Browse Source

推送删除订单页面

zhangxinlei1996 5 years ago
parent
commit
e256c03265

+ 1 - 68
src/jfw/front/laboratory.go

@@ -1,25 +1,14 @@
 package front
 
 import (
-	"fmt"
-	"jfw/config"
-	"jfw/jyutil"
 	"jfw/wx"
 	"qfw/util"
 
 	"github.com/go-xweb/xweb"
-
-	//"net/url"
-	"jfw/public"
-	"net/url"
 )
 
 type Lab struct {
 	*xweb.Action
-	/********************剑鱼标讯实验室dev2.0**************************/
-	index          xweb.Mapper `xweb:"/jylab/index"`        //实验室首页
-	qrToLab        xweb.Mapper `xweb:"/jylab/qrToLab/(.*)"` //pc端扫码进入实验室首页
-	qrToLabSubpage xweb.Mapper `xweb:"/jylab/qr/(.*)"`      //pc端扫码进入实验室子页
 	/*******************剑鱼标讯百宝箱dev2.8.5*************************/
 	treasureBox xweb.Mapper `xweb:"/jyTreasureBox/treasureBox"` //剑鱼百宝箱
 }
@@ -29,8 +18,7 @@ func init() {
 	xweb.AddAction(&Lab{})
 }
 
-//剑鱼标讯实验室首页
-func (l *Lab) Index() error {
+func (l *Lab) TreasureBox() error {
 	defer util.Catch()
 	userid := util.ObjToString(l.GetSession("userId"))
 	openid := util.ObjToString(l.GetSession("s_m_openid"))
@@ -41,60 +29,5 @@ func (l *Lab) Index() error {
 	l.T["nickname"] = l.Session().Get("s_nickname").(string)
 	l.T["avatar"] = l.Session().Get("s_avatar").(string)
 	l.T["s_m_openid"] = se.EncodeString(openid)
-	return l.Render("/weixin/jylab/lab-close.html", &l.T)
-	// return l.Render("/weixin/jylab/lab-index.html", &l.T)
-}
-
-//剑鱼标讯实验室-智能订阅
-func (l *Lab) LabMode(mode string) error {
-	defer util.Catch()
-	userid := util.ObjToString(l.GetSession("userId"))
-	openid := util.ObjToString(l.GetSession("s_m_openid"))
-	if userid == "" {
-		return l.Redirect("/swordfish/about")
-	}
-	tmp, ok := mongodb.FindById("user", userid, `{"s_headimage":1,"s_nickname":1}`)
-	if !ok || tmp == nil || len(*tmp) == 0 {
-		return nil
-	}
-	l.T["s_m_openid"] = se.EncodeString(openid)
-	l.T["signature"] = wx.SignJSSDK(l.Site() + l.Url())
-	l.T["nickname"] = (*tmp)["s_nickname"]
-	l.T["avatar"] = (*tmp)["s_headimage"]
-	return l.Render("/weixin/jylab/lab-index.html", &l.T)
-}
-
-//pc端扫码进入实验室
-func (l *Lab) QrToLab(t string) error {
-	return l.Redirect("/jylab/index")
-}
-
-//pc端扫码进入实验室子页面
-func (l *Lab) QrToLabSubpage(t string) error {
-	userid := util.ObjToString(l.GetSession("userId"))
-	if userid == "" {
-		if l.GetString("state") == "wx" {
-			//微信跳回来的
-			code := l.GetString("code")
-			if code != "" {
-				openid := jyutil.Getopenid(code)
-				FindUserAndCreateSess(openid, l.Session())
-				return l.Redirect("/jylab/index")
-			} else {
-				return nil
-			}
-		} else {
-			if public.CheckWxBrowser(l.Request) {
-				//所有参数都不再使用,跳到微信验证用户
-				return l.Redirect(fmt.Sprintf(config.Wxoauth, url.QueryEscape(l.Site()+l.Url()), "wx"), 302)
-			} else {
-				return l.Render("/weixin/sharePage.html")
-			}
-		}
-	} else {
-		return l.Redirect("/jylab/index")
-	}
-}
-func (l *Lab) TreasureBox() error {
 	return l.Render("/weixin/treasure_box.html", &l.T)
 }

+ 6 - 4
src/web/templates/weixin/treasure_box.html

@@ -9,9 +9,10 @@
     <title>百宝箱</title>
     <script src="/js/rem.js"></script>
     <link rel="stylesheet" type="text/css" href="/css/wx/base.css" />
-    <link rel="stylesheet" href="/css/wx/treasure_box.css?v=03">
+    <link rel="stylesheet" href="/css/wx/treasure_box.css?v=05">
+	<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+	{{include "/common/weixin.html"}}
 </head>
-
 <body>
     <div class="treasure">
         <div class="top">
@@ -77,7 +78,9 @@
     </div>
     <script src="/js/jquery-3.2.1.min.js"></script>
     <script>
-      	$(function(){
+		initShare({{.T.signature}},{{.T.s_m_openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
+      	
+		$(function(){
 			var nowTimestamp= (new Date()).valueOf();
 			$(".vip").on("click",function(){
 				$.post("/subscribepay/orderListDetails/isVip?v="+nowTimestamp,{},function(data){
@@ -95,5 +98,4 @@
 		})
     </script>
 </body>
-
 </html>

+ 28 - 1
src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -84,8 +84,30 @@
 	font-size: 16px;
 	margin-left: 20px;
 }
+
+.nothing{
+	margin: 50% auto;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+	flex-direction:column;
+}
+.nothing img{
+    width: 120px;
+}
+.nothingDiv {
+	padding-top:0.42rem;
+	font-size:0.3rem;
+	color:#838384;
+}
 </style>
-<body>
+<body style="visibility:hidden">
+	<div class="nothing" style="display:none">
+        <img src="/vipsubscribe/image/nothing.png"/>
+		<div class="nothingDiv">
+			该订单记录已删除
+		</div>		
+    </div>
     <div class="vip_order_detail">
         <main class="main">
             <div class="lists">
@@ -212,7 +234,12 @@ try{
     }
     $(".orderCode").text(orderCode);
     $DoPost("/subscribepay/orderListDetails/getOrderPayAllMsg",{"orderCode":orderCode},function(r){
+      $("body").css("visibility","");
       if(r.success){
+		if(r.data.order.order_status==-1){
+			$(".nothing").show();
+			$(".vip_order_detail").hide();
+		}
         //下单时间
         if(r.data.order.prepay_time) {
         	$(".prepayTime").text(r.data.order.prepay_time.replace("-",".").replace("-","."));