xuzhiheng 5 жил өмнө
parent
commit
f418fb32e8
26 өөрчлөгдсөн 536 нэмэгдсэн , 265 устгасан
  1. 18 12
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/keyWord.css
  2. 16 0
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js
  3. 17 5
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js
  4. 50 23
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html
  5. 21 18
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html
  6. 4 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html
  7. 50 23
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html
  8. 21 18
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html
  9. 1 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_industry.html
  10. 26 14
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html
  11. 6 3
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html
  12. 19 1
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html
  13. 18 12
      src/web/staticres/wx_dataExport/css/keyWord.css
  14. 18 1
      src/web/staticres/wx_dataExport/js/additionWord.js
  15. 19 5
      src/web/staticres/wx_dataExport/js/keyWord.js
  16. 56 25
      src/web/templates/weixin/dataExport/dataExport_appended.html
  17. 6 3
      src/web/templates/weixin/dataExport/dataExport_appendedInput.html
  18. 1 2
      src/web/templates/weixin/dataExport/dataExport_area.html
  19. 4 1
      src/web/templates/weixin/dataExport/dataExport_buyerEdit.html
  20. 54 25
      src/web/templates/weixin/dataExport/dataExport_exclude.html
  21. 21 18
      src/web/templates/weixin/dataExport/dataExport_excludeInput.html
  22. 1 1
      src/web/templates/weixin/dataExport/dataExport_industry.html
  23. 43 31
      src/web/templates/weixin/dataExport/dataExport_keyWord.html
  24. 21 18
      src/web/templates/weixin/dataExport/dataExport_keyWordInput.html
  25. 1 1
      src/web/templates/weixin/dataExport/dataExport_subType.html
  26. 24 3
      src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

+ 18 - 12
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/keyWord.css

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

+ 16 - 0
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/additionWord.js

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

+ 17 - 5
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/keyWord.js

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

+ 50 - 23
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appended.html

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

+ 21 - 18
src/jfw/modules/app/src/web/templates/dataExport/dataExport_appendedInput.html

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

+ 4 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_buyerEdit.html

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

+ 50 - 23
src/jfw/modules/app/src/web/templates/dataExport/dataExport_exclude.html

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

+ 21 - 18
src/jfw/modules/app/src/web/templates/dataExport/dataExport_excludeInput.html

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

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_industry.html

@@ -5,10 +5,10 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>行业</title>
     <title>行业</title>
+    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/industry.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/industry.css?v={{Msg "seo" "version"}}">
-    <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 </head>
 </head>

+ 26 - 14
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html

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

+ 6 - 3
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html

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

+ 19 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_winnerEdit.html

@@ -52,6 +52,9 @@
 			/*top: 100%;*/
 			/*top: 100%;*/
 			text-align: center;
 			text-align: center;
 		}
 		}
+		.ios-user-select{
+			-webket-user-select: text;
+		}
 	</style>
 	</style>
 	<body>
 	<body>
 	<div class="app-layout-header">
 	<div class="app-layout-header">
@@ -100,7 +103,7 @@
 								<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
 								<button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
 							</div>
 							</div>
 							<div class="modify">
 							<div class="modify">
-								<span contentEditable="true">${ winner[i] }</span>
+								<span class="ios-user-select" contentEditable="true">${ winner[i] }</span>
 								<button class="deleteKey">删除</button>
 								<button class="deleteKey">删除</button>
 								<button class="ascertainKey">确定</button>
 								<button class="ascertainKey">确定</button>
 							</div>
 							</div>
@@ -200,6 +203,7 @@
 				$('.modify span').each(function(item){
 				$('.modify span').each(function(item){
 					$('.modify span')[0].contentEditable = true
 					$('.modify span')[0].contentEditable = true
 				});
 				});
+				keepLastIndex(e.target)
 				// console.log($(this).parent().siblings().find('span').text())
 				// console.log($(this).parent().siblings().find('span').text())
 				$(this).parent().hide();
 				$(this).parent().hide();
 				$(this).parent().siblings().css('display','block')
 				$(this).parent().siblings().css('display','block')
@@ -277,6 +281,20 @@
 			$(".app-back").on("click", function () {
 			$(".app-back").on("click", function () {
 				history.back();
 				history.back();
 			});
 			});
+			function keepLastIndex(obj) {
+				if (window.getSelection) {//ie11 10 9 ff safari
+					obj.focus(); //解决ff不获取焦点无法定位问题
+					var range = window.getSelection();//创建range
+					range.selectAllChildren(obj);//range 选择obj下所有子内容
+					range.collapseToEnd();//光标移至最后
+				}
+				else if (document.selection) {//ie10 9 8 7 6 5
+					var range = document.selection.createRange();//创建选择对象
+					range.moveToElementText(obj);//range定位到obj
+					range.collapse(false);//光标移至最后
+					range.select();
+				}
+			}
 		})
 		})
 
 
 	</script>
 	</script>

+ 18 - 12
src/web/staticres/wx_dataExport/css/keyWord.css

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

+ 18 - 1
src/web/staticres/wx_dataExport/js/additionWord.js

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

+ 19 - 5
src/web/staticres/wx_dataExport/js/keyWord.js

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

+ 56 - 25
src/web/templates/weixin/dataExport/dataExport_appended.html

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

+ 6 - 3
src/web/templates/weixin/dataExport/dataExport_appendedInput.html

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

+ 1 - 2
src/web/templates/weixin/dataExport/dataExport_area.html

@@ -6,13 +6,12 @@
 		<meta name="viewport" content="initial-scale=1, maximum-scale=1">
 		<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-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-
+		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}3"></script>
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}" />
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}" />
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 		<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/public.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/public.css?v={{Msg "seo" "version"}}">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/choose_area.css?v={{Msg "seo" "version"}}3">
 		<link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/choose_area.css?v={{Msg "seo" "version"}}3">
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
 		{{include "/common/weixin.html"}}
 		{{include "/common/weixin.html"}}
 		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 	</head>
 	</head>

+ 4 - 1
src/web/templates/weixin/dataExport/dataExport_buyerEdit.html

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

+ 54 - 25
src/web/templates/weixin/dataExport/dataExport_exclude.html

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

+ 21 - 18
src/web/templates/weixin/dataExport/dataExport_excludeInput.html

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

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_industry.html

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

+ 43 - 31
src/web/templates/weixin/dataExport/dataExport_keyWord.html

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

+ 21 - 18
src/web/templates/weixin/dataExport/dataExport_keyWordInput.html

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

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_subType.html

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

+ 24 - 3
src/web/templates/weixin/dataExport/dataExport_winnerEdit.html

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