xiugai

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

@@ -5,7 +5,7 @@
   line-height: .38rem;
 }
 .keyWord .enter .enterOne {
-  height: 0.94rem;
+  min-height: 0.94rem;
   width: 100%;
   padding: 0 0.3rem;
   font-size: .3rem;
@@ -37,6 +37,7 @@
   background: #2cb7ca;
   color: #fff;
   font-size: .36rem;
+  opacity: .5;
 }
 .keyWord .showKeyWord ul li {
   margin-bottom: .16rem;
@@ -105,14 +106,28 @@
 .keyWord .showKeyWord ul li .modify button {
   width: 50%;
   height: .88rem;
-  color: #fff;
   float: left;
   margin-top: 0.16rem;
 }
-.keyWord .showKeyWord ul li .modify .deleteKey {
+.keyWord .showKeyWord ul li .modify button.addAdjunctWord, .keyWord .showKeyWord ul li .modify button.addExclusion {
+  position: relative;
+  background: #fff;
+}
+.keyWord .showKeyWord ul li .modify button.addExclusion:before {
+  position: absolute;
+  content: '';
+  width: 1px;
+  height: .64rem;
+  background-color: #e0e0e0;
+  left: 0;
+  top: 0.13rem;
+}
+.keyWord .showKeyWord ul li .modify button.deleteKey {
+  color: #fff;
   background: #FE737A;
 }
-.keyWord .showKeyWord ul li .modify .ascertainKey {
+.keyWord .showKeyWord ul li .modify button.ascertainKey {
+  color: #fff;
   background: #2cb7ca;
 }
 .keyWord .addKeyWord {
@@ -189,3 +204,21 @@
   font-size: .36rem;
   color: #2cb7ca;
 }
+
+.text-overflow100 .weui-toast {
+  margin-left: 0;
+  width: 2.6rem;
+  min-height: .4rem;
+  -webkit-transform: translateX(-50%);
+          transform: translateX(-50%);
+}
+.text-overflow100 .weui-toast .weui-icon_toast {
+  display: none;
+}
+.text-overflow100 .weui-toast .weui-toast__content {
+  margin: 0;
+}
+
+.weui-dialog .weui-dialog__ft .weui-dialog__btn_primary {
+  color: #2cb7ca;
+}

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

@@ -1,197 +0,0 @@
-.keyWord{
-    .title{
-        font-size: .26rem;
-        color: #888;
-        padding: .3rem;
-        line-height: .38rem; 
-    }
-    .enter{
-        
-        .enterOne{
-            height: 0.94rem;
-            width: 100%;
-            padding:0 0.3rem;
-            font-size: .3rem;
-            background: #fff;
-        }
-        .btnChoose{
-            border-top: 1px solid #e0e0e0;
-            overflow: hidden;
-            background: #fff;
-            button{
-                float: left;
-                height: 0.6rem;
-                font-size: .3rem;
-                width: 50%;
-                background: #fff;
-                margin: 0.15rem 0;
-                color: #1D1D1D;
-            }
-            button:first-child{
-               border-right: 1px solid #e0e0e0;
-            }
-        }
-        .btn{
-            margin-top: .16rem;
-            button{
-                width: 100%;
-                height: 0.94rem;
-                background: #2cb7ca;
-                color: #fff;
-                font-size: .36rem;
-            } 
-        }
-    }
-
-    .showKeyWord{
-        ul{
-            li{
-                margin-bottom: .16rem;
-                overflow: hidden;
-                .one{
-                    display: flex;
-                    background: #fff;
-                    line-height: .54rem;
-                    padding: 0.2rem 0;
-                    div{
-                        flex: 1;
-                        span{
-                            display: flex;
-                            padding: 0 .3rem;
-                            
-                            strong{
-                                font-size: 0.3rem;
-                                color: #1d1d1d;
-                                font-weight: normal;
-                                display: block;
-                                width: 1.2rem;
-                            }
-                            p{
-                                flex: 1;
-                                font-size: 0.3rem;
-                                color: #686868;
-                            }
-                        }
-                    }
-                    button{
-                        width: 1.96rem;
-                        background: #fff;
-                        color: #2cb7ca;
-                        border-left: 1px solid #E0E0E0;
-                        font-size: .3rem;
-                       
-                        position: relative;
-                        left: 0;
-                        i{
-                            font-size: .4rem;
-                            padding-right: 0.1rem;
-                        }
-                    }
-                }
-                .modify{
-                    display: none;
-                    margin-top: .16rem;
-                    span{
-                        width: 100%;
-                        display: block;
-                        line-height: 0.5rem;
-                        padding: 0.2rem .3rem;
-                        background: #fff;
-                        outline: none;
-                        font-size: 0.3rem;
-                        color: #1d1d1d;
-                    }
-                    button{
-                        width: 50%;
-                        height: .88rem;
-                        color: #fff;
-                        float: left;
-                        margin-top: 0.16rem;
-                    }
-                    .deleteKey{
-                        background: #FE737A;
-                    }
-                    .ascertainKey{
-                        background: #2cb7ca;
-                    }
-                }
-               
-            }
-        }
-    }
-
-   .addKeyWord{
-       width: 100%;
-       position: fixed;
-       bottom: 0.4rem;
-       text-align: center;
-       i{
-        font-size: 1rem;
-        color: #2cb7ca;
-       }
-      
-   }
-
-    .problem{
-        margin-top: .4rem;
-        font-size: .3rem;
-        color: #2cb7ca;
-        float: right;
-        margin-right: 0.3rem;
-        i{
-            margin-left: .06rem;
-        }
-    }
-    .problemPop{
-        background:rgba($color: #000000, $alpha: .5);
-        position: fixed;
-        width: 100%;
-        height: 100%;
-        top: 0;
-        left: 0;
-        display: none;
-        align-items:center;
-        justify-content: center;
-       
-        .problemPopContent{
-           width: 5.6rem; 
-           min-height: 7.23rem;
-           display: inline-block;
-           background: #fff;
-           border-radius: 4px;
-           position: relative;
-           padding: 0.58rem 0;
-           h3{
-            font-size: .34rem;
-            text-align: center;
-           }
-           ul{
-            padding: 0 .4rem;
-               li{
-                   margin-top: 0.2rem;
-                   h4{
-                       font-size: .3rem;
-                       line-height: .5rem;
-                       color: #1d1d1d;
-                   }
-                   p{
-                       font-size: .28rem;
-                       color: #868686;
-                       line-height: 0.4rem;
-                   }
-               }
-           }
-           button{
-               width: 100%;
-               background: #fff;
-               border-top: 1px solid #E0E0E0;
-               position: absolute;
-               bottom: 5px;
-               height: 1rem;
-               font-size: .36rem;
-               color: #2cb7ca;
-           }
-        }
-    }
-
-}

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

@@ -0,0 +1,127 @@
+$(function(){
+
+    $('.knowBtn').on('click',function(){
+        $(".problemPop").hide()
+    })
+    $(".problem").on('click',function(){
+        $(".problemPop").css("display",'flex');
+    })
+
+    function hasWords () {
+        var showKeyWordLength = $(".showKeyWord ul").find('li').length;
+        if(showKeyWordLength === 0){
+            $(".addkeyWord").show();
+            $(".showKeyWord").hide();
+        } else {
+            $(".addkeyWord").hide();
+            $(".showKeyWord").show();
+        }
+    }
+    hasWords()
+    
+    // 添加按钮
+    $(".addKeyWord i").on('click',function(){
+        $(".addkeyWord").show();
+        $(".showKeyWord").hide();
+    })
+
+    // 添加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 keyWord = $('.addkeyWord input.enterOne').val()
+        var html = `<li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <p class="key">${ keyWord }</p>
+                                </span>
+                            </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)
+        
+        // 隐藏
+        $(".addkeyWord").hide();
+        $('.showKeyWord').show();
+        $('.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().siblings().css('display','block')
+    })
+
+    // 编辑 删除
+    $('.showKeyWord').on('click', '.deleteKey', function(e) {
+        $(this).parents('li').remove()
+        hasWords()
+        console.log('删除附加词:',$(this).parent().find('span').text())
+    })
+    // 编辑 确定
+    $('.showKeyWord').on('click', '.ascertainKey', function(e) {
+        var keyWord = $(this).siblings('span').text()
+        $(this).parent().siblings().find('.key').text(keyWord)
+        $(this).parent().hide().siblings().show()
+        console.log(keyWord)
+    })
+
+    //去空格方法
+    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') }
+            });
+        }
+    })
+
+})

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

@@ -0,0 +1,104 @@
+<!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="../css/base.css">
+    <link rel="stylesheet" href="../iconfont/iconfont.css">
+    <link rel="stylesheet" href="../css/weui.min.css">
+    <link rel="stylesheet" href="../css/keyWord.css">
+    <script src="../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 disabled>确认</button>
+            </div>
+        </div>
+
+        <!-- 添加附加词显示列表 -->
+        <div class="showKeyWord">
+            <ul>
+                <li>
+                    <div class="one">
+                        <div>
+                            <span>
+                                <p class="key">abcde</p>
+                            </span>
+                        </div>
+                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                    </div>
+                    <div class="modify">
+                        <span contentEditable="true">abcde</span>
+                        <button class="deleteKey">删除</button>
+                        <button class="ascertainKey">确定</button>
+                    </div>
+                </li>
+
+                <li>
+                    <div class="one">
+                        <div>
+                            <span>
+                                <p class="key">abcde</p>
+                            </span>
+                        </div>
+                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                    </div>
+                    <div class="modify">
+                        <span contentEditable="true">abcde</span>
+                        <button class="deleteKey">删除</button>
+                        <button class="ascertainKey">确定</button>
+                    </div>
+                </li>
+                
+            </ul>
+
+            <div class="addKeyWord">
+                <i class="iconfont icon-tianjia"></i>
+            </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="../js/zepto.js"></script>
+    <script src="../js/weui.min.js"></script>
+    <script src="../js/additionWord.js"></script>
+</body>
+
+</html>

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

@@ -27,351 +27,364 @@
 		</style>
 	<body>
 		<div id="choose_area">
-			<!-- <header class="header">
-				<a href="#" class="return pull-left">
-					<i class="icon iconfont">&#xe640;</i>
-				</a>
-				<h1 class="title">区域</h1>
-			</header> -->
-			<main class="main">
+				<main class="main">
 				<div class="form">
-					<div class="result">
-						已选择：
-						<span class="result_name"></span>
-					</div>
-					<div class="select-area-box">
-						<!--<div class="tab">全国</div>-->
-						<ul> 
-							<li class="index" id="all"></li>
-							<li >
-								<div class="tab" id="quan">
-									<div class="province">
-										<input type="checkbox" class="checkbox">全国
-									</div>
-								</div>
-							</li>
-							<li class="index" id="A">A</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">安徽
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="B">B</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">北京
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="C">C</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">重庆
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="F">F</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">福建
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="G">G</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">广东
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">广西
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">贵州
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">甘肃
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="H">H</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">河北
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">湖北
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">黑龙江
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">海南
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">河南
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">湖南
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<p class="index" id="J">J</p>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">吉林
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">江苏
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">江西
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="L">L</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">辽宁
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="N">N</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">内蒙古
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">宁夏
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="Q">Q</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">青海
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="S">S</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">山西
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">陕西
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">上海
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">山东
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">四川
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="T">T</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">天津
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="X">X</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">西藏
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">新疆
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="Y">Y</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">云南
-									</div>
-									<span><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-							<li class="index" id="Z">Z</li>
-							<li >
-								<div class="tab">
-									<div class="province">
-										<input type="checkbox" class="checkbox">浙江
-									</div>
-									<span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
-								</div> 
-								<div class="tab_content clearfix"></div> 
-							</li>
-						</ul>
-						<div class="slide">
-							<a href="#all">#</a>
-							<a href="#A">A</a>
-							<a href="#B">B</a>
-							<a href="#C">C</a>
-							<a href="#F">F</a>
-							<a href="#G">G</a>
-							<a href="#H">H</a>
-							<a href="#J">J</a>
-							<a href="#L">L</a>
-							<a href="#N">N</a>
-							<a href="#Q">Q</a>
-							<a href="#S">S</a>
-							<a href="#T">T</a>
-							<a href="#X">X</a>
-							<a href="#Y">Y</a>
-							<a href="#Z">Z</a>
-						</div>
-					</div>
+				<div class="result">
+				已选择：
+		<span class="result_name"></span>
 				</div>
-				<div class="btn">
-					<button class="reset-btn">重置</button>
-					<button class="save-btn">确认</button>
+				<div class="select-area-box">
+				<ul>
+				<li >
+				<div class="tab whole">
+				<div class="province">
+				<input type="checkbox" class="checkbox other">全国
+				</div>
+				<!-- <div class="tab_content clearfix"></div> -->
+				</div>
+				</li>
+				<li class="index" id="A">A</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">安徽
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab municipality">
+				<div class="province">
+				<input type="checkbox" class="checkbox">澳门
+				</div>
+				</div>
+				<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="B">B</li>
+				<li >
+				<div class="tab municipality">
+				<div class="province">
+				<input type="checkbox" class="checkbox">北京
+				</div>
+				</div>
+				<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="C">C</li>
+				<li >
+				<div class="tab municipality">
+				<div class="province">
+				<input type="checkbox" class="checkbox">重庆
+				</div>
+				</div>
+				<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="F">F</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">福建
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="G">G</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">广东
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">广西
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">贵州
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">甘肃
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="H">H</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">河北
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">湖北
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">黑龙江
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">海南
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">河南
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">湖南
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<p class="index" id="J">J</p>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">吉林
 				</div>
-			</main>
-			
+				<span><i class="icon iconfont">&#xe600;</i></span>
 		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">江苏
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">江西
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="L">L</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">辽宁
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="N">N</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">内蒙古
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">宁夏
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="Q">Q</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">青海
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="S">S</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">山西
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">陕西
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab municipality">
+				<div class="province">
+				<input type="checkbox" class="checkbox">上海
+				</div>
+				</div>
+				<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">山东
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">四川
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="T">T</li>
+				<li >
+				<div class="tab municipality">
+				<div class="province">
+				<input type="checkbox" class="checkbox">天津
+				</div>
+				</div>
+				<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab municipality">
+				<div class="province">
+				<input type="checkbox" class="checkbox">台湾
+				</div>
+				</div>
+				<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="X">X</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">西藏
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">新疆
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li >
+				<div class="tab municipality">
+				<div class="province">
+				<input type="checkbox" class="checkbox">香港
+				</div>
+				</div>
+				<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="Y">Y</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">云南
+				</div>
+				<span><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				<li class="index" id="Z">Z</li>
+				<li >
+				<div class="tab">
+				<div class="province">
+				<input type="checkbox" class="checkbox">浙江
+				</div>
+				<span class="down-icon"><i class="icon iconfont">&#xe600;</i></span>
+		</div>
+		<div class="tab_content clearfix"></div>
+				</li>
+				</ul>
+				<div class="slide">
+				<a href="#all">#</a>
+				<a href="#A">A</a>
+				<a href="#B">B</a>
+				<a href="#C">C</a>
+				<a href="#F">F</a>
+				<a href="#G">G</a>
+				<a href="#H">H</a>
+				<a href="#J">J</a>
+				<a href="#L">L</a>
+				<a href="#N">N</a>
+				<a href="#Q">Q</a>
+				<a href="#S">S</a>
+				<a href="#T">T</a>
+				<a href="#X">X</a>
+				<a href="#Y">Y</a>
+				<a href="#Z">Z</a>
+				</div>
+				</div>
+				</div>
+				<div class="btn">
+				<button class="reset-btn">重置</button>
+				<button class="save-btn">确认</button>
+				</div>
+				</main>
+
+				</div>
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/jquery-2.1.4.js"></script>
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/mapJSON.js"></script>
 		<script>
@@ -399,47 +412,50 @@
 				return tempHtml
 			}
 			 $(function(){
-				$('.select-area-box .tab').on('click',function(event){
-					if ($(this).next(".tab_content").css('display') == "none") {
-						//展开未展开
-						// $(this).next(".tab_content").slideDown(500);
-					} else {
-						//收缩已展开
-						// $(this).next(".tab_content").slideUp(500);
-					}
-					$(this).toggleClass('selected').next('.tab_content').slideDown(500);
-					$(this).parent().siblings().children('.tab_content').slideUp(500);
-					$(this).parent().siblings().children('.tab').removeClass('selected'); 
-					
-				});
-				$('.province .checkbox').on('click',function(){
-					// console.log($(this).is(':checked'))
+				 $(".select-area-box .tab:not(.municipality)").on('click',function(event){
+					 $(this).toggleClass('selected').next('.tab_content').slideDown(500);
+					 $(this).parent().siblings().children('.tab_content').slideUp(500);
+					 $(this).parent().siblings().children('.tab').removeClass('selected');
+				 });
+				 $('.province .checkbox:not(.other)').on('change',function(){
 					var isCheckded = $(this).is(':checked');
+					console.log(isCheckded);
 					if(isCheckded){
 						$(this).parents('.tab').siblings('.tab_content').find('.city').addClass('active')
+						$('.other').prop('checked',false);
 					}else{
 						$(this).parents('.tab').siblings('.tab_content').find('.city').removeClass('active')
 					}
 				});
-				$('.tab_content').on('click','.city',function(){
-					$(this).toggleClass('active');
-					var isActive = $(this).parent().find('.city.active').length;
-					// console.log(isActive,$(this).html())
-					if(isActive){
-						var input = $(this).parents('li').find('input.checkbox')
-						window.input = input;
-						// console.log(input)
-						input.prop('checked', true)
-					}else{
-						$(this).parent('div').siblings('.tab').children().children('.checkbox').prop('checked', false)
-					}
-				});
+				 $('.tab_content').on('click','.city',function(){
+					 $(this).toggleClass('active');
+					 var isActive = $(this).parent().find('.city.active').length
+					 console.log(isActive,$(this).html());
+					 if(isActive){
+						 var input = $(this).parents('li').find('input.checkbox')
+						 window.input = input;
+						 input.prop('checked', true)
+					 }else{
+						 $(this).parent('div').siblings('.tab').children().children('.checkbox').prop('checked', false)
+					 }
+				 });
+				 $('.other').on('change',function(){
+					 var checked = $(this).is(':checked');
+					 if(checked){
+						 $('.tab:not(.whole)').removeClass('selected').children('.province').find('input').prop('checked', false);
+						 $('.tab_content').find('.city').removeClass('active')
+					 }
+				 });
 				
 				$('.save-btn').click(function(){
 					$('.result_name').empty();
-					var data = []
+					var data = [];
+					var val = $('.other').parents('.province').text().trim();
+					if($('.other').is(':checked')){
+						data.push(val)
+					}
 					$(".tab_content").find(".city.active").each(function(){
-						data.push($(this).html())
+						data.push($(this).html());
 					});
 					var html='';
 					for(var i = 0;i<data.length;i++){
@@ -464,6 +480,24 @@
 					$('.result_name').empty()
 				});
 				//
+				 if($(".province").find("input").prop("checked") === false){
+				 	$(".other").prop("checked", true);
+				 }
+				 //
+				 $(".tab_content").find(".city.active").each(function(){
+					 $(this).parent().prev().children("input").prop("checked", true)
+				 });
+				 //
+				 $(document).on('click', function () {
+					 console.log($(".province").find("input").prop("checked"));
+					 if($(".province").find("input").prop("checked") === false){
+						 $(".other").prop("checked", true);
+					 }else{
+						 $(".other").prop("checked", false);
+					 }
+				 });
+
+				 //
 				 if(localStorage.area !== "" && localStorage.area!==undefined){
 					 var area = localStorage.area.split(" ");
 					 for(var i in area){

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

@@ -1,194 +1,102 @@
 <!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>采购单位</title>
-		<meta name="viewport" content="initial-scale=1, maximum-scale=1">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css" />
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/win_bid.css">
-		{{include "/common/weixin.html"}}
-		<script src="/js/jquery.js"></script>
-	</head>
-	<style>
-		.win_bid .buyer .form-buyer {
-			padding: .3rem;
-			margin: .2rem 0;
-			background: #fff;
-		}
-		.win_bid .buyer .form-buyer input {
-			width: 100%;
-			height: 100%;
-			font-size: .28rem;
-		}
-		.win_bid .buyer .btn {
-			width: 100%;
-			height: .94rem;
-			background: #2cb7ca;
-			color: #fff;
-			font-size: .34rem;
-			text-align: center;
-		}
-	</style>
-	<body>
-		<div class="win_bid" id="win_bid_edit">
-			<!-- <header class="header">
-				<a href="#" class="return pull-left">
-					<i class="icon iconfont">&#xe640;</i>
-				</a>
-				<h1 class="title">采购单位</h1>
-			</header> -->
-			<main class="main">
-				<form action="" class="form-edit">
+<html lang="en">
 
-				</form>
-				<div class="buyer" style="display: none">
-					<div class="form-buyer">
-						<input type="text" placeholder="采购单位名称">
+<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">
+	<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">
+	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
+</head>
+
+<body>
+
+<div class="keyWord">
+	<div class="enter addkeyWord">
+		<input type="text" class="enterOne" placeholder="采购单位名称" />
+		<div class="btn">
+			<button disabled>确认</button>
+		</div>
+	</div>
+
+	<!-- 添加附加词显示列表 -->
+	<div class="showKeyWord">
+		<ul>
+			<li>
+				<div class="one">
+					<div>
+                            <span>
+                                <p class="key">abcde</p>
+                            </span>
 					</div>
-					<button class="btn">确认</button>
+					<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
 				</div>
-				<a href="#" class="query">
-					疑问解答
-					<i class="icon iconfont">&#xe63b;</i>
-				</a>
-				<div class="add">
-					<img src="{{Msg "seo" "cdn"}}/wx_dataExport/images/icon_add.png" >
+				<div class="modify">
+					<span contentEditable="true">abcde</span>
+					<button class="deleteKey">删除</button>
+					<button class="ascertainKey">确定</button>
 				</div>
-			</main>
-			<!-- weui toast -->
-			<div id="toast" style="display: none;">
-				<div class="weui-mask_transparent"></div>
-				<div class="weui-toast" style="min-height: .4rem;line-height: 1.4;">
-					<p class="weui-toast__content" style="margin: .2rem auto;">采购单位超过15个字</p>
-				</div>
-			</div>
-			<!-- 引用weui Dialog组件 -->
-			<div class="js_dialog" id="tipDialog" style="display: none;">
-				<div class="weui-mask"></div>
-				<div class="weui-dialog">
-					<div class="weui-dialog__bd">
-						<h1 class="dialog-title">疑问解答</h1>
-						<ul class="info">
-							<li>
-								<label>·关键词</label>
-								<p>目标信息中的关键性词语，如“软件系统”</p>
-							</li>
-							<li>
-								<label>·附加词</label>
-								<p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-							</li>
-							<li>
-								<label>·排除词</label>
-								<p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-							</li>
-						</ul>
-					</div>
-					<div class="weui-dialog__ft">
-						<a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary">我知道了</a>
+			</li>
+
+			<li>
+				<div class="one">
+					<div>
+                            <span>
+                                <p class="key">abcde</p>
+                            </span>
 					</div>
+					<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+				</div>
+				<div class="modify">
+					<span contentEditable="true">abcde</span>
+					<button class="deleteKey">删除</button>
+					<button class="ascertainKey">确定</button>
 				</div>
-			</div>
+			</li>
+
+		</ul>
+
+		<div class="addKeyWord">
+			<i class="iconfont icon-tianjia"></i>
+		</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>
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js" type="text/javascript" charset="utf-8"></script>
-		<script src="https://res.wx.qq.com/open/libs/weuijs/1.0.0/weui.min.js"></script>
-		<script>
-			$(function(){
-				// var buyerarr = {{.T.data}};
-				// // console.log(buyerarr);
-				// var buyerHtml = "";
-				// if(buyerarr === ""){
-				// 	window.location.href="/front/wx_dataExport/buyer";
-				// }
-				// for (var i in buyerarr) {
-				// 	buyerHtml += `
-				// 	<div class="form-item">
-				// 		<div class="item-control">
-				// 			<input type="text" id="buy" placeholder="采购单位名称" disabled="disabled" value="${buyerarr[i]["buyer"]}">
-				// 			<span class="edit">
-				// 				<i class="icon iconfont">&#xe60e;</i>
-				// 				修改
-				// 			</span>
-				// 		</div>
-				// 		<div class="item-btn">
-				// 			<button class="btn del">删除</button>
-				// 			<button class="btn enter">确认</button>
-				// 		</div>
-				// 	</div>`;
-				// }
-				// $(".form-edit").html(buyerHtml);
-				// 疑问解答
-				$('.query').click(function(){
-					$('#tipDialog').show(200);
-					$('.weui-dialog__btn_primary').click(function() {
-						$('#tipDialog').hide(200);
-					})
-				});
-				// 修改
-				$('.edit').click(function(event){
-					$(this).siblings('input').removeAttr("disabled").parent().siblings('.item-btn').show(400);
-				});
-				// 删除
 
-				$('.del').click(function(){
-					$(this).parent().parent().remove();
-				});
-				// 输入内容确认
-				$('.enter').click(function(){
-					// var buyerEdit = $(this).parent().prev().find("input").val();
-					var $toast = $('#toast');
-					// console.log($(this).parent().siblings().children().val().length)
-					if($(this).parent().siblings().children().val().length > 15){
-						if ($toast.css('display') != 'none'){
-							return;
-						}
-						$toast.show(100);
-						setTimeout(function () {
-							$toast.hide(100);
-						}, 2000);
-					}else{
-						$(this).parent().hide(600);
-					}
-				});
-				//
-				$('.add').click(function(){
-					$(".buyer").show();
-					$(".form-item").hide();
-				});
-				//
-				var buyerarr = [];
-				var buyerHtml = "";
-				$(".btn").on('click', function () {
-					var buyer = $(".form-buyer input").val();
-					buyerarr.push(buyer);
-					$(".buyer").hide();
-					$(".form-item").show();
-					console.log(buyerarr)
-				});
-				if (buyerarr !== []){
-					for(var i in buyerarr){
-						buyerHtml += `
-					<div class="form-item">
-						<div class="item-control">
-							<input type="text" id="buy" placeholder="采购单位名称" disabled="disabled" value="${ i }">
-							<span class="edit">
-								<i class="icon iconfont">&#xe60e;</i>
-								修改
-							</span>
-						</div>
-						<div class="item-btn">
-							<button class="btn del">删除</button>
-							<button class="btn enter">确认</button>
-						</div>
-					</div>`;
-					}
-					$(".form-edit").html(buyerHtml);
-				}
-			})
-		</script>
-	</body>
+	</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 src="{{Msg "seo" "cdn"}}/wx_dataExport/js/additionWord.js"></script>
+</body>
+
 </html>

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

@@ -0,0 +1,104 @@
+<!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="../css/base.css">
+    <link rel="stylesheet" href="../iconfont/iconfont.css">
+    <link rel="stylesheet" href="../css/weui.min.css">
+    <link rel="stylesheet" href="../css/keyWord.css">
+    <script src="../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 disabled>确认</button>
+            </div>
+        </div>
+
+        <!-- 添加排除词显示列表 -->
+        <div class="showKeyWord">
+            <ul>
+                <li>
+                    <div class="one">
+                        <div>
+                            <span>
+                                <p class="key">abcde</p>
+                            </span>
+                        </div>
+                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                    </div>
+                    <div class="modify">
+                        <span contentEditable="true">abcde</span>
+                        <button class="deleteKey">删除</button>
+                        <button class="ascertainKey">确定</button>
+                    </div>
+                </li>
+
+                <li>
+                    <div class="one">
+                        <div>
+                            <span>
+                                <p class="key">abcde</p>
+                            </span>
+                        </div>
+                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                    </div>
+                    <div class="modify">
+                        <span contentEditable="true">abcde</span>
+                        <button class="deleteKey">删除</button>
+                        <button class="ascertainKey">确定</button>
+                    </div>
+                </li>
+                
+            </ul>
+
+            <div class="addKeyWord">
+                <i class="iconfont icon-tianjia"></i>
+            </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="../js/zepto.js"></script>
+    <script src="../js/weui.min.js"></script>
+    <script src="../js/exclusiveWord.js"></script>
+</body>
+
+</html>

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

@@ -1,204 +1,102 @@
 <!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>中标单位</title>
-		<meta name="viewport" content="initial-scale=1, maximum-scale=1">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css">
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css" />
-		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css" />
-		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/win_bid.css">
-		{{include "/common/weixin.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">
+	<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">
+	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js"></script>
 	</head>
+
 	<body>
-		<div class="win_bid" id="win_bid_edit">
-			<!-- <header class="header">
-				<a href="#" class="return pull-left">
-					<i class="icon iconfont">&#xe640;</i>
-				</a>
-				<h1 class="title">中标单位</h1>
-			</header> -->
-			<main class="main">
-				<form action="" class="form-edit">
-					// <div class="form-item">
-					// 	<div class="item-control">
-					// 		<input type="text" placeholder="中标单位名称" disabled="disabled" value="郑州市工商局">
-					// 		<span class="edit">
-					// 			<i class="icon iconfont">&#xe60e;</i>
-					// 			修改
-					// 		</span>
-					// 	</div>
-					// 	<div class="item-btn">
-					// 		<button class="btn del">删除</button>
-					// 		<button class="btn enter">确认</button>
-					// 	</div>
-					// </div>
-					// <div class="form-item">
-					// 	<div class="item-control">
-					// 		<input type="text" placeholder="中标单位名称" disabled="disabled" value="郑州市工商局">
-					// 		<span class="edit">
-					// 			<i class="icon iconfont">&#xe60e;</i>
-					// 			修改
-					// 		</span>
-					// 	</div>
-					// 	<div class="item-btn">
-					// 		<button class="btn del">删除</button>
-					// 		<button class="btn enter">确认</button>
-					// 	</div>
-					// </div>
-				</form>
-				<a href="" class="query">
-					疑问解答
-					<i class="icon iconfont">&#xe63b;</i>
-				</a>
-				<a href="/front/wx_dataExport/winner" class="add">
-					<img src="{{Msg "seo" "cdn"}}/wx_dataExport/images/icon_add.png" >
-				</a>
-			</main>
-			<!-- weui toast -->
-			<div id="toast" style="display: none;">
-				<div class="weui-mask_transparent"></div>
-				<div class="weui-toast" style="min-height: .4rem;line-height: 1.4;">
-					<p class="weui-toast__content" style="margin: .2rem auto;">中标单位超过15个字</p>
-				</div>
+
+	<div class="keyWord">
+			<div class="enter addkeyWord">
+			<input type="text" class="enterOne" placeholder="中标单位名称" />
+			<div class="btn">
+			<button disabled>确认</button>
+	</div>
+	</div>
+
+	<!-- 添加附加词显示列表 -->
+	<div class="showKeyWord">
+			<ul>
+			<li>
+			<div class="one">
+			<div>
+			<span>
+			<p class="key">abcde</p>
+			</span>
+			</div>
+			<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+	</div>
+	<div class="modify">
+			<span contentEditable="true">abcde</span>
+			<button class="deleteKey">删除</button>
+			<button class="ascertainKey">确定</button>
 			</div>
-			<!-- 引用weui Dialog组件 -->
-			<div class="js_dialog" id="tipDialog" style="display: none;">
-				<div class="weui-mask"></div>
-				<div class="weui-dialog">
-					<div class="weui-dialog__bd">
-						<h1 class="dialog-title">疑问解答</h1>
-						<ul class="info">
-							<li>
-								<label>·关键词</label>
-								<p>目标信息中的关键性词语，如“软件系统”</p>
-							</li>
-							<li>
-								<label>·附加词</label>
-								<p>与关键词形成一体/组合，便于查找准确信息，如“开发”</p>
-							</li>
-							<li>
-								<label>·排除词</label>
-								<p>与关键词互斥，可排除一部分非目标信息，如“运维”</p>
-							</li>
-						</ul>
-					</div>
-					<div class="weui-dialog__ft">
-						<a href="javascript:;" class="weui-dialog__btn weui-dialog__btn_primary">我知道了</a>
-					</div>
-				</div>
+			</li>
+
+			<li>
+			<div class="one">
+			<div>
+			<span>
+			<p class="key">abcde</p>
+			</span>
+			</div>
+			<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+	</div>
+	<div class="modify">
+			<span contentEditable="true">abcde</span>
+			<button class="deleteKey">删除</button>
+			<button class="ascertainKey">确定</button>
 			</div>
-		</div>
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js" type="text/javascript" charset="utf-8"></script>
-		<script src="https://res.wx.qq.com/open/libs/weuijs/1.0.0/weui.min.js"></script>
-		<script>
-			$(function(){
-				//强制返回到数据导出
-				$(document).ready(function (e) {
-					if (window.history && window.history.pushState) {
-						$(window).on('popstate', function () {
-							window.history.pushState('forward', null, '#');
-							window.history.forward(1);
-							// alert("不可回退");  //如果需在弹框就用它
-							self.location="/front/wx_dataExport/toSieve"; //如查需要跳转页面就用它
-						});
-					}
-					window.history.pushState('forward', null, '#'); //在IE中必须得有这两行
-					window.history.forward(1);
-				});
-				//
-				var winnerarr = {{.T.data}};
-				// console.log(winnerarr);
-				var winnerHtml = "";
-				if(winnerarr === ""){
-					window.location.href="/front/wx_dataExport/winner";
-				}
-				for (var i in winnerarr) {
-					winnerHtml += `
-					<div class="form-item">
-						<div class="item-control">
-							<input type="text" id="winner" placeholder="中标单位名称" disabled="disabled" value="${winnerarr[i]["winner"]}">
-							<span class="edit">
-								<i class="icon iconfont">&#xe60e;</i>
-								修改
-							</span>
-						</div>
-						<div class="item-btn">
-							<button class="btn del">删除</button>
-							<button class="btn enter">确认</button>
-						</div>
-					</div>`;
-				}
-				$(".form-edit").html(winnerHtml);
-				// 疑问解答
-				$('.query').click(function(){
-					$('#tipDialog').show(200);
-					$('.weui-dialog__btn_primary').click(function() {
-						$('#tipDialog').hide(200);
-					})
-				});
-				// 修改
-				$('.edit').click(function(event){
-					$(this).siblings('input').removeAttr("disabled").parent().siblings('.item-btn').show(400);
-					var winner = $(this).prev().val();
-					sessionStorage.winner = winner;
-				});
-				// 删除
+			</li>
 
-				$('.del').click(function(){
-					var winner = $(this).parent().prev().find("input").val();
-					console.log(winner)
-					$.ajax({
-						type: 'post',
-						url: '/front/wx_dataExport/delWinner',
-						data: {"winner": winner},
-						async: false,
-						dataType: 'json',
-					});
-					$(this).parent().parent().remove();
-				});
-				// 输入内容确认
+			</ul>
 
-				$('.enter').click(function(){
-					var winner = sessionStorage.winner;
-					var winnerEdit = $(this).parent().prev().find("input").val();
-					$.ajax({
-						type: 'post',
-						url: '/front/wx_dataExport/editWinner',
-						data: {"winner": winner, "winnerEdit": winnerEdit},
-						async: false,
-						dataType: 'json',
-					});
-					var $toast = $('#toast');
-					// console.log($(this).parent().siblings().children().val().length)
-					if($(this).parent().siblings().children().val().length > 15){
-						if ($toast.css('display') != 'none'){
-							return;
-						}
-						$toast.show(100);
-						setTimeout(function () {
-							$toast.hide(100);
-						}, 2000);
-					}else{
-						$(this).parent().hide(600);
-					}
-				})
-				/* $('.add').click(function(){
-					$('.form-edit').append('<div class="form-item">\
-												<div class="item-control">\
-													<input type="text" placeholder="中标单位名称" disabled="disabled" value="郑州市工商局">\
-													<span class="edit"><i class="icon iconfont">&#xe60e;</i>修改</span>\
-												</div>\
-												<div class="item-btn">\
-													<button class="btn del">删除</button>\
-													<button class="btn enter">确认</button>\
-												</div>\
-											</div>')
-				}) */
-			})
-		</script>
+			<div class="addKeyWord">
+			<i class="iconfont icon-tianjia"></i>
+			</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"></script>
+	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js"></script>
+	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/additionWord.js"></script>
 	</body>
-</html>
+
+</html>