微信数据导出优化

src/jfw/front/wx_dataExport.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"jfw/public"
+	"jfw/wx"
 	"log"
 	"qfw/util"
 	"strings"
@@ -15,17 +16,22 @@ import (
 
 type WxDataExport struct {
 	*xweb.Action
-	toSieve    xweb.Mapper `xweb:"/front/wx_dataExport/toSieve"`    //微信数据导出
-	saveData   xweb.Mapper `xweb:"/front/wx_dataExport/saveData"`   //保存筛选数据
-	area       xweb.Mapper `xweb:"/front/wx_dataExport/area"`       //区域
-	industry   xweb.Mapper `xweb:"/front/wx_dataExport/industry"`   //行业
-	keyWord    xweb.Mapper `xweb:"/front/wx_dataExport/keyWord"`    //关键词
-	appended   xweb.Mapper `xweb:"/front/wx_dataExport/appended"`   //附加词
-	exclude    xweb.Mapper `xweb:"/front/wx_dataExport/exclude"`    //排除词
-	price      xweb.Mapper `xweb:"/front/wx_dataExport/price"`      //金额
-	subType    xweb.Mapper `xweb:"/front/wx_dataExport/subType"`    //信息类型
-	buyerEdit  xweb.Mapper `xweb:"/front/wx_dataExport/buyerEdit"`  //采购单位编辑
-	winnerEdit xweb.Mapper `xweb:"/front/wx_dataExport/winnerEdit"` //中标单位编辑
+	toSieve       xweb.Mapper `xweb:"/front/wx_dataExport/toSieve"`       //微信数据导出
+	saveData      xweb.Mapper `xweb:"/front/wx_dataExport/saveData"`      //保存筛选数据
+	area          xweb.Mapper `xweb:"/front/wx_dataExport/area"`          //区域
+	industry      xweb.Mapper `xweb:"/front/wx_dataExport/industry"`      //行业
+	keyWord       xweb.Mapper `xweb:"/front/wx_dataExport/keyWord"`       //关键词
+	keyWordInput  xweb.Mapper `xweb:"/front/wx_dataExport/keyWordInput"`  //关键词输入
+	appended      xweb.Mapper `xweb:"/front/wx_dataExport/appended"`      //附加词
+	appendedInput xweb.Mapper `xweb:"/front/wx_dataExport/appendedInput"` //附加词输入
+	exclude       xweb.Mapper `xweb:"/front/wx_dataExport/exclude"`       //排除词
+	excludeInput  xweb.Mapper `xweb:"/front/wx_dataExport/excludeInput"`  //排除词输入
+	price         xweb.Mapper `xweb:"/front/wx_dataExport/price"`         //金额
+	subType       xweb.Mapper `xweb:"/front/wx_dataExport/subType"`       //信息类型
+	buyerEdit     xweb.Mapper `xweb:"/front/wx_dataExport/buyerEdit"`     //采购单位编辑
+	buyerInput    xweb.Mapper `xweb:"/front/wx_dataExport/buyerInput"`    //采购单位输入
+	winnerEdit    xweb.Mapper `xweb:"/front/wx_dataExport/winnerEdit"`    //中标单位编辑
+	winnerInput   xweb.Mapper `xweb:"/front/wx_dataExport/winnerInput"`   //中标单位输入
 }
 
 func init() {
@@ -34,6 +40,14 @@ func init() {
 
 //微信数据导出
 func (w *WxDataExport) ToSieve() error {
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport.html", &w.T)
 	return nil
 }
@@ -152,54 +166,196 @@ func (w *WxDataExport) SaveData() error {
 
 //区域
 func (w *WxDataExport) Area() error {
-	w.Render("/weixin/dataExport/dataExport_area.html")
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	w.Render("/weixin/dataExport/dataExport_area.html", &w.T)
 	return nil
 }
 
 //行业
 func (w *WxDataExport) Industry() error {
-	w.Render("/weixin/dataExport/dataExport_industry.html")
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	w.Render("/weixin/dataExport/dataExport_industry.html", &w.T)
 	return nil
 }
 
 //关键词
 func (w *WxDataExport) KeyWord() error {
-	w.Render("/weixin/dataExport/dataExport_keyWord.html")
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	w.Render("/weixin/dataExport/dataExport_keyWord.html", &w.T)
+	return nil
+}
+
+//关键词输入
+func (w *WxDataExport) KeyWordInput() error {
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	w.Render("/weixin/dataExport/dataExport_keyWordInput.html", &w.T)
 	return nil
 }
 
 //附加词
 func (w *WxDataExport) Appended() error {
-	w.Render("/weixin/dataExport/dataExport_appended.html")
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	w.Render("/weixin/dataExport/dataExport_appended.html", &w.T)
+	return nil
+}
+
+//附加词输入
+func (w *WxDataExport) AppendedInput() error {
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	w.Render("/weixin/dataExport/dataExport_appendedInput.html", &w.T)
 	return nil
 }
 
 //排除词
 func (w *WxDataExport) Exclude() error {
-	w.Render("/weixin/dataExport/dataExport_exclude.html")
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	w.Render("/weixin/dataExport/dataExport_exclude.html", &w.T)
+	return nil
+}
+
+//排除词输入
+func (w *WxDataExport) ExcludeInput() error {
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	w.Render("/weixin/dataExport/dataExport_excludeInput.html", &w.T)
 	return nil
 }
 
 //金额
 func (w *WxDataExport) Price() error {
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_price.html")
 	return nil
 }
 
 //信息类型
 func (w *WxDataExport) SubType() error {
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_subType.html")
 	return nil
 }
 
 //采购单位编辑
 func (w *WxDataExport) BuyerEdit() error {
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_buyerEdit.html", &w.T)
 	return nil
 }
 
+//采购单位输入
+func (w *WxDataExport) BuyerInput() error {
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	w.Render("/weixin/dataExport/dataExport_buyerInput.html", &w.T)
+	return nil
+}
+
 //中标单位编辑
 func (w *WxDataExport) WinnerEdit() error {
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
 	w.Render("/weixin/dataExport/dataExport_winnerEdit.html", &w.T)
 	return nil
 }
+
+//中标单位输入
+func (w *WxDataExport) WinnerInput() error {
+	//分享
+	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
+	myopenid, _ := w.Session().Get("s_m_openid").(string)
+	w.T["openid"] = se.EncodeString(myopenid)
+	mynickname, _ := w.Session().Get("s_nickname").(string)
+	myavatar, _ := w.Session().Get("s_avatar").(string)
+	w.T["nickname"] = mynickname
+	w.T["avatar"] = myavatar
+	w.Render("/weixin/dataExport/dataExport_winnerInput.html", &w.T)
+	return nil
+}

src/web/staticres/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/web/staticres/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="/front/wx_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/web/staticres/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;
@@ -24,9 +24,8 @@ $(function(){
     
     //添加按钮
     $(".addKeyWord i").on('click',function(){
-        $(".addkeyWord").show();
-        $(".showKeyWord").hide();
-        sessionStorage.removeItem("keyWord")
+        sessionStorage.removeItem("keyWord");
+        window.location.href="/front/wx_dataExport/keyWordInput";
     });
 
     // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
@@ -71,7 +70,7 @@ $(function(){
     // })
     
     // 添加 按钮的点击事件
-    $('.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);
@@ -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){

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

@@ -9,7 +9,7 @@
     <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"}}">
+    <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>
 <body>
@@ -20,7 +20,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>
 
@@ -72,6 +73,40 @@
         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){
@@ -80,8 +115,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 +=
@@ -113,7 +148,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){
@@ -164,8 +199,9 @@
 
             // 添加按钮
             $(".addKeyWord i").on('click',function(){
-                $(".addkeyWord").show();
-                $(".showKeyWord").hide();
+                var keyWord = tokens;
+                sessionStorage.removeItem("keyWord");
+                window.location.href="/front/wx_dataExport/appendedInput?keyWord="+keyWord;
             });
 
             // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
@@ -200,13 +236,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
                         }
                     }
@@ -246,7 +282,6 @@
                 var buttonDOM = $('.enter.addkeyWord .btn button')[0];
                 buttonDOM.style.opacity = .5;
                 buttonDOM.setAttribute("disabled", true)
-
             });
 
             // 编辑
@@ -264,7 +299,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
                     }
                 }
@@ -273,7 +308,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();
@@ -284,7 +319,7 @@
                     }
                 }
                 for(var m in keyWordArr){
-                    if(keyWordArr[m].keyWord === token){
+                    if(keyWordArr[m].keyWord === tokens){
                         keyWordArr[m].appended = appendedArr
                     }
                 }
@@ -292,12 +327,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(){
@@ -305,16 +340,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/web/templates/weixin/dataExport/dataExport_appendedInput.html

@@ -0,0 +1,182 @@
+<!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"}}"2>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    </head>
+    <body>
+
+    <div class="keyWord">
+        <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="{{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 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/web/templates/weixin/dataExport/dataExport_area.html

@@ -509,7 +509,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/web/templates/weixin/dataExport/dataExport_buyerEdit.html

@@ -6,10 +6,10 @@
 	<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">
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css">
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
-	<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css">
+	<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"></script>
 </head>
 <style>
@@ -28,6 +28,7 @@
 		<input type="text" class="enterOne" placeholder="采购单位名称" />
 		<div class="btn">
 			<button disabled class="save-btn">确认</button>
+			<button class="close">取消</button>
 		</div>
 	</div>
 
@@ -45,13 +46,12 @@
 </div>
 <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js"></script>
 <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"}}25"></script>
+<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/additionWord.js?v={{Msg "seo" "version"}}27"></script>
 <script>
 	var buyerArr = [];
 	if(localStorage.buyer !== "" && localStorage.buyer !== undefined){
 		var buyer = localStorage.buyer.split(",");
 		buyerArr = buyer;
-		console.log(buyerArr);
 		var html = "";
 		for(var i in buyer){
 			html +=

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

@@ -0,0 +1,123 @@
+<!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"}}2">
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
+    </head>
+    <style>
+    .keyWord .addKeyWord {
+        width: 100%;
+        position: fixed;
+        top: 100%;
+        text-align: center;
+    }
+    </style>
+
+    <body>
+
+    <div class="keyWord">
+        <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="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/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/web/templates/weixin/dataExport/dataExport_exclude.html

@@ -9,7 +9,7 @@
     <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"}}">
+    <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>
 </head>
 <body>
@@ -20,7 +20,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>
 
@@ -72,6 +73,12 @@
         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];
+        }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -80,8 +87,8 @@
             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 +=
@@ -113,7 +120,7 @@
                 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){
@@ -164,8 +171,9 @@
 
             // 添加按钮
             $(".addKeyWord i").on('click',function(){
-                $(".addkeyWord").show();
-                $(".showKeyWord").hide();
+                var keyWord = tokens;
+                sessionStorage.removeItem("keyWord");
+                window.location.href="/front/wx_dataExport/excludeInput?keyWord="+keyWord;
             });
 
             // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
@@ -200,13 +208,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
                         }
                     }
@@ -246,7 +254,6 @@
                 var buttonDOM = $('.enter.addkeyWord .btn button')[0];
                 buttonDOM.style.opacity = .5;
                 buttonDOM.setAttribute("disabled", true)
-
             });
 
             // 编辑
