石凯 %!s(int64=4) %!d(string=hai) anos
pai
achega
d193eed1cd

+ 49 - 0
pages.json

@@ -73,6 +73,20 @@
 			}
 		},
 		{
+			"path": "pages/index/peifu/rule",//规则说明
+			"style": {
+				"navigationBarTitleText":"规则说明",
+			    "navigationStyle":"custom"//添加自定义配置
+			}
+		},
+		{
+			"path": "pages/index/peifu/record",//培福记录
+			"style": {
+				"navigationBarTitleText":"培福",
+			    "navigationStyle":"custom"//添加自定义配置
+			}
+		},
+		{
 			"path": "pages/index/gongdeng/index",//供灯首页
 			"style": {
 				"navigationBarTitleText":"供灯",
@@ -157,6 +171,41 @@
 			}
 		},
 		{
+			"path":"pages/index/xingshan/shuoming",//行善说明
+			"style":{
+				"navigationBarTitleText":"行善",
+				"navigationStyle":"custom"//添加自定义配置
+			}
+		},
+		{
+			"path":"pages/index/xingshan/tougao",//行善投稿
+			"style":{
+				"navigationBarTitleText":"投稿",
+				"navigationStyle":"custom"//添加自定义配置
+			}
+		},
+		{
+			"path":"pages/index/xingshan/my",//我的善缘
+			"style":{
+				"navigationBarTitleText":"行善",
+				"navigationStyle":"custom"//添加自定义配置
+			}
+		},
+		{
+			"path":"pages/index/xingshan/gongde",//行善功德
+			"style":{
+				"navigationBarTitleText":"行善",
+				"navigationStyle":"custom"//添加自定义配置
+			}
+		},
+		{
+			"path":"pages/index/xingshan/shanxingji",//善行记
+			"style":{
+				"navigationBarTitleText":"善行记",
+				"navigationStyle":"custom"//添加自定义配置
+			}
+		},
+		{
 			"path":"pages/index/nianfo/index",//念佛首页
 			"style":{
 				"navigationBarTitleText":"念佛",

+ 11 - 9
pages/index/peifu/index.vue

@@ -313,15 +313,19 @@
 	.rankInner{
 		margin-top: 20rpx;
 	}
-	.rankContent .rankInner .rankOrder{
-		display: block;
-		width: 480rpx;
-		height: 80rpx;
+	.rankContent .rankInner {
+		margin-left: 10rpx;
+		position: relative;
+	}
+	.rankOrder{	
 		border-radius: 10rpx;
 		margin-bottom: 20rpx;
 		background-color: #f7ebdd;
-		margin-left: 10rpx;
-		position: relative;
+		width: 480rpx;
+		height: 80rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
 	}
 	.rankName,.rankNum,.rankA{
 		font-weight: 500;
@@ -337,11 +341,9 @@
 	 left: 75%
 	}
 	.rankI image{
-		position: absolute;
 		width: 50rpx;
 		height: 60rpx;
-		top:10rpx;
-		left:3%;
+		transform: translateX(15rpx);
 	}
 	.rankA{
 		left: 6%;

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 354 - 0
pages/index/xingshan/gongde.vue


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 628 - 110
pages/index/xingshan/index.vue


+ 202 - 6
pages/index/xingshan/less.less

@@ -6,8 +6,12 @@ page{
 	background-color: #f7f6f2;
 	margin: 0;
 	padding: 0;
+	
 }
 .nav{
+	position: sticky;
+	top: 0;
+	z-index: 9;
 	width: 100%;
 	height: @h1;
 	background-color: #ff8359;
@@ -59,6 +63,44 @@ page{
 			border-radius: 20rpx;
 		}
 	}
+	.menuContent{
+		z-index: 1;
+		position: absolute;
+		width: 40%;
+		height: 15%;
+		background-color: #007AFF;
+		right: 0;
+		background-color: #fff;
+		border-radius: 20rpx;
+		top: 95rpx;
+		.menuContent1,.menuContent2{
+			width: 100%;
+			height: 50%;
+			position: absolute;
+			image{
+				position: absolute;
+				top: 50%;
+				transform: translateY(-50%);
+				width: 40rpx;
+				height: 40rpx;
+				left: 10%;
+			}
+		}
+		.menuContent2{
+			top:50%;
+			image{
+				width: 50rpx;
+			}
+		}
+		text{
+			font-size: 35rpx;
+			position: absolute;
+			color: #000;
+			top: 50%;
+			transform: translateY(-50%);
+			left: 35%;
+		}
+	}
 }
 
 @h2:350rpx;
@@ -67,7 +109,7 @@ page{
 		width: 100%;
 		height: @h2;
 		background-color:#f7f6f2;
-		.content1{
+		 .content1{
 			width: 100%;
 			height:100rpx;
 			background-color: #FFFFFF;
@@ -112,6 +154,7 @@ page{
 				border-radius: 20rpx;
 			}
 		}
+	
 }
 @h3:100rpx;
 .rank{
@@ -149,7 +192,6 @@ page{
 			position: absolute;
 			width: 60%;
 			height: @h3;
-			background-color: #18B566;
 			left: @h3+20rpx;
 			margin-top: 25rpx;
 			color: #000000;
@@ -170,18 +212,26 @@ page{
 		}
 		.rankTime{
 			position: absolute;
-			width: @h3;
+			width: @h3*2;
 			height: @h3;
+			top: 25rpx;
+			right: 0;
+			color: rgb(165,165,165);
+			line-height: @h3;
+			text{
+				position: absolute;
+				right: 0;
+			}
 		}
 	}
 }
+
 .btn{
-	top: 100%;
-	position: fixed;
+	bottom: 0;
+	position: sticky;
 	width: 100%;
 	height: 100rpx;
 	background-color:#ccad52;
-	transform: translateY(-100%);
 	.btnText{
 		position: absolute;
 		line-height: 100rpx;
@@ -192,4 +242,150 @@ page{
 		transform: translateX(-50%);
 	}
 	
+}
+@color:#ccc;
+.Switch{
+	position: absolute;
+	width: 100%;
+	height: 100vh;
+	background-color: rgba(1,1,1,0.3);
+	top: 0;
+	.switchBox{
+		color: @color;
+		transition: all 0.3s linear;
+		width: 100%;
+		height: 61%;
+		background-color: #FFFFFF;
+		position: absolute;
+		top: 100%;
+		transform: translateY(-100%);
+		.hearder{
+			position: relative;
+			width: 94%;
+			height: 12%;
+			margin-left: 3%;
+			border-bottom: 1rpx @color solid;
+			text{
+				font-size: 35rpx;
+				position: absolute;
+				top: 50%;
+				transform: translateY(-50%);
+				font-weight:550;
+			}
+			text:nth-child(2){
+				right:0;
+				font-size: 60rpx;
+			}
+		}
+		.zhong{
+			width: 94%;
+			height: 76%;
+			margin-left: 3%;
+			view{
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				border: 1px @color solid;
+				border-radius: 20rpx;
+				width: 100%;
+				height: 23%;
+				margin: 15rpx 0;
+				position: relative;
+				image{
+					width: 140rpx;
+					height: 120rpx;
+				}
+				text{
+					font-size: 35rpx;
+				}
+				input{
+					position: absolute;
+					right: 0;
+					border: 1rpx solid @color;
+					height: 50rpx;
+					border-radius: 10rpx;
+					width: 170rpx;
+				}
+				
+			}
+		}
+		.bottom{
+			position: relative;
+			width: 100%;
+			height: 12%;
+			background-color: #ff8359;
+			view{
+				font-size: 40rpx;
+				color: #FFFFFF;
+				font-weight: 500;
+			height: 12%;
+			position: absolute;
+			left: 50%;
+			transform: translateX(-50%);
+			line-height: 100rpx;
+
+			}
+		}
+	}
+	
+}
+.sswitch{
+	width: 100%;
+	height: 100%;
+	background-color: rgba(1,1,1,0.3);
+	top: 0;
+	.switchBox{
+		transition: all 0.3s linear;
+		width: 100%;
+		height: 0%;
+		background-color: #FFFFFF;
+		position: absolute;
+		top: 100%;
+		.hearder{
+			position: relative;
+			width: 94%;
+			height: 12%;
+			margin-left: 3%;
+			border-bottom: 1rpx @color solid;
+			text{
+				font-size: 35rpx;
+				position: absolute;
+				top: 50%;
+				transform: translateY(-50%);
+				font-weight:550;
+			}
+			text:nth-child(2){
+				right:0;
+				font-size: 60rpx;
+			}
+		}
+
+		.bottom{
+			position: relative;
+			width: 100%;
+			height: 12%;
+			background-color: #ff8359;
+			view{
+				font-size: 40rpx;
+				color: #FFFFFF;
+				font-weight: 500;
+			height: 12%;
+			position: absolute;
+			left: 50%;
+			transform: translateX(-50%);
+			line-height: 100rpx;
+			}
+		}
+	}
+	
+}
+.zhong view .text1,.zhong view .text2,.zhong view .text3,.zhong view .text4{
+	position: absolute;
+	right: 2%;
+}
+
+.Switch .switchBox .zhong view .text4,.Switch .switchBox .zhong view .shang1{
+	width: 80rpx;
+	height: 80rpx;
+	margin-left: 5%;
 }

+ 58 - 0
pages/index/xingshan/my.vue

@@ -0,0 +1,58 @@
+<template>
+	<view>
+		<view class="sticky-nav">
+			<view class="nav-box">
+				<u-icon name="arrow-left" color="#000" size="48" @click="backHome()"></u-icon>
+				<text class="rule-text">我的善缘</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				}
+				},
+		methods:{
+			backHome() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.sticky-nav {
+		position: sticky;
+		width: 100%;
+		top: 0;
+		z-index: 1;
+	}
+	.nav-box {
+		width: 100%;
+		padding-top: 50rpx;
+		display: flex;
+		align-items: center;
+		background: #fff;
+		height: 100rpx;
+		padding-bottom: 50rpx;
+	    /deep/.u-icon{
+			margin-left: 20rpx!important;
+		}
+		.rule-text {
+			font-size: 38rpx;
+			color: #000;
+			margin-left: 250rpx;
+		}
+	}
+	/deep/.directory-content {
+	    margin: 0 0 25rpx 25rpx;
+		font-size: 35rpx;
+		color: rgb(118,118,118);
+	}
+</style>

+ 119 - 0
pages/index/xingshan/shanxingji.vue

@@ -0,0 +1,119 @@
+<template>
+	<view class="">
+		
+	
+		<view class="nav">
+			<u-icon class="back" name="arrow-left" color="#000;" size="48" @click="backHome()"></u-icon>
+			<view class="text">
+				<text>善行记</text>
+			</view>
+		</view>
+		
+		<view class="" v-for="(item,index) in cont" key="index">
+			<navigator url="./gongde">
+			<view class="content2" >
+				<text><b>{{item.title}}</b></text>
+				<text>{{item.time}}</text>
+				<image :src="item.image" mode=""></image>
+			</view>
+			</navigator>
+			
+		</view>
+</view>
+</template>
+
+<script>
+	export default{
+				data(){
+					return{
+						cont:[{
+							
+								title:'功德人生2021关爱长者慈善公益活动',
+								time:'2021-04-26 15:37:36',
+								image:'../../../static/index/xingshan/content.jpg'
+							},
+					
+						{
+							title:'功德人生2021关爱长者慈善公益活动',
+							time:'2021-04-26 15:37:36',
+							image:'../../../static/index/xingshan/content.jpg'
+						}]
+						
+						}
+						},
+				methods:{
+					backHome() {
+						uni.navigateBack({
+							delta: 1
+						});
+					},
+				},
+				}
+</script>
+
+<style>
+	page{
+		background-color: #f4f4f4;
+	}
+	.nav {
+		background-color: #FFFFFF;
+		  position: sticky;
+		  top: 0;
+		  z-index: 9;
+		  width: 100%;
+		  height: 100rpx;
+		  color: #000;
+		  font-size: 45rpx;
+		  font-weight: 600;
+		}
+		.nav .back {
+		  height: 100rpx;
+		  width: 15%;
+		  position: absolute;
+		  text-align: center;
+		}
+		.nav .back text {
+		  line-height: 100rpx;
+		}
+		.nav .text {
+			display: block;
+		  position: absolute;
+		  height: 100rpx;
+		  width: 70%;
+		  left: 40%;
+
+		}
+		.nav .text text {
+		  line-height: 100rpx;
+		}
+		
+	.content2 {
+		margin-top: 2rpx;
+		  position: relative;
+		  width: 100%;
+		  border-bottom: 5rpx solid #cccccc;
+		  height: 220rpx;
+		  background-color: #fff;
+		}
+		.content2 text:nth-child(1) {
+		  font-size: 35rpx;
+		  display: block;
+		  width: 65%;
+		  height: 120rpx;
+		  margin-top: 10rpx;
+		  padding-left: 20rpx;
+		}
+		.content2 text:nth-child(2) {
+		  font-size: 28rpx;
+		  color: #a9a9a9;
+		  margin-left: 20rpx;
+		  }
+		  .content2 image {
+		    position: absolute;
+		    width: 200rpx;
+		    height: 170rpx;
+		    top: 20rpx;
+		    right: 20rpx;
+		    border-radius: 20rpx;
+		  }
+</style>

+ 141 - 0
pages/index/xingshan/shuoming.vue

@@ -0,0 +1,141 @@
+<template>
+	<view>
+		<view class="sticky-nav">
+			<view class="nav-box">
+				<u-icon name="arrow-left" color="#000" size="48" @click="backHome()"></u-icon>
+				<text class="rule-text">行善说明</text>
+			</view>
+		</view>
+		<view class="content_box">
+			<rich-text :nodes="nodes"></rich-text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				nodes:[{
+						name: 'h1',
+						attrs: {
+							class: 'directory-content',
+						},
+						children: [{
+							type: 'text',
+							text: '1.功能介绍'
+						}]
+					},
+					{
+						name: 'p',
+						attrs: {
+							class: 'directory-content',
+						},
+						children: [{
+							type: 'text',
+							text: `行善功能是一个鼓励大家有向善之心,让大家养成一个行善积德的好习惯,聚沙成塔,以平台为载体汇聚更多力量去帮助有需要帮助的人,包含善缘记录、功德榜、我要行善这三个核心功能。`
+						}]
+					},
+					{
+						name: 'h1',
+						attrs: {
+							class: 'directory-content',
+						},
+						children: [{
+							type: 'text',
+							text: '我的善缘是什么?'
+						}]
+					},
+					{
+						name: 'p',
+						attrs: {
+							class: 'directory-content',
+						},
+						children: [{
+							type: 'text',
+							text: '行善的记录,包含时间、金额、功德证书(可直接分享给好友,一起共享福报)'
+						}]
+					},
+					{
+						name: 'h1',
+						attrs: {
+							class: 'directory-content',
+						},
+						children: [{
+							type: 'text',
+							text: '手机日行一善具体怎么操作?'
+						}]
+					},
+					{
+						name: 'p',
+						attrs: {
+							class: 'directory-content',
+						},
+						children: [{
+							type: 'text',
+							text: '点击“我要行善”——选择项目“日行一善、功德三千、打赏平台”然后点击下一步——输入名称(系统默认用户名,可选择是否匿名)——祈愿内容(可自动选择,也可自己手动输入)——选择是否公开——确认支付香花券——获得功德证书'
+						}]
+					},
+					{
+						name: 'h1',
+						attrs: {
+							class: 'directory-content',
+						},
+						children: [{
+							type: 'text',
+							text: '行善的款项会用于哪里?'
+						}]
+					},
+					{
+						name: 'p',
+						attrs: {
+							class: 'directory-content',
+						},
+						children: [{
+							type: 'text',
+							text: '行善的款项会以平台方的名义,以粮、米、油、面、水果等生活物资的形式,捐赠给中小寺院和周边养老机构,并将在平台内部资讯头条内做展示。'
+						}]
+					}
+				]
+			}
+		},
+		methods:{
+			backHome() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.sticky-nav {
+		position: sticky;
+		width: 100%;
+		top: 0;
+		z-index: 1;
+	}
+	.nav-box {
+		width: 100%;
+		padding-top: 50rpx;
+		display: flex;
+		align-items: center;
+		background: #fff;
+		height: 100rpx;
+		padding-bottom: 50rpx;
+	    /deep/.u-icon{
+			margin-left: 20rpx!important;
+		}
+		.rule-text {
+			font-size: 38rpx;
+			color: #000;
+			margin-left: 250rpx;
+		}
+	}
+	/deep/.directory-content {
+	    margin: 0 0 25rpx 25rpx;
+		font-size: 35rpx;
+		color: #000000;
+	}
+</style>

+ 55 - 0
pages/index/xingshan/tougao.css

@@ -0,0 +1,55 @@
+page {
+  width: 100%;
+  height: 100%;
+  background-color: #e7e7e7;
+}
+.box {
+  width: 100%;
+  height: 25vh;
+  background-color: #FFFFFF;
+  margin: 1.5vh 0;
+}
+.title,
+.author {
+  width: 94%;
+  margin-left: 3%;
+  height: 30%;
+  font-size: 30rpx;
+}
+.shang {
+  font-size: 30rpx;
+  width: 94%;
+  margin-left: 3%;
+  height: 40%;
+}
+.shang,
+.title,
+.author {
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+}
+.bottom {
+  width: 100%;
+  height: 64vh;
+  background-color: #FFFFFF;
+}
+#text {
+  width: 94%;
+  margin-left: 3%;
+}
+.input {
+  position: relative;
+  width: 90rpx;
+  height: 90rpx;
+  border: 1rpx #ccad52 solid;
+  font-size: 100rpx;
+}
+.haha {
+  color: #ccad52;
+  display: block;
+  position: absolute;
+  top: -30%;
+  left: 50%;
+  transform: translateX(-50%);
+}

+ 176 - 0
pages/index/xingshan/tougao.vue

@@ -0,0 +1,176 @@
+<template>
+<view class="">
+		
+	
+	<view class="nav">
+		<u-icon class="back" name="arrow-left" color="#fff" size="48" @click="backHome()"></u-icon>
+		<view class="text">
+			<text>投稿</text>
+		</view>
+		<view class="menu" @click.stop="openMenu()">
+			<view class="text">
+				提交
+			</view>
+		</view>
+	</view>
+	<view class="box">
+			<view class="title">
+				<text>标题:</text>
+				<input type="text" value="" placeholder="请输入标题" />
+			</view>
+			<view class="author">
+			<text>作者:</text>
+			<input type="text" :value="name" />
+			</view>
+			<view class="shang" @click="shang()">
+				<view ref="input" class="input">
+					<text class="haha">+</text>
+				</view>
+				<view class="text">
+					上传封面(非必选)
+				</view>
+
+			</view>
+			
+	</view>
+	<view class="bottom">
+		<input type="text" value=""  placeholder="请输入内容" id="text"/>
+	</view>
+	
+	
+	
+	
+</view>	
+</template>
+
+<script>
+		export default{
+			data(){
+				return{
+					name:'方婷'
+					}
+					},
+			methods:{
+				backHome() {
+					uni.navigateBack({
+						delta: 1
+					});
+				},
+				shang(){
+					uni.chooseImage({
+					    count: 1, //上传图片的数量,默认是9
+					    sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
+					    sourceType: ['album'], //从相册选择
+					    success: function (res) {
+					        const tempFilePaths = res.tempFilePaths;    //拿到选择的图片,是一个数组
+					    }
+					});
+
+				}
+			},
+			}
+				
+</script>
+
+<style>
+	
+	page {
+	  width: 100%;
+	  height: 100%;
+	  background-color: #e7e7e7;
+	}
+	.box {
+	  width: 100%;
+	  height: 25vh;
+	  background-color: #FFFFFF;
+	  margin: 1.5vh 0;
+	}
+	.title,
+	.author {
+	  width: 94%;
+	  margin-left: 3%;
+	  height: 30%;
+	  font-size: 30rpx;
+	}
+	.shang {
+	  font-size: 30rpx;
+	  width: 94%;
+	  margin-left: 3%;
+	  height: 40%;
+	}
+	.shang,
+	.title,
+	.author {
+	  display: flex;
+	  align-items: center;
+	  flex-direction: row;
+	}
+	.bottom {
+	  width: 100%;
+	  height: 64vh;
+	  background-color: #FFFFFF;
+	}
+	#text {
+	  width: 94%;
+	  margin-left: 3%;
+	}
+	.input {
+	  position: relative;
+	  width: 90rpx;
+	  height: 90rpx;
+	  border: 1rpx #ccad52 solid;
+	  font-size: 100rpx;
+	}
+	.haha {
+	  color: #ccad52;
+	  display: block;
+	  position: absolute;
+	  top: -30%;
+	  left: 50%;
+	  transform: translateX(-50%);
+	}
+	
+	.nav {
+	  position: sticky;
+	  top: 0;
+	  z-index: 9;
+	  width: 100%;
+	  height: 8vh;
+	  background-color: #ff8359;
+	  color: #fff;
+	  font-size: 45rpx;
+	  font-weight: 600;
+	}
+	.nav .back {
+	  height: 100rpx;
+	  width: 15%;
+	  position: absolute;
+	  text-align: center;
+	}
+	.nav .back text {
+	  line-height: 100rpx;
+	}
+	.nav .text {
+	  position: absolute;
+	  height: 100rpx;
+	  width: 70%;
+	  left: 15%;
+	}
+	.nav .text text {
+	  line-height: 100rpx;
+	}
+	.nav .menu {
+	  position: absolute;
+	  width: 15%;
+	  height: 100rpx;
+	  left: 85%;
+	}
+	.nav .menu image {
+	  height: 100rpx;
+	  width: 100%;
+	}
+	.menu .text{
+		font-size: 35rpx;
+		line-height: 100rpx;
+	}
+</style>

BIN=BIN
static/index/xingshan/09dec9f3b9904f5f818421365d389d84.jpg


BIN=BIN
static/index/xingshan/376bd4dfbca84741945c9e82e7075ba8.jpg


BIN=BIN
static/index/xingshan/4b5dd8cde7114f7e8047c7d20a058071.png


BIN=BIN
static/index/xingshan/673236c16a51400785fc8e8098006206.png


BIN=BIN
static/index/xingshan/7b4249e2886148c1adcaf337a569a56a.jpg


BIN=BIN
static/index/xingshan/bd266271e80544f496f52669404dec6d.jpg


+ 3 - 0
static/index/xingshan/desktop.ini

@@ -0,0 +1,3 @@
+[LocalizedFileNames]
+upload.png=@upload.png,0
+upload_pic.png=@upload_pic.png,0

BIN=BIN
static/index/xingshan/e18835856bc74a4aa38e2c8e9bedd7bc.jpg


BIN=BIN
static/index/xingshan/eecb111e544a44d59e9d643dc34bc63f.jpg


BIN=BIN
static/index/xingshan/gx_shuomin.png


BIN=BIN
static/index/xingshan/merit_cneter1.png


BIN=BIN
static/index/xingshan/upload.png


BIN=BIN
static/index/xingshan/upload_pic.png


BIN=BIN
static/index/xingshan/日行一善按钮.png