From afc77317819fd47b3dd8dc01570125a307a40960 Mon Sep 17 00:00:00 2001 From: Gdpao <1341331954@qq.com> Date: Tue, 4 Aug 2020 19:39:31 +0800 Subject: [PATCH] gdpao --- components/index/video-item/index.vue | 22 +- components/remaining/remaining.vue | 37 ++-- components/shop/list/item.vue | 5 +- components/shop/shop-item/index.vue | 10 +- manifest.json | 36 +++- pageA/register/register.vue | 1 + pageB/photo/index.vue | 20 +- pageB/search/out.vue | 294 +++++++++++++------------- pages/information/information.vue | 4 +- pages/shop/index.vue | 14 +- static/CustomStoryboard.zip | Bin 0 -> 42827 bytes 11 files changed, 229 insertions(+), 214 deletions(-) create mode 100644 static/CustomStoryboard.zip diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue index 689e1c8..1de8549 100644 --- a/components/index/video-item/index.vue +++ b/components/index/video-item/index.vue @@ -113,6 +113,7 @@ box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12); .bubble { position: relative; + border-radius: 20rpx; background-color: #fff; &::after { position: absolute; @@ -130,8 +131,7 @@ > view { display: flex; align-items: center; - height: 52rpx; - padding: 10rpx 20rpx; + padding: 20rpx 30rpx; &:not(:last-child) { border-bottom: 2rpx #ECECEC solid; } @@ -142,17 +142,17 @@ } > image { &:first-child { - @include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx); + @include image-class($width: 30rpx, $height: 30rpx, $right: 12rpx); } &:nth-child(2) { - @include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx); + @include image-class($width: 30rpx, $height: 30rpx, $right: 12rpx); } &:last-child { - @include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx); + @include image-class($width: 30rpx, $height: 30rpx, $right: 9rpx); } } > text { - font-size: 20rpx; + font-size: 24rpx; color: rgba(51,51,51,1); } } @@ -205,19 +205,18 @@ export default { }).then(res => { console.log(res) if(res.errCode == 0) { + this.$u.toast(res.message); this.$emit("getArticlelist"); - // this.$u.toast(res.message); - } else { - // this.$u.toast(res.message); - } + } }) }, articleCollect() { this.$u.api.articleCollect({ article_id: this.item.article_id, }).then(res => { - console.log(res) + console.log(res); if(res.errCode == 0) { + this.$u.toast(res.message); this.$emit("getArticlelist"); } }) @@ -229,6 +228,7 @@ export default { }).then(res => { // console.log(res) if(res.errCode == 0) { + this.$u.toast(res.message); this.$emit("getArticlelist"); } }) diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue index 90389cf..612bd66 100644 --- a/components/remaining/remaining.vue +++ b/components/remaining/remaining.vue @@ -4,9 +4,8 @@ - - abc @@ -22,8 +21,8 @@ - 立即体验 + 立即体验 @@ -72,7 +71,8 @@ background: ['color1', 'color2', 'color3'], indicatorDots: true, interval: 2000, - duration: 500 + duration: 500, + swiper_index: "", }; }, onReady: function(res) { @@ -133,6 +133,11 @@ } }); }, + // 立即体验 + goNext() { + this.protocol = true; + this.banner = false; + }, // 我同意 to_agree() { uni.setStorage({ @@ -203,8 +208,21 @@ .uni-padding-wrap{ // height: 400rpx; } + .btn-init { + z-index: 1000; + position: absolute; + bottom: 100rpx; + right: 30%; + width: 300rpx; + height: 80rpx; + line-height: 80rpx; + text-align: center; + color: #fff; + border-radius: 40rpx; + background-color: #007AFF; + } .welcome_jumpes { - z-index: 10000; + z-index: 100; position: absolute; top: 80rpx; right: 60rpx; @@ -220,15 +238,6 @@ #myVideo { width: 100%; - .time { - position: absolute; - top: 0; - left: 0; - width: 10rpx; - height: 10rpx; - color: #fff; - font-size: 30rpx; - } } uni-video { diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue index c33e26c..56bdefa 100644 --- a/components/shop/list/item.vue +++ b/components/shop/list/item.vue @@ -1,6 +1,6 @@