首页添加关爱妇女

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" : {

pages.json

@@ -10,6 +10,12 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+			"path": "pages/home/caringwomen",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
 		// 登陆部分
 		{
 			"path": "pages/login/index",

pages/home/caringwomen.vue

@@ -0,0 +1,290 @@
+<template>
+	<view class="main">
+		<navigation>{{ content.title }}</navigation>
+		
+		<!-- #ifdef APP-PLUS -->
+		<view class="body-app">
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="body">
+				<!-- #endif -->
+			<view class="content" v-html="content.content">
+				
+			</view>
+
+
+	</view>
+	</view>
+</template>
+
+<script>
+	import UButton from '../../uview-ui/components/u-button/u-button.vue'
+	import api from '@/utils/api'
+	import md5 from 'js-md5'
+	export default {
+		name: "caringwomen",
+		data() {
+			return {
+			 content:{}
+			};
+		},
+		computed: {
+			i18n() {
+				return this.$t("login");
+			},
+		},
+		onLoad() {
+		this.agreement()
+		},
+		watch: {
+			
+		},
+		onShow() {},
+		methods: {
+			// 服务协议
+			agreement() {
+					api.agreement({
+						type:'caringwomen'
+					}).then(res => {
+						 this.content=res
+					})
+
+			},
+
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{
+		margin-top: 50rpx;
+		text-align: left;
+		padding-bottom: 60rpx;
+		// HTML+CSS 对于英文单词强制换行但不截断单词的解决办法
+						
+		/* 这两个在技术上是一样的, 为了兼容了浏览器两个都加上 */
+		overflow-wrap: break-word;
+		word-wrap: break-word;
+					
+		-ms-word-break: break-all;
+		/* 这个的使用在web-kit中有些危险，他可能会阶段所有东西 */
+		word-break: break-all;
+		/* Instead use this non-standard one: */
+		word-break: break-word;
+					
+		/* 如果浏览器支持的话增加一个连接符(Blink不支持) */
+		-ms-hyphens: auto;
+		-moz-hyphens: auto;
+		-webkit-hyphens: auto;
+		hyphens: auto;
+	}
+	.main {
+
+		.body {
+			margin-top: 204rpx;
+			padding: 0 40rpx;
+			overflow: hidden;
+
+			.welcomeText {
+				margin-top: 48rpx;
+				font-size: 48rpx;
+				font-weight: 800;
+				text-align: center;
+			}
+
+			.signInText {
+				font-size: 32rpx;
+				text-align: center;
+				color: #A2A0A8;
+			}
+
+			.form {
+				font-size: 32rpx;
+				margin-top: 48rpx;
+
+				.input-item {
+					height: 112rpx;
+					line-height: 112rpx;
+					background: #211F32;
+					margin-bottom: 48rpx;
+					border-radius: 32rpx;
+
+					.icon {
+						margin: 0 24rpx;
+					}
+
+					/deep/.u-form-item__body {
+						padding: 0;
+					}
+
+					.input {
+						height: 112rpx;
+					}
+				}
+
+				.vCode {
+
+					.getVCodeBtn {
+						// position: absolute;
+						width: 154rpx;
+						height: 56rpx;
+						right: 28rpx;
+						// top: 14px;
+						border-radius: 8px;
+						line-height: 56rpx;
+						font-size: 24rpx;
+						color: #00E8A2 !important;
+						padding: 0;
+					}
+				}
+			}
+
+			.agree {
+				font-size: 28rpx;
+
+				.check {
+					display: inline-block;
+					vertical-align: top;
+					margin-right: 32rpx;
+				}
+
+				.text {
+					display: inline-block;
+					width: 542rpx;
+				}
+
+				span {
+					cursor: pointer;
+					color: #00E8A2;
+					padding: 0 10rpx;
+
+				}
+			}
+
+			.button {
+				margin-top: 64rpx;
+				height: 112rpx;
+				line-height: 112rpx;
+				border-radius: 32rpx;
+				font-size: 32rpx;
+				color: #15141F !important;
+			}
+
+			.signUp {
+				margin: 48rpx 0;
+				text-align: center;
+				font-size: 32rpx;
+
+				.navigator {
+					display: inline;
+					color: #00E8A2;
+					padding: 0 10rpx;
+				}
+
+			}
+		}
+     .body-app{
+     	margin-top: 204rpx !important;
+     	padding: 0 40rpx;
+     	overflow: hidden;
+     
+     	.welcomeText {
+     		margin-top: 48rpx;
+     		font-size: 48rpx;
+     		font-weight: 800;
+     		text-align: center;
+     	}
+     
+     	.signInText {
+     		font-size: 32rpx;
+     		text-align: center;
+     		color: #A2A0A8;
+     	}
+     
+     	.form {
+     		font-size: 32rpx;
+     		margin-top: 48rpx;
+     
+     		.input-item {
+     			height: 112rpx;
+     			line-height: 112rpx;
+     			background: #211F32;
+     			margin-bottom: 48rpx;
+     			border-radius: 32rpx;
+     
+     			.icon {
+     				margin: 0 24rpx;
+     			}
+     
+     			/deep/.u-form-item__body {
+     				padding: 0;
+     			}
+     
+     			.input {
+     				height: 112rpx;
+     			}
+     		}
+     
+     		.vCode {
+     
+     			.getVCodeBtn {
+     				// position: absolute;
+     				width: 154rpx;
+     				height: 56rpx;
+     				right: 28rpx;
+     				// top: 14px;
+     				border-radius: 8px;
+     				line-height: 56rpx;
+     				font-size: 24rpx;
+     				color: #00E8A2 !important;
+     				padding: 0;
+     			}
+     		}
+     	}
+     
+     	.agree {
+     		font-size: 28rpx;
+     
+     		.check {
+     			display: inline-block;
+     			vertical-align: top;
+     			margin-right: 32rpx;
+     		}
+     
+     		.text {
+     			display: inline-block;
+     			width: 542rpx;
+     		}
+     
+     		span {
+     			cursor: pointer;
+     			color: #00E8A2;
+     			padding: 0 10rpx;
+     
+     		}
+     	}
+     
+     	.button {
+     		margin-top: 64rpx;
+     		height: 112rpx;
+     		line-height: 112rpx;
+     		border-radius: 32rpx;
+     		font-size: 32rpx;
+     		color: #15141F !important;
+     	}
+     
+     	.signUp {
+     		margin: 48rpx 0;
+     		text-align: center;
+     		font-size: 32rpx;
+     
+     		.navigator {
+     			display: inline;
+     			color: #00E8A2;
+     			padding: 0 10rpx;
+     		}
+     
+     	}
+     }
+	}
+</style>

pages/home/index.vue

@@ -64,18 +64,15 @@
 				<!-- 步数 -->
 				<view class="steps">
 					<view class="content">
-						<view class="title">{{ i18n.TodaySteps }}</view>
+						<view class="title">{{ i18n.CaringForWomen }}</view>
 
+						<view class="slogan">{{ i18n.LoveFeminist }}<br>{{ i18n.LoveFeminist1 }}</view>
 
 						
-						<view id="chart" :stepsNum="stepsNum" :stepTarget="stepTarget"
-							:change:stepTarget="echarts.stepTargetReceive" :change:stepsNum="echarts.receive"
-							style="width: 280rpx;height:280rpx; font-size: 40rpx;">
-						</view>
 
 
 						<!-- <canvas id="chart" ref="chart" style="width: 280rpx;height:280rpx; font-size: 40rpx;"></canvas> -->
-						<u-button class="button" color="#00E8A2" @click="closeModalShow=true">{{ i18n.ReceiveEarnings }}
+						<u-button class="button" color="#00E8A2" @click="getCharity">{{ i18n.checkTheDetails }}
 						</u-button>
 					</view>
 				</view>
@@ -429,6 +426,13 @@
 					}
 				})
 			},
