浏览代码

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

xuzhiheng 5 年之前
父节点
当前提交
fc9d8f8c68

+ 0 - 30
src/jfw/modules/app/src/app/front/myorder.go

@@ -24,7 +24,6 @@ type MyOrder struct {
 	paySuccess    xweb.Mapper `xweb:"/jyapp/front/myorder/paySuccess/(\\w+)"`          //支付成功发票
 	deleteOrder   xweb.Mapper `xweb:"/jyapp/front/myorder/deleteOrder"`                //删除订单
 	getOneMore    xweb.Mapper `xweb:"/jyapp/front/myorder/getOneMore"`                 //获取额外一条数据
-	//	testPay       xweb.Mapper `xweb:"/jyapp/front/myorder/testPay"`                    //模拟去支付
 	//我的邮箱
 	myEmail    xweb.Mapper `xweb:"/jyapp/front/myorder/myEmail"`    //我的邮箱
 	setSuccess xweb.Mapper `xweb:"/jyapp/front/myorder/setSuccess"` //查询订单
@@ -46,35 +45,6 @@ var (
 	order_pageSize          = 10
 )
 
-/*
-func (m *MyOrder) TestPay() error {
-	userId := m.Session().Get("userId")
-	order_code := m.GetString("orderCode")
-	testBl := false
-	queryMap := map[string]interface{}{}
-	if userId != nil {
-		log.Println("usid:", userId)
-		queryMap["order_code"] = order_code
-		queryMap["user_id"] = userId
-		now := time.Now()
-		testBl = public.Mysql.Update(tableName_order, queryMap, map[string]interface{}{
-			"pay_money":    1 * 100,
-			"order_status": 1,
-			"pay_time":     util.FormatDate(&now, util.Date_Full_Layout),
-			"download_url": "download_url",
-			"service_time": util.FormatDate(&now, util.Date_Full_Layout),
-		})
-
-	} else {
-		log.Println("userid为空")
-	}
-	log.Println("-----------", testBl, "-------------")
-	m.ServeJson(map[string]interface{}{
-		"testBl": testBl,
-	})
-	return nil
-}
-*/
 func (m *MyOrder) GetOneMore() error {
 	defer util.Catch()
 	pageNum, _ := m.GetInteger("pageNum")

+ 8 - 0
src/jfw/modules/app/src/app/front/shorturl.go

@@ -38,6 +38,13 @@ func (s *Short) Article(stype, id string) error {
 	if b {
 		return s.Redirect("/jyapp/free/mob/err")
 	}
+	//判断用户是否是vip用户
+	isVip := false
+	vip_status, _ := mongodb.FindOne("user", bson.M{"_id": bson.ObjectIdHex(userId), "i_vip_status": bson.M{"$in": []int{1, 2}}}) //获取vip标志
+	if len(*vip_status) == 1 {
+		isVip = true
+	}
+	s.T["isVip"] = isVip
 	surl := s.GetString("url")
 	kds := s.GetString("keywords")
 	industry := s.GetString("industry")
@@ -48,6 +55,7 @@ func (s *Short) Article(stype, id string) error {
 	} else {
 		sid = sid_openid[0]
 	}
+
 	s.T["keywords"] = kds
 	var obj map[string]interface{}
 	obj = wxvisitD(sid, userId)

+ 1 - 1
src/jfw/modules/app/src/app/front/vipsubscribe.go

@@ -17,7 +17,7 @@ type Subscribepay struct {
 	toChooseArea      xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChooseArea"`      //订阅收费地区筛选
 	toChooseIndustry  xweb.Mapper `xweb:"/jyapp/vipsubscribe/toChooseIndustry"`  //订阅收费行业筛选
 	toPaySuccessPage  xweb.Mapper `xweb:"/jyapp/vipsubscribe/toPaySuccessPage"`  //订阅支付完成页面
-	toOrderDetailPage xweb.Mapper `xweb:"/weixin/pay/toOrderDetailPage"`         //订阅收费支付订单详情页面
+	toOrderDetailPage xweb.Mapper `xweb:"/jyapp/vipsubscribe/toOrderDetailPage"` //订阅收费支付订单详情页面
 	toSetKeyWordPage  xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetKeyWordPage"`  //订阅收费设置关键词
 	toSetPage         xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetPage"`         //订阅收费设置
 	toSetInfoTypePage xweb.Mapper `xweb:"/jyapp/vipsubscribe/toSetInfoTypePage"` //订阅收费设置信息类型

+ 3 - 3
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -459,7 +459,7 @@
 			function beforeJump(eid,isVipOrder){
 				setSessionStorage();
 				if (isVipOrder=="true"){
-					window.location.href="/weixin/pay/toOrderDetailPage?orderCode="+eid;
+					window.location.href="/jyapp/vipsubscribe/toOrderDetailPage?orderCode="+eid;
 				}else{
 					window.location.href="/jyapp/front/myOrder/toOrderDetail?orderCode="+eid;
 				}
@@ -786,14 +786,14 @@
 		        		pay_way="ali_app";
 		        	}
 				});
-				
+				var canpay=true;
 				//确认支付
 				$(".surePay").on("click", function() {
 					$(".loading_").show();
 					let isvip_order=$(".media").attr("isviporder");
 					//vip支付;
 					if (isvip_order=="true"){
-						var orderCode =$(e).attr("orderCode");
+						var orderCode =$(".media").attr("orderCode");
 						if(!canpay)return  
 		            	canpay=false;
 			            $.post("/subscribepay/vipsubscribe/orderToPay",{"orderCode":orderCode},function(r){

+ 2 - 2
src/jfw/modules/app/src/web/templates/me/index.html

@@ -384,9 +384,9 @@
 		$(".vip_").click(function(){
 			$.post("/subscribepay/orderListDetails/isVip?v="+nowTimestamp,{},function(data){
 				if (data.isvip){
-					window.location.href="/front/vipsubscribe/toSetPage";		//vip订阅入口  试用或正式vip
+					window.location.href="/jyapp/vipsubscribe/toSetPage";		//vip订阅入口  试用或正式vip
 				}else{
-					window.location.href="/front/vipsubscribe/introducePage";		//vip订阅入口  非vip
+					window.location.href="/jyapp/vipsubscribe/introducePage";		//vip订阅入口  非vip
 				}
 			})
 		})

+ 635 - 0
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_order_detail.html

@@ -0,0 +1,635 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>我的订单</title>
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <script src="/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/weui/1.1.2/style/weui.css" />
+    <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/public.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/vip_order_detail.css?v={{Msg "seo" "version"}}1">
+	
+	<link rel="stylesheet" type="text/css" href="/jyapp/css/layout.css?v={{Msg "seo" "version"}}" />
+	<link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />   
+	<link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
+</head>
+<style>
+	.person > p >span , .unit > p >span{
+		margin-bottom: .12rem;
+	}
+	
+	.jymobile-setting-dialog {
+  font-size: .32rem;
+}
+
+.jymobile-setting-dialog .weui-dialog__hd {
+  padding: 0;
+  height: 0.82rem;
+  line-height: .82rem;
+  text-align: center;
+  background-color: #F5F4F9;
+}
+
+.jymobile-setting-dialog .weui-dialog__hd .weui-dialog__title {
+  font-size: .36rem;
+}
+
+.jymobile-setting-dialog .weui-dialog__bd {
+  padding: .37rem .1rem .38rem;
+  color: #1D1D1D;
+  font-size: .32rem;
+  text-align: center;
+}
+
+.jymobile-setting-dialog .weui-dialog__ft {
+  display: flex;
+  padding: 0 0 .38rem 0;
+  text-align: center;
+  justify-content: space-around;
+}
+
+.jymobile-setting-dialog .weui-dialog__ft:after {
+  border: none;
+}
+
+.jymobile-setting-dialog .weui-dialog__ft .weui-dialog__btn {
+  display: flex;
+  flex: none;
+  align-items: center;
+  justify-content: center;
+  width: 1.72rem;
+  height: .72rem;
+  color: #fff;
+  font-size: .32rem;
+  vertical-align: center;
+}
+
+.jymobile-setting-dialog .weui-dialog__ft .weui-dialog__btn_primary {
+  margin: 0;
+  margin-left: .3rem;
+  background-color: #2CB7CA;
+}
+
+.jymobile-setting-dialog .weui-dialog__ft .weui-dialog__btn_default {
+  margin: 0;
+  margin-right: .3rem;
+  background-color: #BFBFC3;
+}
+.cancel_time{
+	font-size: 16px;
+	margin-left: 20px;
+}
+
+.pay_way .box {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background: #fff;
+    height: 4.9rem;
+    z-index: 9999;
+}
+.pay_way .box .box_hd {
+    padding: 0 .4rem;
+    height: .88rem;
+    line-height: .88rem;
+    background: #F4F4F9;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-pack: justify;
+    -ms-flex-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    border-bottom: 1px solid #eee;
+}
+
+ .pay_way .box .box_bd p {
+    font-size: .32rem;
+}
+.pay_way .box .box_bd .zfb_label{
+	margin-bottom:.38rem;
+}
+ .pay_way .box .box_hd>h3 {
+    color: #1D1D1D;
+    font-size: .32rem;
+}
+.pay_way .box .box_hd .cancel {
+    color: #2cb7ca;
+    font-size: .32rem;
+}
+.pay_way .box .box_bd img {
+    width: .8rem;
+    height: .8rem;
+    margin-right: .3rem;
+}
+.pay_way .box .box_bd .wx_label, .pay_way .box .box_bd .zfb_label {
+    margin-top: .38rem;
+    padding: 0 .3rem;
+}
+.zfje{
+	font-size: .32rem;
+	margin: 0 auto;
+	
+}
+.money_pay{
+    font-size: .50rem;
+    text-align: center;
+    height: 1rem;
+    line-height: 1rem;
+}
+.surePay{
+	font-size: .40rem;
+    text-align: center;
+    height: 1rem;
+    line-height: 1rem;
+    background-color: #2CB7CA;
+    color: #fff;
+    margin-top:  0.28rem;
+}
+
+.weui-cells {
+    margin-top: 0px !important;
+    background-color: 
+	#fff;
+	line-height: 1.47058824;
+	font-size: 17px;
+	overflow: hidden;
+	position: relative;
+}
+
+.weui-cell::before {
+    content: " ";
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    height: 1px;
+    border-top: 0px solid #e5e5e5 !important;
+    border-top-color: 
+    rgb(229, 229, 229);
+    border-top-style: solid;
+    border-top-width: 5px;
+	color:#e5e5e5;
+    -webkit-transform-origin: 0 0;
+    transform-origin: 0 0;
+    -webkit-transform: scaleY(.5);
+    transform: scaleY(.5);
+    left: 15px;
+    z-index: 2;
+}
+</style>
+<body>
+ 	<div class="app-layout-header">
+		<span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
+		订单详情
+	</div>
+	<div class="app-layout-content-b">
+	<div class="vip_order_detail">
+	        <main class="main">
+	            <div class="lists">
+	                <div class="card">
+	                    <div class="card-header">
+	                        <img src="/vipsubscribe/image/line.png?v={{Msg "seo" "version"}}">
+	                        <h3 id="pageTitle"></h3>
+	                        <!-- <h3>待付款</h3> -->
+	                        <img src="/vipsubscribe/image/line.png?v={{Msg "seo" "version"}}">
+	                    </div>
+	                    <div class="card-content">
+	                        <p class="text ellipsis">订单编号:<span class="orderCode"></span></p>
+	                        <p class="text ellipsis">下单时间:<span class="prepayTime"></span></p>
+	                        <!-- 订单状态为已完成时显示支付时间、支付方式和订单号,状态为待付款时不显示 -->
+	                        <p class="text ellipsis line_paytime" id="paytime" style="display:none">支付时间:<span class="payTime"></span></p>
+	                        <p class="text ellipsis line_payway"  style="display:none">支付方式:<span class="payWay"></span></p>
+	                        <p class="text ellipsis line_transaction"  style="display:none">支付单号:<span class="transaction_id"></span></p>
+	                        <p class="text ellipsis">产品类型:<span class="productType"></span></p>
+	                        <p class="text ellipsis" id="price">价格:¥<span class="price"></span></p>
+	                        <!----- 未开发票状态 ----->
+	                        <p class="text ellipsis invoice">发票:<a class="invoicing" style="display:none">开发票</a></p>
+	                        <!----- 已开发飘状态 ----->
+	                        <!--  单位发票-->
+	                        <div class="unit" style="display: none;">
+	                            <p><span>发票类型:</span><span>普通发票(电子发票)</span></p>
+	                            <p><span>发票内容:</span><span>明细</span></p>
+	                            <p><span>发票抬头:</span><span>单位</span></p>
+	                            <p><span>单位名称:</span><span class="company_name"></span></p>
+	                            <p><span>纳税人识别号:</span><span class="taxpayer_number"></span></p>
+	                        </div>
+	                        <!-- 个人发票 -->
+	                        <div class="person" style="display: none;">
+	                            <p><span>发票类型:</span><span>普通发票(电子发票)</span></p>
+	                            <p><span>发票内容:</span><span>明细</span></p>
+	                            <p><span>发票抬头:</span><span>个人</span></p>
+	                        </div>
+	                    </div>
+	                </div>
+	                <div class="card">
+	                    <div class="card-header">
+	                        <img src="/vipsubscribe/image/line.png?v={{Msg "seo" "version"}}">
+	                        <h3>订阅条件</h3>
+	                        <img src="/vipsubscribe/image/line.png?v={{Msg "seo" "version"}}">
+	                    </div>
+	                    <div class="card-content">
+	                        <div class="item-list">
+	                            <label>订阅区域:</label>
+	                            <ul class="item-list-parents">
+	                                <li class="areaNum"></li>
+	                            </ul>
+	                        </div>
+	                        <div class="item-list">
+	                            <label>订阅行业:</label>
+	                            <ul class="item-list-parents">
+	                                <li><span class="industryNum"></span></li>
+	                            </ul>
+	                        </div>
+	                        <div class="item-list">
+	                            <label>订阅周期:</label>
+	                            <ul class="item-list-parents">
+	                                <li><span class="cyclecount"></li>
+	                            </ul>
+	                        </div>
+	                        <div class="item-list line_cycle" style="display:none">
+	                            <label>有效日期:</label>
+	                            <ul class="item-list-parents">
+	                                <li><span class="serviceTime"></span></li>
+	                            </ul>
+	                        </div>
+	                    </div>
+	                </div>
+	            </div>
+	        </main>
+			<div class="js_dialog pay_way" id="pay_way" style="display: none;">
+	            <div class="weui-mask"></div>
+	            <div class="box">
+	                <div class="box_hd">
+	                    <span  class="zfje">支付方式</span>
+	                    <div></div>
+	                    <span class="cancel">取消</span>
+	                </div>
+	               <!-- <div class="money_pay">
+	                	
+	                </div>-->
+	                <div class="box_bd">
+	                    <div class="weui-cells weui-cells_checkbox choose-form">
+	                        <label class="weui-cell weui-check__label wx_label" for="wx">
+	                            <div class="weui-cell__bd read">
+	                                <p><img src="/jyapp/dataExport/images/weixin.png">微信支付</p>
+	                            </div>
+	                            <div class="weui-cell__hd">
+	                                <input type="radio" class="weui-check" name="way" value="微信支付" id="wx" checked />
+	                                <i class="weui-icon-checked"></i>
+	                            </div>
+	                        </label>
+	                        <label class="weui-cell weui-check__label zfb_label" for="zfb">
+	                            <div class="weui-cell__bd read">
+	                                <p><img src="/jyapp/dataExport/images/zhifubao.png">支付宝支付</p>
+	                            </div>
+	                            <div class="weui-cell__hd">
+	                                <input type="radio" class="weui-check" name="way" value="支付宝支付" id="zfb" />
+	                                <i class="weui-icon-checked"></i>
+	                            </div>
+	                        </label>
+	                    </div>
+	                    <div style="display: none;" class="param_dataType"></div>
+	                    <div style="display: none;" class="param_id"></div>
+	                    <div style="display: none;" class="this"></div>
+	                    <div style="display: none;" class="order_code_vip"></div>
+	                </div>
+	                <!--确认支付 --> 
+                    	<div class="surePay">
+                    		确认支付
+                    	</div>
+	            </div>
+	        </div>
+	        <!-- 当状态为待付款时显示去支付按钮 -->
+	        <!--当状态为已取消时显示再次购买按钮-->
+	        <a href="#" class="button align" style="display:none">去支付<span class="cancel_time"></span></a>
+	    </div>
+	</div>
+</body>
+<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
+<!--<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>-->
+<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
+<script src="{{Msg "seo" "cdn"}}/jyapp/js/common.js?v={{Msg "seo" "version"}}"></script>
+
+<script>
+  $(function(){
+    var canpay=true;
+    var orderCode=decodeURIComponent(getParam("orderCode"));
+    if(!orderCode){
+      weui.toast("订单号异常",{
+        duration: 2000,
+        className: 'custom-toast',
+	    });
+    }
+    $(".orderCode").text(orderCode);
+    $DoPost("/subscribepay/orderListDetails/getOrderPayAllMsg",{"orderCode":orderCode},function(r){
+      if(r.success){
+      	
+        //下单时间
+        if(r.data.order.prepay_time) {
+        	$(".prepayTime").text(r.data.order.prepay_time.replace("-",".").replace("-","."));
+        }
+        //产品类型
+        if(r.data.order.product_type) $(".productType").text(r.data.order.product_type);
+        if(r.data.order.original_price==0){
+        	$(".productType").text(r.data.order.product_type+"(试用)");
+        }
+        //1 续费 2升级
+        if(r.data.order.vip_type==1){
+        	$(".productType").text(r.data.order.product_type+"(续费)");
+        }else if(r.data.order.vip_type==2){
+        	$(".productType").text(r.data.order.product_type+"(升级)");
+        }
+        //价格
+        $(".price").text(r.data.order.original_price/100);
+        
+        //订单条件        
+        if(r.data.order.filter){
+            var filterObj=JSON.parse(r.data.order.filter);
+            //省份数 城市数
+            if(!$.isEmptyObject(filterObj.area)){
+              var cityNum=0;
+              var provinceNum=0;
+              for(var i in filterObj.area) {
+                let citys=filterObj.area[i];
+                if(citys.length>0){
+                  cityNum+=citys.length;
+                }else{
+                  provinceNum++;
+                }
+              }
+              var areaText="";//1个省级区域、4个地市
+              if(provinceNum>0) areaText= areaText + provinceNum+"个省级区域";
+              if(cityNum>0){
+                if(provinceNum>0) areaText= areaText+"、"
+                areaText = areaText+ cityNum+"个地市";
+              }
+              $(".areaNum").text(areaText);
+            }else{
+              $(".areaNum").text("全国");
+            }
+         
+          
+          //行业数
+          if(filterObj.industry.length!=0){
+            $(".industryNum").text(filterObj.industry.length+"个行业");
+          }else{
+            $(".industryNum").text("全行业");
+          }
+          
+        }
+        
+        //周期
+       if((r.data.order.vip_starttime!=undefined)&&(r.data.order.vip_endtime!=undefined)){
+       		var start_time_vip = r.data.order.vip_starttime;
+       		var end_time_vip = r.data.order.vip_endtime;
+       		var start_time_arr = start_time_vip.split(" ")[0].split("-")
+       		var end_time_arr = end_time_vip.split(" ")[0].split("-")
+       		var start_year=start_time_arr[0];
+       		var start_month=start_time_arr[1];
+       		var end_year=end_time_arr[0];
+       		var end_month=end_time_arr[1];
+       		
+       		var year = 0;
+			var month = 0;
+			if(end_year > start_year){
+	    		if(end_month > start_month){
+    				year = end_year - start_year;
+    				month = end_month - start_month;
+	    		}else{
+    				year = end_year - start_year-1;
+    				month = 12+Number(end_month)-start_month;
+    				if (month==12){
+    					year=Number(year)+1;
+    					month=0;
+    				}
+	    		}
+	    	}else if(end_year === start_year){
+    			month = end_month - start_month;
+	    	}
+	    	
+	    	if(year != 0 && month !=0){
+	    		$(".cyclecount").text(year+"年"+month+"个月");
+	    	}else if(year !== 0&& month ===0){
+	    		$(".cyclecount").text(year+"年");
+	    	}else if(year === 0&& month !==0){
+	    		$(".cyclecount").text(month+"个月");
+	    	}else {
+	    		$(".cyclecount").text("7天");
+	    	}
+       }else{
+       		//未支付
+	      if(filterObj.cycleunit==1){
+	        $(".cyclecount").text(filterObj.cyclecount+"年")
+	      }else if(filterObj.cycleunit==2){
+	       $(".cyclecount").text(filterObj.cyclecount+"个月")
+	      }else if(filterObj.cycleunit==3){
+	           $(".cyclecount").text(filterObj.cyclecount+"天")
+	      }
+       }
+        
+        if(r.data.order.order_status==0){       	
+          //未支付
+	        $("#pageTitle").text("待付款");
+	        $(".invoice").css("display","none");//隐藏开发票
+	        $(".button.align").css("display","").on("click",function(){//显示去支付按钮
+	         	$("#pay_way").show();
+	        })
+        }else if (r.data.order.order_status==1){
+          $("#pageTitle").text("已完成");
+          //支付时间
+          $(".line_paytime").css("display","");
+          if(r.data.order.pay_time) $(".payTime").text(r.data.order.pay_time.replace("-",".").replace("-","."));
+          if (r.data.order.original_price==0){
+         	 $(".line_paytime").css("display","none");
+          }
+          
+          //有效周期
+          $(".line_cycle").css("display","");
+          //有效日期  
+          if(r.data.time.vip_starttime&&r.data.time.vip_endtime){
+            	var vip_starttime=r.data.time.vip_starttime+"";
+           		var vip_endtime=r.data.time.vip_endtime+"";
+           		vip_starttime=vip_starttime.split(" ")[0].replace(/-/g,".");
+           		vip_endtime=vip_endtime.split(" ")[0].replace(/-/g,".");
+           		var serviceTime=vip_starttime+" - "+vip_endtime;
+           	  	$(".serviceTime").text(serviceTime)
+          }
+          
+          //支付方式
+          if(r.data.order.pay_way.indexOf("wx")>-1){
+            $(".line_payway").css("display","");
+            $(".payWay").text("微信支付");
+          }else if(r.data.order.pay_way.indexOf("ali")>-1){
+            $(".payWay").text("支付宝支付");
+            $(".line_payway").css("display","");
+          }else{//试用用户
+            $(".invoice").css("display","none");
+            return
+          }
+			
+		//确认支付
+		$(".surePay").on("click", function() {
+			$(".loading_").show();
+			canpay = false;
+			var param = {};
+			var dataType=$(".param_dataType").text();
+			param.pay_way = pay_way;
+			param.data_spec = dataType == "高级字段包" ? "senior" : "standard";
+			param.id = $(".param_id").text();
+			param.sourcePage = "weixin"
+			//支付已经创建订单
+			$.post("/jypay/dataExport/app/createOrder", param, function(data) {
+				if (data.success){
+					try {
+		                if(pay_way=="wx_app"){
+		                  JyObj.wxPay(data.data)
+		                }else{
+		                  JyObj.aliPay(data.data)
+		                }
+		                $('.pay_way').hide(200);
+		                checkPaySuccess(data.order);
+					} catch (e) {
+						alert(e)
+					}
+				}
+	            $(".loading_").hide();
+	            canpay = true;
+			})
+		})
+
+          $(".line_transaction").css("display","");
+          if(r.data.transaction_id) $(".transaction_id").text(r.data.transaction_id);
+          //发票
+          if(r.data.order.applybill_status==0){ 
+            //已支付未申请发票
+            $(".invoice .invoicing").css("display","");
+            $(".invoicing").on("click",function(){
+            	var nowTimestamp= (new Date()).valueOf();
+            	$.post("/subscribepay/orderListDetails/emailOperation?v="+nowTimestamp,{},function(r){
+					if (r.success){
+						//没有绑定邮箱
+						weuiDialog();
+					}else{
+						//绑定了邮箱
+						window.location.href="/front/vipsubscribe/openInvoice/"+orderCode;
+					}
+				})
+            });
+          }else{
+            //已支付已申请发票
+			      $(".invoice").css("display","none");
+            switch (r.data.order.applybill_type){
+            	case 0:
+            	$(".person").css("display","");
+            	break;
+            	case 1:
+            	$(".unit").css("display","");
+            	$(".company_name").html(r.data.order.applybill_company);
+            	$(".taxpayer_number").html(r.data.order.applybill_taxnum);
+            	break;
+            }
+
+          } 
+        }else if(r.data.order.order_status==-2){
+    		$("#pageTitle").text("已取消");
+     		$(".invoice").css("display","none");//隐藏开发票
+        }
+       
+      }
+      	
+      	if (r.data.order.order_status==0){
+	    	//倒计时 未购买
+			var create_time=r.data.order.create_time;
+			//create_time="2019-11-09 11:17:55";
+			var clock_end = +new Date(create_time) + 172800000;
+			setTimeFunc(clock_end); 
+			setInterval(function(){
+				setTimeFunc(clock_end);
+			},1000)
+		}
+    })
+    function formatEffectiveDate(strat,end){
+        var startDate = new Date(strat*1000);
+        var endDate = new Date(end*1000);
+        return formatDate(startDate)+" - "+formatDate(endDate)
+    }
+    function formatDate(d){
+	    return (d.getFullYear()) + "." + 
+	    (Array(2).join(0)+(d.getMonth() + 1)).slice(-2) + "." +
+	    (Array(2).join(0)+(d.getDate())).slice(-2);
+    }
+    
+	function weuiDialog(){
+		weui.dialog({
+			title: '提示信息',
+			content: '您未绑定邮箱<br/>请绑定后再开发票',
+	        className: 'jymobile-setting-dialog',// 设置弹框的类名
+	        buttons: [
+	        {
+	        	label: '去设置',
+	        	type: 'primary',
+	        	onClick: function () {
+	        		window.location.href="/front/wxMyOrder/myEmail?name=invoice&orderCode="+orderCode;
+	        	}
+	        },
+	        {
+	        	label: '取消',
+	        	type: 'default',
+	        	onClick: function () {
+	        		console.log('取消')
+	        	}
+	        }
+	        ]
+	    });
+	}
+
+
+	// 参数为结束时间戳
+	function setTimeFunc (endtime){
+  		var t = endtime - +new Date();
+  		if (t <= 0) {
+  			$(".button").hide();
+  			$(".cancel_time").hide();
+  			$("#pageTitle").html("已取消");
+  		}
+  		//天时分秒
+		var days = parseInt(t / 1000 / 60 / 60 / 24 , 10).toString().padStart(2, '0'); //计算剩余的天数 
+		var hours = parseInt(t / 1000 / 60 / 60 % 24 , 10).toString().padStart(2, '0');; //计算剩余的小时 
+		var minutes = parseInt(t / 1000 / 60 % 60, 10).toString().padStart(2, '0');;//计算剩余的分钟 
+		var seconds = parseInt(t / 1000 % 60, 10).toString().padStart(2, '0');;//计算剩余的秒数
+		//时分秒
+		var days_ = parseInt(t / 1000 / 60 / 60   , 10).toString().padStart(2, '0'); //计算剩余的天数 
+		var minutes_ = parseInt(t / 1000 / 60 % 60, 10).toString().padStart(2, '0');;//计算剩余的分钟 
+		
+		//$(".cancel_time").text("("+days+"天" + hours+"小时" + minutes+"分"+seconds+"秒)");
+		$(".cancel_time").text("剩余"+days_+":" + minutes_+":"+seconds+" ");
+	  }
+  })
+      
+  //苹果端  刷新js
+  $(function () {    
+		var isPageHide = false;   
+		window.addEventListener('pageshow', function () {      
+		    if (isPageHide) {
+                location.reload();
+		    }    
+		});    
+		window.addEventListener('pagehide', function () {
+		    isPageHide = true;
+		});  
+	});
+</script>
+	{{include "/common/baiducc.html"}}
+</html>	

+ 27 - 11
src/web/templates/weixin/vipsubscribe/edit_subscribe_success.html

@@ -16,28 +16,44 @@
         <div class="edit_success">
             <div><i class="icon iconfont success">&#xe612;</i></div>
             <p>修改成功</p>
-            <button class="public_btn" id="back">返回(<em class="time">3</em>)</button>
+            <button class="public_btn" id="back">返回<em class="time"></em></button>
         </div>
         <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
         <script>
-            function timer(obj,callback) { 
+
+            $(function(){
+//              timer($('.time'),()=>{
+//                  window.history.go(-1); 
+//              })
+				countDown();
+                $('#back').click(function () {  
+                    window.history.go(-1); 
+                })
+            })
+       		var time =3;
+        	function countDown(){
+				if(time == 0){
+					$('.time').html('');
+					  window.history.go(-1); 
+				}else{
+					 $('.time').html('(' + time + ')');
+					time--;
+					setTimeout(()=>{
+						countDown()
+					},1000)
+				}
+			}
+        	
+        	function timer(obj,callback) { 
                 let t = 3; 
                 let timer = setInterval(() => {
                     t--;
                     obj.html(t)
-                    if(t == 0){
+                    if(t == 1){
                         callback()
                     }
                 }, 1000);
             }
-            $(function(){
-                timer($('.time'),()=>{
-                    window.history.go(-1); 
-                })
-                $('#back').click(function () {  
-                    window.history.go(-1); 
-                })
-            })
         </script>
     </body>
 </html>

+ 1 - 1
src/web/templates/weixin/wxinfocontent.html

@@ -496,7 +496,7 @@ pre {
 }
 
 .time_label{
-	margin-top:5px;
+	margin-top:10px;
 	display: flex;
 	align-items: center;
 	justify-content: space-between;

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

@@ -445,6 +445,12 @@ pre {
 .toolbar .follow i,.toolbar .follow_vip i{
 	top: 2px;
 }
+.time_label {
+    margin-top: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
 </style>
 </head>
 <body>
@@ -521,7 +527,7 @@ pre {
 						}
 					}
 			</script>
-		{{if .T.obj.hasSession}}{{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:-21px !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}}
+		{{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>