diff --git a/App.vue b/App.vue
index 87cb497..9e4a0fe 100644
--- a/App.vue
+++ b/App.vue
@@ -77,6 +77,7 @@
this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
this.globalData.uid = this.$store.state.app.uid;
+ // #ifdef APP-PLUS
//监听uni小程序发送的事件
mp.onUniMPEventReceive(ret => {
console.log('小程序事件: ', ret);
@@ -86,6 +87,7 @@
});
}
});
+ // #endif
let that = this;
// #ifdef MP
diff --git a/components/WaterfallsFlow/WaterfallsFlowo.vue b/components/WaterfallsFlow/WaterfallsFlowo.vue
index 561592e..e8cc612 100644
--- a/components/WaterfallsFlow/WaterfallsFlowo.vue
+++ b/components/WaterfallsFlow/WaterfallsFlowo.vue
@@ -101,7 +101,7 @@ export default {
if(this.mark < this.allList.length){
this.waterFall()
}
-
+ console.log(this.rightList,this.leftList)
}
},
immediate: true,
diff --git a/components/WaterfallsFlow/WaterfallsFlows.vue b/components/WaterfallsFlow/WaterfallsFlows.vue
index 17461f6..e954156 100644
--- a/components/WaterfallsFlow/WaterfallsFlows.vue
+++ b/components/WaterfallsFlow/WaterfallsFlows.vue
@@ -108,7 +108,6 @@ export default {
deep:true
},
mounted(){
-
this.getUserInfo()
},
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
index 7e8b621..a30a5c5 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
@@ -1,16 +1,14 @@
-
-
-
+
{{item.title}}
-
{{ item.author.nickname }}
@@ -41,7 +39,6 @@
this.getUserInfo()
},
-
methods: {
/**
* 获取个人用户信息
@@ -62,7 +59,6 @@
url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1`
// #endif
})
-
} else {
uni.navigateTo({
url: `/pages/plantGrass/plant_detail/index?id=${item.community_id}`
diff --git a/pages.json b/pages.json
index f70167c..627f062 100644
--- a/pages.json
+++ b/pages.json
@@ -1529,7 +1529,6 @@
"selectedColor": "#E93323",
"borderStyle": "white",
"backgroundColor": "#ffffff",
- "fontSize": "25rpx",
"list": [{
"pagePath": "pages/index/index",
"iconPath": "static/tabbar_icon/a.png",
@@ -1564,13 +1563,11 @@
}
],
"midButton": {
- "width": "78rpx",
- "height": "126rpx",
- "iconWidth": "78rpx",
+ "width": "68px",
+ "height": "70px",
+ "iconWidth": "48px",
"pagePath": "pages/plant_release/index",
"iconPath": "static/tabbar_icon/d.png",
- // "selectedIconPath": "static/tabbar_icon/d-a.png",
-
"text": "发布"
}
diff --git a/pages/columnGoods/goods_list/index.vue b/pages/columnGoods/goods_list/index.vue
index def6ed8..ea0fbeb 100644
--- a/pages/columnGoods/goods_list/index.vue
+++ b/pages/columnGoods/goods_list/index.vue
@@ -77,7 +77,6 @@
-
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index d750591..992c8b3 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,644 +1,611 @@
-
-
-
-
-
-
-
-
- {{street}}
-
-
-
-
-
-
-
-
-
-
-
-
- 更多功能
- 编辑
- 完成
-
-
-
-
-
+
+
+
+
+
+ 更多功能
+ 编辑
+ 完成
+
+
+
+
+
-
-
-
- {{ item.name }}
-
-
-
- 还没有应用,点我添加应用
-
-
-
-
- 编辑功能
- 完成
-
-
-
-
-
-
-
- {{ item.name }}
-
-
-
-
+ ">
+
+
+
+ {{ item.name }}
+
+
+
+ 还没有应用,点我添加应用
+
+
+
+
+ 编辑功能
+ 完成
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6917f14..4a48eb3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,197 +1,225 @@
-
-
-
-
-
-
-
-
- {{street}}
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 位置权限使用说明
-
-
- 用于向你推荐最近门店
-
-
-
+
+ 位置权限使用说明
+ 用于向你推荐最近门店
+
+
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue
index 81d380f..a664519 100644
--- a/pages/nongKe/supply_chain/supplierA.vue
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -1,264 +1,270 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{titName}}
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.mer_name}}
- {{item.type_name}}
+
+
+
+
-
-
- 5.0
- 月销2000+
-
-
-
- {{item.service_phone}}
-
-
-
- {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
-
-
-
- {{item.mer_address}}
+
+ {{titName}}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{item.mer_name}}
+ {{item.type_name}}
+
+
+
+ 5.0
+ 月销2000+
+
+
+
+ {{item.service_phone}}
+
+
+
+ {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
+
+
+
+ {{item.mer_address}}
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+ -->
-
-
+
+ -->
-
-
-
-
- 暂无店铺,快去搜索其他店铺吧
+
+
+
+ 暂无店铺,快去搜索其他店铺吧
+
+
+
+
+
+
+
-
-
-
-
-
+
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index aba5372..cef4cd9 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -132,7 +132,8 @@
客服电话:
-
+
+
开启先货后款:
@@ -154,6 +155,7 @@
开启后,店铺即可展示在移动端
-->
+
@@ -265,7 +267,8 @@
credit_buy: false, //开启信用购
interest_rate: '', //利率
settle_cycle: '', //周期
- mer_name:''
+ mer_name:'',
+ type_code:''
}
},
onLoad(e) {
@@ -295,6 +298,7 @@
res.data.mer_take_day.forEach((item, i) => {
this.dateWeek[Number(item) - 1].isCheck = true
})
+ this.type_code= res.data.type_code
this.mer_take_time = res.data.mer_take_time
this.intro = res.data.mer_info
this.cruxText = res.data.mer_keyword
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 2c9e80f..c245860 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -319,8 +319,7 @@
-
-
+
@@ -705,15 +704,15 @@
// })'
// that.isUser ?
videoList({
- page: that.page,
- limit: that.limit,
- id:this.videoID
-
- }).then(res=>{
- that.getVideoData(res.data.list);
+ page: that.page,
+ limit: that.limit,
+ id: this.videoID
+
+ }).then(res => {
+ that.getVideoData(res.data.list);
})
-
-
+
+
//:
// graphicLstApi({
// page: that.page,
@@ -746,7 +745,7 @@
})
},
getVideoData(list) {
-
+
if (list.length == 0) return
let that = this;
that.loadVideo = list.length == that.limit
@@ -757,7 +756,7 @@
msg[i]['community_id'] = msg[i]['community_id'].toString()
that.dataList.push(msg[i])
}
-
+
if (that.dataList.length !== 0) {
that.dataList[that.k].state = 'play';
setTimeout(function() {
@@ -883,8 +882,8 @@
// 这个方法主要就是用来第一次进入视频播放时用来处理
deoList(this.videoID).then(async (res) => {
this.loadVideo = false
- this.userUid=res.data.uid
- this.page = this.page + 1;
+ this.userUid = res.data.uid
+ this.page = this.page + 1;
var msg = [res.data];
for (let i = 0; i < msg.length; i++) {
msg[i]['isMore'] = false
@@ -895,7 +894,7 @@
msg[i]['community_id'] = msg[i]['community_id'].toString()
}
this.dataList = msg;
-
+
if (this.dataList.length !== 0) {
this.dataList[this.k].state = 'play';
uni.createVideoContext(this.dataList[this.k].community_id, this).play()
@@ -1239,6 +1238,7 @@
left: 0;
top: 70rpx;
height: 86rpx;
+
.icon-xiangzuo {
margin-left: 10px;
diff --git a/pages/short_video/components/index/icon-back.png b/pages/short_video/components/index/icon-back.png
new file mode 100644
index 0000000..f1a635f
Binary files /dev/null and b/pages/short_video/components/index/icon-back.png differ
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 50968b1..cff11cd 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -775,8 +775,7 @@
page: that.page,
limit: that.limit,
id: this.videoID
- // is_star: that.isSatrt,
- // community_id: that.videoID
+
}).then(res => {
that.videoData(res.data.list)
if (res.data.list.length < that.limit) {
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 1d123bc..87e4007 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -88,7 +88,7 @@
+ @click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
-
+