app数据导出优化 微信分享

src/jfw/modules/app/src/app/front/dataExport.go

@@ -15,17 +15,22 @@ import (
 
 type WxDataExport struct {
 	*xweb.Action
-	toSieve    xweb.Mapper `xweb:"/jyapp/front/dataExport/toSieve"`    //微信数据导出
-	saveData   xweb.Mapper `xweb:"/jyapp/front/dataExport/saveData"`   //保存筛选数据
-	area       xweb.Mapper `xweb:"/jyapp/front/dataExport/area"`       //区域
-	industry   xweb.Mapper `xweb:"/jyapp/front/dataExport/industry"`   //行业
-	keyWord    xweb.Mapper `xweb:"/jyapp/front/dataExport/keyWord"`    //关键词
-	appended   xweb.Mapper `xweb:"/jyapp/front/dataExport/appended"`   //附加词
-	exclude    xweb.Mapper `xweb:"/jyapp/front/dataExport/exclude"`    //排除词
-	price      xweb.Mapper `xweb:"/jyapp/front/dataExport/price"`      //金额
-	subType    xweb.Mapper `xweb:"/jyapp/front/dataExport/subType"`    //信息类型
-	buyerEdit  xweb.Mapper `xweb:"/jyapp/front/dataExport/buyerEdit"`  //采购单位编辑
-	winnerEdit xweb.Mapper `xweb:"/jyapp/front/dataExport/winnerEdit"` //中标单位编辑
+	toSieve       xweb.Mapper `xweb:"/jyapp/front/dataExport/toSieve"`       //微信数据导出
+	saveData      xweb.Mapper `xweb:"/jyapp/front/dataExport/saveData"`      //保存筛选数据
+	area          xweb.Mapper `xweb:"/jyapp/front/dataExport/area"`          //区域
+	industry      xweb.Mapper `xweb:"/jyapp/front/dataExport/industry"`      //行业
+	keyWord       xweb.Mapper `xweb:"/jyapp/front/dataExport/keyWord"`       //关键词
+	keyWordInput  xweb.Mapper `xweb:"/jyapp/front/dataExport/keyWordInput"`  //关键词输入
+	appended      xweb.Mapper `xweb:"/jyapp/front/dataExport/appended"`      //附加词
+	appendedInput xweb.Mapper `xweb:"/jyapp/front/dataExport/appendedInput"` //附加词输入
+	exclude       xweb.Mapper `xweb:"/jyapp/front/dataExport/exclude"`       //排除词
+	excludeInput  xweb.Mapper `xweb:"/jyapp/front/dataExport/excludeInput"`  //排除词输入
+	price         xweb.Mapper `xweb:"/jyapp/front/dataExport/price"`         //金额
+	subType       xweb.Mapper `xweb:"/jyapp/front/dataExport/subType"`       //信息类型
+	buyerEdit     xweb.Mapper `xweb:"/jyapp/front/dataExport/buyerEdit"`     //采购单位编辑
+	buyerInput    xweb.Mapper `xweb:"/jyapp/front/dataExport/buyerInput"`    //采购单位输入
+	winnerEdit    xweb.Mapper `xweb:"/jyapp/front/dataExport/winnerEdit"`    //中标单位编辑
+	winnerInput   xweb.Mapper `xweb:"/jyapp/front/dataExport/winnerInput"`   //中标单位输入
 }
 
 func init() {
@@ -168,18 +173,36 @@ func (w *WxDataExport) KeyWord() error {
 	return nil
 }
 
+//关键词输入
+func (w *WxDataExport) KeyWordInput() error {
+	w.Render("/dataExport/dataExport_keyWordInput.html")
+	return nil
+}
+
 //附加词
 func (w *WxDataExport) Appended() error {
 	w.Render("/dataExport/dataExport_appended.html")
 	return nil
 }
 
+//附加词输入
+func (w *WxDataExport) AppendedInput() error {
+	w.Render("/dataExport/dataExport_appendedInput.html")
+	return nil
+}
+
 //排除词
 func (w *WxDataExport) Exclude() error {
 	w.Render("/dataExport/dataExport_exclude.html")
 	return nil
 }
 
+//排除词输入
+func (w *WxDataExport) ExcludeInput() error {
+	w.Render("/dataExport/dataExport_excludeInput.html")
+	return nil
+}
+
 //金额
 func (w *WxDataExport) Price() error {
 	w.Render("/dataExport/dataExport_price.html")
@@ -198,7 +221,19 @@ func (w *WxDataExport) BuyerEdit() error {
 	return nil
 }
 
+//采购单位输入
+func (w *WxDataExport) BuyerInput() error {
+	w.Render("/dataExport/dataExport_buyerInput.html", &w.T)
+	return nil
+}
+
 //中标单位编辑
+func (w *WxDataExport) WinnerInput() error {
+	w.Render("/dataExport/dataExport_winnerInput.html", &w.T)
+	return nil
+}
+
+//中标单位输入
 func (w *WxDataExport) WinnerEdit() error {
 	w.Render("/dataExport/dataExport_winnerEdit.html", &w.T)
 	return nil

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

@@ -94,4 +94,19 @@ em,i{
 }
 .hide{
 	display: none;
+}
+
+.easyalert{
+	position: fixed;
+	background-color: rgba(0,0,0,0.7);
+	top: 50%;
+	color: #fff;
+	z-index: 999;
+	border-radius: 6px;
+	padding: 17px 20px;
+    font-size: 15px;
+	line-height: 22px;
+	max-width: 260px;
+	text-align: center;
+	display: none;
 }

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

@@ -1,6 +1,7 @@
 html .page {
   background: #F5F4F9;
   padding-bottom: .94rem;
+    font-size: .24rem;
 }
 html .page .progress {
   display: -webkit-box;

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

@@ -32,13 +32,22 @@
   margin-top: .16rem;
 }
 .keyWord .enter .btn button {
-  width: 100%;
+  width: 50%;
   height: 0.94rem;
   background: #2cb7ca;
   color: #fff;
   font-size: .36rem;
   opacity: .5;
 }
+.keyWord .enter .btn .close {
+  width: 50%;
+  height: 0.94rem;
+  background:rgba(255,255,255,1);
+  opacity:1;
+  color:rgba(44,183,202,1);
+  font-size: .36rem;
+  float: left;
+}
 .keyWord .showKeyWord ul li {
   margin-bottom: .16rem;
   overflow: hidden;

src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/no_result.css

@@ -3,6 +3,16 @@
   overflow: scroll;
 }
 
+#no_result{
+	margin: 0 auto;
+    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;
+}
 .main::-webkit-scrollbar {
   display: none;
 }

src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/order_detail.css

@@ -75,6 +75,7 @@
   border-radius: 0.06rem;
   font-size: .28rem;
   color: #2cb7ca;
+/*padding-top:0.03rem;*/
 }
 #order_detail .main .lists .card .unit p {
   display: -webkit-box;

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

@@ -264,8 +264,7 @@ position: absolute;
 #pay_order .main .form .form-item .way .way-right .icon-right {
   color: #C2C2C2;
   font-size: .26rem;
-/*	display:none;*/
-    margin-top: 0.13rem;
+	display:none;
 }
 #pay_order .main .form .form-item.phone-number {
   margin-top: .23rem;

src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/css/pay_success.css

@@ -8,6 +8,7 @@
 }
 
 #pay_success {
+	font-size: .24rem !important;
   width: 100%;
   height: 100%;
   background: #fff;

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

@@ -17,19 +17,20 @@ $(function(){
             $(".showKeyWord").show();
         }
     }
-    hasWords()
+    hasWords();
     
     // 添加按钮
     $(".addKeyWord i").on('click',function(){
         $(".addkeyWord").show();
         $(".showKeyWord").hide();
-    })
+        window.location.href="/jyapp/front/dataExport/buyerInput";
+    });
 
     // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
     $('.addkeyWord input.enterOne').on('input', function() {
         if ($(this).val().length >= 100) {
-            var s = $(this).val().slice(0,100)
-            $(this).val(s)
+            var s = $(this).val().slice(0,100);
+            $(this).val(s);
 
             weui.toast('附加词不能超过100字', {
                 duration: 2000,
@@ -50,7 +51,7 @@ $(function(){
     })
     
     // 添加 按钮的点击事件
-    $('.addkeyWord .btn button').on('click', function(){
+    $('.addkeyWord .btn .save-btn').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val()
         buyerArr.push(keyWord);
         localStorage.setItem("buyer", buyerArr);
@@ -117,7 +118,7 @@ $(function(){
     //去空格方法
     String.prototype.trim = function(){
         return this.replace(/(^\s*)|(\s*$)/g, ' ');
-     }
+    }
 
     //附加词个数
     $('.modify span').keydown(function(){
@@ -133,6 +134,9 @@ $(function(){
                 callback: function(){ console.log('close') }
             });
         }
-    })
+    });
 
-})
+    $(".close").on("click", function () {
+        history.back();
+    })
+});

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

@@ -2,13 +2,13 @@ $(function(){
 
     $(".enterOne").focus(function(){
         $(".btnChoose").show();
-    })
+    });
     $('.knowBtn').on('click',function(){
         $(".problemPop").hide()
-    })
+    });
     $(".problem").on('click',function(){
         $(".problemPop").css("display",'flex');
-    })
+    });
 
     function hasWords () {
         var showKeyWordLength = $(".showKeyWord ul").find('li').length;
@@ -21,12 +21,11 @@ $(function(){
         }
     }
     hasWords();
-
+    
     //添加按钮
     $(".addKeyWord i").on('click',function(){
-        $(".addkeyWord").show();
-        $(".showKeyWord").hide();
-        sessionStorage.removeItem("keyWord")
+        sessionStorage.removeItem("keyWord");
+        window.location.href="/jyapp/front/dataExport/keyWordInput";
     });
 
     // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
@@ -58,7 +57,7 @@ $(function(){
             $(this).next().find(".exclude").prop("disabled", true);
         }
     });
-
+    
     // $('.exclusion input.enterOne').on('input', function() {
     //     var buttonDOM = $(this).siblings().find('button')[0]
     //     if ($(this).val().length >= 1) {
