Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/base.css

@@ -8,17 +8,17 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fiel
     padding: 0;
 }
 html,body {
-    /* max-width: 750px; */
-/*    -webkit-text-size-adjust: 100%;*/
+     max-width: 750px;
+    -webkit-text-size-adjust: 100%;
     margin: 0 auto;
-/*    height: 100%;*/
-/*    overflow-x: hidden;*/
-/*    -webkit-box-sizing: border-box;
+    height: 100%;
+    overflow-x: hidden;
+    -webkit-box-sizing: border-box;
     box-sizing: border-box;
     font-size: .24rem;
     background:rgba(245,244,249,1);;
-    color: #3d3d3d;*/
-/*    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;*/
+    color: #3d3d3d;
+    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
 }
 
 ul,ol {

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/choose_area.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 .main {
   width: 100%;
   overflow: scroll;
@@ -7,75 +8,335 @@
   display: none;
 }
 
-#choose_area .btn {
-  position: fixed;
+.layout_top-bottom {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 100%;
+}
+
+.layout_top-bottom .layou_top {
+  flex: 1;
+  overflow: scroll;
+}
+
+.bottom_button {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
   width: 100%;
   height: .94rem;
-  bottom: 0;
+}
+
+.bottom_button .left_btn,
+.bottom_button .right_btn {
+  flex: 1;
+  height: 100%;
+  font-size: .34rem;
+}
+
+.bottom_button .left_btn {
+  color: #2cb7ca;
+  background-color: #fff;
+  border-top: 1px solid #e0e0e0;
+}
+
+.bottom_button .right_btn {
+  color: #fff;
+  background-color: #2cb7ca;
+  border-top: 1px solid #2cb7ca;
+}
+
+.bottom_button button[disabled] {
+  opacity: .5;
+}
+
+.jy_icon {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+.jy_icon.decrease:before,
+.jy_icon.increase:before,
+.jy_icon.increase:after {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  content: '';
+  width: 0.4rem;
+  height: 0.04rem;
+  background-color: #686868;
+  transform: translate(-50%, -50%);
+}
+
+.jy_icon.increase:after {
+  transform: translate(-50%, -50%) rotate(90deg);
+}
+
+/*禁止长按复制 加给body*/
+.no-touch {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+/* 弹性盒子布局 */
+.flex_alginC {
+  display: flex;
+  align-items: center;
+}
+
+.flex_alginC_justB {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flex_alginC_justC {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.flex_column {
+  display: flex;
+  flex-direction: column;
+}
+
+.flex_column_alignC {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+/* 自定义弹窗*/
+@-webkit-keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+.custom-dialog .weui-animate-fade-in {
+  -webkit-animation: c ease 0s forwards;
+  animation: c ease 0s forwards;
+}
+
+@-webkit-keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.custom-dialog .weui-animate-fade-out {
+  -webkit-animation: d ease 0s forwards;
+  animation: d ease 0s forwards;
+}
+
+.custom-dialog .weui-dialog__hd {
+  background: #F5F4F9;
+  padding: .17rem 0;
+  color: #000;
+  font-size: .34rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__bd {
+  padding: .37rem 0;
+  color: #1D1D1D;
+  font-size: .32rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__ft:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__btn:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__ft {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-bottom: .38rem;
+  box-sizing: border-box;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__btn {
+  display: block;
+  width: 1.72rem;
+  height: .72rem;
+  line-height: .72rem;
+  color: #fff;
+  padding: 0;
+  flex: none;
+  text-align: center;
+  border-radius: 3px;
+}
+
+.custom-dialog .weui-dialog__btn_primary {
+  background-color: #2CB7CA;
+  margin-right: 1rem;
+}
+
+.custom-dialog .weui-dialog__btn_default {
+  background-color: #BFBFC3;
+}
+
+/* 自定义switch按钮 */
+.custom-switch {
+  position: relative;
+  width: 52px;
+  height: 32px;
+  border: 1px solid #dfdfdf;
+  outline: 0;
+  border-radius: 16px;
+  box-sizing: border-box;
+  background-color: #dfdfdf;
+  -webkit-transition: background-color .1s,border .1s;
+  transition: background-color .1s,border .1s;
+  -webkit-appearance: none;
+}
+
+.custom-switch:before {
+  content: " ";
+  position: absolute;
+  top: 0;
   left: 0;
-  right: 0;
+  width: 50px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fdfdfd;
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+}
+
+.custom-switch:after {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 30px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+}
+
+.custom-switch.checked {
+  border-color: #04be02;
+  background-color: #04be02;
+}
+
+.custom-switch.checked:before {
+  transform: scale(0);
+}
+
+.custom-switch.checked:after {
+  transform: translateX(20px);
+}
+
+#choose_area {
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  overflow: hidden;
+  height: 100%;
+}
+
+#choose_area .form {
+  flex: 1;
+  overflow-y: scroll;
+}
+
+#choose_area .btn {
+  width: 100%;
+  height: .94rem;
   line-height: .94rem;
   color: #fff;
   font-size: .34rem;
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
-}
-#choose_area .btn .save-btn, #choose_area .btn .reset-btn {
-  -webkit-box-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  align-items: center;
+  justify-content: space-between;
+}
+
+#choose_area .btn .save-btn,
+#choose_area .btn .reset-btn {
+  flex: 1;
   width: 50%;
   text-align: center;
   height: 100%;
   font-size: .34rem;
 }
+
 #choose_area .btn .reset-btn {
   background: #fff;
   color: #2cb7ca;
 }
+
 #choose_area .btn .save-btn {
   background: #2cb7ca;
   color: #fff;
 }
-#choose_area .main .result {
+
+#choose_area .result {
   padding: .2rem .3rem;
   font-size: .26rem;
 }
-#choose_area .main .select-area-box {
-  padding-bottom: .94rem;
-}
-#choose_area .main .select-area-box .tab {
-  display: -webkit-box;
-  display: -ms-flexbox;
+
+#choose_area .select-area-box .tab {
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
+  align-items: center;
+  justify-content: space-between;
   color: #1d1d1d;
   background: #fff;
   font-size: .3rem;
-  padding: 0.2rem 0.5rem;
+  padding: .2rem .5rem;
   border-bottom: 0.5px solid #e0e0e0;
 }
-#choose_area .main .select-area-box .tab .province {
-  display: -webkit-box;
-  display: -ms-flexbox;
+
+#choose_area .select-area-box .tab .province {
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  align-items: center;
 }
-#choose_area .main .select-area-box .tab .province .checkbox {
+
+#choose_area .select-area-box .tab .province .checkbox {
   width: .4rem;
   height: .4rem;
   border: 1px solid #ddd;
@@ -84,38 +345,62 @@
   -webkit-appearance: none;
   background: #fff;
 }
-#choose_area .main .select-area-box .tab .province .checkbox:checked {
+
+#choose_area .select-area-box .tab .province .checkbox:checked {
   border: 0;
-  background: url(/wx_dataExport/images/xuanzhong.png) no-repeat center center;
+  background: url(/jyapp/dataExport/images/xuanzhong.png) no-repeat center center;
   background-size: 100% 100%;
 }
-#choose_area .main .select-area-box label::after {
+
+#choose_area .select-area-box .tab .province .checkbox[disabled] {
+  border: 0;
+  background: url(../image/active_disabled.png) no-repeat center center;
+  background-size: 100% 100%;
+}
+
+#choose_area .select-area-box label::after {
   font-size: 14px;
   float: right;
   margin-right: 15px;
 }
-#choose_area .main .select-area-box .tab_content {
+
+#choose_area .select-area-box .tab_content {
   display: none;
   font-size: .28rem;
   padding: .1rem .3rem;
   text-align: center;
 }
-#choose_area .main .select-area-box .tab_content .city {
+
+#choose_area .select-area-box .tab_content .city {
   float: left;
   padding: .1rem .2rem;
   background: #fff;
-  margin: .1rem;
+  margin: .1rem 0 .1rem .1rem;
+  border-radius: 0.04rem;
 }
-#choose_area .main .select-area-box .tab_content .active {
+
+#choose_area .select-area-box .tab_content .active {
   background: #2cb7ca;
   color: #fff;
 }
-#choose_area .main .select-area-box .index {
+
+#choose_area .select-area-box .tab_content .active[disabled] {
+  background: #BFBFC3;
+  color: #fff;
+}
+
+#choose_area .select-area-box .tab_content .city[disabled] {
+  background: #BFBFC3;
+  color: #fff;
+}
+
+#choose_area .select-area-box .index {
   padding: .3rem .3rem .1rem .3rem;
   font-size: .32rem;
 }
-#choose_area .main .slide {
-  background:transparent;
+
+#choose_area .slide {
+  background: transparent;
   position: fixed;
   right: 0;
   top: 50%;
@@ -123,23 +408,15 @@
   width: .4rem;
   font-size: .26rem;
   text-align: center;
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: column;
-          flex-direction: column;
-  -webkit-box-pack: center;
-      -ms-flex-pack: center;
-          justify-content: center;
+  flex-direction: column;
+  justify-content: center;
   padding: .1rem 0;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  align-items: center;
   margin-top: -4.25rem;
   z-index: 9999;
 }
-#choose_area .main .slide a {
+
+#choose_area .slide a {
   margin-bottom: .1rem;
 }

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/keyWord.css

@@ -7,6 +7,7 @@
 }
 .keyWord .enter .enterOne {
   min-height: 0.94rem;
+  display: block;
   width: 100%;
   padding: 0 0.3rem;
   font-size: .3rem;
@@ -73,11 +74,11 @@
   padding: 0 .3rem;
 }
 .keyWord .showKeyWord ul li .one div span strong {
-  font-size: 14px;
+  font-size: 0.3rem;
   color: #1d1d1d;
   font-weight: normal;
   display: block;
-  width: 1.2rem;
+  width: 1.3rem;
 }
 .keyWord .showKeyWord ul li .one div span p {
   -webkit-box-flex: 1;
@@ -155,9 +156,11 @@
   float: right;
   margin-right: 0.3rem;
 }
+
 .keyWord .problem i {
   margin-left: .06rem;
 }
+
 .keyWord .problemPop {
   background: rgba(0, 0, 0, 0.5);
   position: fixed;
@@ -166,13 +169,10 @@
   top: 0;
   left: 0;
   display: none;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-pack: center;
-      -ms-flex-pack: center;
-          justify-content: center;
+  align-items: center;
+  justify-content: center;
 }
+
 .keyWord .problemPop .problemPopContent {
   width: 5.6rem;
   min-height: 7.23rem;
@@ -182,32 +182,39 @@
   position: relative;
   padding: 0.58rem 0;
 }
+
 .keyWord .problemPop .problemPopContent h3 {
   font-size: .34rem;
   text-align: center;
+  padding-bottom: 0.2rem;
 }
+
 .keyWord .problemPop .problemPopContent ul {
   padding: 0 .4rem;
 }
+
 .keyWord .problemPop .problemPopContent ul li {
-  margin-top: 0.2rem;
+  margin-top: 0.16rem;
 }
+
 .keyWord .problemPop .problemPopContent ul li h4 {
   font-size: .3rem;
-  line-height: .5rem;
+  line-height: 1.5;
   color: #1d1d1d;
 }
+
 .keyWord .problemPop .problemPopContent ul li p {
   font-size: .28rem;
   color: #868686;
-  line-height: 0.4rem;
+  line-height: 1.4;
 }
+
 .keyWord .problemPop .problemPopContent button {
   width: 100%;
   background: #fff;
   border-top: 1px solid #E0E0E0;
   position: absolute;
-  bottom: 5px;
+  bottom: 0;
   height: 1rem;
   font-size: .36rem;
   color: #2cb7ca;

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/pay_order.css

@@ -8,7 +8,7 @@
 }
 
 #pay_order {
-  padding-bottom: 2.7rem;
+/*  padding-bottom: 2.7rem;*/
     font-size: .24rem !important;
 	background: rgba(245,244,249,1);
 	margin-top: 64px;
@@ -213,8 +213,9 @@
   display: flex;
 }
 #pay_order .main .form .form-item .form-control .input input[type='text'] {
-/*  height: 100%;*/
-      width: 3.5rem;
+/*  height: 100%;
+      width: 3.5rem;*/
+     width:6.8rem;
 	padding: .2rem .1rem;
     margin-top: .05rem;
 }
@@ -248,7 +249,7 @@ position: absolute;
   padding: 0 .3rem;
 }
 #pay_order .main .form .form-item .way span:nth-child(1) {
-  color: #888;
+  /*color: #888;*/
 }
 #pay_order .main .form .form-item .way .way-right {
   display: -webkit-box;
@@ -259,7 +260,7 @@ position: absolute;
           align-items: center;
 }
 #pay_order .main .form .form-item .way .way-right span {
-  color: #1d1d1d;
+  color: #888;
   padding-right: .1rem;
 }
 #pay_order .main .form .form-item .way .way-right .icon-right {
@@ -282,7 +283,7 @@ position: absolute;
 letter-spacing: 0.02rem;
 }
 #pay_order   .fixed-bottom-box {
-  position: fixed;
+ /* position: fixed;*/
   bottom: 0;
   left: 0;
   right: 0;
@@ -463,7 +464,7 @@ letter-spacing: 0.02rem;
 	height: 0.88rem;
 }
 #pay_order #email-input input{
-	width:4rem;
+	width:6.8rem;
 }
 #pay_order #codeinput{
 	    padding: 0 .2rem;

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js

