diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue
index cc9d4d2..5a2a73b 100644
--- a/components/zbpSwiper.vue
+++ b/components/zbpSwiper.vue
@@ -5,7 +5,7 @@
![]()
-
+
{{street}}
@@ -26,7 +26,7 @@
-
+
@@ -35,15 +35,26 @@
+
+ .newsDetail .title {
+ padding: 0 30rpx;
+ font-size: 34rpx;
+ color: #282828;
+ font-weight: bold;
+ margin: 45rpx 0 23rpx 0;
+ line-height: 1.5;
+ }
+
+ .newsDetail .list {
+ margin: 0 30rpx;
+ padding-bottom: 25rpx;
+ }
+
+ .newsDetail .list .label {
+ font-size: 30rpx;
+ color: #B1B2B3;
+ }
+
+ .newsDetail .list .item {
+ margin-left: 27rpx;
+ font-size: 30rpx;
+ color: #B1B2B3;
+ }
+
+ .newsDetail .list .item .iconfont {
+ font-size: 28rpx;
+ margin-right: 10rpx;
+ }
+
+ .newsDetail .list .item .iconfont.icon-shenhezhong {
+ font-size: 26rpx;
+ }
+
+ .newsDetail .conters {
+ padding: 0 30rpx;
+ font-size: 32rpx;
+ line-height: 1.7;
+
+ /deep/ img {
+ max-width: 100%;
+ }
+ }
+
+ .newsDetail .picTxt {
+ width: 690rpx;
+ height: 200rpx;
+ border-radius: 20rpx;
+ border: 1px solid #e1e1e1;
+ position: relative;
+ margin: 30rpx auto 0 auto;
+ }
+
+ .newsDetail .picTxt .pictrue {
+ width: 200rpx;
+ height: 200rpx;
+ }
+
+ .newsDetail .picTxt .pictrue image {
+ width: 100%;
+ height: 100%;
+ border-radius: 20rpx 0 0 20rpx;
+ display: block;
+ }
+
+ .newsDetail .picTxt .text {
+ width: 460rpx;
+ }
+
+ .newsDetail .picTxt .text .name {
+ font-size: 30rpx;
+ color: #282828;
+ }
+
+ .newsDetail .picTxt .text .money {
+ font-size: 24rpx;
+ margin-top: 40rpx;
+ font-weight: bold;
+ }
+
+ .newsDetail .picTxt .text .money .num {
+ font-size: 36rpx;
+ }
+
+ .newsDetail .picTxt .text .y_money {
+ font-size: 26rpx;
+ color: #999;
+ text-decoration: line-through;
+ }
+
+ .newsDetail .picTxt .label {
+ position: absolute;
+ background-color: #303131;
+ width: 160rpx;
+ height: 50rpx;
+ right: -7rpx;
+ border-radius: 25rpx 0 6rpx 25rpx;
+ text-align: center;
+ line-height: 50rpx;
+ bottom: 24rpx;
+ }
+
+ .newsDetail .picTxt .label .span {
+ background-image: linear-gradient(to right, #fff71e 0%, #f9b513 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+
+ .newsDetail .picTxt .label:after {
+ content: " ";
+ position: absolute;
+ width: 0;
+ height: 0;
+ border-bottom: 8rpx solid #303131;
+ border-right: 8rpx solid transparent;
+ top: -7rpx;
+ right: 0;
+ }
+
+ .newsDetail .bnt {
+ color: #fff;
+ font-size: 30rpx;
+ width: 690rpx;
+ height: 90rpx;
+ border-radius: 45rpx;
+ margin: 48rpx auto;
+ text-align: center;
+ line-height: 90rpx;
+ }
+
\ No newline at end of file
diff --git a/pages/news_list/index.vue b/pages/news_list/index.vue
index 02c4887..a03bd95 100644
--- a/pages/news_list/index.vue
+++ b/pages/news_list/index.vue
@@ -1,310 +1,339 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
- {{item.title}}
- {{item.create_time}}
-
-
-
-
-
-
-
-
-
-
-
- 暂无新闻信息~
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.create_time}}
+
+
+
+
+
+
+
+
+
+
+
+ 暂无新闻信息~
+
+
+
+
+ .newsList .swiper {
+ width: 100%;
+ position: relative;
+ box-sizing: border-box;
+ padding: 0 30rpx;
+ }
+
+ .newsList .swiper swiper {
+ width: 100%;
+ height: 365rpx;
+ position: relative;
+ }
+
+ .newsList .swiper .slide-image {
+ width: 100%;
+ height: 335rpx;
+ border-radius: 6rpx;
+ }
+
+ // #ifdef MP-WEIXIN
+ .newsList .swiper .wx-swiper-dot {
+ width: 12rpx !important;
+ height: 12rpx !important;
+ border-radius: 0;
+ transform: rotate(-45deg);
+ transform-origin: 0 100%;
+ }
+
+ .newsList .swiper .wx-swiper-dot~.wx-swiper-dot {
+ margin-left: 5rpx;
+ }
+
+ .newsList .swiper .wx-swiper-dots.wx-swiper-dots-horizontal {
+ margin-bottom: -15rpx;
+ }
+
+ // #endif
+ // #ifdef APP-PLUS || H5
+ .newsList .swiper .uni-swiper-dot {
+ width: 12rpx !important;
+ height: 12rpx !important;
+ border-radius: 0;
+ transform: rotate(-45deg);
+ transform-origin: 0 100%;
+ }
+
+ .newsList .swiper .uni-swiper-dot~.uni-swiper-dot {
+ margin-left: 5rpx;
+ }
+
+ .newsList .swiper .uni-swiper-dots.uni-swiper-dots-horizontal {
+ margin-bottom: -15rpx;
+ }
+
+ // #endif
+ .newsList .nav {
+ padding: 0 30rpx;
+ width: 100%;
+ white-space: nowrap;
+ box-sizing: border-box;
+ margin-top: 43rpx;
+ }
+
+ .newsList .nav .item {
+ display: inline-block;
+ font-size: 32rpx;
+ color: #999;
+ min-width: 130rpx;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ position: relative;
+ padding-bottom: 20rpx;
+ }
+
+ .newsList .nav .item.on {
+ color: #282828;
+ }
+
+ .newsList .nav .item~.item {
+ margin-left: 46rpx;
+ }
+
+ .newsList .nav .item .line {
+ width: 24rpx;
+ height: 4rpx;
+ border-radius: 2rpx;
+ margin: 10rpx auto 0 auto;
+ position: absolute;
+ bottom: 5rpx;
+ left: 50%;
+ margin-left: -12rpx;
+ }
+
+ .newsList .list .item {
+ margin: 0 30rpx;
+ border-bottom: 1px solid #f0f0f0;
+ padding: 35rpx 0;
+ }
+
+ .newsList .list .item .pictrue {
+ width: 250rpx;
+ height: 156rpx;
+ }
+
+ .newsList .list .item .pictrue image {
+ width: 100%;
+ height: 100%;
+ border-radius: 6rpx;
+ }
+
+ .newsList .list .item .text {
+ width: 420rpx;
+ height: 156rpx;
+ font-size: 24rpx;
+ color: #999;
+ }
+
+ .newsList .list .item .text .name {
+ font-size: 30rpx;
+ color: #282828;
+ }
+
+ .newsList .list .item .picList .pictrue {
+ width: 335rpx;
+ height: 210rpx;
+ margin-top: 30rpx;
+ }
+
+ .newsList .list .item .picList.on .pictrue {
+ width: 217rpx;
+ height: 136rpx;
+ }
+
+ .newsList .list .item .picList .pictrue image {
+ width: 100%;
+ height: 100%;
+ border-radius: 6rpx;
+ }
+
+ .newsList .list .item .time {
+ text-align: right;
+ font-size: 24rpx;
+ color: #999;
+ margin-top: 22rpx;
+ }
+
+ .noCommodity {
+ border: none;
+ }
+
+ .empty-box {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ margin-top: 200rpx;
+
+ image {
+ width: 414rpx;
+ height: 240rpx;
+ }
+
+ .txt {
+ font-size: 26rpx;
+ color: #999;
+ text-align: center;
+ }
+ }
+
\ No newline at end of file
diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue
index 0377eec..545dab3 100644
--- a/pages/store/home/index.vue
+++ b/pages/store/home/index.vue
@@ -179,7 +179,8 @@
-
+
+
@@ -429,8 +430,14 @@
import request from "@/utils/request.js";
import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
import easyLoadimage from '@/components/easy-loadimage/easy-loadimage.vue'
- import { getStoreDetail, getStoreGoods, getStoreCategory, followStore, unfollowStore,
- storeServiceList } from '@/api/store.js';
+ import {
+ getStoreDetail,
+ getStoreGoods,
+ getStoreCategory,
+ followStore,
+ unfollowStore,
+ storeServiceList
+ } from '@/api/store.js';
import { initiateAssistApi, getTopicList } from '@/api/activity.js';
import { getShopCoupons, setCouponReceive, getDiy } from '@/api/api.js';
import { getUserInfo } from '@/api/user.js';
@@ -512,7 +519,7 @@
isColumn: true, // 商品列表排列方式
navShow: false,
navActive: 0,
- diyActive: 0,
+ diyActive: 1,
tabActive: 0, // 底部切换
isCoupon: 0,
keyword: '',
@@ -592,6 +599,21 @@
value: 4,
}
],
+ tabs3: [{
+ icon: 'icon-gouwu_o',
+ name: '商品',
+ value: 3,
+ },
+ {
+ icon: 'icon-yingyongAPP_o',
+ name: '分类',
+ value: 2,
+ }, {
+ icon: 'icon-yizhan_o',
+ name: '里海云仓',
+ value: 6,
+ }
+ ],
tabs: [],
storeScroll: true,
storeTop: 0,
@@ -599,7 +621,7 @@
currSpid: "",
topicList: [],
service_open: false,
- type: 0,
+ type: 3,
statusBarHeight: 0
}
},
@@ -658,7 +680,7 @@
},
},
onLoad: function(options) {
- this.type = parseInt(options.type) || 1
+ this.type = parseInt(options.type) || 3
this.id = options.mer_id || options.id || 0;
this.isCoupon = options.coupon || 0;
this.diyActive = options.order || 0;
@@ -877,6 +899,7 @@
this.tabs = this.tabs2
this.service_open = false
}
+ this.tabs = this.tabs3
this.tab(this.type)
// #ifdef H5
this.ShareInfo();
@@ -894,12 +917,14 @@
},
// 获取商铺商品
getGoods: function() {
+ console.log('获取店铺商品');
let that = this;
if (that.loadend) return;
if (that.loading) return;
if (that.goodsLoading) return;
that.goodsLoading = true;
that.loadTitle = '';
+ console.log('111');
getStoreGoods(that.id, that.where).then(res => {
that.goodsLoading = false;
let list = res.data.list;
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index dc5899b..5e901a7 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -1,19 +1,12 @@
-
+
-
+ :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${street_id}`">
- 通滩镇
+ {{town||JSON.parse(location).address_component.street}}
-供销综合云市场-
@@ -29,14 +22,7 @@
-
-
+
{{item.title}}
@@ -50,20 +36,20 @@
- 最新动态
+
-
+
-
+
{{item.title}}
- {{item.author && item.author.nickname}}
+ {{item.author}}
@@ -78,8 +64,6 @@
-
@@ -97,171 +81,82 @@
import zbpSwiper from '@/components/zbpSwiper'
import { mapGetters } from 'vuex'
import mTabbar from '@/components/m-tabbar/m-tabbar.vue'
- import WaterfallsFlow from '@/components/plantWaterfallsFlow/WaterfallsFlow.vue'
- import { getSlideAPI, getArea, getStreet, getArticleListAPI } from '@/api/article.js'
- import { graphicLstApi, getTopicList, graphicStartApi } from '@/api/community.js'
- import { getDiy, getArticleCategoryList, getArticleList } from '@/api/api.js'
+ import { graphicStartApi } from '@/api/community.js'
+ import { getArticleList, getArticleCategoryList } from '@/api/api.js'
import { Toast } from '@/libs/uniApi'
export default {
components: {
- WaterfallsFlow,
mTabbar,
zbpSwiper
},
data() {
return {
- showPicker: false,
- columnData: [],
- show: false,
- sotreParam: {
- street_id: '',
- page: 1
- },
- swiper: {
- url: [{
- img: ''
- }],
- indicatorDots: true, // 显示面板指示点
- vertical: false, // 滑动方向是否为纵向
- autoplay: true, // 是否自动切换
- interval: 2000, // 自动切换时间间隔
- duration: 500 // 滑动动画时长
- },
tabsData: {
list: [],
- tabsActive: 0,
- activeStyle: {
- color: '#F84221',
- fontWeight: 'bold',
- borderRadius: '100px',
- backgroundColor: '#fff',
- padding: '15.79rpx 21.05rpx'
- },
- inactiveStyle: {
- color: '#fff',
- padding: '15.79rpx 21.05rpx',
- }
+ tabsActive: 0
},
- cateGoods: [],
- where: {
- category_id: 0,
- page: 1,
- limit: 30
- },
- currentItemId: 69, // 默认获取 社区的数据 0 表示推荐 || 69 社区
- keyword: '',
- district: '',
town: '',
emptyShow: false,
- articleList: []
+ articleList: [],
+ recoList: [],
+ street_id: ''
}
},
onLoad() {
- this.getBanner()
- this.getCateList()
- this.getGoods()
- this.articleHotList()
- this.Area()
uni.$on('resetLocation', function() {
console.log('resetLocation');
})
+ this.getArticle()
+ getArticleList(19).then(res => {
+ this.recoList = res.data.list
+ })
},
onShow() {},
computed: mapGetters(['location']),
methods: {
+ selectPlce(e) {
+ this.town = e.value[1].name
+ },
navigat() {
uni.navigateTo({
url: '/pages/store/settledApply/settledApply'
})
},
- async articleHotList() {
- const res = await getArticleList(19)
- // console.log('res', res);
- this.articleList = res.data.list
- },
gogogo(item) {
uni.navigateTo({
- url: '/pages/plantGrass/plant_detail/index?id=' + item.community_id
+ url: '/pages/news_details/index?id=' + item.article_id
})
},
+ async getArticle() {
+ let list = []
+ const { data } = await getArticleCategoryList()
+ data.map((item, index) => {
+ if (item.title !== '推荐') {
+ list.push(item)
+ }
+ })
+ this.tabsData.list = list
+ this.getArticleList(list[0].article_category_id)
+ },
+ async getArticleList(id) {
+ const { data } = await getArticleList(id)
+ this.articleList = data.list
+ },
+ // 点赞
giveStart(item) {
- let status = item.relevance_id ? 0 : 1
- graphicStartApi(item.community_id, { status: status }).then(res => {
- Toast(res.message)
- this.getGoods()
- })
- },
- dianji() {
- this.show = !this.show
- },
- likeToggle(item) {
- console.log('item', item);
- },
- // 获取发现商品
- getGoods: function() {
- // 数据写死：默认社区数据 category_id=69&page=1&limit=30
- console.log('id', this.currentItemId);
- graphicLstApi({
- ...this.where,
- category_id: this.currentItemId
- }).then(res => {
- this.cateGoods = res.data.list
- res.data.list.length <= 0 ? this.emptyShow = true : this.emptyShow = false
- })
- },
- /*获取分类列表*/
- async getCateList() {
- const {
- data
- } = await getTopicList()
- this.tabsData.list = data
+ // let status = item.status ? 0 : 1
+ // graphicStartApi(item.community_id, { status: status }).then(res => {
+ // Toast(res.message)
+ // this.getArticleList()
+ // })
},
tabsChange(item) {
+ this.getArticleList(item.article_category_id)
this.street_id = item.id
this.tabsData.tabsActive = item.index
},
- async getBanner() {
- const { data } = await getDiy({ id: 0 })
- if (data.value['1683638943100000']) {
- this.swiper.url = data.value['1683638943100000'].swiperConfig.list
- } else {
- this.swiper.url = data.value['1683875164005000'].swiperConfig.list
- }
- },
- // 二级联动
- changeHandler(e) {
- const { columnIndex, value, values, index, picker = this.$refs.uPicker } = e;
- if (columnIndex === 0) {
- getStreet({ area_code: value[0]['code'] }).then(res => {
- this.$refs.uPicker.setColumnValues(1, res.data);
- });
- }
- },
- confirm(e) {
- this.district = e.value[0].name
- this.town = e.value[1].name
- this.sotreParam.page = 1
- this.sotreParam.street_id = e.value[1].code
- this.showPicker = false
- },
- Area() {
- getArea({ city_code: 510500 }).then(res => {
- this.$refs.uPicker.setColumnValues(0, res.data);
- this.Street(res.data[0]['code']);
- });
- },
- Street(code) {
- getStreet({ area_code: code }).then(res => {
- this.$refs.uPicker.setColumnValues(1, res.data);
- });
- },
},
onPullDownRefresh() {
- this.getBanner()
- this.getCateList()
- this.getGoods()
- this.articleHotList()
- this.Area()
uni.stopPullDownRefresh()
}
}
@@ -283,68 +178,6 @@
z-index: 2;
}
- .supply_chains-head {
- margin-bottom: 31.58rpx;
-
- .swiper {
- width: 100%;
- height: 500rpx;
- margin: 0 auto;
-
- .swi_item {
- width: 100%;
- height: 500rpx;
- }
- }
- }
-
- .bg_color {
- position: absolute;
- top: 0;
- left: 0;
- z-index: 1;
- width: 100%;
- height: 940.35rpx;
- background: url("https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/home_bg.png") no-repeat;
- background-size: cover;
- }
-
- .search_wrapper {
- width: 694.74rpx;
- margin: 0 auto;
-
-
- .iconlihai {
- color: #fff;
- font-size: 31.58rpx;
- }
-
- .search_content {
- // flex: 1;
- // margin: 0 auto;
- width: 575.44rpx;
- height: 66.67rpx;
- padding: 2px 2px 2px 21.05rpx;
- border-radius: 100px;
- background-color: #fff;
-
- .icon-sousuo {
- font-weight: bold;
- color: #f84221;
- margin-right: 17.54rpx;
- }
-
- .search_btn {
- color: #fff;
- width: 135.09rpx;
- height: 59.65rpx;
- line-height: 59.65rpx;
- background: #f84221;
- border-radius: 100px;
- }
- }
- }
-
.shop_wrapper {
height: 192.98rpx;
width: 694.74rpx;
@@ -491,10 +324,6 @@
margin: 38.6rpx auto;
margin-bottom: 21.05rpx;
- ::v-deep .u-tabs__wrapper__nav__item {
- padding: 0 !important;
- }
-
.title {
font-size: 31.58rpx;
font-weight: bold;