@@ -69,9 +68,9 @@ $(function(){
     //         buttonDOM.setAttribute("disabled", true)
     //     }
     // })
-
+    
     // 添加 按钮的点击事件
-    $('.addkeyWord .btn button').on('click', function(){
+    $('.addkeyWord .btn .save').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val();
         var Obj = {"keyWord": keyWord};
         keyWordArr.push(Obj);
@@ -95,7 +94,7 @@ $(function(){
                         </div>
                     </li>`
         $('.showKeyWord > ul').prepend(html);
-
+        
         // 隐藏
         $(".addkeyWord").hide();
         $('.showKeyWord').show();
@@ -110,11 +109,11 @@ $(function(){
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
         $('.modify span').each(function(item){
             $('.modify span')[0].contentEditable = true
-        })
+        });
         // console.log($(this).parent().siblings().find('span').text())
-        $(this).parent().hide()
+        $(this).parent().hide();
         $(this).parent().siblings().css('display','block')
-    })
+    });
 
     // 编辑删除
     $('.showKeyWord').on('click', '.deleteKey', function(e) {
@@ -142,8 +141,8 @@ $(function(){
     })
     // 编辑确定
     $('.showKeyWord').on('click', '.ascertainKey', function(e) {
-        var $this = $(this)
-        var keyWord = $(this).siblings('span').text()
+        var $this = $(this);
+        var keyWord = $(this).siblings('span').text();
         var keyWords = $(this).parent().prev().find('.key').text();
         for(var i in keyWordArr){
             if(keyWordArr[i].keyWord === keyWords){
@@ -177,7 +176,7 @@ $(function(){
     //去空格方法
     String.prototype.trim = function(){
         return this.replace(/(^\s*)|(\s*$)/g, ' ');
-    }
+     }
 
     //关键词个数
     $('.modify span').keydown(function(){
@@ -201,5 +200,5 @@ $(function(){
     //     $('.exclusion').show();
     //     $('.showKeyWord').hide();
     // })
-
+    
 })

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

@@ -6,15 +6,15 @@
     <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="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}">
-    <script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/js/jquery.js"></script>
-    <link rel="stylesheet" href="/jyapp/mobiscroll/mobiscroll.min.css?v={{Msg "seo" "version"}}">
-    <script src="/jyapp/mobiscroll/mobiscroll.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/mobiscroll/mobiscroll.min.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/mobiscroll/mobiscroll.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style>
     .mbsc-ios .dwbc{

src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.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>
-    <link rel="stylesheet" href="/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
-    <script src="/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
+    <script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style>
     .app-layout-header{
@@ -30,6 +30,9 @@
     body{
         background: rgba(245,244,249,1)!important;
     }
+    .keyWord .enter .btn .save {
+        float: right;
+    }
 </style>
 <body>
 <div class="app-layout-header">
@@ -41,7 +44,8 @@
 <div class="enter addkeyWord">
     <input type="text" class="enterOne" placeholder="请输入附加词" />
     <div class="btn">
-    <button disabled>确认</button>
+    <button class="save" disabled>确认</button>
+    <button class="close">取消</button>
 </div>
 </div>
 
@@ -85,14 +89,48 @@
     </div>
 
     </div>
-    <script src="/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
         var keyWordArr = [];
         var keyWordsArr = [];
         var appendedArr = [];
         var url = location.href;
         var token = decodeURI(url.match(/=.*/)).replace("=", "");
+        var tokens = "";
+        if(token.indexOf("_in")===-1){
+            tokens = token;
+        }else{
+            tokens = token.split("_")[0];
+            window.onload = function(){
+                backListen();
+            };
+        }
+        //
+        // 监听浏览器回退事件
+        function backListen () {
+            if (window.history && window.history.pushState) {
+                $(window).on('popstate', function () { // 点击后退会触发popstate事件
+                    var hashLocation = location.hash; // 获取点击后的页面的hash值
+                    var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
+                    var hashName = hashSplit[1]; // 取数组的第一个
+
+                    // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
+                    if (hashName !== '') {
+                        var hash = window.location.hash;
+                        if (hash === '') { // 如果当前页面没有哈希值
+
+                            sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
+
+                            // 强行回退一步，就不用多点一次了😎
+                            history.go(-2); // 直接跳过没有哈希值的页面，就不会出现要点两次才能回到真正的上一页了
+                        }
+                    }
+                });
+                // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
+                window.history.pushState('forward', null, '#');
+            }
+        }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -101,8 +139,8 @@
             keyWordsArr = JSON.parse(sessionStorage.keyWord);
             var shtml = "";
             for(var x in keyWordsArr){
-                appendedArr = keyWordsArr[x].appended;
-                if(keyWordsArr[x].keyWord === token){
+                if(keyWordsArr[x].keyWord === tokens){
+                    appendedArr = keyWordsArr[x].appended;
                     if(appendedArr !== undefined){
                         for(var y in appendedArr){
                             shtml +=
@@ -134,7 +172,7 @@
                 for(var i in keyWordArr){
                     var keyWords = keyWordArr[i].keyWord;
                     var appendeds = keyWordArr[i].appended;
-                    if(keyWords === token){
+                    if(keyWords === tokens){
                         appendedArr = appendeds;
                         if(appendeds !== undefined){
                             for(var m in appendeds){
@@ -185,8 +223,9 @@
 
             // 添加按钮
             $(".addKeyWord i").on('click',function(){
-                $(".addkeyWord").show();
-                $(".showKeyWord").hide();
+                var keyWord = tokens;
+                sessionStorage.removeItem("keyWord");
+                window.location.href="/jyapp/front/dataExport/appendedInput?keyWord="+keyWord;
             });
 
             // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
@@ -221,13 +260,13 @@
                 }
                 appendedArr.push(appended);
                 for(var i in keyWordArr){
-                    if(keyWordArr[i].keyWord === token){
+                    if(keyWordArr[i].keyWord === tokens){
                         keyWordArr[i].appended = appendedArr
                     }
                 }
                 if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
                     for(var m in keyWordsArr){
-                        if(keyWordsArr[m].keyWord === token){
+                        if(keyWordsArr[m].keyWord === tokens){
                             keyWordsArr[m].appended = appendedArr
                         }
                     }
@@ -267,7 +306,6 @@
                 var buttonDOM = $('.enter.addkeyWord .btn button')[0];
                 buttonDOM.style.opacity = .5;
                 buttonDOM.setAttribute("disabled", true)
-
             });
 
             // 编辑
@@ -285,7 +323,7 @@
                 var appended = $(this).parent().prev().find('.key').text();
                 appendedArr.splice($.inArray(appended, appendedArr),1);
                 for(var i in keyWordArr){
-                    if(keyWordArr[i].keyWord === token){
+                    if(keyWordArr[i].keyWord === tokens){
                         keyWordArr[i].appended = appendedArr
                     }
                 }
@@ -294,7 +332,7 @@
                 $(this).parents('li').remove();
                 hasWords()
                 // console.log('删除附加词:',$(this).parent().find('span').text())
-            })
+            });
             // 编辑 确定
             $('.showKeyWord').on('click', '.ascertainKey', function(e) {
                 var appended = $(this).siblings('span').text();
@@ -305,7 +343,7 @@
                     }
                 }
                 for(var m in keyWordArr){
-                    if(keyWordArr[m].keyWord === token){
+                    if(keyWordArr[m].keyWord === tokens){
                         keyWordArr[m].appended = appendedArr
                     }
                 }
@@ -313,12 +351,12 @@
                 localStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parent().siblings().find('.key').text(appended);
                 $(this).parent().hide().siblings().show()
-            })
+            });
 
             //去空格方法
             String.prototype.trim = function(){
                 return this.replace(/(^\s*)|(\s*$)/g, ' ');
-            }
+            };
 
             //附加词个数
             $('.modify span').keydown(function(){
@@ -326,16 +364,19 @@
                 // console.log(olength)
                 if(olength >= 100){
                     $('.fontLength').show();
-                    var s = $(this).text().slice(0,100)
-                    $(this).text(s)
+                    var s = $(this).text().slice(0,100);
+                    $(this).text(s);
                     weui.toast('附加词不能超过100字', {
                         duration: 2000,
                         className: 'text-overflow100',
                         callback: function(){ console.log('close') }
                     });
                 }
-            })
+            });
 
+            $('.addkeyWord .btn .close').on('click', function () {
+                window.history.back();
+            });
         })
 
     </script>

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

@@ -0,0 +1,206 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <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>
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"2>
+    <script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    </head>
+    <style>
+        .app-layout-header{
+            line-height: 44px;
+            background-color: #FFFFFF;
+            text-align: center;
+            border-bottom: 1px solid #E6E6E6;
+            font-size: 17px;
+            position: fixed;
+            padding-top: 20px;
+            z-index: 99999;
+            left: 0;
+            right: 0;
+            top: 0;
+            color: #444444;
+        }
+        body{
+            background: rgba(245,244,249,1)!important;
+        }
+        .keyWord .enter .btn .save {
+            float: right;
+        }
+    </style>
+    <body>
+    <div class="app-layout-header">
+        附加词
+    </div>
+    <div class="keyWord" style="margin-top: 50px;">
+        <p class="title">示例：开发（附加词）</p>
+    <!-- 添加附加词 -->
+    <div class="enter addkeyWord">
+        <input type="text" class="enterOne" placeholder="请输入附加词" />
+        <div class="btn">
+        <button class="save" disabled>确认</button>
+        <button class="close">取消</button>
+    </div>
+    </div>
+
+        <div class="problem">
+        疑问解答 <i class="iconfont icon-wenhao"></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>
+
+        </div>
+        <script src="/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script>
+        var keyWordArr = [];
+        var keyWordsArr = [];
+        var appendedArr = [];
+        var url = location.href;
+        var token = decodeURI(url.match(/=.*/)).replace("=", "");
+        //
+        if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                keyWordArr = JSON.parse(localStorage.keyWord);
+            }
+            keyWordsArr = JSON.parse(sessionStorage.keyWord);
+            for(var x in keyWordsArr) {
+                appendedArr = keyWordsArr[x].appended;
+            }
+        }else{
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                var keyWord = localStorage.keyWord;
+                keyWordArr = JSON.parse(keyWord);
+            }
+            for(var i in keyWordArr) {
+                var keyWords = keyWordArr[i].keyWord;
+                var appendeds = keyWordArr[i].appended;
+                if (keyWords === token) {
+                    appendedArr = appendeds;
+                }
+            }
+        }
+
+        $(function(){
+
+            $('.knowBtn').on('click',function(){
+                $(".problemPop").hide()
+            });
+            $(".problem").on('click',function(){
+                $(".problemPop").css("display",'flex');
+            });
+
+            // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
+            $('.addkeyWord input.enterOne').on('input', function() {
+                if ($(this).val().length >= 100) {
+                    var s = $(this).val().slice(0,100);
+                    $(this).val(s);
+
+                    weui.toast('附加词不能超过100字', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){ console.log('close') }
+                    });
+                    return
+                }
+
+                var buttonDOM = $(this).siblings().find('button')[0];
+                if ($(this).val().length >= 1) {
+                    buttonDOM.style.opacity = 1;
+                    buttonDOM.removeAttribute("disabled")
+                } else {
+                    buttonDOM.style.opacity = .5;
+                    buttonDOM.setAttribute("disabled", true)
+                }
+            });
+
+            // 添加 按钮的点击事件
+            $('.addkeyWord .btn .save').on('click', function(){
+                var appended = $('.addkeyWord input.enterOne').val();
+                if(appendedArr===undefined){
+                    appendedArr = [];
+                }
+                appendedArr.push(appended);
+                for(var i in keyWordArr){
+                    if(keyWordArr[i].keyWord === token){
+                        keyWordArr[i].appended = appendedArr
+                    }
+                }
+                if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+                    for(var m in keyWordsArr){
+                        if(keyWordsArr[m].keyWord === token){
+                            keyWordsArr[m].appended = appendedArr
+                        }
+                    }
+                    keyWordArr.push(keyWordsArr[0]);
+                    for (var x = 0; x < keyWordArr.length; x++) {
+                        for (var j =x+1; j <keyWordArr.length; ) {
+                            if (keyWordArr[x].keyWord === keyWordArr[j].keyWord && keyWordArr[x].exclude === keyWordArr[j].exclude && keyWordArr[x].appended === keyWordArr[j].appended) {
+                                keyWordArr.splice(j, 1);
+                            }
+                            else j++;
+                        }
+                    }
+                }
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
+                localStorage.keyWord = JSON.stringify(keyWordArr);
+                window.history.back();
+            });
+
+            //去空格方法
+            String.prototype.trim = function(){
+                return this.replace(/(^\s*)|(\s*$)/g, ' ');
+            };
+
+            //附加词个数
+            $('.modify span').keydown(function(){
+                var olength = $(this).text().replace(/\s+/g,'').length;
+                // console.log(olength)
+                if(olength >= 100){
+                    $('.fontLength').show();
+                    var s = $(this).text().slice(0,100);
+                    $(this).text(s);
+                    weui.toast('附加词不能超过100字', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){ console.log('close') }
+                    });
+                }
+            });
+
+            $('.addkeyWord .btn .close').on('click', function () {
+                window.history.back();
+            });
+        })
+
+    </script>
+</body>
+
+</html>

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

@@ -530,7 +530,7 @@
 					 localStorage.city = citys.toString();
 					 localStorage.province = province.toString();
 					 localStorage.area = html;
-					 window.location.href = "/front/wx_dataExport/toSieve";
+					 history.back();
 				 });
 				$('.reset-btn').click(function(){
 					$('input[type="checkbox"]').attr("checked",false);

src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.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>
-	<link rel="stylesheet" href="/wx_dataExport/css/base.css">
-	<link rel="stylesheet" href="/wx_dataExport/iconfont/iconfont.css">
-	<link rel="stylesheet" href="/wx_dataExport/css/weui.min.css">
-	<link rel="stylesheet" href="/wx_dataExport/css/keyWord.css">
-	<script src="/wx_dataExport/js/rem.js"></script>
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css">
+	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css">
+	<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js"></script>
 </head>
 <style>
 	.keyWord .addKeyWord {
@@ -33,6 +33,12 @@
 		top: 0;
 		color: #444444;
 	}
+	body{
+		background: rgba(245,244,249,1)!important;
+	}
+	.keyWord .enter .btn .save-btn {
+		float: right;
+	}
 </style>
 
 <body>
@@ -44,6 +50,7 @@
 		<input type="text" class="enterOne" placeholder="采购单位名称" />
 		<div class="btn">
 			<button disabled class="save-btn">确认</button>
+			<button class="close">取消</button>
 		</div>
 	</div>
 
@@ -59,9 +66,9 @@
 		</div>
 	</div>
 </div>
-<script src="/wx_dataExport/js/zepto.js"></script>
-<script src="/wx_dataExport/js/weui.min.js"></script>
-<script src="/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}25"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}25"></script>
 <script>
 	var buyerArr = [];
 	if(localStorage.buyer !== "" && localStorage.buyer !== undefined){

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

@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <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>
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}2">
+    <script src="/jyapp/wx_dataExport/js/rem.js"></script>
+    </head>
+    <style>
+        .keyWord .addKeyWord {
+            width: 100%;
+            position: fixed;
+            top: 100%;
+            text-align: center;
+        }
+        .app-layout-header{
+            line-height: 44px;
+            background-color: #FFFFFF;
+            text-align: center;
+            border-bottom: 1px solid #E6E6E6;
+            font-size: 17px;
+            position: fixed;
+            padding-top: 20px;
+            z-index: 99999;
+            left: 0;
+            right: 0;
+            top: 0;
+            color: #444444;
+        }
+        body{
+            background: rgba(245,244,249,1)!important;
+        }
+        .keyWord .enter .btn .save-btn {
+            float: right;
+        }
+    </style>
+
+    <body>
+    <div class="app-layout-header">
+        采购单位
+    </div>
+    <div class="keyWord" style="margin-top: 40px;">
+        <div class="enter addkeyWord">
+        <input type="text" class="enterOne" placeholder="采购单位名称" />
+        <div class="btn">
+        <button disabled class="save-btn">确认</button>
+        <button class="close">取消</button>
+        </div>
+        </div>
+
+        <!-- 添加附加词显示列表 -->
+        <div class="showKeyWord">
+        <ul>
+
+
+        </ul>
+
+        <div class="addKeyWord">
+        <i class="iconfont icon-tianjia"></i>
+        </div>
+        </div>
+        </div>
+        <script src="/jyapp/wx_dataExport/js/zepto.js"></script>
+    <script src="/jyapp/wx_dataExport/js/weui.min.js"></script>
+    <script>
+        var buyerArr = [];
+        if(localStorage.buyer !== "" && localStorage.buyer !== undefined) {
+            var buyer = localStorage.buyer.split(",");
+            buyerArr = buyer;
+        }
+
+        $('.knowBtn').on('click',function(){
+            $(".problemPop").hide()
+        });
+        $(".problem").on('click',function(){
+            $(".problemPop").css("display",'flex');
+        });
+        // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
+        $('.addkeyWord input.enterOne').on('input', function() {
+            if ($(this).val().length >= 100) {
+                var s = $(this).val().slice(0,100);
+                $(this).val(s);
+
+                weui.toast('附加词不能超过100字', {
+                    duration: 2000,
+                    className: 'text-overflow100',
+                    callback: function(){ console.log('close') }
+                });
+                return
+            }
+
+            var buttonDOM = $(this).siblings().find('button')[0];
+            if ($(this).val().length >= 1) {
+                buttonDOM.style.opacity = 1;
+                buttonDOM.removeAttribute("disabled")
+            } else {
+                buttonDOM.style.opacity = .5;
+                buttonDOM.setAttribute("disabled", true)
+            }
+        });
+
+        // 添加 按钮的点击事件
+        $('.addkeyWord .btn .save-btn').on('click', function(){
+            var keyWord = $('.addkeyWord input.enterOne').val();
+            buyerArr.push(keyWord);
+            localStorage.setItem("buyer", buyerArr);
+            history.back();
+        });
+
+        //去空格方法
+        String.prototype.trim = function(){
+            return this.replace(/(^\s*)|(\s*$)/g, ' ');
+        };
+
+        //附加词个数
+        $('.modify span').keydown(function(){
+            var olength = $(this).text().replace(/\s+/g,'').length;
+            // console.log(olength)
+            if(olength >= 100){
+                $('.fontLength').show();
+                var s = $(this).text().slice(0,100);
+                $(this).text(s);
+                weui.toast('附加词不能超过100字', {
+                    duration: 2000,
+                    className: 'text-overflow100',
+                    callback: function(){ console.log('close') }
+                });
+            }
+        });
+
+        $(".close").on("click", function () {
+            history.back();
+        })
+
+    </script>
+
+</body>
+
+</html>

src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.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>
-    <link rel="stylesheet" href="/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
-    <script src="/wx_dataExport/js/rem.js"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js"></script>
 </head>
 <style>
     .app-layout-header{
@@ -30,6 +30,9 @@
     body{
         background: rgba(245,244,249,1)!important;
     }
+    .keyWord .enter .btn .save {
+        float: right;
+    }
 </style>
 <body>
 <div class="app-layout-header">
@@ -41,7 +44,8 @@
 <div class="enter addkeyWord">
     <input type="text" class="enterOne" placeholder="请输入排除词" />
     <div class="btn">
-    <button disabled>确认</button>
+    <button class="save" disabled>确认</button>
+    <button class="close">取消</button>
 </div>
 </div>
 
@@ -85,14 +89,47 @@
     </div>
 
     </div>
-    <script src="/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
         var keyWordArr = [];
         var keyWordsArr = [];
         var excludeArr = [];
         var url = location.href;
         var token = decodeURI(url.match(/=.*/)).replace("=", "");
+        var tokens = "";
+        if(token.indexOf("_in")===-1){
+            tokens = token;
+        }else{
+            tokens = token.split("_")[0];
+            window.onload = function(){
+                backListen();
+            };
+        }
+        // 监听浏览器回退事件
+        function backListen () {
+            if (window.history && window.history.pushState) {
+                $(window).on('popstate', function () { // 点击后退会触发popstate事件
+                    var hashLocation = location.hash; // 获取点击后的页面的hash值
+                    var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
+                    var hashName = hashSplit[1]; // 取数组的第一个
+
+                    // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
+                    if (hashName !== '') {
+                        var hash = window.location.hash;
+                        if (hash === '') { // 如果当前页面没有哈希值
+
+                            sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
+
+                            // 强行回退一步，就不用多点一次了😎
+                            history.go(-2); // 直接跳过没有哈希值的页面，就不会出现要点两次才能回到真正的上一页了
+                        }
+                    }
+                });
+                // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
+                window.history.pushState('forward', null, '#');
+            }
+        }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -101,26 +138,26 @@
             keyWordsArr = JSON.parse(sessionStorage.keyWord);
             var shtml = "";
             for(var x in keyWordsArr){
-                excludeArr = keyWordsArr[x].exclude;
-                if(keyWordsArr[x].keyWord === token){
+                if(keyWordsArr[x].keyWord === tokens){
+                    excludeArr = keyWordsArr[x].exclude;
                     if(excludeArr !== undefined){
                         for(var y in excludeArr){
                             shtml +=
                                 `<li>
-                                <div class="one">
-                                    <div>
-                                        <span>
-                                            <p class="key">${ excludeArr[y] }</p>
-                                        </span>
+                                    <div class="one">
+                                        <div>
+                                            <span>
+                                                <p class="key">${ excludeArr[y] }</p>
+                                            </span>
+                                        </div>
+                                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                     </div>
-                                    <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                                </div>
-                                <div class="modify">
-                                    <span contentEditable="true">${ excludeArr[y] }</span>
-                                    <button class="deleteKey">删除</button>
-                                    <button class="ascertainKey">确定</button>
-                                </div>
-                            </li>`
+                                    <div class="modify">
+                                        <span contentEditable="true">${ excludeArr[y] }</span>
+                                        <button class="deleteKey">删除</button>
+                                        <button class="ascertainKey">确定</button>
+                                    </div>
+                                </li>`
                         }
                     }
                 }
@@ -134,26 +171,26 @@
                 for(var i in keyWordArr){
                     var keyWords = keyWordArr[i].keyWord;
                     var excludes = keyWordArr[i].exclude;
-                    if(keyWords === token){
+                    if(keyWords === tokens){
                         excludeArr = excludes;
                         if(excludes !== undefined){
                             for(var m in excludes){
                                 html +=
                                     `<li>
-                                <div class="one">
-                                    <div>
-                                        <span>
-                                            <p class="key">${ excludes[m] }</p>
-                                        </span>
+                                    <div class="one">
+                                        <div>
+                                            <span>
+                                                <p class="key">${ excludes[m] }</p>
+                                            </span>
+                                        </div>
+                                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                                    </div>
+                                    <div class="modify">
+                                        <span contentEditable="true">${ excludes[m] }</span>
+                                        <button class="deleteKey">删除</button>
+                                        <button class="ascertainKey">确定</button>
                                     </div>
-                                    <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                                </div>
-                                <div class="modify">
-                                    <span contentEditable="true">${ excludes[m] }</span>
-                                    <button class="deleteKey">删除</button>
-                                    <button class="ascertainKey">确定</button>
-                                </div>
-                            </li>`
+                                </li>`
                             }
                         }
                     }
@@ -185,8 +222,9 @@
 
             // 添加按钮
             $(".addKeyWord i").on('click',function(){
-                $(".addkeyWord").show();
-                $(".showKeyWord").hide();
+                var keyWord = tokens;
+                sessionStorage.removeItem("keyWord");
+                window.location.href="/jyapp/front/dataExport/excludeInput?keyWord="+keyWord;
             });
 
             // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
@@ -221,13 +259,13 @@
                 }
                 excludeArr.push(exclude);
                 for(var i in keyWordArr){
-                    if(keyWordArr[i].keyWord === token){
+                    if(keyWordArr[i].keyWord === tokens){
                         keyWordArr[i].exclude = excludeArr
                     }
                 }
                 if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
                     for(var m in keyWordsArr){
-                        if(keyWordsArr[m].keyWord === token){
+                        if(keyWordsArr[m].keyWord === tokens){
                             keyWordsArr[m].exclude = excludeArr
                         }
                     }
@@ -244,20 +282,20 @@
                 localStorage.keyWord = JSON.stringify(keyWordArr);
                 sessionStorage.keyWord = JSON.stringify(keyWordsArr);
                 var html = `<li>
-                                    <div class="one">
-                                        <div>
-                                            <span>
-                                                <p class="key">${ exclude }</p>
-                                            </span>
+                                        <div class="one">
+                                            <div>
+                                                <span>
+                                                    <p class="key">${ exclude }</p>
+                                                </span>
+                                            </div>
+                                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                         </div>
-                                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                                    </div>
-                                    <div class="modify">
-                                        <span contentEditable="true">${ exclude }</span>
-                                        <button class="deleteKey">删除</button>
-                                        <button class="ascertainKey">确定</button>
-                                    </div>
-                                </li>`;
+                                        <div class="modify">
+                                            <span contentEditable="true">${ exclude }</span>
+                                            <button class="deleteKey">删除</button>
+                                            <button class="ascertainKey">确定</button>
+                                        </div>
+                                    </li>`;
                 $('.showKeyWord > ul').prepend(html);
 
                 // 隐藏
@@ -267,7 +305,6 @@
                 var buttonDOM = $('.enter.addkeyWord .btn button')[0];
                 buttonDOM.style.opacity = .5;
                 buttonDOM.setAttribute("disabled", true)
-
             });
 
             // 编辑
@@ -285,7 +322,7 @@
                 var exclude = $(this).parent().prev().find('.key').text();
                 excludeArr.splice($.inArray(exclude, excludeArr),1);
                 for(var i in keyWordArr){
-                    if(keyWordArr[i].keyWord === token){
+                    if(keyWordArr[i].keyWord === tokens){
                         keyWordArr[i].exclude = excludeArr
                     }
                 }
@@ -305,7 +342,7 @@
                     }
                 }
                 for(var m in keyWordArr){
-                    if(keyWordArr[m].keyWord === token){
+                    if(keyWordArr[m].keyWord === tokens){
                         keyWordArr[m].exclude = excludeArr
                     }
                 }
@@ -334,8 +371,11 @@
                         callback: function(){ console.log('close') }
                     });
                 }
-            })
+            });
 