@@ -23,8 +23,6 @@ $(function(){
     
     // 添加按钮
     $(".addKeyWord i").on('click',function(){
-        $(".addkeyWord").show();
-        $(".showKeyWord").hide();
         window.location.href="/jyapp/front/dataExport/buyerInput";
     });
 
@@ -90,6 +88,7 @@ $(function(){
         $('.modify span').each(function(item){
             $('.modify span')[0].contentEditable = true
         })
+        keepLastIndex(e.target)
         // console.log($(this).parent().siblings().find('span').text())
         $(this).parent().hide()
         $(this).parent().siblings().css('display','block')
@@ -163,4 +162,19 @@ $(function(){
     $(".close").on("click", function () {
         history.back();
     })
+
+    function keepLastIndex(obj) {
+        if (window.getSelection) {//ie11 10 9 ff safari
+            obj.focus(); //解决ff不获取焦点无法定位问题
+            var range = window.getSelection();//创建range
+            range.selectAllChildren(obj);//range 选择obj下所有子内容
+            range.collapseToEnd();//光标移至最后
+        }
+        else if (document.selection) {//ie10 9 8 7 6 5
+            var range = document.selection.createRange();//创建选择对象
+            range.moveToElementText(obj);//range定位到obj
+            range.collapse(false);//光标移至最后
+            range.select();
+        }
+    }
 });

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js

@@ -112,6 +112,7 @@ $(function(){
         $('.modify span').each(function(item){
             $('.modify span')[0].contentEditable = true
         });
+        keepLastIndex(e.target);
         var keyWord = $(this).prev().children().find(".key").text();
         for(var i in keyWordArr){
             if(keyWordArr[i].keyWord === keyWord){
@@ -228,9 +229,20 @@ $(function(){
         }
     })
 
-    // $(".addExclusion").on('click',function(){
-    //     $('.exclusion').show();
-    //     $('.showKeyWord').hide();
-    // })
-    
+    function keepLastIndex(obj) {
+        if (window.getSelection) {//ie11 10 9 ff safari
+            obj.focus(); //解决ff不获取焦点无法定位问题
+            var range = window.getSelection();//创建range
+            range.selectAllChildren(obj);//range 选择obj下所有子内容
+            range.collapseToEnd();//光标移至最后
+        }
+        else if (document.selection) {//ie10 9 8 7 6 5
+            var range = document.selection.createRange();//创建选择对象
+            range.moveToElementText(obj);//range定位到obj
+            range.collapse(false);//光标移至最后
+            range.select();
+        }
+    }
+
+
 })

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/mapJSON.js

@@ -1555,12 +1555,6 @@ var chinaMapJSON = [{
     "ProID": 20,
     "CitySort": 272,
     "area": ['其他']
-  }, {
-    "CityID": 273,
-    "name": "三沙市",
-    "ProID": 20,
-    "CitySort": 273,
-    "area": ['其他']
   }]
 }, {
   "ProID": 21,
@@ -1881,7 +1875,7 @@ var chinaMapJSON = [{
     "area": ['其他']
   }, {
     "CityID": 344,
-    "name": "吐鲁番市",
+    "name": "吐鲁番地区",
     "ProID": 24,
     "CitySort": 344,
     "area": ["吐鲁番市", "鄯善县", "托克逊县"]
@@ -1941,7 +1935,7 @@ var chinaMapJSON = [{
     "area": ["城东区", "城中区", "城西区", "城北区", "大通回族土族自治县", "湟中县", "湟源县"]
   }, {
     "CityID": 291,
-    "name": "海东市",
+    "name": "海东地区",
     "ProID": 25,
     "CitySort": 291,
     "area": ["平安县", "民和回族土族自治县", "乐都县", "互助土族自治县", "化隆回族自治县", "循化撒拉族自治县"]
@@ -2193,13 +2187,13 @@ var chinaMapJSON = [{
     "area": ["凯里市", "黄平县", "施秉县", "三穗县", "镇远县", "岑巩县", "天柱县", "锦屏县", "剑河县", "台江县", "黎平县", "榕江县", "从江县", "雷山县", "麻江县", "丹寨县"]
   }, {
     "CityID": 251,
-    "name": "铜仁市",
+    "name": "铜仁地区",
     "ProID": 29,
     "CitySort": 251,
     "area": ["铜仁市", "江口县", "玉屏侗族自治县", "石阡县", "思南县", "印江土家族苗族自治县", "德江县", "沿河土家族自治县", "松桃苗族自治县", "万山特区"]
   }, {
     "CityID": 252,
-    "name": "毕节市",
+    "name": "毕节地区",
     "ProID": 29,
     "CitySort": 252,
     "area": ["毕节市", "大方县", "黔西县", "金沙县", "织金县", "纳雍县", "威宁彝族回族苗族自治县", "赫章县"]

src/jfw/modules/app/src/web/templates/dataExport/404.html

@@ -2,7 +2,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-		<title>404</title>
+		<title>数据导出</title>
 		<script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js"></script>
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}"/>
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/no_result.css?v={{Msg "seo" "version"}}">

src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -283,8 +283,7 @@
             $("#starttime").removeClass("timeSelect");
             $("#endtime").removeClass("timeSelect");
             $(".dateMake").css({"color":"#888"});
-            $("#starttime").val("");
-            $("#endtime").val("");
+
         });
 
         //筛选日期自动更新
@@ -362,14 +361,15 @@
                     }
                     startFlag =false;
                 }
-                if (startFlag){
+                // if (startFlag){
                     $("#starttime").addClass("timeSelect");
                     $("#endtime").addClass("timeSelect");
                     $(".dateMake").css({"color":"#24C0D7"});
                     $(".chooseTime ul li").removeClass('active');
-                }
+                // }
                 $(".confirm").hide();
                 $(".resetOne").show();
+                localStorage.removeItem("date");
             },
             onClear: function (inst) {
                 localStorage.removeItem("export_starttime");
@@ -432,15 +432,16 @@
                     }
                     endFlag =false;
                 }
-                if (endFlag){
+                // if (endFlag){
                     $("#starttime").addClass("timeSelect");
                     $("#endtime").addClass("timeSelect");
                     $(".dateMake").css({"color":"#24C0D7"});
                     $(".chooseTime ul li").removeClass('active');
-                }
+                // }
                 //
                 $(".confirm").hide();
                 $(".resetOne").show();
+                localStorage.removeItem("date");
             },
             onClear: function (inst) {
                 localStorage.removeItem("export_endtime");
@@ -627,6 +628,8 @@
             var winner = "";
             date = getDate();
             localStorage.date = date;
+            localStorage.removeItem("export_starttime");
+            localStorage.removeItem("export_endtime");
             if(localStorage.area!==undefined&&localStorage.area!==""){
                 area = localStorage.area;
             }

src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html

@@ -46,6 +46,16 @@
         top: 18px;
         color: #444444;
     }
+    .keyWord .addKeyWord {
+        width:0;
+        position: fixed;
+        left: 44%;
+        top: 85%;
+        text-align: center;
+    }
+    .ios-user-select{
+        -webket-user-select: text;
+    }
 </style>
 <body>
 <div class="app-layout-header">
@@ -71,34 +81,36 @@
 
     </div>
 
-    <div class="addKeyWord">
-    <i class="iconfont icon-tianjia"></i>
-    </div>
-
     <div class="problem">
     疑问解答 <i class="iconfont icon-wenhao"></i>
     </div>
+    <div class="addKeyWord">
+        <i class="iconfont icon-tianjia"></i>
+    </div>
 
     <!-- 疑难问题弹窗 -->
     <div class="problemPop">
-    <div class="problemPopContent">
-    <h3>疑问解答</h3>
-    <ul>
-    <li>
-    <h4>·关键词</h4>
-<p>目标信息中的关键性词语，如“软件系统”</p>
-</li>
-<li>
-<h4>·附加词</h4>
-<p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-</li>
-<li>
-<h4>·排除词</h4>
-<p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-</li>
-</ul>
-<button class="knowBtn">我知道了</button>
-    </div>
+        <div class="problemPopContent">
+            <h3>疑问解答</h3>
+            <ul>
+                <li>
+                    <p>例：某公司主营业务为软件系统开发</p>
+                </li>
+                <li>
+                    <h4>关键词:</h4>
+                    <p>目标信息中的关键性词语，如“软件系统”</p>
+                </li>
+                <li>
+                    <h4>附加词:</h4>
+                    <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+                </li>
+                <li>
+                    <h4>排除词:</h4>
+                    <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+                </li>
+            </ul>
+            <button class="knowBtn">我知道了</button>
+        </div>
 
     </div>
 
@@ -167,7 +179,7 @@
                                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                         </div>
                                         <div class="modify">
-                                            <span contentEditable="true">${ appendedArr[y] }</span>
+                                            <span class="ios-user-select" contentEditable="true">${ appendedArr[y] }</span>
                                             <button class="deleteKey">删除</button>
                                             <button class="ascertainKey">确定</button>
                                         </div>
@@ -328,6 +340,7 @@
                 $('.modify span').each(function(item){
                     $('.modify span')[0].contentEditable = true
                 });
+                keepLastIndex(e.target);
                 // console.log($(this).parent().siblings().find('span').text())
                 $(this).parent().hide();
                 $(this).parent().siblings().css('display','block')
@@ -417,6 +430,20 @@
             $(".app-back").on("click", function () {
                 history.back();
             });
+            function keepLastIndex(obj) {
+                if (window.getSelection) {//ie11 10 9 ff safari
+                    obj.focus(); //解决ff不获取焦点无法定位问题
+                    var range = window.getSelection();//创建range
+                    range.selectAllChildren(obj);//range 选择obj下所有子内容
+                    range.collapseToEnd();//光标移至最后
+                }
+                else if (document.selection) {//ie10 9 8 7 6 5
+                    var range = document.selection.createRange();//创建选择对象
+                    range.moveToElementText(obj);//range定位到obj
+                    range.collapse(false);//光标移至最后
+                    range.select();
+                }
+            }
         })
 
     </script>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html

@@ -69,24 +69,27 @@
 
         <!-- 疑难问题弹窗 -->
         <div class="problemPop">
-        <div class="problemPopContent">
-        <h3>疑问解答</h3>
-        <ul>
-        <li>
-        <h4>·关键词</h4>
-    <p>目标信息中的关键性词语，如“软件系统”</p>
-    </li>
-    <li>
-    <h4>·附加词</h4>
-    <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-    </li>
-    <li>
-    <h4>·排除词</h4>
-    <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-    </li>
-    </ul>
-    <button class="knowBtn">我知道了</button>
-        </div>
+            <div class="problemPopContent">
+                <h3>疑问解答</h3>
+                <ul>
+                    <li>
+                        <p>例：某公司主营业务为软件系统开发</p>
+                    </li>
+                    <li>
+                        <h4>关键词:</h4>
+                        <p>目标信息中的关键性词语，如“软件系统”</p>
+                    </li>
+                    <li>
+                        <h4>附加词:</h4>
+                        <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+                    </li>
+                    <li>
+                        <h4>排除词:</h4>
+                        <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+                    </li>
+                </ul>
+                <button class="knowBtn">我知道了</button>
+            </div>
 
         </div>
 

src/jfw/modules/app/src/web/templates/dataExport/dataExport_applyInvoice.html

@@ -174,7 +174,7 @@
 			var taxNumer = document.getElementById("taxNumer");
 			var companyName =document.getElementById("companyName");
 			//纳税人识别正则
-			   taxNumer.onkeyup = function(){
+			   taxNumer.onblur = function(){
 			    	var taxNumerValue = taxNumer.value;
 			    	var b = taxNumer_reg.test(taxNumerValue);
 				if(taxNumerValue == ""){
@@ -197,7 +197,7 @@
 				   }
 			}
 			//公司识别正则
-			   companyName.onkeyup = function(){
+			   companyName.onblur = function(){
 			    	var companyNameValue = companyName.value;
 			    	var b = companyName_reg.test(companyNameValue);
 			    	if (companyNameValue == "")	{
@@ -235,7 +235,7 @@
                     actions: [{
                             text: "个人",
                             onClick: function() {
-                                $.alert("你选择了“个人”");
+                              //  $.alert("你选择了“个人”");
                                 $(".type").html("个人")
                                	$("#sieve").css("background-color","#2cb7ca")
                                 $("#unit-info").hide()
@@ -244,7 +244,7 @@
                         {
                             text: "单位",
                             onClick: function() {
-                                $.alert("你选择了“单位”");
+                               // $.alert("你选择了“单位”");
                                 $(".type").html("单位")
                                 $("#sieve").css("background-color","#90D5E1");
                                 $("#unit-info").show()

src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html

@@ -8,10 +8,10 @@
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 
 		<link rel="stylesheet" href="/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" type="text/css" href="/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}" />
+		<link rel="stylesheet" type="text/css" href="/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}4" />
 		<link rel="stylesheet" type="text/css" href="/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 		<link rel="stylesheet" href="/jyapp/dataExport/css/public.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="/jyapp/dataExport/css/choose_area.css?v={{Msg "seo" "version"}}3">
+		<link rel="stylesheet" href="/jyapp/dataExport/css/choose_area.css?v={{Msg "seo" "version"}}5">
 		<script src="/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 		<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 		<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
@@ -56,363 +56,362 @@
 			<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 			区域
 		</div>
-		<div id="choose_area" style="margin-top:65px">
-				<main class="main">
-				<div class="form">
+		<div id="choose_area" style="padding-top:65px">
 				<div class="result">
-				已选择：
-		<span class="result_name"></span>
-				</div>
-				<div class="select-area-box">
-				<ul>
-				<li>
-				<div class="tab whole selected">
-				<div class="province">
-				<input type="checkbox" class="checkbox other">全国
-				</div>
-				<!-- <div class="tab_content clearfix"></div> -->
-				</div>
-				</li>
-				<li class="index" id="A">A</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">安徽
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">澳门
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="B">B</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">北京
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="C">C</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">重庆
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="F">F</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">福建
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="G">G</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">广东
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">广西
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">贵州
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">甘肃
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="H">H</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">河北
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">湖北
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">黑龙江
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">海南
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">河南
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">湖南
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<p class="index" id="J">J</p>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">吉林
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">江苏
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">江西
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="L">L</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">辽宁
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="N">N</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">内蒙古
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">宁夏
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="Q">Q</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">青海
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="S">S</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">山西
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">陕西
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">上海
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">山东
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">四川
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="T">T</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">天津
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">台湾
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="X">X</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">西藏
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">新疆
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">香港
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="Y">Y</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">云南
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="Z">Z</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">浙江
-				</div>
-				<span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				</ul>
-				<div class="slide">
-				<a href="javascript:;">#</a>
-				<a href="javascript:;">A</a>
-				<a href="javascript:;">B</a>
-				<a href="javascript:;">C</a>
-				<a href="javascript:;">F</a>
-				<a href="javascript:;">G</a>
-				<a href="javascript:;">H</a>
-				<a href="javascript:;">J</a>
-				<a href="javascript:;">L</a>
-				<a href="javascript:;">N</a>
-				<a href="javascript:;">Q</a>
-				<a href="javascript:;">S</a>
-				<a href="javascript:;">T</a>
-				<a href="javascript:;">X</a>
-				<a href="javascript:;">Y</a>
-				<a href="javascript:;">Z</a>
-				</div>
+					已选择：
+					<span class="result_name"></span>
 				</div>
+				<div class="form">
+
+					<div class="select-area-box">
+						<ul>
+							<li>
+								<div class="tab whole selected">
+									<div class="province">
+										<input type="checkbox" class="checkbox other">全国
+									</div>
+									<!-- <div class="tab_content clearfix"></div> -->
+								</div>
+							</li>
+							<li class="index" id="A">A</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">安徽
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab municipality">
+									<div class="province">
+										<input type="checkbox" class="checkbox">澳门
+									</div>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="B">B</li>
+							<li >
+								<div class="tab municipality">
+									<div class="province">
+										<input type="checkbox" class="checkbox">北京
+									</div>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="C">C</li>
+							<li >
+								<div class="tab municipality">
+									<div class="province">
+										<input type="checkbox" class="checkbox">重庆
+									</div>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="F">F</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">福建
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="G">G</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">广东
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">广西
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">贵州
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">甘肃
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="H">H</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">河北
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">湖北
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">黑龙江
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">海南
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">河南
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">湖南
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<p class="index" id="J">J</p>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">吉林
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">江苏
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">江西
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="L">L</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">辽宁
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="N">N</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">内蒙古
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">宁夏
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="Q">Q</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">青海
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="S">S</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">山西
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">陕西
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab municipality">
+									<div class="province">
+										<input type="checkbox" class="checkbox">上海
+									</div>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">山东
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">四川
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="T">T</li>
+							<li >
+								<div class="tab municipality">
+									<div class="province">
+										<input type="checkbox" class="checkbox">天津
+									</div>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab municipality">
+									<div class="province">
+										<input type="checkbox" class="checkbox">台湾
+									</div>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="X">X</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">西藏
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">新疆
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li >
+								<div class="tab municipality">
+									<div class="province">
+										<input type="checkbox" class="checkbox">香港
+									</div>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="Y">Y</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">云南
+									</div>
+									<span><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+							<li class="index" id="Z">Z</li>
+							<li >
+								<div class="tab">
+									<div class="province">
+										<input type="checkbox" class="checkbox">浙江
+									</div>
+									<span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
+								</div>
+								<div class="tab_content clearfix"></div>
+							</li>
+						</ul>
+						<div class="slide">
+							<a href="javascript:;">#</a>
+							<a href="javascript:;">A</a>
+							<a href="javascript:;">B</a>
+							<a href="javascript:;">C</a>
+							<a href="javascript:;">F</a>
+							<a href="javascript:;">G</a>
+							<a href="javascript:;">H</a>
+							<a href="javascript:;">J</a>
+							<a href="javascript:;">L</a>
+							<a href="javascript:;">N</a>
+							<a href="javascript:;">Q</a>
+							<a href="javascript:;">S</a>
+							<a href="javascript:;">T</a>
+							<a href="javascript:;">X</a>
+							<a href="javascript:;">Y</a>
+							<a href="javascript:;">Z</a>
+						</div>
+					</div>
 				</div>
 				<div class="btn">
-				<button class="reset-btn">重置</button>
-				<button class="save-btn">确认</button>
+					<button class="reset-btn">重置</button>
+					<button class="save-btn">确认</button>
 				</div>
-				</main>
 
 				</div>
 		<script src="/jyapp/dataExport/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
@@ -456,7 +455,7 @@
 			});
 			function createMoreCity(arr){
 				var tempHtml = arr.map(function(v) {
-					return '<div class="city">'+v.name.replace(/市$/g,'')+'</div>'
+					return '<button class="city">' + v.name.replace(/地区$/g, '市') + '</button>'
 				}).join('');
 				return tempHtml
 			}
@@ -464,38 +463,95 @@
 			/* 选中结果 */
 			function getResult() {
 				$('.result_name').empty()
-				var data = []
+				var data = []; //定义一个总数组
+				var cityArr =[]; //定义一个选中城市数组
 				var val = $('.other').parents('.province').text().trim();
 				if ($('.other').is(':checked')) {
-					data.push(val)
+					// data.push(val)
+					data =[{name:val,children:[]}] //全国
 				}
+
 				$(".tab_content").find(".city.active:not('[disabled]')").each(function () {
 					var length = $(this).parent('.tab_content').find('.city').length; //省份下城市的length
 					var activeLeng = $(this).parent('.tab_content').find('.city.active').length; //省份下选中城市的length
+					let arr =[];
 					// 判断省份下的城市是否等于选中的城市长度,相等就是全部选中
 					if (length == activeLeng) {
-						data.push($(this).parent('.tab_content').siblings('.tab:not(.whole)')
-								.children('.province').text().trim())
-						return true;
+						// data.push($(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();
+						data.push({
+							name:province,
+							children:[]
+						})
 					} else {
-						data.push($(this).parent('.tab_content').siblings('.tab:not(.whole)')
-								.children('.province').text().trim())
-						data.push($(this).html())
+						// data.push($(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim())
+						// data.push($(this).html())
+						// 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 city = $(this).html()
+						arr.push({name:city,parent:province})
+						// console.log(arr)
+						for(let i =0;i<arr.length;i++){
+							// console.log(arr[i])
+							let obj ={};
+							obj.name = arr[i].name;
+							obj.parent = arr[i].parent;
+							cityArr.push(obj)
+						}
+						data.push({
+							name:province,
+							children:cityArr
+						})
 					}
-					// data.push($(this).html())
-				})
-				data = Array.from(new Set(data)); //数组去重
-				console.log(data)
+				});
+				//数组对象去重
+				let obj = {};
+				data = data.reduce((cur,next) =>{
+					obj[next.name] ? "" : obj[next.name] = true && cur.push(next);
+					return cur
+				},[]);
+				// 数组筛选
+				let result = data.map(v =>{
+					let filterArr = v.children.filter(s =>{
+						return s.parent === v.name
+					});
+					return {
+						name:v.name,
+						children:filterArr
+					}
+				});
+				// console.log(result)
 				var html = '';
-				for (var i = 0; i < data.length; i++) {
-					if (i != data.length - 1) {
-						html += '<span>' + data[i] + '、' + '</span>'
-					} else {
-						html += '<span>' + data[i] + '</span>'
+				for (var i = 0; i < result.length; i++) {
+					let children = result[i].children;
+					if( children.length >0){
+						html += `<span> ${result[i].name} (</span>`;
+						for(var j = 0;j < children.length;j++){
+							if (j != children.length - 1) {
+								html += `<span> ${children[j].name}、</span>`
+							} else {
+								html += `<span> ${children[j].name} </span>`
+							}
+						}
+						if(i !=result.length -1){
+							html += `<span>)</span>、`
+						}else{
+							html += `<span>)</span>`
+						}
+
+					}else{
+						if(i !=result.length -1){
+							html += `<span>${result[i].name}、</span>`
+						}else{
+							html += `<span>${result[i].name}</span>`
+						}
 					}
 				}
 				$('.result_name').append(html)
 			}
+
 			//
 			 $(function(){
 				 $("body").on('click','.slide a',function(){
@@ -506,11 +562,23 @@
 					 document.querySelector('#' + s).scrollIntoView({block:'center'});
 				 });
 
-				 $(".select-area-box .tab:not(.municipality)").on('click',function(event){
-					 $(this).toggleClass('selected').next('.tab_content').slideDown(500);
-					 $(this).parent().siblings().children('.tab_content').slideUp(500);
+				 $(".select-area-box .tab:not(.municipality)").on('click', function (event) {
+					 if($(this).next('.tab_content:not(:animated)').css("display") == "block"){
+						 $(this).children().children('i').css({
+							 "display":"inline-block",
+							 "transform":"rotate(0)"
+						 })
+					 }else{
+						 $(this).children().children('i').css({
+							 "display":"inline-block",
+							 "transform":"rotate(-180deg)"
+						 })
+					 }
+					 $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500)
+					 // $(this).parent().siblings().children('.tab_content').slideUp(500)
 					 $(this).parent().siblings().children('.tab').removeClass('selected');
-				 });
+
+				 })
 				 $('.province .checkbox:not(.other)').on('change',function(){
 					var isCheckded = $(this).is(':checked');
 					// console.log(isCheckded);
@@ -567,7 +635,6 @@
 							 }
 						 }
 					 });
-					 console.log(province);
 					 if($('.other').is(':checked')){
 						 data.push(val);
 					 }
@@ -598,11 +665,15 @@
 					 history.back();
 				 });
 				$('.reset-btn').click(function(){
-					$('input[type="checkbox"]').attr("checked",false);
-					$('.tab_content .city').removeClass('active');
+					$('input[type="checkbox"]:not("[disabled]")').attr("checked", false)
+					$('.tab_content .city:not("[disabled]")').removeClass('active')
 					$('.result_name').empty();
-					$(".whole").addClass("selected");
-					$(".other").prop("checked",true);
+					$('.other').prop('checked', true);
+					$('.tab_content').slideUp(500);
+					$('.tab span i').css({
+						"display":"inline-block",
+						"transform":"rotate(0)"
+					});
 					$(".reset-btn").hide();
 					getResult()
 				});

src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html

@@ -52,6 +52,9 @@
 		/*top: 100%;*/
 		text-align: center;
 	}
+	.ios-user-select{
+		-webket-user-select: text;
+	}
 </style>
 
 <body>
@@ -102,7 +105,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span contentEditable="true">${ buyer[i] }</span>
+                            <span class="ios-user-select" contentEditable="true">${ buyer[i] }</span>
                             <button class="deleteKey">删除</button>
                             <button class="ascertainKey">确定</button>
                         </div>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

@@ -46,6 +46,16 @@
         top: 18px;
         color: #444444;
     }
+    .keyWord .addKeyWord {
+        width:0;
+        position: fixed;
+        left: 44%;
+        top: 85%;
+        text-align: center;
+    }
+    .ios-user-select{
+        -webket-user-select: text;
+    }
 </style>
 <body>
 <div class="app-layout-header">
@@ -71,34 +81,36 @@
 
     </div>
 
-    <div class="addKeyWord">
-    <i class="iconfont icon-tianjia"></i>
-    </div>
-
     <div class="problem">
     疑问解答 <i class="iconfont icon-wenhao"></i>
     </div>
+    <div class="addKeyWord">
+        <i class="iconfont icon-tianjia"></i>
+    </div>
 
     <!-- 疑难问题弹窗 -->
     <div class="problemPop">
-    <div class="problemPopContent">
-    <h3>疑问解答</h3>
-    <ul>
-    <li>
-    <h4>·关键词</h4>
-<p>目标信息中的关键性词语，如“软件系统”</p>
-</li>
-<li>
-<h4>·附加词</h4>
-<p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-</li>
-<li>
-<h4>·排除词</h4>
-<p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-</li>
-</ul>
-<button class="knowBtn">我知道了</button>
-    </div>
+        <div class="problemPopContent">
+            <h3>疑问解答</h3>
+            <ul>
+                <li>
+                    <p>例：某公司主营业务为软件系统开发</p>
+                </li>
+                <li>
+                    <h4>关键词:</h4>
+                    <p>目标信息中的关键性词语，如“软件系统”</p>
+                </li>
+                <li>
+                    <h4>附加词:</h4>
+                    <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+                </li>
+                <li>
+                    <h4>排除词:</h4>
+                    <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+                </li>
+            </ul>
+            <button class="knowBtn">我知道了</button>
+        </div>
 
     </div>
 
@@ -167,7 +179,7 @@
                                         <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                     </div>
                                     <div class="modify">
-                                        <span contentEditable="true">${ excludeArr[y] }</span>
+                                        <span class="ios-user-select" contentEditable="true">${ excludeArr[y] }</spanclass>
                                         <button class="deleteKey">删除</button>
                                         <button class="ascertainKey">确定</button>
                                     </div>
@@ -329,6 +341,7 @@
                 $('.modify span').each(function(item){
                     $('.modify span')[0].contentEditable = true
                 });
+                keepLastIndex(e.target);
                 // console.log($(this).parent().siblings().find('span').text())
                 $(this).parent().hide();
                 $(this).parent().siblings().css('display','block')
@@ -418,6 +431,20 @@
             $(".app-back").on("click", function () {
                 history.back();
             });
+            function keepLastIndex(obj) {
+                if (window.getSelection) {//ie11 10 9 ff safari
+                    obj.focus(); //解决ff不获取焦点无法定位问题
+                    var range = window.getSelection();//创建range
+                    range.selectAllChildren(obj);//range 选择obj下所有子内容
+                    range.collapseToEnd();//光标移至最后
+                }
+                else if (document.selection) {//ie10 9 8 7 6 5
+                    var range = document.selection.createRange();//创建选择对象
+                    range.moveToElementText(obj);//range定位到obj
+                    range.collapse(false);//光标移至最后
+                    range.select();
+                }
+            }
         })
 
     </script>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html

@@ -81,24 +81,27 @@
 
         <!-- 疑难问题弹窗 -->
         <div class="problemPop">
-        <div class="problemPopContent">
-        <h3>疑问解答</h3>
-        <ul>
-        <li>
-        <h4>·关键词</h4>
-    <p>目标信息中的关键性词语，如“软件系统”</p>
-    </li>
-    <li>
-    <h4>·附加词</h4>
-    <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-    </li>
-    <li>
-    <h4>·排除词</h4>
-    <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-    </li>
-    </ul>
-    <button class="knowBtn">我知道了</button>
-        </div>
+            <div class="problemPopContent">
+                <h3>疑问解答</h3>
+                <ul>
+                    <li>
+                        <p>例：某公司主营业务为软件系统开发</p>
+                    </li>
+                    <li>
+                        <h4>关键词:</h4>
+                        <p>目标信息中的关键性词语，如“软件系统”</p>
+                    </li>
+                    <li>
+                        <h4>附加词:</h4>
+                        <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+                    </li>
+                    <li>
+                        <h4>排除词:</h4>
+                        <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+                    </li>
+                </ul>
+                <button class="knowBtn">我知道了</button>
+            </div>
 
         </div>
 

src/jfw/modules/app/src/web/templates/dataExport/dataExport_industry.html

@@ -5,10 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>行业</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}3">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/industry.css?v={{Msg "seo" "version"}}">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
@@ -20,12 +20,12 @@
         body .industry .list ul li dd {
             background: #F4F4F9;
             display: inline-block;
-            width: 2.1rem;
+            width: 2.22rem;
             height: .7rem;
             border-radius: 3px;
             text-align: center;
             line-height: .7rem;
-            margin-right: .05rem;
+            margin-right: .02rem;
             margin-bottom: 0.2rem;
         }
         .app-layout-header{
@@ -190,7 +190,7 @@
         </div>
 
     </div>
-    <script src="/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script>
 
             function hasActive(){
@@ -210,7 +210,6 @@
                         arr.unshift()
                     }
                 })
