diff --git a/manifest.json b/manifest.json index 89e37d8..c0134a2 100644 --- a/manifest.json +++ b/manifest.json @@ -110,7 +110,7 @@ "proxy" : { "/api" : { "ws" : false, - "target" : "https://sapi.payairs.com", + "target" : "https://api.gream.ltd", "changeOrigin" : true, "secure" : false, "pathRewrite" : { diff --git a/pages.json b/pages.json index 1b09d88..aa17ae2 100644 --- a/pages.json +++ b/pages.json @@ -10,6 +10,12 @@ "navigationStyle": "custom" } }, + { + "path": "pages/home/caringwomen", + "style": { + "navigationStyle": "custom" + } + }, // 登陆部分 { "path": "pages/login/index", diff --git a/pages/home/caringwomen.vue b/pages/home/caringwomen.vue new file mode 100644 index 0000000..fd14a8d --- /dev/null +++ b/pages/home/caringwomen.vue @@ -0,0 +1,290 @@ + + + + + diff --git a/pages/home/index.vue b/pages/home/index.vue index a356f66..7f41805 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -64,18 +64,15 @@ - {{ i18n.TodaySteps }} + {{ i18n.CaringForWomen }} + {{ i18n.LoveFeminist }}
{{ i18n.LoveFeminist1 }}
- - - + - {{ i18n.ReceiveEarnings }} + {{ i18n.checkTheDetails }}
@@ -429,6 +426,13 @@ } }) }, + getCharity() { + uni.navigateTo({ + url: '/pages/home/caringwomen' + }) + + + }, // 获取未读的公告 getNoReadNotice() { @@ -929,18 +933,42 @@ border-radius: 16px; .content { - margin-left: 246rpx; + //margin-left: 246rpx; + height: 100%; display: flex; justify-content: space-evenly; - align-items: center; + align-items: center; flex-direction: column; .title { - font-size: 48rpx; - height: 64rpx; - line-height: 64rpx; + width: 100%; + padding-left: 10rpx; + display: flex; + flex-direction: column; + + overflow: hidden; //超出部分隐藏 + + background-image: linear-gradient(to right,transparent,#00E8A2,transparent); + align-items: center; + font-size: 34rpx; + height: 72rpx; + line-height: 72rpx; + } + .slogan{ + margin-left: 28%; + width: 72%; + display: flex; + flex-direction: column; + padding-top:80rpx; + font-weight: bold; + text-align: center; + padding-right:20rpx; + align-items: center; + font-size: 36rpx; + height:150rpx; + line-height: 50rpx; } .chart { @@ -949,12 +977,13 @@ } .button { - width: 386rpx; - height: 60rpx; + width: 326rpx; + height: 70rpx; line-height: 60rpx; - border-radius: 40rpx; - font-size: 24rpx; - color: #15141F !important; + border-radius: 100rpx; + font-size: 30rpx; + font-weight: bold; + color: #FFF !important; padding: 0; margin-right: 24rpx; } diff --git a/static/home/img_People.png b/static/home/img_People.png index e0cbc41..95e9646 100644 Binary files a/static/home/img_People.png and b/static/home/img_People.png differ diff --git a/utils/language/en_US.js b/utils/language/en_US.js index 6514ca0..0f0b92c 100644 --- a/utils/language/en_US.js +++ b/utils/language/en_US.js @@ -95,6 +95,10 @@ export default { WarmTipsText: 'Are you sure to receive?', Cancel: 'Cancel', Confirm: 'Confirm', + CaringForWomen:'Caring for women, respecting feminism', + LoveFeminist:'——Love Feminist Fund', + LoveFeminist1:'Support Program', + checkTheDetails:'check the details', }, // 合约页面相关 diff --git a/utils/language/vi_VN.js b/utils/language/vi_VN.js index 73f639e..69551d0 100644 --- a/utils/language/vi_VN.js +++ b/utils/language/vi_VN.js @@ -93,6 +93,10 @@ export default { WarmTipsText: 'Bạn có chắc chắn nhận được nó?', Cancel: 'Hủy bỏ', Confirm: 'xác nhận', + CaringForWomen:'Quan tâm đến phụ nữ, tôn trọng quyền của phụ nữ', + LoveFeminist:'—Chương trình Hỗ trợ Quỹ', + LoveFeminist1:'Quyền lợi Phụ nữ Tình yêu', + checkTheDetails:'kiểm tra các chi tiết', }, // 合约页面相关 diff --git a/utils/language/zh_TW.js b/utils/language/zh_TW.js index a5570ec..3ee9b8b 100644 --- a/utils/language/zh_TW.js +++ b/utils/language/zh_TW.js @@ -95,6 +95,10 @@ export default { WarmTipsText: '您確定領取嗎?', Cancel: '取消', Confirm: '確認', + CaringForWomen:'關愛女性,尊重女權', + LoveFeminist:'——愛心女權', + LoveFeminist1:'基金扶植計劃', + checkTheDetails:'查看詳情', }, // 合约页面相关