Skip to content

W
wmypcWeb
Commit 19425265 by liangkaiping
Options

Merge branch 'dev' into 'master' 

save

See merge request liangkaiping/wmypcweb!1
parents d4f03acb 253b85c1
Showing with 46 additions and 33 deletions
src/locales/newWord.json
......@@ -86,7 +86,7 @@
"mylabiliry103": "评分说明",
"ViewMore": "查看项目",
"pictureBestSize03": "支持",
"PoweredByCompanyName": "上海易知信息科技股份有限公司提供技术支持",
"PoweredByCompanyName": "上海复深蓝软件股份有限公司提供技术支持",
"pictureBestSize04": "大小",
"ApplyNotice": "报名须知",
"pictureBestSize02": "比例为",
......
src/locales/zh-CN.json
......@@ -26,7 +26,7 @@
"PleaseInputSmsCode": "请输入验证码",
"confirm.pwd.not.correct": "两次输入的密码不一致",
"8-20CharactersIncludingNumbersAndLetters": "8-20个字符,由字母、数字和符号组合",
"PoweredByShanghaiYizhiTechnologyCo.,Ltd.": "上海易知信息科技股份有限公司提供技术支持",
"PoweredByShanghaiYizhiTechnologyCo.,Ltd.": "上海复深蓝软件股份有限公司提供技术支持",
"Home": "首页",
"Course": "课程",
"MyStudy": "我的学习",
......@@ -392,7 +392,7 @@
"WrongCaptchaCode": "校验码输入不正确",
"WorngSmsCode": "验证码输入不正确",
"TwoInputPasswordsMustBeConsistent": "两次输入的密码不一致",
"PoweredByCompanyName": "版权所有 ©上海易知信息科技股份有限公司",
"PoweredByCompanyName": "版权所有 ©上海复深蓝软件股份有限公司",
"ToSearch1": "搜索",
"ToSearch2": ">>",
"Photo": "头像",
......
src/utils/api.js
......@@ -3,13 +3,13 @@ if (location.host.indexOf("localhost") != -1) {
//
// baseUrl = "http://dev.pc.kmelearning.com";
baseUrl = "https://test.pc.kmelearning.com";
// baseUrl = "https://test.pc.kmelearning.com";
baseUrl = "http://wx.fairyclass.cn";
// baseUrl = "https://uat.pc.kmelearning.com";
// baseUrl = "https://pc.kmelearning.com";
// baseUrl = "https://sasspc.kmelearning.com";
}else {
} else {
//这里不许改，谁改谁请30杯奶茶，并且罚款500
baseUrl = "";
}
......@@ -17,9 +17,8 @@ if (location.host.indexOf("localhost") != -1) {
// baseUrl += "/"+ urlConfigObj.urlPrefix;
// } // baseUrl = "https://pc.kmelearning.com";
const api = {
ranking: baseUrl+ "/web-student",
ranking: baseUrl + "/web-student",
indexUrl: baseUrl + "/web-student",
albumUrl: baseUrl + "/web-student",
tranningList: baseUrl + "/web-student/api/trainingProject/page/list",
......@@ -29,8 +28,9 @@ const api = {
login: baseUrl + "/system/api/loginApp",
living: baseUrl + "/web-student/api/live/pc/pageList",
livStatuGet: baseUrl + "/web-student/api/live/show/config/status/get",
liveBackList: baseUrl + "/web-student/api/live/review/list",//直播回放列表
liveReviewSwitch: baseUrl + "/web-student/api/live/review/switch/on/live/list",
liveBackList: baseUrl + "/web-student/api/live/review/list", //直播回放列表
liveReviewSwitch:
baseUrl + "/web-student/api/live/review/switch/on/live/list",
message: baseUrl + "/web-student",
messageList: baseUrl + "/newMessage",
menu: baseUrl + "/web-student/api/system/pc/my/item",
......@@ -43,7 +43,7 @@ const api = {
mycollection: baseUrl + "/web-student/",
myCollectionDelete: baseUrl + "/web-student/api/pc/favoritepc/delete",
ossUrl: baseUrl + "/aliyun", //oss上传服务域名
logoImage: baseUrl + '/system',
logoImage: baseUrl + "/system",
systemUrl: baseUrl + "/system",
search: baseUrl + "/esearch",
searchCommit: baseUrl + "/web-student",
......@@ -51,9 +51,9 @@ const api = {
exam: baseUrl + "/web-student",
homework: baseUrl + "/web-student",
loginUrl: baseUrl + "/system/api",
loginImg: baseUrl + '/web-student/api',
caseUrl:baseUrl +"/web-student",
forum:baseUrl + '/web-student',
loginImg: baseUrl + "/web-student/api",
caseUrl: baseUrl + "/web-student",
forum: baseUrl + "/web-student",
my: {
baseUrl: baseUrl,
login: baseUrl + "/system/api/loginApp",
......@@ -64,48 +64,61 @@ const api = {
info: baseUrl + "/system/api/account/get",
accountSave: baseUrl + "/system/api/account/pc/updateInfo",
myCourse: baseUrl + "/web-student/pc/my",
myCourseUrl:baseUrl+"/web-student",
myCourseUrl: baseUrl + "/web-student",
myTraining: baseUrl + "/web-student/pc/my",
myIntegral: baseUrl + "/web-student",
myDuration: baseUrl + "/web-student",
myCertificate: baseUrl + "/web-student",
myCase: baseUrl + "/web-student",
getCaptcha: baseUrl + "/system/api/public/getCaptcha",
myTaskNum: baseUrl + '/web-student/calendar/api/pc/getPageNum',
myTaskList: baseUrl + '/web-student/calendar/api/pc/getPage',
myCalendarTaskNum: baseUrl + '/web-student/calendar/api/calendarTaskNum',
myTaskNum: baseUrl + "/web-student/calendar/api/pc/getPageNum",
myTaskList: baseUrl + "/web-student/calendar/api/pc/getPage",
myCalendarTaskNum: baseUrl + "/web-student/calendar/api/calendarTaskNum",
},
news: {
list: baseUrl + "/web-student/api/info/page/pcList",
info: baseUrl + "/web-student/api/info/page/pcView",
},
TrainingItem: baseUrl + "/web-student/pc/trainingProject/pc/one/detail/progress/view",
TrainingItem:
baseUrl + "/web-student/pc/trainingProject/pc/one/detail/progress/view",
trainEnjoin: baseUrl + "/web-student/api/enroll/pc/insert",
trainingComment: baseUrl + "/web-student/api/tpComment/pc/list",
trainingResource: baseUrl + "/web-student/student/document/query/ByRelationId",
trainingResource:
baseUrl + "/web-student/student/document/query/ByRelationId",
trainingStutas: baseUrl + "/web-student/student/document/canStudy",
trainingResourceUrl: baseUrl + "/web-student/student/document/download",
checkActivitiew: baseUrl + "/web-student/pc/trainingProject/pc/click/activity",
commitReplay: baseUrl + "/web-student/api/tpCommentReply/pc/reply/Children/save",
checkActivitiew:
baseUrl + "/web-student/pc/trainingProject/pc/click/activity",
commitReplay:
baseUrl + "/web-student/api/tpCommentReply/pc/reply/Children/save",
commitComment: baseUrl + "/web-student/api/tpComment/pc/save",
commentreplaytoreply: baseUrl + "/web-student/api/tpCommentReply/pc/reply/Children/save",
commentreplaytoreply:
baseUrl + "/web-student/api/tpCommentReply/pc/reply/Children/save",
loadchildren: `${baseUrl}/web-student/api/tpCommentReply/pc/list`,
addLike: `${baseUrl}/web-student/api/tpCommentThumbsUp/pc/save`,
addMethod: baseUrl + "/web-student/api/tpCommentThumbsUp/pc/save",
deleteLike: `${baseUrl}/web-student/api/tpCommentThumbsUp/pc/delete`,
downLineDetail: `${baseUrl}/web-student/pc/trainingProject/offlineCourse/get`,
siteFooter: baseUrl + "/web-student/api/portal/pc/pageFooterItem/get",
getgrant:baseUrl+"/web-student/pc/trainingProject/pc/certificate/grant",
getbanner:baseUrl+"/web-student/api/banner/home/image/list",
addNum:baseUrl+"/web-student/pc/trainingProject/pc/tpPlanActivity/view/record/add",
databaseActivity:baseUrl+"/web-student/student/document/getDetailById",//项目内容活动-资料
languageTypes: baseUrl+"/system/api/internationalizationWord/public/languageType/getList",
getlanguageClass: baseUrl+"/web-student/public/api/siteLanguage/page",//获取语言类
languageChaneg: baseUrl+"/web-student/public/api/siteLanguage/language/get",//语言JSON
selectLanguageSave: baseUrl+"/web-student/student/siteLanguage/record/international/selectLanguage/save",//用户登录后修改语言
selectLanguageGet: baseUrl+"/web-student/student/siteLanguage/record/international/selectLanguage/get",//回显语言类型
getgrant: baseUrl + "/web-student/pc/trainingProject/pc/certificate/grant",
getbanner: baseUrl + "/web-student/api/banner/home/image/list",
addNum:
baseUrl +
"/web-student/pc/trainingProject/pc/tpPlanActivity/view/record/add",
databaseActivity: baseUrl + "/web-student/student/document/getDetailById", //项目内容活动-资料
languageTypes:
baseUrl +
"/system/api/internationalizationWord/public/languageType/getList",
getlanguageClass: baseUrl + "/web-student/public/api/siteLanguage/page", //获取语言类
languageChaneg: baseUrl + "/web-student/public/api/siteLanguage/language/get", //语言JSON
selectLanguageSave:
baseUrl +
"/web-student/student/siteLanguage/record/international/selectLanguage/save", //用户登录后修改语言
selectLanguageGet:
baseUrl +
"/web-student/student/siteLanguage/record/international/selectLanguage/get", //回显语言类型
canVisit: baseUrl + "/web-student/student/site/student/canVisit",
exchange: baseUrl + "/mall",//积分兑换商城
exchange: baseUrl + "/mall", //积分兑换商城
};
export default api;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment