Browse Source

修改结果建议显示

wyq 3 năm trước cách đây
mục cha
commit
bafd9414e1
2 tập tin đã thay đổi với 7 bổ sung8 xóa
  1. 0 2
      src/css/informationOut.less
  2. 7 6
      src/js/staticInfo.js

+ 0 - 2
src/css/informationOut.less

@@ -224,12 +224,10 @@ div,li,span,i,p,h1,h2,h3,h4,h5,pre{
   left: -10px;
   border-radius: 0;
   border: none;
-  background-color: #F5F6F7;
   background: url('../images/icon_current.png');
   background-repeat: no-repeat;
   background-position-x: center;
   background-position-y: center;
-  background-size: 18px 9px;
 }
   .disCopy {
     -webkit-touch-callout: none;

+ 7 - 6
src/js/staticInfo.js

@@ -322,7 +322,7 @@ function copy(name) {
   $(".copy").click(function () {
     var texts = document.getElementById("result_title").innerText;
     if (texts == '') {
-      Toast('温馨提示:结果为空,无法复制', 5000000000, 'warn')
+      Toast('温馨提示:结果为空,无法复制', 500, 'warn')
       return
     }
     var inputs = document.getElementById("inputs");
@@ -330,7 +330,7 @@ function copy(name) {
     console.log(inputs.value)
     inputs.select(); // 选中文本
     document.execCommand("copy"); // 执行浏览器复制命令
-    Toast('复制成功', 5000000000000, 'success')
+    Toast('复制成功', 500, 'success')
   })
 
 }
@@ -393,14 +393,15 @@ function getResult(pushInfo, textType) {
         for (var i = 0; i < pushInfo.length; i++) {
           if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && !tmp) {
             result = pushInfo[i].result + '(' + num + '分' + ')'
-            proposal = pushInfo[i].pushInfo
+            proposal = pushInfo[i].pushInfo + ';' + proposals.join(";");
             break
           } else if (pushInfo[i].content.max >= num && num >= pushInfo[i].content.min && tmp) {
-            result = pushInfo[i].result + '(' + num + '分' + ')' + ';' + tmp
-            proposal = pushInfo[i].pushInfo
+            result = pushInfo[i].result + '(' + num + '分' + ')' + '' + tmp
+            proposal = pushInfo[i].pushInfo + ';' + proposals.join(";");
             break
           } else {
             result = tmp
+            proposal = proposals.join(";");
           }
         }
       } else {
@@ -430,7 +431,7 @@ function getResult(pushInfo, textType) {
         $(".foot").css('display', 'block')
       }
     } else {
-      Toast('温馨提示:必填选项不能为空~', 5000000000, 'warn')
+      Toast('温馨提示:必填选项不能为空~', 500, 'warn')
     }
   })
   $(".printing").hover(