WH01243 %!s(int64=4) %!d(string=hai) anos
pai
achega
53ff84d651

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_renew.js

@@ -340,7 +340,7 @@ var renew = {
             }
             sizeTime = size.period
           } else {
-            sizeTime = '1个月'
+            sizeTime = '1'
           }
           console.log(upgrade,sizeTime, '新or老')
             $('.vip-footer.renew .confirm').prop('disabled', true)

+ 30 - 11
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_viewPage.html

@@ -360,7 +360,12 @@
 			htmlObj.on("click", function(event){
 				var h = $(this).find("a.bt").attr("s");
 				var eid = $(this).find("a.bt").attr("eid");
-				beforeJump(eid,h);
+				var keywordsDOMArr = $(event.currentTarget).find('.keyword')
+				var keywordsArr = []
+				keywordsDOMArr.each(function(item) {
+					keywordsArr.push($(this).text())
+				})
+				beforeJump(eid,h, 'VIPkey_' + unique(keywordsArr).join('_'));
 			});
 			$('#list').append(htmlObj);
 		}
@@ -379,18 +384,32 @@
 		function tablejump(eid,h){
 			beforeJump(eid,h);
 		}
-		function beforeJump(eid,h){
-			if(sessionStorage){
-				sessionStorage.resultpreviewScrollTop = scrollTop;
-				sessionStorage.resultpreviewPageNumCache = pageNum;
-				sessionStorage.resultpreviewListCache = listCache;
-				sessionStorage.resultpreviewNoMoreCache = noMore;
-				sessionStorage.resultpreviewHasNextData = hasNextPage;
-				sessionStorage.resultpreviewSds = sds;
-				sessionStorage.resultpreviewKeys = keys;
+	function beforeJump(eid,h,sds){
+		if(sessionStorage){
+			sessionStorage.resultpreviewScrollTop = scrollTop;
+			sessionStorage.resultpreviewPageNumCache = pageNum;
+			sessionStorage.resultpreviewListCache = listCache;
+			sessionStorage.resultpreviewNoMoreCache = noMore;
+			sessionStorage.resultpreviewHasNextData = hasNextPage;
+			sessionStorage.resultpreviewSds = sds;
+			sessionStorage.resultpreviewKeys = keys;
+		}
+		newredirect(zbadd,h,eid,sds);
+	}
+	// 数组去重
+	function unique (arr) {
+		if (!Array.isArray(arr)) {
+			console.log('type error!')
+			return
+		}
+		var array = [];
+		for (var i = 0; i < arr.length; i++) {
+			if (array.indexOf(arr[i]) === -1) {
+				array.push(arr[i])
 			}
-			newredirect(zbadd,h,eid,sds);
 		}
+		return array
+	}
 </script>
 <style type="text/css">
 	.restime span.buyerclass{

+ 36 - 49
src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -1,40 +1,5 @@
 <html>
 <head>
-    <script>
-        try {
-            window.onlyUserID = {{session "userId"}}
-        } catch (e) {
-            console.log('获取ID失败')
-        }
-        function clearOtherUserLocalStorage () {
-            var readUserID = JSON.parse(localStorage.getItem('big_member_full_video_play_reads') || '[]')
-            if (readUserID.length) {
-                try {
-                    var oCookie = window.onlyUserID || null
-                    var isUserNext = readUserID.indexOf(oCookie) === -1
-                    if (isUserNext) {
-                        localStorage.removeItem('big_member_full_video_play')
-                    } else {
-                        localStorage.setItem('big_member_full_video_play', 'true')
-                    }
-                } catch (e) {
-                    console.log('cookie 获取失败02')
-                }
-            } else {
-                localStorage.removeItem('big_member_full_video_play')
-            }
-        }
-        clearOtherUserLocalStorage()
-        if (localStorage.getItem('big_member_full_video_play')) {
-            console.log('已经播放')
-        } else {
-          console.log('应该跳转')
-          window.onload = function () {
-            history.pushState({state: 'full'}, null)
-            location.href = '/jyapp/big/page/full'
-          }
-        }
-    </script>
     {{include "/common/meta.html"}}
     <!--S-当前页必定需要预加载的资源-->
     <link rel="preload" as="script" href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/swiper.min.js' />
@@ -205,10 +170,10 @@
                         <div class="jy_sprite_home_icon icon_1"></div>
                         <span>投标决策</span>
                     </a>
-                    <a class="tab_item" data-only-name="潜在项目预测" id="mainSearch-tab2">
+                    <!-- <a class="tab_item" data-only-name="潜在项目预测" id="mainSearch-tab2">
                         <div class="jy_sprite_home_icon_add icon_9"></div>
                         <span>潜在项目预测</span>
-                    </a>
+                    </a> -->
                     <a class="tab_item" data-only-name="中标企业预测" id="mainSearch-tab3">
                         <div class="jy_sprite_home_icon icon_3"></div>
                         <span>中标企业预测</span>
@@ -220,7 +185,11 @@
                     <a class="tab_item" data-only-name="剑鱼文库" id="">
                       <div class="jy_sprite_home_icon icon_2"></div>
                       <span>剑鱼文库</span>
-                  </a>
+                    </a>
+                    <a class="tab_item" data-only-name="剑鱼伙伴" id="mainSearch-tab2">
+                        <div class="jy_sprite_home_icon_add icon_9"></div>
+                        <span>剑鱼伙伴</span>
+                    </a>
                 </div>
                 <div class="tab_container">
                     <a class="tab_item" data-only-name="数据导出" id="mainSearch-tab5">
@@ -981,17 +950,17 @@
                     }
                     break
                 }
-                case '潜在项目预测': {
-                    sessionStorage.setItem('landinfo', JSON.stringify({
-                        anchor: '潜在项目预测'
-                    }))
-                    if ($this.attr('data-access')) {
-                        window.location.href = '/jyapp/big/page/forecast_list';
-                    } else {
-                        location.href = '/jyapp/big/page/landingPage';
-                    }
-                    break
-                }
+                // case '潜在项目预测': {
+                //     sessionStorage.setItem('landinfo', JSON.stringify({
+                //         anchor: '潜在项目预测'
+                //     }))
+                //     if ($this.attr('data-access')) {
+                //         window.location.href = '/jyapp/big/page/forecast_list';
+                //     } else {
+                //         location.href = '/jyapp/big/page/landingPage';
+                //     }
+                //     break
+                // }
                 case '中标企业预测':  {
                     sessionStorage.setItem('landinfo', JSON.stringify({
                         anchor: '中标企业预测'
@@ -1042,6 +1011,24 @@
                     }
                     break
                 }
+                case '剑鱼伙伴': {
+                    if(userId==""){
+                        window.location.href='/jyapp/free/login?back=index';
+                    }else{
+                        $.ajax({
+                            url: '/distribution/partner/isPartner?t=' + new Date().getTime(),
+                            type: 'POST',
+                            success: function (r) {
+                                if (r.isPartner) {
+                                    window.location.href = "/page_partner/home"
+                                } else {
+                                    window.location.href = "/page_partner/partner/partner.html" // 协议页面
+                                }
+                            }
+                        })
+                    }
+                    break
+                }
                 case '签到': {
                     if(userId==""){
                         window.location.href='/jyapp/free/login?back=index';

+ 3 - 3
src/jfw/modules/distribution/src/config.json

@@ -23,9 +23,9 @@
     "mysql": {
 	    "main": {
 	        "dbName": "jianyu",
-	        "address": "192.168.3.14:3306",
-	        "userName": "admin",
-	        "passWord": "123456",
+	        "address": "192.168.3.11:3366",
+	        "userName": "root",
+	        "passWord": "Topnet123",
 			"maxOpenConns": 20,
 			"maxIdleConns": 20
 	    }

+ 3 - 3
src/jfw/modules/distribution/src/service/action/partner.go

@@ -358,7 +358,7 @@ func (p *Partner) PartnerInfo() {
 			data["contacts"] = (*partner)[0]["contacts"]
 		}
 
-		return data, "查询成功", 1
+		return data, "", Error_code
 	}()
 	p.ServeJson(Result{
 		Error_code: code,
@@ -383,7 +383,7 @@ func (p *Partner) EnterInfo() {
 	}
 	p.ServeJson(map[string]interface{}{
 		"status":  true,
-		"message": "修改成功",
+		"message": "",
 	})
 }
 
@@ -487,7 +487,7 @@ func (p *Partner) ReapplyPartner() {
 			}
 			return false
 		}) {
-			return 1, "保存成功"
+			return 1, ""
 		}
 		return -1, "保存失败"
 	}()

+ 8 - 3
src/jfw/modules/subscribepay/src/entity/distribution.go

@@ -28,18 +28,23 @@ func DisWordRecode(order_id, sale_money int, product_name, disWord string) {
 			parentTypeInt, _ := strconv.Atoi(fmt.Sprint((*parentList)[0]["type"]))
 			parentType = parentTypeInt
 		}
-		if (parentType == 2) {
-			return
-		}
+		fmt.Println("用户类型"+fmt.Sprint(parentType))
+		//if (parentType == 2) {
+		//	return
+		//}
+		fmt.Println("走人了")
 		//查询产品信息   获取  rate 佣金比例
 		var c_rate float64 = 0
 		if p_data, ok := util.MQFW.Find("dis_product", nil, `{"l_createdate":1}`, nil, false, -1, -1); ok && p_data != nil {
+
 			for _, v := range *p_data {
+				fmt.Println(v)
 				if product_name == qutil.ObjToString(v["s_name"]) {
 					c_rate = qutil.Float64All(v["f_rate"])
 				}
 			}
 		}
+		fmt.Println("佣金比例:",fmt.Sprint(c_rate))
 		//四舍五入 取整
 		c_money_f := float64(sale_money) * c_rate
 		c_money_i := int(qutil.RetainDecimal(c_money_f, 0))

+ 6 - 8
src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -209,15 +209,13 @@ func (this *vipSubscribeStruct) PayCallBack(param *CallBackParam) bool {
 			suffix := dis_word[len(dis_word)-3 : len(dis_word)]
 			if suffix == suffix_msgt {
 				go OtherDisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅", dis_word, qutil.ObjToString((*orderdata)["user_id"]), qutil.ObjToString((*orderdata)["create_time"]))
-			} else {
-				prefix := dis_word[0 : 1]
-				if prefix=="G"{
-					go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅企业版", dis_word)
-				}else{
-					go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅", dis_word)
+			} else  if suffix=="_GX"{
+				go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅企业版", dis_word)
 
-				}
-				}
+			}else{
+				go DisWordRecode(qutil.IntAll((*orderdata)["id"]), qutil.IntAll((*orderdata)["order_money"]), "超级订阅", dis_word)
+
+			}
 		}
 		//卡卷使用
 		userLotteryId := qutil.ObjToString((*orderdata)["d_relation_id"])

+ 8 - 3
src/jfw/modules/weixin/src/github.com/wizjin/weixin/weixin.go

@@ -792,13 +792,18 @@ func (wx *Weixin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			log.Println("Weixin parse message failed:", err)
 			http.Error(w, "", http.StatusBadRequest)
 		} else {
-			if msg.Event == EventTemplateSent || msg.Event == EventView {
+			//update by wcj on 2021-07-29
+			//update before
+			/*if msg.Event == EventTemplateSent || msg.Event == EventView {
 				http.Error(w, "", http.StatusNotFound)
 			} else {
 				wx.routeRequest(w, &msg)
-			}
+			}*/
+			//update after
+			wx.routeRequest(w, &msg)
 		}
 	}
+	w.Write([]byte("success")) //add by wcj on 2021-07-30
 	return
 }
 
@@ -819,7 +824,7 @@ func (wx *Weixin) routeRequest(w http.ResponseWriter, r *Request) {
 		route.handler(writer, r)
 		return
 	}
-	http.Error(w, "", http.StatusNotFound)
+	//http.Error(w, "", http.StatusNotFound)
 	return
 }
 

