Merge branch 'dev4.6.3.4' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.4

src/jfw/modules/app/src/app/front/jylog.go

@@ -1,73 +0,0 @@
-package front
-
-/**
-日志文件自动切换，默认保留15天内日志
-**/
-
-import (
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"time"
-
-	"github.com/go-xweb/xweb"
-	"github.com/robfig/cron"
-)
-
-//日志格式
-var fileReg = regexp.MustCompile("^(\\d{4}_[0-9_]{14})\\.log$")
-
-//当前日志文件句柄
-var LogFile *os.File
-
-//时间格式
-var FMT = "2006_01_02_15_04_05"
-
-//日志目录
-var LogPath = "./jylog"
-
-func init() {
-	os.Mkdir(LogPath, os.ModePerm)
-	//默认保留15天内的日志，-1为永久保留
-	initLog(15)
-}
-
-func initLog(saveDay int) {
-	go logfile()
-	task := cron.New()
-	task.Start()
-	task.AddFunc("0 0 0 * * ?", func() {
-		go logfile()
-		time.Sleep(50 * time.Second)
-		if saveDay > 0 {
-			filepath.Walk(LogPath, func(path string, info os.FileInfo, err error) error {
-				str := fileReg.FindStringSubmatch(info.Name())
-				if len(str) == 2 {
-					t, er := time.ParseInLocation(FMT, str[1], time.Local)
-					if er == nil {
-						if (time.Now().Unix()-t.Unix())/86400 > int64(saveDay) {
-							log.Println("delete log file:", path, os.Remove(path))
-						}
-					}
-				}
-				return nil
-			})
-		}
-	})
-}
-
-//创建并切换输出文件
-func logfile() {
-	now := time.Now().Format(FMT)
-	file, _ := os.Create(LogPath + "/" + now + ".log")
-	log.SetOutput(file)
-	xweb.RootApp().Logger.SetOutput(file)
-	go func(file *os.File) {
-		time.Sleep(5 * time.Second)
-		if LogFile != nil {
-			LogFile.Close()
-		}
-		LogFile = file
-	}(file)
-}

src/jfw/modules/app/src/main.go