@@ -264,7 +271,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
                     }
                 }
@@ -284,7 +291,7 @@
                     }
                 }
                 for(var m in keyWordArr){
-                    if(keyWordArr[m].keyWord === token){
+                    if(keyWordArr[m].keyWord === tokens){
                         keyWordArr[m].exclude = excludeArr
                     }
                 }
@@ -313,8 +320,11 @@
                         callback: function(){ console.log('close') }
                     });
                 }
-            })
+            });
 
+            $('.addkeyWord .btn .close').on('click', function () {
+                window.history.back();
+            });
         })
 
     </script>

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

@@ -0,0 +1,194 @@
+<!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"></script>
+    </head>
+    <body>
+
+    <div class="keyWord">
+        <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="{{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 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/web/templates/weixin/dataExport/dataExport_industry.html

@@ -247,7 +247,7 @@
                     html = "全部";
                 }
                 localStorage.industry = html;
-                window.location.href = "/front/wx_dataExport/toSieve";
+                history.back();
             });
             //
             if(localStorage.industry !== "" && localStorage.industry!==undefined){

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

@@ -9,7 +9,7 @@
     <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"}}">
+    <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>
 </head>
@@ -34,7 +34,8 @@
                 <button class="addExclusion exclude" disabled>添加 排除词</button>
             </div>
             <div class="btn">
-                <button disabled>确认</button>
+                <button class="save" disabled>确认</button>
+                <button class="close">取消</button>
             </div>
         </div>
 
@@ -89,7 +90,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}18"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}20"></script>
     <script>
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -200,16 +201,6 @@
             }
             $('.showKeyWord > ul').prepend(keyWordHtml);
             //
