Merge branch 'release/v4.8.33' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.8.33_wmh

src/jfw/front/shorturl.go

@@ -84,7 +84,8 @@ var (
 
 func (s *Short) Article(stype, id string) error {
 	userId, _ := s.GetSession("userId").(string)
-	if (stype == "content" || stype == "indexcontent") && userId == "" {
+	//PC端未登录用户程序走此逻辑  WX端走原来逻辑
+	if !mobileReg.MatchString(s.Header("User-Agent")) && (stype == "content" || stype == "indexcontent") && userId == "" {
 		if seoAgentReg.MatchString(s.UserAgent()) {
 			sids := encrypt.CommonDecodeArticle(stype, id)
 			return s.NologinCommon("", stype, id, sids[0])

src/web/staticres/common-module/pc-dialog/css/leave-info-dialog.css

@@ -87,22 +87,22 @@
   left: 50%;
   top: 50%;
   width: 752px;
-  max-height: 680px;
-  margin: 34px auto 0;
-  background: #fff;
+  /* max-height: 680px; */
+  margin: -30px auto 0;
+  background: transparent;
   border-radius: 8px;
-  transform: translate(-50%,-45%);
+  transform: translate(-50%,-50%);
   z-index: 1000;
   box-sizing: border-box;
   /* overflow-y: auto; */
 }
-@media screen and (min-width: 800px) and (max-width: 1366px) {
+/* @media screen and (min-width: 800px) and (max-width: 1366px) {
   #collectUserInfoDialog .dialog-container {
     top: 65%;
   }
-}
+} */
 #collectUserInfoDialog .dialog-header{
-  margin-top: -114px;
+  /* margin-top: -114px; */
   height: 250px;
   color: #1D1D1D;
   font-size: 18px;
@@ -114,8 +114,10 @@
   background-size: 100% 250px;
 }
 #collectUserInfoDialog .dialog-content{
-  /* margin-top: 20px; */
+  margin-top: -1px;
   padding: 0 32px 32px;
+  border-radius: 0 0 8px 8px;
+  background-color: #fff;
 }
 #collectUserInfoDialog .form-title{
   font-size: 14px;

src/web/staticres/common-module/pc-dialog/js/leave-info-dialog.js

@@ -389,7 +389,7 @@ var vm = new Vue({
         }
       }
     })
-    $(window).on('resize', this.changeTop)
+    // $(window).on('resize', this.changeTop)
   },
   beforeDestroy() {
     $(document).off('click')
@@ -419,15 +419,15 @@ var vm = new Vue({
         }
       }
     },
-    changeTop: function () {
-      this.$nextTick(function () {
-        var dialogDom = $('#collectUserInfoDialog .dialog-container')
-        var diffHeight = window.innerHeight - dialogDom.height() - 240
-        if (diffHeight < 0) {
-          dialogDom.css('margin-top', diffHeight.toString() + 'px')
-        }
-      })
-    },
+    // changeTop: function () {
+    //   this.$nextTick(function () {
+    //     var dialogDom = $('#collectUserInfoDialog .dialog-container')
+    //     var diffHeight = window.innerHeight - dialogDom.height() - 240
+    //     if (diffHeight < 0) {
+    //       dialogDom.css('margin-top', diffHeight.toString() + 'px')
+    //     }
+    //   })
+    // },
     nameFocus:function(){
       this.$refs['ruleForm'].clearValidate(['name']);
     },
@@ -546,7 +546,7 @@ var vm = new Vue({
               _this.showForm = true
             // 当前头部背景图
               _this.isSelfHeader()
-              _this.changeTop()
+              // _this.changeTop()
               if (res.info) {
                 echoRequiredValues(_this.form, res.info, ['name', 'phone', 'mail', 'branch'])
                 // 原有赋值回显逻辑

src/web/staticres/dataSmt/css/index.css

@@ -183,9 +183,7 @@ a:focus{
   width: 688px;
   height: 354px;
   padding: 32px 40px;
-  background: linear-gradient(to left, #3CADF9, #10BDE3, #276EF3), url(/dataSmt/images/supermarket-left-bg.png) no-repeat;
-  background-position: right center;
-  background-blend-mode: color-burn;
+  background: url(/dataSmt/images/supermarket-left-bg.png) no-repeat center center;
   background-size: 100% 100%;
   border-radius: 16px;
 }

src/web/templates/dataMarket/index.html

@@ -180,8 +180,7 @@
           </li>
         </ul>
         <p class="learn-more-container">
-          <a id="learn-more-data-export" class="learn-more" href="javascript:;"
-             onClick="needSubmitHandle('pc_data_custom_data')">了解更多></a>
+          <a id="learn-more-data-export" class="learn-more" href="/front/dataMarket/customExport">了解更多></a>
         </p>
       </div>
       <div class="export-case CfadeInUp">

src/web/templates/pc/dataSmt/list.html

@@ -207,8 +207,11 @@
     }
   }
   function dataSmtdetail (id){
-  
-    window.open('/datasmt/all/'+id+'?searchwords='+getParam('searchValue'))
+    if (getParam('searchValue')==""){
+      window.open('/datasmt/all/'+id)
+    }else {
+      window.open('/datasmt/all/' + id + '?searchwords=' + getParam('searchValue'))
+    }
   }
   function needSubmitHandle (source, name){
     // 调用组件是否留资方法