Ver código fonte

Merge branch 'feature/v4.8.16_merge' of qmx/jy into feature/v4.8.16

zhangyuhan 2 anos atrás
pai
commit
fb4276b3eb

+ 3 - 4
src/jfw/modules/app/src/web/staticres/jyapp/css/wxinfocontent.css

@@ -301,7 +301,6 @@ body .loading_ p span {
     justify-content: space-between;
 }
 
-<<<<<<< HEAD
 .toolbar .refer_stand{
   display: flex;
   justify-content: space-between;
@@ -319,11 +318,12 @@ body .loading_ p span {
   align-items: center;
 }
 
-.toolbar .refer_stand .r-s-left img, .toolbar .refer_stand .r-s-right img{
+.toolbar .refer_stand .r-s-left img, .toolbar .refer_stand .r-s-right img {
   margin-right: 4px;
   width: 24px;
   height: 24px;
-=======
+}
+
 .toolbar .tool_bottom.new_layout.free_user {
   justify-content:flex-start;
   flex-direction: column;
@@ -336,7 +336,6 @@ body .loading_ p span {
 }
 .toolbar .tool_bottom.new_layout.free_user .timebefore{
   margin-top: .24rem;
->>>>>>> master
 }
 
 .forecast {

+ 3 - 7
src/jfw/modules/app/src/web/templates/big-member/page_pro_follow_detail.html

@@ -500,7 +500,6 @@
             isRequestIng:false,
             isExportDialogShow: false,
             cid: '', // 取消认领id
-<<<<<<< HEAD
             cbInfo: {
               isShowRefer: false,
               canBiaoInfo: {
@@ -551,10 +550,8 @@
               show: false,
               status: 0
             },
-            rownum: 1
-=======
+            rownum: 1,
             proParams: {}
->>>>>>> feature/v4.8.17
         },
         created() {
             this.isOpening()
@@ -610,7 +607,6 @@
             }
         },
         methods: {
-<<<<<<< HEAD
           doClosePopover () {
             this.showAccEntList = false
           },
@@ -1045,13 +1041,13 @@
               } else if (this.editBtnStatus.status == 2) {
                 this.editBtnStatus.status = 1
                 this.getBidContent()
-=======
+              }
+            },
             getShareParams () {
               this.proParams = {
                 type: '2',
                 id: this.sid,
                 referer: location.href
->>>>>>> feature/v4.8.17
               }
             },
             goAnalysis: function () {

+ 2 - 3
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1610,7 +1610,6 @@
       }
     }
 
-<<<<<<< HEAD
     // 查询项目是否可以参标
     // function getCanCanBiao () {
     //   const params = {
@@ -1743,7 +1742,7 @@
     }
 
     getCanBiaoInfo()
-=======
+
     var vShareCom = new Vue({
       el: '.forward-share',
       components: {
@@ -1768,7 +1767,7 @@
         }
       }
     })
