Merge remote-tracking branch 'origin/dev4.6.2.4' into dev4.6.2.4

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -746,7 +746,7 @@
         success: function (r) {
             if (r && r.data) {
                 window.jyAddInfo = r.data
-                if(res.data.memberStatus > 0 && r.data.isSubCount) {
+                if(r.data.memberStatus > 0 && r.data.isSubCount) {
                     $('#resbm').hide()
                 } else {
                     $('#resbm').show()

src/jfw/modules/bigmember/src/service/use/use.go

@@ -993,6 +993,8 @@ func Combo(userid string, member_status int) (combo_name string) {
 			3: "商机版",
 			4: "试用版",
 			5: "自定义",
+			6: "商机版2.0",
+			7: "专家版2.0",
 		}
 		combo_name = level_map[member_status]
 	}

src/web/templates/pc/biddetail_rec.html

@@ -3356,11 +3356,34 @@ function fromwhere(text){
       }
     }
   }
+
+  //超级订阅附件下载
+  function cjdyDownload () {
+	  $.ajax({
+		  type:'post',
+		  url:'/publicapply/attachment/get',
+		  data:{
+			  infoId:{{.T.obj._id}}
+  		  },
+		  success:function(data){
+			  // TODO 留资判断
+			  for(var i=0;i<data.data.attachment.length;i++) {
+
+			  }
+			  if(data.data && data.data.attachment !=null && data.data.attachment.length!==0){
+				  for(var i=0;i<data.data.attachment.length;i++) {
+					  goDownload(data.data.attachment[i].downurl)
+				  }
+			  }
+	  }
+  });
+  }
+
   // 获取附件内容
   function getFileData () {
     $.ajax({
       type:'post',
-      url:'/publicapply/attachment/get',
+      url:'/bigmember/attachment/get',
       data:{
         infoId:{{.T.obj._id}}
       },
@@ -3369,15 +3392,28 @@ function fromwhere(text){
         if(data.data && data.data.attachment !=null && data.data.attachment.length!==0){
           var html = ''
           for(var i=0;i<data.data.attachment.length;i++) {
-            html += "<div class='downs'>"+"<a class='menu_list' style='text-decoration:underline;color: #2CB7CA' onclick='goDownload(\""+data.data.attachment[i].downurl+"\")'>"+(i+1)+"."+data.data.attachment[i].filename+"</a></div>"
+            // html += "<div class='downs'>"+"<a class='menu_list' style='text-decoration:underline;color: #2CB7CA' onclick='goDownload(\""+data.data.attachment[i].downurl+"\")'>"+(i+1)+"."+data.data.attachment[i].filename+"</a></div>"
+            html += "<div class='downs'>"+"<a class='menu_list' style='text-decoration:underline;color: #2CB7CA'>"+(i+1)+"."+data.data.attachment[i].filename+"</a></div>"
+
           }
           if(html!==""){
             $("#attach-list").css("display","").find(".download-list").html(html)
           }
+			$(".downs").click(function (){
+				cjdyDownload()
+			})
+			// $(".downs").click(function (){
+			//
+			// })
         }
       }
     });
   }
+
+  // $(".menu_list").click(function (){
+  //
+  // })
+
   // 根据isAdd接口 展示附件部分dom
   function showFileSomeDom () {
     // 免费用户展示可下载一次提示(免费用户且没有体验过附件下载权益的展示)