+            $('.addkeyWord .btn .close').on('click', function () {
+                window.history.back();
+            });
         })
 
     </script>

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

@@ -0,0 +1,218 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <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>
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}"3>
+    <script src="/jyapp/wx_dataExport/js/rem.js"></script>
+    </head>
+    <style>
+        .app-layout-header{
+            line-height: 44px;
+            background-color: #FFFFFF;
+            text-align: center;
+            border-bottom: 1px solid #E6E6E6;
+            font-size: 17px;
+            position: fixed;
+            padding-top: 20px;
+            z-index: 99999;
+            left: 0;
+            right: 0;
+            top: 0;
+            color: #444444;
+        }
+        body{
+            background: rgba(245,244,249,1)!important;
+        }
+        .keyWord .enter .btn .save {
+            float: right;
+        }
+    </style>
+    <body>
+    <div class="app-layout-header">
+        排除词
+    </div>
+    <div class="keyWord" style="margin-top: 50px;">
+        <p class="title">示例：运维（排除词）</p>
+    <!-- 添加附加词 -->
+    <div class="enter addkeyWord">
+        <input type="text" class="enterOne" placeholder="请输入排除词" />
+        <div class="btn">
+        <button class="save" disabled>确认</button>
+        <button class="close">取消</button>
+    </div>
+    </div>
+
+    <!-- 添加附加词显示列表 -->
+    <div class="showKeyWord">
+        <ul>
+
+        </ul>
+
+        </div>
+
+        <div class="addKeyWord">
+        <i class="iconfont icon-tianjia"></i>
+        </div>
+
+        <div class="problem">
+        疑问解答 <i class="iconfont icon-wenhao"></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>
+
+        </div>
+        <script src="/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script>
+        var keyWordArr = [];
+        var keyWordsArr = [];
+        var excludeArr = [];
+        var url = location.href;
+        var token = decodeURI(url.match(/=.*/)).replace("=", "");
+        //
+        if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                keyWordArr = JSON.parse(localStorage.keyWord);
+            }
+            keyWordsArr = JSON.parse(sessionStorage.keyWord);
+            for(var x in keyWordsArr){
+                excludeArr = keyWordsArr[x].exclude;
+            }
+        }else{
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined) {
+                var keyWord = localStorage.keyWord;
+                keyWordArr = JSON.parse(keyWord);
+            }
+            for(var i in keyWordArr){
+                var keyWords = keyWordArr[i].keyWord;
+                var excludes = keyWordArr[i].exclude;
+                if(keyWords === token){
+                    excludeArr = excludes;
+                }
+            }
+        }
+
+        $(function(){
+
+            $('.knowBtn').on('click',function(){
+                $(".problemPop").hide()
+            });
+            $(".problem").on('click',function(){
+                $(".problemPop").css("display",'flex');
+            });
+
+            // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
+            $('.addkeyWord input.enterOne').on('input', function() {
+                if ($(this).val().length >= 100) {
+                    var s = $(this).val().slice(0,100);
+                    $(this).val(s);
+
+                    weui.toast('附加词不能超过100字', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){ console.log('close') }
+                    });
+                    return
+                }
+
+                var buttonDOM = $(this).siblings().find('button')[0];
+                if ($(this).val().length >= 1) {
+                    buttonDOM.style.opacity = 1;
+                    buttonDOM.removeAttribute("disabled")
+                } else {
+                    buttonDOM.style.opacity = .5;
+                    buttonDOM.setAttribute("disabled", true)
+                }
+            });
+
+            // 添加 按钮的点击事件
+            $('.addkeyWord .btn button').on('click', function(){
+                var exclude = $('.addkeyWord input.enterOne').val();
+                if(excludeArr===undefined){
+                    excludeArr = [];
+                }
+                excludeArr.push(exclude);
+                for(var i in keyWordArr){
+                    if(keyWordArr[i].keyWord === token){
+                        keyWordArr[i].exclude = excludeArr
+                    }
+                }
+                if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+                    for(var m in keyWordsArr){
+                        if(keyWordsArr[m].keyWord === token){
+                            keyWordsArr[m].exclude = excludeArr
+                        }
+                    }
+                    keyWordArr.push(keyWordsArr[0]);
+                    for (var x = 0; x < keyWordArr.length; x++) {
+                        for (var j =x+1; j <keyWordArr.length; ) {
+                            if (keyWordArr[x].keyWord === keyWordArr[j].keyWord && keyWordArr[x].exclude === keyWordArr[j].exclude && keyWordArr[x].appended === keyWordArr[j].appended) {
+                                keyWordArr.splice(j, 1);
+                            }
+                            else j++;
+                        }
+                    }
+                }
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
+                localStorage.keyWord = JSON.stringify(keyWordArr);
+                window.history.back();
+            });
+
+            //去空格方法
+            String.prototype.trim = function(){
+                return this.replace(/(^\s*)|(\s*$)/g, ' ');
+            };
+
+            //附加词个数
+            $('.modify span').keydown(function(){
+                var olength = $(this).text().replace(/\s+/g,'').length;
+                // console.log(olength)
+                if(olength >= 100){
+                    $('.fontLength').show();
+                    var s = $(this).text().slice(0,100);
+                    $(this).text(s);
+                    weui.toast('附加词不能超过100字', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){ console.log('close') }
+                    });
+                }
+            });
+
+            $('.addkeyWord .btn .close').on('click', function () {
+                window.history.back();
+            });
+        })
+
+    </script>
+</body>
+
+</html>

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="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/industry.css?v={{Msg "seo" "version"}}">
-    <script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/industry.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 </head>
     <style>
         .active{
@@ -277,7 +277,7 @@
                     html = "全部";
                 }
                 localStorage.industry = html;
