Przeglądaj źródła

Merge branch 'dev4.6.2.4' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.4

zhangxinlei1996 3 lat temu
rodzic
commit
541d0b2eea

+ 11 - 4
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -546,7 +546,7 @@
                         </li>
                     {{end}}
                 </ul>
-                <div class="mask-zz" style="position:absolute; top:0;width: 380px;padding:0;height: 100%;background-color:white;z-index: 1;">
+                <div class="mask-zz" style="position:absolute; top:0;width: 100%;padding:0;height: 100%;background-color:white;z-index: 1;">
                     <img style="width: 100%;height: 100%" src="/images/pc/pc_mh.png">
                     <div class="mask-zz" style="position:absolute; left: 50%; top: 50%; margin-top: -110px;margin-left: -150px;width: 300px;height: 220px;background-color: white;z-index: 100;border-radius: 10px">
                         <div style="position: relative">
@@ -554,9 +554,10 @@
                             <div style="position: absolute;top: 50%;left: 50%; margin-left: -100px;width: 200px;height: 26px;color: antiquewhite;font-size: 16px;">想中标?提前介入很关键!</div>
                         </div>
                         <div style="display: flex;flex-direction: column;justify-content: center;align-items: center;padding: 20px;">
-                            <div style="color: #0d0d0d;font-size: 16px;font-weight: 500;margin-bottom: 5px">提前获取正在审批中的新项目,比招标信息更超前!</div>
-                            <div style="color: #0d0d0d;font-size: 16px;font-weight: 500;margin-bottom: 20px">助您提前了解项目信息,把握重要商机!</div>
-                            <button style="background-color: deepskyblue;color: white;border:none;width: 105px;height:30px;border-radius: 5px;margin-bottom: 20px" @click="onFree">免费体验</button>
+                            <div style="color: #0d0d0d;font-size: 14px;font-weight: 500;">拟建项目抢先获知,提前获取正在审批中的</div>
+                            <div style="color: #0d0d0d;font-size: 14px;font-weight: 500;">新项目,比招标信息更超前!</div>
+                            <div style="color: #0d0d0d;font-size: 14px;font-weight: 500;margin-bottom: 20px">助您提前了解项目信息,把握重要商机!</div>
+                            <button class="free-btn-reword" style="background-color: deepskyblue;color: white;border:none;width: 105px;height:30px;border-radius: 5px;margin-bottom: 20px" @click="onFree">免费体验</button>
                         </div>
                     </div>
                 </div>
@@ -1109,6 +1110,12 @@
         }
     }
 
+    //留资弹窗页面
+    $('.free-btn-reword').on('click', function() {
+        //  留资判断
+        location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=ent_portrait_contacts'
+    })
+
     // 判断账户权限
     function getAccountInfo () {
         $.ajax({

Plik diff jest za duży
+ 1 - 1
src/jfw/modules/bigmember/src/config.json


+ 8 - 0
src/jfw/modules/publicapply/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/publicapply.iml" filepath="$PROJECT_DIR$/.idea/publicapply.iml" />
+    </modules>
+  </component>
+</project>

+ 9 - 0
src/jfw/modules/publicapply/.idea/publicapply.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 6 - 0
src/jfw/modules/publicapply/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
+  </component>
+</project>

+ 1 - 1
src/jfw/modules/publicapply/src/config.json

@@ -14,7 +14,7 @@
             "user": "public03@topnet.net.cn"
         }
     ],
-    "attachmentRPC":"192.168.3.128:10082",
+    "attachmentRPC":"192.168.3.206:10082",
     "followPushRpc": "127.0.0.1:8759",
     "industry": "分类综合测试",
     "defaultEntList": [

+ 69 - 1
src/web/templates/weixin/wxinfocontent_rec.html

@@ -633,6 +633,46 @@ pre {
   background-size: contain;
   margin-right: .04rem;
 }
+.free-down-text,.file-count-tip{
+  display: none;
+  margin-left: .24rem;
+  padding: 0 .16rem;
+  background: rgba(42, 189, 209, 0.1);
+  border-radius: 10px;
+  line-height: .4rem;
+  font-size: .22rem;
+  color: #2ABDD1;
+}
+.concat-kf {
+  display: none;
+  padding: 0.06rem .16rem;
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDY3IDc5LjE1Nzc0NywgMjAxNS8wMy8zMC0yMzo0MDo0MiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTUgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjNGMjBGMzQ2NEYyQzExRUNBNDRBRDFDQjI2MEM5NTRBIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjNGMjBGMzQ3NEYyQzExRUNBNDRBRDFDQjI2MEM5NTRBIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6M0YyMEYzNDQ0RjJDMTFFQ0E0NEFEMUNCMjYwQzk1NEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6M0YyMEYzNDU0RjJDMTFFQ0E0NEFEMUNCMjYwQzk1NEEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5KLSJ9AAAABlBMVEX///////9VfPVsAAAAAnRSTlP/AOW3MEoAAABISURBVHjazNIxDgAgCEPR9v6XdsBEUL6udiPPEBVkiC6gCIL+AtN1GUyt2rdH1UgBpa7zlLasb0cwQqU6QYRE58wR3lsyBBgA3KsBiK25dREAAAAASUVORK5CYII=) no-repeat 6px center #2ABDD1;
+  background-size: .28rem .28rem;
+  padding-left: .48rem;
+  border-radius: 8px;
+  color:#fff;
+  font-size: .22rem;
+  line-height: normal;
+}
+.icon-help{
+  display: none;
+  width: .32rem;
+  height: .32rem;
+  margin: 0 .38rem 0 .2rem;
+  background: url(/images/help-b.png) no-repeat center center;
+  background-size: contain;
+}
+.download-list ul .downs {
+  margin-bottom: 0.32rem;
+  font-size: .3rem;
+  line-height: .44rem;
+  color: #2ABED1;
+  text-decoration: underline;
+}
+.join {
+    display: flex;
+    align-items: center;
+}
 </style>
 </head>
 <body>
@@ -977,6 +1017,10 @@ pre {
                     <a class="adv_center" style="display: flex;flex-direction: column;flex: 1;">
                         <div class="join">
                             附件下载
+                            <span class="free-down-text">免费用户享有1次附件下载权益</span>
+                            <span class="file-count-tip">本月剩余:<em class="file-count"></em>次</span>
+                            <span class="icon-help"></span>
+                            <span class="concat-kf">联系客服</span>
                         </div>
                     </a>
                 </div>
@@ -1511,6 +1555,16 @@ function isOpening() {
           }
           if (res.data.power && res.data.power.indexOf(6) > -1) {
             $('#analysis-in').hide()
+          }
+          // 免费用户展示可下载一次提示(免费用户且没有体验过附件下载权益的展示)
+          if (res.data && res.data.isFree && res.data.freeFile == 0) {
+            $('.free-down-text').css('display', 'inline-block')
+          }
+          if (res.data && res.data.vipStatus > 0 && res.data.viper) {
+            $('.file-count-tip').css('display', 'inline-block')
+            $('.concat-kf').css('display', 'inline-block')
+            $('.icon-help').css('display', 'inline-block')
+            $('.file-count').html(res.data.fileNum)
           }
 			},
 			error:function(err) {
@@ -2467,7 +2521,21 @@ $(function(){
     {{end}}
     $(".original_name").attr("adv_name",original_name);
     $(".original").attr("dataHref",original);
-
+    
+    // 下载帮助
+    $('.icon-help').click(function(){
+      vant.Dialog.alert({
+        message: '点击附件即为下载,系统会扣除当月附件下载次数;每月下载次数有限,次月清零,请合理使用。',
+        className: 'custom-dialog',
+        confirmButtonText: '我知道了',
+        confirmButtonColor: '#2ABDD1',
+        width: 303,
+      }).then(() => {})
+    })
+    // 联系客服
+    $('.concat-kf').click(function(){
+      location.href = '/big/wx/page/customer'
+    })
 })
 function reward(){
 	window.location.href = "/jypay/weixin/reward/redirect?id={{.T.obj._id}}&source=m";

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików