diff --git a/.env.development b/.env.development index 45c63c5..f465bc7 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,2 @@ -VITE_API_URL = "https://m.taigurun.cn" -VITE_OSS_URL = "https://m.taigurun.cn/uploads" \ No newline at end of file +VITE_API_URL = "https://shop.jhxinyu.com" +VITE_OSS_URL = "https://shop.jhxinyu.com/uploads" \ No newline at end of file diff --git a/.env.production b/.env.production index 45c63c5..f465bc7 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,2 @@ -VITE_API_URL = "https://m.taigurun.cn" -VITE_OSS_URL = "https://m.taigurun.cn/uploads" \ No newline at end of file +VITE_API_URL = "https://shop.jhxinyu.com" +VITE_OSS_URL = "https://shop.jhxinyu.com/uploads" \ No newline at end of file diff --git a/README.md b/README.md index e118ec6..0b5f47e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ch-xymy-h5 +# ch-cymy-h5 ### 一、图片命名规范 diff --git a/index.html b/index.html index 1bdb701..1e6ca30 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,7 @@ - 歆羽贸易 + 弛欲贸易 diff --git a/public/img/img-business-school-banner.jpg b/public/img/img-business-school-banner.jpg index ef6f64c..c4c87a7 100644 Binary files a/public/img/img-business-school-banner.jpg and b/public/img/img-business-school-banner.jpg differ diff --git a/public/img/img-invite-bg.jpg b/public/img/img-invite-bg.jpg index 21dbf88..a5add92 100644 Binary files a/public/img/img-invite-bg.jpg and b/public/img/img-invite-bg.jpg differ diff --git a/public/img/img-logo-app.png b/public/img/img-logo-app.png index b9a64bb..eb7e711 100644 Binary files a/public/img/img-logo-app.png and b/public/img/img-logo-app.png differ diff --git a/public/img/img-logo-login.png b/public/img/img-logo-login.png index 2964349..eb7e711 100644 Binary files a/public/img/img-logo-login.png and b/public/img/img-logo-login.png differ diff --git a/src/App.vue b/src/App.vue index 57e02bf..c0d44bb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -90,7 +90,7 @@ export default { const data = res.data || {}; // alert(JSON.stringify(data)) let shareinfo = { - title: title || this.wechatShareInfo.title || '歆羽贸易', + title: title || this.wechatShareInfo.title || '弛欲贸易', desc: desc || this.wechatShareInfo.contents || '汇聚平凡梦想，共创美好未来', imgUrl: imgUrl || this.wechatShareInfo.img || data.img, link: this.$getShareLink(), diff --git a/src/styles/ch.less b/src/styles/ch.less index 88f5a6c..5421897 100644 --- a/src/styles/ch.less +++ b/src/styles/ch.less @@ -15,7 +15,7 @@ .b_l_w; .box; .box-wrap; - padding: 12vw 0 0; + padding: 8vw 0 0; &::before { content: ''; @@ -36,7 +36,7 @@ } .login_page__logo { - margin-bottom: 7.2vw; + margin-bottom: 5.2vw; .box; .box-tb; .box-pack-center; @@ -57,7 +57,7 @@ } img { - height: 31.2vw; + height: 45.2vw; } } diff --git a/src/views/Account/Login.vue b/src/views/Account/Login.vue index cc368c0..965d0a0 100644 --- a/src/views/Account/Login.vue +++ b/src/views/Account/Login.vue @@ -7,7 +7,7 @@ @@ -75,13 +75,15 @@ - + {{ isReg ? '注册' : '登录' }} - + @@ -173,7 +175,7 @@ export default { }, checkWxLogin() { if (!this.$isWechat()) return - const REDIRECT_URI = encodeURIComponent('https://m.taigurun.cn/#/WxCallback') + const REDIRECT_URI = encodeURIComponent('https://shop.jhxinyu.com/#/WxCallback') window.location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxdff8dd2032f1e054&redirect_uri=${REDIRECT_URI}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect` }, validatePhone(phone) { diff --git a/src/views/Platform/BusinessSchool.vue b/src/views/Platform/BusinessSchool.vue index 7a4a413..2ce1780 100644 --- a/src/views/Platform/BusinessSchool.vue +++ b/src/views/Platform/BusinessSchool.vue @@ -73,7 +73,7 @@ export default { }, mounted() { this.getList() - // this.$emit('updateShare', '歆羽贸易商学院', '学习知识，提升能力', '/img/icon-business-school.png'); + // this.$emit('updateShare', '弛欲贸易商学院', '学习知识，提升能力', '/img/icon-business-school.png'); }, methods: { getList() { diff --git a/src/views/Tabbars/Home.vue b/src/views/Tabbars/Home.vue index bd3c6d4..a2b8498 100644 --- a/src/views/Tabbars/Home.vue +++ b/src/views/Tabbars/Home.vue @@ -14,10 +14,10 @@

{{ new Date().getDate() }}

{{ month }}月 - - + +