diff --git a/config/index.js b/config/index.js index 32ddead..4d7ff2e 100644 --- a/config/index.js +++ b/config/index.js @@ -12,7 +12,7 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api': { - // target: 'http://admin.jiangtang360.com/admin', + // target: 'https://admins.jiangtang360.com/admin', target: 'http://sz-test.shengzhevictor.com', //设置调用接口域名和端口号别忘了加http///请求的第三方接口 changeOrigin: true,///在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题 pathRewrite: { diff --git a/src/components/Homes.vue b/src/components/Homes.vue index 5a18acd..0cfc05d 100644 --- a/src/components/Homes.vue +++ b/src/components/Homes.vue @@ -1,6 +1,6 @@ diff --git a/src/components/common/CommonTop.vue b/src/components/common/CommonTop.vue index cadce68..898d007 100644 --- a/src/components/common/CommonTop.vue +++ b/src/components/common/CommonTop.vue @@ -32,7 +32,7 @@ data-vidtype="1" style="position: relative; z-index: 1; height: 35em; width: 31em" scrolling="no" - src="http://img.jiangtang360.com/1666599415204.mp4" + src="https://imgs.jiangtang360.com/1666599415204.mp4" allowfullscreen="1" frameborder="0" > diff --git a/src/components/signin/QRCode.vue b/src/components/signin/QRCode.vue index 0679db2..2f490b5 100644 --- a/src/components/signin/QRCode.vue +++ b/src/components/signin/QRCode.vue @@ -30,7 +30,7 @@ export default { }, methods: { createQRCode(num) { - axios.get("http://admin.jiangtang360.com/api/Card/getTime").then( + axios.get("https://admins.jiangtang360.com/api/Card/getTime").then( (res) => { if (num === 1) { var redirect_uri = encodeURIComponent(this.redirect_uri)+res.data; diff --git a/src/components/signin/SignIn.vue b/src/components/signin/SignIn.vue index f4dc6f4..05eb9a7 100644 --- a/src/components/signin/SignIn.vue +++ b/src/components/signin/SignIn.vue @@ -77,7 +77,7 @@ export default { var params = new URLSearchParams(query); //扫描二维码传入的时间 var paramValue = params.get("nowTime"); - axios.get("http://admin.jiangtang360.com/api/Card/getTime").then( + axios.get("https://admins.jiangtang360.com/api/Card/getTime").then( (res) => { if ( Number(paramValue) + 1000 * 60 * 5 > res.data && @@ -99,7 +99,7 @@ export default { getOpenid(code) { let formData = new FormData(); formData.append("code", code); - axios.post("http://admin.jiangtang360.com/api/Signin/getOpenId", formData).then( + axios.post("https://admins.jiangtang360.com/api/Signin/getOpenId", formData).then( (res) => { if (res.data.code == 200) { this.openid = res.data.data; @@ -120,7 +120,7 @@ export default { let formData = new FormData(); formData.append("openid", openid); axios - .post("http://admin.jiangtang360.com/api/Signin/isTodaySignedIn", formData) + .post("https://admins.jiangtang360.com/api/Signin/isTodaySignedIn", formData) .then( (res) => { if (res.status == 200) { @@ -141,7 +141,7 @@ export default { formData.append("openid", this.openid); axios .post( - "http://admin.jiangtang360.com/api/Signin/getLastSubmissionByOpenid", + "https://admins.jiangtang360.com/api/Signin/getLastSubmissionByOpenid", formData ) .then( @@ -169,7 +169,7 @@ export default { formData.append("openid", this.openid); axios .post( - "http://admin.jiangtang360.com/api/Signin/saveUserCheckinInfo", + "https://admins.jiangtang360.com/api/Signin/saveUserCheckinInfo", formData ) .then( diff --git a/src/components/study/course.vue b/src/components/study/course.vue index 692bc2c..bc00ce4 100644 --- a/src/components/study/course.vue +++ b/src/components/study/course.vue @@ -2,12 +2,7 @@
-
+

{{ item.name }}