-                window.location.href = "/jyapp/front/dataExport/toSieve";
+                history.back();
             });
             //
             if(localStorage.industry !== "" && localStorage.industry!==undefined){

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

@@ -6,12 +6,12 @@
     <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>
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
-    <script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/js/jquery.js"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 </head>
 <style>
     .keyWord .addKeyWord {
@@ -38,6 +38,9 @@
     body{
         background: rgba(245,244,249,1)!important;
     }
+    .keyWord .enter .btn .save {
+        float: right;
+    }
 </style>
 <body>
     <div class="app-layout-header">
@@ -53,7 +56,8 @@
                 <button class="addExclusion" disabled>添加 排除词</button>
             </div>
             <div class="btn">
-                <button disabled>确认</button>
+                <button class="save" disabled>确认</button>
+                <button class="close">取消</button>
             </div>
         </div>
 
@@ -106,9 +110,9 @@
         </div>
 
     </div>
-    <script src="/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}12"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}13"></script>
     <script>
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -120,115 +124,105 @@
                 var exclude = keyWordArr[i].exclude;
                 if(append !== undefined && exclude === undefined){
                     keyWordHtml += `
-                    <li>
-                        <div class="one">
-                            <div>
-                                <span>
-                                    <strong> 关键词：</strong>
-                                    <p class="key">${ keyWordArr[i].keyWord }</p>
-                                </span>
-                                <span>
-                                    <strong> 附加词：</strong>
-                                    <p class="addition">${ append }</p>
-                                </span>
+                        <li>
+                            <div class="one">
+                                <div>
+                                    <span>
+                                        <strong> 关键词：</strong>
+                                        <p class="key">${ keyWordArr[i].keyWord }</p>
+                                    </span>
+                                    <span>
+                                        <strong> 附加词：</strong>
+                                        <p class="addition">${ append }</p>
+                                    </span>
+                                </div>
+                                <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
-                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                        </div>
-                        <div class="modify">
-                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
-                            <button class="addAdjunctWord">编辑 附加词</button>
-                            <button class="addExclusion">添加 排除词</button>
-                            <button class="deleteKey">删除</button>
-                            <button class="ascertainKey">确定</button>
-                        </div>
-                    </li>`;
+                            <div class="modify">
+                                <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <button class="addAdjunctWord">编辑 附加词</button>
+                                <button class="addExclusion">添加 排除词</button>
+                                <button class="deleteKey">删除</button>
+                                <button class="ascertainKey">确定</button>
+                            </div>
+                        </li>`;
                 }else if(append === undefined && exclude !== undefined){
                     keyWordHtml += `
-                    <li>
-                        <div class="one">
-                            <div>
-                                <span>
-                                    <strong> 关键词：</strong>
-                                    <p class="key">${ keyWordArr[i].keyWord }</p>
-                                </span>
-                                <span>
-                                    <strong> 排除词：</strong>
-                                    <p class="exclusion">${ exclude }</p>
-                                </span>
+                        <li>
+                            <div class="one">
+                                <div>
+                                    <span>
+                                        <strong> 关键词：</strong>
+                                        <p class="key">${ keyWordArr[i].keyWord }</p>
+                                    </span>
+                                    <span>
+                                        <strong> 排除词：</strong>
+                                        <p class="exclusion">${ exclude }</p>
+                                    </span>
+                                </div>
+                                <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
-                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                        </div>
-                        <div class="modify">
-                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
-                            <button class="addAdjunctWord">编辑 附加词</button>
-                            <button class="addExclusion">添加 排除词</button>
-                            <button class="deleteKey">删除</button>
-                            <button class="ascertainKey">确定</button>
-                        </div>
-                    </li>`;
+                            <div class="modify">
+                                <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <button class="addAdjunctWord">编辑 附加词</button>
+                                <button class="addExclusion">添加 排除词</button>
+                                <button class="deleteKey">删除</button>
+                                <button class="ascertainKey">确定</button>
+                            </div>
+                        </li>`;
                 }else if(append !== undefined && exclude !== undefined){
                     keyWordHtml += `
-                    <li>
-                        <div class="one">
-                            <div>
-                                <span>
-                                    <strong> 关键词：</strong>
-                                    <p class="key">${ keyWordArr[i].keyWord }</p>
-                                </span>
-                                <span>
-                                    <strong> 附加词：</strong>
-                                    <p class="addition">${ append }</p>
-                                </span>
-                                <span>
-                                    <strong> 排除词：</strong>
-                                    <p class="exclusion">${ exclude }</p>
-                                </span>
+                        <li>
+                            <div class="one">
+                                <div>
+                                    <span>
+                                        <strong> 关键词：</strong>
+                                        <p class="key">${ keyWordArr[i].keyWord }</p>
+                                    </span>
+                                    <span>
+                                        <strong> 附加词：</strong>
+                                        <p class="addition">${ append }</p>
+                                    </span>
+                                    <span>
+                                        <strong> 排除词：</strong>
+                                        <p class="exclusion">${ exclude }</p>
+                                    </span>
+                                </div>
+                                <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
-                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                        </div>
-                        <div class="modify">
-                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
-                            <button class="addAdjunctWord">编辑 附加词</button>
-                            <button class="addExclusion">添加 排除词</button>
-                            <button class="deleteKey">删除</button>
-                            <button class="ascertainKey">确定</button>
-                        </div>
-                    </li>`;
+                            <div class="modify">
+                                <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <button class="addAdjunctWord">编辑 附加词</button>
+                                <button class="addExclusion">添加 排除词</button>
+                                <button class="deleteKey">删除</button>
+                                <button class="ascertainKey">确定</button>
+                            </div>
+                        </li>`;
                 }else if(append === undefined && exclude === undefined){
                     keyWordHtml += `
-                    <li>
-                        <div class="one">
-                            <div>
-                                <span>
-                                    <strong> 关键词：</strong>
-                                    <p class="key">${ keyWordArr[i].keyWord }</p>
-                                </span>
+                        <li>
+                            <div class="one">
+                                <div>
+                                    <span>
+                                        <strong> 关键词：</strong>
+                                        <p class="key">${ keyWordArr[i].keyWord }</p>
+                                    </span>
+                                </div>
+                                <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                             </div>
-                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                        </div>
-                        <div class="modify">
-                            <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
-                            <button class="addAdjunctWord">编辑 附加词</button>
-                            <button class="addExclusion">添加 排除词</button>
-                            <button class="deleteKey">删除</button>
-                            <button class="ascertainKey">确定</button>
-                        </div>
-                    </li>`;
+                            <div class="modify">
+                                <span contentEditable="true">${ keyWordArr[i].keyWord }</span>
+                                <button class="addAdjunctWord">编辑 附加词</button>
+                                <button class="addExclusion">添加 排除词</button>
+                                <button class="deleteKey">删除</button>
+                                <button class="ascertainKey">确定</button>
+                            </div>
+                        </li>`;
                 }
                 keyWordHtml = keyWordHtml.replace(/,/g, " ");
             }
             $('.showKeyWord > ul').prepend(keyWordHtml);
             //