-                console.log(arr)
             }
             hasActive()
 

src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html

@@ -55,6 +55,16 @@
         margin-top: 0!important;
         border-top: 1px solid #e0e0e0;
     }
+    .keyWord .addKeyWord {
+        width:0;
+        position: fixed;
+        left: 44%;
+        top: 85%;
+        text-align: center;
+    }
+    .ios-user-select{
+        -webket-user-select: text;
+    }
 </style>
 <body>
     <div class="app-layout-header">
@@ -93,13 +103,12 @@
 
         </div>
 
-        <div class="addKeyWord">
-            <i class="iconfont icon-tianjia"></i>
-        </div>
-
         <div class="problem">
             疑问解答 <i class="iconfont icon-wenhao"></i>
         </div>
+        <div class="addKeyWord">
+            <i class="iconfont icon-tianjia"></i>
+        </div>
 
         <!-- 疑难问题弹窗 -->
         <div class="problemPop">
@@ -107,16 +116,19 @@
                 <h3>疑问解答</h3>
                 <ul>
                     <li>
-                    	<h4>·关键词</h4>
-                    	<p>目标信息中的关键性词语，如“软件系统”</p>
+                        <p>例：某公司主营业务为软件系统开发</p>
+                    </li>
+                    <li>
+                        <h4>关键词:</h4>
+                        <p>目标信息中的关键性词语，如“软件系统”</p>
                     </li>
                     <li>
-                    	<h4>·附加词</h4>
-                    	<p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+                        <h4>附加词:</h4>
+                        <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
                     </li>
                     <li>
-                    	<h4>·排除词</h4>
-                    	<p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+                        <h4>排除词:</h4>
+                        <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
                     </li>
                 </ul>
                 <button class="knowBtn">我知道了</button>
@@ -154,7 +166,7 @@
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
                                 <button class="addAdjunctWord">编辑 附加词</button>
                                 <button class="addExclusion">添加 排除词</button>
                                 <button class="deleteKey">删除</button>
@@ -178,7 +190,7 @@
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
                                 <button class="addAdjunctWord">编辑 附加词</button>
                                 <button class="addExclusion">添加 排除词</button>
                                 <button class="deleteKey">删除</button>
@@ -206,7 +218,7 @@
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
                                 <button class="addAdjunctWord">编辑 附加词</button>
                                 <button class="addExclusion">添加 排除词</button>
                                 <button class="deleteKey">删除</button>
@@ -226,7 +238,7 @@
                                 <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
                             <div class="modify">
-                                <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
                                 <button class="addAdjunctWord">编辑 附加词</button>
                                 <button class="addExclusion">添加 排除词</button>
                                 <button class="deleteKey">删除</button>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html

@@ -77,15 +77,18 @@
             <h3>疑问解答</h3>
             <ul>
                 <li>
-                    <h4>·关键词</h4>
+                    <p>例：某公司主营业务为软件系统开发</p>
+                </li>
+                <li>
+                    <h4>关键词:</h4>
                     <p>目标信息中的关键性词语，如“软件系统”</p>
                 </li>
                 <li>
-                    <h4>·附加词</h4>
+                    <h4>附加词:</h4>
                     <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
                 </li>
                 <li>
-                    <h4>·排除词</h4>
+                    <h4>排除词:</h4>
                     <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
                 </li>
             </ul>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_payOrder.html

@@ -1,7 +1,7 @@
 <html>
 	<head>
 		{{include "/common/meta.html"}}
-		<title>支付订单</title>
+		<title>数据导出</title>
 		<script src="{{Msg "seo" "cdn"}}/jyapp/js/rem.js"></script>
 		<link href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" rel="stylesheet">
 		<link href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" rel="stylesheet">
