Merge branch 'test' into 'wyz'

修改积分明细api方法，已发生产合并代码

See merge request !119

api/api.ts

 import request from "../util/request";
-import {baseURL,apiURL,cffpURL,sfpUrl,imgUrl,scrmUrl,csfUrl,
+import {baseURL,apiURL,cffpURL,sfpUrl,imgUrl,scrmUrl,csfUrl,env
 } from "../environments/environment";
 
 export default {
@@ -474,16 +474,32 @@ export default {
 	},
 	//薪资信息
 	salaryCondition(params) {
+		
 		// 只有当地址栏是 HTTP 时，才允许用 HTTP 绝对路径
 		    if (location.protocol === 'http:') {
 		        return request(`${csfUrl}/csf/api/salary/condition/list`, 'POST', params);
 		    } else {
-		        // HTTPS 下只能走相对路径（依赖 Nginx 代理转发）
-		        return request(`/csf/api/salary/condition/list`, 'POST', params);
+				if(env=='dev'){
+					// HTTPS 下只能走相对路径（依赖 Nginx 代理转发）
+					return request(`/csf/api/salary/condition/list`, 'POST', params);
+				}else if(env=='prod'){
+					
+					return request(`${csfUrl}/api/csf/api/salary/condition/list`, 'POST', params);
+				}
 		    }
 	},
 	//薪资信息
 	salaryDetail(salaryBizId) {
-		return request(`/csf/api/salary/detail?salaryBizId=${salaryBizId}`,'GET')
+		// return request(`/csf/api/salary/detail?salaryBizId=${salaryBizId}`,'GET')
+		if (location.protocol === 'http:') {
+		    return request(`${csfUrl}/csf/api/salary/detail?salaryBizId=${salaryBizId}`,'GET');
+		} else {
+			if(env=='dev'){
+				// HTTPS 下只能走相对路径（依赖 Nginx 代理转发）
+				return request(`/csf/api/salary/detail?salaryBizId=${salaryBizId}`,'GET');
+			}else if(env=='prod'){
+				return request(`${csfUrl}/api/csf/api/salary/detail?salaryBizId=${salaryBizId}`,'GET');
+			}
+		}
 	},
 }

environments/environment.ts

@@ -31,7 +31,7 @@ const prod = {
 	img_url:'https://app.ydhomeoffice.cn',
 	scrm_url:'https://m.zuihuibi.cn',
 	file_query_url:'https://m.zuihuibi.cn',
-	csf_url:'https://center.supguard.cn',
+	csf_url:'https://web.csf.hk',
 }
 // companyType: '1',  cffp
 // companyType: '2',  appYdhomeoffice