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

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_introduce.css

@@ -34,7 +34,6 @@
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  margin-bottom: .94rem;
 }
 
 .vip_introduce .main {
@@ -168,14 +167,6 @@
   font-size: .22rem;
 }
 
-.vip_introduce .menu {
-   position: fixed;
-   width: 100%;
-   /* height: .94rem; */
-   bottom: 0;
-   /* line-height: .94rem; */
-}
-
 .vip_introduce .menu:after {
   position: absolute;
   content: '';

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_purchase.css

@@ -345,8 +345,8 @@
 }
 
 .custom-switch.checked {
-  border-color: #04be02;
-  background-color: #04be02;
+  border-color: #2ABED1;
+  background-color: #2ABED1;
 }
 
 .custom-switch.checked:before {

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_index_new.html

@@ -246,7 +246,6 @@
         </div>
     </div>
 
-    <!-- 计费清单picker -->
     <!-- 计费清单picker -->
     <div class="billing-list-container" style="display: none;">
         <div class="weui-mask weui-animate-fade-in"></div>

src/web/staticres/vipsubscribe/css/weui.min.css

@@ -343,7 +343,7 @@
 
 }
 .p13 .jymobile-datePicker .weui-half-screen-dialog__hd .weui-icon-btn {
-    background: url(/jyapp/images/wxqc.png?v=1429);
+    background: url(/vip/wxqc.png?v=1429);
     color: transparent;
     width: 16px;
     height: 16px;

src/web/templates/weixin/historypush.html

@@ -132,8 +132,12 @@
             });
             // TODO 缺陷疑问
             $(".wx_header_right .sub_manager").click(function () {
-                setSessionStorage();
-                window.location.href = '/wxkeyset/keyset/index';
+                if (!isVipSub) {
+                    setSessionStorage();
+                    window.location.href = '/wxkeyset/keyset/index';
+                } else {
+                    tosetpage()
+                }
             });
             //
             $(window).scroll(function () {
@@ -387,7 +391,12 @@
                     }
                 }
                 $('.wx_header').show();
-                $(".vip_set").show();
+                // $(".vip_set").show();
+                // TODO vip
+                $(".switch").addClass("only-vip");$(".switch").text("VIP订阅").show();
+                $(".switch").click(tosetpage);
+                // thisClass.InitVip(r);
+                // extend(1);
                 $(".vip_report").show();
                 $(".tab_left .area").show();
                 $.post("/subscribepay/report/tip", null, function (r) {
@@ -1020,12 +1029,12 @@
         ._header .wx_header .wx_header_left .only-vip:before {
             content: "";
             width: 15px;
-            height: 15px;
+            height: 18px;
             background-size: 15px;
             background-repeat: no-repeat;
             background-position: center;
             margin-right: 5px;
-            background-image: url(/jyapp/images/vip.png);
+            background-image: url(/vip/vip.png);
         }
         ._header .wx_header .wx_header_right {
             line-height: 56px;
@@ -1034,7 +1043,7 @@
             font-size: 15px;
             align-self: center;
             padding-left: 19px;
-            background-image: url('/jyapp/images/sub_manager.png');
+            background-image: url('/vip/sub_manager.png');
             background-size: 14px;
             background-repeat: no-repeat;
             background-position: left center;
@@ -1055,7 +1064,7 @@
             font-size: 15px;
             align-self: center;
             padding-left: 19px;
-            background-image: url('/jyapp/images/sub_manager.png');
+            background-image: url('/vip/sub_manager.png');
             background-size: 14px;
             background-repeat: no-repeat;
             background-position: left center;
@@ -1265,9 +1274,9 @@
     <div class="wx_header">
         <div class="wx_header_left">
             订阅
-            <span class="switch" style="display:none;">
+            <div class="switch" style="display:none;">
                 <span></span>
-            </span>
+            </div>
         </div>
         <div class="wx_header_right">
             <span class="sub_manager">订阅管理</span>
@@ -1326,7 +1335,7 @@
     <div class="vip_banner" style="display: none;">
         <div class="box">
             <div class="left">
-                <img src="/jyapp/vipsubscribe/image/Vector.png?t=1" alt="v">
+                <img src="/vip/Vector.png?t=1" alt="v">
                 <h4>300组关键词特权</h4>
             </div>
             <a onclick="tointroducepage()" class="right freeuse" style="text-decoration: none;background: linear-gradient(270deg, #F1D090 0%, #FAE7CA 100%)">免费试用</a>
@@ -1560,29 +1569,6 @@
             }
         })
     }