@@ -155,8 +155,8 @@
                 </label>
             </div>
             <div class="price">
-                <span class="pay_before">原价：￥20,000</span>
-                <strong class="pay_discount">￥16,300</strong>
+                <span class="pay_before"></span>
+                <strong class="pay_discount"></strong>
             </div>
             <div class="form-btn">
                 <button class="btn prew dataPreview">预览数据</button>
@@ -172,11 +172,11 @@
                     <ul class="info">
                         <li>
                             <label>·标准字段包</label>
-                            <p>公告标题、公告内容、剑鱼地址、省份城市、发布时间、项目名称、采购单位中标单位、中标价、币种、公告类别</p>
+                            <p>公告标题、公告内容、剑鱼标讯地址、省份城市、发布时间、项目名称、采购单位、中标单位、中标价、币种、公告类别</p>
                         </li>
                         <li>
                             <label>·高级字段包</label>
-                            <p>公告标题、公告内容、公告地址、剑鱼地址、省份、城市、发布时间、项目名称、项目编号、采购单位、采购单位联系人、采购单位联系电话、预算、开标日期、中标单位、中标单位联系方式、中标价、招标机构、项目范围、币种、公告类别</p>
+                            <p>公告标题、公告内容、公告地址、剑鱼标讯地址、省份、城市、发布时间、项目名称、项目编号、采购单位、采购单位联系人、采购单位联系电话、预算、开标日期、中标单位、中标价、招标机构、项目范围、币种、公告类别</p>
                         </li>
                     </ul>
                 </div>
@@ -279,9 +279,22 @@
 				$(".pay_discount").text("￥" + shouldPay);
 				$(".pay_before").text("￥" + beforePay)
 			}
-			$(function() {
+			$(function() {            	
+				if(sessionStorage.index=="1"){
+            		$(".choose .choose-item").eq(sessionStorage.index).addClass("active").siblings().removeClass("active");
+            		dataType=2;
+            	}
 				ChangePayMoney();
-
+				//缓存判断是否点击我已阅读
+				if(sessionStorage.readClause=="true"){
+					readClause=true;
+					sessionStorage.readClause="true";
+					$(".toPay").removeAttr("disabled");
+				}
+				//全部高度-main高度
+				var height_bottom=document.body.scrollHeight-$(".main").height()
+				height_bottom=height_bottom+"px"
+				$("#bottombox").css("margin-top",height_bottom)
 				if (sessionStorage.getItem("order_email" + {{.T._id}}) != null) {
 					$(".email_check_ok").show();
 					$(".email_input").val(sessionStorage.getItem("order_email" + {{.T._id}}));
@@ -343,6 +356,7 @@
 						} else if (index == 1) {
 							dataType = 2;
 						}
+						sessionStorage.index=index;
 						ChangePayMoney();
 					})
 				})
@@ -394,7 +408,7 @@
 					}
 				}).blur(function() {
 					var phone_input = $(this).val().replace(/\s*/g, "");
-					if (phone_input.length != 11) {
+					if (phone_input.length != 11&&phone_input.length!=0) {
 						$(".phone_err_msg").show();
 						$(".phone_check_ok").hide();
 						finishPhoneVerity = false;
@@ -443,11 +457,14 @@
 					}
 				}).blur(function() {
 					var email = $(".email_input").val().replace(/\s*/g, "");
-					if (!/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email)) {
+					if (!/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email)&&( $(".email_input").val().length!=0)) {
 						$(".email_err_msg").show();
 						$(".email_check_ok").hide();
 						return
 					}
+					if($(".email_input").val()==email){
+						return;
+					}
 					$("#sendCode").removeAttr("disabled");
 					$(".email_check_ok").hide();
 					$(".email_err_msg").hide();
@@ -522,11 +539,13 @@
 				$(".fixed-bottom-box .weui-check").on("click", function() {
 					if ($(this).is(":checked")) {
 						readClause = true;
+						sessionStorage.readClause="true";
 						if (finishEmailVerity && finishPhoneVerity) {
 							$(".toPay").removeAttr("disabled")
 						}
 					} else {
 						readClause = false;
+						sessionStorage.readClause="false";
 						$(".toPay").attr("disabled", "disabled");
 					}
 				})
@@ -545,7 +564,11 @@
 				$(".toPay").on("click", function() {
 					if (!finishEmailVerity || !readClause || !canpay || !finishPhoneVerity) {
 						return
-					}
+					}else{
+				      //清除我已阅读缓存
+				      sessionStorage.removeItem("readClause");
+					  sessionStorage.removeItem("index");
+				     }
 					$(".loading_").show();
 					canpay = false;
 					var param = {};

src/jfw/modules/app/src/web/templates/dataExport/dataExport_price.html

@@ -106,10 +106,10 @@
             }else{
                 var min = $("#min").val();
                 var max = $("#max").val();
-			    //金额判断
-				if ((parseInt(min)>parseInt(max))||parseInt(min)==parseInt(max)){
-					return
-				}
+//			    //金额判断
+//				if ((parseInt(min)>parseInt(max))||parseInt(min)==parseInt(max)){
+//					return
+//				}
                 var price = min+"万元-"+max+"万元";
                 localStorage.setItem("price", price);
             }
@@ -159,6 +159,96 @@
         $(".app-back").on("click", function () {
             history.back();
         });
+        
+         var reg = /^[\u4e00-\u9fa5]+$/;
+     var maxnum = "";
+	//金额大小互换
+	$("#max").on("blur",function(){
+		var max=$("#max").val(),min=$("#min").val();
+	        if(Number(max)<Number(min)&&max!=""&&min!=""){
+	            $("#max").val(min);
+	            $("#min").val(max);
+	            minnum = max;
+	            maxnum = min;
+	        }
+	}).on("input propertychange",function(){	//最大金额两位小数限制
+		var oldvalue = $(this).val();
+	        var maxp = $.trim($(this).val()).replace(/\s/g,"");
+			if(oldvalue != maxp){
+		        $(this).val(maxp);
+			}
+	        if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(maxp)){
+	            if((reg.test(maxp)||isNaN(maxp)||maxp.indexOf("e")>0)&&maxp.indexOf(".")<0){
+	                $(this).val(maxnum);
+	            }else{
+	                if(reg.test(maxp)||isNaN(maxp)||maxp.indexOf("e")>0){
+	                    $(this).val(maxnum);
+	                }else{
+	                    if(maxp.indexOf(".")>0){
+	                        var offront = maxp.split(".")[0];
+	                        var ofafter = maxp.split(".")[1];
+	                        if(offront.length>9||ofafter.length>2){
+	                            $(this).val(maxnum);
+	                        }else{
+	                            maxnum = maxp;
+	                        }
+	                    }else{
+	                        if(maxp.length>9){
+	                            $(this).val(maxnum);
+	                        }else{
+	                            maxnum = maxp;
+	                        }
+	                    }
+	                }
+	            }
+	        }else{
+	            maxnum = maxp;
+	        }
+	})
+	
+    var minnum = "";
+	$("#min").on("blur",function(){
+		var max=$("#max").val(),min=$("#min").val();
+	        if(Number(max)<Number(min)&&max!=""&&min!=""){
+	            $("#max").val(min);
+	            $("#min").val(max);
+	            minnum = max;
+	            maxnum = min;
+	        }
+	}).on("input propertychange",function(){
+			var oldvalue = $(this).val();
+	        var minp = $.trim($(this).val()).replace(/\s/g,"");
+			if(oldvalue != minp){
+		        $(this).val(minp);
+			}
+	        if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
+	            if((reg.test(minp)||isNaN(minp)||minp.indexOf("e")>0)&&minp.indexOf(".")<0){
+	                $(this).val(minnum);
+	            }else{
+	                if(reg.test(minp)||isNaN(minp)||minp.indexOf("e")>0){
+	                    $(this).val(minnum);
+	                }else{
+	                    if(minp.indexOf(".")>0){
+	                        var offront = minp.split(".")[0];
+	                        var ofafter = minp.split(".")[1];
+	                        if(offront.length>9||ofafter.length>2){
+	                            $(this).val(minnum);
+	                        }else{
+	                            minnum = minp;
+	                        }
+	                    }else{
+	                        if(minp.length>9){
+	                            $(this).val(minnum);
+	                        }else{
+	                            minnum = minp;
+	                        }
+	                    }
+	                }
+	            }
+	        }else{
+	            minnum = minp;
+	        }
+	})
     })
 </script>
 <!--百度统计end-->

src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="/jyapp/dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-	<link rel="stylesheet" href="/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}3">
+	<link rel="stylesheet" href="/jyapp/dataExport/css/keyWord.css?v={{Msg "seo" "version"}}6">
 	<script src="/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 	<script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
@@ -52,6 +52,9 @@
 			/*top: 100%;*/
 			text-align: center;
 		}
+		.ios-user-select{
+			-webket-user-select: text;
+		}
 	</style>
 	<body>
 	<div class="app-layout-header">
@@ -100,7 +103,7 @@
 								<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
 							</div>
 							<div class="modify">
-								<span contentEditable="true">${ winner[i] }</span>
+								<span class="ios-user-select" contentEditable="true">${ winner[i] }</span>
 								<button class="deleteKey">删除</button>
 								<button class="ascertainKey">确定</button>
 							</div>
@@ -133,8 +136,6 @@
 
 			// 添加按钮
 			$(".addKeyWord i").on('click',function(){
-				$(".addkeyWord").show();
-				$(".showKeyWord").hide();
 				window.location.href="/jyapp/front/dataExport/winnerInput";
 			});
 
@@ -200,6 +201,7 @@
 				$('.modify span').each(function(item){
 					$('.modify span')[0].contentEditable = true
 				});
+				keepLastIndex(e.target)
 				// console.log($(this).parent().siblings().find('span').text())
 				$(this).parent().hide();
 				$(this).parent().siblings().css('display','block')
@@ -277,6 +279,20 @@
 			$(".app-back").on("click", function () {
 				history.back();
 			});
+			function keepLastIndex(obj) {
+				if (window.getSelection) {//ie11 10 9 ff safari
+					obj.focus(); //解决ff不获取焦点无法定位问题
+					var range = window.getSelection();//创建range
+					range.selectAllChildren(obj);//range 选择obj下所有子内容
+					range.collapseToEnd();//光标移至最后
+				}
+				else if (document.selection) {//ie10 9 8 7 6 5
+					var range = document.selection.createRange();//创建选择对象
+					range.moveToElementText(obj);//range定位到obj
+					range.collapse(false);//光标移至最后
+					range.select();
+				}
+			}
 		})
 
 	</script>

src/jfw/modules/app/src/web/templates/me/login.html