@@ -12,6 +12,7 @@ import (
 	"jfw/public"
 	"net/http"
 	"qfw/util"
+	_ "qfw/util/jylog" //日志文件
 	"strings"
 	"time"
 

src/jfw/modules/bigmember/src/main.go

@@ -7,6 +7,7 @@ import (
 	_ "entinfo"
 	_ "filter"
 	"net/http"
+	_ "qfw/util/jylog" //日志文件
 	_ "service"
 
 	"github.com/go-xweb/xweb"

src/jfw/modules/bigmember/src/util/jylog.go

@@ -1,73 +0,0 @@
-package util
-
-/**
-日志文件自动切换，默认保留15天内日志
-**/
-
-import (
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"time"
-
-	"github.com/go-xweb/xweb"
-	"github.com/robfig/cron"
-)
-
-//日志格式
-var fileReg = regexp.MustCompile("^(\\d{4}_[0-9_]{14})\\.log$")
-
-//当前日志文件句柄
-var LogFile *os.File
-
-//时间格式
-var FMT = "2006_01_02_15_04_05"
-
-//日志目录
-var LogPath = "./jylog"
-
-func init() {
-	os.Mkdir(LogPath, os.ModePerm)
-	//默认保留15天内的日志，-1为永久保留
-	initLog(15)
-}
-
-func initLog(saveDay int) {
-	go logfile()
-	task := cron.New()
-	task.Start()
-	task.AddFunc("0 0 0 * * ?", func() {
-		go logfile()
-		time.Sleep(50 * time.Second)
-		if saveDay > 0 {
-			filepath.Walk(LogPath, func(path string, info os.FileInfo, err error) error {
-				str := fileReg.FindStringSubmatch(info.Name())
-				if len(str) == 2 {
-					t, er := time.ParseInLocation(FMT, str[1], time.Local)
-					if er == nil {
-						if (time.Now().Unix()-t.Unix())/86400 > int64(saveDay) {
-							log.Println("delete log file:", path, os.Remove(path))
-						}
-					}
-				}
-				return nil
-			})
-		}
-	})
-}
-
-//创建并切换输出文件
-func logfile() {
-	now := time.Now().Format(FMT)
-	file, _ := os.Create(LogPath + "/" + now + ".log")
-	log.SetOutput(file)
-	xweb.RootApp().Logger.SetOutput(file)
-	go func(file *os.File) {
-		time.Sleep(5 * time.Second)
-		if LogFile != nil {
-			LogFile.Close()
-		}
-		LogFile = file
-	}(file)
-}

src/jfw/front/jylog.go → src/jfw/modules/common/src/qfw/util/jylog/jylog.go

@@ -1,4 +1,4 @@
-package front
+package jylog
 
 /**
 日志文件自动切换，默认保留15天内日志

src/jfw/modules/publicapply/src/a/jylog.go

@@ -1,73 +0,0 @@
-package a
-
-/**
-日志文件自动切换，默认保留15天内日志
-**/
-
-import (
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"time"
-
-	"github.com/go-xweb/xweb"
-	"github.com/robfig/cron"
-)
-
-//日志格式
-var fileReg = regexp.MustCompile("^(\\d{4}_[0-9_]{14})\\.log$")
-
-//当前日志文件句柄
-var LogFile *os.File
-
-//时间格式
-var FMT = "2006_01_02_15_04_05"
-
-//日志目录
-var LogPath = "./jylog"
-
-func init() {
-	os.Mkdir(LogPath, os.ModePerm)
-	//默认保留15天内的日志，-1为永久保留
-	initLog(15)
-}
-
-func initLog(saveDay int) {
-	go logfile()
-	task := cron.New()
-	task.Start()
-	task.AddFunc("0 0 0 * * ?", func() {
-		go logfile()
-		time.Sleep(50 * time.Second)
-		if saveDay > 0 {
-			filepath.Walk(LogPath, func(path string, info os.FileInfo, err error) error {
-				str := fileReg.FindStringSubmatch(info.Name())
-				if len(str) == 2 {
-					t, er := time.ParseInLocation(FMT, str[1], time.Local)
-					if er == nil {
-						if (time.Now().Unix()-t.Unix())/86400 > int64(saveDay) {
-							log.Println("delete log file:", path, os.Remove(path))
-						}
-					}
-				}
-				return nil
-			})
-		}
-	})
-}
-
-//创建并切换输出文件
-func logfile() {
-	now := time.Now().Format(FMT)
-	file, _ := os.Create(LogPath + "/" + now + ".log")
-	log.SetOutput(file)
-	xweb.RootApp().Logger.SetOutput(file)
-	go func(file *os.File) {
-		time.Sleep(5 * time.Second)
-		if LogFile != nil {
-			LogFile.Close()
-		}
-		LogFile = file
-	}(file)
-}

src/jfw/modules/publicapply/src/main.go

@@ -17,10 +17,10 @@ import (
 	_ "me"
 	"net/http"
 	_ "project"
+	_ "qfw/util/jylog" //日志文件
 	_ "shareFission"
 	_ "subscribe"
 	_ "subscribePush"
-
 	_ "userbase"
 
 	"github.com/go-xweb/xweb"

src/jfw/modules/subscribepay/src/main.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"net/rpc"
 	"qfw/util/endless"
+	_ "qfw/util/jylog" //日志文件
 	"rpcfollow"
 	_ "service"
 	"timetask"

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

@@ -72,7 +72,7 @@ func (o *OrderDetail) CommonDetail(bigm int, fields string) (data map[string]int
 				if err != nil {
 					log.Println("json.unmarshal err", filter_map)
 				} else {
-					data["cycle"] = filter_map["count"]
+					data["cycle"] = filter_map["cycle"]
 					data["level"] = filter_map["level"]
 					comboid := qutil.IntAll(filter_map["comboId"])
 					combo := util.Mysql.FindOne("bigmember_combo", map[string]interface{}{"id": comboid}, "s_name", "")

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

@@ -858,7 +858,7 @@ func (o *OrderListDetails) CommonDetail(bigm int, fields string) (data, time map
 						log.Println("json.unmarshal err", filter_map)
 					} else {
 						if bigm == 0 || bigm == 1 {
-							data["cycle"] = filter_map["count"]
+							data["cycle"] = filter_map["cycle"]
 						} else if bigm == 0 {
 							data["level"] = filter_map["level"]
 							comboid := qutil.IntAll(filter_map["comboId"])

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

@@ -1,73 +0,0 @@
-package util
-
-/**
-日志文件自动切换，默认保留15天内日志
-**/
-
-import (
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"time"
-
-	"github.com/go-xweb/xweb"
-	"github.com/robfig/cron"
-)
-
-//日志格式
-var fileReg = regexp.MustCompile("^(\\d{4}_[0-9_]{14})\\.log$")
-
-//当前日志文件句柄
-var LogFile *os.File
-
-//时间格式
-var FMT = "2006_01_02_15_04_05"
-
-//日志目录
-var LogPath = "./jylog"
-
-func init() {
-	os.Mkdir(LogPath, os.ModePerm)
-	//默认保留15天内的日志，-1为永久保留
-	initLog(15)
-}
-
-func initLog(saveDay int) {
-	go logfile()
-	task := cron.New()
-	task.Start()
-	task.AddFunc("0 0 0 * * ?", func() {
-		go logfile()
-		time.Sleep(50 * time.Second)
-		if saveDay > 0 {
-			filepath.Walk(LogPath, func(path string, info os.FileInfo, err error) error {
-				str := fileReg.FindStringSubmatch(info.Name())
-				if len(str) == 2 {
-					t, er := time.ParseInLocation(FMT, str[1], time.Local)
-					if er == nil {
-						if (time.Now().Unix()-t.Unix())/86400 > int64(saveDay) {
-							log.Println("delete log file:", path, os.Remove(path))
-						}
-					}
-				}
-				return nil
-			})
-		}
-	})
-}
-
-//创建并切换输出文件
-func logfile() {
-	now := time.Now().Format(FMT)
-	file, _ := os.Create(LogPath + "/" + now + ".log")
-	log.SetOutput(file)
-	xweb.RootApp().Logger.SetOutput(file)
-	go func(file *os.File) {
-		time.Sleep(5 * time.Second)
-		if LogFile != nil {
-			LogFile.Close()
-		}
-		LogFile = file
-	}(file)
-}

src/jfw/modules/weixin/src/main.go

@@ -8,6 +8,7 @@ import (
 	"net/rpc"
 	"oauth"
 	"qfw/util/endless"
+	_ "qfw/util/jylog" //日志文件
 	_ "tools"
 	"wx"
 )

src/jfw/modules/weixin/src/tools/wxlog.go

@@ -1,73 +0,0 @@
-package tools
-
-/**
-日志文件自动切换，默认保留15天内日志
-**/
-
-import (
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"time"
-
-	"github.com/go-xweb/xweb"
-	"github.com/robfig/cron"
-)
-
-//日志格式
-var fileReg = regexp.MustCompile("^(\\d{4}_[0-9_]{14})\\.log$")
-
-//当前日志文件句柄
-var LogFile *os.File
-
-//时间格式
-var FMT = "2006_01_02_15_04_05"
-
-//日志目录
-var LogPath = "./wxlog"
-
-func init() {
-	os.Mkdir(LogPath, os.ModePerm)
-	//默认保留15天内的日志，-1为永久保留
-	initLog(15)
-}
-
-func initLog(saveDay int) {
-	go logfile()
-	task := cron.New()
-	task.Start()
-	task.AddFunc("0 0 0 * * ?", func() {
-		go logfile()
-		time.Sleep(50 * time.Second)
-		if saveDay > 0 {
-			filepath.Walk(LogPath, func(path string, info os.FileInfo, err error) error {
-				str := fileReg.FindStringSubmatch(info.Name())
-				if len(str) == 2 {
-					t, er := time.ParseInLocation(FMT, str[1], time.Local)
-					if er == nil {
-						if (time.Now().Unix()-t.Unix())/86400 > int64(saveDay) {
-							log.Println("delete log file:", path, os.Remove(path))
-						}
-					}
-				}
-				return nil
-			})
-		}
-	})
-}
-
-//创建并切换输出文件
-func logfile() {
-	now := time.Now().Format(FMT)
-	file, _ := os.Create(LogPath + "/" + now + ".log")
-	log.SetOutput(file)
-	xweb.RootApp().Logger.SetOutput(file)
-	go func(file *os.File) {
-		time.Sleep(5 * time.Second)
-		if LogFile != nil {
-			LogFile.Close()
-		}
-		LogFile = file
-	}(file)
-}

src/main.go

@@ -3,7 +3,7 @@ package main
 import (
 	_ "jfw/active"
 	. "jfw/config"
-
+	_ "qfw/util/jylog" //日志文件
 	// _ "jfw/course"  线下课程 dev3.5.2 21年2.24 下线
 	_ "jfw/filter"
 	"jfw/front"

src/web/staticres/big-member/css/pc_buy_commit.css

@@ -196,8 +196,17 @@ input[type="radio"] {
 .list_all .sever_list {
   display: flex;
   align-items: center;
-  min-width: 235px;
+  min-width: 190px;
   margin: 6px 0;
+  font-size: 13px;
+  color: #1D1D1D;
+}
+.list_all .sever_list .serve_sub_text {
+  font-size: 12px;
+  color: #999;
+}
+.list_all .sever_list .text_gold {
+  color: #D69E55;
 }
 
 .page--big--buycommit .w-box .w1200 .p-main .meal_content .active {

src/web/staticres/css/subscribe_new.css

@@ -1249,6 +1249,6 @@
 .sticky-header {
   position: fixed;
   top: 63px;
-  z-index: 999;
+  z-index: 99;
   width: 100%;
 }

src/web/templates/big-member/pc/page_buy_commit.html

@@ -235,15 +235,15 @@
                       </li>
                       <li class="sever_list">
                         <span class="j-icon icon-root"></span>
-                        <span class="serve_text">项目进度监控（100个）</span>
+                        <span class="serve_text">项目进度监控<span class="serve_sub_text">(100个)</span></span>
                       </li>
                       <li class="sever_list">
                         <span class="j-icon icon-root"></span>
-                        <span class="serve_text">企业情报监控（100个）</span>
+                        <span class="serve_text">企业情报监控<span class="serve_sub_text">(100个)</span></span>
                       </li>
                       <li class="sever_list">
                         <span class="j-icon icon-root"></span>
-                        <span class="serve_text">在线数据导出（每日100条）</span>
+                        <span class="serve_text">在线数据导出<span class="serve_sub_text">(每日100条)</span></span>
                       </li>
                       <li class="sever_list">
                         <span class="j-icon icon-root"></span>
@@ -270,15 +270,15 @@
                       </li>
                       <li class="sever_list">
                         <span class="j-icon icon-root"></span>
-                        <span class="serve_text">项目进度监控（500个）</span>
+                        <span class="serve_text">项目进度监控<span class="serve_sub_text">(500个)</span></span>
                       </li>
                       <li class="sever_list">
                         <span class="j-icon icon-root"></span>
-                        <span class="serve_text">企业情报监控（500个）</span>
+                        <span class="serve_text">企业情报监控<span class="serve_sub_text">(500个)</span></span>
                       </li>
                       <li class="sever_list">
                         <span class="j-icon icon-root"></span>
-                        <span class="serve_text">在线数据导出（每日200条）</span>
+                        <span class="serve_text">在线数据导出<span class="serve_sub_text">(每日200条)</span></span>
                       </li>
                       <li class="sever_list">
                         <span class="j-icon icon-root"></span>
@@ -1077,7 +1077,7 @@
       })
       // 条款
       $('.agren_link').on('click', function () {
-        location.href = '/front/staticPage/serviceterms.html'
+        window.open('/front/staticPage/serviceterms.html')
       })
       windowScrollFn()
     })

src/web/templates/structuredata/pc/index.html

@@ -66,6 +66,23 @@
             background-image: url('{{Msg "seo" "cdn"}}/structuredata/pc/image/new-section-9-title.png');
             background-position: center;
         }
+        .section-5 .cookie{
+        top: 2960px;
+        left: 96px;
+        width: 120px;
+        position: absolute;
+        }
+        .section-3 .xuxian{
+        height: 10px;
+        width: 830px;
+        border-bottom: 1px dashed #F9E4C2;
+        position: relative;
+        top: 99px;
+        left: 186px;
+        }
+        .section-3 .cenji{
+            z-index: 1;
+        }
     </style>
 </head>
 <body class="indexpage">
@@ -109,30 +126,31 @@
     <div class="s-section section-3">
         <div class="section-content s-bg center">
             <div class="section-title-bg s-bg center"></div>
+            <div class="xuxian"></div>
             <div class="section-item-list">
                 <div class="section-item-card">
-                    <div class="section-3-pic">
+                    <div class="section-3-pic cenji">
                         <img src='{{Msg "seo" "cdn"}}/structuredata/pc/image/new-icon-4-1.png?v=1' alt="" style="width: 100%;">
                     </div>
                     <div>1.用户需求</div>
                     <div style="margin-bottom: 21px;">用户向剑鱼标讯提出数据需求</div>
                 </div>
                 <div class="section-item-card">
-                    <div class="section-3-pic">
+                    <div class="section-3-pic cenji">
                         <img src='{{Msg "seo" "cdn"}}/structuredata/pc/image/new-icon-4-2.png?v=1' alt="" style="width: 100%;">
                     </div>
                     <div>2.数据规则确认</div>
                     <div>剑鱼标讯数据服务工程师与用户<br>沟通需求，建立用户数据规则</div>
                 </div>
                 <div class="section-item-card">
-                    <div class="section-3-pic">
+                    <div class="section-3-pic cenji">
                         <img src='{{Msg "seo" "cdn"}}/structuredata/pc/image/new-icon-4-3.png?v=1' alt="" style="width: 100%;">
                     </div>
                     <div>3.样例数据输出</div>
                     <div>依据数据规则输出样例数据，<br>由用户进行样例数据的确认</div>
                 </div>
                 <div class="section-item-card">
-                    <div class="section-3-pic">
+                    <div class="section-3-pic cenji">
                         <img src='{{Msg "seo" "cdn"}}/structuredata/pc/image/new-icon-4-4.png?v=1' alt="" style="width: 100%;">
                     </div>
                     <div>4.数据交付</div>
@@ -165,8 +183,11 @@
         </div>
     </div>
     <div class="s-section section-5 s-bg">
+        <div class="cookie">
+            <img src='{{Msg "seo" "cdn"}}/structuredata/pc/image/cookie-circle.png?v=1' alt="" style="width: 100%;">
+        </div>
         <div class="section-content s-bg center">
-            <div class="section-title-bg s-bg center"></div>
+            <div class="section-title-bg s-bg center "></div>
             <div class="section-item-list">
                 <div class="section-item-card s-bg example-senior">
                     <div>