diff --git a/components/certifiedCj/certifiedCj.vue b/components/certifiedCj/certifiedCj.vue new file mode 100644 index 0000000..ba56e59 --- /dev/null +++ b/components/certifiedCj/certifiedCj.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/components/news/news.vue b/components/news/news.vue new file mode 100644 index 0000000..887949c --- /dev/null +++ b/components/news/news.vue @@ -0,0 +1,59 @@ + + + diff --git a/components/products/products.vue b/components/products/products.vue new file mode 100644 index 0000000..9c3e2aa --- /dev/null +++ b/components/products/products.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/pages.json b/pages.json index 6b4860d..47542bd 100644 --- a/pages.json +++ b/pages.json @@ -87,6 +87,23 @@ "enablePullDownRefresh": false } + }, { + "path": "pages/bindCompony/bindCompony", + "style": { + "navigationBarTitleText": "绑定公司", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } + + }, { + "path": "pages/browseHistory/browseHistory", + "style": { + "navigationBarTitleText": "浏览记录", + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#12CA64", + "enablePullDownRefresh": false + } } ], "tabBar": { diff --git a/pages/bindCompony/bindCompony.vue b/pages/bindCompony/bindCompony.vue new file mode 100644 index 0000000..09060bd --- /dev/null +++ b/pages/bindCompony/bindCompony.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/pages/browseHistory/browseHistory.vue b/pages/browseHistory/browseHistory.vue new file mode 100644 index 0000000..748a6e1 --- /dev/null +++ b/pages/browseHistory/browseHistory.vue @@ -0,0 +1,196 @@ + + + + + diff --git a/pages/certifiedCj/certifiedCj.vue b/pages/certifiedCj/certifiedCj.vue index 5a51212..437fdef 100644 --- a/pages/certifiedCj/certifiedCj.vue +++ b/pages/certifiedCj/certifiedCj.vue @@ -1,19 +1,6 @@ @@ -23,46 +10,9 @@ data() { return { cjsShow: true, - cjsList: [{ - src: '/static/report/zhanwei_xf(1).png', - title: '西安兴沃丰餐饮管理有限责任公司', - tags: [{ - tag: '咖啡' - }, - { - tag: '饮品' - } - ] - }, - { - src: '/static/report/zhanwei_xf(2).png', - title: '福建省海纳川食品有限公司', - tags: [{ - tag: '活冻鲍鱼' - }, - { - tag: '鲍鱼罐头' - }, - { - tag: '佛跳墙' - }, - { - tag: '海螺片' - } - - ] - }, - ] } }, methods: { - click(index) { - if (index == 0) { - uni.navigateTo({ - url: '/pages/detail/certifiedCjDetail/certifiedCjDetail' - }) - } - } // this.cjsShow = this.list.length === 0 ? true : false } } diff --git a/pages/index/index.vue b/pages/index/index.vue index f5252a6..045c685 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -34,39 +34,7 @@ - - - - - - - - - - {{item.img_tag}} - - - - {{item.title}} - - - - - {{item.desc}} - - - - - 发布日期: - {{item.time}} - - - - - - + @@ -127,39 +95,7 @@ '/static/products/sy_bg.png', 'https://cdn.uviewui.com/uview/swiper/swiper3.png' ], - productList: [{ - src: '/static/products/zhanwei_dg.png', - title: '锅巴', - tag: '无添加剂', - img_tag: '零食铺子', - desc: '糯米蟹黄锅巴散装,非油炸绿色健康食品', - time: '2022-12-04' - }, - { - src: '/static/products/zhanwei_dg(2).png', - title: '干吃汤圆', - tag: '天然原料', - img_tag: '糕点卷酥', - desc: '休闲食品厂家甜品糯米食品零食闽南特产宵夜好吃糍粑', - time: '2022-12-04' - }, - { - src: '/static/products/zhanwei_dg(1).png', - title: '紫薯魔芋人参魔芋人参魔芋人参…', - tag: '天然原料', - img_tag: '健康创新', - desc: '紫薯魔芋人参代餐粉 冲调饮品贴牌加工 五谷杂粮粉代餐', - time: '2022-12-04' - }, - { - src: '/static/products/zhanwei_dg(3).png', - title: '焦糖饼干', - tag: '无防腐剂', - img_tag: '饼干曲奇', - desc: '比利时风味焦糖饼干代餐小吃零食品', - time: '2022-12-04' - } - ] + } }, onPullDownRefresh() { @@ -170,13 +106,8 @@ //点击一级分类 click(listIndex) { this.$refs.uToast.success(`点击了第${listIndex}个`) - }, - //点击图片跳转到详情页 - toDetailPage() { - uni.navigateTo({ - url: '/pages/detail/productsDetail/productsDetail' - }) } + } } @@ -255,101 +186,6 @@ } } - .products_box { - padding: 10rpx; - .u-grid-item { - - .bgContent { - position: absolute; - right: 0; - top: 0; - - .u-image__image { - margin-left: 6px; - } - - .img_tag { - position: absolute; - padding: 2rpx 8rpx; - right: 5px; - top: 30rpx; - border-radius: 54rpx 0px 0px 54rpx; - box-shadow: 0px 2rpx 4rpx 0px #078C42; - background: linear-gradient(135deg, #0DB658 0%, #16DD6D 100%); - font-size: 20rpx; - color: #FFFFFF; - line-height: 28rpx; - } - - - .title_box { - position: relative; - width: 100%; - display: flex; - justify-content: space-between; - align-items: center; - - .title { - width: 186rpx; - font-size: 26rpx; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: bold; - color: #0EBB5B; - line-height: 37rpx; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - - .u-tag { - height: 26rpx; - line-height: 26rpx; - background: linear-gradient(124deg, #FEAA19 0%, #FDCF3A 100%); - - .u-tag__text { - font-size: 20rpx; - } - - } - } - - .product_desc { - font-size: 22rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #3E3E3E; - line-height: 26rpx; - margin-top: 24rpx; - margin-bottom: 20rpx; - -webkit-line-clamp: 2; - display: -webkit-box; - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; - } - - .releaseDate { - font-size: 22rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #A3A3A3; - line-height: 26rpx; - display: flex; - align-items: center; - padding-bottom: 25rpx; - - image { - margin-left: 0; - } - - .release { - padding: 0 10rpx 0 5rpx; - } - } - } - - } - } } diff --git a/pages/my/my.vue b/pages/my/my.vue index 3cc6540..6641a6f 100644 --- a/pages/my/my.vue +++ b/pages/my/my.vue @@ -18,8 +18,19 @@ 顾发航 - + + + + + + + + + @@ -51,7 +79,7 @@ color: #fff !important; } - .u-icon__icon { + .uicon-arrow-left { display: none !important; } @@ -73,4 +101,38 @@ } } + + .table { + background-color: #fff; + margin-top: 50rpx; + } + + .u-line { + display: none !important; + } + + .u-cell--clickable { + background-color: #fff !important; + } + + .u-cell { + border-bottom: 1rpx solid #EEEEEE; + + } + + .u-icon__icon--info { + font-size: 28rpx !important; + } + + .u-cell__title-text { + margin-left: 20rpx; + font-size: 24rpx !important; + color: #252421; + line-height: 33rpx !important; + } + + .u-cell__value { + font-size: 24rpx !important; + color: #CCCCCC !important; + } diff --git a/pages/news/news.vue b/pages/news/news.vue index 3f8af7d..7e115ec 100644 --- a/pages/news/news.vue +++ b/pages/news/news.vue @@ -1,22 +1,6 @@ @@ -26,39 +10,12 @@ data() { return { newsShow: true, - newsList: [{ - src: '/static/report/zhanwei_xf.png', - title: '2022近50款食品饮料新品,创新的方向都在这里', - time: '2022-12-03 09:59', - place: '第一食品资讯官方账号' - }, - { - src: '/static/report/zhanwei_zh.png', - title: '食品企业如何开发新产品?创新思维又发挥着怎样的效应呢?', - time: '2022-10-18 14:43', - place: '腾讯新闻 ' - }, - { - src: '/static/report/zhanwei_zh.png', - title: '食品企业如何开发新产品?创新思维又发挥着怎样的效应呢?', - time: '2022-10-18 14:43', - place: '腾讯新闻' - }, - ], } }, onLoad() { }, methods: { - // 跳转到新闻详情页 - clickNews(index) { - if (index == 0) { - uni.navigateTo({ - url: '/pages/detail/xwDetail/xwDetail' - }) - } - }, // this.newsShow = this.list.length === 0 ? true : false } } @@ -74,45 +31,4 @@ color: #BBBBBB; line-height: 28rpx; } - - .xw_content { - background: #FFFFFF; - border: 1rpx solid #EEEEEE; - display: flex; - padding: 29rpx 19rpx; - - .xw_right { - padding-left: 19rpx; - display: flex; - flex-direction: column; - - .xw_title { - font-size: 30rpx; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: bold; - color: #3E3E3E; - line-height: 42rpx; - -webkit-line-clamp: 2; - display: -webkit-box; - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; - } - - .xw_time { - font-size: 24rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #969696; - line-height: 33rpx; - padding-top: 3rpx; - } - - .xw_place { - padding-left: 20rpx; - } - } - - - } diff --git a/pages/report/report.vue b/pages/report/report.vue index 89eb91b..4c4efa8 100644 --- a/pages/report/report.vue +++ b/pages/report/report.vue @@ -19,23 +19,7 @@ 行业新闻 - - - - - - {{item.title}} - - - - {{item.time}} - - - {{item.place}} - - - - + @@ -45,39 +29,7 @@ 新品发布 - - - - - - - - - - {{item.img_tag}} - - - - {{item.title}} - - - - - {{item.desc}} - - - - - 发布日期: - {{item.time}} - - - - - - + @@ -87,20 +39,7 @@ 认证厂家 - - - - - - {{item.title}} - - - - {{tagsItem.tag}} - - - - + @@ -122,90 +61,7 @@ title: '认证厂家' }, ], - productList: [{ - src: '/static/products/zhanwei_dg.png', - title: '锅巴', - tag: '无添加剂', - img_tag: '零食铺子', - desc: '糯米蟹黄锅巴散装,非油炸绿色健康食品', - time: '2022-12-04' - }, - { - src: '/static/products/zhanwei_dg(2).png', - title: '干吃汤圆', - tag: '天然原料', - img_tag: '糕点卷酥', - desc: '休闲食品厂家甜品糯米食品零食闽南特产宵夜好吃糍粑', - time: '2022-12-04' - }, - { - src: '/static/products/zhanwei_dg(1).png', - title: '紫薯魔芋人参魔芋人参魔芋人参…', - tag: '天然原料', - img_tag: '健康创新', - desc: '紫薯魔芋人参代餐粉 冲调饮品贴牌加工 五谷杂粮粉代餐', - time: '2022-12-04' - }, - { - src: '/static/products/zhanwei_dg(3).png', - title: '焦糖饼干', - tag: '无防腐剂', - img_tag: '饼干曲奇', - desc: '比利时风味焦糖饼干代餐小吃零食品', - time: '2022-12-04' - } - ], - newsList: [{ - src: '/static/report/zhanwei_xf.png', - title: '2022近50款食品饮料新品,创新的方向都在这里', - time: '2022-12-03 09:59', - place: '第一食品资讯官方账号' - }, - { - src: '/static/report/zhanwei_zh.png', - title: '食品企业如何开发新产品?创新思维又发挥着怎样的效应呢?', - time: '2022-10-18 14:43', - place: '腾讯新闻 ' - }, - { - src: '/static/report/zhanwei_zh.png', - title: '食品企业如何开发新产品?创新思维又发挥着怎样的效应呢?', - time: '2022-10-18 14:43', - place: '腾讯新闻' - }, - ], - cjsList: [ - { - src: '/static/report/zhanwei_xf(1).png', - title: '西安兴沃丰餐饮管理有限责任公司', - tags: [{ - tag: '咖啡' - }, - { - tag: '饮品' - } - ] - }, - { - src: '/static/report/zhanwei_xf(2).png', - title: '福建省海纳川食品有限公司', - tags: [{ - tag: '活冻鲍鱼' - }, - { - tag: '鲍鱼罐头' - }, - { - tag: '佛跳墙' - }, - { - tag: '海螺片' - } - - ] - }, - ] } }, methods: { @@ -222,28 +78,8 @@ }) } }, - // 跳转到新闻详情页 - clickNews(index) { - if (index == 0) { - uni.navigateTo({ - url: '/pages/detail/xwDetail/xwDetail' - }) - } - }, - //点击图片跳转到详情页 - toDetailPage() { - uni.navigateTo({ - url: '/pages/detail/productsDetail/productsDetail' - }) - }, - // 跳转到认证厂家详情页 - clickCj(index) { - if (index == 0) { - uni.navigateTo({ - url: '/pages/detail/certifiedCjDetail/certifiedCjDetail' - }) - } - } + + } } @@ -286,54 +122,7 @@ } - .xw_content { - background: #FFFFFF; - border: 1rpx solid #EEEEEE; - display: flex; - padding: 29rpx 19rpx; - .xw_right { - padding-left: 19rpx; - display: flex; - flex-direction: column; - - .xw_title { - font-size: 30rpx; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: bold; - color: #3E3E3E; - line-height: 42rpx; - -webkit-line-clamp: 2; - display: -webkit-box; - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; - } - - .xw_time { - font-size: 24rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #969696; - line-height: 33rpx; - - } - - .xw_place { - padding-left: 20rpx; - } - - .cj_tags { - font-size: 24rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #969696; - line-height: 33rpx; - padding-right: 10rpx; - margin-top: 35rpx; - } - } - } .xpfb_text { color: #FCAC18; @@ -342,101 +131,4 @@ .rzcj_text { color: #78E13A; } - - .products_box { - padding: 10rpx; - - .u-grid-item { - - .bgContent { - position: absolute; - right: 0; - top: 0; - - .u-image__image { - margin-left: 5px; - } - - .img_tag { - position: absolute; - padding: 2rpx 8rpx; - right: 5px; - top: 30rpx; - border-radius: 54rpx 0px 0px 54rpx; - box-shadow: 0px 2rpx 4rpx 0px #078C42; - background: linear-gradient(135deg, #0DB658 0%, #16DD6D 100%); - font-size: 20rpx; - color: #FFFFFF; - line-height: 28rpx; - } - - - .title_box { - position: relative; - width: 100%; - display: flex; - justify-content: space-between; - align-items: center; - - .title { - width: 186rpx; - font-size: 26rpx; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: bold; - color: #0EBB5B; - line-height: 37rpx; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - } - - .u-tag { - height: 26rpx; - line-height: 26rpx; - background: linear-gradient(124deg, #FEAA19 0%, #FDCF3A 100%); - - .u-tag__text { - font-size: 20rpx; - } - - } - } - - .product_desc { - font-size: 22rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #3E3E3E; - line-height: 26rpx; - margin-top: 24rpx; - margin-bottom: 20rpx; - -webkit-line-clamp: 2; - display: -webkit-box; - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; - } - - .releaseDate { - font-size: 22rpx; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #A3A3A3; - line-height: 26rpx; - display: flex; - align-items: center; - padding-bottom: 25rpx; - - image { - margin-left: 0; - } - - .release { - padding: 0 10rpx 0 5rpx; - } - } - } - - } - } diff --git a/static/my/wo_icon_bd.png b/static/my/wo_icon_bd.png new file mode 100644 index 0000000..51a449c Binary files /dev/null and b/static/my/wo_icon_bd.png differ diff --git a/static/my/wo_icon_hyzx.png b/static/my/wo_icon_hyzx.png new file mode 100644 index 0000000..9bf8914 Binary files /dev/null and b/static/my/wo_icon_hyzx.png differ diff --git a/static/my/wo_icon_lljl.png b/static/my/wo_icon_lljl.png new file mode 100644 index 0000000..124d9a0 Binary files /dev/null and b/static/my/wo_icon_lljl.png differ diff --git a/static/my/wo_icon_lxkf.png b/static/my/wo_icon_lxkf.png new file mode 100644 index 0000000..87cf133 Binary files /dev/null and b/static/my/wo_icon_lxkf.png differ diff --git a/static/my/wo_icon_sc.png b/static/my/wo_icon_sc.png new file mode 100644 index 0000000..45db566 Binary files /dev/null and b/static/my/wo_icon_sc.png differ diff --git a/static/styles/news.scss b/static/styles/news.scss new file mode 100644 index 0000000..960be63 --- /dev/null +++ b/static/styles/news.scss @@ -0,0 +1,48 @@ + .xw_content { + background: #FFFFFF; + border: 1rpx solid #EEEEEE; + display: flex; + padding: 29rpx 19rpx; + + .xw_right { + padding-left: 19rpx; + display: flex; + flex-direction: column; + + .xw_title { + font-size: 30rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: bold; + color: #3E3E3E; + line-height: 42rpx; + -webkit-line-clamp: 2; + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } + + .xw_time { + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #969696; + line-height: 33rpx; + + } + + .xw_place { + padding-left: 20rpx; + } + + .cj_tags { + font-size: 24rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #969696; + line-height: 33rpx; + padding-right: 10rpx; + margin-top: 35rpx; + } + } + } \ No newline at end of file diff --git a/static/styles/products.scss b/static/styles/products.scss new file mode 100644 index 0000000..a2a7c32 --- /dev/null +++ b/static/styles/products.scss @@ -0,0 +1,97 @@ +.products_box { + padding: 10rpx; + + .u-grid-item { + position: relative; + + .bgContent { + position: absolute; + right: 0; + top: 0; + + .u-image__image { + margin-left: 6px; + } + + .img_tag { + position: absolute; + padding: 2rpx 8rpx; + right: 5px; + top: 30rpx; + border-radius: 54rpx 0px 0px 54rpx; + box-shadow: 0px 2rpx 4rpx 0px #078C42; + background: linear-gradient(135deg, #0DB658 0%, #16DD6D 100%); + font-size: 20rpx; + color: #FFFFFF; + line-height: 28rpx; + } + + + .title_box { + position: relative; + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + + .title { + width: 186rpx; + font-size: 26rpx; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: bold; + color: #0EBB5B; + line-height: 37rpx; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + .u-tag { + height: 26rpx; + line-height: 26rpx; + background: linear-gradient(124deg, #FEAA19 0%, #FDCF3A 100%); + + .u-tag__text { + font-size: 20rpx; + } + + } + } + + .product_desc { + font-size: 22rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #3E3E3E; + line-height: 26rpx; + margin-top: 24rpx; + margin-bottom: 20rpx; + -webkit-line-clamp: 2; + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + } + + .releaseDate { + font-size: 22rpx; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #A3A3A3; + line-height: 26rpx; + display: flex; + align-items: center; + padding-bottom: 25rpx; + + image { + margin-left: 0; + } + + .release { + padding: 0 10rpx 0 5rpx; + } + } + } + + } +} diff --git a/uni.scss b/uni.scss index 4bbd5fd..a9f4a55 100644 --- a/uni.scss +++ b/uni.scss @@ -12,7 +12,8 @@ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件 */ @import 'uview-ui/theme.scss'; - +@import 'static/styles/products.scss'; +@import 'static/styles/news.scss'; /* 颜色变量 */