Home Verkennen Help
Inloggen
qmx
/
jy
14
0
Vork 0
Bestanden Issues 2 Pull-aanvragen 0 Wiki
Bladeren bron

Merge branch 'feature/v4.9.27' of https://jygit.jydev.jianyu360.cn/qmx/jy into dev/v4.9.27_wmh

wenmenghao321 1 jaar geleden
bovenliggende
79a401e4f8 04b3c7b884
commit
df65d7cbc0
8 gewijzigde bestanden met toevoegingen van 19 en 12 verwijderingen
Gecombineerde weergave Toon Diff Stats
  1. 5 1
      src/jfw/front/index.go
  2. 1 1
      src/jfw/front/partner.go
  3. 1 1
      src/jfw/modules/app/src/app/front/wx.go
  4. 2 2
      src/web/staticres/common-module/order-list/js/order-list-config.js
  5. BIN
      src/web/staticres/images/pc/txt.png
  6. 3 2
      src/web/templates/frontRouter/pc/docs/sess/index.html
  7. 1 1
      src/web/templates/order/pc/paySuccess.html
  8. 6 4
      src/web/templates/pc/template/index/doc-card-module.html

+ 5 - 1
src/jfw/front/index.go
Bestand weergeven 

@@ -319,10 +319,14 @@ func GetDocsData() (docClass []string, indexDocs [][]map[string]interface{}) {
 
 					if common.IntAll(docv["source"]) == 2 {
 
 					if common.IntAll(docv["source"]) == 2 {
 
 						previewImg = fmt.Sprintf(docinUrl, common.InterfaceToStr(docv["previewImgId"]))
 
 						previewImg = fmt.Sprintf(docinUrl, common.InterfaceToStr(docv["previewImgId"]))
 
 					}
 
 					}
 
+					fileSuffix := common.InterfaceToStr(docv["docFileSuffix"])
 
+					if strings.HasPrefix(fileSuffix, ".") {
 
+						fileSuffix = strings.ReplaceAll(fileSuffix, ".", "")
 
+					}
 
 					indexDoc = append(indexDoc, map[string]interface{}{
 
 					indexDoc = append(indexDoc, map[string]interface{}{
 
 						"id":            common.InterfaceToStr(docv["id"]),
 
 						"id":            common.InterfaceToStr(docv["id"]),
 
 						"docName":       common.InterfaceToStr(docv["docName"]),
 
 						"docName":       common.InterfaceToStr(docv["docName"]),
 
-						"docFileSuffix": common.InterfaceToStr(docv["docFileSuffix"]),
 
+						"docFileSuffix": fileSuffix,
 
 						"previewImg":    previewImg,
 
 						"previewImg":    previewImg,
 
 						"productType":   common.IntAll(docv["productType"]),
 
 						"productType":   common.IntAll(docv["productType"]),
 
 					})
 
 					})

+ 1 - 1
src/jfw/front/partner.go
Bestand weergeven 

@@ -34,5 +34,5 @@ func (p *Partner) PartnerInfo(source string) error {
 
 		jy.SetCookieValue(p.ResponseWriter, jy.ChannelCookieName, source, cacheTimeOut)                      //三天
 
 		jy.SetCookieValue(p.ResponseWriter, jy.ChannelCookieName, source, cacheTimeOut)                      //三天
 
 		redis.Put("limitation", fmt.Sprintf("firstVisitTagByWX_%s", p.Session().Id()), source, cacheTimeOut) //登录注册 用户标识
 
 		redis.Put("limitation", fmt.Sprintf("firstVisitTagByWX_%s", p.Session().Id()), source, cacheTimeOut) //登录注册 用户标识
 
 	}
 
 	}
 
-	return p.Redirect("/jylab/supsearch/index.html?keywords=&selectType=title&searchGroup=1")
 
+	return p.Redirect("/jylab/supsearch/index.html?keywords=&selectType=title&searchGroup=1&partner=" + source)
 
 }
 
 }

+ 1 - 1
src/jfw/modules/app/src/app/front/wx.go
Bestand weergeven 