-            $(".showKeyWord").on('click', '.addAdjunctWord',function(e){
-                var keyWord = $(this).parent().prev().find('.key').text();
-                sessionStorage.removeItem("keyWord");
-                window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
-            });
-            $(".showKeyWord").on('click', '.addExclusion',function(e){
-                var keyWord = $(this).parent().prev().find('.key').text();
-                sessionStorage.removeItem("keyWord");
-                window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
-            });
         }
         //
         if($(".enterOne").val()!==""){
@@ -218,23 +209,40 @@
             $('.enter.addkeyWord .btn > button').prop("disabled", false);
             $('.enter.addkeyWord .btn > button').css("opacity", 1);
         }
+    // $(".showKeyWord").on('click', '.append',function(e){
         $(".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 = "/front/wx_dataExport/appended?keyWord="+keyWord;
+            window.location.href = "/front/wx_dataExport/appendedInput?keyWord="+keyWord;
         });
+        // $(".showKeyWord").on('click', '.exclude',function(e){
         $(".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 = "/front/wx_dataExport/excludeInput?keyWord="+keyWord;
+        });
+        //
+        $(".showKeyWord").on('click', '.addAdjunctWord',function(e){
+            var keyWord = $(this).parent().prev().find('.key').text();
+            sessionStorage.removeItem("keyWord");
+            window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
+        });
+        $(".showKeyWord").on('click', '.addExclusion',function(e){
+            var keyWord = $(this).parent().prev().find('.key').text();
+            sessionStorage.removeItem("keyWord");
             window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
         });
 