+			getCharity() {
+				uni.navigateTo({
+					url: '/pages/home/caringwomen'
+				})
+				
+				
+			},
 
 			// 获取未读的公告
 			getNoReadNotice() {
@@ -929,7 +933,8 @@
 			border-radius: 16px;
 
 			.content {
-				margin-left: 246rpx;
+				//margin-left: 246rpx;
+				
 				height: 100%;
 				display: flex;
 				justify-content: space-evenly;
@@ -938,9 +943,32 @@
 				flex-direction: column;
 
 				.title {
-					font-size: 48rpx;
+					width: 100%;
-					height: 64rpx;
+					padding-left: 10rpx;
-					line-height: 64rpx;
+					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;
+					width: 326rpx;
-					height: 60rpx;
+					height: 70rpx;
 					line-height: 60rpx;
-					border-radius: 40rpx;
+					border-radius: 100rpx;
-					font-size: 24rpx;
+					font-size: 30rpx;
-					color: #15141F !important;
+					font-weight: bold;
+					color: #FFF !important;
 					padding: 0;
 					margin-right: 24rpx;
 				}

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',
 	},
 
 	// 合约页面相关

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',
 	},
 
 	// 合约页面相关

utils/language/zh_TW.js

@@ -95,6 +95,10 @@ export default {
 		WarmTipsText: '您確定領取嗎？',
 		Cancel: '取消',
 		Confirm: '確認',
+		CaringForWomen:'關愛女性，尊重女權',
+		LoveFeminist:'——愛心女權',
+		LoveFeminist1:'基金扶植計劃',
+		checkTheDetails:'查看詳情',
 	},
 
 	// 合约页面相关