Merge branch 'dev2.10.10' of http://192.168.3.207:10080/qmx/jy into dev2.10.10

src/jfw/modules/app/src/web/templates/structeddata/write_infor.html

@@ -206,7 +206,7 @@ $(function(){
   weui.tab('#tab',{
       defaultIndex: 0,
       onChange: function(index){
-          console.log(index);
+          //console.log(index);
       }
   });
   // 姓名输入事件
@@ -225,7 +225,6 @@ $(function(){
             isfreesubmit[0] = 'false'
         }
       }
-      console.log(isfreesubmit)
       freesubmit()
   })
   
@@ -385,7 +384,6 @@ $(function(){
           $('.kf_phone_tips').hide()
           issubmit[1] = "true"
       }else{
-          console.log(myreg.test(this.value))
         if(myreg.test(this.value)){
             $('.kf_phone_tips').hide()
             issubmit[1] = "false"
@@ -501,12 +499,9 @@ function isPoneAvailable($poneInput) {
 function isname($nameInput) {
     // var myreg=/^\s*$/g;
     var tworeg = /^[\u4E00-\u9FA5]{2,}$/;
-    console.log(!tworeg.test($nameInput))
     if (!tworeg.test($nameInput)) {
-        console.log('false')
         return false;
     } else {
-        console.log('true')
         return true;
     }
 }

src/jfw/modules/app/src/web/templates/structeddata/write_result.html

@@ -40,7 +40,7 @@
 <script>
    function back_to_index(){
     //    window.location.href = "/jyapp/jylab/mainSearch"
-       history.go(-2)
+       history.go(-1)
    }
 
    function fanhui() {

src/web/staticres/structuredata/pc/js/write_infor.js

@@ -183,7 +183,6 @@ window.location.href="/front/dataExport/toSieve?from=structed"
     // 点击发送验证码
     $('.l-get-sms').on('click', function() {
         // 先判断邮箱格式
-        console.log('111')
         var iptemail = $('.ipt_email').val()
         var emailrule = isAvailableEmail(iptemail)
         if(emailrule){
@@ -356,12 +355,9 @@ window.location.href="/front/dataExport/toSieve?from=structed"
     function isname($nameInput) {
         // var myreg=/^\s*$/g;
         var tworeg = /^[\u4E00-\u9FA5]{2,}$/;
-        console.log(!tworeg.test($nameInput))
         if (!tworeg.test($nameInput)) {
-            console.log('false')
             return false;
         } else {
-            console.log('true')
             return true;
         }
     }
@@ -373,7 +369,6 @@ window.location.href="/front/dataExport/toSieve?from=structed"
 
     // 判断提交按钮是否可以点击
     function submit() {
-        console.log(issubmit.indexOf('false'))
         if(issubmit.indexOf('false') != -1) {
             $('.write_run').attr('disabled',true)
         } else {

src/web/templates/structuredata/mobile/write_infor_wx.html

@@ -188,7 +188,7 @@ $(function(){
   weui.tab('#tab',{
       defaultIndex: 0,
       onChange: function(index){
-          console.log(index);
+          //console.log(index);
       }
   });
   // 姓名输入事件
@@ -207,7 +207,6 @@ $(function(){
             isfreesubmit[0] = 'false'
         }
       }
-      console.log(isfreesubmit)
       freesubmit()
   })
   
@@ -246,7 +245,6 @@ $(function(){
                   email:this.value,
               },
               success:function(res) {
-                  console.log(res)
                   if(res.status == true) {
                       isfreesubmit[3] = 'true'
                       $('.email_code').slideUp();
@@ -368,7 +366,6 @@ $(function(){
           $('.kf_phone_tips').hide()
           issubmit[1] = "true"
       }else{
-          console.log(myreg.test(this.value))
         if(myreg.test(this.value)){
             $('.kf_phone_tips').hide()
             issubmit[1] = "false"
@@ -487,12 +484,9 @@ function isPoneAvailable($poneInput) {
 // 联系人必须是两个汉字以上
 function isname($nameInput) {
     var tworeg = /^[\u4E00-\u9FA5]{2,}$/;
-    console.log(!tworeg.test($nameInput))
     if (!tworeg.test($nameInput)) {
-        console.log('false')
         return false;
     } else {
-        console.log('true')
         return true;
     }
 }
@@ -514,7 +508,6 @@ function submit() {
     } else {
         $('.write_run').attr('disabled',false)
     }
-    console.log(issubmit)
 }
 
 // 判断免费样例的按钮是否可以点击

src/web/templates/structuredata/pc/index.html

@@ -236,7 +236,7 @@
         //为了保证兼容性，这里取两个值，哪个有值取哪一个
         //scrollTop就是触发滚轮事件时滚轮的高度
         var scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
-        console.log("滚动距离" + scrollTop);
+        //console.log("滚动距离" + scrollTop);
         // 定义定时器
         if(scrollTop >= 200) {
             $('.backTop').show()