diff --git a/project.config.json b/project.config.json index 5f59496..2c995fd 100644 --- a/project.config.json +++ b/project.config.json @@ -66,7 +66,7 @@ ], "include": [] }, - "appid": "wx96104303877e3fd9", + "appid": "wxa4ece062e60e93a5", "scripts": { "beforeCompile": "pnpm run beforeCompile", "beforePreview": "pnpm run beforeCompile", diff --git a/src/app.ts b/src/app.ts index d4ff8c6..39c6bba 100644 --- a/src/app.ts +++ b/src/app.ts @@ -17,15 +17,15 @@ App({ globalData: { // dev // appid:wxa4ece062e60e93a5 - // url: 'https://m.wtx.hbraas.com', - // upFileUrl: 'https://m.wtx.hbraas.com/', - // imageUrl: 'https://m.wtx.hbraas.com/GeneB/', + url: 'https://m.wtx.hbraas.com', + upFileUrl: 'https://m.wtx.hbraas.com/', + imageUrl: 'https://m.wtx.hbraas.com/GeneB/', // pro // appid:wx96104303877e3fd9 - url: 'https://m.gene.hbsaas.com', - upFileUrl: 'https://m.gene.hbsaas.com/', - imageUrl: 'https://m.gene.hbsaas.com/GeneB/', + // url: 'https://m.gene.hbsaas.com', + // upFileUrl: 'https://m.gene.hbsaas.com/', + // imageUrl: 'https://m.gene.hbsaas.com/GeneB/', Timestamp: new Date().getTime(), scene: {}, diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss index 2526605..9cc8c20 100644 --- a/src/pages/index/index.scss +++ b/src/pages/index/index.scss @@ -44,6 +44,29 @@ width: 115rpx; height: 60rpx; } + .content { + padding: 20rpx 0; + position: absolute; + left: 260rpx; + top: -4rpx; + width: 8em; + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + line-height: 1.4; + box-sizing: border-box; + .c-title { + font-size: 30rpx; + color: rgba(255, 255, 255, 1); + font-weight: bold; + } + .c-content { + font-size: 36rpx; + color: rgba(255, 255, 255, 1); + font-weight: bold; + } + } } .module1 { margin-top: 54rpx; diff --git a/src/pages/index/index.ts b/src/pages/index/index.ts index 97e4cbc..f1cf729 100644 --- a/src/pages/index/index.ts +++ b/src/pages/index/index.ts @@ -15,6 +15,11 @@ Page({ pageTop: '', background: 'transparent', + + applyWord: { + ApplyButtonWordOne: '', + ApplyButtonWordTwo: '', + }, }, onLoad() { app.waitLogin().then(() => { @@ -31,6 +36,18 @@ Page({ this.getBanner() this.getKnowledgeList() this.getQuestionList() + this.getApplyWord() + }) + }, + getApplyWord() { + wx.ajax({ + method: 'GET', + url: '?r=wtx/common/get-apply-word', + data: {}, + }).then((res) => { + this.setData({ + applyWord: res, + }) }) }, getBanner() { diff --git a/src/pages/index/index.wxml b/src/pages/index/index.wxml index d471113..be20c92 100644 --- a/src/pages/index/index.wxml +++ b/src/pages/index/index.wxml @@ -21,6 +21,10 @@ src="{{imageUrl}}index-apply-end.png?t={{Timestamp}}" > + + {{applyWord.ApplyButtonWordOne}} + {{applyWord.ApplyButtonWordTwo}} + { @@ -16,6 +21,19 @@ Page({ Days: userInfo.Days.replace(/(\d+)/g, '$1'), }) }) + + this.getApplyWord() + }) + }, + getApplyWord() { + wx.ajax({ + method: 'GET', + url: '?r=wtx/common/get-apply-word', + data: {}, + }).then((res) => { + this.setData({ + applyWord: res, + }) }) }, onChooseAvatar(e) { diff --git a/src/pages/my/index.wxml b/src/pages/my/index.wxml index 3e8c64d..1e00be0 100644 --- a/src/pages/my/index.wxml +++ b/src/pages/my/index.wxml @@ -23,6 +23,10 @@ src="{{imageUrl}}index-apply-end.png?t={{Timestamp}}" > + + {{applyWord.ApplyButtonWordOne}} + {{applyWord.ApplyButtonWordTwo}} +