Merge branch 'feature/v3.1.16_ws' of jianyu/salesLeads into feature/v3.1.16

src/config.json

@@ -825,6 +825,7 @@
     "activity_end":1635436800,
     "smsServiceRpc":"192.168.3.149:932",
 	"appNewUserTime": 1667985243,
+	"appNewIntro": "拜托，只有提交以下信息，剑鱼才可以给您精准推送标讯信息和商机情报！",
 	"appNewSales": [
 		{
 			"key": "company",
@@ -867,7 +868,7 @@
 					"title": "服务类",
 					"choose": 2,
 					"type": 1,
-					"condition": ["软件开发","仓储运输","金融服务","法律服务","财务税务","物业管理","培训咨询","广告传媒","餐饮服务","安检服务","人力外包","档案服务","后勤服务"," 信息服务","场地租赁","房屋管理和维修","医疗健康体检","警卫安保服务","印刷出版","安全服务","车辆保险","车辆租赁"]
+					"condition": ["软件开发","仓储运输","金融服务","法律服务","财务税务","物业管理","培训咨询","广告传媒","餐饮服务","安检服务","人力外包","档案服务","后勤服务","信息服务","场地租赁","房屋管理和维修","医疗健康体检","警卫安保服务","印刷出版","安全服务","车辆保险","车辆租赁"]
 				},
 				{
 					"key": "product##engineering",

src/config/config.go

@@ -75,6 +75,7 @@ type config struct {
 	SmsServiceRpc   string
 
 	AppNewUserTime        int64           //APP新用户注册留资时间
+	AppNewIntro           string          //标签介绍
 	AppNewSales           []SalesListData `json:"appNewSales"`
 	BindPopRedis          string
 	MaxBindPop            int

src/service/action/info.go

@@ -648,7 +648,10 @@ func (i *Info) AppIsNewUerSales() {
 			return Result{Error_code: -1, Error_msg: "无用户数据", Data: nil}
 		}
 		if qu.Int64All((*data)["l_registedate"]) >= Sysconfig.AppNewUserTime && qu.IntAll((*data)["app_first_login"]) == 0 {
-			return Result{Data: Sysconfig.AppNewSales}
+			return Result{Data: map[string]interface{}{
+				"list":  Sysconfig.AppNewSales,
+				"intro": Sysconfig.AppNewIntro,
+			}}
 		}
 		return Result{}
 		//return Result{Data: Sysconfig.AppNewSales}