@@ -285,7 +285,7 @@
 		}
 		function loginByWeixinCallBack222(){
 			//var wxSign = "D00THAAVRlVFXBkKUlRUQQMHBwFGWUNXSVZdQFRbHQtSVEcbUWhUdEQFEwsjTHliRFswBAcIXBFVZAVXPyZITElWQFlVF05NQVlUTQUGV1RMDkgPVRAHVVIBEU1cTBYdVV4TD1YNEl5VEVcBVABFWhILBBcHVgkEElkRWlxCBVQAABBbRExJVkZJQVBWVUAT";
-			var wxSign="D00THAAVRlVFXBkKUlRUQQQEBwdGXUJeSVZdQFRbHQtSVEdWHhJERhEdGQpHThAFVQQWXUUPAxIGVQUMTF4RCF0QVABTV01NXEwXHVYSCxdFXEBYUBJUUQVQQF4VDFBEC1MBF1hNAwcCGhAKE1ZFVxINBEcBUlIAElgUWwQQUVJVBUNYFgtUF1AJUFYRTVxMEQ1CVRMPRhI=";
+			var wxSign="D00THAAVRlVFXBkKUlRUQQQICAFDXUdYSVZdQFRbHQtSVEdWHhJERhEdGQpHThAFUlASXEZaABELBgVTQFxHXwYXBVICVkdNXEwXHVYSCxdFV0BZVBVWUwEGRl0VCFNNV1VSF1hNAwcCGhAKEwNFDUJaAxEFAwBREg0VDQBHBAkHVk1eEg8ATAFSAwZETVxMEQ1CVRMPRBI=";
       		$.ajax({
 				url: "/jyapp/free/login",
 				type: "post",

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -459,6 +459,7 @@
 									<button class="btn">单一</button>
 									<button class="btn">竞价</button>
 									<button class="btn">变更</button>
+									<button class="btn">其它</button>
 								</li>
 								<li>
 									<div id="dqbtn" style="width:81px;" data-value="结果">招标结果</div>
@@ -472,7 +473,6 @@
 									<button class="btn">合同</button>
 									<button class="btn">验收</button>
 									<button class="btn">违规</button>
-									<button class="btn">其它</button>
 								</li>
 							</ul>
 						</div>

src/web/staticres/wx_dataExport/css/base.css

@@ -8,17 +8,17 @@ body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fiel
     padding: 0;
 }
 html,body {
-    /* max-width: 750px; */
-/*    -webkit-text-size-adjust: 100%;*/
+     max-width: 750px;
+    -webkit-text-size-adjust: 100%;
     margin: 0 auto;
-/*    height: 100%;*/
-/*    overflow-x: hidden;*/
-/*    -webkit-box-sizing: border-box;
+    height: 100%;
+    overflow-x: hidden;
+    -webkit-box-sizing: border-box;
     box-sizing: border-box;
     font-size: .24rem;
     background:rgba(245,244,249,1);;
-    color: #3d3d3d;*/
-/*    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;*/
+    color: #3d3d3d;
+    font-family:  "Microsoft YaHei","Helvetica Neue", "Roboto", "Segoe UI", "PingFang SC", "Hiragino Sans GB", sans-serif;
 }
 
 ul,ol {

src/web/staticres/wx_dataExport/css/choose_area.css

@@ -1,3 +1,4 @@
+@charset "UTF-8";
 .main {
   width: 100%;
   overflow: scroll;
@@ -7,75 +8,335 @@
   display: none;
 }
 
-#choose_area .btn {
-  position: fixed;
+.layout_top-bottom {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  height: 100%;
+}
+
+.layout_top-bottom .layou_top {
+  flex: 1;
+  overflow: scroll;
+}
+
+.bottom_button {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
   width: 100%;
   height: .94rem;
-  bottom: 0;
+}
+
+.bottom_button .left_btn,
+.bottom_button .right_btn {
+  flex: 1;
+  height: 100%;
+  font-size: .34rem;
+}
+
+.bottom_button .left_btn {
+  color: #2cb7ca;
+  background-color: #fff;
+  border-top: 1px solid #e0e0e0;
+}
+
+.bottom_button .right_btn {
+  color: #fff;
+  background-color: #2cb7ca;
+  border-top: 1px solid #2cb7ca;
+}
+
+.bottom_button button[disabled] {
+  opacity: .5;
+}
+
+.jy_icon {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+.jy_icon.decrease:before,
+.jy_icon.increase:before,
+.jy_icon.increase:after {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  content: '';
+  width: 0.4rem;
+  height: 0.04rem;
+  background-color: #686868;
+  transform: translate(-50%, -50%);
+}
+
+.jy_icon.increase:after {
+  transform: translate(-50%, -50%) rotate(90deg);
+}
+
+/*禁止长按复制 加给body*/
+.no-touch {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+/* 弹性盒子布局 */
+.flex_alginC {
+  display: flex;
+  align-items: center;
+}
+
+.flex_alginC_justB {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.flex_alginC_justC {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.flex_column {
+  display: flex;
+  flex-direction: column;
+}
+
+.flex_column_alignC {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+/* 自定义弹窗*/
+@-webkit-keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes c {
+  0% {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+
+.custom-dialog .weui-animate-fade-in {
+  -webkit-animation: c ease 0s forwards;
+  animation: c ease 0s forwards;
+}
+
+@-webkit-keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+@keyframes d {
+  0% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.custom-dialog .weui-animate-fade-out {
+  -webkit-animation: d ease 0s forwards;
+  animation: d ease 0s forwards;
+}
+
+.custom-dialog .weui-dialog__hd {
+  background: #F5F4F9;
+  padding: .17rem 0;
+  color: #000;
+  font-size: .34rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__bd {
+  padding: .37rem 0;
+  color: #1D1D1D;
+  font-size: .32rem;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__ft:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__btn:after {
+  border: 0;
+}
+
+.custom-dialog .weui-dialog__ft {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding-bottom: .38rem;
+  box-sizing: border-box;
+  text-align: center;
+}
+
+.custom-dialog .weui-dialog__btn {
+  display: block;
+  width: 1.72rem;
+  height: .72rem;
+  line-height: .72rem;
+  color: #fff;
+  padding: 0;
+  flex: none;
+  text-align: center;
+  border-radius: 3px;
+}
+
+.custom-dialog .weui-dialog__btn_primary {
+  background-color: #2CB7CA;
+  margin-right: 1rem;
+}
+
+.custom-dialog .weui-dialog__btn_default {
+  background-color: #BFBFC3;
+}
+
+/* 自定义switch按钮 */
+.custom-switch {
+  position: relative;
+  width: 52px;
+  height: 32px;
+  border: 1px solid #dfdfdf;
+  outline: 0;
+  border-radius: 16px;
+  box-sizing: border-box;
+  background-color: #dfdfdf;
+  -webkit-transition: background-color .1s,border .1s;
+  transition: background-color .1s,border .1s;
+  -webkit-appearance: none;
+}
+
+.custom-switch:before {
+  content: " ";
+  position: absolute;
+  top: 0;
   left: 0;
-  right: 0;
+  width: 50px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fdfdfd;
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+  transition: transform 0.35s cubic-bezier(0.45, 1, 0.4, 1), -webkit-transform 0.35s cubic-bezier(0.45, 1, 0.4, 1);
+}
+
+.custom-switch:after {
+  content: " ";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 30px;
+  height: 30px;
+  border-radius: 15px;
+  background-color: #fff;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+  -webkit-transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+  transition: transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35), -webkit-transform 0.35s cubic-bezier(0.4, 0.4, 0.25, 1.35);
+}
+
+.custom-switch.checked {
+  border-color: #04be02;
+  background-color: #04be02;
+}
+
+.custom-switch.checked:before {
+  transform: scale(0);
+}
+
+.custom-switch.checked:after {
+  transform: translateX(20px);
+}
+
+#choose_area {
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  overflow: hidden;
+  height: 100%;
+}
+
+#choose_area .form {
+  flex: 1;
+  overflow-y: scroll;
+}
+
+#choose_area .btn {
+  width: 100%;
+  height: .94rem;
   line-height: .94rem;
   color: #fff;
   font-size: .34rem;
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
-}
-#choose_area .btn .save-btn, #choose_area .btn .reset-btn {
-  -webkit-box-flex: 1;
-      -ms-flex: 1;
-          flex: 1;
+  align-items: center;
+  justify-content: space-between;
+}
+
+#choose_area .btn .save-btn,
+#choose_area .btn .reset-btn {
+  flex: 1;
   width: 50%;
   text-align: center;
   height: 100%;
   font-size: .34rem;
 }
+
 #choose_area .btn .reset-btn {
   background: #fff;
   color: #2cb7ca;
 }
+
 #choose_area .btn .save-btn {
   background: #2cb7ca;
   color: #fff;
 }
-#choose_area .main .result {
+
+#choose_area .result {
   padding: .2rem .3rem;
   font-size: .26rem;
 }
-#choose_area .main .select-area-box {
-  padding-bottom: .94rem;
-}
-#choose_area .main .select-area-box .tab {
-  display: -webkit-box;
-  display: -ms-flexbox;
+
+#choose_area .select-area-box .tab {
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
+  align-items: center;
+  justify-content: space-between;
   color: #1d1d1d;
   background: #fff;
   font-size: .3rem;
-  padding: 0.2rem 0.5rem;
+  padding: .2rem .5rem;
   border-bottom: 0.5px solid #e0e0e0;
 }
-#choose_area .main .select-area-box .tab .province {
-  display: -webkit-box;
-  display: -ms-flexbox;
+
+#choose_area .select-area-box .tab .province {
   display: flex;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  align-items: center;
 }
-#choose_area .main .select-area-box .tab .province .checkbox {
+
+#choose_area .select-area-box .tab .province .checkbox {
   width: .4rem;
   height: .4rem;
   border: 1px solid #ddd;
@@ -84,38 +345,62 @@
   -webkit-appearance: none;
   background: #fff;
 }
-#choose_area .main .select-area-box .tab .province .checkbox:checked {
+
+#choose_area .select-area-box .tab .province .checkbox:checked {
   border: 0;
   background: url(/wx_dataExport/images/xuanzhong.png) no-repeat center center;
   background-size: 100% 100%;
 }
-#choose_area .main .select-area-box label::after {
+
+#choose_area .select-area-box .tab .province .checkbox[disabled] {
+  border: 0;
+  background: url(../image/active_disabled.png) no-repeat center center;
+  background-size: 100% 100%;
+}
+
+#choose_area .select-area-box label::after {
   font-size: 14px;
   float: right;
   margin-right: 15px;
 }
-#choose_area .main .select-area-box .tab_content {
+
+#choose_area .select-area-box .tab_content {
   display: none;
   font-size: .28rem;
   padding: .1rem .3rem;
   text-align: center;
 }
-#choose_area .main .select-area-box .tab_content .city {
+
+#choose_area .select-area-box .tab_content .city {
   float: left;
   padding: .1rem .2rem;
   background: #fff;
-  margin: .1rem;
+  margin: .1rem 0 .1rem .1rem;
+  border-radius: 0.04rem;
 }
-#choose_area .main .select-area-box .tab_content .active {
+
+#choose_area .select-area-box .tab_content .active {
   background: #2cb7ca;
   color: #fff;
 }
-#choose_area .main .select-area-box .index {
+
+#choose_area .select-area-box .tab_content .active[disabled] {
+  background: #BFBFC3;
+  color: #fff;
+}
+
+#choose_area .select-area-box .tab_content .city[disabled] {
+  background: #BFBFC3;
+  color: #fff;
+}
+
+#choose_area .select-area-box .index {
   padding: .3rem .3rem .1rem .3rem;
   font-size: .32rem;
 }
-#choose_area .main .slide {
-  background:transparent;
+
+#choose_area .slide {
+  background: transparent;
   position: fixed;
   right: 0;
   top: 50%;
@@ -123,23 +408,15 @@
   width: .4rem;
   font-size: .26rem;
   text-align: center;
-  display: -webkit-box;
-  display: -ms-flexbox;
   display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: column;
-          flex-direction: column;
-  -webkit-box-pack: center;
-      -ms-flex-pack: center;
-          justify-content: center;
+  flex-direction: column;
+  justify-content: center;
   padding: .1rem 0;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
+  align-items: center;
   margin-top: -4.25rem;
   z-index: 9999;
 }
-#choose_area .main .slide a {
+
+#choose_area .slide a {
   margin-bottom: .1rem;
 }

src/web/staticres/wx_dataExport/css/keyWord.css

@@ -5,6 +5,7 @@
   line-height: .48rem;
 }
 .keyWord .enter .enterOne {
+  display: block;
   min-height: 0.94rem;
   width: 100%;
   padding: 0 0.3rem;
@@ -72,11 +73,11 @@
   padding: 0 .3rem;
 }
 .keyWord .showKeyWord ul li .one div span strong {
-  font-size: 14px;
+  font-size: 0.3rem;
   color: #1d1d1d;
   font-weight: normal;
   display: block;
-  width: 1.2rem;
+  width: 1.3rem;
 }
 .keyWord .showKeyWord ul li .one div span p {
   -webkit-box-flex: 1;
@@ -154,9 +155,11 @@
   float: right;
   margin-right: 0.3rem;
 }
+
 .keyWord .problem i {
   margin-left: .06rem;
 }
+
 .keyWord .problemPop {
   background: rgba(0, 0, 0, 0.5);
   position: fixed;
@@ -165,13 +168,10 @@
   top: 0;
   left: 0;
   display: none;
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-pack: center;
-      -ms-flex-pack: center;
-          justify-content: center;
+  align-items: center;
+  justify-content: center;
 }
+
 .keyWord .problemPop .problemPopContent {
   width: 5.6rem;
   min-height: 7.23rem;
@@ -181,32 +181,39 @@
   position: relative;
   padding: 0.58rem 0;
 }
+
 .keyWord .problemPop .problemPopContent h3 {
   font-size: .34rem;
   text-align: center;
+  padding-bottom: 0.2rem;
 }
+
 .keyWord .problemPop .problemPopContent ul {
   padding: 0 .4rem;
 }
+
 .keyWord .problemPop .problemPopContent ul li {
-  margin-top: 0.2rem;
+  margin-top: 0.16rem;
 }
+
 .keyWord .problemPop .problemPopContent ul li h4 {
   font-size: .3rem;
-  line-height: .5rem;
+  line-height: 1.5;
   color: #1d1d1d;
 }
+
 .keyWord .problemPop .problemPopContent ul li p {
   font-size: .28rem;
   color: #868686;
-  line-height: 0.4rem;
+  line-height: 1.4;
 }
+
 .keyWord .problemPop .problemPopContent button {
   width: 100%;
   background: #fff;
   border-top: 1px solid #E0E0E0;
   position: absolute;
-  bottom: 5px;
+  bottom: 0;
   height: 1rem;
   font-size: .36rem;
   color: #2cb7ca;

src/web/staticres/wx_dataExport/css/pay_order.css

@@ -8,7 +8,7 @@
 }
 
 #pay_order {
-  padding-bottom: 2.7rem;
+ /* padding-bottom: 2.7rem;*/
     font-size: .24rem !important;
 	background: rgba(245,244,249,1);
 }
@@ -212,8 +212,9 @@
   display: flex;
 }
 #pay_order .main .form .form-item .form-control .input input[type='text'] {
-/*  height: 100%;*/
-      width: 3.5rem;
+/*  height: 100%;
+      width: 3.5rem;*/
+     width: 6.8rem;
 	padding: .2rem .1rem;
     margin-top: .05rem;
 }
@@ -247,7 +248,7 @@ position: absolute;
   padding: 0 .3rem;
 }
 #pay_order .main .form .form-item .way span:nth-child(1) {
-  color: #888;
+  /*color: #888;*/
 }
 #pay_order .main .form .form-item .way .way-right {
   display: -webkit-box;
@@ -258,7 +259,7 @@ position: absolute;
           align-items: center;
 }
 #pay_order .main .form .form-item .way .way-right span {
-  color: #1d1d1d;
+  color: #888;
   padding-right: .1rem;
 }
 #pay_order .main .form .form-item .way .way-right .icon-right {
@@ -282,7 +283,7 @@ position: absolute;
 letter-spacing: 0.02rem;
 }
 #pay_order .main .form .fixed-bottom-box {
-  position: fixed;
+  /*position: fixed;*/
   bottom: 0;
   left: 0;
   right: 0;
@@ -463,7 +464,8 @@ letter-spacing: 0.02rem;
 	height: 0.88rem;
 }
 #pay_order #email-input input{
-	width:4rem;
+	/*width:4rem;*/
+	width:6.8rem;
 }
 #pay_order #codeinput{
 	    padding: 0 .2rem;

src/web/staticres/wx_dataExport/js/additionWord.js

@@ -23,8 +23,6 @@ $(function(){
     
     // 添加按钮
     $(".addKeyWord i").on('click',function(){
-        $(".addkeyWord").show();
-        $(".showKeyWord").hide();
         window.location.href="/front/wx_dataExport/buyerInput";
     });
 
@@ -90,9 +88,11 @@ $(function(){
         $('.modify span').each(function(item){
             $('.modify span')[0].contentEditable = true
         })
+        keepLastIndex(e.target)
         // console.log($(this).parent().siblings().find('span').text())
         $(this).parent().hide()
         $(this).parent().siblings().css('display','block')
+        $(".addKeyWord").hide()
     })
 
     // 编辑 删除
@@ -101,6 +101,7 @@ $(function(){
         buyerArr.splice($.inArray(buyer, buyerArr),1);
         localStorage.buyer = buyerArr.toString();
         $(this).parents('li').remove();
+        $(".addKeyWord").show();
         hasWords()
         // console.log('删除附加词:',$(this).parent().find('span').text())
     })
@@ -137,7 +138,7 @@ $(function(){
             $(this).parent().siblings().find('.key').text(keyWord)
             $(this).parent().hide().siblings().show()
         }
-
+        $(".addKeyWord").show();
     })
 
     //去空格方法
@@ -164,4 +165,18 @@ $(function(){
     $(".close").on("click", function () {
         history.back();
     })
+    function keepLastIndex(obj) {
+        if (window.getSelection) {//ie11 10 9 ff safari
+            obj.focus(); //解决ff不获取焦点无法定位问题
+            var range = window.getSelection();//创建range
+            range.selectAllChildren(obj);//range 选择obj下所有子内容
+            range.collapseToEnd();//光标移至最后
+        }
+        else if (document.selection) {//ie10 9 8 7 6 5
+            var range = document.selection.createRange();//创建选择对象
+            range.moveToElementText(obj);//range定位到obj
+            range.collapse(false);//光标移至最后
+            range.select();
+        }
+    }
 });

src/web/staticres/wx_dataExport/js/keyWord.js

@@ -112,6 +112,7 @@ $(function(){
         $('.modify span').each(function(item){
             $('.modify span')[0].contentEditable = true
         });
+        keepLastIndex(e.target);
         var keyWord = $(this).prev().children().find(".key").text();
         for(var i in keyWordArr){
             if(keyWordArr[i].keyWord === keyWord){
@@ -142,7 +143,8 @@ $(function(){
             }
         }
         $(this).parent().hide();
-        $(this).parent().siblings().css('display','block')
+        $(this).parent().siblings().css('display','block');
+        $(".addKeyWord").hide();
     });
 
     // 编辑删除
@@ -162,6 +164,7 @@ $(function(){
                     keyWordArr = keyWordArr.filter((e=>{return e.keyWord!==keyWord}));
                     localStorage.keyWord = JSON.stringify(keyWordArr);
                     jQueryDOM.remove();
+                    $(".addKeyWord").show();
                     hasWords()
                 }
             }]
@@ -203,6 +206,7 @@ $(function(){
             $this.parent().siblings().find('.key').text(keyWord)
             $this.parent().hide().siblings().show()
         }
+        $(".addKeyWord").show();
     })
 
     //去空格方法
@@ -228,9 +232,19 @@ $(function(){
         }
     })
 
-    // $(".addExclusion").on('click',function(){
-    //     $('.exclusion').show();
-    //     $('.showKeyWord').hide();
-    // })
+    function keepLastIndex(obj) {
+        if (window.getSelection) {//ie11 10 9 ff safari
+            obj.focus(); //解决ff不获取焦点无法定位问题
+            var range = window.getSelection();//创建range
+            range.selectAllChildren(obj);//range 选择obj下所有子内容
+            range.collapseToEnd();//光标移至最后
+        }
+        else if (document.selection) {//ie10 9 8 7 6 5
+            var range = document.selection.createRange();//创建选择对象
+            range.moveToElementText(obj);//range定位到obj
+            range.collapse(false);//光标移至最后
+            range.select();
+        }
+    }
     
 })

src/web/staticres/wx_dataExport/js/mapJSON.js

@@ -1555,12 +1555,6 @@ var chinaMapJSON = [{
     "ProID": 20,
     "CitySort": 272,
     "area": ['其他']
-  }, {
-    "CityID": 273,
-    "name": "三沙市",
-    "ProID": 20,
-    "CitySort": 273,
-    "area": ['其他']
   }]
 }, {
   "ProID": 21,
@@ -1881,7 +1875,7 @@ var chinaMapJSON = [{
     "area": ['其他']
   }, {
     "CityID": 344,
-    "name": "吐鲁番市",
+    "name": "吐鲁番地区",
     "ProID": 24,
     "CitySort": 344,
     "area": ["吐鲁番市", "鄯善县", "托克逊县"]
@@ -1941,7 +1935,7 @@ var chinaMapJSON = [{
     "area": ["城东区", "城中区", "城西区", "城北区", "大通回族土族自治县", "湟中县", "湟源县"]
   }, {
     "CityID": 291,
-    "name": "海东市",
+    "name": "海东地区",
     "ProID": 25,
     "CitySort": 291,
     "area": ["平安县", "民和回族土族自治县", "乐都县", "互助土族自治县", "化隆回族自治县", "循化撒拉族自治县"]
@@ -2193,13 +2187,13 @@ var chinaMapJSON = [{
     "area": ["凯里市", "黄平县", "施秉县", "三穗县", "镇远县", "岑巩县", "天柱县", "锦屏县", "剑河县", "台江县", "黎平县", "榕江县", "从江县", "雷山县", "麻江县", "丹寨县"]
   }, {
     "CityID": 251,
-    "name": "铜仁市",
+    "name": "铜仁地区",
     "ProID": 29,
     "CitySort": 251,
     "area": ["铜仁市", "江口县", "玉屏侗族自治县", "石阡县", "思南县", "印江土家族苗族自治县", "德江县", "沿河土家族自治县", "松桃苗族自治县", "万山特区"]
   }, {
     "CityID": 252,
-    "name": "毕节市",
+    "name": "毕节地区",
     "ProID": 29,
     "CitySort": 252,
     "area": ["毕节市", "大方县", "黔西县", "金沙县", "织金县", "纳雍县", "威宁彝族回族苗族自治县", "赫章县"]

src/web/templates/weixin/dataExport/404.html

@@ -2,7 +2,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
-		<title>404</title>
+		<title>数据导出</title>
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}"/>
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/no_result.css?v={{Msg "seo" "version"}}">

src/web/templates/weixin/dataExport/dataExport.html

@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
     <title>数据导出</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
@@ -219,6 +220,12 @@
 <script>
     initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
     $(function(){
+        //
+        $(window).bind("pageshow", function(event){
+            if(event.originalEvent.persisted){
+                window.location.reload();
+            }
+        });
         //筛选日期选中
         $(".chooseTime ul li").click(function(){
             $(".chooseTime ul li").removeClass('active');
@@ -227,8 +234,10 @@
             $("#starttime").removeClass("timeSelect");
             $("#endtime").removeClass("timeSelect");
             $(".dateMake").css({"color":"#888"});
-            $("#starttime").val("");
-            $("#endtime").val("");
+
+            //
+            // localStorage.removeItem("export_starttime");
+            // localStorage.removeItem("export_endtime");
         });
 
         //筛选日期自动更新
@@ -306,15 +315,16 @@
                     }
                     startFlag =false;
                 }
-                if (startFlag){
+                // if (startFlag){
                     $("#starttime").addClass("timeSelect");
                     $("#endtime").addClass("timeSelect");
                     $(".dateMake").css({"color":"#24C0D7"});
                     $(".chooseTime ul li").removeClass('active');
-                }
+                // }
                 //
                 $(".confirm").hide();
                 $(".resetOne").show();
+                localStorage.removeItem("date");
             },
             onClear: function (inst) {
                 localStorage.removeItem("export_starttime");
@@ -377,15 +387,16 @@
                     }
                     endFlag =false;
                 }
-                if (endFlag){
+                // if (endFlag){
                     $("#starttime").addClass("timeSelect");
                     $("#endtime").addClass("timeSelect");
                     $(".dateMake").css({"color":"#24C0D7"});
                     $(".chooseTime ul li").removeClass('active');
-                }
+                // }
                 //
                 $(".confirm").hide();
                 $(".resetOne").show();
+                localStorage.removeItem("date");
             },
             onClear: function (inst) {
                 localStorage.removeItem("export_endtime");
@@ -554,6 +565,7 @@
             $(".confirm").hide();
             $(".resetOne").show();
         }
+        //
 
         //筛选条件发送
         $(".saveData").on('click', function () {

src/web/templates/weixin/dataExport/dataExport_appended.html

@@ -21,6 +21,16 @@
     body{
         background: rgba(245,244,249,1);
     }
+    .keyWord .addKeyWord {
+        width:0;
+        position: fixed;
+        left: 44%;
+        top: 85%;
+        text-align: center;
+    }
+    .ios-user-select{
+        -webket-user-select: text;
+    }
 </style>
 <body>
 
@@ -43,34 +53,36 @@
 
     </div>
 
-    <div class="addKeyWord">
-    <i class="iconfont icon-tianjia"></i>
-    </div>
-
     <div class="problem">
     疑问解答 <i class="iconfont icon-wenhao"></i>
     </div>
+    <div class="addKeyWord">
+        <i class="iconfont icon-tianjia"></i>
+    </div>
 
     <!-- 疑难问题弹窗 -->
     <div class="problemPop">
-    <div class="problemPopContent">
-    <h3>疑问解答</h3>
-    <ul>
-    <li>
-    <h4>·关键词</h4>
-<p>目标信息中的关键性词语，如“软件系统”</p>
-</li>
-<li>
-<h4>·附加词</h4>
-<p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-</li>
-<li>
-<h4>·排除词</h4>
-<p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-</li>
-</ul>
-<button class="knowBtn">我知道了</button>
-    </div>
+        <div class="problemPopContent">
+            <h3>疑问解答</h3>
+            <ul>
+                <li>
+                    <p>例：某公司主营业务为软件系统开发</p>
+                </li>
+                <li>
+                    <h4>关键词:</h4>
+                    <p>目标信息中的关键性词语，如“软件系统”</p>
+                </li>
+                <li>
+                    <h4>附加词:</h4>
+                    <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+                </li>
+                <li>
+                    <h4>排除词:</h4>
+                    <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+                </li>
+            </ul>
+            <button class="knowBtn">我知道了</button>
+        </div>
 
     </div>
 
@@ -139,7 +151,7 @@
                                         <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                     </div>
                                     <div class="modify">
-                                        <span contentEditable="true">${ appendedArr[y] }</span>
+                                        <span class="ios-user-select" contentEditable="true">${ appendedArr[y] }</span>
                                         <button class="deleteKey">删除</button>
                                         <button class="ascertainKey">确定</button>
                                     </div>
@@ -301,9 +313,12 @@
                 $('.modify span').each(function(item){
                     $('.modify span')[0].contentEditable = true
                 });
+                keepLastIndex(e.target);
                 // console.log($(this).parent().siblings().find('span').text())
                 $(this).parent().hide();
                 $(this).parent().siblings().css('display','block')
+                //
+                $(".addKeyWord").hide();
             });
 
             // 编辑 删除
@@ -318,7 +333,8 @@
                 sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 localStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
-                hasWords()
+                $(".addKeyWord").show();
+                hasWords();
                 // console.log('删除附加词:',$(this).parent().find('span').text())
             });
             // 编辑 确定
@@ -360,7 +376,8 @@
                     $(this).parent().siblings().find('.key').text(appended);
                     $(this).parent().hide().siblings().show()
                 }
-
+                //
+                $(".addKeyWord").show();
             });
 
             //去空格方法
@@ -387,6 +404,20 @@
             $('.addkeyWord .btn .close').on('click', function () {
                 window.history.back();
             });
+            function keepLastIndex(obj) {
+                if (window.getSelection) {//ie11 10 9 ff safari
+                    obj.focus(); //解决ff不获取焦点无法定位问题
+                    var range = window.getSelection();//创建range
+                    range.selectAllChildren(obj);//range 选择obj下所有子内容
+                    range.collapseToEnd();//光标移至最后
+                }
+                else if (document.selection) {//ie10 9 8 7 6 5
+                    var range = document.selection.createRange();//创建选择对象
+                    range.moveToElementText(obj);//range定位到obj
+                    range.collapse(false);//光标移至最后
+                    range.select();
+                }
+            }
         })
 
     </script>

src/web/templates/weixin/dataExport/dataExport_appendedInput.html

@@ -43,15 +43,18 @@
         <h3>疑问解答</h3>
         <ul>
         <li>
-        <h4>·关键词</h4>
+        <p>例：某公司主营业务为软件系统开发</p>
+    </li>
+    <li>
+    <h4>关键词:</h4>
     <p>目标信息中的关键性词语，如“软件系统”</p>
     </li>
     <li>
-    <h4>·附加词</h4>
+    <h4>附加词:</h4>
     <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
     </li>
     <li>
-    <h4>·排除词</h4>
+    <h4>排除词:</h4>
     <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
     </li>
     </ul>

src/web/templates/weixin/dataExport/dataExport_applyInvoice.html

@@ -150,7 +150,7 @@
 			var taxNumer = document.getElementById("taxNumer");
 			var companyName =document.getElementById("companyName");
 			//纳税人识别正则
-			   taxNumer.onkeyup = function(){
+			   taxNumer.onblur = function(){
 			    	var taxNumerValue = taxNumer.value;
 			    	var b = taxNumer_reg.test(taxNumerValue);
 				if(taxNumerValue == ""){
@@ -173,7 +173,7 @@
 				   	}
 			}
 			//公司识别正则
-			   companyName.onkeyup = function(){
+			   companyName.onblur = function(){
 			    	var companyNameValue = companyName.value;
 			    	var b = companyName_reg.test(companyNameValue);
 			    	if (companyNameValue == "")	{
@@ -211,7 +211,7 @@
                     actions: [{
                             text: "个人",
                             onClick: function() {
-                                $.alert("你选择了“个人”");
+                               // $.alert("你选择了“个人”");
                                 $(".type").html("个人")
                             	$("#sieve").css("background-color","#2cb7ca")
                                 $("#unit-info").hide()
@@ -220,7 +220,7 @@
                         {
                             text: "单位",
                             onClick: function() {
-                                $.alert("你选择了“单位”");
+                              //  $.alert("你选择了“单位”");
                                 $(".type").html("单位")
                                 $("#sieve").css("background-color","#90D5E1");
                                 $("#unit-info").show()

src/web/templates/weixin/dataExport/dataExport_area.html

@@ -6,383 +6,373 @@
 		<meta name="viewport" content="initial-scale=1, maximum-scale=1">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-
+		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}3"></script>
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}" />
+		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}4" />
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/public.css?v={{Msg "seo" "version"}}">
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/choose_area.css?v={{Msg "seo" "version"}}3">
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/choose_area.css?v={{Msg "seo" "version"}}4">
 		{{include "/common/weixin.html"}}
 		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 	</head>
-		<style>
-			#choose_area .main .select-area-box .tab .province .checkbox:checked {
-				border: 0;
-				background: url(/wx_dataExport/images/xuanzhong.png) no-repeat center center;
-				background-size: 100% 100%;
-			}
-		</style>
 	<body>
-		<div id="choose_area">
-				<main class="main">
-				<div class="form">
-				<div class="result">
-				已选择：
-		<span class="result_name"></span>
-				</div>
-				<div class="select-area-box">
-				<ul>
-				<li >
-				<div class="tab whole selected">
-				<div class="province">
-				<input type="checkbox" class="checkbox other">全国
-				</div>
-				<!-- <div class="tab_content clearfix"></div> -->
-				</div>
-				</li>
-				<li class="index" id="A">A</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">安徽
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">澳门
-				</div>
-				</div>
-				<div class="tab_content"></div>
-				</li>
-				<li class="index" id="B">B</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">北京
-				</div>
-				</div>
-				<div class="tab_content"></div>
-				</li>
-				<li class="index" id="C">C</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">重庆
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="F">F</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">福建
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="G">G</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">广东
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">广西
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">贵州
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">甘肃
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="H">H</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">河北
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">湖北
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">黑龙江
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">海南
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">河南
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">湖南
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<p class="index" id="J">J</p>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">吉林
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">江苏
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">江西
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="L">L</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">辽宁
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="N">N</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">内蒙古
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">宁夏
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="Q">Q</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">青海
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="S">S</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">山西
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">陕西
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
+	<div id="choose_area">
+		<div class="result">
+			已选择：
+			<span class="result_name"></span>
 		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">上海
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">山东
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">四川
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="T">T</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">天津
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">台湾
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="X">X</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">西藏
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">新疆
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li >
-				<div class="tab municipality">
-				<div class="province">
-				<input type="checkbox" class="checkbox">香港
-				</div>
-				</div>
-				<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="Y">Y</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">云南
-				</div>
-				<span><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
-				<li class="index" id="Z">Z</li>
-				<li >
-				<div class="tab">
-				<div class="province">
-				<input type="checkbox" class="checkbox">浙江
-				</div>
-				<span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
-		</div>
-		<div class="tab_content clearfix"></div>
-				</li>
+		<div class="form">
+			<div class="select-area-box">
+				<ul>
+					<li >
+						<div class="tab whole selected">
+							<div class="province">
+								<input type="checkbox" class="checkbox other">全国
+							</div>
+							<!-- <div class="tab_content clearfix"></div> -->
+						</div>
+					</li>
+					<li class="index" id="A">A</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">安徽
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab municipality">
+							<div class="province">
+								<input type="checkbox" class="checkbox">澳门
+							</div>
+						</div>
+						<div class="tab_content"></div>
+					</li>
+					<li class="index" id="B">B</li>
+					<li >
+						<div class="tab municipality">
+							<div class="province">
+								<input type="checkbox" class="checkbox">北京
+							</div>
+						</div>
+						<div class="tab_content"></div>
+					</li>
+					<li class="index" id="C">C</li>
+					<li >
+						<div class="tab municipality">
+							<div class="province">
+								<input type="checkbox" class="checkbox">重庆
+							</div>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="F">F</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">福建
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="G">G</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">广东
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">广西
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">贵州
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">甘肃
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="H">H</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">河北
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">湖北
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">黑龙江
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">海南
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">河南
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">湖南
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<p class="index" id="J">J</p>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">吉林
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">江苏
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">江西
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="L">L</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">辽宁
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="N">N</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">内蒙古
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">宁夏
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="Q">Q</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">青海
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="S">S</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">山西
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">陕西
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab municipality">
+							<div class="province">
+								<input type="checkbox" class="checkbox">上海
+							</div>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">山东
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">四川
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="T">T</li>
+					<li >
+						<div class="tab municipality">
+							<div class="province">
+								<input type="checkbox" class="checkbox">天津
+							</div>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab municipality">
+							<div class="province">
+								<input type="checkbox" class="checkbox">台湾
+							</div>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="X">X</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">西藏
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">新疆
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li >
+						<div class="tab municipality">
+							<div class="province">
+								<input type="checkbox" class="checkbox">香港
+							</div>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="Y">Y</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">云南
+							</div>
+							<span><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
+					<li class="index" id="Z">Z</li>
+					<li >
+						<div class="tab">
+							<div class="province">
+								<input type="checkbox" class="checkbox">浙江
+							</div>
+							<span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
+						</div>
+						<div class="tab_content clearfix"></div>
+					</li>
 				</ul>
 				<div class="slide">
-				<a href="javascript:;">#</a>
-				<a href="javascript:;">A</a>
-				<a href="javascript:;">B</a>
-				<a href="javascript:;">C</a>
-				<a href="javascript:;">F</a>
-				<a href="javascript:;">G</a>
-				<a href="javascript:;">H</a>
-				<a href="javascript:;">J</a>
-				<a href="javascript:;">L</a>
-				<a href="javascript:;">N</a>
-				<a href="javascript:;">Q</a>
-				<a href="javascript:;">S</a>
-				<a href="javascript:;">T</a>
-				<a href="javascript:;">X</a>
-				<a href="javascript:;">Y</a>
-				<a href="javascript:;">Z</a>
-				</div>
-				</div>
-				</div>
-				<div class="btn">
-				<button class="reset-btn">重置</button>
-				<button class="save-btn">确认</button>
-				</div>
-				</main>
+					<a href="javascript:;">#</a>
+					<a href="javascript:;">A</a>
+					<a href="javascript:;">B</a>
+					<a href="javascript:;">C</a>
+					<a href="javascript:;">F</a>
+					<a href="javascript:;">G</a>
+					<a href="javascript:;">H</a>
+					<a href="javascript:;">J</a>
+					<a href="javascript:;">L</a>
+					<a href="javascript:;">N</a>
+					<a href="javascript:;">Q</a>
+					<a href="javascript:;">S</a>
+					<a href="javascript:;">T</a>
+					<a href="javascript:;">X</a>
+					<a href="javascript:;">Y</a>
+					<a href="javascript:;">Z</a>
+				</div>
+			</div>
+		</div>
+		<div class="btn">
+			<button class="reset-btn">重置</button>
+			<button class="save-btn">确认</button>
+		</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/mapJSON.js?v={{Msg "seo" "version"}}3"></script>
 		<script>
@@ -425,7 +415,7 @@
 			});
 			function createMoreCity(arr){
 				var tempHtml = arr.map(function(v) {
-					return '<div class="city">'+v.name.replace(/市$/g,'')+'</div>'
+					return '<button class="city">' + v.name.replace(/地区$/g, '市') + '</button>'
 				}).join('');
 				return tempHtml
 			}
@@ -433,34 +423,90 @@
 			/* 选中结果 */
 			function getResult() {
 				$('.result_name').empty()
-				var data = []
+				var data = []; //定义一个总数组
+				var cityArr =[]; //定义一个选中城市数组
 				var val = $('.other').parents('.province').text().trim();
 				if ($('.other').is(':checked')) {
-					data.push(val)
+					// data.push(val)
+					data =[{name:val,children:[]}] //全国
 				}
+
 				$(".tab_content").find(".city.active:not('[disabled]')").each(function () {
 					var length = $(this).parent('.tab_content').find('.city').length; //省份下城市的length
 					var activeLeng = $(this).parent('.tab_content').find('.city.active').length; //省份下选中城市的length
+					let arr =[];
 					// 判断省份下的城市是否等于选中的城市长度,相等就是全部选中
 					if (length == activeLeng) {
-						data.push($(this).parent('.tab_content').siblings('.tab:not(.whole)')
-								.children('.province').text().trim())
-						return true;
+						// data.push($(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();
+						data.push({
+							name:province,
+							children:[]
+						})
 					} else {
-						data.push($(this).parent('.tab_content').siblings('.tab:not(.whole)')
-								.children('.province').text().trim())
-						data.push($(this).html())
+						// data.push($(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim())
+						// data.push($(this).html())
+						// 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 city = $(this).html()
+						arr.push({name:city,parent:province})
+						// console.log(arr)
+						for(let i =0;i<arr.length;i++){
+							// console.log(arr[i])
+							let obj ={};
+							obj.name = arr[i].name;
+							obj.parent = arr[i].parent;
+							cityArr.push(obj)
+						}
+						data.push({
+							name:province,
+							children:cityArr
+						})
 					}
-					// data.push($(this).html())
-				})
-				data = Array.from(new Set(data)); //数组去重
-				console.log(data)
+				});
+				//数组对象去重
+				let obj = {};
+				data = data.reduce((cur,next) =>{
+					obj[next.name] ? "" : obj[next.name] = true && cur.push(next);
+					return cur
+				},[]);
+				// 数组筛选
+				let result = data.map(v =>{
+					let filterArr = v.children.filter(s =>{
+						return s.parent === v.name
+					});
+					return {
+						name:v.name,
+						children:filterArr
+					}
+				});
+				// console.log(result)
 				var html = '';
-				for (var i = 0; i < data.length; i++) {
-					if (i != data.length - 1) {
-						html += '<span>' + data[i] + '、' + '</span>'
-					} else {
-						html += '<span>' + data[i] + '</span>'
+				for (var i = 0; i < result.length; i++) {
+					let children = result[i].children;
+					if( children.length >0){
+						html += `<span> ${result[i].name} (</span>`;
+						for(var j = 0;j < children.length;j++){
+							if (j != children.length - 1) {
+								html += `<span> ${children[j].name}、</span>`
+							} else {
+								html += `<span> ${children[j].name} </span>`
+							}
+						}
+						if(i !=result.length -1){
+							html += `<span>)</span>、`
+						}else{
+							html += `<span>)</span>`
+						}
+
+					}else{
+						if(i !=result.length -1){
+							html += `<span>${result[i].name}、</span>`
+						}else{
+							html += `<span>${result[i].name}</span>`
+						}
 					}
 				}
 				$('.result_name').append(html)
@@ -475,11 +521,24 @@
 					 document.querySelector('#' + s).scrollIntoView({block:'center'});
 				 });
 
-				 $(".select-area-box .tab:not(.municipality)").on('click',function(event){
-					 $(this).toggleClass('selected').next('.tab_content').slideDown(500);
-					 $(this).parent().siblings().children('.tab_content').slideUp(500);
+				 $(".select-area-box .tab:not(.municipality)").on('click', function (event) {
+					 if($(this).next('.tab_content:not(:animated)').css("display") == "block"){
+						 $(this).children().children('i').css({
+							 "display":"inline-block",
+							 "transform":"rotate(0)"
+						 })
+					 }else{
+						 $(this).children().children('i').css({
+							 "display":"inline-block",
+							 "transform":"rotate(-180deg)"
+						 })
+					 }
+					 $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500)
+					 // $(this).parent().siblings().children('.tab_content').slideUp(500)
 					 $(this).parent().siblings().children('.tab').removeClass('selected');
+
 				 });
+				 //
 				 $('.province .checkbox:not(.other)').on('change',function(){
 					var isCheckded = $(this).is(':checked');
 					// console.log(isCheckded);
@@ -566,11 +625,21 @@
 					history.back();
 				});
 				$('.reset-btn').click(function(){
-					$('input[type="checkbox"]').attr("checked",false);
-					$('.tab_content .city').removeClass('active');
+					// $('input[type="checkbox"]').attr("checked",false);
+					// $('.tab_content .city').removeClass('active');
+					// $('.result_name').empty();
+					// $(".whole").addClass("selected");
+					// $(".other").prop("checked",true);
+					// $(".reset-btn").hide();
+					$('input[type="checkbox"]:not("[disabled]")').attr("checked", false)
+					$('.tab_content .city:not("[disabled]")').removeClass('active')
 					$('.result_name').empty();
-					$(".whole").addClass("selected");
-					$(".other").prop("checked",true);
+					$('.other').prop('checked', true);
+					$('.tab_content').slideUp(500);
+					$('.tab span i').css({
+						"display":"inline-block",
+						"transform":"rotate(0)"
+					});
 					$(".reset-btn").hide();
 					getResult()
 				});

src/web/templates/weixin/dataExport/dataExport_buyerEdit.html

@@ -27,6 +27,9 @@
 	body{
 		background: rgba(245,244,249,1);
 	}
+	.ios-user-select{
+		-webket-user-select: text;
+	}
 </style>
 
 <body>
@@ -74,7 +77,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span contentEditable="true">${ buyer[i] }</span>
+                            <span class="ios-user-select" contentEditable="true">${ buyer[i] }</span>
                             <button class="deleteKey">删除</button>
                             <button class="ascertainKey">确定</button>
                         </div>

src/web/templates/weixin/dataExport/dataExport_exclude.html

@@ -21,6 +21,16 @@
     body{
         background: rgba(245,244,249,1);
     }
+    .keyWord .addKeyWord {
+        width:0;
+        position: fixed;
+        left: 44%;
+        top: 85%;
+        text-align: center;
+    }
+    .ios-user-select{
+        -webket-user-select: text;
+    }
 </style>
 <body>
 
@@ -43,34 +53,36 @@
 
     </div>
 
-    <div class="addKeyWord">
-    <i class="iconfont icon-tianjia"></i>
-    </div>
-
     <div class="problem">
     疑问解答 <i class="iconfont icon-wenhao"></i>
     </div>
+    <div class="addKeyWord">
+        <i class="iconfont icon-tianjia"></i>
+    </div>
 
     <!-- 疑难问题弹窗 -->
     <div class="problemPop">
-    <div class="problemPopContent">
-    <h3>疑问解答</h3>
-    <ul>
-    <li>
-    <h4>·关键词</h4>
-<p>目标信息中的关键性词语，如“软件系统”</p>
-</li>
-<li>
-<h4>·附加词</h4>
-<p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-</li>
-<li>
-<h4>·排除词</h4>
-<p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-</li>
-</ul>
-<button class="knowBtn">我知道了</button>
-    </div>
+        <div class="problemPopContent">
+            <h3>疑问解答</h3>
+            <ul>
+                <li>
+                    <p>例：某公司主营业务为软件系统开发</p>
+                </li>
+                <li>
+                    <h4>关键词:</h4>
+                    <p>目标信息中的关键性词语，如“软件系统”</p>
+                </li>
+                <li>
+                    <h4>附加词:</h4>
+                    <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+                </li>
+                <li>
+                    <h4>排除词:</h4>
+                    <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+                </li>
+            </ul>
+            <button class="knowBtn">我知道了</button>
+        </div>
 
     </div>
 
@@ -140,7 +152,7 @@
                                     <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                 </div>
                                 <div class="modify">
-                                    <span contentEditable="true">${ excludeArr[y] }</span>
+                                    <span class="ios-user-select" contentEditable="true">${ excludeArr[y] }</span>
                                     <button class="deleteKey">删除</button>
                                     <button class="ascertainKey">确定</button>
                                 </div>
@@ -302,9 +314,11 @@
                 $('.modify span').each(function(item){
                     $('.modify span')[0].contentEditable = true
                 });
+                keepLastIndex(e.target)
                 // console.log($(this).parent().siblings().find('span').text())
                 $(this).parent().hide();
-                $(this).parent().siblings().css('display','block')
+                $(this).parent().siblings().css('display','block');
+                $(".addKeyWord").hide();
             });
 
             // 编辑 删除
@@ -319,6 +333,7 @@
                 localStorage.keyWord = JSON.stringify(keyWordArr);
                 sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
+                $(".addKeyWord").show();
                 hasWords()
                 // console.log('删除附加词:',$(this).parent().find('span').text())
             })
@@ -361,7 +376,7 @@
                     $(this).parent().siblings().find('.key').text(exclude);
                     $(this).parent().hide().siblings().show()
                 }
-
+                $(".addKeyWord").show();
             });
 
             //去空格方法
@@ -388,6 +403,20 @@
             $('.addkeyWord .btn .close').on('click', function () {
                 window.history.back();
             });
+            function keepLastIndex(obj) {
+                if (window.getSelection) {//ie11 10 9 ff safari
+                    obj.focus(); //解决ff不获取焦点无法定位问题
+                    var range = window.getSelection();//创建range
+                    range.selectAllChildren(obj);//range 选择obj下所有子内容
+                    range.collapseToEnd();//光标移至最后
+                }
+                else if (document.selection) {//ie10 9 8 7 6 5
+                    var range = document.selection.createRange();//创建选择对象
+                    range.moveToElementText(obj);//range定位到obj
+                    range.collapse(false);//光标移至最后
+                    range.select();
+                }
+            }
         })
 
     </script>

src/web/templates/weixin/dataExport/dataExport_excludeInput.html

@@ -53,24 +53,27 @@
 
         <!-- 疑难问题弹窗 -->
         <div class="problemPop">
-        <div class="problemPopContent">
-        <h3>疑问解答</h3>
-        <ul>
-        <li>
-        <h4>·关键词</h4>
-    <p>目标信息中的关键性词语，如“软件系统”</p>
-    </li>
-    <li>
-    <h4>·附加词</h4>
-    <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-    </li>
-    <li>
-    <h4>·排除词</h4>
-    <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-    </li>
-    </ul>
-    <button class="knowBtn">我知道了</button>
-        </div>
+            <div class="problemPopContent">
+                <h3>疑问解答</h3>
+                <ul>
+                    <li>
+                        <p>例：某公司主营业务为软件系统开发</p>
+                    </li>
+                    <li>
+                        <h4>关键词:</h4>
+                        <p>目标信息中的关键性词语，如“软件系统”</p>
+                    </li>
+                    <li>
+                        <h4>附加词:</h4>
+                        <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+                    </li>
+                    <li>
+                        <h4>排除词:</h4>
+                        <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+                    </li>
+                </ul>
+                <button class="knowBtn">我知道了</button>
+            </div>
 
         </div>
 

src/web/templates/weixin/dataExport/dataExport_industry.html

@@ -5,10 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>行业</title>
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}4">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/industry.css?v={{Msg "seo" "version"}}">
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
@@ -20,12 +20,12 @@
         body .industry .list ul li dd {
             background: #F4F4F9;
             display: inline-block;
-            width: 2.1rem;
+            width: 2.22rem;
             height: .7rem;
             border-radius: 3px;
             text-align: center;
             line-height: .7rem;
-            margin-right: .05rem;
+            margin-right: .02rem;
             margin-bottom: 0.2rem;
         }
     </style>

src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>关键词</title>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}119">
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}123">
     <script src="/js/jquery.js"></script>
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
@@ -31,6 +31,16 @@
         margin-top: 0!important;
         border-top: 1px solid #e0e0e0;
     }
+    .keyWord .addKeyWord {
+        width:0;
+        position: fixed;
+        left: 44%;
+        top: 85%;
+        text-align: center;
+    }
+    .ios-user-select{
+        -webket-user-select: text;
+    }
 </style>
 <body>
 
@@ -66,41 +76,43 @@
 
         </div>
 
-        <div class="addKeyWord">
-            <i class="iconfont icon-tianjia"></i>
-        </div>
-
         <div class="problem">
             疑问解答 <i class="iconfont icon-wenhao"></i>
         </div>
+        <div class="addKeyWord">
+        <i class="iconfont icon-tianjia"></i>
+        </div>
 
         <!-- 疑难问题弹窗 -->
-        <div class="problemPop">
-            <div class="problemPopContent">
-                <h3>疑问解答</h3>
-                <ul>
-                    <li>
-                    	<h4>·关键词</h4>
-                    	<p>目标信息中的关键性词语，如“软件系统”</p>
-                    </li>
-                    <li>
-                    	<h4>·附加词</h4>
-                    	<p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-                    </li>
-                    <li>
-                    	<h4>·排除词</h4>
-                    	<p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-                    </li>
-                </ul>
-                <button class="knowBtn">我知道了</button>
-            </div>
+    <div class="problemPop">
+    <div class="problemPopContent">
+    <h3>疑问解答</h3>
+    <ul>
+    <li>
+    <p>例：某公司主营业务为软件系统开发</p>
+</li>
+<li>
+<h4>关键词:</h4>
+<p>目标信息中的关键性词语，如“软件系统”</p>
+</li>
+<li>
+<h4>附加词:</h4>
+<p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+</li>
+<li>
+<h4>排除词:</h4>
+<p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+</li>
+</ul>
+<button class="knowBtn">我知道了</button>
+    </div>
 