-            $(".showKeyWord").on('click', '.addAdjunctWord',function(e){
-                var keyWord = $(this).parent().prev().find('.key').text();
-                sessionStorage.removeItem("keyWord");
-                window.location.href = "/jyapp/front/dataExport/appended?keyWord="+keyWord;
-            });
-            $(".showKeyWord").on('click', '.addExclusion',function(e){
-                var keyWord = $(this).parent().prev().find('.key').text();
-                sessionStorage.removeItem("keyWord");
-                window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord;
-            });
         }
         //
         if($(".enterOne").val()!==""){
@@ -243,13 +237,30 @@
             buttonDOM.prop("disabled", true);
             var obj = [{"keyWord":keyWord}];
             sessionStorage.keyWord = JSON.stringify(obj);
-            window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
+            window.location.href = "/jyapp/front/dataExport/appendedInput?keyWord="+keyWord;
         });
         $(".exclude").on('click', function () {
             var keyWord = $(this).parent().prev().val();
             var buttonDOM = $('.enter.addkeyWord .btnChoose .exclude');
             buttonDOM.prop("disabled", true);
-            window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
+            var obj = [{"keyWord":keyWord}];
+            sessionStorage.keyWord = JSON.stringify(obj);
+            window.location.href = "/jyapp/front/dataExport/excludeInput?keyWord="+keyWord;
+        });
+        //
+        $(".showKeyWord").on('click', '.addAdjunctWord',function(e){
+            var keyWord = $(this).parent().prev().find('.key').text();
+            sessionStorage.removeItem("keyWord");
+            window.location.href = "/jyapp/front/dataExport/appended?keyWord="+keyWord;
+        });
+        $(".showKeyWord").on('click', '.addExclusion',function(e){
+            var keyWord = $(this).parent().prev().find('.key').text();
+            sessionStorage.removeItem("keyWord");
+            window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord;
+        });
+
+        $('.addkeyWord .btn .close').on('click', function () {
+            window.history.back();
         });
 
 

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

@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <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>
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}2">
+    <script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/jyapp/js/jquery.js"></script>
+</head>
+<style>
+    .app-layout-header{
+        line-height: 44px;
+        background-color: #FFFFFF;
+        text-align: center;
+        border-bottom: 1px solid #E6E6E6;
+        font-size: 17px;
+        position: fixed;
+        padding-top: 20px;
+        z-index: 99999;
+        left: 0;
+        right: 0;
+        top: 0;
+        color: #444444;
+    }
+    body{
+        background: rgba(245,244,249,1)!important;
+    }
+    .keyWord .enter .btn .save {
+        float: right;
+    }
+</style>
+<body>
+<div class="app-layout-header">
+    关键词
+</div>
+<div class="keyWord" style="margin-top: 50px;">
+    <p class="title">示例：软件系统(关键词);  开发(附加词);  运维(排除词)</p>
+    <!-- 添加关键词 -->
+    <div class="enter addkeyWord">
+        <input type="text" class="enterOne" placeholder="请输入关键词" />
+        <div class="btnChoose" style="display:none;">
+            <button class="addAdjunctWord appended" disabled>添加 附加词</button>
+            <button class="addExclusion exclude" disabled>添加 排除词</button>
+        </div>
+        <div class="btn">
+            <button class="save" disabled>确认</button>
+            <button class="close">取消</button>
+        </div>
+    </div>
+
+    <div class="problem">
+        疑问解答 <i class="iconfont icon-wenhao"></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>
+
+</div>
+<script src="/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+<script src="/jyapp/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script>
+    var keyWordArr = [];
+    if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+        var keyWord = localStorage.keyWord;
+        keyWordArr = JSON.parse(keyWord);
+    }
+    //
+    //
+    $(function() {
+        $(".enterOne").focus(function () {
+            $(".btnChoose").show();
+        });
+        $('.knowBtn').on('click', function () {
+            $(".problemPop").hide()
+        });
+        $(".problem").on('click', function () {
+            $(".problemPop").css("display", 'flex');
+        });
+        // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
+        $('.addkeyWord input.enterOne').on('input', function () {
+            if ($(this).val().length >= 100) {
+                var s = $(this).val().slice(0, 100)
+                $(this).val(s)
+
+                weui.toast('关键词不能超过100字', {
+                    duration: 2000,
+                    className: 'text-overflow100',
+                    callback: function () {
+                        console.log('close')
+                    }
+                });
+                return
+            }
+
+            var buttonDOM = $(this).siblings()[1].children[0];
+            if ($(this).val().length >= 1) {
+                buttonDOM.style.opacity = 1;
+                buttonDOM.removeAttribute("disabled");
+                //
+                $(this).next().find(".appended").prop("disabled", false);
+                $(this).next().find(".exclude").prop("disabled", false);
+            } else {
+                buttonDOM.style.opacity = .5;
+                buttonDOM.setAttribute("disabled", true);
+                //
+                $(this).next().find(".appended").prop("disabled", true);
+                $(this).next().find(".exclude").prop("disabled", true);
+            }
+        });
+
+        // 添加 按钮的点击事件
+        $('.addkeyWord .btn .save').on('click', function () {
+            var keyWord = $('.addkeyWord input.enterOne').val();
+            var Obj = {"keyWord": keyWord};
+            keyWordArr.push(Obj);
+            localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
+            window.history.back();
+        });
+
+        $('.addkeyWord .btn .close').on('click', function () {
+            window.history.back();
+        });
+
+        //去空格方法
+        String.prototype.trim = function(){
+            return this.replace(/(^\s*)|(\s*$)/g, ' ');
+        }
+
+        //关键词个数
+        $('.modify span').keydown(function(){
+            var olength = $(this).text().replace(/\s+/g,'').length;
+            // console.log(olength)
+            if(olength >= 100){
+                $('.fontLength').show();
+                var s = $(this).text().slice(0,100)
+                $(this).text(s)
+                weui.toast('关键词不能超过100字', {
+                    duration: 2000,
+                    className: 'text-overflow100',
+                    callback: function(){
+
+                    }
+                });
+            }
+        })
+    });
+
+
+
+
+    if($(".enterOne").val()!==""){
+        $('.enter.addkeyWord .btnChoose .appended').prop("disabled", false);
+        $('.enter.addkeyWord .btnChoose .exclude').prop("disabled", false);
+        $('.enter.addkeyWord .btn > button').prop("disabled", false);
+        $('.enter.addkeyWord .btn > button').css("opacity", 1);
+    }
+    $(".appended").on('click', function () {
+        var keyWord = $(this).parent().prev().val();
+        var buttonDOM = $('.enter.addkeyWord .btnChoose .appended');
+        buttonDOM.prop("disabled", true);
+        var obj = [{"keyWord":keyWord}];
+        sessionStorage.keyWord = JSON.stringify(obj);
+        window.location.href = "/jyapp/front/dataExport/appended?keyWord="+keyWord+"_in";
+    });
+    $(".exclude").on('click', function () {
+        var keyWord = $(this).parent().prev().val();
+        var buttonDOM = $('.enter.addkeyWord .btnChoose .exclude');
+        buttonDOM.prop("disabled", true);
+        var obj = [{"keyWord":keyWord}];
+        sessionStorage.keyWord = JSON.stringify(obj);
+        window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord+"_in";
+    });
+
+</script>
+</body>
+
+</html>

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

@@ -5,11 +5,11 @@
     <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="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/money.css?v={{Msg "seo" "version"}}">
-    <script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/js/jquery.js"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/money.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
 </head>
 <style>
     .active{
@@ -77,7 +77,7 @@
                 var price = min+"万元-"+max+"万元";
                 localStorage.setItem("price", price);
             }
