Merge branch 'master' into feature/v4.8.96

src/jfw/modules/subscribepay/src/util/sellerOrder.go

@@ -1,7 +1,6 @@
 package util
 
 import (
-	"app.yhyue.com/moapp/jypkg/identity"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -10,6 +9,8 @@ import (
 	"net/url"
 	"time"
 
+	"app.yhyue.com/moapp/jypkg/identity"
+
 	qutil "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
@@ -27,7 +28,7 @@ import (
 //			超级订阅：tn：周期 1:天、2:月
 //					tt：数量
 //	 err 异常
-func SellerTokenDecrypt(token string) (uId, sName string, sid int, desc map[string]interface{}, err error) {
+func SellerTokenDecrypt(token string) (uId, sName string, sid string, desc map[string]interface{}, err error) {
 	if token == "" {
 		err = fmt.Errorf("缺少token")
 		return
@@ -50,9 +51,9 @@ func SellerTokenDecrypt(token string) (uId, sName string, sid int, desc map[stri
 
 	uId = param.Get("uid")
 	sName = param.Get("sName")
-	sid = qutil.IntAll(param.Get("sid"))
+	sid = qutil.ObjToString(param.Get("sid"))
 
-	if uId == "" || sName == "" || sid == 0 || len(desc) == 0 {
+	if uId == "" || sName == "" || sid == "" || len(desc) == 0 {
 		err = fmt.Errorf("缺少参数")
 		return
 	}
@@ -70,9 +71,9 @@ func SellerTokenDecrypt(token string) (uId, sName string, sid int, desc map[stri
 //					tt：数量
 //	 return
 //	  token 加密信息
-func GetSellerToken(uId, sName string, sid int, desc map[string]interface{}) (token string) {
+func GetSellerToken(uId, sName string, sid string, desc map[string]interface{}) (token string) {
 	bytes, _ := json.Marshal(desc)
-	return encrypt.SE.Encode2Hex(fmt.Sprintf("uid=%s&sName=%s&sid=%d&desc=%s&t=%d", uId, sName, sid, string(bytes), time.Now().Unix()))
+	return encrypt.SE.Encode2Hex(fmt.Sprintf("uid=%s&sName=%s&sid=%s&desc=%s&t=%d", uId, sName, sid, string(bytes), time.Now().Unix()))
 }
 
 type MessageRet struct {

src/jfw/modules/weixin/src/wx/wx.go

@@ -1155,6 +1155,9 @@ func updatePushSet(openid string) {
 		return
 	}
 	entData := tools.Mysql.Find("entniche_user", map[string]interface{}{"phone": phone}, "id", "", -1, -1)
+	if entData == nil || len(*entData) == 0 {
+		return
+	}
 	for _, data := range *entData {
 		entUser := util.Int64All(data["id"])
 		tools.MQFW.Update("ent_user", map[string]interface{}{

src/web/staticres/js/biddingSearch.js

@@ -399,6 +399,7 @@ function unique( arr ){
 }
 //携带当前检索跳转数据导出支付页面
 function toPaydataExport(){
+  var isOpenNewTab = true
 	if(!loginflag){
 		unseatflag = true;
 		$(".code-text").html('<span style="font-size:22px;margin-top:10px;display:inline-block;color:#252627;font-weight:normal;"><img id="wxpng" src="/images/wx1.png">请先微信扫码登录</span>')
@@ -423,7 +424,9 @@ function toPaydataExport(){
         }
       }
     })
-    window.history.replaceState(null, null, window.location.pathname+"?goback"+new Date().getTime());
+    if (!isOpenNewTab) {
+      window.history.replaceState(null, null, window.location.pathname+"?goback"+new Date().getTime());
+    }
 		//$("#zbSeatchT").attr("action","/front/dataExport/superSearchExport?selectIds=" + selectIds);
     var tmpInput= $("<input type='hidden' name='selectIds'/>");
     // 点击数据导出，先调用分页的函数，让selectDataIds为最新的数据
@@ -440,19 +443,21 @@ function toPaydataExport(){
     // if(ipt.length != 0) {
     //   $('#zbSeatchT input[name="selectIds"]').attr('name', '')
     // }
-	var params = $("#zbSeatchT").serialize();
-	var $form = jsCreateFrom(params)
-    $form.attr('target', "_parent")
+    var params = $("#zbSeatchT").serialize();
+    var $form = jsCreateFrom(params)
+    $form.attr('target', "_blank")
     $form.attr("action","/front/dataExport/superSearchExport").append(tmpInput);
-    if (goTemplateData.inIframe) {
-      window.$BRACE.methods.open({
-        route: {
-          link: window.location.pathname+"?goback"+new Date().getTime(),
-          appType: 'iframe'
-        }
-      })
+    if (!isOpenNewTab) {
+      if (goTemplateData.inIframe) {
+        window.$BRACE.methods.open({
+          route: {
+            link: window.location.pathname+"?goback"+new Date().getTime(),
+            appType: 'iframe'
+          }
+        })
+      }
     }
-	$form.submit();
+    $form.submit();
 	}
 }
 

src/web/templates/frontRouter/pc/page_big_pc/sess/index.html

@@ -104,6 +104,12 @@
 <script src='{{Msg "seo" "cdn"}}/js/jquery.cookie.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>
 <script src='{{Msg "seo" "cdn"}}/js/public-nav.js?v={{Msg "seo" "version"}}' type="text/javascript"></script>
 <script>
+    // 临时处理-返回筛选
+    $('.page--docs--index').on('click', '.fr.goback', function() {
+      if (history.length === 1) {
+        window.close();
+      }
+    });
     $(function () {
         haslogin({{.T.logid}});
         // 采购单位画像TDK设置（也可在page_bigmember_pc子应用里通过MetaInfo插件设置）