-    $.post("/jyapp/myinfo?t="+new Date().getTime(),null,function(r){
-        if(r.userType=="vip"){
-            $(".switch").addClass("only-vip");
-            $(".switch").text("VIP订阅").show();
-            $(".switch").click(tosetpage);
-            thisClass.InitVip(r);
-            extend(1);
-        }
-        // else{
-        //     setTimeout(function(){
-        //     if (scrollTop==0){
-        //         $(".header_header").show();
-        //     }},200)
-        //     $(".app-content").css("justify-content","flex-start");
-        //     $(".switch").addClass("only-personal");
-        //     $(".switch>span").text("免费试用 VIP");
-        //     $(".switch").click(tointroducepage);
-        //     $(".switch_ext").click(tointroducepage);
-        //     thisClass.InitPersonal(r);
-        //     userMergeQuery();
-        //     extend(0);
-        // }
-    });
     function weuiDialog() {
         weui.dialog({
             title: '提示信息',

src/web/templates/weixin/wxinfocontent_rec.html

@@ -96,39 +96,6 @@ pre {
 	font-size: 16px;
 	top: 3px;
 }
-.area{
-    padding: 1px 3px;
-	color: #fff;
-    background-color: #24C0D7;
-    border-radius: 2px;
-    margin-right: 3px;
-    float: left;
-    height: 0.40rem;
-    line-height: 0.40rem;
-	display: inline-block;
-}
-.type{
-    padding: 1px 3px;
-    background: #ffba00;
-	color: #fff;
-	border-radius: 2px;
-	margin-right: 3px;
-	float: left;
-    height: 0.40rem;
-    line-height: 0.40rem;
-	display: inline-block;
-}
-.industry{
-	padding: 1px 3px;
-	background: #25c78c;
-	color: #fff;
-	border-radius: 3px;
-	margin-right: 3px;
-	float: left;
-    height: 0.40rem;
-    line-height: 0.40rem;
-	display: inline-block;
-}
 .guide{
 	text-align: center;
 	position: absolute;
@@ -255,16 +222,6 @@ pre {
     font-size: 15px;
     border-radius: 15px;
 }
-/*.onekey{
-	float: right;
-    border: 1px solid #2cb7ca;
-    background-color: #2cb7ca;
-    color: #fff;
-    padding: 3px 10px 2px;
-    font-size: 13px;
-    border-radius: 2px;
-	margin-top: -5px;
-}*/
 .sion-left{
 	height: 1px;
     border-bottom: 1px dashed #cecece;
@@ -295,8 +252,6 @@ pre {
 	display:none;
 }
 .adv-cont{
-	/*height: 65pt;
-    width: 90%;*/
     margin: auto;
 	padding: 20px 15px;
 }
@@ -335,12 +290,6 @@ pre {
 	text-align: center;
 	padding: 0px 20px 15px;
 }
-/*#onekey{
-	padding:8px 28px;
-	width: 100%;
-	background-color: #24C0D7;
-	border-radius: 6px;
-}*/
 .modal-body {
 	padding:15px 20px;
 }
@@ -415,18 +364,6 @@ pre {
 	left: 90%;
 	top: 20px;
 }
-
-.buyerclass{
-    background: #CFAD89;
-    padding: 1px 3px;
-    color: #fff;
-    border-radius: 3px;
-    margin-right: 3px;
-    float: left;
-    height: 0.40rem;
-    line-height: 0.40rem;
-	display: inline-block;
-}
 .timebefore_vip{
 	color: #888888;
     font-size: 14px;
@@ -464,9 +401,52 @@ pre {
     justify-content: space-between;
 }
 
-.projectMatch{
+.buyerclass{
+    background: #CFAD89;
+    padding: 1px 3px;
+    color: #fff;
+    border-radius: 3px;
+    margin-right: 3px;
+    float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
+}
+/* .area{
+    padding: 1px 3px;
+	  color: #fff;
+    background-color: #24C0D7;
+    border-radius: 2px;
+    margin-right: 3px;
+    float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
+}
+.type{
+    padding: 1px 3px;
+    background: #ffba00;
+	color: #fff;
+	border-radius: 2px;
+	margin-right: 3px;
+	float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
+}
+.industry{
 	padding: 1px 3px;
-    background: #B4B4B8;
+	background: #25c78c;
+	color: #fff;
+	border-radius: 3px;
+	margin-right: 3px;
+	float: left;
+    height: 0.40rem;
+    line-height: 0.40rem;
+	display: inline-block;
+}
+
+.projectMatch{
     color: #fff;
     border-radius: 3px;
     margin-right: 3px;
@@ -474,6 +454,29 @@ pre {
     height: 0.40rem;
     line-height: 0.40rem;
 	display: inline-block;
+}*/
+
+.tag {
+  display: inline-block;
+  padding: 1px 8px;
+  height: 0.40rem;
+  color: #5F5E64;
+  background-color: #F7F9FA;
+  margin-right: 4px;
+  border-radius: 4px;
+  font-size: 12px;
+  line-height: 0.40rem;
+} 
+.area {}
+
+.buyerclass{}
+
+.type{}
+
+.industry{}
+
+.projectMatch{
+  padding: 1px 3px;
 }
 .join{
   color:#fff;
@@ -509,13 +512,63 @@ pre {
 {{end}}
 <div class="mask" style="display: none;"></div>
 <div class="maskl"></div>
+<script>
+  var MoneyUnit = {
+    levelArr: ['元', '万元', '亿元', '万亿元'],
+    test: function (num, type, lv) {
+      if (type === void 0) {
+          type = 'string';
+      }
+      if (lv === void 0) {
+          lv = 0;
+      }
+      if (num === 0) {
+          if (type === 'string') {
+              return '0';
+          }
+
+          if (type === 'lv') {
+              return this.levelArr[lv];
+          }
+
+          if (type === 'number') {
+              return 0;
+          }
+
+          if (type === 'index') {
+              return lv;
+          }
+      }
+
+      var result = num / Math.pow(10000, lv);
+      if (result > 10000 && lv < 2) {
+          return this.test(num, type, lv + 1);
+      } else {
+          if (type === 'string') {
+              return String(Math.floor(result * 100) / 100).replace('.00', '') + this.levelArr[lv];
+          }
+
+          if (type === 'lv') {
+              return this.levelArr[lv];
+          }
+
+          if (type === 'index') {
+              return lv;
+          }
+
+          if (type === 'number') {
+              return String(Math.floor(result * 100) / 100).replace('.00', '');
+          }
+      }
+    }
+  }
+  console.log({{.T.isVip}})
+</script>
 <div class="info">
 	<div class="title myfollow" id="title">{{.T.obj.title}}</div>
 	<div class="toolbar">
-	{{if .T.isVip}}
-	<!--VIP-->
 		<div class="type_label clearfix">
-			<script>var area="{{.T.obj.area}}"; if(area!="A" && area.replace(/\s+/g,"")!=""){document.write('<span class="area">'+area+'</span>');}</script>
+			<script>var area="{{.T.obj.area}}"; if(area!="A" && area.replace(/\s+/g,"")!=""){document.write('<span class="tag area">'+area+'</span>');}</script>
 			<script>
 				var type = "";
 				if ({{.T.obj.subtype}} !=""){
@@ -533,7 +586,7 @@ pre {
 					}
 				}
 				if(type != ""){
-					document.write("<span class='type'>"+type+"</span>");
+					document.write("<span class='tag type'>"+type+"</span>");
 				}
 	
 				var industry = {{.T.obj.industry}};
@@ -541,20 +594,38 @@ pre {
 				//vip用户显示与普通用户不同
 				var buyerclass={{.T.obj.buyerclass}};
 				if(industry){
-	                document.write("<span class='industry'>"+industry+"</span>");
+	          document.write("<span class='tag industry'>"+industry+"</span>");
 				}else if(subscopeclass){
 					var suclass = subscopeclass.split(",")[0];
-					document.write("<span class='industry'>"+ suclass.split("_")[0]+"</span>");
+					document.write("<span class='tag industry'>"+ suclass.split("_")[0]+"</span>");
+        }
+        // 金额标签数据
+				var moneyTag = {
+					content: '',
+					bidamount: {{.T.obj.bidamount}},
+					budget: {{.T.obj.budget}}
 				}
-				if(buyerclass){
-					document.write("<span class='buyerclass'>"+ buyerclass+"</span>");
+				// 金额标签处理
+				if(typeof(moneyTag.budget) != "undefined" && moneyTag.budget != null && moneyTag.budget != ""){
+					moneyTag.content = MoneyUnit.test(moneyTag.budget);
 				}
-				//项目匹配
-				projectMatch=getParam("projectMatch");
-				if (projectMatch){
-					document.write("<span class='projectMatch'>"+projectMatch+"</span>")
+				if(typeof(moneyTag.bidamount) != "undefined" && moneyTag.bidamount != null && moneyTag.bidamount != ""){
+					moneyTag.content = MoneyUnit.test(moneyTag.bidamount);
 				}
-				
+				if(moneyTag.content){
+					document.write("<span class='tag budget'>"+ moneyTag.content+"</span>");
+				}
+        {{if .T.isVip}}
+	        // VIP用户
+          if(buyerclass){
+            document.write("<span class='tag buyerclass'>"+ buyerclass+"</span>");
+          }
+          //项目匹配
+          projectMatch=getParam("projectMatch");
+          if (projectMatch){
+            document.write("<span class='tag projectMatch'>"+projectMatch+"</span>")
+          }
+        {{ end }}
 			</script>
 		</div>
 		<div class="time_label">
@@ -569,46 +640,6 @@ pre {
 			</script>
 		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:0px !important">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</div>{{end}}{{else}}<!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
 		</div>
-	{{else}}<!--非VIP-->
-		<script>var area="{{.T.obj.area}}"; if(area!="A" && area.replace(/\s+/g,"")!=""){document.write('<span class="area">'+area+'</span>');}</script>
-		<script>
-			var type = "";
-			if ({{.T.obj.subtype}} !=""){
-				type = {{.T.obj.subtype}};
-			}else if({{.T.obj.toptype}} !=""){
-				type = {{.T.obj.toptype}};
-			}else{
-				type = {{.T.obj.type}};
-				if(type == "bid"){
-					type = "中标";
-				}else if(type == "tender"){
-					type = "招标";
-				}else{
-					type = "";
-				}
-			}
-			if(type != ""){
-				document.write("<span class='type'>"+type+"</span>");
-			}
-
-			var industry = {{.T.obj.industry}};
-			var subscopeclass = {{.T.obj.s_subscopeclass}};
-			if(industry){
-                document.write("<span class='industry'>"+industry+"</span>");
-			}else if(subscopeclass){
-				var suclass = subscopeclass.split(",")[0];
-				document.write("<span class='industry'>"+ suclass.split("_")[0]+"</span>");
-			}
-			var l_publishtime = {{.T.obj.l_publishtime}};
-			if(l_publishtime != ""){
-				var tdf = timeDiff(new Date(Number(l_publishtime+"000")))
-				if(tdf != null){
-					document.write("<span class='timebefore'><i class='glyphicon bofangjilu'></i>"+tdf+"</span>");
-				}
-			}
-		</script>
-		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<span class="follow">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</span>{{end}}{{else}}<!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
-	{{end}}
 	</div>
 	
 	<div class="newuser hidden">