diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
index df1b617..d5de85b 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
@@ -30,7 +30,7 @@
{{item.merchant.mer_name}}
-
+
diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue
index d670711..f1c4653 100644
--- a/components/orderGoods/index.vue
+++ b/components/orderGoods/index.vue
@@ -45,6 +45,7 @@
{{item.product_num - item.refund_num}}
已退款 x
{{item.product_num - item.refund_num}}
+
去评价
已评价
@@ -114,9 +115,8 @@
申请退款
-
去评价
已评价
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 9452b28..952185d 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -1,5 +1,6 @@
+
@@ -488,12 +489,12 @@
// console.log('到后台');
},
onLoad(options) {
- console.log(options);
+
this.videoID = options.id || 0;
this.isUser = options.user == 1 ? true : false;
this.userUid = options.uid ? options.uid : 0;
this.isSatrt = options.tab == 1 ? 1 : 0;
- if (options.pid) app.globalData.spid = options.pid;
+ // if (options.pid) app.globalData.spid = options.pid;
// console.log('到后台');
this.platform = uni.getSystemInfoSync().platform
this.windowWidth = uni.getSystemInfoSync().screenWidth //获取屏幕宽度
@@ -501,7 +502,7 @@
this.wHeight = uni.getSystemInfoSync().screenHeight; //获取屏幕高度
this.boxStyle.height = this.wHeight; //改变视频高度
this.get() //这一步，加载视频数据
- if (this.isLogin) this.getUserInfo()
+ // if (this.isLogin) this.getUserInfo()
},
onReady() {},
methods: {
@@ -662,9 +663,9 @@
// this.getUserInfo()
// },
// 授权关闭
- authColse: function(e) {
- this.isShowAuth = e
- },
+ // authColse: function(e) {
+ // this.isShowAuth = e
+ // },
moreTap(item) {
item.isMore = !item.isMore;
},
@@ -749,6 +750,7 @@
})
},
getVideoData(list) {
+ console.log(list,'111111')
if (list.length == 0) return
let that = this;
that.loadVideo = list.length == that.limit
@@ -760,6 +762,7 @@
msg[i]['community_id'] = msg[i]['community_id'].toString()
that.dataList.push(msg[i])
}
+ console.log(that.dataList)
if (that.dataList.length !== 0) {
that.dataList[that.k].state = 'play';
setTimeout(function() {
@@ -882,13 +885,12 @@
get() {
// if(!this.loadVideo) return
this.loadVideo = true
- // 这个方法主要就是用来第一次进入视频播放时用来处理的
-
+ // 这个方法主要就是用来第一次进入视频播放时用来处理
deoList(this.videoID).then(async (res) => {
this.loadVideo = false
this.page = 1;
var msg = [res.data];
-
+ console.log(res.data)
for (let i = 0; i < msg.length; i++) {
msg[i]['isMore'] = false
msg[i]['playIng'] = false
@@ -898,6 +900,7 @@
msg[i]['community_id'] = msg[i]['community_id'].toString()
}
this.dataList = msg;
+ console.log(this.dataList)
if (this.dataList.length !== 0) {
this.dataList[this.k].state = 'play';
uni.createVideoContext(this.dataList[this.k].community_id, this).play()
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 7da5535..22d7c56 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -6,7 +6,7 @@
-
+
{{street}}
@@ -24,10 +24,10 @@
-
-
-
+
+
+
-
+
-
+
-
+
@@ -176,7 +176,7 @@
import {
getIndexData,
getDiy,
-
+
} from '@/api/api.js'
import {
@@ -184,7 +184,8 @@
} from '@/api/product.js';
import {
getGeocoder,
- merClassifly
+ merClassifly,
+ getProductHot
} from '@/api/store.js';
import {
getArea,
@@ -251,16 +252,16 @@
onPullDownRefresh() {
this.cateGoods = []
- // this.list()
+ this.list()
this.Area()
uni.stopPullDownRefresh()
},
onLoad() {
-
-
+this.list()
+
this.Area()
-
+
// this.openTongZhi()
uni.$on('connectstatusChange', (connectstatus) => {
@@ -281,25 +282,25 @@
this.status = 'loading';
t
this.where.page = ++this.where.page;
- // this.list()
+ this.list()
},
mounted() {
-
+
// #ifdef H5
// 监听页面滚动事件
window.addEventListener("scroll", this.scrolling);
// #endif
-
- this.$bus.$on('value-updated', (newValue) => {
- // 更新父组件的值
- this.street = newValue.split(',')[0]
- this.town=newValue.split(',')[0]
- this.street_id=newValue.split(',')[1]
- });
-
-
-
- if(this.street.length<=0){
+
+ this.$bus.$on('value-updated', (newValue) => {
+ // 更新父组件的值
+ this.street = newValue.split(',')[0]
+ this.town = newValue.split(',')[0]
+ this.street_id = newValue.split(',')[1]
+ });
+
+
+
+ if (this.street.length <= 0) {
this.selfLocation()
}
@@ -325,10 +326,14 @@
methods: {
list() {
- spuInfo('510502106', this.where1).then(res => {
+ getProductHot(1,10).then(res => {
// console.log(res)
this.cateGoods = res.data.list
})
+ // spuInfo('510502106', this.where1).then(res => {
+ // // console.log(res)
+ // this.cateGoods = res.data.list
+ // })
},
scrolling() {
// 滚动条距文档顶部的距离
@@ -372,11 +377,11 @@
},
-
-
+
+
getCloudShopMerId(id) {
get_cloud_shop(id).then(res => {
res.data.length > 0 ? this.isYunCang = 1 : this.isYunCang = 0
@@ -470,7 +475,7 @@
uni.navigateTo({
url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}`
})
-
+
},
dchange(e) {
this.street = e.value[1].name
@@ -500,7 +505,7 @@
this.town = res.data.address_reference.town.title
this.street_id = res.data.address_reference.town.id
this.street = res.data.address_component.street
- uni.$emit('add',this.street+','+this.street_id)
+ uni.$emit('add', this.street + ',' + this.street_id)
// uni.setStorageSync('ADRESS_LOCATION',
// this.town + ',' + this.street_id)
// this.list()
@@ -522,8 +527,8 @@
});
},
-
-
+
+
}
}
@@ -534,7 +539,7 @@
}
page {
- background-color: #F4F7FE;
+ background: #F4F7FE;
// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
}
@@ -755,7 +760,7 @@
width: 356rpx;
height: 235rpx;
position: relative;
- background: linear-gradient(180deg, #3B7733 0%, rgba(59, 118, 50, 0.88) 60%, rgba(56, 113, 49, 0) 100%);
+
.list-title {
display: flex;
@@ -763,7 +768,7 @@
top: 20rpx;
.list-titlea {
-
+
margin-left: 14rpx;
width: 96rpx;
height: 117rpx;
@@ -812,7 +817,7 @@
}
.titleb {
-
+
font-size: 33rpx;
font-family: PingFang SC-Medium, PingFang SC;
font-weight: 500;
@@ -823,15 +828,21 @@
}
.list-title-info {
-
+ width: 98rpx;
+ height: 30rpx;
+ background: #FFFFFF;
padding: 2rpx 2rpx;
display: flex;
font-size: 10rpx;
- background: #FFFFFF;
+ font-size: 18rpx;
+ font-family: PingFang SC-Medium, PingFang SC;
+ font-weight: 500;
+ color: #FF6B00;
border-radius: 19rpx 19rpx 19rpx 19rpx;
position: absolute;
bottom: 14rpx;
- left: 100rpx;
+ left: 50%;
+ margin-left: -49rpx;
padding-left: 15rpx;
.title-infoimg {
@@ -860,10 +871,10 @@
padding: 12rpx;
.list-con-left {
- width: 356rpx;
+ width: 357rpx;
height: 482rpx;
position: relative;
- background: linear-gradient(180deg, #3B7733 0%, rgba(59, 118, 50, 0.88) 60%, rgba(56, 113, 49, 0) 100%);
+
.list-con-title {
position: absolute;
@@ -902,7 +913,7 @@
width: 356rpx;
height: 235rpx;
position: relative;
- background: linear-gradient(180deg, #3B7733 0%, rgba(59, 118, 50, 0.88) 60%, rgba(56, 113, 49, 0) 100%);
+
.list-con-title {
position: absolute;
diff --git a/static/images/f1.png b/static/images/f1.png
index 36f6686..e0c77a8 100644
Binary files a/static/images/f1.png and b/static/images/f1.png differ
diff --git a/static/images/f2.png b/static/images/f2.png
index 73b7c43..5e12ffc 100644
Binary files a/static/images/f2.png and b/static/images/f2.png differ
diff --git a/static/images/f5.png b/static/images/f5.png
index 2bb8854..2e84ae3 100644
Binary files a/static/images/f5.png and b/static/images/f5.png differ
diff --git a/static/images/f6.png b/static/images/f6.png
index c61178a..c5c3f2a 100644
Binary files a/static/images/f6.png and b/static/images/f6.png differ
diff --git a/static/images/f7.png b/static/images/f7.png
index 3e8545c..5f2f760 100644
Binary files a/static/images/f7.png and b/static/images/f7.png differ