@@ -41,7 +36,7 @@ export default { course: [], }; }, - created() {}, + created() { }, mounted() { this.getPageData(); }, @@ -54,11 +49,17 @@ export default { (data) => { if (data.code == 1) { this.course = data.data; + for (let index = 0; index < this.course.length; index++) { + this.course[index].thumbnail = this.course[index].thumbnail.replace( + "http://img", + "https://imgs" + ); + } } else { Toast(data.msg); } }, - (err) => {} + (err) => { } ); }, }, @@ -70,45 +71,53 @@ export default { padding: 5.5rem 0; width: 90%; margin: auto; + .kecheng_biaoti { height: 3rem; display: flex; justify-content: space-between; align-items: center; } + .kecheng_biaotiL { font-size: 1.56rem; font-family: MicrosoftYaHei; font-weight: bold; } + .kecheng_biaotiR { font-size: 1.25rem; font-family: MicrosoftYaHei; font-weight: 400; color: #c5c5c5; + .fr { width: 1rem; height: 1rem; } } + .kechenginfo { padding: 2rem 0; display: flex; justify-content: space-between; align-items: center; border-bottom: 1px solid #cccccc; - > img { + + >img { width: 11rem; height: 15rem; object-fit: cover; } } + .kechenginfoR { width: 56%; height: 15rem; text-align: left; position: relative; } + .kechenginfoR_bt { display: block; width: 100%; @@ -119,6 +128,7 @@ export default { overflow: hidden; text-overflow: ellipsis; } + .kechenginfoR_xbt { display: block; width: 100%; @@ -131,10 +141,12 @@ export default { text-overflow: ellipsis; height: 7rem; } + .kechenginfoR_end { font-size: 1rem; color: #0083ff; } + .kechenginfoR_bot { height: 4rem; display: flex; @@ -144,6 +156,7 @@ export default { bottom: 0; width: 100%; } + .kechenginfoR_botL { color: #cccccc; font-size: 1.25rem; @@ -151,11 +164,13 @@ export default { justify-content: flex-start; align-items: center; } + .yanjing { width: 1.5rem; height: 1.5rem; margin-right: 0.5rem; } + .kechenginfoR_botR { width: 8rem; height: 3rem; diff --git a/src/components/study/courseAll.vue b/src/components/study/courseAll.vue index bf109bd..6f18334 100644 --- a/src/components/study/courseAll.vue +++ b/src/components/study/courseAll.vue @@ -1,158 +1,174 @@ diff --git a/src/components/study/courseDetail.vue b/src/components/study/courseDetail.vue index 3e082b0..f90569d 100644 --- a/src/components/study/courseDetail.vue +++ b/src/components/study/courseDetail.vue @@ -270,7 +270,21 @@ export default { (data) => { if (data.code == 1) { this.courseData = data.data; + this.courseData.thumbnail = this.courseData.thumbnail.replace( + "http://img", + "https://imgs" + ); this.section = data.data.section; + for (let index = 0; index < this.section.length; index++) { + this.section[index].thumbnail = this.section[index].thumbnail.replace( + "http://img", + "https://imgs" + ); + this.section[index].video_url = this.section[index].video_url.replace( + "http://img", + "https://imgs" + ); + } this.changeSection(data.data.recent_section); } else { Toast(data.msg); diff --git a/src/components/user/photoPreview.vue b/src/components/user/photoPreview.vue index 5327ba3..e69f123 100644 --- a/src/components/user/photoPreview.vue +++ b/src/components/user/photoPreview.vue @@ -23,7 +23,7 @@ export default { mounted() { this.cardphotopath = - "http://admin.jiangtang360.com/static/admin/cards/" + + "https://admins.jiangtang360.com/static/admin/cards/" + this.$refs.getValue.value + ".jpg" + "?ran=" + diff --git a/src/components/user/uploadphoto.vue b/src/components/user/uploadphoto.vue index 35d1fdd..2a702c3 100644 --- a/src/components/user/uploadphoto.vue +++ b/src/components/user/uploadphoto.vue @@ -151,7 +151,7 @@ export default { axios .post( // "/uploadcardimage",formData - "http://admin.jiangtang360.com/api/card/uploadcardimage", + "https://admins.jiangtang360.com/api/card/uploadcardimage", formData, config // Qs.stringify(formData) @@ -188,13 +188,13 @@ export default { mounted() { this.photopath = - "http://admin.jiangtang360.com/static/admin/cards/" + + "https://admins.jiangtang360.com/static/admin/cards/" + this.$refs.getValue.value + ".jpg" + "?ran=" + Math.random(); this.ImgObj.src = - "http://admin.jiangtang360.com/static/admin/cards/" + + "https://admins.jiangtang360.com/static/admin/cards/" + this.$refs.getValue.value + ".jpg" + "?ran=" + diff --git a/src/router/index.js b/src/router/index.js index 0652551..ecef6f6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -121,6 +121,11 @@ export default new Router({ name:'wxerror', component: resolve => require(['../components/login/wxError.vue'], resolve) }, + { + path:'/liveview', + name:'liveview', + component: resolve => require(['../components/study/liveView.vue'], resolve) + }, // 用户 { path:'/user', diff --git a/src/vuex/store.js b/src/vuex/store.js index cae94f6..4ae04d9 100644 --- a/src/vuex/store.js +++ b/src/vuex/store.js @@ -13,6 +13,7 @@ const state={ const mutations={ addInfo(state,loginInfo){ state.loginInfo = loginInfo; + state.loginInfo.header = state.loginInfo.header.replace('http://img','https://imgs'); } }