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/me.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"jfw/config"
 	"jfw/public"
+	"log"
 	qutil "qfw/util"
 	"qfw/util/jy"
 	"qfw/util/redis"
@@ -323,9 +324,9 @@ func (l *Me) MyInfo() {
 		"userType": "free",
 	}
 	userId, _ := l.GetSession("userId").(string)
-	fmt.Println("1223312",userId)
+	fmt.Println("1223312", userId)
 	user, ok := mongodb.FindById("user", userId, `{"s_phone":1,"s_m_phone":1,"o_jy":1,"i_vip_status":1,"l_vip_endtime":1,"o_vipjy":1,"i_vip_subtips":1,"i_entniche_first":1}`)
-	fmt.Println("1223312",(*user)["s_phone"].(string),(*user)["s_m_phone"].(string))
+	fmt.Println("1223312", (*user)["s_phone"].(string), (*user)["s_m_phone"].(string))
 	if ok && user != nil {
 		isExpire := -1
 		isPassCount := false
@@ -361,7 +362,7 @@ func (l *Me) MyInfo() {
 				hasKeyFlag = len(a_key) > 0
 			}
 		}
-		fmt.Println("1223312",(*user)["s_phone"].(string),(*user)["s_m_phone"].(string))
+		fmt.Println("1223312", (*user)["s_phone"].(string), (*user)["s_m_phone"].(string))
 		//商机管理处理
 		phone := ""
 		if s_phone, _ := (*user)["s_phone"].(string); s_phone != "" {
@@ -372,11 +373,11 @@ func (l *Me) MyInfo() {
 		isEnt := false
 		if phone != "" {
 			//已购买企业未过期
-			log.Println("SELECT status FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1",phone)
+			log.Println("SELECT status FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1", phone)
 			if entInfo := public.Mysql.SelectBySql(`SELECT status,isNew FROM entniche_info WHERE id  IN (SELECT ent_id FROM entniche_user where phone = ? and power =1)`, phone); len((*entInfo)) > 0 {
-				for _, v := range (*entInfo) {
+				for _, v := range *entInfo {
 					//&& qutil.IntAll(v["isNew"]
-					if qutil.IntAll(v["status"]) == 1  {
+					if qutil.IntAll(v["status"]) == 1 {
 						isEnt = true
 						break
 					}

src/web/templates/pc/subscribe_new.html

@@ -224,8 +224,8 @@
                 <div class="content">打通企业库、项目库、招标库多源数据，构建企业多维度分析，获取企业历史项目、数量、规模，深入挖掘合作客户及关系等；</div>
                 <div class="title"><div class="font">采购单位全景分析</div></div>
                 <div class="content">提供采购单位的历史采购周期、规模等深入分析甲方采购需求、供应商关系，帮助企业拓展客户；</div>
-                <div class="title"><div class="font">周报/月报/定制化市场分析报告</div></div>
-                <div class="content">订阅招标项目信息提供周报/月报/定制化市场分析报告多维分析，帮助销售管理者快速做出预判与决策。</div>
+                <div class="title"><div class="font">周报/月报</div></div>
+                <div class="content">订阅招标项目信息提供周报/月报多维分析，帮助销售管理者快速做出预判与决策。</div>
             </div>
             <div class="content-right">
                 <img src="{{Msg "seo" "cdn"}}/images/subscribe/scenario_3.png?v={{Msg "seo" "version"}}" alt="" style="width: 630px;height: 432px">
@@ -295,7 +295,7 @@
                     <li class="double"><div>推送设置</div><div>固定时间/实时推送</div></li>
                     <li class="gray double"><div>标讯高级搜索</div><div>按联系方式、附件、项目名称/标的物、发布时间搜索</div></li>
                     <li class="double"><div>企业搜索</div><div>按中标项目/标的物、联系方式等搜索企业信息</div></li>
-                    <li class="gray">周报/月报/定制化市场分析报告</li>
+                    <li class="gray">周报/月报</li>
                     <li class=" double"><div>标讯收藏</div><div>关注项目一键收藏，重要信息不遗漏</div></li>
                     <li class="gray">专属资源社群对接</li>
                 </ul>