+ 14 - 3
src/jfw/modules/weixin/src/wx/wx.go

@@ -109,10 +109,20 @@ func MenuClickHandler(w ResponseWriter, r *Request) {
 	clickButtonKey := r.EventKey
 	if replyText, ok := menuClickReplyTextMap[clickButtonKey]; ok {
 		w.PostText(replyText)
-		//二维码
-		mediaId, err := w.UploadMediaFromFile("image", tools.BusinessCoop)
+		CBKey := fmt.Sprintf("%s_%d", clickButtonKey, time.Now().Day())
+		mediaId := redis.GetStr("other", CBKey)
+		if mediaId == "" {
+			//二维码
+			_mediaId, err := w.UploadMediaFromFile("image", tools.BusinessCoop)
+			if _mediaId != "" && err == nil {
+				mediaId = _mediaId
+			}
+		}
 		// log.Println(mediaId, "--", err, "--", tools.BusinessCoop)
-		if mediaId != "" && err == nil {
+		if mediaId != "" {
+			go func() {
+				redis.Put("other", CBKey, mediaId, 24*60*60)
+			}()
 			w.PostImage(mediaId)
 		}
 	}
@@ -409,6 +419,7 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 			newUser["startTime"] =startTimeInt64
 			endTime:=time.Unix(startTimeInt64,0)
 			newUser["endTime"] = endTime.AddDate(1, 0, 0).Unix()
+			newUser["disWord"] = strings.Split(source, "_")[1]+"_"+strings.Split(source, "_")[2]
 		}
 		if isJyopUser {
 			newUser["s_registersource"] = "openplatform"

+ 1 - 1
src/web/staticres/vipsubscribe/js/vip_renew.js

@@ -341,7 +341,7 @@ var renew = {
               }
               sizeTime = size.period
             } else {
-              sizeTime = '1个月'
+              sizeTime = '1'
             }
             console.log(upgrade,sizeTime, '新or老')
             //支付请求

+ 0 - 279
src/web/templates/common/pchead.html

@@ -1,282 +1,3 @@
-<!--S-视频-->
-<style>
-    .fullscreenvideo {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 100%;
-        height: 100%;
-        z-index: 99999999;
-        background: url('{{Msg "seo" "cdn"}}/images/mp4/start.jpg') no-repeat center center;
-        background-color: black;
-        -webkit-transform: translateX(-50%) translateY(-50%);
-        transform: translateX(-50%) translateY(-50%);
-        -webkit-transition: 1s opacity;
-        transition: 1s opacity;
-    }
-    .videocontainer{
-        position: fixed;
-        width: 100%;
-        height: 100%;
-        overflow: hidden;
-        z-index: 99999999;
-    }
-    .videocontainer:before{
-        content: "";
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        display: block;
-        z-index: 99999999;
-        top: 0;
-        left: 0;
-        background: rgba(25,29,34,.65);
-    }
-    .full-video-mask-video-box {
-        width: 100%;
-        height: 100%;
-        top: 0;
-        left: 0;
-        position: absolute;
-        z-index: 99999999;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        display: none;
-        background-color: rgba(0, 0, 0, 0.75);
-    }
-    #rePalyFullVideo, #goFullVideoInfo {
-        font-size: 18px;
-        line-height: 52px;
-        text-align: center;
-        margin: 10px 20px;
-        border: 1px solid #FFFFFF;
-        width: 136px;
-        height: 52px;
-        box-sizing: border-box;
-        border-radius: 34px;
-        color: #fff;
-        cursor: pointer;
-        display: inline-block;
-    }
-    #goFullVideoInfo {
-        border: 1px solid #2CB7CA;
-        background-color: #2CB7CA;
-    }
-    @keyframes rotate-music {
-        0% {
-            transform: rotate(0deg);
-        }
-        100% {
-            transform: rotate(1turn);
-        }
-    }
-    #music-control-box,
-    #skip-video-box {
-        position: fixed;
-        overflow: hidden;
-        z-index: 999999999;
-        right: 0;
-        top: 0;
-        padding: 20px;
-        cursor: pointer;
-    }
-    #skip-video-box {
-        right: 70px;
-        color: #fff;
-        font-size: 16px;
-        line-height: 30px;
-        padding: 20px 8px;
-    }
-    #music-control-box.run-music .music-icon-box {
-        -webkit-animation-play-state: running;
-        animation-play-state: running;
-    }
-    #music-control-box.run-music .music-icon-box::before {
-        content: none;
-    }
-    #music-control-box .music-icon-box {
-        position: relative;
-        width: 30px;
-        height: 30px;
-        border-radius: 50%;
-        border: 1px solid #fff;
-        box-sizing: border-box;
-        overflow: hidden;
-        background-color: rgba(0, 0, 0, 0.6);
-        -webkit-animation: rotate-music 3s linear infinite;
-        animation: rotate-music 3s linear infinite;
-        -webkit-animation-play-state: paused;
-        animation-play-state: paused;
-    }
-    #music-control-box .music-icon-box::before {
-        content: '';
-        width: 16px;
-        height: 2px;
-        background: #fff;
-        position: absolute;
-        top: 12px;
-        left: 6px;
-        transform: rotate(45deg);
-    }
-    #music-control-box .music-icon-box img {
-        width: 18px;
-        height: 18px;
-        margin: 5px;
-    }
-</style>
-<div class="videocontainer" id="FullVideo">
-    <div id="music-control-box">
-        <div class="music-icon-box">
-            <img src='{{Msg "seo" "cdn"}}/images/mp4/music-icon.png' />
-        </div>
-    </div>
-    <div id="skip-video-box">跳过</div>
-    <video id="bgvid" class="fullscreenvideo" poster='{{Msg "seo" "cdn"}}/images/mp4/start.jpg'
-           muted preload="auto"
-           playsinline="true" webkit-playsinline="true" mtt-playsinline="true"
-           x5-video-player-type="h5-page"
-           autoplay="true" >
-        <source src='{{Msg "seo" "cdn"}}/images/mp4/start_hd.mp4' type="video/mp4">
-    </video>
-    <div class="full-video-mask-video-box">
-        <div class="full-video-button">
-            <div id="rePalyFullVideo">再次播放</div>
-            <div id="goFullVideoInfo">查看详情</div>
-        </div>
-    </div>
-</div>
-<script>
-     var jyTempLog = window.console.log
-     if (window.localStorage.getItem('log') === '1') {
-        window.console.log = jyTempLog
-     } else {
-        window.console.log = function () {
-          return null
-        }
-     }
-    function getCookieValue(name) {
-        var result = document.cookie.match("(^|[^;]+)\\s*" + name + "\\s*=\\s*([^;]+)")
-        return result ? result.pop() : ""
-    }
-    try {
-        window.onlyUserID = {{session "userId"}}
-        if (location.pathname === '/' || location.pathname === '' || location.pathname.indexOf('article/content/') !== -1 || location.pathname.indexOf('article/mailprivate/') !== -1) {
-            // 首页userId有redis缓存,采用cookie判断
-            window.onlyUserID = getCookieValue('SESSIONID')
-        }
-    } catch (e) {
-        console.log('获取ID失败')
-    }
-    function setOnlyCookie () {
-        try {
-            var oCookie = window.onlyUserID || null
-            var readUserID = JSON.parse(localStorage.getItem('big_member_full_video_play_reads') || '[]')
-            if (readUserID.indexOf(oCookie) === -1) {
-                readUserID.push(oCookie)
-            }
-            if (readUserID.indexOf(getCookieValue('SESSIONID')) === -1) {
-                readUserID.push(getCookieValue('SESSIONID'))
-            }
-            localStorage.setItem('big_member_full_video_play_reads', JSON.stringify(readUserID))
-        } catch (e) {
-            console.log('cookie 获取失败01')
-        }
-    }
-
-    function clearOtherUserLocalStorage () {
-        var readUserID = JSON.parse(localStorage.getItem('big_member_full_video_play_reads') || '[]')
-        if (readUserID.length) {
-            try {
-                var oCookie = window.onlyUserID || null
-                var isUserNext = readUserID.indexOf(oCookie) === -1
-                if (isUserNext) {
-                    localStorage.removeItem('big_member_full_video_play')
-                } else {
-                    localStorage.setItem('big_member_full_video_play', 'true')
-                }
-            } catch (e) {
-                console.log('cookie 获取失败02')
-            }
-        } else {
-            localStorage.removeItem('big_member_full_video_play')
-        }
-    }
-    if (document.referrer === location.origin || document.referrer === location.origin + '/') {
-        if (localStorage.getItem('big_member_full_video_play')) {
-            setOnlyCookie()
-        }
-    }
-    function checkSkipPages () {
-      var skipPages = ['/big/page/index?source=baidusem', '/front/structed/pc_index.html?source=baidusem']
-      return skipPages.some(function (v) {
-        return location.href.indexOf(v) !== -1
-      })
-    }
-
-    clearOtherUserLocalStorage()
-    var isAutoPlayMusic = false
-    if (checkSkipPages()) {
-      $("#FullVideo").remove()
-    } else if (localStorage.getItem('big_member_full_video_play')) {
-        $("#FullVideo").remove()
-    } else {
-        var bgvid = document.getElementById("bgvid");
-        var b_re = document.getElementById('rePalyFullVideo')
-        var b_info = document.getElementById('goFullVideoInfo')
-        var b_music = document.getElementById('music-control-box')
-        var fullbox = document.getElementById("FullVideo");
-        var skipVideo = document.getElementById("skip-video-box");
-        fullbox.addEventListener('mousedown', function(){
-            if (isAutoPlayMusic) {
-                isAutoPlayMusic = false
-                bgvid.muted = false
-                b_music.classList.add('run-music')
-            }
-        }, false);
-        b_music.addEventListener('click', function (e) {
-            if (b_music.classList.contains('run-music')) {
-                bgvid.muted = true
-                b_music.classList.remove('run-music')
-            } else {
-                bgvid.muted = false
-                b_music.classList.add('run-music')
-            }
-        })
-        b_re.addEventListener('click', function () {
-            bgvid.play()
-            document.querySelector('.full-video-mask-video-box').style.display = 'none'
-        })
-        skipVideo.addEventListener('click', function () {
-            $("#FullVideo").remove()
-            localStorage.setItem('big_member_full_video_play', 'true')
-            setOnlyCookie()
-        })
-        b_info.addEventListener('click', function () {
-            location.href = '/big/page/index'
-        })
-        bgvid.addEventListener('play', function () { //播放开始执行的函数
-            console.log("开始播放");
-            b_music.style.display = 'block'
-            skipVideo.style.display = 'block'
-        });
-        bgvid.addEventListener('pause', function () { //暂停开始执行的函数
-            console.log("暂停播放");
-        });
-        bgvid.addEventListener('waiting', function () { //加载
-            console.log("加载中");
-        });
-        bgvid.addEventListener('ended', function () { //结束
-            console.log("播放结束");
-            document.querySelector('.full-video-mask-video-box').style.display = 'flex'
-            b_music.style.display = 'none'
-            skipVideo.style.display = 'none'
-            localStorage.setItem('big_member_full_video_play', 'true')
-            setOnlyCookie()
-        }, false);
-    }
-</script>
-<!--E-视频-->
 <style>
 	.new-info {
 		position: relative;

+ 0 - 31
src/web/templates/weixin/search/mainSearch.html

@@ -1,36 +1,5 @@
 <html>
 <head>
-    <script>
-        try {
-            window.onlyUserID = {{session "userId"}}
-        } catch (e) {
-            console.log('获取ID失败')
-        }
-        function clearOtherUserLocalStorage () {
-            var readUserID = JSON.parse(localStorage.getItem('big_member_full_video_play_reads') || '[]')
-            if (readUserID.length) {
-                try {
-                    var oCookie = window.onlyUserID || null
-                    var isUserNext = readUserID.indexOf(oCookie) === -1
-                    if (isUserNext) {
-                        localStorage.removeItem('big_member_full_video_play')
-                    } else {
-                        localStorage.setItem('big_member_full_video_play', 'true')
-                    }
-                } catch (e) {
-                    console.log('cookie 获取失败02')
-                }
-            } else {
-                localStorage.removeItem('big_member_full_video_play')
-            }
-        }
-        clearOtherUserLocalStorage()
-        if (localStorage.getItem('big_member_full_video_play')) {
-            console.log('已经播放')
-        } else {
-            location.href = '/big/wx/page/full'
-        }
-    </script>
 <meta charset="UTF-8" />
 <meta name="format-detection" content="telephone=no" />
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">

+ 30 - 11
src/web/templates/weixin/vipsubscribe/vip_viewPage.html

@@ -360,7 +360,12 @@
 			htmlObj.on("click", function(event){
 				var h = $(this).find("a.bt").attr("s");
 				var eid = $(this).find("a.bt").attr("eid");
-				beforeJump(eid,h);
+				var keywordsDOMArr = $(event.currentTarget).find('.keyword')
+				var keywordsArr = []
+				keywordsDOMArr.each(function(item) {
+					keywordsArr.push($(this).text())
+				})
+				beforeJump(eid,h, 'VIPkey_' + unique(keywordsArr).join('_'));
 			});
 			$('#list').append(htmlObj);
 		}
