diff --git a/App.vue b/App.vue index 738ab2c..a2ebfc4 100644 --- a/App.vue +++ b/App.vue @@ -130,7 +130,7 @@ page { height: 100%; - background-color: #f7faf9; + background-color: #fff; } /* #endif */ diff --git a/components/z-navigation/z-navigation.vue b/components/z-navigation/z-navigation.vue index d57cc2e..75de461 100644 --- a/components/z-navigation/z-navigation.vue +++ b/components/z-navigation/z-navigation.vue @@ -54,7 +54,7 @@ "text": "购物车" }, { - "pagePath": "pages/library/library", + "pagePath": "pages/taihu/index", "iconPath": "static/tab/tab_nor_03.png", "selectedIconPath": "static/tab/tab_cur_03.png", "text": "太湖公益" @@ -80,7 +80,7 @@ "text": "购物车" }, { - "pagePath": "pages/library/library", + "pagePath": "pages/taihu/index", "iconPath": "static/tab/tab_nor_03.png", "selectedIconPath": "static/tab/tab_cur_03.png", "text": "太湖公益" diff --git a/pages.json b/pages.json index d33e87b..8cd0d4d 100644 --- a/pages.json +++ b/pages.json @@ -260,7 +260,7 @@ "path" : "pages/course/courseSet", "style" : { - "navigationBarTitleText" : "课程设置" + "navigationBarTitleText" : "总课程说明" } }, { @@ -277,6 +277,30 @@ { "navigationBarTitleText" : "课程大纲" } + }, + { + "path" : "pages/course/coursePrice", + "style" : + { + "navigationBarTitleText" : "课程价格", + "enablePullDownRefresh": true + } + }, + { + "path" : "pages/course/platformInfo", + "style" : + { + "navigationBarTitleText" : "平台说明", + "enablePullDownRefresh": true + } + }, + { + "path" : "pages/taihu/index", + "style" : + { + "navigationBarTitleText" : "太湖公益" + // "enablePullDownRefresh": true + } } ], "globalStyle": { @@ -307,7 +331,7 @@ "text": "购物车" }, { - "pagePath": "pages/peanut/shopping", + "pagePath": "pages/taihu/index", "iconPath": "static/tab/tab_nor_03.png", "selectedIconPath": "static/tab/tab_cur_03.png", "text": "太湖公益" diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue index 7a1c64e..897fca8 100644 --- a/pages/course/courseDetail.vue +++ b/pages/course/courseDetail.vue @@ -11,7 +11,7 @@ {{course.title}} - + @@ -313,8 +313,8 @@ .item { font-size: 26rpx; - height: 80rpx; - line-height: 80rpx; + height: 96rpx; + line-height: 96rpx; border-bottom: 1px solid #ececec; text { diff --git a/pages/course/coursePrice.vue b/pages/course/coursePrice.vue index b655a71..d63d65e 100644 --- a/pages/course/coursePrice.vue +++ b/pages/course/coursePrice.vue @@ -6,26 +6,35 @@ - - - {{item1.title}}-- + + {{item1.title}}-- - - {{item2.title}} - 半年：￥{{item2.halfFee}}整年：￥{{item2.fee}} - - - - + + {{item2.title}} + + 半年：￥{{item2.halfFee}} 元整年：￥{{item2.fee}} 元 + + - + + + + 立即购买 + + + - + - + + @@ -43,7 +52,8 @@ data() { return { playData: {}, - courseList: [] + courseList: [], + status:0, }; }, //第一次加载 @@ -75,12 +85,15 @@ .then(res => { if (res.code == 0 && res.list.length > 0) { this.courseList = res.list + this.status = 2 } else { this.courseList = [] + this.status = 1 } }).catch(e => { console.log(e, '报错') this.courseList = [] + this.status = 1 }); }, itemClick(op) { @@ -95,13 +108,70 @@ .flexbox { display: flex; } - .priceItem{margin-bottom:20rpx; font-size: 28rpx;} - .courseItem{ background: $containerColor; border-radius: 20rpx; - align-items: center;margin-bottom:20rpx; display: block; padding: 10rpx 0; width: 100%; - .u-icon{display: inline-block;} - text{font-size: 28rpx; padding-left: 10rpx;} + .buyBox{ + .saveBtn{ margin: 0 auto;} } + .saveBtn { + width: 260rpx; + align-items: center; + justify-content: center; + @include theme("btn_bg"); + height: 60rpx; + + // width: 46%; + overflow: hidden; + border-radius: 30rpx; + + text { + padding-left: 10rpx; + font-size: 28rpx; + color: #fff; + } + } + .courseItemleve1 { + padding: 20rpx; + border-radius: 20rpx; + border: 1px solid #eee; + overflow: hidden; + margin-bottom: 20rpx; + background: $containerColor; + } + + .priceItem {justify-content: center; + margin-bottom: 20rpx; + font-size: 28rpx; + background-color: #82aee2; + border-radius: 20rpx; padding:10rpx; + // border: 1px solid #ff5500; + .pbox{ justify-content: center; width: 100%; text-align: center;} + text{ + color: #fff; + } + .mname{padding: 2rpx 10rpx; background: #00e1ec ; border-radius: 20rpx;} + } + + .courseItem { + background: $containerColor; font-weight: bold; border-bottom: 1px dotted #e1e1e1; + border-radius: 20rpx; + align-items: center; + margin-bottom: 20rpx; + display: block; + padding: 10rpx 0; + width: 100%; + + .u-icon { + display: inline-block; + } + + text { + font-size: 28rpx; + padding-left: 10rpx; + } + } + .container { - .content{padding: 0 20rpx;} + .content { + padding: 0 20rpx; + } } \ No newline at end of file diff --git a/pages/course/courseSet.vue b/pages/course/courseSet.vue index 9ea4a8c..3594aec 100644 --- a/pages/course/courseSet.vue +++ b/pages/course/courseSet.vue @@ -10,10 +10,10 @@ - + + + + 点击课程名称即可查看对应的课程说明 @@ -168,7 +168,7 @@ if(e){ this.tagId = this.treeList[e].id this.getCourseInfo(this.tagId) - this.closeDrawer('showRight') + // this.closeDrawer('showRight') } }, changeD(e, type) { @@ -293,6 +293,12 @@ video{width: 100% !important; } } +.close { + display: flex; + justify-content: right; + padding-top: 60rpx; + padding-right: 20px; + } .infoBox { padding: 20rpx; font-size: 26rpx; diff --git a/pages/course/illustrate.vue b/pages/course/illustrate.vue index b01c585..f80f2fb 100644 --- a/pages/course/illustrate.vue +++ b/pages/course/illustrate.vue @@ -2,24 +2,24 @@ - - + + - + + + + 点击课程名称即可查看对应的课程说明 - + + :show-animation="true"> @@ -59,8 +59,9 @@ - - + + - - + + + + + @@ -15,7 +18,7 @@ - 课程价格 + 课程价格 > @@ -27,7 +30,7 @@ - 课程说明 + 课程说明 > @@ -38,10 +41,10 @@ - 平台简介 + 平台简介 > - + @@ -109,17 +112,23 @@ .flexbox { display: flex; } - - .container { - align-items: center; - min-height: calc(100vh - 270rpx); - @include pleft_right(10px); - background: url(@/static/pageBg.jpg) center no-repeat; - background-size: cover; + .imagebg{ + width: 100%; + + background:#fff url(@/static/pageBg.jpg) top no-repeat; + background-size:cover; + height:45vh + } + .container { + min-height: calc(100vh - 270rpx); + align-items: end !important; + position: relative; background-color: #fff; } + .ss{@include pleft_right(10px); } - .box { + .box { overflow: hidden; + // position: absolute; left: 20rpx; bottom: 0rpx; width: 100%; justify-content: space-between; @@ -132,15 +141,15 @@ margin: 20rpx 0; position: relative; padding: 16rpx; - @include mshadow(10px, 1); + // @include mshadow(10px, 1); .tt{ align-items: center; } .logo { image { - width: 150rpx; - height: 150rpx; + width: 100rpx; + height: 100rpx; } } } @@ -153,8 +162,8 @@ // position: absolute; right: 0; image { - width: 50rpx; - height: 60rpx; + width: 40rpx; + height: 50rpx; } } @@ -162,14 +171,14 @@ width: 100%; font-size: 40rpx; color: #fff; - line-height: 150rpx; + line-height: 100rpx; text-align: right; padding-right: 20rpx; } } .title { - font-size: 32rpx; + font-size: 30rpx; font-weight: bold; display: block; text-align: center; diff --git a/pages/course/platformInfo.vue b/pages/course/platformInfo.vue index defec1c..ec2161c 100644 --- a/pages/course/platformInfo.vue +++ b/pages/course/platformInfo.vue @@ -117,8 +117,8 @@ }, formatRichText(html) { - if(html == ''){ - return '暂无内容'; + if(html == '' || !html){ + html = '暂无内容'; } //控制图片大小 let newContent = html.replace(/]*>/gi, function(match, capture) { @@ -148,6 +148,7 @@ @import '@/style/mixin.scss'; .tabs { + background-color: $containerColor; padding-bottom: 20rpx; } @@ -155,8 +156,7 @@ .box { background-color: #fff; - @include pleft_right(10px); - min-height: calc(100vh - 270rpx); + @include pleft_right(10px); padding-top: 20rpx; } @@ -172,4 +172,7 @@ line-height: 48rpx; margin-top: 10rpx; } + ::v-deep body{ + background-color: #fff; + } \ No newline at end of file diff --git a/pages/news/news.vue b/pages/news/news.vue index fb2d669..517eb46 100644 --- a/pages/news/news.vue +++ b/pages/news/news.vue @@ -68,6 +68,9 @@ } + }, + onPullDownRefresh() { + uni.stopPullDownRefresh() }, components: { // musicPlay diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue index cfc9458..9da465e 100644 --- a/pages/peanut/home.vue +++ b/pages/peanut/home.vue @@ -493,22 +493,7 @@ }); }, - newsClick(item) { - // if (item.type == 1) { // url跳转 - // if (item.url != '') { - // // this.openURL(item.url) - // this.surl = item.url - // this.urlVisible = true - // } else { - - // } - // } else { // 内部跳转 - // uni.navigateTo({ - // url: 'pages/news/news' - // }); - // uni.navigateTo({ - // url: `/pages/news/news?newsId=1&title=1` - // }); + newsClick(item) { console.log('item',item) uni.navigateTo({ url: `/pages/news/news?newsId=${item.id}&url=${item.url}&type=${item.type}` diff --git a/pages/taihu/index.vue b/pages/taihu/index.vue new file mode 100644 index 0000000..4afe1d7 --- /dev/null +++ b/pages/taihu/index.vue @@ -0,0 +1,355 @@ + + + + \ No newline at end of file diff --git a/static/bg2.jpg b/static/bg2.jpg index a23601b..90715ce 100644 Binary files a/static/bg2.jpg and b/static/bg2.jpg differ diff --git a/static/gongyitop.jpg b/static/gongyitop.jpg new file mode 100644 index 0000000..4b3a429 Binary files /dev/null and b/static/gongyitop.jpg differ diff --git a/static/icon/midBtn_01.png b/static/icon/midBtn_01.png deleted file mode 100644 index 63ae0a0..0000000 Binary files a/static/icon/midBtn_01.png and /dev/null differ diff --git a/static/icon/midBtn_02.png b/static/icon/midBtn_02.png deleted file mode 100644 index da7afbd..0000000 Binary files a/static/icon/midBtn_02.png and /dev/null differ diff --git a/static/icon/midBtn_03.png b/static/icon/midBtn_03.png deleted file mode 100644 index 5801aec..0000000 Binary files a/static/icon/midBtn_03.png and /dev/null differ diff --git a/static/icon/midBtn_04.png b/static/icon/midBtn_04.png deleted file mode 100644 index 0d1f493..0000000 Binary files a/static/icon/midBtn_04.png and /dev/null differ diff --git a/static/icon/midBtn_05.png b/static/icon/midBtn_05.png deleted file mode 100644 index 046654c..0000000 Binary files a/static/icon/midBtn_05.png and /dev/null differ diff --git a/static/icon/midBtn_06.png b/static/icon/midBtn_06.png deleted file mode 100644 index 7e6881a..0000000 Binary files a/static/icon/midBtn_06.png and /dev/null differ diff --git a/static/pageBg.jpg b/static/pageBg.jpg index 76e4d34..5b7733e 100644 Binary files a/static/pageBg.jpg and b/static/pageBg.jpg differ