-            window.location.href = "/jyapp/front/dataExport/toSieve"
+            history.back();
         });
         //
         if(localStorage.price !== ""&&localStorage.price!=undefined){

src/jfw/modules/app/src/web/templates/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>
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="/jyapp/wx_dataExport/css/messageType.css?v={{Msg "seo" "version"}}">
-    <script src="/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/css/messageType.css?v={{Msg "seo" "version"}}">
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 </head>
     <style>
         .active{
@@ -101,7 +101,7 @@
         </div>
 
     </div>
-    <script src="/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script>
            
             function hasActive(){
@@ -188,7 +188,7 @@
                 }
                 console.log(html);
                 localStorage.subType = html;
-                window.location.href = "/jyapp/front/dataExport/toSieve";
+                history.back();
             });
             //
             if(localStorage.subType !== "" && localStorage.subType!==undefined){

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

@@ -36,16 +36,20 @@
 		body{
 			background: rgba(245,244,249,1)!important;
 		}
+		.keyWord .enter .btn .save-btn {
+			float: right;
+		}
 	</style>
 	<body>
 	<div class="app-layout-header">
 		中标单位
 	</div>
-	<div class="keyWord" style="margin-top:35px">
+	<div class="keyWord" style="margin-top:70px;">
 			<div class="enter addkeyWord">
 			<input type="text" class="enterOne" placeholder="中标单位名称" />
 			<div class="btn">
-			<button disabled>确认</button>
+			<button class="save-btn" disabled>确认</button>
+			<button class="close">取消</button>
 	</div>
 	</div>
 
@@ -73,20 +77,20 @@
 			for(var i in winner){
 				html +=
 						`<li>
-                        <div class="one">
-                            <div>
-                                <span>
-                                    <p class="key">${ winner[i] }</p>
-                                </span>
-                            </div>
-                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                        </div>
-                        <div class="modify">
-                            <span contentEditable="true">${ winner[i] }</span>
-                            <button class="deleteKey">删除</button>
-                            <button class="ascertainKey">确定</button>
-                        </div>
-                    </li>`
+							<div class="one">
+								<div>
+									<span>
+										<p class="key">${ winner[i] }</p>
+									</span>
+								</div>
+								<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+							</div>
+							<div class="modify">
+								<span contentEditable="true">${ winner[i] }</span>
+								<button class="deleteKey">删除</button>
+								<button class="ascertainKey">确定</button>
+							</div>
+						</li>`
 			}
 			$('.showKeyWord > ul').prepend(html);
 		}
@@ -109,19 +113,20 @@
 					$(".showKeyWord").show();
 				}
 			}
-			hasWords()
+			hasWords();
 
 			// 添加按钮
 			$(".addKeyWord i").on('click',function(){
 				$(".addkeyWord").show();
 				$(".showKeyWord").hide();
-			})
+				window.location.href="/jyapp/front/dataExport/winnerInput";
+			});
 
 			// 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
 			$('.addkeyWord input.enterOne').on('input', function() {
 				if ($(this).val().length >= 100) {
-					var s = $(this).val().slice(0,100)
-					$(this).val(s)
+					var s = $(this).val().slice(0,100);
+					$(this).val(s);
 
 					weui.toast('附加词不能超过100字', {
 						duration: 2000,
@@ -131,57 +136,57 @@
 					return
 				}
 
-				var buttonDOM = $(this).siblings().find('button')[0]
+				var buttonDOM = $(this).siblings().find('button')[0];
 				if ($(this).val().length >= 1) {
-					buttonDOM.style.opacity = 1
+					buttonDOM.style.opacity = 1;
 					buttonDOM.removeAttribute("disabled")
 				} else {
-					buttonDOM.style.opacity = .5
+					buttonDOM.style.opacity = .5;
 					buttonDOM.setAttribute("disabled", true)
 				}
-			})
+			});
 
 			// 添加 按钮的点击事件
-			$('.addkeyWord .btn button').on('click', function(){
-				var keyWord = $('.addkeyWord input.enterOne').val()
+			$('.addkeyWord .btn .save-btn').on('click', function(){
+				var keyWord = $('.addkeyWord input.enterOne').val();
 				winnerArr.push(keyWord);
 				localStorage.setItem("winner", winnerArr);
 				var html = `<li>
-							<div class="one">
-								<div>
-									<span>
-										<p class="key">${ keyWord }</p>
-									</span>
+								<div class="one">
+									<div>
+										<span>
+											<p class="key">${ keyWord }</p>
+										</span>
+									</div>
+									<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
 								</div>
-								<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-							</div>
-							<div class="modify">
-								<span contentEditable="true">${ keyWord }</span>
-								<button class="deleteKey">删除</button>
-								<button class="ascertainKey">确定</button>
-							</div>
-						</li>`
-				$('.showKeyWord > ul').prepend(html)
+								<div class="modify">
+									<span contentEditable="true">${ keyWord }</span>
+									<button class="deleteKey">删除</button>
+									<button class="ascertainKey">确定</button>
+								</div>
+							</li>`;
+				$('.showKeyWord > ul').prepend(html);
 
 				// 隐藏
 				$(".addkeyWord").hide();
 				$('.showKeyWord').show();
-				$('.enter.addkeyWord > input').val('')
-				var buttonDOM = $('.enter.addkeyWord .btn button')[0]
-				buttonDOM.style.opacity = .5
+				$('.enter.addkeyWord > input').val('');
+				var buttonDOM = $('.enter.addkeyWord .btn button')[0];
+				buttonDOM.style.opacity = .5;
 				buttonDOM.setAttribute("disabled", true)
 
-			})
+			});
 
 			// 编辑
 			$(".showKeyWord").on('click', '.editKeyWord',function(e){
 				$('.modify span').each(function(item){
 					$('.modify span')[0].contentEditable = true
-				})
+				});
 				// console.log($(this).parent().siblings().find('span').text())
-				$(this).parent().hide()
+				$(this).parent().hide();
 				$(this).parent().siblings().css('display','block')
-			})
+			});
 
 			// 编辑 删除
 			$('.showKeyWord').on('click', '.deleteKey', function(e) {
@@ -191,7 +196,7 @@
 				$(this).parents('li').remove();
 				hasWords()
 				// console.log('删除附加词:',$(this).parent().find('span').text())
-			})
+			});
 			// 编辑 确定
 			$('.showKeyWord').on('click', '.ascertainKey', function(e) {
 				var keyWord = $(this).siblings('span').text();
@@ -202,14 +207,14 @@
 					}
 				}
 				localStorage.winner = winnerArr.toString();
-				$(this).parent().siblings().find('.key').text(keyWord)
+				$(this).parent().siblings().find('.key').text(keyWord);
 				$(this).parent().hide().siblings().show()
-			})
+			});
 
 			//去空格方法
 			String.prototype.trim = function(){
 				return this.replace(/(^\s*)|(\s*$)/g, ' ');
-			}
+			};
 
 			//附加词个数
 			$('.modify span').keydown(function(){
@@ -217,16 +222,19 @@
 				// console.log(olength)
 				if(olength >= 100){
 					$('.fontLength').show();
-					var s = $(this).text().slice(0,100)
-					$(this).text(s)
+					var s = $(this).text().slice(0,100);
+					$(this).text(s);
 					weui.toast('附加词不能超过100字', {
 						duration: 2000,
 						className: 'text-overflow100',
 						callback: function(){ console.log('close') }
 					});
 				}
-			})
+			});
 
+			$(".close").on('click', function () {
+				history.back();
+			});
 		})
 
 	</script>

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

@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <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>
+    <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"}}3">
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    </head>
+    <style>
+        .keyWord .addKeyWord {
+            width: 100%;
+            position: fixed;
+            top: 100%;
+            text-align: center;
+        }
+        .app-layout-header{
+            line-height: 44px;
+            background-color: #FFFFFF;
+            text-align: center;
+            border-bottom: 1px solid #E6E6E6;
+            font-size: 17px;
+            position: fixed;
+            padding-top: 20px;
+            z-index: 99999;
+            left: 0;
+            right: 0;
+            top: 0;
+            color: #444444;
+        }
+        body{
+            background: rgba(245,244,249,1)!important;
+        }
+        .keyWord .enter .btn .save-btn {
+            float: right;
+        }
+    </style>
+    <body>
+
+    <div class="keyWord" style="margin-top: 40px;">
+        <div class="enter addkeyWord">
+        <input type="text" class="enterOne" placeholder="中标单位名称" />
+        <div class="btn">
+        <button class="save-btn" disabled>确认</button>
+        <button class="close">取消</button>
+    </div>
+    </div>
+    <div class="app-layout-header">
+        中标单位
+    </div>
+    <!-- 添加附加词显示列表 -->
+    <div class="showKeyWord">
+        <ul>
+
+        </ul>
+
+        <div class="addKeyWord">
+        <i class="iconfont icon-tianjia"></i>
+        </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>
+    var winnerArr = [];
+    if(localStorage.winner !== "" && localStorage.winner !== undefined){
+        var winner = localStorage.winner.split(",");
+        winnerArr = winner;
+    }
+    $(function(){
+
+        $('.knowBtn').on('click',function(){
+            $(".problemPop").hide()
+        });
+        $(".problem").on('click',function(){
+            $(".problemPop").css("display",'flex');
+        });
+
+        // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
+        $('.addkeyWord input.enterOne').on('input', function() {
+            if ($(this).val().length >= 100) {
+                var s = $(this).val().slice(0,100);
+                $(this).val(s);
+
+                weui.toast('附加词不能超过100字', {
+                    duration: 2000,
+                    className: 'text-overflow100',
+                    callback: function(){ console.log('close') }
+                });
+                return
+            }
+
+            var buttonDOM = $(this).siblings().find('button')[0];
+            if ($(this).val().length >= 1) {
+                buttonDOM.style.opacity = 1;
+                buttonDOM.removeAttribute("disabled")
+            } else {
+                buttonDOM.style.opacity = .5;
+                buttonDOM.setAttribute("disabled", true)
+            }
+        });
+
+        // 添加 按钮的点击事件
+        $('.addkeyWord .btn .save-btn').on('click', function(){
+            var keyWord = $('.addkeyWord input.enterOne').val();
+            winnerArr.push(keyWord);
+            localStorage.setItem("winner", winnerArr);
+            history.back();
+        });
+
+        //去空格方法
+        String.prototype.trim = function(){
+            return this.replace(/(^\s*)|(\s*$)/g, ' ');
+        };
+
+        //附加词个数
+        $('.modify span').keydown(function(){
+            var olength = $(this).text().replace(/\s+/g,'').length;
+            // console.log(olength)
+            if(olength >= 100){
+                $('.fontLength').show();
+                var s = $(this).text().slice(0,100);
+                $(this).text(s);
+                weui.toast('附加词不能超过100字', {
+                    duration: 2000,
+                    className: 'text-overflow100',
+                    callback: function(){ console.log('close') }
+                });
+            }
+        });
+
+        $(".close").on('click', function () {
+            history.back();
+        });
+    })
+
+    </script>
+</body>
+
+</html>

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

