修改缺陷

src/jfw/front/shorturl.go

@@ -6,6 +6,7 @@ import (
 	"jfw/jyutil"
 	"jfw/public"
 	"jfw/wx"
+	"log"
 	"math/rand"
 	"net/url"
 	"qfw/util"
@@ -34,6 +35,7 @@ var Map_stype = map[string]bool{
 }
 
 func (s *Short) Article(stype, id string) error {
+	log.Println("into Article..")
 	//先判断是否有session
 	source := s.GetString("source")
 	aboutUrl := "/swordfish/about"
@@ -90,6 +92,7 @@ func (s *Short) Article(stype, id string) error {
 		data1, _ := mongodb.FindOneByField("user", bson.M{"s_m_openid": ssOpenid}, `{"_id":1}`)
 		userId = util.BsonIdToSId((*data1)["_id"])
 	}
+	log.Println("bm---", bm)
 	if bm {
 		//判断有没有取关，取关的话，跳转到关于剑鱼标讯页面
 		if ssOpenid != nil && ssOpenid != "" {
@@ -135,6 +138,7 @@ func (s *Short) Article(stype, id string) error {
 		if util.IntAll((*res)["i_vip_status"]) == 1 || util.IntAll((*res)["i_vip_status"]) == 2 {
 			isVip = true
 		}
+		log.Println("isVip:----", isVip)
 		s.T["isVip"] = isVip
 		mynickname, _ := s.GetSession("s_nickname").(string)
 		myavatar, _ := s.GetSession("s_avatar").(string)

src/jfw/modules/subscribepay/src/service/orderListDetails.go

@@ -30,6 +30,7 @@ type OrderListDetails struct {
 	checkMailCodeVerify xweb.Mapper `xweb:"/orderListDetails/checkMailCodeVerify"` //验证码
 	emailOperation      xweb.Mapper `xweb:"/orderListDetails/emailOperation"`      //查看邮箱
 	isVip               xweb.Mapper `xweb:"/orderListDetails/isVip"`
+	getVipOrderInfo     xweb.Mapper `xweb:"/orderListDetails/getVipOrderInfo"` //再次购买 回显
 }
 
 var (
@@ -360,6 +361,62 @@ func (o *OrderListDetails) IsVip() {
 	})
 }
 
+//获取购买订阅相关信息
+func (o *OrderListDetails) GetVipOrderInfo() {
+	userId := qutil.ObjToString(o.GetSession("userId"))
+	order_code := o.GetString("orderCode")
+	queryMap := map[string]interface{}{
+		"user_id":    userId,
+		"order_code": order_code,
+	}
+	inf := map[string]interface{}{}
+	company, timeSelect, year, month := 0, 0, 0, 0
+	filter := util.Mysql.FindOne(tableName_order, queryMap, "filter,vip_starttime,vip_endtime", "")
+	if filter != nil {
+		info := qutil.ObjToMap(filter)
+		inf = *qutil.ObjToMap((*info)["filter"])
+		vip_starttime := qutil.ObjToString((*info)["vip_starttime"])
+		vip_endtime := qutil.ObjToString((*info)["vip_endtime"])
+		if vip_starttime != "" && vip_endtime != "" {
+			//计算周期时间
+			vip_starttime_stamp, _ := time.ParseInLocation(qutil.Date_Full_Layout, vip_starttime, time.Local)
+			vip_endtime_stamp, _ := time.ParseInLocation(qutil.Date_Full_Layout, vip_endtime, time.Local)
+			start_year := time.Unix(qutil.Int64All(vip_starttime_stamp.Unix()), 0).Year()
+			end_year := time.Unix(qutil.Int64All(vip_endtime_stamp.Unix()), 0).Year()
+			start_month := int(time.Unix(qutil.Int64All(vip_starttime_stamp.Unix()), 0).Month())
+			end_month := int(time.Unix(qutil.Int64All(vip_endtime_stamp.Unix()), 0).Month())
+			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 + end_month - start_month
+					if month == 12 {
+						year++
+						month = 0
+					}
+				}
+			} else if end_year == start_year {
+				month = end_month - start_month
+			}
+			//company 1：年 2：月
+			if year == 0 && month > 0 {
+				company, timeSelect = 2, month
+			} else if year > 0 && month > 0 {
+				company, timeSelect = 2, (12*year + month)
+			} else if year > 0 && month == 0 {
+				company, timeSelect = 1, year
+			}
+		}
+	}
+	o.ServeJson(map[string]interface{}{
+		"data":       inf,
+		"company":    company,
+		"timeSelect": timeSelect,
+	})
+}
+
 func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[string]interface{}) {
 	//获取最后一次购买的vip订单
 	queryM["product_type"] = "VIP订阅"

src/web/templates/weixin/email/bind_email.html

@@ -121,7 +121,7 @@
 								if(data.success){
 									if ($("#bindBtn").text()=="确定"){	//更改绑定
 										sessionStorage.removeItem("send_myemail_"+{{.T.userId}});
-										window.location.replace("/jyapp/front/myorder/setSuccess?name=changeEmail"); 
+										window.location.replace("/front/wxMyOrder/setSuccess?name=changeEmail"); 
 									}else{
 										sessionStorage.removeItem("send_myemail_"+{{.T.userId}});
 										if((param="invoice")&&(orderCode!=null)){

src/web/templates/weixin/email/unbind_email.html

@@ -9,7 +9,7 @@
 		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>   
 	</head>
 	<body>
-		<div class="unbind_email">
			<div class="input_box mgT26">
				<label>邮箱</label>
				<input type="email" name="email" id="" value="{{.T.text_email}}" readonly="readonly"/>
			</div>
			<button type="button" class="common_btn choose_email">更换邮箱</button>
			<p class="text-algin">
				<a href="javascript:;" class="unbind">解绑</a>
			</p>
			
			<!-- 更换邮箱弹框 -->
			<div class="dialog_confirm" id="choose_email_dialog" style="display: none;">
				<div class="mask"></div>
				<div class="dialog">
					<div class="dialog_hd"><strong>确定更换邮箱</strong></div>
					<div class="dialog_bd">{{.T.text_email}}</div>
					<div class="dialog_ft">
						<a href="javascript:;" class="btn_dialog default" id="cancel_choose">取消</a>
						<a href="javascript:;" class="btn_dialog primary" id="sure_choose">确定</a>
					</div>
				</div>
			</div>
			<!-- 解绑邮箱弹框 -->
			<div class="dialog_confirm" id="unbind_email_dialog" style="display: none;">
				<div class="mask"></div>
				<div class="dialog">
					<div class="dialog_hd"><strong>确定解绑邮箱</strong></div>
					<div class="dialog_bd" style="color: #888;">{{.T.text_email}}</div>
					<div class="dialog_ft">
						<a href="javascript:;" class="btn_dialog default" id="cancel_unbind">取消</a>
						<a href="javascript:;" class="btn_dialog primary" id="sure_unbind">确定</a>
					</div>
				</div>
			</div>
		</div>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
		<script>
+		<div class="unbind_email">
			<div class="input_box mgT26">
				<label>邮箱</label>
				<input type="email" name="email" id="" value="{{.T.text_email}}" readonly="readonly" unselectable="on" onfocus="this.blur()" style="-webkit-user-select :none"/>
			</div>
			<button type="button" class="common_btn choose_email">更换邮箱</button>
			<p class="text-algin">
				<a href="javascript:;" class="unbind">解绑</a>
			</p>
			
			<!-- 更换邮箱弹框 -->
			<div class="dialog_confirm" id="choose_email_dialog" style="display: none;">
				<div class="mask"></div>
				<div class="dialog">
					<div class="dialog_hd"><strong>确定更换邮箱</strong></div>
					<div class="dialog_bd">{{.T.text_email}}</div>
					<div class="dialog_ft">
						<a href="javascript:;" class="btn_dialog default" id="cancel_choose">取消</a>
						<a href="javascript:;" class="btn_dialog primary" id="sure_choose">确定</a>
					</div>
				</div>
			</div>
			<!-- 解绑邮箱弹框 -->
			<div class="dialog_confirm" id="unbind_email_dialog" style="display: none;">
				<div class="mask"></div>
				<div class="dialog">
					<div class="dialog_hd"><strong>确定解绑邮箱</strong></div>
					<div class="dialog_bd" style="color: #888;">{{.T.text_email}}</div>
					<div class="dialog_ft">
						<a href="javascript:;" class="btn_dialog default" id="cancel_unbind">取消</a>
						<a href="javascript:;" class="btn_dialog primary" id="sure_unbind">确定</a>
					</div>
				</div>
			</div>
		</div>
		<script src="{{Msg "seo" "cdn"}}/wxmyemail/js/zepto.js"></script>
		<script>
 			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
			$(function(){
				/* 更换邮箱 */
				$('.choose_email').on('click',() =>{
 					$('#choose_email_dialog').show(400);
 					$("#cancel_choose").on('click',() =>{

src/web/templates/weixin/vipsubscribe/edit_subscribe_success.html

@@ -21,7 +21,7 @@
         <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
         <script>
             function timer(obj,callback) { 
-                let t = 5; 
+                let t = 3; 
                 let timer = setInterval(() => {
                     t--;
                     obj.html(t)

src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -473,7 +473,8 @@ try{
 	        	label: '去设置',
 	        	type: 'primary',
 	        	onClick: function () {
-	        		window.location.replace("/front/wxMyOrder/myEmail?name=invoice&orderCode="+orderCode);
+	        		//window.location.replace("/front/wxMyOrder/myEmail?name=invoice&orderCode="+orderCode);
+	        		window.location.href="/front/wxMyOrder/myEmail?name=invoice&orderCode="+orderCode;
 	        	}
 	        },
 	        {

src/web/templates/weixin/vipsubscribe/vip_purchase.html

@@ -369,22 +369,26 @@
                     {{end}}
                     {{if .T.again}}    //再次购买回显
                     {{if eq .T.again 1 }}
+                    var orderCode=getParam("orderCode")
                     if (!sessionStorage.getItem("vipSubSelectArea") || !sessionStorage.getItem("vipSubSelectIndustry")) {
-                        $DoPost("/subscribepay/editSub/getSubBuyMsg", {}, function (r) {
-                            if (r.success) {
-                                if (!$.isEmptyObject(r.data.area)) {
-                                    purchase.areaSelect = r.data.area
-                                } else {
-                                    purchase.areaSelect = {"全国": []}
-                                }
-                                if (r.data.industry.length != 0) {
-                                    purchase.industrySelect = r.data.industry
-                                } else {
-                                    purchase.industrySelect = ["全部行业"]
-                                }
-                                sessionStorage.setItem("vipSubSelectArea", JSON.stringify(purchase.areaSelect));
-                                sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
+                      $DoPost("/subscribepay/orderListDetails/getVipOrderInfo", {"orderCode":orderCode}, function (r) {
+                           if (!$.isEmptyObject(r.data.area)) {
+                                purchase.areaSelect = r.data.area
+                            } else {
+                                purchase.areaSelect = {"全国": []}
+                            }
+                            if (r.data.industry.length != 0) {
+                                purchase.industrySelect = r.data.industry
+                            } else {
+                                purchase.industrySelect = ["全部行业"]
+                            }
+                            if (r.timeSelect!=undefined&&r.company!=undefined){
+                           		purchase.timeSelect=[r.timeSelect,r.company];
                             }
+                            sessionStorage.setItem("vipSubSelectArea", JSON.stringify(purchase.areaSelect));
+                            sessionStorage.setItem("vipSubSelectIndustry", JSON.stringify(purchase.industrySelect));
+                            sessionStorage.setItem("vipSubSelectTime", JSON.stringify(purchase.timeSelect));
+                          
                         }, false)
                     }
                     {{end}}
@@ -743,6 +747,27 @@
             sessionStorage.removeItem("vipSubSelectTime");
             sessionStorage.removeItem("vipSub_read");
         }
+        
+        /******* 获取url参数（正则）********/
+		function getParam(name) {
+		    var search = document.location.search;
+		    // alert(search);
+		    var pattern = new RegExp("[?&]" + name + "\=([^&]+)", "g");
+		    var matcher = pattern.exec(search);
+		    var items = null;
+		    if (null != matcher) {
+		        try {
+		            items = decodeURIComponent(decodeURIComponent(matcher[1]));
+		        } catch (e) {
+		            try {
+		                items = decodeURIComponent(matcher[1]);
+		            } catch (e) {
+		                items = matcher[1];
+		            }
+		        }
+		    }
+		    return items;
+		};
 
     </script>
     {{include "/common/weixin.html"}}