+        $('.addkeyWord .btn .close').on('click', function () {
+            window.history.back();
+        });
+
     </script>
 </body>
 

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

@@ -0,0 +1,182 @@
+<!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"}}2">
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <script src="/js/jquery.js"></script>
+</head>
+<style>
+
+</style>
+<body>
+
+<div class="keyWord">
+    <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="{{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 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 = "/front/wx_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 = "/front/wx_dataExport/exclude?keyWord="+keyWord+"_in";
+    });
+
+</script>
+</body>
+
+</html>

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

@@ -62,7 +62,7 @@
                 var price = min+"万元-"+max+"万元";
                 localStorage.setItem("price", price);
             }
-            window.location.href = "/front/wx_dataExport/toSieve"
+            history.back();
         });
         //
         if(localStorage.price !== ""&&localStorage.price!=undefined){

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

@@ -92,10 +92,10 @@
             function hasActive(){
                 var arr = [];
                 if( $(".list ul li dl dd").hasClass('active')||$(".list ul li dl dt").hasClass('active')){
-                    $(".consfirm").hide()
+                    $(".consfirm").hide();
                     $(".resetOne").show()
                 }else{
-                        $(".consfirm").show()
+                        $(".consfirm").show();
                         $(".resetOne").hide()
                 }
                 
@@ -107,7 +107,7 @@
                         }
                 })
             }
-            hasActive()
+            hasActive();
             
             $(".list ul li dl dt").on("click",function(){
                 $(".all span").removeClass("active");
@@ -173,7 +173,7 @@
                 }
                 console.log(html);
                 localStorage.subType = html;
-                window.location.href = "/front/wx_dataExport/toSieve";
+                history.back();
             });
             //
             if(localStorage.subType !== "" && localStorage.subType!==undefined){
@@ -196,7 +196,7 @@
                 }
                 $(".list ul li").find("dd.active").each(function(){
                     $(".all span").removeClass("active")
-                })
+                });
                 $(".list ul li").find("dt.active").each(function(){
                     $(".all span").removeClass("active")
                 })

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

@@ -9,7 +9,7 @@
 	<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"}}">
+	<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>
@@ -26,7 +26,8 @@
 			<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>
 
@@ -90,19 +91,20 @@
 					$(".showKeyWord").show();
 				}
 			}
-			hasWords()
+			hasWords();
 
 			// 添加按钮
 			$(".addKeyWord i").on('click',function(){
 				$(".addkeyWord").show();
 				$(".showKeyWord").hide();
-			})
+				window.location.href="/front/wx_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,
@@ -112,19 +114,19 @@
 					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>
@@ -141,28 +143,28 @@
 								<button class="deleteKey">删除</button>
 								<button class="ascertainKey">确定</button>
 							</div>
-						</li>`
-				$('.showKeyWord > ul').prepend(html)
+						</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) {
@@ -172,7 +174,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();
@@ -183,14 +185,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(){
@@ -198,16 +200,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/web/templates/weixin/dataExport/dataExport_winnerInput.html

@@ -0,0 +1,125 @@
+<!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;
+    }
+    </style>
+    <body>
+
+    <div class="keyWord">
+        <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="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>