@@ -16,6 +16,7 @@
     <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js"></script>
 </head>
 <style>
     .mbsc-ios .dwbc{
@@ -190,6 +191,7 @@
     </div>
 
 <script>
+    initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
     $(function(){
         //筛选日期选中
         $(".chooseTime ul li").click(function(){

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

@@ -11,6 +11,8 @@
     <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"}}3">
     <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>
 <body>
 
@@ -68,6 +70,7 @@
     <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>
+        initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         var keyWordArr = [];
         var keyWordsArr = [];
         var appendedArr = [];

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

@@ -14,6 +14,7 @@
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/choose_area.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>
 		<style>
 			#choose_area .main .select-area-box .tab .province .checkbox:checked {
@@ -388,6 +389,7 @@
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/jquery-2.1.4.js"></script>
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
 		<script>
+			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
 			chinaMapJSON.forEach(function(item,index){
 				// console.log(item,index)
 				

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

@@ -11,6 +11,8 @@
 	<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"}}3">
 	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
+	{{include "/common/weixin.html"}}
+	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style>
 	.keyWord .addKeyWord {
@@ -48,6 +50,7 @@
 <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js"></script>
 <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}27"></script>
 <script>
+	initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
 	var buyerArr = [];
 	if(localStorage.buyer !== "" && localStorage.buyer !== undefined){
 		var buyer = localStorage.buyer.split(",");

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

@@ -11,6 +11,8 @@
     <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"}}2">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
+    {{include "/common/weixin.html"}}
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
     </head>
     <style>
     .keyWord .addKeyWord {
@@ -47,6 +49,7 @@
         <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js"></script>
     <script>
+        initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         var buyerArr = [];
         if(localStorage.buyer !== "" && localStorage.buyer !== undefined) {
             var buyer = localStorage.buyer.split(",");

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

@@ -11,6 +11,8 @@
     <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"}}2">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
+    {{include "/common/weixin.html"}}
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <body>
 
@@ -68,6 +70,7 @@
     <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>
+        initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         var keyWordArr = [];
         var keyWordsArr = [];
         var excludeArr = [];
@@ -78,6 +81,33 @@
             tokens = token;
         }else{
             tokens = token.split("_")[0];
+            window.onload = function(){
+                backListen();
+            };
+        }
+        // 监听浏览器回退事件
+        function backListen () {
+            if (window.history && window.history.pushState) {
+                $(window).on('popstate', function () { // 点击后退会触发popstate事件
+                    var hashLocation = location.hash; // 获取点击后的页面的hash值
+                    var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
+                    var hashName = hashSplit[1]; // 取数组的第一个
+
+                    // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
+                    if (hashName !== '') {
+                        var hash = window.location.hash;
+                        if (hash === '') { // 如果当前页面没有哈希值
+
+                            sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
+
+                            // 强行回退一步，就不用多点一次了😎
+                            history.go(-2); // 直接跳过没有哈希值的页面，就不会出现要点两次才能回到真正的上一页了
+                        }
+                    }
+                });
+                // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
+                window.history.pushState('forward', null, '#');
+            }
         }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){

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

@@ -11,6 +11,8 @@
     <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"}}"3>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
+    {{include "/common/weixin.html"}}
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
     </head>
     <body>
 
@@ -68,6 +70,7 @@
         <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>
+        initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         var keyWordArr = [];
         var keyWordsArr = [];
         var excludeArr = [];

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

@@ -10,6 +10,7 @@
     <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>
     <style>
         .active{
@@ -162,128 +163,128 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script>
-           
-            function hasActive(){
-                var arr = [];
-                if( $(".list ul li dl dd").hasClass('active')||$(".list ul li dl dt").hasClass('active')){
-                    $(".consfirm").hide()
-                    $(".resetOne").show()
-                }else{
-                        $(".consfirm").show()
-                        $(".resetOne").hide()
-                }
-                
-                $(".list ul li dl dd").each(function(index){
-                        if($(this).hasClass('active')){
-                            arr.push('dcs')
-                        }else{
-                            arr.unshift()
-                        }
-                })
+        initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+        function hasActive(){
+            var arr = [];
+            if( $(".list ul li dl dd").hasClass('active')||$(".list ul li dl dt").hasClass('active')){
+                $(".consfirm").hide()
+                $(".resetOne").show()
+            }else{
+                    $(".consfirm").show()
+                    $(".resetOne").hide()
+            }
+
+            $(".list ul li dl dd").each(function(index){
+                    if($(this).hasClass('active')){
+                        arr.push('dcs')
+                    }else{
+                        arr.unshift()
+                    }
+            })
+        }
+        hasActive();
+
+        $(".list ul li dl dt").on("click",function(){
+            $(".all span").removeClass("active");
+            if($(this).hasClass('active')){
+                $(this).parent().find('dd').removeClass('active');
+                $(this).removeClass('active');
+            }else{
+                $(this).parent().find('dd').addClass('active');
+                $(this).addClass('active');
+            }
+            hasActive()
+        });
+        $(".list ul li dl dd").on('click',function(){
+            $(".all span").removeClass("active");
+            if($(this).hasClass('active')){
+                $(this).removeClass('active');
+            }else{
+                $(this).addClass('active');
             }
             hasActive();
-            
-            $(".list ul li dl dt").on("click",function(){
-                $(".all span").removeClass("active");
-                if($(this).hasClass('active')){
-                    $(this).parent().find('dd').removeClass('active');
-                    $(this).removeClass('active');
-                }else{
-                    $(this).parent().find('dd').addClass('active');
-                    $(this).addClass('active');
-                }
-                hasActive()  
-            });
-            $(".list ul li dl dd").on('click',function(){
-                $(".all span").removeClass("active");
-                if($(this).hasClass('active')){
-                    $(this).removeClass('active');
-                }else{
-                    $(this).addClass('active');
-                }
-                hasActive();
-                isDtSelected(this);
-               
-            });
-            $('.all').on('click',function(){
-                if($(".all span").hasClass('active')){
-                //     $('.list ul li dl dt').addClass('active');
-                //     $('.list ul li dl dd').addClass('active')
-                // }else{
-                    $('.list ul li dl dt').removeClass('active');
-                    $('.list ul li dl dd').removeClass('active')
-                }
-            });
-            
-            $('.reset').on('click',function(){
+            isDtSelected(this);
+
+        });
+        $('.all').on('click',function(){
+            if($(".all span").hasClass('active')){
+            //     $('.list ul li dl dt').addClass('active');
+            //     $('.list ul li dl dd').addClass('active')
+            // }else{
                 $('.list ul li dl dt').removeClass('active');
                 $('.list ul li dl dd').removeClass('active')
+            }
+        });
+
+        $('.reset').on('click',function(){
+            $('.list ul li dl dt').removeClass('active');
+            $('.list ul li dl dd').removeClass('active')
+        });
+        //
+        $(".all span").on('click', function () {
+            if($(this).hasClass('active')){
+                $(this).removeClass('active');
+            }else{
+                $(this).addClass('active');
+            }
+        });
+        //
+        $('.save-btn').click(function(){
+            var data = [];
+            $(".list ul li").find("dd.active").each(function(){
+                data.push($(this).attr("data-value"))
             });
-            //
-            $(".all span").on('click', function () {
-                if($(this).hasClass('active')){
-                    $(this).removeClass('active');
+            var html='';
+            for(var i = 0;i<data.length;i++){
+                if(i != data.length -1){
+                    html+=data[i]+ ' '
                 }else{
-                    $(this).addClass('active');
+                    html+=data[i]
                 }
-            });
+            }
             //
-            $('.save-btn').click(function(){
-                var data = [];
-                $(".list ul li").find("dd.active").each(function(){
-                    data.push($(this).attr("data-value"))
-                });
-                var html='';
-                for(var i = 0;i<data.length;i++){
-                    if(i != data.length -1){
-                        html+=data[i]+ ' '
-                    }else{
-                        html+=data[i]
+            var all = $(".all span").attr("class");
+            if (all === "active"){
+                html = "全部";
+            }
+            localStorage.industry = html;
+            history.back();
+        });
+        //
+        if(localStorage.industry !== "" && localStorage.industry!==undefined){
+            var industry = localStorage.industry.split(" ");
+            for(var i in industry){
+                $(".list ul li").find("dd").each(function(){
+                    if($(this).attr("data-value") === industry[i]){
+                        $(this).addClass("active");
                     }
-                }
-                //
-                var all = $(".all span").attr("class");
-                if (all === "active"){
-                    html = "全部";
-                }
-                localStorage.industry = html;
-                history.back();
-            });
-            //
-            if(localStorage.industry !== "" && localStorage.industry!==undefined){
-                var industry = localStorage.industry.split(" ");
-                for(var i in industry){
-                    $(".list ul li").find("dd").each(function(){
-                        if($(this).attr("data-value") === industry[i]){
-                            $(this).addClass("active");
-                        }
-                    })
-                }
-                $(".list ul li").find("dd.active").each(function(){
-                    $(".all span").removeClass("active")
                 })
             }
-            //
-            // 判断dd是否被全部选中  -----> 操作二级标题
-            function isDtSelected (_this) {
-                // 如果全部dd选中 dt就选中，dd有一个没选中 dt就不选中
-                var _f = false;
-                $(_this).parent().find('dd').each(function(index,dom){
-                    // 如果有一个dd被选中，就设置标记为true
-                    if (!$(dom).hasClass('active')) {
-                        _f = true;
-                        return false
-                    } else {
-                        _f = false;
-                    }
-                });
-                // 如果循环结束仍为false说明 dd全部被选中
-                if (_f) {
-                    $(_this).parent().find('dt').removeClass('active');
+            $(".list ul li").find("dd.active").each(function(){
+                $(".all span").removeClass("active")
+            })
+        }
+        //
+        // 判断dd是否被全部选中  -----> 操作二级标题
+        function isDtSelected (_this) {
+            // 如果全部dd选中 dt就选中，dd有一个没选中 dt就不选中
+            var _f = false;
+            $(_this).parent().find('dd').each(function(index,dom){
+                // 如果有一个dd被选中，就设置标记为true
+                if (!$(dom).hasClass('active')) {
+                    _f = true;
+                    return false
                 } else {
-                    $(_this).parent().find('dt').addClass('active');
+                    _f = false;
                 }
+            });
+            // 如果循环结束仍为false说明 dd全部被选中
+            if (_f) {
+                $(_this).parent().find('dt').removeClass('active');
+            } else {
+                $(_this).parent().find('dt').addClass('active');
             }
+        }
 
     </script>
 </body>

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

@@ -12,6 +12,8 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}3">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="/js/jquery.js"></script>
+    {{include "/common/weixin.html"}}
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style>
     .keyWord .addKeyWord {
@@ -92,6 +94,7 @@
     <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"}}20"></script>
     <script>
+        initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
             var keyWord = localStorage.keyWord;

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

@@ -12,6 +12,8 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}2">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="/js/jquery.js"></script>
+    {{include "/common/weixin.html"}}
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style>
 
@@ -64,6 +66,7 @@
 <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>
+    initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
     var keyWordArr = [];
     if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
         var keyWord = localStorage.keyWord;

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

@@ -11,6 +11,7 @@
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <script src="/js/jquery.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 </head>
 <style>
     .active{
@@ -43,6 +44,7 @@
 
     </div>
 <script>
+    initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
     $(function () {
         $("input").on('click', function () {
             $(".industry .all span").removeClass("active");

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

@@ -10,6 +10,7 @@
     <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>
     <style>
         .active{
@@ -88,139 +89,139 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script>
-           
-            function hasActive(){
-                var arr = [];
-                if( $(".list ul li dl dd").hasClass('active')||$(".list ul li dl dt").hasClass('active')){
-                    $(".consfirm").hide();
-                    $(".resetOne").show()
-                }else{
-                        $(".consfirm").show();
-                        $(".resetOne").hide()
-                }
-                
-                $(".list ul li dl dd").each(function(index){
-                        if($(this).hasClass('active')){
-                            arr.push('dcs')
-                        }else{
-                            arr.unshift()
-                        }
-                })
+        initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+        function hasActive(){
+            var arr = [];
+            if( $(".list ul li dl dd").hasClass('active')||$(".list ul li dl dt").hasClass('active')){
+                $(".consfirm").hide();
+                $(".resetOne").show()
+            }else{
+                    $(".consfirm").show();
+                    $(".resetOne").hide()
+            }
+
+            $(".list ul li dl dd").each(function(index){
+                    if($(this).hasClass('active')){
+                        arr.push('dcs')
+                    }else{
+                        arr.unshift()
+                    }
+            })
+        }
+        hasActive();
+
+        $(".list ul li dl dt").on("click",function(){
+            $(".all span").removeClass("active");
+            if($(this).hasClass('active')){
+                $(this).parent().find('dd').removeClass('active');
+                $(this).removeClass('active');
+            }else{
+                $(this).parent().find('dd').addClass('active');
+                $(this).addClass('active');
+            }
+            hasActive()
+        });
+        $(".list ul li dl dd").on('click',function(){
+            $(".all span").removeClass("active");
+            if($(this).hasClass('active')){
+                $(this).removeClass('active');
+            }else{
+                $(this).addClass('active');
             }
             hasActive();
-            
-            $(".list ul li dl dt").on("click",function(){
-                $(".all span").removeClass("active");
-                if($(this).hasClass('active')){
-                    $(this).parent().find('dd').removeClass('active');
-                    $(this).removeClass('active');
-                }else{
-                    $(this).parent().find('dd').addClass('active');
-                    $(this).addClass('active');
-                }
-                hasActive()  
-            });
-            $(".list ul li dl dd").on('click',function(){
-                $(".all span").removeClass("active");
-                if($(this).hasClass('active')){
-                    $(this).removeClass('active');
-                }else{
-                    $(this).addClass('active');
-                }
-                hasActive();
-                isDtSelected(this);
-            });
-            $('.all').on('click',function(){
-                if($(".all span").hasClass('active')){
-                    $('.list ul li dl dt').removeClass('active');
-                    $('.list ul li dl dd').removeClass('active')
-                }
-            });
-            
-            $('.reset').on('click',function(){
+            isDtSelected(this);
+        });
+        $('.all').on('click',function(){
+            if($(".all span").hasClass('active')){
                 $('.list ul li dl dt').removeClass('active');
                 $('.list ul li dl dd').removeClass('active')
-            });
+            }
+        });
 
-            $(".all span").on('click', function () {
-                if($(this).hasClass('active')){
-                    $(this).removeClass('active');
-                }else{
-                    $(this).addClass('active');
-                }
-            });
+        $('.reset').on('click',function(){
+            $('.list ul li dl dt').removeClass('active');
+            $('.list ul li dl dd').removeClass('active')
+        });
 
-            $('.save-btn').click(function(){
-                var data = [];
-                $(".list ul li").find("dd.active").each(function(){
-                    data.push($(this).html())
-                });
-                $(".list ul li").find("dt.question.active").each(function(){
-                    data.push($(this).attr("data-value"))
-                });
-                var html='';
-                for(var i = 0;i<data.length;i++){
-                    if(i != data.length -1){
-                        html+=data[i]+ " "
-                    }else{
-                        html+=data[i]
-                    }
-                }
-                //
-                var all = $(".all span").attr("class");
-                if (all === "active"){
-                    html = "全部";
-                }
-                console.log(html);
-                localStorage.subType = html;
-                history.back();
+        $(".all span").on('click', function () {
+            if($(this).hasClass('active')){
+                $(this).removeClass('active');
+            }else{
+                $(this).addClass('active');
+            }
+        });
+
+        $('.save-btn').click(function(){
+            var data = [];
+            $(".list ul li").find("dd.active").each(function(){
+                data.push($(this).html())
             });
-            //
-            if(localStorage.subType !== "" && localStorage.subType!==undefined){
-                var subType = localStorage.subType.split(" ");
-                // var subTypes = subType.filter(function (e) {
-                //     return e !== "";
-                // });
-                for(var i in subType){
-                    console.log(subType[i]);
-                    $(".list ul li").find("dd").each(function(){
-                        if($(this).text() === subType[i]){
-                            $(this).addClass("active");
-                        }
-                    })
-                    $(".list ul li").find("dt.question").each(function(){
-                        if($(this).attr("data-value") === subType[i]){
-                            $(this).addClass("active");
-                        }
-                    })
+            $(".list ul li").find("dt.question.active").each(function(){
+                data.push($(this).attr("data-value"))
+            });
+            var html='';
+            for(var i = 0;i<data.length;i++){
+                if(i != data.length -1){
+                    html+=data[i]+ " "
+                }else{
+                    html+=data[i]
                 }
-                $(".list ul li").find("dd.active").each(function(){
-                    $(".all span").removeClass("active")
-                });
-                $(".list ul li").find("dt.active").each(function(){
-                    $(".all span").removeClass("active")
-                })
             }
-            // 判断dd是否被全部选中  -----> 操作二级标题
-            function isDtSelected (_this) {
-                // 如果全部dd选中 dt就选中，dd有一个没选中 dt就不选中
-                var _f = false;
-                $(_this).parent().find('dd').each(function(index,dom){
-                    // 如果有一个dd被选中，就设置标记为true
-                    if (!$(dom).hasClass('active')) {
-                        _f = true;
-                        return false
-                    } else {
-                        _f = false;
+            //
+            var all = $(".all span").attr("class");
+            if (all === "active"){
+                html = "全部";
+            }
+            console.log(html);
+            localStorage.subType = html;
+            history.back();
+        });
+        //
+        if(localStorage.subType !== "" && localStorage.subType!==undefined){
+            var subType = localStorage.subType.split(" ");
+            // var subTypes = subType.filter(function (e) {
+            //     return e !== "";
+            // });
+            for(var i in subType){
+                console.log(subType[i]);
+                $(".list ul li").find("dd").each(function(){
+                    if($(this).text() === subType[i]){
+                        $(this).addClass("active");
                     }
-                });
-                // 如果循环结束仍为false说明 dd全部被选中
-                if (_f) {
-                    $(_this).parent().find('dt').removeClass('active');
+                })
+                $(".list ul li").find("dt.question").each(function(){
+                    if($(this).attr("data-value") === subType[i]){
+                        $(this).addClass("active");
+                    }
+                })
+            }
+            $(".list ul li").find("dd.active").each(function(){
+                $(".all span").removeClass("active")
+            });
+            $(".list ul li").find("dt.active").each(function(){
+                $(".all span").removeClass("active")
+            })
+        }
+        // 判断dd是否被全部选中  -----> 操作二级标题
+        function isDtSelected (_this) {
+            // 如果全部dd选中 dt就选中，dd有一个没选中 dt就不选中
+            var _f = false;
+            $(_this).parent().find('dd').each(function(index,dom){
+                // 如果有一个dd被选中，就设置标记为true
+                if (!$(dom).hasClass('active')) {
+                    _f = true;
+                    return false
                 } else {
-                    $(_this).parent().find('dt').addClass('active');
+                    _f = false;
                 }
+            });
+            // 如果循环结束仍为false说明 dd全部被选中
+            if (_f) {
+                $(_this).parent().find('dt').removeClass('active');
+            } else {
+                $(_this).parent().find('dt').addClass('active');
             }
+        }
 
     </script>
 </body>

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

@@ -11,6 +11,8 @@
 	<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"}}3">
 	<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>
 	<style>
 		.keyWord .addKeyWord {
@@ -47,6 +49,7 @@
 			<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>
+		initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
 		var winnerArr = [];
 		if(localStorage.winner !== "" && localStorage.winner !== undefined){
 			var winner = localStorage.winner.split(",");

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

@@ -11,6 +11,8 @@
     <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"}}3">
     <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>
     <style>
     .keyWord .addKeyWord {
@@ -47,77 +49,78 @@
         <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>
-    var winnerArr = [];
-    if(localStorage.winner !== "" && localStorage.winner !== undefined){
-        var winner = localStorage.winner.split(",");
-        winnerArr = winner;
-    }
-    $(function(){
-
-        $('.knowBtn').on('click',function(){
-            $(".problemPop").hide()
-        });
-        $(".problem").on('click',function(){
-            $(".problemPop").css("display",'flex');
-        });
-
-        // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
-        $('.addkeyWord input.enterOne').on('input', function() {
-            if ($(this).val().length >= 100) {
-                var s = $(this).val().slice(0,100);
-                $(this).val(s);
-
-                weui.toast('附加词不能超过100字', {
-                    duration: 2000,
-                    className: 'text-overflow100',
-                    callback: function(){ console.log('close') }
-                });
-                return
-            }
-
-            var buttonDOM = $(this).siblings().find('button')[0];
-            if ($(this).val().length >= 1) {
-                buttonDOM.style.opacity = 1;
-                buttonDOM.removeAttribute("disabled")
-            } else {
-                buttonDOM.style.opacity = .5;
-                buttonDOM.setAttribute("disabled", true)
-            }
-        });
-
-        // 添加 按钮的点击事件
-        $('.addkeyWord .btn .save-btn').on('click', function(){
-            var keyWord = $('.addkeyWord input.enterOne').val();
-            winnerArr.push(keyWord);
-            localStorage.setItem("winner", winnerArr);
-            history.back();
-        });
-
-        //去空格方法
-        String.prototype.trim = function(){
-            return this.replace(/(^\s*)|(\s*$)/g, ' ');
-        };
-
-        //附加词个数
-        $('.modify span').keydown(function(){
-            var olength = $(this).text().replace(/\s+/g,'').length;
-            // console.log(olength)
-            if(olength >= 100){
-                $('.fontLength').show();
-                var s = $(this).text().slice(0,100);
-                $(this).text(s);
-                weui.toast('附加词不能超过100字', {
-                    duration: 2000,
-                    className: 'text-overflow100',
-                    callback: function(){ console.log('close') }
-                });
-            }
-        });
-
-        $(".close").on('click', function () {
-            history.back();
-        });
-    })
+        initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+        var winnerArr = [];
+        if(localStorage.winner !== "" && localStorage.winner !== undefined){
+            var winner = localStorage.winner.split(",");
+            winnerArr = winner;
+        }
+        $(function(){
+
+            $('.knowBtn').on('click',function(){
+                $(".problemPop").hide()
+            });
+            $(".problem").on('click',function(){
+                $(".problemPop").css("display",'flex');
+            });
+
+            // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
+            $('.addkeyWord input.enterOne').on('input', function() {
+                if ($(this).val().length >= 100) {
+                    var s = $(this).val().slice(0,100);
+                    $(this).val(s);
+
+                    weui.toast('附加词不能超过100字', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){ console.log('close') }
+                    });
+                    return
+                }
+
+                var buttonDOM = $(this).siblings().find('button')[0];
+                if ($(this).val().length >= 1) {
+                    buttonDOM.style.opacity = 1;
+                    buttonDOM.removeAttribute("disabled")
+                } else {
+                    buttonDOM.style.opacity = .5;
+                    buttonDOM.setAttribute("disabled", true)
+                }
+            });
+
+            // 添加 按钮的点击事件
+            $('.addkeyWord .btn .save-btn').on('click', function(){
+                var keyWord = $('.addkeyWord input.enterOne').val();
+                winnerArr.push(keyWord);
+                localStorage.setItem("winner", winnerArr);
+                history.back();
+            });
+
+            //去空格方法
+            String.prototype.trim = function(){
+                return this.replace(/(^\s*)|(\s*$)/g, ' ');
+            };
+
+            //附加词个数
+            $('.modify span').keydown(function(){
+                var olength = $(this).text().replace(/\s+/g,'').length;
+                // console.log(olength)
+                if(olength >= 100){
+                    $('.fontLength').show();
+                    var s = $(this).text().slice(0,100);
+                    $(this).text(s);
+                    weui.toast('附加词不能超过100字', {
+                        duration: 2000,
+                        className: 'text-overflow100',
+                        callback: function(){ console.log('close') }
+                    });
+                }
+            });
+
+            $(".close").on('click', function () {
+                history.back();
+            });
+        })
 
     </script>
     </body>