-        </div>
+    </div>
 
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}38"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}41"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         var keyWordArr = [];
@@ -128,7 +140,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -152,7 +164,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -180,7 +192,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
@@ -200,7 +212,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                            <span class="ios-user-select" contentEditable="true">${ keyWordArr[i].keyWord }</span>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>

src/web/templates/weixin/dataExport/dataExport_keyWordInput.html

@@ -46,24 +46,27 @@
 
     <!-- 疑难问题弹窗 -->
     <div class="problemPop">
-        <div class="problemPopContent">
-            <h3>疑问解答</h3>
-            <ul>
-                <li>
-                    <h4>·关键词</h4>
-                    <p>目标信息中的关键性词语，如“软件系统”</p>
-                </li>
-                <li>
-                    <h4>·附加词</h4>
-                    <p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-                </li>
-                <li>
-                    <h4>·排除词</h4>
-                    <p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-                </li>
-            </ul>
-            <button class="knowBtn">我知道了</button>
-        </div>
+    <div class="problemPopContent">
+    <h3>疑问解答</h3>
+    <ul>
+    <li>
+    <p>例：某公司主营业务为软件系统开发</p>
+</li>
+<li>
+<h4>关键词:</h4>
+<p>目标信息中的关键性词语，如“软件系统”</p>
+</li>
+<li>
+<h4>附加词:</h4>
+<p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
+</li>
+<li>
+<h4>排除词:</h4>
+<p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
+</li>
+</ul>
+<button class="knowBtn">我知道了</button>
+    </div>
 
     </div>
 

src/web/templates/weixin/dataExport/dataExport_payOrder.html

@@ -1,7 +1,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>支付订单</title>
+        <title>数据导出</title>
 		<meta name="format-detection" content="telephone=no" />
 		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
         <meta name="apple-mobile-web-app-capable" content="yes">
@@ -150,7 +150,7 @@
                         </div>
                     </div>
                     <p class="msg">购买须知：最低起售{{.T.orderMinPrice}}元；标准字段包:原价{{.T.unitPrice_normal}}元/条、{{.T.discount10}}折价{{.T.unitPrice_normal_final}}元/条计费；高级字段包:原价{{.T.unitPrice_senior}}元/条、{{.T.discount10}}折价{{.T.unitPrice_senior_final}}元/条计费；</p>
-                    <div class="fixed-bottom-box">
+                    <div class="fixed-bottom-box" id="bottombox">
                         <div class="weui-cells weui-cells_checkbox radio-form">
                             <label class="weui-cell weui-check__label" for="s11">
                                 <div class="weui-cell__hd">
@@ -163,8 +163,8 @@
                             </label>
                         </div>
                         <div class="price">
-                            <span class="pay_before">原价：￥20,000</span>
-                            <strong class="pay_discount">￥16,300</strong>
+                            <span class="pay_before"></span>
+                            <strong class="pay_discount"></strong>
                         </div>
                         <div class="form-btn">
                             <button class="btn prew dataPreview">预览数据</button>
@@ -182,11 +182,11 @@
                         <ul class="info">
                             <li>
                                 <label>·标准字段包</label>
-                                <p>公告标题、公告内容、剑鱼地址、省份城市、发布时间、项目名称、采购单位中标单位、中标价、币种、公告类别</p>
+                                <p>公告标题、公告内容、剑鱼标讯地址、省份城市、发布时间、项目名称、采购单位、中标单位、中标价、币种、公告类别</p>
                             </li>
                             <li>
                                 <label>·高级字段包</label>
-                                <p>公告标题、公告内容、公告地址、剑鱼地址、省份、城市、发布时间、项目名称、项目编号、采购单位、采购单位联系人、采购单位联系电话、预算、开标日期、中标单位、中标单位联系方式、中标价、招标机构、项目范围、币种、公告类别</p>
+                                <p>公告标题、公告内容、公告地址、剑鱼标讯地址、省份、城市、发布时间、项目名称、项目编号、采购单位、采购单位联系人、采购单位联系电话、预算、开标日期、中标单位、中标价、招标机构、项目范围、币种、公告类别</p>
                             </li>
                         </ul>
                     </div>
@@ -280,8 +280,21 @@
 				$(".pay_before").text("￥"+beforePay)
 			}
             $(function() {
+            	if(sessionStorage.index=="1"){
+            		$(".choose .choose-item").eq(sessionStorage.index).addClass("active").siblings().removeClass("active");
+            		dataType=2;
+            	}
 				ChangePayMoney();
-				
+				//缓存判断是否点击我已阅读
+				if(sessionStorage.readClause=="true"){
+					readClause=true;
+					sessionStorage.readClause="true";
+					$(".toPay").removeAttr("disabled");
+				}
+				//全部高度-main高度
+				var height_bottom=document.body.scrollHeight-$(".main").height()
+				height_bottom=height_bottom+"px"
+				$("#bottombox").css("margin-top",height_bottom)
 				if (sessionStorage.getItem("order_email"+{{.T._id}})!=null){
 					$(".email_check_ok").show();
 					$(".email_input").val(sessionStorage.getItem("order_email"+{{.T._id}}));
@@ -325,6 +338,7 @@
 						}else if(index==1){
 							dataType=2;
 						}
+						sessionStorage.index=index;
 						ChangePayMoney();
                     })
                 })
@@ -374,7 +388,7 @@
 					}
 				}).blur(function(){
 					var phone_input = $(this).val().replace(/\s*/g,"");
-					if (phone_input.length != 11) {
+					if (phone_input.length != 11&&phone_input.length!=0) {
 						$(".phone_err_msg").show();
 						$(".phone_check_ok").hide();
 						finishPhoneVerity=false;
@@ -423,11 +437,14 @@
 					}
 				}).blur(function(){
 					var email=$(".email_input").val().replace(/\s*/g,"");
-					if(!/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email)){
+					if(!/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email)&&($(".email_input").val().length!=0)){
 						$(".email_err_msg").show();
 						$(".email_check_ok").hide();
 						return
 					}
+					if($(".email_input").val()==email){
+						return;
+					}
 					$("#sendCode").removeAttr("disabled");
 					$(".email_check_ok").hide();
 					$(".email_err_msg").hide();
@@ -436,7 +453,7 @@
 				var canVerify=true;
 				$(".sendCode").on("click",function(){
 					var email=$(".email_input").val().replace(/\s*/g,"");
-					if(!/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email)){
+					if(!/\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/.test(email)) {
 						$(".email_err_msg").show();
 						$(".email_check_ok").hide();
 						return
@@ -500,11 +517,13 @@
 				$(".fixed-bottom-box .weui-check").on("click", function () {
 					if($(this).is(":checked")){
 						readClause=true;
+						sessionStorage.readClause="true";
 						if(finishEmailVerity&&finishPhoneVerity){
 							$(".toPay").removeAttr("disabled")
 						} 
 					}else{
 						readClause=false;
+						sessionStorage.readClause="false";
 						$(".toPay").attr("disabled","disabled");
 					}
 				})
@@ -524,6 +543,10 @@
 				$(".toPay").on("click",function(){
 					if(!finishEmailVerity||!readClause||!canpay||!finishPhoneVerity){
 						return	
+					}else{
+						//清除我已阅读缓存
+						sessionStorage.removeItem("readClause");
+						sessionStorage.removeItem("index");
 					}
 					$(".loading_").show();
 					canpay=false;

src/web/templates/weixin/dataExport/dataExport_price.html

@@ -4,6 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
     <title>金额</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
@@ -31,11 +32,11 @@
             <h3>价格区间</h3>
             <div class="connectMain">
                 <span>
-                    <input type="number" id="min" >万元
+                    <input type="text" id="min"  >万元
                 </span>
                 —
                 <span>
-                    <input type="number" id="max" >万元
+                    <input type="text" id="max" >万元
                 </span>
             </div>
             
@@ -77,9 +78,10 @@
                 var min = $("#min").val();
                 var max = $("#max").val();
                 //金额判断
-				if ((parseInt(min)>parseInt(max))||parseInt(min)==parseInt(max)){
-					return
-				}
+//              console.log(parseInt(min))
+//				if ((parseInt(min)>parseInt(max))||parseInt(min)==parseInt(max)){
+//					return
+//				}
                 var price = min+"万元-"+max+"万元";
                 localStorage.setItem("price", price);
             }
@@ -130,10 +132,100 @@
 			$(".resetOne .btn").addClass("width100");
 			$(".reset").hide();
 		}
-		
-		
+	 var reg = /^[\u4e00-\u9fa5]+$/;
+     var maxnum = "";
+	//金额大小互换
+	$("#max").on("blur",function(){
+		var max=$("#max").val(),min=$("#min").val();
+	        if(Number(max)<Number(min)&&max!=""&&min!=""){
+	            $("#max").val(min);
+	            $("#min").val(max);
+	            minnum = max;
+	            maxnum = min;
+	        }
+	}).on("input propertychange",function(){	//最大金额两位小数限制
+		var oldvalue = $(this).val();
+	        var maxp = $.trim($(this).val()).replace(/\s/g,"");
+			if(oldvalue != maxp){
+		        $(this).val(maxp);
+			}
+	        if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(maxp)){
+	            if((reg.test(maxp)||isNaN(maxp)||maxp.indexOf("e")>0)&&maxp.indexOf(".")<0){
+	                $(this).val(maxnum);
+	            }else{
+	                if(reg.test(maxp)||isNaN(maxp)||maxp.indexOf("e")>0){
+	                    $(this).val(maxnum);
+	                }else{
+	                    if(maxp.indexOf(".")>0){
+	                        var offront = maxp.split(".")[0];
+	                        var ofafter = maxp.split(".")[1];
+	                        if(offront.length>9||ofafter.length>2){
+	                            $(this).val(maxnum);
+	                        }else{
+	                            maxnum = maxp;
+	                        }
+	                    }else{
+	                        if(maxp.length>9){
+	                            $(this).val(maxnum);
+	                        }else{
+	                            maxnum = maxp;
+	                        }
+	                    }
+	                }
+	            }
+	        }else{
+	            maxnum = maxp;
+	        }
+	})
+	
+    var minnum = "";
+	$("#min").on("blur",function(){
+		var max=$("#max").val(),min=$("#min").val();
+	        if(Number(max)<Number(min)&&max!=""&&min!=""){
+	            $("#max").val(min);
+	            $("#min").val(max);
+	            minnum = max;
+	            maxnum = min;
+	        }
+	}).on("input propertychange",function(){
+			var oldvalue = $(this).val();
+	        var minp = $.trim($(this).val()).replace(/\s/g,"");
+			if(oldvalue != minp){
+		        $(this).val(minp);
+			}
+	        if(!/^[\d]{1,9}([.][\d]{0,2})?$/.test(minp)){
+	            if((reg.test(minp)||isNaN(minp)||minp.indexOf("e")>0)&&minp.indexOf(".")<0){
+	                $(this).val(minnum);
+	            }else{
+	                if(reg.test(minp)||isNaN(minp)||minp.indexOf("e")>0){
+	                    $(this).val(minnum);
+	                }else{
+	                    if(minp.indexOf(".")>0){
+	                        var offront = minp.split(".")[0];
+	                        var ofafter = minp.split(".")[1];
+	                        if(offront.length>9||ofafter.length>2){
+	                            $(this).val(minnum);
+	                        }else{
+	                            minnum = minp;
+	                        }
+	                    }else{
+	                        if(minp.length>9){
+	                            $(this).val(minnum);
+	                        }else{
+	                            minnum = minp;
+	                        }
+	                    }
+	                }
+	            }
+	        }else{
+	            minnum = minp;
+	        }
+	})
+
+})
+
+ 
 
-    })
 </script>
 	{{include "/common/baiducc.html"}}
 </body>

src/web/templates/weixin/dataExport/dataExport_subType.html

@@ -5,10 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>信息类型</title>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/messageType.css?v={{Msg "seo" "version"}}">
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 </head>

src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

@@ -6,11 +6,11 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 	<meta http-equiv="X-UA-Compatible" content="ie=edge">
 	<title>中标单位</title>
+	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}4">
-	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 	{{include "/common/weixin.html"}}
 	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 	</head>
@@ -27,6 +27,9 @@
 		body{
 			background: rgba(245,244,249,1);
 		}
+		.ios-user-select{
+			-webket-user-select: text;
+		}
 	</style>
 	<body>
 
@@ -73,7 +76,7 @@
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span contentEditable="true">${ winner[i] }</span>
+                            <span class="ios-user-select" contentEditable="true">${ winner[i] }</span>
                             <button class="deleteKey">删除</button>
                             <button class="ascertainKey">确定</button>
                         </div>
@@ -106,8 +109,6 @@
 
 			// 添加按钮
 			$(".addKeyWord i").on('click',function(){
-				$(".addkeyWord").show();
-				$(".showKeyWord").hide();
 				window.location.href="/front/wx_dataExport/winnerInput";
 			});
 
@@ -150,7 +151,7 @@
 								<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
 							</div>
 							<div class="modify">
-								<span contentEditable="true">${ keyWord }</span>
+								<span class="ios-user-select" contentEditable="true">${ keyWord }</span>
 								<button class="deleteKey">删除</button>
 								<button class="ascertainKey">确定</button>
 							</div>
@@ -173,9 +174,11 @@
 				$('.modify span').each(function(item){
 					$('.modify span')[0].contentEditable = true
 				});
+				keepLastIndex(e.target)
 				// console.log($(this).parent().siblings().find('span').text())
 				$(this).parent().hide();
 				$(this).parent().siblings().css('display','block')
+				$(".addKeyWord").hide();
 			});
 
 			// 编辑 删除
@@ -184,6 +187,7 @@
 				winnerArr.splice($.inArray(winner, winnerArr),1);
 				localStorage.winner = winnerArr.toString();
 				$(this).parents('li').remove();
+				$(".addKeyWord").show();
 				hasWords()
 				// console.log('删除附加词:',$(this).parent().find('span').text())
 			});
@@ -220,6 +224,7 @@
 					$(this).parent().siblings().find('.key').text(keyWord);
 					$(this).parent().hide().siblings().show()
 				}
+				$(".addKeyWord").show();
 			});
 
 			//去空格方法
@@ -246,6 +251,20 @@
 			$(".close").on('click', function () {
 				history.back();
 			});
+			function keepLastIndex(obj) {
+				if (window.getSelection) {//ie11 10 9 ff safari
+					obj.focus(); //解决ff不获取焦点无法定位问题
+					var range = window.getSelection();//创建range
+					range.selectAllChildren(obj);//range 选择obj下所有子内容
+					range.collapseToEnd();//光标移至最后
+				}
+				else if (document.selection) {//ie10 9 8 7 6 5
+					var range = document.selection.createRange();//创建选择对象
+					range.moveToElementText(obj);//range定位到obj
+					range.collapse(false);//光标移至最后
+					range.select();
+				}
+			}
 		})
 
 	</script>

src/web/templates/weixin/search/mainSearch.html

@@ -519,6 +519,7 @@
 								<button class="btn">单一</button>
 								<button class="btn">竞价</button>
 								<button class="btn">变更</button>
+								<button class="btn">其它</button>
 							</li>
 							<li>
 								<div id="dqbtn" style="width:81px;" data-value="结果">招标结果</div>
@@ -532,7 +533,6 @@
 								<button class="btn">合同</button>
 								<button class="btn">验收</button>
 								<button class="btn">违规</button>
-								<button class="btn">其它</button>
 							</li>
 						</ul>
 					</div>