Merge branch 'master' into feature/v4.8.12

src/jfw/filter/pcfilter.go

@@ -62,7 +62,8 @@ func (this *pcFilter) Do() bool {
 			} else {
 				//与redis中的session不一致 本账号退出登录
 				redis.Del("session", sessid)
-				http.SetCookie(this.W, this.cookie("", "userid_secure"))
+				//http.SetCookie(this.W, this.cookie("", "userid_secure"))
+				jyutil.ClearCookie(this.W, fmt.Sprintf("%s,%s", jyutil.SKCookieName, jyutil.KeepLoginCookieName))
 			}
 		}
 	} else {

src/jfw/front/front.go

@@ -9,7 +9,6 @@ import (
 	"jy/src/jfw/wx"
 	"log"
 	"math/rand"
-	"net/http"
 	"net/url"
 	"regexp"
 	"strconv"
@@ -74,18 +73,20 @@ type Front struct {
 	pcAjaxReq          xweb.Mapper `xweb:"/front/pcAjaxReq"`
 	myFeedbacks        xweb.Mapper `xweb:"/swordfish/myFeedbacks"`
 	wxerr              xweb.Mapper `xweb:"/mob/err"`
-	getRecomKWs        xweb.Mapper `xweb:"/member/getRecomKWs"`          //获取推荐关键词
-	behaviorRecord     xweb.Mapper `xweb:"/member/behaviorRecord"`       //记录用户点击的关键词
-	tSGuide            xweb.Mapper `xweb:"/front/tenderSubscribe/guide"` //引导页
-	transfer           xweb.Mapper `xweb:"/front/transfer"`              //原文链接中转
-
-	jyCms             xweb.Mapper `xweb:"/jyCms/(.*)/index([^.]*).html"` //剑鱼栏目列表页
-	encrypt           xweb.Mapper `xweb:"/share/encrypt"`                //分享三级页加密
-	newhistorypush    xweb.Mapper `xweb:"/swordfish/newhistorypush"`     //新的历时推送记录
-	historypush       xweb.Mapper `xweb:"/swordfish/historypush"`        //历时推送记录
-	historypushPaging xweb.Mapper `xweb:"/swordfish/historypush/paging"` //历时推送记录--分页
-	aboutus           xweb.Mapper `xweb:"/front/aboutus.html"`           //关于我们
-	busicooperation   xweb.Mapper `xweb:"/front/busicooperation.html"`   //商务合作
+	getRecomKWs        xweb.Mapper `xweb:"/member/getRecomKWs"`           //获取推荐关键词
+	behaviorRecord     xweb.Mapper `xweb:"/member/behaviorRecord"`        //记录用户点击的关键词
+	tSGuide            xweb.Mapper `xweb:"/front/tenderSubscribe/guide"`  //引导页
+	transfer           xweb.Mapper `xweb:"/front/transfer"`               //原文链接中转
+	jyblog             xweb.Mapper `xweb:"/jyblog/index([^.]*).html"`     //剑鱼标讯博客
+	jybdetail          xweb.Mapper `xweb:"/jyblog/([^.]*).html"`          //剑鱼标讯博客三级页
+	blogpraise         xweb.Mapper `xweb:"/jyblog/blogpraise"`            //剑鱼标讯博客三级页点赞
+	jyCms              xweb.Mapper `xweb:"/jyCms/(.*)/index([^.]*).html"` //剑鱼栏目列表页
+	encrypt            xweb.Mapper `xweb:"/share/encrypt"`                //分享三级页加密
+	newhistorypush     xweb.Mapper `xweb:"/swordfish/newhistorypush"`     //新的历时推送记录
+	historypush        xweb.Mapper `xweb:"/swordfish/historypush"`        //历时推送记录
+	historypushPaging  xweb.Mapper `xweb:"/swordfish/historypush/paging"` //历时推送记录--分页
+	aboutus            xweb.Mapper `xweb:"/front/aboutus.html"`           //关于我们
+	busicooperation    xweb.Mapper `xweb:"/front/busicooperation.html"`   //商务合作
 
 	/********************wxkeyset:v1.8**************************/
 	wxKeysetAjaxReq xweb.Mapper `xweb:"/wxkeyset/ajaxReq"`           //订阅词ajax请求
@@ -164,24 +165,25 @@ func init() {
 	urlMap = config.Sysconfig["redirect"].(map[string]interface{})
 }
 
-// 前端页面加载
+//前端页面加载
 func (this *Front) ReloadTo(href string) {
 	this.T["transfer"] = fmt.Sprintf("%s/%s", config.Sysconfig["webdomain"].(string), href)
 	this.Render("/pc/reloadTo.html", &this.T)
 }
 
-// 获取打赏标语
+//获取打赏标语
 func (this *Front) RewardText() {
 	rewardText, _ := getRewardText()
 	this.Write(rewardText)
 	return
 }
 
+//
 func (f *Front) Hp() error {
 	return f.Redirect("/")
 }
 
-// 二维码图片
+//二维码图片
 func (f *Front) Qr() error {
 	w := f.ResponseWriter
 	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
@@ -194,7 +196,7 @@ func (f *Front) Qr() error {
 	return err
 }
 
-// 二维码图片
+//二维码图片
 func (f *Front) Hpshare() error {
 	w := f.ResponseWriter
 	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
@@ -235,6 +237,7 @@ func (p *Front) PayIndex() error {
 	return p.Render("/weixin/pay.html", &p.T)
 }
 
+//
 func (f *Front) RecInof() error {
 	var msg = ""
 	var flag = true
@@ -357,7 +360,7 @@ func (f *Front) RecInof() error {
 	return nil
 }
 
-// 更新取到的权重最低的字段到bidding表
+//更新取到的权重最低的字段到bidding表
 func updateLastWrongField(id, result string) {
 	if result == "" {
 		return
@@ -369,7 +372,7 @@ func updateLastWrongField(id, result string) {
 	})
 }
 
-// 轮询查登录状态
+//轮询查登录状态
 func (f *Front) AjaxPolling() {
 	reqType, _ := f.GetInteger("reqType")
 	if reqType == 1 {
@@ -416,7 +419,7 @@ func (f *Front) AjaxPolling() {
 	}
 }
 
-// 广告服务
+//广告服务
 func (f *Front) Advservices() error {
 	var shareid = f.GetString("id")
 	if len(shareid) == 0 {
@@ -427,12 +430,12 @@ func (f *Front) Advservices() error {
 	return f.Render("/pc/advservices.html", &f.T)
 }
 
-// 移动端专题推广
+//移动端专题推广
 func (f *Front) Mobtopics() error {
 	return f.Render("/active/mobtopics.html")
 }
 
-// 移动端专题推广
+//移动端专题推广
 func (f *Front) Extension(page string) error {
 	//今日头条和百度推广用的同一个页面，如以后有变动，需拆分成两个。
 	if page != "tengxun" {
@@ -441,7 +444,7 @@ func (f *Front) Extension(page string) error {
 	return f.Render("/active/ext-" + page + ".html")
 }
 
-// SEM推广
+//SEM推广
 func (f *Front) Topics() error {
 	f.T["logid"] = config.Seoconfig["jySEMtgy"].(string)
 	userId, _ := f.GetSession("userId").(string)
@@ -482,6 +485,7 @@ func (f *Front) Topics() error {
 	return f.Render("/pc/landingpage.html", &f.T)
 }
 
+//
 func (f *Front) Notin() error {
 	refer := "/"
 	tmp := f.Header("Referer")
@@ -503,6 +507,7 @@ func (f *Front) Notin() error {
 	return f.Render("/pc/notin.html", &f.T)
 }
 
+//
 func (f *Front) Followinfo() error {
 	var pid = f.GetString("pid")
 	var kid = f.GetString("kid")
@@ -587,6 +592,7 @@ func (f *Front) Followinfo() error {
 	return nil
 }
 
+//
 func (f *Front) Login(key string) error {
 	shareid := se.DecodeString(key)
 	openid := redis.GetStr("sso", "p_usershare_"+shareid)
@@ -609,7 +615,7 @@ func (f *Front) Login(key string) error {
 	return nil
 }
 
-// 用户是否登录
+//用户是否登录
 func (f *Front) HasSign() error {
 	sessVal := f.Session().GetMultiple()
 	if userId, _ := sessVal["mgoUserId"].(string); userId != "" {
@@ -662,31 +668,11 @@ func (f *Front) SignOut() error {
 		config.Middleground.PowerCheckCenter.DelCheckRedis("10000", positionId)
 	}
 	f.Session().Clear()
-	f.ClearCookie(fmt.Sprintf("%s,%s", jyutil.SKCookieName, jyutil.KeepLoginCookieName))
+	jyutil.ClearCookie(f.ResponseWriter, fmt.Sprintf("%s,%s", jyutil.SKCookieName, jyutil.KeepLoginCookieName))
 	f.ServeJson("ok")
 	return nil
 }
 
-// ClearCookie 清楚前端cookie 缓存
-func (f *Front) ClearCookie(name string) {
-	if name == "" {
-		name = jyutil.SKCookieName
-	}
-	for _, nk := range strings.Split(name, ",") {
-		if nk != "" {
-			http.SetCookie(f.ResponseWriter, &http.Cookie{
-				Name:     nk,
-				Value:    "",
-				Path:     "/",
-				HttpOnly: false,
-				MaxAge:   -1,
-				Expires:  time.Now().Add(-1),
-				Domain:   httpsession.Domain,
-			})
-		}
-	}
-}
-
 // GetLoginNum 微信公众号获取数字
 func (f *Front) GetLoginNum(prestr string) error {
 	var oid = f.GetString("oid")
@@ -704,7 +690,7 @@ func (f *Front) GetLoginNum(prestr string) error {
 	return nil
 }
 
-// 一键报告
+//一键报告
 func (m *Front) Onekey() error {
 	defer util.Catch()
 	fkid := encrypt.DecodeArticleId2ByCheck(m.GetString("fkid"))[0]
@@ -770,6 +756,7 @@ func (m *Front) Onekey() error {
 	return nil
 }
 
+//
 func (m *Front) Encrypt() error {
 	defer util.Catch()
 	id := m.GetString("id")
@@ -792,11 +779,12 @@ func (m *Front) Encrypt() error {
 	return nil
 }
 
+//
 func (m *Front) Wxerr() error {
 	return m.Render("/_err.html")
 }
 
-// 查找用户并创建session
+//查找用户并创建session
 func FindUserAndCreateSess(openid string, sess *httpsession.Session, typ string, flag, isSwitchToBestIdentity bool) (bool, *map[string]interface{}, map[string]interface{}) {
 	return CreateSession(map[string]interface{}{
 		"s_m_openid": openid,
@@ -860,7 +848,7 @@ func CreateSession(q map[string]interface{}, sess *httpsession.Session, typ stri
 
 var bindUrl = "/front/account/phone/bind?mode=mergeBind"
 
-// 微信跳转创建session
+//微信跳转创建session
 func (m *Front) Sess(ostr string) error {
 	defer util.Catch()
 	if strings.Contains(ostr, "&") {
@@ -978,7 +966,7 @@ func (m *Front) Sess(ostr string) error {
 	return nil
 }
 
-// 删除模板缓存
+//删除模板缓存
 func (d *Front) Delc(url string) {
 	defer util.Catch()
 	d.App.TemplateMgr.CacheDelete(strings.Replace(url, "GG", "/", 1))
@@ -989,12 +977,12 @@ func (m *Front) Viewdemo() {
 	m.Redirect("/swordfish/guide/-1")
 }
 
-// 剑鱼标讯用户协议
+//剑鱼标讯用户协议
 func (m *Front) Wxprotocol() error {
 	return m.Render("/weixin/wxprotocol.html")
 }
 
-// 推送列表
+//推送列表
 func (m *Front) WxpushListInfo(_id string) error {
 	return m.Redirect("/swordfish/historypush")
 }
@@ -1074,7 +1062,7 @@ func (m *Front) Isrecord(name string) {
 	}
 }
 
-// 招标订阅向导
+//招标订阅向导
 func (f *Front) TSGuide() error {
 	defer util.Catch()
 	userid := util.ObjToString(f.GetSession("userId"))
@@ -1177,12 +1165,12 @@ func isInTSguide(userid string) bool {
 	return false
 }
 
-// 查看原文中转
+//查看原文中转
 func (f *Front) Transfer() error {
 	return f.Redirect(f.GetString("url"))
 }
 
-// 关于我们
+//关于我们
 func (f *Front) Aboutus() error {
 	code := f.GetString("code")
 	if mobileReg.MatchString(f.UserAgent()) {
@@ -1200,7 +1188,7 @@ func (f *Front) Aboutus() error {
 	return f.SetBody(content)
 }
 
-// 商务合作
+//商务合作
 func (f *Front) Busicooperation() error {
 	var shareid = f.GetString("id")
 	if len(shareid) == 0 {
@@ -1230,7 +1218,7 @@ func (f *Front) Gethotkey() error {
 	return nil
 }
 
-// redis存储用户搜索关键词 企业 项目信息
+//redis存储用户搜索关键词 企业 项目信息
 func (f *Front) Rediskw() error {
 	skw := f.GetString("skw")
 	num := f.GetString("num")
@@ -1297,7 +1285,7 @@ func (f *Front) DownloadJyApp() error {
 	return f.Redirect(getDownloadUri(code, source, domain+apkurl))
 }
 
-// 获取app下载地址，不通code对应不通渠道的app包
+//获取app下载地址，不通code对应不通渠道的app包
 func getDownloadUri(code, source, download string) string {
 	jyapp := config.Sysconfig["jyapp"].(map[string]interface{})
 	channelMap := jyapp["channelDir"].(map[string]interface{})
@@ -1389,7 +1377,7 @@ func (f *Front) LimitSearchText() {
 	f.Write("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\">" + fmt.Sprintf(public.Lst.Msg, status, public.Lst.Count, public.Lst.TimeOut, public.Lst.TotalPage))
 }
 
-// 设置js css 版本号，修改以后记得同步更新seo.json中的值
+//设置js css 版本号，修改以后记得同步更新seo.json中的值
 func (f *Front) SetSeoVersion() {
 	//!@111qqq@! md5=51a3b7b4ed3cf140
 	if f.GetString("p") != "51a3b7b4ed3cf140" {
@@ -1517,6 +1505,7 @@ func (f *Front) YmResult() error {
 
 }
 
+//
 func (f *Front) JylabShareTimeline() {
 	userid := util.ObjToString(f.GetSession("userId"))
 	if userid == "" {
@@ -1542,8 +1531,7 @@ func (f *Front) JylabShareTimeline() {
 	}
 }
 
-/*
-*
+/**
 成功分享后 更改分享相关信息
 
 shareType - 分享类型 1-详情页 2-推送列表 3-实验室
@@ -1628,6 +1616,7 @@ func encodeURIComponent(str string) string {
 	return r
 }
 
+//
 func (f *Front) GetAdByCode() {
 	m := map[string]interface{}{}
 	if ad_name := f.GetString("ad_name"); ad_name != "" {

src/jfw/jyutil/classroomiInfo.go

@@ -346,7 +346,7 @@ func GuidelineAndInformation(t, s string, num int) *[]map[string]interface{} {
 
 // SPic 图片链接处理
 func SPic(sPic string) string {
-	if sPic != "" {
+	if sPic != "" && !strings.HasPrefix(sPic, "http") {
 		if strings.HasPrefix(sPic, "/") &&
 			strings.HasSuffix(util.InterfaceToStr(config.Seoconfig["jyadd"]), "/") {
 			sPic = util.InterfaceToStr(config.Seoconfig["jyadd"]) + sPic[1:]

src/jfw/jyutil/jyutil.go

@@ -1,15 +1,13 @@
 package jyutil
 
 import (
+	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
+	"app.yhyue.com/moapp/jypkg/compatible"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"jy/src/jfw/config"
 	"log"
-
-	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
-	"app.yhyue.com/moapp/jypkg/compatible"
-
 	"net"
 	"net/http"
 	"reflect"
@@ -34,11 +32,30 @@ var (
 		Key: "mGlAgnIBB8bx2nch",
 		Iv:  "1389461544135476",
 	}
-	EsDoc               = public.EsDoc
 	KeepLoginTimeKey    = "keeplogin_%s"
 	KeepLoginCookieName = "klcn_value"
 )
 
+// ClearCookie 清楚前端cookie 缓存
+func ClearCookie(w http.ResponseWriter, name string) {
+	if name == "" {
+		name = SKCookieName
+	}
+	for _, nk := range strings.Split(name, ",") {
+		if nk != "" {
+			http.SetCookie(w, &http.Cookie{
+				Name:     nk,
+				Value:    "",
+				Path:     "/",
+				HttpOnly: false,
+				MaxAge:   -1,
+				Expires:  time.Now().Add(-1),
+				Domain:   httpsession.Domain,
+			})
+		}
+	}
+}
+
 // SetCookieValueForAutoLogin 为延长用户登录时间 往cookie 中加入标识，在过滤器判断是否自动登录
 func SetCookieValueForAutoLogin(rw http.ResponseWriter, baseUserId int64) {
 	log.Println("-----111--------;", rw.Header())
@@ -92,7 +109,7 @@ func FindMyShareId(activecode, openid string) string {
 	return shareid
 }
 
-// 获取用户openid
+//获取用户openid
 func Getopenid(code string) (openid string) {
 	defer util.Catch()
 	recturl := fmt.Sprintf(config.Wxoauthinfo, code)
@@ -109,6 +126,7 @@ func Getopenid(code string) (openid string) {
 	return
 }
 
+//
 func GetSessionVal(q map[string]interface{}) (*map[string]interface{}, map[string]interface{}) {
 	person, ok := public.MQFW.FindOneByField("user", q, `{"_id":1,"i_shareknow":1,"s_m_openid":1,"s_nickname":1,"s_headimage":1,"s_headimageurl":1,"s_phone":1,"s_m_phone":1,"l_registedate":1,"i_ispush":1,"i_unlimited":1,"s_jyname":1,"base_user_id":1}`)
 	sessionVal := make(map[string]interface{})
@@ -149,7 +167,7 @@ func GetSessionVal(q map[string]interface{}) (*map[string]interface{}, map[strin
 	return person, sessionVal
 }
 
-// value 用户sessionid
+//value 用户sessionid
 func LoginRedisKey(userid string) string {
 	return fmt.Sprintf("login_%s", userid)
 }
@@ -185,7 +203,7 @@ func (a SortBy) Less(i, j int) bool {
 }
 
 // ture  倒序3, 2, 1
-// fmt.Println(m)
+//fmt.Println(m)
 func SortData(data interface{}, sortkey string, reverse bool) {
 	//func SortData(data interface{}, sortkey string, reverse bool) {
 	var db []map[string]interface{}

src/web/staticres/common-module/consult-dialog/js/index.js

@@ -32,10 +32,10 @@ var consultDialog = new Vue({
                   if (res.data) {
                       let customers = res.data.customers
                       customers.forEach(ele => {
-                          if (ele.remark == '客户经理') {
+                          if (ele.vip == false) {
                               this_.img = ele.wxer
 
-                          } else if (ele.remark == '专属客服') {
+                          } else if (ele.vip == true) {
                               this_.vip_img = ele.wxer
 
                           }

src/web/staticres/css/pc.css

@@ -5040,7 +5040,6 @@ h6 {
   line-height: 24px;
   color: #686868;
   cursor: pointer;
-  margin-bottom: 32px;
 }
 
 .login-dig-top-back-box span {
@@ -5290,7 +5289,7 @@ h6 {
 }
 
 .login-dig-footer-box p.passTip{
-  margin-top: 100px;
+	margin-top: 100px;
 }
 
 .guide-intro-dialog{

src/web/staticres/site/common/css/pc-school-head.css

@@ -676,19 +676,6 @@ white-space: nowrap;
   align-items: center;
   justify-content: space-between;
 }
-.go-register {
-  display: inline-block;
-  color: #2CB7CA;
-  font-size: 14px;
-  line-height: 24px;
-  margin-left: 112px;
-  margin-top: 12px;
-  text-align: center;
-  cursor: pointer;
-}
-.go-register:hover{
-text-decoration: underline;
-}
 #public-nav form{
   display: flex;
   height: 64px;

src/web/staticres/site/page/helpCenter/css/index.css

@@ -223,7 +223,7 @@
 .hot-handel .video-card:nth-child(3n) {
   margin-right: 0;
 }
-.hot-handel .video-card:nth-child(n + 3) {
+.hot-handel .video-card:nth-child(n + 4) {
   margin-top: 20px;
 }
 .hot-handel .video-card-body{

src/web/staticres/site/page/helpCenter/css/summary.css

@@ -202,4 +202,7 @@ summary.active a{
   line-height: 36px;
   color: #1D1D1D;
 }
-details summary::-webkit-details-marker { display:none; }
+details summary::-webkit-details-marker { display:none; }
+strong{
+  font-weight: bold;
+}

src/web/staticres/site/page/industryInfo/css/industry_content.css

@@ -57,8 +57,6 @@
 }
 .industry_info .scroll_main{
   margin-top: 20px;
-  height: 576px;
-  overflow-y: auto;
   overflow-x: hidden;
 }
 .industry_info h2 {

src/web/templates/common/pc-login-dialog.html

@@ -0,0 +1,199 @@
+<!-- 剑鱼pc登录弹窗html接口模板 -->
+<!-- 依赖于pc公共头部样式以及 pc.css、bootstrap.css、bootstrap.js、jquery.js、login.js -->
+<div
+  class="modal fade bidLogin"
+  id="bidLogin"
+  tabindex="-1"
+  role="dialog"
+  aria-labelledby="bidLogin"
+  aria-hidden="true"
+>
+  <div class="modal-dialog login-dig-box is-show" style="max-width: 720px; height: 584px; width: auto; display: flex">
+    <div class="ad_space">
+      <div class="active-tip-group" style="display: none">
+        <img src="" alt="二维码" />
+      </div>
+    </div>
+    <div class="new_login">
+      <div class="login-dig-icon-close" onclick="closeLoginDig()"></div>
+      <img class="logo" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: block" />
+      <div class="bind-phone-head" style="display: none">
+        <h3 class="bind-phone-title">绑定手机号</h3>
+        <p class="bind-phone-tip">为了给您提供更好的服务，请绑定手机号！</p>
+      </div>
+      <div class="login-dig-tabbar-navbar" style="">
+        <span name="code" class="is-active">验证码登录</span>
+        <span name="pass" class="">密码登录</span>
+        <div class="line-box"></div>
+      </div>
+      <!-- <div class="login-dig-tabbar-navbar" data-name="bind-phone" style="display: none;">
+          <span name="phone" class="is-active">手机号绑定</span>
+          <div class="line-box"></div>
+      </div> -->
+      <div class="login-dig-tabbar-content login-module-card sms-login is-active" data-name="code" style="">
+        <div class="login-dig-input-box" data-error="手机号码输入错误">
+          <i class="login-dig-icon-phone"></i>
+          <input autocomplete="off" name="verify_phone" type="tel" placeholder="输入手机号码" maxlength="11" />
+        </div>
+        <div class="login-dig-input-box" data-error="图形验证码输入错误">
+          <i class="login-dig-icon-guard"></i>
+          <input autocomplete="off" name="verify_code" type="text" placeholder="输入图形验证码" maxlength="4" />
+          <div class="after-input-box">
+            <img data-name="verfiy-login" class="verify-img" src="/front/landpage/captcha" alt="verify" />
+          </div>
+        </div>
+        <div class="login-dig-input-box" data-error="短信验证码输入错误">
+          <i class="login-dig-icon-guard"></i>
+          <input
+            autocomplete="off"
+            name="verify_sms"
+            class="enter-action-login"
+            type="text"
+            placeholder="输入短信验证码"
+            maxlength="6"
+          />
+          <div class="after-input-box">
+            <span data-name="verify_get_sms" class="l-get-sms is-stop">获取验证码</span>
+          </div>
+        </div>
+        <button class="login-dig-submit-button" name="verify_submit" disabled="true">登录</button>
+        <div class="footer-action-container">
+          <div class="auto-login-container no-selected">
+            <div class="auto-login-checkbox"></div>
+            <label for="autoLogin">下次自动登录</label>
+            <div class="icon-tip-container">
+              <div class="icon-tip"></div>
+              <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
+            </div>
+          </div>
+          <!-- <a class="go-register" href="/phone/register" >立即注册</a> -->
+          <div class="go-register" onclick="openLoginDigForReg(true)">立即注册</div>
+        </div>
+      </div>
+      <div class="login-dig-tabbar-content login-module-card password-login" data-name="pass">
+        <div class="login-dig-input-box" data-error="手机号码输入错误">
+          <i class="login-dig-icon-phone"></i>
+          <input
+            autocomplete="off"
+            class="enter-action-login"
+            name="pass_phone"
+            type="tel"
+            placeholder="输入手机号码"
+            maxlength="11"
+          />
+        </div>
+        <div class="login-dig-input-box" data-error="密码输入错误">
+          <i class="login-dig-icon-pass"></i>
+          <input
+            autocomplete="off"
+            class="enter-action-login"
+            name="pass_pass"
+            type="password"
+            placeholder="输入密码"
+          />
+        </div>
+        <button class="login-dig-submit-button" name="pass_submit" disabled="true">登录</button>
+        <div class="footer-action-container f-box right-box">
+          <div class="auto-login-container no-selected">
+            <div class="auto-login-checkbox"></div>
+            <label for="autoLogin">下次自动登录</label>
+            <div class="icon-tip-container">
+              <div class="icon-tip"></div>
+              <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
+            </div>
+          </div>
+          <div class="login-right-actions">
+            <div class="forget-pass-link" onclick="openLoginDigForReg(true)">立即注册</div>
+            <span class="login-splitter"></span>
+            <a class="forget-pass-link" href="/phone/forgetPwd">忘记密码？</a>
+            <!-- <a class="forget-pass-link" style="color: #2ABED1!important;" href="/phone/register">立即注册</a> -->
+          </div>
+        </div>
+      </div>
+      <div class="login-dig-wx-qrcode-box login-module-card wx-qr-login" style="display: none">
+        <div class="wx-tip">
+          <div class="wx-logo"><i class="login-dig-icon-wx"></i></div>
+          <span>微信扫码登录</span>
+        </div>
+        <!-- <img class="wx-qrcode" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: block;"> -->
+        <img class="wx-qrcode" id="layerImg-login" src="/front/share/10" />
+        <div class="footer-action-container">
+          <div class="auto-login-container no-selected">
+            <div class="auto-login-checkbox"></div>
+            <label for="autoLogin">下次自动登录</label>
+            <div class="icon-tip-container">
+              <div class="icon-tip"></div>
+              <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
+            </div>
+          </div>
+        </div>
+        <div class="login-dig-top-back-box" style="display: none" onclick="openLoginDigForWx(false)">
+          <i class="login-dig-icon-blue-back"></i>
+          <span>验证码/密码登录</span>
+        </div>
+      </div>
+      <div class="login-dig-reg register-form-box" style="display: none">
+        <div class="login-dig-input-box" data-error="手机号码输入错误">
+          <i class="login-dig-icon-phone"></i>
+          <input autocomplete="off" name="register_phone" type="tel" placeholder="输入手机号码" maxlength="11" />
+        </div>
+        <div class="login-dig-input-box" data-error="图形验证码输入错误">
+          <i class="login-dig-icon-guard"></i>
+          <input autocomplete="off" name="register_code" type="text" placeholder="输入图形验证码" maxlength="4" />
+          <div class="after-input-box">
+            <img data-name="verfiy-login" class="verify-img" src="/front/landpage/captcha" alt="verify" />
+          </div>
+        </div>
+        <div class="login-dig-input-box" data-error="短信验证码输入错误">
+          <i class="login-dig-icon-guard"></i>
+          <input autocomplete="off" name="register_sms" type="text" placeholder="输入短信验证码" maxlength="6" />
+          <div class="after-input-box">
+            <span data-name="register_get_sms" class="l-get-sms is-stop">获取验证码</span>
+          </div>
+        </div>
+        <div class="login-dig-input-box" data-error="公司名称最少4个字">
+          <i class="login-dig-icon-ent"></i>
+          <input maxlength="30" autocomplete="off" name="verify_entname" type="text" placeholder="输入公司名称" />
+          <div class="autocomplete-box">
+            <ul>
+              <li>xxxxxx</li>
+            </ul>
+          </div>
+        </div>
+        <div class="login-dig-input-box" data-error="邮箱输入错误">
+          <i class="login-dig-icon-email"></i>
+          <input autocomplete="off" class="register_email" type="text" placeholder="输入电子邮箱" />
+        </div>
+        <!-- <div class="login-dig-input-box" data-error="邮箱输入错误">
+          <i class="login-dig-icon-email"></i>
+          <input autocomplete="off" name="register_email" type="text" placeholder="输入电子邮箱">
+        </div> -->
+        <div class="ad_small_space">
+          <img src="{{Msg "seo" "cdn"}}/images/pc/register_email.png?v={{Msg "seo" "version"}}" alt="">
+        </div>
+        <button class="login-dig-submit-button reg-dig-submit-button" name="register_submit_phone" disabled="true">
+          立即注册
+        </button>
+        <!-- <button class="reg-dig-submit-button" name="verify_register" disabled="true">立即注册</button> -->
+        <div class="back-login" onclick="backLogin(false)">
+          <i class="login-dig-icon-blue-back"></i>
+          <span>登录</span>
+        </div>
+      </div>
+      <!-- <div class="login-dig-footer-box" data-name="bind-phone" name="tip-bind-phone" style="display: none;">
+          <p>为了确保您账号的安全性与唯一性，在您购买剑鱼标讯任意功能前，请先绑定手机号，以便后期维护。</p>
+      </div> -->
+      <div class="login-dig-footer-box">
+        <div class="login-dig-text-split" style=""><i></i><span>使用微信扫码登录</span><i></i></div>
+        <div class="wx-logo-box" onclick="openLoginDigForWx(true)" style="">
+          <div class="wx-logo"><i class="login-dig-icon-wx"></i></div>
+        </div>
+        <p>
+          未注册用户验证后自动注册，注册即代表同意
+          <a href="/front/staticPage/permission_rules.html">《剑鱼标讯用户使用许可协议》</a>
+          <a href="/front/staticPage/privacy_rules.html">《剑鱼标讯隐私政策》</a>
+        </p>
+      </div>
+    </div>
+  </div>
+</div>

src/web/templates/common/pchead.html

@@ -90,177 +90,9 @@
     </div>
 </section>
 
-<div class="modal fade bidLogin" id="bidLogin" tabindex="-1" role="dialog" aria-labelledby="bidLogin"
-  aria-hidden="true">
-  <div class="modal-dialog login-dig-box is-show" style="max-width:720px;height:584px;width: auto;display: flex;">
-    <div class="ad_space">
-      <div class="active-tip-group" style="display: none;">
-        <img src="" alt="二维码">
-      </div>
-    </div>
-    <div class="new_login">
-      <div class="login-dig-icon-close" onclick="closeLoginDig()"></div>
-      <img class="logo" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: block;">
-      <div class="bind-phone-head" style="display: none;">
-          <h3 class="bind-phone-title">绑定手机号</h3>
-          <p class="bind-phone-tip">为了给您提供更好的服务，请绑定手机号！</p>
-      </div>
-      <div class="login-dig-tabbar-navbar" style="">
-          <span name="code" class="is-active">验证码登录</span>
-          <span name="pass" class="">密码登录</span>
-          <div class="line-box"></div>
-      </div>
-      <!-- <div class="login-dig-tabbar-navbar" data-name="bind-phone" style="display: none;">
-          <span name="phone" class="is-active">手机号绑定</span>
-          <div class="line-box"></div>
-      </div> -->
-      <div class="login-dig-tabbar-content login-module-card sms-login is-active" data-name="code" style="">
-          <div class="login-dig-input-box" data-error="手机号码输入错误">
-              <i class="login-dig-icon-phone"></i>
-              <input autocomplete="off" name="verify_phone" type="tel" placeholder="输入手机号码" maxlength="11">
-          </div>
-          <div class="login-dig-input-box" data-error="图形验证码输入错误">
-              <i class="login-dig-icon-guard"></i>
-              <input autocomplete="off" name="verify_code" type="text" placeholder="输入图形验证码" maxlength="4">
-              <div class="after-input-box">
-                  <img data-name="verfiy-login" class="verify-img" src="/front/landpage/captcha" alt="verify">
-              </div>
-          </div>
-          <div class="login-dig-input-box" data-error="短信验证码输入错误">
-              <i class="login-dig-icon-guard"></i>
-              <input autocomplete="off" name="verify_sms" class="enter-action-login" type="text" placeholder="输入短信验证码" maxlength="6">
-              <div class="after-input-box">
-                  <span data-name="verify_get_sms" class="l-get-sms is-stop">获取验证码</span>
-              </div>
-          </div>
-          <button class="login-dig-submit-button" name="verify_submit" disabled="true">登录</button>
-          <div class="footer-action-container">
-            <div class="auto-login-container no-selected">
-              <div class="auto-login-checkbox"></div>
-              <label for="autoLogin">下次自动登录</label>
-              <div class="icon-tip-container">
-                <div class="icon-tip"></div>
-                <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
-              </div>
-            </div>
-            <!-- <a class="go-register" href="/phone/register" >立即注册</a> -->
-            <div class="go-register" onclick="openLoginDigForReg(true)" >立即注册</div>
-          </div>
-      </div>
-      <div class="login-dig-tabbar-content login-module-card password-login" data-name="pass">
-          <div class="login-dig-input-box" data-error="手机号码输入错误">
-              <i class="login-dig-icon-phone"></i>
-              <input autocomplete="off" class="enter-action-login" name="pass_phone" type="tel" placeholder="输入手机号码" maxlength="11">
-          </div>
-          <div class="login-dig-input-box" data-error="密码输入错误">
-              <i class="login-dig-icon-pass"></i>
-              <input autocomplete="off" class="enter-action-login" name="pass_pass" type="password" placeholder="输入密码">
-          </div>
-          <button class="login-dig-submit-button" name="pass_submit" disabled="true">登录</button>
-          <div class="footer-action-container f-box right-box">
-            <div class="auto-login-container no-selected">
-              <div class="auto-login-checkbox"></div>
-              <label for="autoLogin">下次自动登录</label>
-              <div class="icon-tip-container">
-                <div class="icon-tip"></div>
-                <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
-              </div>
-            </div>
-            <div class="login-right-actions">
-              <div class="forget-pass-link" onclick="openLoginDigForReg(true)">立即注册</div>
-              <span class="login-splitter"></span>
-              <a class="forget-pass-link" href="/phone/forgetPwd">忘记密码？</a>
-              <!-- <a class="forget-pass-link" style="color: #2ABED1!important;" href="/phone/register">立即注册</a> -->
-            </div>
-          </div>
-      </div>
-      <div class="login-dig-wx-qrcode-box login-module-card wx-qr-login" style="display: none;">
-        <div class="wx-tip">
-          <div class="wx-logo"><i class="login-dig-icon-wx"></i></div>
-          <span>微信扫码登录</span>
-        </div>
-        <!-- <img class="wx-qrcode" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: block;"> -->
-        <img class="wx-qrcode" id="layerImg-login" src="/front/share/10" />
-        <div class="footer-action-container">
-          <div class="auto-login-container no-selected">
-            <div class="auto-login-checkbox"></div>
-            <label for="autoLogin">下次自动登录</label>
-            <div class="icon-tip-container">
-              <div class="icon-tip"></div>
-              <div class="j-tooltip" style="display: none">为了确保你的信息安全，不建议在公共设备上勾选此项。</div>
-            </div>
-          </div>
-        </div>
-        <div class="login-dig-top-back-box" style="display: none;" onclick="openLoginDigForWx(false)">
-          <i class="login-dig-icon-blue-back"></i>
-          <span>验证码/密码登录</span>
-        </div>
-      </div>
-      <div class="login-dig-reg register-form-box" style="display: none;">
-        <div class="login-dig-input-box" data-error="手机号码输入错误">
-          <i class="login-dig-icon-phone"></i>
-          <input autocomplete="off" name="register_phone" type="tel" placeholder="输入手机号码" maxlength="11">
-        </div>
-        <div class="login-dig-input-box" data-error="图形验证码输入错误">
-            <i class="login-dig-icon-guard"></i>
-            <input autocomplete="off" name="register_code" type="text" placeholder="输入图形验证码" maxlength="4">
-            <div class="after-input-box">
-                <img data-name="verfiy-login" class="verify-img" src="/front/landpage/captcha" alt="verify">
-            </div>
-        </div>
-        <div class="login-dig-input-box" data-error="短信验证码输入错误">
-            <i class="login-dig-icon-guard"></i>
-            <input autocomplete="off" name="register_sms" type="text" placeholder="输入短信验证码" maxlength="6">
-            <div class="after-input-box">
-                <span data-name="register_get_sms" class="l-get-sms is-stop">获取验证码</span>
-            </div>
-        </div>
-        <div class="login-dig-input-box" data-error="公司名称最少4个字">
-          <i class="login-dig-icon-ent"></i>
-          <input maxlength="30" autocomplete="off" name="verify_entname" type="text" placeholder="输入公司名称">
-          <div class="autocomplete-box">
-            <ul>
-              <li>xxxxxx</li>
-            </ul>
-          </div>
-        </div>
-        <div class="login-dig-input-box" data-error="邮箱输入错误">
-          <i class="login-dig-icon-email"></i>
-          <input autocomplete="off" class="register_email" type="text" placeholder="输入电子邮箱">
-        </div>
-        <!-- <div class="login-dig-input-box" data-error="邮箱输入错误">
-          <i class="login-dig-icon-email"></i>
-          <input autocomplete="off" name="register_email" type="text" placeholder="输入电子邮箱">
-        </div> -->
-        <div class="ad_small_space">
-          <img src="{{Msg "seo" "cdn"}}/images/pc/register_email.png?v={{Msg "seo" "version"}}" alt="">
-        </div>
-        <button class="login-dig-submit-button reg-dig-submit-button" name="register_submit_phone" disabled="true">立即注册</button>
-        <!-- <button class="reg-dig-submit-button" name="verify_register" disabled="true">立即注册</button> -->
-        <div class="back-login" onclick="backLogin(false)">
-          <i class="login-dig-icon-blue-back"></i>
-          <span>登录</span>
-        </div>
-    </div>
-      <!-- <div class="login-dig-footer-box" data-name="bind-phone" name="tip-bind-phone" style="display: none;">
-          <p>为了确保您账号的安全性与唯一性，在您购买剑鱼标讯任意功能前，请先绑定手机号，以便后期维护。</p>
-      </div> -->
-      <div class="login-dig-footer-box">
-          <div class="login-dig-text-split" style="">
-              <i></i><span>使用微信扫码登录</span><i></i>
-          </div>
-          <div class="wx-logo-box" onclick="openLoginDigForWx(true)" style="">
-              <div class="wx-logo"><i class="login-dig-icon-wx"></i></div>
-          </div>
-          <p>
-              未注册用户验证后自动注册，注册即代表同意
-              <a href="/front/staticPage/permission_rules.html">《剑鱼标讯用户使用许可协议》</a>
-              <a href="/front/staticPage/privacy_rules.html">《剑鱼标讯隐私政策》</a>
-          </p>
-      </div>
-    </div>
-  </div>
-</div>
+<!-- pc登录弹窗html结构 -->
+{{include "/common/pc-login-dialog.html"}}
+
 <script src='{{Msg "seo" "cdn"}}/js/dateFunc.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/message.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/public-pc/js/header-nav.js?v={{Msg "seo" "version"}}'></script>

src/web/templates/pc/jyblogdetail.html

@@ -187,7 +187,7 @@ $(function(){
 	//
 	$(".jyb_ddetail img").each(function(){
 		var imgsrc = $(this).attr("src");
-		if(imgsrc.indexOf("://") < 0){
+		if(!(imgsrc.indexOf("http") ===0 || imgsrc.indexOf("data:image/png;base64,")===0)){
 			$(this).attr("src",{{Msg "seo" "jyadd"}}+imgsrc)
 		}
 	})

src/web/templates/site/common/pc-school-head.html

@@ -65,133 +65,9 @@
   </div>
 </section>
 
-<div class="modal fade bidLogin" id="bidLogin" tabindex="-1" role="dialog" aria-labelledby="bidLogin"
-  aria-hidden="true">
-  <div class="modal-dialog login-dig-box is-show" style="max-width:720px;height:584px;width: auto;display: flex;">
-    <div class="ad_space">
-      <div class="active-tip-group" style="display: none;">
-        <img src="" alt="二维码">
-      </div>
-    </div>
-    <div class="new_login">
-      <div class="login-dig-icon-close" onclick="closeLoginDig()"></div>
-      <img class="logo" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: block;">
-      <div class="bind-phone-head" style="display: none;">
-        <h3 class="bind-phone-title">绑定手机号</h3>
-        <p class="bind-phone-tip">为了给您提供更好的服务，请绑定手机号！</p>
-      </div>
-      <div class="login-dig-tabbar-navbar" style="">
-        <span name="code" class="is-active">验证码登录</span>
-        <span name="pass" class="">密码登录</span>
-        <div class="line-box"></div>
-      </div>
-      <div class="login-dig-tabbar-content is-active" data-name="code" style="">
-        <div class="login-dig-input-box" data-error="手机号码输入错误">
-          <i class="login-dig-icon-phone"></i>
-          <input autocomplete="off" name="verify_phone" type="tel" placeholder="输入手机号码" maxlength="11">
-        </div>
-        <div class="login-dig-input-box" data-error="图形验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="verify_code" type="text" placeholder="输入图形验证码" maxlength="4">
-          <div class="after-input-box">
-            <img data-name="verfiy-login" class="verify-img" src="/front/landpage/captcha" alt="verify">
-          </div>
-        </div>
-        <div class="login-dig-input-box" data-error="短信验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="verify_sms" type="text" placeholder="输入短信验证码" maxlength="6">
-          <div class="after-input-box">
-            <span data-name="verify_get_sms" class="l-get-sms is-stop">获取验证码</span>
-          </div>
-        </div>
-        <button class="login-dig-submit-button" name="verify_submit" disabled="true">登录</button>
-        <div class="go-register" onclick="openLoginDigForReg(true)">立即注册</div>
-      </div>
-      <div class="login-dig-tabbar-content" data-name="pass">
-        <div class="login-dig-input-box" data-error="手机号码输入错误">
-          <i class="login-dig-icon-phone"></i>
-          <input autocomplete="off" name="pass_phone" type="tel" placeholder="输入手机号码" maxlength="11">
-        </div>
-        <div class="login-dig-input-box" data-error="密码输入错误">
-          <i class="login-dig-icon-pass"></i>
-          <input autocomplete="off" name="pass_pass" type="password" placeholder="输入密码">
-        </div>
-        <button class="login-dig-submit-button" name="pass_submit" disabled="true">登录</button>
-        <div class="f-box right-box">
-          <a class="forget-pass-link" href="/phone/forgetPwd">忘记密码？</a>
-          <div style="color: #2ABED1!important;" class="forget-pass-link" onclick="openLoginDigForReg(true)">立即注册</div>
-        </div>
-      </div>
-      <div class="login-dig-wx-qrcode-box" style="display: none;">
-        <div class="wx-tip">
-          <div class="wx-logo"><i class="login-dig-icon-wx"></i></div>
-          <span>微信扫码登录</span>
-        </div>
-        <!-- <img class="wx-qrcode" src="/images/swordfish/sf_01_new.png" alt="logo" style="display: block;"> -->
-        <img class="wx-qrcode" id="layerImg-login" src="/front/share/10" />
-        <div class="login-dig-top-back-box" style="display: none;" onclick="openLoginDigForWx(false)">
-          <i class="login-dig-icon-blue-back"></i>
-          <span>验证码/密码登录</span>
-        </div>
-      </div>
-      <div class="login-dig-reg register-form-box" style="display: none;">
-        <div class="login-dig-input-box" data-error="手机号码输入错误">
-          <i class="login-dig-icon-phone"></i>
-          <input autocomplete="off" name="register_phone" type="tel" placeholder="输入手机号码" maxlength="11">
-        </div>
-        <div class="login-dig-input-box" data-error="图形验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="register_code" type="text" placeholder="输入图形验证码" maxlength="4">
-          <div class="after-input-box">
-            <img data-name="verfiy-login" class="verify-img" src="/front/landpage/captcha" alt="verify">
-          </div>
-        </div>
-        <div class="login-dig-input-box" data-error="短信验证码输入错误">
-          <i class="login-dig-icon-guard"></i>
-          <input autocomplete="off" name="register_sms" type="text" placeholder="输入短信验证码" maxlength="6">
-          <div class="after-input-box">
-            <span data-name="register_get_sms" class="l-get-sms is-stop">获取验证码</span>
-          </div>
-        </div>
-        <div class="login-dig-input-box" data-error="公司名称最少4个字">
-          <i class="login-dig-icon-ent"></i>
-          <input maxlength="30" autocomplete="off" name="verify_entname" type="text" placeholder="输入公司名称">
-          <div class="autocomplete-box">
-            <ul>
-              <li></li>
-            </ul>
-          </div>
-        </div>
-        <div class="login-dig-input-box" data-error="邮箱输入错误">
-          <i class="login-dig-icon-email"></i>
-          <input autocomplete="off" class="register_email" type="text" placeholder="输入电子邮箱">
-        </div>
-        <div class="ad_small_space">
-          <img src='{{Msg "seo" "cdn"}}/images/pc/register_email.png?v={{Msg "seo" "version"}}' alt="">
-        </div>
-        <button class="login-dig-submit-button reg-dig-submit-button" name="register_submit_phone"
-          disabled="true">立即注册</button>
-        <div class="back-login" onclick="backLogin(false)">
-          <i class="login-dig-icon-blue-back"></i>
-          <span>登录</span>
-        </div>
-      </div>
-      <div class="login-dig-footer-box">
-        <div class="login-dig-text-split" style="">
-          <i></i><span>使用微信扫码登录</span><i></i>
-        </div>
-        <div class="wx-logo-box" onclick="openLoginDigForWx(true)" style="">
-          <div class="wx-logo"><i class="login-dig-icon-wx"></i></div>
-        </div>
-        <p>
-          未注册用户验证后自动注册，注册即代表同意
-          <a href="/front/staticPage/permission_rules.html">《剑鱼标讯用户使用许可协议》</a>
-          <a href="/front/staticPage/privacy_rules.html">《剑鱼标讯隐私政策》</a>
-        </p>
-      </div>
-    </div>
-  </div>
-</div>
+<!-- pc登录弹窗html结构 -->
+{{include "/common/pc-login-dialog.html"}}
+
 <script src='{{Msg "seo" "cdn"}}/js/dateFunc.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/js/message.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/site/common/js/pc-school-head.js?v={{Msg "seo" "version"}}'></script>

src/web/templates/site/page/helpCenter/detail.html

@@ -46,7 +46,7 @@
 
     $(".s-content img").each(function(){
       var imgsrc = $(this).attr("src");
-      if(imgsrc.indexOf("://") < 0){
+      if(!(imgsrc.indexOf("http") ===0 || imgsrc.indexOf("data:image/png;base64,")===0)){
         $(this).attr("src",{{Msg "seo" "jyadd"}}+imgsrc)
       }
     })

src/web/templates/site/page/helpCenter/index.html

@@ -31,7 +31,7 @@
               <div class="card">
                 <div class="card-body">
                   <div class="list-title">
-                    <img src='{{Msg "seo" "cdn"}}/site/page/helpCenter/image/{{$v.Code}}.png?v={{Msg "seo" "version"}}' alt="{{$v.Name}}">
+                    <img src='/site/page/helpCenter/image/{{$v.Code}}.png?v={{Msg "seo" "version"}}' alt="{{$v.Name}}">
                     <h4>{{$v.Name}}</h4>
                   </div>
                   <div class="list-middle">
@@ -131,7 +131,7 @@
       $(".hot-container img.v-thumbnail").each(function(){
         var imgsrc = $(this).attr("src");
         console.log("xx",imgsrc)
-        if(imgsrc.indexOf("://") < 0){
+        if(!(imgsrc.indexOf("http") ===0 || imgsrc.indexOf("data:image/png;base64,")===0)){
           $(this).attr("src",{{Msg "seo" "jyadd"}}+imgsrc)
         }
       })

src/web/templates/site/page/industryInfo/class.html

@@ -40,7 +40,7 @@
     <!--    广告位-->
     {{range $k,$v:=Ad "jy-pc-school-top" -1 .Host}}
     <div class="school-in-header">
-      <img src="{{Msg "seo" "cdn"}}{{$v.S_pic}}" alt="">
+      <img src="{{$v.S_pic}}" alt="">
     </div>
     {{end}}
     <div class="school_tabs">
@@ -111,7 +111,7 @@
                 <div class="module_c_l_left">
                   <img src="{{$v.previewImgId}}" alt="">
                   <!-- 文件类型 -->
-                  <img class="subscript" src='{{Msg "seo" "cdn"}}/site/page/jySchool/image/{{$v.docFileType}}@2x.png?v={{Msg "seo" "version"}}' alt="">
+                  <img class="subscript" src='/site/page/jySchool/image/{{$v.docFileType}}@2x.png?v={{Msg "seo" "version"}}' alt="">
                 </div>
                 <div class="module_c_l_right">
                   <div class="m_c_l_r_title ellipsis-2" onclick="window.location.href='/swordfish/docs/content/{{$v.docId}}'">{{$v.docName}}</div>

src/web/templates/site/page/industryInfo/index.html

@@ -55,7 +55,7 @@
 
         {{range $k,$v:=Ad "jy-pc-school-top" -1 .Host}}
         <div class="school-in-header">
-          <img src="{{Msg "seo" "cdn"}}{{$v.S_pic}}" alt="">
+          <img src="{{$v.S_pic}}" alt="">
         </div>
         {{end}}
 

src/web/templates/site/page/jySchool/class.html

@@ -38,7 +38,7 @@
         </div>
         {{range $k,$v:=Ad "jy-pc-school-top" -1 .Host}}
         <div class="school-in-header">
-          <img src="{{Msg "seo" "cdn"}}{{$v.S_pic}}" alt="">
+          <img src="{{$v.S_pic}}" alt="">
         </div>
         {{end}}
         <div class="school_tabs">

src/web/templates/site/page/jySchool/index.html

@@ -57,7 +57,7 @@
           {{range $k,$v := .T.hotCourse }}
           <div class="course-card" onclick="window.open('/jyxspc/courser-details?id={{$v._id}}')">
             <div class="card-img">
-              <img src='{{Msg "seo" "cdn"}}{{$v.s_picUrl2}}?v={{Msg "seo" "version"}}' alt="">
+              <img src='{{$v.s_picUrl2}}?v={{Msg "seo" "version"}}' alt="">
             </div>
             <div class="card-main">
               <div class="ellipsis-2 c-m-title"  title="{{$v.s_name}}">{{$v.s_name}}</div>
@@ -107,9 +107,9 @@
           {{range $k,$v := .T.newJyDoc }}
           <div class="doc-card" onclick="window.location.href='/swordfish/docs/content/{{$v.docId}}'">
             <div class="doc-img">
-              <img  class="img-bg" src='{{Msg "seo" "cdn"}}{{$v.previewImgId}}?v={{Msg "seo" "version"}}' alt="">
+              <img  class="img-bg" src='{{$v.previewImgId}}?v={{Msg "seo" "version"}}' alt="">
               <!-- 图片类型 doc@2x、excel@2x、pdf@2x、ppt@2x-->
-              <img class="img-type" src='{{Msg "seo" "cdn"}}/site/page/jySchool/image/{{$v.docFileType}}@2x.png?v={{Msg "seo" "version"}}' alt="">
+              <img class="img-type" src='/site/page/jySchool/image/{{$v.docFileType}}@2x.png?v={{Msg "seo" "version"}}' alt="">
             </div>
             <div class="doc-main">
               <div class="doc-title" title="{{$v.docName}}">{{$v.docName}}</div>
@@ -144,7 +144,7 @@
                 <div class="str-body">
                   {{range $m,$n := $v.list}}
                   <div class="s-b-item" onclick="window.location.href='/jySite/{{$n._id}}.html'">
-                    <img class="s-b-item-bg" src='{{Msg "seo" "cdn"}}{{$n.s_pic1}}?v={{Msg "seo" "version"}}' alt="{{$n.s_title}}">
+                    <img class="s-b-item-bg" src='{{$n.s_pic1}}?v={{Msg "seo" "version"}}' alt="{{$n.s_title}}">
                     <div class="s-b-item-bar">
                       <p class="ellipsis-2">{{$n.s_title}}</p>
                     </div>
@@ -170,6 +170,18 @@
     haslogin({{.T.logid}});
     var pageSchool = {
       init: function () {
+        var img = ''
+        if ($('.swiper-slide').hasClass('.swiper-slide-active')) {
+          img = document.getElementsByClassName('swiper-slide-active')[0].children[0];
+        } else {
+          img = document.getElementsByClassName('swiper-slide')[0].children[0];
+        }
+        var theme = $(img).attr('data-theme')
+        if (theme === 'dark') {
+          $('.msg-container').addClass('dark').removeClass('light')
+        } else {
+          $('.msg-container').addClass('light').removeClass('dark')
+        }
         this.lunBoFn()
       },
       lunBoFn: function () {

src/web/templates/site/page/jySchool/search.html

@@ -35,7 +35,7 @@
 
         {{range $k,$v:=Ad "jy-pc-school-top" -1 .Host}}
         <div class="school-in-header">
-          <img src="{{Msg "seo" "cdn"}}{{$v.S_pic}}" alt="">
+          <img src="{{$v.S_pic}}" alt="">
         </div>
         {{end}}
         <div class="school_search">

src/web/templates/site/page/jySchool/strategy.html

@@ -32,7 +32,7 @@
         </div>
         {{range $k,$v:=Ad "jy-pc-school-top" -1 .Host}}
         <div class="school-in-header">
-          <img src="{{Msg "seo" "cdn"}}{{$v.S_pic}}" alt="">
+          <img src="{{$v.S_pic}}" alt="">
         </div>
         {{end}}
         <div class="school-in-content">

src/web/templates/site/page/jyblogdetail.html

@@ -208,7 +208,7 @@
 
     $(".jyb_ddetail img").each(function(){
       var imgsrc = $(this).attr("src");
-      if(imgsrc.indexOf("://") < 0){
+      if(!(imgsrc.indexOf("http") ===0 || imgsrc.indexOf("data:image/png;base64,")===0)){
         $(this).attr("src",{{Msg "seo" "jyadd"}}+imgsrc)
       }
     })