Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_8.2

# Conflicts:
#	controllers/report.go

controllers/activity.go

@@ -345,7 +345,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 		}
 		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
 			list[k].ActivityTypeName = "买方研选电话会"
-			list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
+			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}
 		if v.ActivityType == 0 {
 			if mapAddress[v.City] != "" {
@@ -564,7 +564,8 @@ func (this *ActivityCoAntroller) ScheduleList() {
 		}
 		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
 			list[k].ActivityTypeName = "买方研选电话会"
-			list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
+			//list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
+			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}
 		if v.ActivityType == 0 {
 			if mapAddress[v.City] != "" {
@@ -2615,7 +2616,8 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		}
 		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
 			list[k].ActivityTypeName = "买方研选电话会"
-			list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
+			//list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
+			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}
 		if v.ActivityType == 0 {
 			if mapAddress[v.City] != "" {

controllers/report.go

@@ -1217,10 +1217,10 @@ func (this *ReportController) IsShow() {
 		return
 	}
 	resp.IsShowChart = true
-	resp.IsShowResearch = true
+	//resp.IsShowResearch = true
 	resp.LinkWxExplain = utils.LINK_WX_EXPLAIN
 	resp.ActivitySpecialExplain = utils.ACTIVITY_SPECIAL_EXPLAIN
-	resp.YanXuan_Explain = true
+	//resp.YanXuan_Explain = true
 	resp.IsShowFreeButton = IsShowFreeButton
 	mobile := user.Mobile
 	if mobile == "" {

services/sms.go

@@ -11,7 +11,7 @@ import (
 
 func SendSmsCode(mobile, vcode string) bool {
 	flag := false
-	tplId := "65692"
+	tplId := "250078"
 	result, err := sendSms(mobile, tplId, vcode)
 	if err != nil {
 		fmt.Println("发送短信失败")
@@ -96,7 +96,7 @@ func sendSmsGj(mobile, code, areaNum string) (rs []byte, err error) {
 	param := url.Values{}
 	//配置请求参数,方法内部已处理urlencode问题,中文参数可以直接传参
 	param.Set("mobile", mobile)           //接受短信的用户手机号码
-	param.Set("tplId", "10054")           //您申请的短信模板ID，根据实际情况修改
+	param.Set("tplId", "12335")           //您申请的短信模板ID，根据实际情况修改
 	param.Set("tplValue", "#code#="+code) //您设置的模板变量，根据实际情况
 	param.Set("key", utils.JhGjAppKey)    //应用APPKEY(应用详细页查询)
 	param.Set("areaNum", areaNum)         //应用APPKEY(应用详细页查询)

utils/constants.go

@@ -38,8 +38,8 @@ const (
 
 //聚合短信
 var (
-	JhGnTplId = "65692" //聚合国内模板编码
-	JhGjTplId = "10054" //聚合国内模板编码
+	JhGnTplId = "250078" //聚合国内模板编码
+	JhGjTplId = "10054"  //聚合国内模板编码
 
 	JhGnAppKey = "4c8504c49dd335e99cfd7b6a3a9e2415" //聚合国内AppKey
 	JhGjAppKey = "3326ad2c1047a4cd92ace153e6044ca3"
@@ -124,6 +124,7 @@ const (
 
 const (
 	YI_YAO_QI_TA = "https://hzstatic.hzinsights.com/static/temp/20220922202209/20220922/2OQMBFplQE1R3bX1y3obX7JSwSuA.png"
+	YAN_XUAN_IMG = "https://hzstatic.hzinsights.com/static/temp/20221027202210/20221027/Dd8TrsMh8tNx2tGd5VeaQDyJVQfV.png"
 )
 
 const (