->>>>>>> feature/v4.8.17
+
 
     // 商机管理-认领客户
     var vKeepEntComponent = new Vue({

+ 2 - 7
src/web/staticres/common-module/big-member/js/page_client_follow_detail.js

@@ -113,7 +113,6 @@ var vNode = {
         isRequestIng:false,
         isExportDialogShow: false,
         cid: '', // 取消认领id
-<<<<<<< HEAD
         cbInfo: {
           isShowRefer: false,
           canBiaoInfo: {
@@ -165,10 +164,8 @@ var vNode = {
           show: false,
           status: 0
         },
-        rownum: 1
-=======
+        rownum: 1,
         proParams: {}
->>>>>>> feature/v4.8.17
     },
     computed: {
         bmdetail: function () {
@@ -222,7 +219,6 @@ var vNode = {
       this.getShareParams()
     },
     methods: {
-<<<<<<< HEAD
           doClosePopover () {
             this.showAccEntList = false
           },
@@ -675,14 +671,13 @@ var vNode = {
         // 关闭投标项目阶段弹窗
         BidProjectPopupClose: function () {
           this.bidProject = false
-=======
+        },
         getShareParams () {
           this.proParams = {
             type: '2',
             id: this.sid,
             referer: location.href
           }
->>>>>>> feature/v4.8.17
         },
         goAnalysis: function () {
             sessionStorage.removeItem('big-analysis_filter')

+ 2 - 7
src/web/templates/big-member/wx/page_pro_follow_detail.html

@@ -497,7 +497,6 @@
             isRequestIng:false,
             isExportDialogShow: false,
             cid: '', // 取消认领id
-<<<<<<< HEAD
             cbInfo: {
               isShowRefer: false,
               canBiaoInfo: {
@@ -549,10 +548,8 @@
               show: false,
               status: 0
             },
-            rownum: 1
-=======
+            rownum: 1,
             proParams: {}
->>>>>>> feature/v4.8.17
         },
         created() {
             this.isOpening()
@@ -622,7 +619,6 @@
             }
         },
         methods: {
-<<<<<<< HEAD
           doClosePopover () {
             this.showAccEntList = false
           },
@@ -1077,14 +1073,13 @@
             // 关闭投标项目阶段弹窗
             BidProjectPopupClose: function () {
               this.bidProject = false
-=======
+            },
             getShareParams () {
               this.proParams = {
                 type: '2',
                 id: this.sid,
                 referer: location.href
               }
->>>>>>> feature/v4.8.17
             },
             goAnalysis: function () {
                 sessionStorage.removeItem('big-analysis_filter')

+ 81 - 227
src/web/templates/pc/biddetail_rec.html

@@ -373,70 +373,71 @@
                     var followProjectId = ""
                     var doReq = false
 
-<<<<<<< HEAD
-                    $.post("/bigmember/follow/project/check",{sid:{{.T.obj._id}}},function(res){
-                      if(res.data&&res.data.showFollow){
-                        if( res.data.flag ){
-                          //已关注
-                          $("#followedProject").css("display","")
-                        }else {
-                          //未关注
-                          $("#unfollowedProject").css("display","")
-                        }
-                        followProjectId= res.data.fig
-                        //取消关注
-                        $("#followedProject").on("click",cancelFollow)
-                        //关注
-                        $("#unfollowedProject").on("click",addFollow)
-                      } else {
-                        $('.bid_dev').hide()
-                      }
-                    });
-                    function cancelFollow() {
-                      if (followProjectId ===""||doReq){
-                        return
-                      }
-                      doReq = true
-                      $.post("/bigmember/follow/project/cancel",{fid:followProjectId},function(r){
-                        if (r.data === "success"){
-                          followProjectId= ""
-                          $("#followedProject").css("display","none")
-                          $("#unfollowedProject").css("display","")
-                        }
-                        doReq =	false
-                      });
-                    }
-                    function addFollow() {
-                      if (doReq){
-                        return
-                      }
-                      doReq = true
-                      $.post("/bigmember/follow/project/add",{sid:{{.T.obj._id}}},function(r){
-                        if(r.error_code===0&&r.data!==""){
-                          followProjectId = r.data
-                          $("#unfollowedProject").css("display","none")
-                          $("#followedProject").css("display","")
-                        } else {
-                          EasyAlert.show(r.error_msg, { 'max-width': 'unset' }, 1500);
-                        }
-                        doReq =	false
-                      });
-                    }
-                  })
-                </script>
-
-                <span class="com-wxshare">
-                    <img class="icon-title-img" src="{{Msg "seo" "cdn"}}/images/new-weixin.png">微信分享
-                    <div class="scanqr">
-                        <span>微信扫一扫</span>
-                        <img class="img" src="/biddetail/normal/qr/{{.T.obj._id}}" alt="微信分享">
-                    </div>
-                 </span>
-                <!-- 参标-->
+						$.post("/bigmember/follow/project/check",{sid:{{.T.obj._id}}},function(res){
+							if(res.data&&res.data.showFollow){
+								if( res.data.flag ){
+									//已关注
+									$("#followedProject").css("display","")
+								}else {
+									//未关注
+									$("#unfollowedProject").css("display","")
+								}
+								followProjectId= res.data.fig
+								//取消关注
+								$("#followedProject").on("click",cancelFollow)
+								//关注
+								$("#unfollowedProject").on("click",addFollow)
+							} else {
+								$('.bid_dev').hide()
+							}
+						});
+						function cancelFollow() {
+							if (followProjectId ===""||doReq){
+								return
+							}
+							doReq = true
+							$.post("/bigmember/follow/project/cancel",{fid:followProjectId},function(r){
+								if (r.data === "success"){
+									followProjectId= ""
+									$("#followedProject").css("display","none")
+									$("#unfollowedProject").css("display","")
+								}
+								doReq =	false
+							});
+						}
+						function addFollow() {
+							if (doReq){
+								return
+							}
+							doReq = true
+							$.post("/bigmember/follow/project/add",{sid:{{.T.obj._id}}},function(r){
+								if(r.error_code===0&&r.data!==""){
+									followProjectId = r.data
+									$("#unfollowedProject").css("display","none")
+									$("#followedProject").css("display","")
+								} else {
+									EasyAlert.show(r.error_msg, { 'max-width': 'unset' }, 1500);
+								}
+								doReq =	false
+							});
+						}
+					})
+				</script>
+				<span class="com-wxshare">
+				<img class="icon-title-img" src="{{Msg "seo" "cdn"}}/images/new-weixin.png">微信分享
+				<div class="scanqr">
+					<span>微信扫一扫</span>
+					<img class="img" src="/biddetail/normal/qr/{{.T.obj._id}}" alt="微信分享">
+				</div>
+      </span>
+                      <!-- 参标-->
                 <span class="com-collect" id="bidJoined" style="display: none;" onclick="joinBidAction('out')"><img class="icon-title-img" src='{{Msg "seo" "cdn"}}/images/canbiao-active.png'/>终止参标</span>
                 <span class="com-collect" id="bidJoin" onclick="joinBidAction('in')" style="display: none;"><img class="icon-title-img" src='{{Msg "seo" "cdn"}}/images/canbiao.png'/>参标</span>
-            </div>
-            <div class="sub-info-container">
+      <span class="com-icon" id="share-colleague">
+        <img class="icon-title-img" src="{{Msg "seo" "cdn"}}/images/share-colleague.png">转给同事
+      </span>
+			</div>
+			<div class="sub-info-container">
                 <!--  参标详细信息-->
                 <div class="bin-join-info">
                  <span>
@@ -452,12 +453,12 @@
                      </span>
                  </span>
                 </div>
-                <div class="personal-tags" style="display: none;">
-                    <div class="p-l-label">个人标签:</div>
-                    <div class="p-l-content"></div>
-                </div>
-            </div>
-            <script>
+				<div class="personal-tags" style="display: none;">
+					<div class="p-l-label">个人标签:</div>
+					<div class="p-l-content"></div>
+				</div>
+			</div>
+              <script>
               /**
                招标信息是否参标藏接口ajax
                bids: String, // 招标信息id(多个用,号拼接) 必填
@@ -534,144 +535,6 @@
                       }
                     }
                   }
-=======
-						$.post("/bigmember/follow/project/check",{sid:{{.T.obj._id}}},function(res){
-							if(res.data&&res.data.showFollow){
-								if( res.data.flag ){
-									//已关注
-									$("#followedProject").css("display","")
-								}else {
-									//未关注
-									$("#unfollowedProject").css("display","")
-								}
-								followProjectId= res.data.fig
-								//取消关注
-								$("#followedProject").on("click",cancelFollow)
-								//关注
-								$("#unfollowedProject").on("click",addFollow)
-							} else {
-								$('.bid_dev').hide()
-							}
-						});
-						function cancelFollow() {
-							if (followProjectId ===""||doReq){
-								return
-							}
-							doReq = true
-							$.post("/bigmember/follow/project/cancel",{fid:followProjectId},function(r){
-								if (r.data === "success"){
-									followProjectId= ""
-									$("#followedProject").css("display","none")
-									$("#unfollowedProject").css("display","")
-								}
-								doReq =	false
-							});
-						}
-						function addFollow() {
-							if (doReq){
-								return
-							}
-							doReq = true
-							$.post("/bigmember/follow/project/add",{sid:{{.T.obj._id}}},function(r){
-								if(r.error_code===0&&r.data!==""){
-									followProjectId = r.data
-									$("#unfollowedProject").css("display","none")
-									$("#followedProject").css("display","")
-								} else {
-									EasyAlert.show(r.error_msg, { 'max-width': 'unset' }, 1500);
-								}
-								doReq =	false
-							});
-						}
-					})
-				</script>
-				<span class="com-wxshare">
-				<img class="icon-title-img" src="{{Msg "seo" "cdn"}}/images/new-weixin.png">微信分享
-				<div class="scanqr">
-					<span>微信扫一扫</span>
-					<img class="img" src="/biddetail/normal/qr/{{.T.obj._id}}" alt="微信分享">
-				</div>
-      </span>
-      <span class="com-icon" id="share-colleague">
-        <img class="icon-title-img" src="{{Msg "seo" "cdn"}}/images/share-colleague.png">转给同事
-      </span>
-			</div>
-			<div class="sub-info-container">
-				<div class="personal-tags" style="display: none;">
-					<div class="p-l-label">个人标签:</div>
-					<div class="p-l-content"></div>
-				</div>
-			</div>
-			<div class="cutline"></div>
-<!--			<div class="com-prebuilt mask-zz hidden" style="position:relative;filter: blur(4px)">-->
-			<div class="com-prebuilt hidden" style="position:relative;">
-				<div class="mask-zz hidden" style="position:absolute; top:0;width: 900px;padding:0;height: 408px;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: -250px;width: 500px;height: 220px;background-color: white;z-index: 100;border-radius: 10px">
-						<div style="position: relative">
-							<img style="width: 100%;height: 100px;" src='{{Msg "seo" "cdn"}}/images/pc/pc_zzt.png?v={{Msg "seo" "version"}}'>
-							<div id="tip-title" style="position: absolute;top: 50%;left: 50%; margin-top: -13px;transform: translateX(-50%);height: 26px;color: antiquewhite;font-size: 18px;">拟建项目抢先获知</div>
-						</div>
-						<div class="tip-box">
-							<div class="tip-text" style="margin-top: 12px">提前获取正在审批中的新项目,比招标信息更超前!</div>
-							<div class="tip-text">助您提前了解项目信息,把握重要商机!</div>
-							<button class="detail-nj-btn" style="background: #2CB7CA;color: white;border:none;width: 132px;height: 36px;border-radius: 6px;margin-bottom: 20px;margin-top: 24px">免费体验</button>
-						</div>
-					</div>
-				</div>
-				<div class="mask-zzz hidden" style="position:absolute; top:0;width: 900px;padding:0;height: 408px;background-color:white;z-index: 1;">
-					<img style="width: 100%;height: 100%" src="/images/pc/pc_mh.png">
-					<div class="mask-zzz" style="position:absolute; left: 50%; top: 50%; transform: translate3d(-50%, -50%, 0);width: 500px;background-color: white;z-index: 100;border-radius: 10px">
-						<div style="position: relative">
-							<img style="width: 100%;height: 35%" src='{{Msg "seo" "cdn"}}/images/pc/pc_zzt.png?v={{Msg "seo" "version"}}'>
-							<div style="position: absolute;top: 50%;left: 50%; margin-top: -13px;margin-left: -90px;width: 180px;height: 26px;color: antiquewhite;font-size: 16px;">想中标?提前介入很关键!</div>
-						</div>
-						<div class="tip-box">
-							<div class="tip-text">采购意向项目全公开,抢先获知采购项目需求,</div>
-							<div class="tip-text">提前主动介入,中标几率更高!</div>
-							<button class="detail-nj-btn" style="background: #2CB7CA;color: white;border:none;width: 132px;height: 36px;border-radius: 6px;margin-bottom: 12px;margin-top: 10px">免费体验</button>
-						</div>
-					</div>
-				</div>
-				<div class="mask-zzz hidden" style="position:absolute; top:0;width: 900px;padding:0;height: 408px;background-color:white;z-index: 1;">
-					<img style="width: 100%;height: 100%" src="/images/pc/pc_mh.png">
-					<div class="mask-zzz" style="position:absolute; left: 50%; top: 50%; transform: translate3d(-50%, -50%, 0);width: 500px;background-color: white;z-index: 100;border-radius: 10px">
-						<div style="position: relative">
-							<img style="width: 100%;height: 35%" src='{{Msg "seo" "cdn"}}/images/pc/pc_zzt.png?v={{Msg "seo" "version"}}'>
-							<div style="position: absolute;top: 50%;left: 50%; margin-top: -13px;margin-left: -90px;width: 180px;height: 26px;color: antiquewhite;font-size: 16px;">免费查看更多公告</div>
-						</div>
-						<div class="tip-box">
-							<div class="tip-text">请完善个人信息,获取更多免费查看公告权限</div>
-							<button class="detail-nj-btn  jyarticle_see3" style="background: #2CB7CA;color: white;border:none;width: 132px;height: 36px;border-radius: 6px;margin-bottom: 12px;margin-top: 10px">立即解锁</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="lead-btn-nj" style="color:#2cb7ca;margin:15px 0;display:none;"><div class="adv_tosieve"></div><div class="join" onclick="adv_statistics(this)"><a style="color:#fff;text-decoration:none" class="adv_tosieve-btn"></a></div></div>
-			{{if .T.obj.detail}}
-			<div class="recoveryfat" style="display:none;">
-				<div class="recoveryhead">
-					<div class="tab2 active" onclick="jumpTab('2')">公告摘要</div>
-					<div class="tab1" onclick="jumpTab('1')">公告正文</div>
-					<div class="tab3">
-            {{if .T.obj.site}}
-            {{if eq .T.obj.site "剑鱼信息发布平台"}}
-            {{if .T.obj.recommended_service}}
-            {{if eq .T.obj.recommended_service 1}}
-            <div class="pubinfo">
-              <span>该信息由用户发布,急寻供应商</span>
-              <span class="btnn">点击报名</span>
-              <script>
-                $(".btnn").click(function(){
-                  //点击报名事件处理
-                  // vm.showForm = true
-                  var infoid = window.location.pathname.split("/")[3].split(".html")[0]
-                  vm.isNeedSubmit('peugeot_supplier_regist', function () {
-                    vm.showSuccess = true
-                  },"",infoid)
-                  vm.dialogTitleTop='供应商报名'
-                  vm.dialogTitle = '请完善您的个人信息,抢先对接采购单位'
->>>>>>> feature/v4.8.17
                 })
               }
               // 初始化参标的一些操作显示项
@@ -1878,7 +1741,6 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
           }
         })
       }
-<<<<<<< HEAD
     </script>
     <!-- 多条广告如下脚本只需引入一次 -->
     <script type="text/javascript" src="//cpro.baidustatic.com/cpro/ui/cm.js" async="async" defer="defer" >
@@ -1916,31 +1778,23 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
           }
         }
         initChat()
+        $('#share-colleague').on('click', function(){
+          sharebox_Dialog.showNewuserDialog = true
+        })
+        // 分享弹框 数据注入
+        const pagedata = {{.T.obj}} ;
+        const stype = extractString(pagedata.urlpath)
+        sharebox_Dialog.sendData({pageData:pagedata, title:pagedata.title, desc:'标讯信息', link:window.location.href, type:'biddetail_rec',code:1,id:pagedata._id,stype:stype});
+        function extractString(str) {
+          const regex = /\/article\/(.*?)\//;
+          const match = str.match(regex);
+          return match ? match[1] : null;
+        }
       })
     </script>
     <!--百度统计start-->
     {{include "/common/baiducc.html"}}
     <!--百度统计end-->
-=======
-      initChat()
-      $('#share-colleague').on('click', function(){
-        sharebox_Dialog.showNewuserDialog = true
-      })
-      // 分享弹框 数据注入
-      const pagedata = {{.T.obj}} ;
-      const stype = extractString(pagedata.urlpath)
-      sharebox_Dialog.sendData({pageData:pagedata, title:pagedata.title, desc:'标讯信息', link:window.location.href, type:'biddetail_rec',code:1,id:pagedata._id,stype:stype});
-      function extractString(str) {
-        const regex = /\/article\/(.*?)\//;
-        const match = str.match(regex);
-        return match ? match[1] : null;
-      }
-    })
-  </script>
-  <!--百度统计start-->
-{{include "/common/baiducc.html"}}
-<!--百度统计end-->
->>>>>>> feature/v4.8.17
 </body>
 </html>