-
九月十九观音护法魔法会
-
套用模型省时省力，不用冥思苦想，但是，每一个需要设计的内容和体系应…
+
{{privateData.title}}
+
{{privateData.description}}
-
已有23784人参与
+
已有{{privateData.sales}}人参与
-
+
关注
@@ -28,8 +26,53 @@
@@ -79,7 +122,7 @@ export default {
width: 2.16rem;
height: 2.16rem;
vertical-align: top;
- border-radius: .16rem;
+ border-radius: .05rem;
& ~ img{
margin-left: .27rem;
}
@@ -112,17 +155,30 @@ export default {
.btn{
display: flex;
margin-left: .5rem;
- line-height: .40rem;
+ align-items: center;
.iconfont{
color:$primary-color;
vertical-align: middle;
- font-size: .3rem;
+ font-size: .4rem;
+ margin-top: -3px;
}
b{
- font-size: .3rem;
- padding-left: .07rem;
+ font-size: .35rem;
+ padding-left: .1rem;
color: #888;
+ display: inline-block;
+ vertical-align: middle;
+ }
+ }
+ .collect{
+ .iconfont{
+ color: $primary-color;
+ }
+ }
+ .un-collect{
+ .iconfont{
+ color: #ddd;
}
}
}
diff --git a/src/components/index.js b/src/components/index.js
index c3f2038..e1997d5 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -8,6 +8,10 @@ import Order from './order';
import ScrollView from './scroll-view'
import Uploader from './uploader'
import ContentExpand from './content-expand'
+import UserDynamic from './user-dynamic';
+import RandomMoney from './random-money'
+import ThankGiving from './Thanksgiving'
+import ArrowMore from './arrow-more'
Vue.component(UserMerit.name, UserMerit)
Vue.component(Temple.name, Temple)
@@ -17,3 +21,7 @@ Vue.component(Order.name, Order)
Vue.component(ScrollView.name, ScrollView)
Vue.component(Uploader.name, Uploader)
Vue.component(ContentExpand.name, ContentExpand)
+Vue.component(UserDynamic.name, UserDynamic)
+Vue.component(RandomMoney.name, RandomMoney)
+Vue.component(ThankGiving.name, ThankGiving)
+Vue.component(ArrowMore.name, ArrowMore)
diff --git a/src/components/merit-goods/index.vue b/src/components/merit-goods/index.vue
index 647e98b..99d5fce 100644
--- a/src/components/merit-goods/index.vue
+++ b/src/components/merit-goods/index.vue
@@ -1,11 +1,11 @@
-
+
![]()
-
放生修复|观音出家月放生佛祖坚持护佑，第一迅猛的运转方法
+
{{data.title}}
- 已有100000人参与
-
+ 已有{{data.sales}}人参与
+
+
![]()
+
+
+ {{user.nickname}}
+
+
+
+
+
+
+
+ 元
+
+
+
+
+
+
+
-
![]()
+
![]()
- {{data.name}}
- {{data.visitor}} 人到访
+ {{data.unit_name}}
+ {{data.visit}} 人到访
+
![]()
+
{{data.nickname}}
+
{{data.goods_name}}
+
{{data.date}}
+
+
- 李晓华
- 湖南长沙
+ {{data.user_info.nickname}}
+ {{data.user_info.region}}
-
为佛像贴金身，菩萨护佑
+
{{data.goods_name}}
-
24212.23元
-
2021-10-3 21：58
+
{{data.order_amount || data.sum_money}}元
+
{{data.paid_at}}
@@ -23,6 +23,7 @@
@@ -70,10 +71,12 @@ export default {
text-align: right;
.money {
font-size: 0.37rem;
+ color: $primary-color;
+ font-weight: bold;
}
.date {
- font-size: 0.32rem;
- color: #666;
+ font-size: 0.3rem;
+ color: #888;
}
}
}
diff --git a/src/components/vue-number-scroll/index.vue b/src/components/vue-number-scroll/index.vue
new file mode 100644
index 0000000..c5a4298
--- /dev/null
+++ b/src/components/vue-number-scroll/index.vue
@@ -0,0 +1,143 @@
+
+
+
+
+
+
+
diff --git a/src/main.js b/src/main.js
index 70556e7..f6a95ee 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,5 +1,6 @@
import Vue from 'vue'
import VueAwesomeSwiper from 'vue-awesome-swiper';
+import globalMixin from './mixins';
import App from './App.vue'
import delay from 'delay'
import router from './router';
@@ -7,7 +8,7 @@ import '@/assets/js/flexable.js';
import './common/vant';
import './components/index'
import 'swiper/css/swiper.css'
-
+Vue.mixin(globalMixin)
Vue.config.productionTip = false
Vue.prototype.$delay = delay;
Vue.use(VueAwesomeSwiper)
diff --git a/src/mixins/index.js b/src/mixins/index.js
new file mode 100644
index 0000000..2439744
--- /dev/null
+++ b/src/mixins/index.js
@@ -0,0 +1,15 @@
+export default {
+ directives: {
+ numberOnly: {
+ bind: function(el) {
+ el.handler = function() {
+ el.value = el.value.replace(/\D+/, '')
+ }
+ el.addEventListener('input', el.handler)
+ },
+ unbind: function(el) {
+ el.removeEventListener('input', el.handler)
+ }
+ }
+ },
+}
\ No newline at end of file
diff --git a/src/pages/buddha-activity/index.vue b/src/pages/buddha-activity/index.vue
index e13bd56..45078a6 100644
--- a/src/pages/buddha-activity/index.vue
+++ b/src/pages/buddha-activity/index.vue
@@ -1,15 +1,44 @@
-
-
-
-
-
+
diff --git a/src/pages/everyday-donation/index.vue b/src/pages/everyday-donation/index.vue
index ab94c46..ae820d5 100644
--- a/src/pages/everyday-donation/index.vue
+++ b/src/pages/everyday-donation/index.vue
@@ -45,10 +45,7 @@
-
-
-
-
+
@@ -63,7 +60,7 @@
-
- 随喜
+ 随喜
-
{{spec.money}}元
@@ -132,6 +129,7 @@
+
@@ -142,25 +140,31 @@ import { getGoodsDetail } from '@/api'
export default {
components: {
- swiper, swiperSlide
- },
+ swiper,
+ swiperSlide,
+},
data(){
const { query } = this.$route;
let title = '详情';
- if(query.goods_type === '-1'){
+ if(query.goods_type === '1'){
title = '日行一善';
}
- if(query.goods_type === '-2'){
+ if(query.goods_type === '2'){
title = '添砖加瓦'
}
document.title = title;
+ console.log( JSON.stringify(query))
+ for(let i in query){
+ query[i] = query[i].toString()
+ }
return {
+ showRandom: false, // 随喜
documentTitle: title,
query,
data: null,
value: 1,
is_auto: false, // 是否自动行善
- showSpec: true,
+ showSpec: false,
priceUnit: 0,
priceUnitId: '',
number: 1,
@@ -184,10 +188,11 @@ export default {
}
},
mounted(){
- if(this.query.goods_type === '-1'){
+ console.log('query', this.query)
+ if(this.query.goods_type === '1'){
return this.getGoodsDetail('friendly');
}
- if(this.query.goods_type === '-2'){
+ if(this.query.goods_type === '2'){
return this.getGoodsDetail('tile');
}
@@ -202,7 +207,7 @@ export default {
async getGoodsDetail(type){
const { goods_id, temple_id } = this.$route.query;
const response = await getGoodsDetail(type, goods_id, temple_id);
- if(this.query.goods_type === '-2'){
+ if(this.query.goods_type === '2'){
response.spec = response.spec.map(v => ({ ...v, money: this.amountAbs(v.donate_number, Number(response.price))}))
}
this.data = response;
@@ -211,12 +216,12 @@ export default {
onPriceUnit({id, money}){
this.priceUnit = Number(money);
this.priceUnitId = id;
- if(this.query.goods_type === '-2'){
+ if(this.query.goods_type === '2'){
this.is_assign = false;
}
},
onToPay(){
- if(this.query.goods_type === '-1'){
+ if(this.query.goods_type === '1'){
this.$router.push({
name: 'pay',
query: {
@@ -232,7 +237,7 @@ export default {
}
})
}
- if(this.query.goods_type === '-2'){
+ if(this.query.goods_type === '2'){
this.$router.push({
name: 'pay',
query: {
diff --git a/src/pages/goods-detail/index.vue b/src/pages/goods-detail/index.vue
index ae70c2d..6dcdab5 100644
--- a/src/pages/goods-detail/index.vue
+++ b/src/pages/goods-detail/index.vue
@@ -3,12 +3,7 @@
-
-
-
+
![]()
@@ -81,18 +76,17 @@ export default {
data(){
return {
query: this.$route.query,
- showSpec: true,
+ showSpec: false,
checked: false,
current: 0,
data: null,
value: '',
spec_id: '',
- banners: [ '/1.jpg', '/2.jpg', '/3.jpg' ],
step: 0,
swiperOption: {
autoplay: 8000,
initialSlide: 1,
- loop: true,
+ loop: false,
pagination: '.swiper-pagination',
onSlideChangeEnd: swiper => {
console.log('onSlideChangeEnd', swiper.realIndex)
diff --git a/src/pages/home.vue b/src/pages/home.vue
index b09035f..010ef81 100644
--- a/src/pages/home.vue
+++ b/src/pages/home.vue
@@ -1,197 +1,237 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
- 功德无量
- 更多
-
-
-
-
-
-
为佛像贴金身，菩萨菩萨
-
-
-
-
为佛像贴金身，菩萨菩萨
-
-
-
-
为佛像贴金身，菩萨菩萨
-
-
-
-
-
-
-
- 进展状态
- 更多
-
-
-
-
-
-
感恩功德
-
- 实时
- 月榜
- 总榜
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+.merit-rank-container {
+}
+
+.container {
+ padding: 0.4rem;
+ padding-bottom: 0.53rem;
+ .my-swipe .van-swipe-item {
+ color: #fff;
+ font-size: 20px;
+ height: 3.57rem;
+ text-align: center;
+ img {
+ width: 100%;
+ height: 100%;
+ border-radius: 0.16rem;
+ }
+ }
+ .swiper {
+ margin-bottom: 0.4rem;
+ }
+ .van-notice-bar {
+ border: 1px solid #e6b759;
+ border-radius: 0.16rem;
+ }
+}
+.platform_home {
+ .home-grid-nav {
+ .nav-icon {
+ width: 1.07rem;
+ height: 1.07rem;
+ }
+ }
+ .user-dynamic-container {
+ margin-top: 0.5rem;
+ height: 1.26rem;
+ overflow: hidden;
+ margin-bottom: 0.5rem;
+ .van-swipe {
+ height: 100%;
+ }
+ .van-swipe__indicators {
+ display: none;
+ }
+ }
+ .van-swipe__indicators {
+ bottom: 0;
+ .van-swipe__indicator {
+ width: 20px;
+ height: 2px;
+ border-radius: 10px;
+ }
+ .van-swipe__indicator--active {
+ background: $primary-color;
+ }
+ }
+}
+
+.merit {
+ width: 3.39rem;
+ height: 3.39rem;
+ display: inline-block;
+ position: relative;
+ border-radius: 0.16rem;
+ vertical-align: top;
+ overflow: hidden;
+ & ~ .merit {
+ margin-left: 0.4rem;
+ }
+ img {
+ width: 100%;
+ height: 100%;
+ }
+ .title {
+ position: absolute;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ height: 0.91rem;
+ background: rgba(0, 0, 0, 0.7);
+ color: white;
+ line-height: 0.91rem;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: 0.37rem;
+ padding: 0 0.11rem;
+ }
+}
+
diff --git a/src/pages/merit-box/index.vue b/src/pages/merit-box/index.vue
index b830917..0bffedd 100644
--- a/src/pages/merit-box/index.vue
+++ b/src/pages/merit-box/index.vue
@@ -1,5 +1,5 @@
-
+
-
+
![]()
- 感恩功德
- 重庆石林寺
+ {{info.merit_box_title}}
+ {{info.unit_name}}
- 实时
- 月榜
- 总榜
+ {{n.title}}
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
@@ -56,6 +128,11 @@ export default {
vertical-align: top;
}
.merit-rank-container{
+ background: white;
+ position: relative;
+ margin-top: -.4rem;
+ border-top-left-radius: 10px;
+ border-top-right-radius: 10px;
.head{
padding: .53rem .4rem;
padding-bottom: .13rem;
@@ -87,6 +164,12 @@ export default {
}
}
}
+ .body{
+ height: 80vh;
+ .swiper-container{
+ height: 100%;;
+ }
+ }
}
.merit-button-group{
text-align: center;
diff --git a/src/pages/merit-list/index.vue b/src/pages/merit-list/index.vue
index 9bf709b..780be46 100644
--- a/src/pages/merit-list/index.vue
+++ b/src/pages/merit-list/index.vue
@@ -2,18 +2,73 @@
-
-
+
+
+
+ 没有更多了
+ 正在加载更多...
+
-
+
diff --git a/src/pages/monk/index.vue b/src/pages/monk/index.vue
index f052e67..b08a3bd 100644
--- a/src/pages/monk/index.vue
+++ b/src/pages/monk/index.vue
@@ -1,23 +1,18 @@
-
+
-
+
-
+
-
-
-
+
![]()
-
方丈： 素全大法师
-
素全法师的法名智国，是属羊人，他毕业于电子科技大学，他出生于成都市。他出于对佛教文化的特别喜爱，在1989年于昭觉寺皈依清定上师，法名智国。在2006-7-28日入驻四川省什邡市的罗汉寺，在1994年，于山西五台山碧山寺依本焕大和尚、一诚大和尚、香港圣一大和尚为三师，美国寿冶大和尚为学戒和尚受具足戒。并且在1996～1999年，于山西五台山塔院寺学修。曾任传戒引礼、尊证等职先后参加了四川省佛教协会宝光寺、峨眉山、石经寺、广德寺的传授三坛大戒法会。
+
{{data.title}}
+
@@ -42,6 +37,7 @@
diff --git a/src/pages/pay-result/index.vue b/src/pages/pay-result/index.vue
new file mode 100644
index 0000000..d8b73af
--- /dev/null
+++ b/src/pages/pay-result/index.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+ 参与成功
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/pay/index.vue b/src/pages/pay/index.vue
index 8bdba13..8f427c5 100644
--- a/src/pages/pay/index.vue
+++ b/src/pages/pay/index.vue
@@ -34,7 +34,8 @@
@@ -62,9 +73,15 @@ export default {
width: 100%;
}
.authed{
- font-size: .4rem;
+ font-size: .35rem;
line-height: 1.2rem;
padding-left: .4rem;
+ color: #888;
+ img{
+ width: .3rem;
+ vertical-align: middle;
+ margin-right: .1rem;
+ }
}
.auth{
margin: .4rem;
@@ -100,14 +117,14 @@ export default {
margin-right: .3rem;
img{
width: 100%;
+ vertical-align: top;
}
}
}
.description{
font-size: .4rem;
- color: #666;
- text-indent: 2em;
- line-height: 1.4;
+ color: #888;
+ line-height: 1.7;
padding-top: .35rem;
letter-spacing: 1px;
text-align: justify;
diff --git a/src/pages/temple-home/index.vue b/src/pages/temple-home/index.vue
index f605e2c..40d3776 100644
--- a/src/pages/temple-home/index.vue
+++ b/src/pages/temple-home/index.vue
@@ -1,75 +1,45 @@
-
+
-
重庆石林寺
+
{{data.temple_data.unit_name}}
- 重庆市大渡口区
- 123232到访
+ {{data.temple_data.region}}
+ {{data.temple_data.visit}}到访
-
-
佛教协会认证寺院 可放心访问
-
查看
+
+
+
佛教协会认证寺院 可放心访问
+
查看
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ ![]()
+
+
+
+
+
-
-
-
信众信众信众信众
-
永沐佛恩，慈悲加持，世代永沐佛恩，慈悲加持，世代...
-
2小时前
-
+
-
-
+
+
![]()
-
住持：素全大法师
+
{{manager.title}}
- 素全法师，法名智国，属羊，出生于成都市。2006-7-28日入驻四川省什邡市的罗汉寺。1989年，出于对佛教文化的特别喜爱，于昭觉寺皈依清定上师，法名智国。1992～1996年，受隆莲法师影响和介绍到成都市的龙泉驿区的石经寺依贞意大和尚出家。1994年，于山西五台山碧山寺依本焕大和尚、一诚大和尚、香港圣一大和尚为三师，美国寿冶大和尚为学戒和尚受具足戒。1996～1999年，于山西五台山塔院寺学修。曾任传戒引礼、尊证等职先后参加了四川省佛教协会宝光寺、峨眉山、石经寺、广德寺的传授三坛大戒法会。
-
-
-
-
-
-
-
住持：素全大法师
-
- 素全法师，法名智国，属羊，出生于成都市。2006-7-28日入驻四川省什邡市的罗汉寺。1989年，出于对佛教文化的特别喜爱，于昭觉寺皈依清定上师，法名智国。1992～1996年，受隆莲法师影响和介绍到成都市的龙泉驿区的石经寺依贞意大和尚出家。1994年，于山西五台山碧山寺依本焕大和尚、一诚大和尚、香港圣一大和尚为三师，美国寿冶大和尚为学戒和尚受具足戒。1996～1999年，于山西五台山塔院寺学修。曾任传戒引礼、尊证等职先后参加了四川省佛教协会宝光寺、峨眉山、石经寺、广德寺的传授三坛大戒法会。
+
@@ -77,7 +47,7 @@
-
+
-
-
-
-
+
+
查看更多进展状态
@@ -173,11 +141,37 @@
@@ -57,6 +128,9 @@ export default {
- 
-