diff --git a/src/components/content-expand/index.vue b/src/components/content-expand/index.vue index 4f7f173..79fff32 100644 --- a/src/components/content-expand/index.vue +++ b/src/components/content-expand/index.vue @@ -1,12 +1,13 @@ @@ -19,7 +20,8 @@ export default { wrapperHeight: 0, contentHeight: 0, show: false, - wrapperContainerHeight: 0 + wrapperContainerHeight: 0, + defaultContentHeight: 0 } }, computed: { @@ -28,10 +30,15 @@ export default { return this.contentHeight > this.wrapperHeight; } } + }, + updated() { + }, mounted(){ this.wrapperHeight = this.$refs.wrapper.offsetHeight this.contentHeight = this.$refs.content.offsetHeight + this.defaultContentHeight = this.$refs.content.querySelector('.goods-content').offsetHeight / (3/2) + console.log(this.defaultContentHeight) this.$nextTick(() => { this.wrapperContainerHeight = this.wrapperHeight; }) @@ -71,6 +78,10 @@ export default { .iconfont-expand{ transform: rotateZ(180deg); } + .label{ + padding-left: .1rem; + font-size: .35rem; + } } } \ No newline at end of file diff --git a/src/components/detail-content-expand/index.vue b/src/components/detail-content-expand/index.vue new file mode 100644 index 0000000..e42e9c3 --- /dev/null +++ b/src/components/detail-content-expand/index.vue @@ -0,0 +1,101 @@ + + + + + \ No newline at end of file diff --git a/src/components/index.js b/src/components/index.js index 2be7fbb..490732f 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -8,6 +8,7 @@ import Order from './order'; import ScrollView from './scroll-view' import Uploader from './uploader' import ContentExpand from './content-expand' +import detailContentExpand from './detail-content-expand' import UserDynamic from './user-dynamic'; import RandomMoney from './random-money' import ThankGiving from './Thanksgiving' @@ -27,6 +28,7 @@ Vue.component(Order.name, Order) Vue.component(ScrollView.name, ScrollView) Vue.component(Uploader.name, Uploader) Vue.component(ContentExpand.name, ContentExpand) +Vue.component(detailContentExpand.name, detailContentExpand) Vue.component(UserDynamic.name, UserDynamic) Vue.component(RandomMoney.name, RandomMoney) Vue.component(ThankGiving.name, ThankGiving) diff --git a/src/pages/buddha-detail/index.vue b/src/pages/buddha-detail/index.vue index 1a44e00..af72ac6 100644 --- a/src/pages/buddha-detail/index.vue +++ b/src/pages/buddha-detail/index.vue @@ -8,9 +8,10 @@
-
+ +
+
-
已有{{ data.sales }}人参与 diff --git a/src/pages/everyday-donation/index.vue b/src/pages/everyday-donation/index.vue index f3d10f0..6caf322 100644 --- a/src/pages/everyday-donation/index.vue +++ b/src/pages/everyday-donation/index.vue @@ -23,7 +23,9 @@
详情
-
+ +
+
@@ -285,6 +287,11 @@ export default { await this.getDynamicDataByGoodsId(goods_id, goods_type); await this.getPayRecords(this.lTypeId, 1); this.data = response; + this.$nextTick(() => { + + this.$refs.contentWrap.refresh() + console.log('a', this.$refs.contentWrap) + }) if(!this.onlySpecs){ const { donate_number, money, id } = this.data.spec[0]; const priceUnit = donate_number || money; @@ -399,6 +406,12 @@ export default { } } +.process-content{ + *{ + max-width: 100%; + } +} + .caret{ padding-bottom: .2rem; .head{ diff --git a/src/pages/goods-detail/index.vue b/src/pages/goods-detail/index.vue index 5668b07..fd5ec11 100644 --- a/src/pages/goods-detail/index.vue +++ b/src/pages/goods-detail/index.vue @@ -20,7 +20,9 @@
详情
-
+ +
+
diff --git a/src/pages/temple-home/index.vue b/src/pages/temple-home/index.vue index 91bbad4..1ecbec5 100644 --- a/src/pages/temple-home/index.vue +++ b/src/pages/temple-home/index.vue @@ -113,9 +113,9 @@ 功德箱 -
  • +
  • - 查看更多寺院 + 自在福田首页
  • @@ -284,6 +284,7 @@ export default { } .merit-scroll-container{ height: 3.39rem; + margin: 0; overflow-x: auto; .merit-scroll-wrapper{ white-space: nowrap; diff --git a/src/pages/temple-list/index.vue b/src/pages/temple-list/index.vue index 9f4d798..528ae17 100644 --- a/src/pages/temple-list/index.vue +++ b/src/pages/temple-list/index.vue @@ -30,8 +30,7 @@
    \ No newline at end of file +
    \ No newline at end of file