@@ -379,18 +384,32 @@
 		function tablejump(eid,h){
 			beforeJump(eid,h);
 		}
-		function beforeJump(eid,h){
-			if(sessionStorage){
-				sessionStorage.resultpreviewScrollTop = scrollTop;
-				sessionStorage.resultpreviewPageNumCache = pageNum;
-				sessionStorage.resultpreviewListCache = listCache;
-				sessionStorage.resultpreviewNoMoreCache = noMore;
-				sessionStorage.resultpreviewHasNextData = hasNextPage;
-				sessionStorage.resultpreviewSds = sds;
-				sessionStorage.resultpreviewKeys = keys;
+	function beforeJump(eid,h,sds){
+		if(sessionStorage){
+			sessionStorage.resultpreviewScrollTop = scrollTop;
+			sessionStorage.resultpreviewPageNumCache = pageNum;
+			sessionStorage.resultpreviewListCache = listCache;
+			sessionStorage.resultpreviewNoMoreCache = noMore;
+			sessionStorage.resultpreviewHasNextData = hasNextPage;
+			sessionStorage.resultpreviewSds = sds;
+			sessionStorage.resultpreviewKeys = keys;
+		}
+		newredirect(zbadd,h,eid,sds);
+	}
+	// 数组去重
+	function unique (arr) {
+		if (!Array.isArray(arr)) {
+			console.log('type error!')
+			return
+		}
+		var array = [];
+		for (var i = 0; i < arr.length; i++) {
+			if (array.indexOf(arr[i]) === -1) {
+				array.push(arr[i])
 			}
-			newredirect(zbadd,h,eid,sds);
 		}
+		return array
+	}
 </script>
 <style type="text/css">
 	.restime span.buyerclass{