@@ -34,7 +34,7 @@ func (w *WX) Index(pageLabel string) error {
 
 	if userId, _ := w.GetSession("userId").(string); userId == "" {
 
 	if userId, _ := w.GetSession("userId").(string); userId == "" {
 
 		jy.SetCookieValue(w.ResponseWriter, jy.ChannelCookieName, pageLabel, cacheTimeOut)
 
 		jy.SetCookieValue(w.ResponseWriter, jy.ChannelCookieName, pageLabel, cacheTimeOut)
 
 		redis.Put("limitation", fmt.Sprintf("firstVisitTagByWX_%s", w.Session().Id()), pageLabel, cacheTimeOut) //app 登录注册 用户标识
 
 		redis.Put("limitation", fmt.Sprintf("firstVisitTagByWX_%s", w.Session().Id()), pageLabel, cacheTimeOut) //app 登录注册 用户标识
 
-		return w.Redirect("/jyapp/jylab/mainSearch?from=wx")
 
+		return w.Redirect("/jyapp/jylab/mainSearch?partner=" + pageLabel)
 
 	}
 
 	}
 
 	//已登录
 
 	//已登录
 
 	return w.Redirect("/jy_mobile/tabbar/home?from=wx")
 
 	return w.Redirect("/jy_mobile/tabbar/home?from=wx")

+ 2 - 2
src/web/staticres/common-module/order-list/js/order-list-config.js
Bestand weergeven 

@@ -480,8 +480,8 @@ var assetsConf = {
 
       app: '/jyapp/pay/checkout_docMember'
 
       app: '/jyapp/pay/checkout_docMember'
 
     },
 
     },
 
     renew: {
 
     renew: {
 
-      wx: '/jy_mobile/order/create/docMember',
 
-      app: '/jy_mobile/order/create/docMember'
 
+      wx: '/jy_mobile/order/create/docsvip',
 
+      app: '/jy_mobile/order/create/docsvip'
 
     },
 
     },
 
     orderDetail: {
 
     orderDetail: {
 
       wx: '/weixin/common/docMember/orderDetail',
 
       wx: '/weixin/common/docMember/orderDetail',

BIN
src/web/staticres/images/pc/txt.png
Bestand weergeven


+ 3 - 2
src/web/templates/frontRouter/pc/docs/sess/index.html
Bestand weergeven 

@@ -44,8 +44,8 @@
 
     <link rel="preload" href="https://cdn-common.jianyu360.com/cdn/lib/single-spa/4.3.7/lib/system/single-spa.min.js" as="script" crossorigin="anonymous" />
 
     <link rel="preload" href="https://cdn-common.jianyu360.com/cdn/lib/single-spa/4.3.7/lib/system/single-spa.min.js" as="script" crossorigin="anonymous" />
 
     <link rel="preload" href="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js" as="script" crossorigin="anonymous" />
 
     <link rel="preload" href="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js" as="script" crossorigin="anonymous" />
 
     <script src="https://cdn-common.jianyu360.com/cdn/lib/import-map-overrides/2.2.0/dist/import-map-overrides.js"></script>
 
     <script src="https://cdn-common.jianyu360.com/cdn/lib/import-map-overrides/2.2.0/dist/import-map-overrides.js"></script>
 
-    <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266//build/pdf.min.js"></script>
 
-    <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266//web/pdf_viewer.js"></script>
 
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/build/pdf.min.js"></script>
 
+    <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/web/pdf_viewer.js"></script>
 
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/system.min.js"></script>
 
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/system.min.js"></script>
 
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/amd.min.js"></script>
 
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/amd.min.js"></script>
 
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/named-exports.js"></script>
 
     <script src="https://cdn-common.jianyu360.com/cdn/lib/systemjs/6.8.3/dist/extras/named-exports.js"></script>
 
@@ -74,6 +74,7 @@
 
 <body class="page--docs--index">
 
 <body class="page--docs--index">
 
 {{include "/site/common/pc-school-head.html"}}
 
 {{include "/site/common/pc-school-head.html"}}
 
 <!-- S-注入  -->
 
 <!-- S-注入  -->
 
+<div id="vue-collect-user-info"></div>
 
 <div class="w-box page-container">
 
 <div class="w-box page-container">
 
     <div class="w1200">
 
     <div class="w1200">
 
         <div id="single-spa-app"></div>
 
         <div id="single-spa-app"></div>

+ 1 - 1
src/web/templates/order/pc/paySuccess.html
Bestand weergeven 

@@ -144,7 +144,7 @@
 
                 <a class="check_order sm-size" id="goBack2" style="display: none;">立即返回</a>
 
                 <a class="check_order sm-size" id="goBack2" style="display: none;">立即返回</a>
 
                 <a class="check_order sm-size default" href="/front/integral/integralDetail?order_code={{.T.orderCode}}">查看订单</a>
 
                 <a class="check_order sm-size default" href="/front/integral/integralDetail?order_code={{.T.orderCode}}">查看订单</a>
 
             {{else if eq .T.orderType "docMember"}}
 
             {{else if eq .T.orderType "docMember"}}
 
-            <a class="check_order default" href="/front/integral/integralDetail?order_code={{.T.orderCode}}">查看订单</a>
 
+            <a class="check_order default" href="/front/docMember/orderDetail?order_code={{.T.orderCode}}">查看订单</a>
 
             <a class="check_order" href="javascript:;" onclick="getDocsJumpUrl()">获取文档</a>
 
             <a class="check_order" href="javascript:;" onclick="getDocsJumpUrl()">获取文档</a>
 
             {{end}}
 
             {{end}}
 
             </div>
 
             </div>

+ 6 - 4
src/web/templates/pc/template/index/doc-card-module.html
Bestand weergeven 

@@ -18,14 +18,16 @@
 
             <li class="doc-card-list-item">
 
             <li class="doc-card-list-item">
 
               <div class='doc-card-list-item-img {{if not $vv.productType}}{{else if Eq $vv.productType 1}}free{{else if Eq $vv.productType 2}}good{{end}}'>
 
               <div class='doc-card-list-item-img {{if not $vv.productType}}{{else if Eq $vv.productType 1}}free{{else if Eq $vv.productType 2}}good{{end}}'>
 
                 <img class="doc-main-img" src="{{$vv.previewImg}}" alt="doc-name">
 
                 <img class="doc-main-img" src="{{$vv.previewImg}}" alt="doc-name">
 
-                {{if or (eq $vv.docFileSuffix ".doc") (eq $vv.docFileSuffix ".docx") (eq $vv.docFileSuffix "doc")}}
 
+                {{if or (eq $vv.docFileSuffix "doc") (eq $vv.docFileSuffix "docx")}}
 
                 <img class="doc-type-img" src='/images/pc/word.png' alt="doc-type">
 
                 <img class="doc-type-img" src='/images/pc/word.png' alt="doc-type">
 
-                {{else if  eq $vv.docFileSuffix ".pdf"}}
 
+                {{else if  eq $vv.docFileSuffix "pdf"}}
 
                 <img class="doc-type-img" src='/images/pc/pdf.png' alt="doc-type">
 
                 <img class="doc-type-img" src='/images/pc/pdf.png' alt="doc-type">
 
-                {{else if  eq $vv.docFileSuffix ".ppt"}}
 
+                {{else if  eq $vv.docFileSuffix "ppt"}}
 
                 <img class="doc-type-img" src='/images/pc/ppt.png' alt="doc-type">
 
                 <img class="doc-type-img" src='/images/pc/ppt.png' alt="doc-type">
 
-                {{else if  eq $vv.docFileSuffix ".excel"}}
 
+                {{else if  eq $vv.docFileSuffix "xls"}}
 
                 <img class="doc-type-img" src='/images/pc/excel.png' alt="doc-type">
 
                 <img class="doc-type-img" src='/images/pc/excel.png' alt="doc-type">
 
+                {{else if  eq $vv.docFileSuffix "txt"}}
 
+                <img class="doc-type-img" src='/images/pc/txt.png' alt="doc-type">
 
                 {{end}}
 
                 {{end}}
 
               </div>
 
               </div>
 
               <a class="doc-card-list-item-title cms-link ellipsis-2" target="_blank" href="/swordfish/docs/content/{{$vv.id}}" title="{{$vv.docName}}">{{$vv.docName}}</a>
 
               <a class="doc-card-list-item-title cms-link ellipsis-2" target="_blank" href="/swordfish/docs/content/{{$vv.id}}" title="{{$vv.docName}}">{{$vv.docName}}</a>