diff --git a/App.vue b/App.vue
index 088d48f..e0645a9 100644
--- a/App.vue
+++ b/App.vue
@@ -10,7 +10,7 @@
// +----------------------------------------------------------------------
// #ifdef APP-PLUS
let jpushModule = uni.requireNativePlugin("JG-JPush");
- const mp = uni.requireNativePlugin('uniMP');
+ const mp = uni.requireNativePlugin('uniMP');
// #endif
import {
checkLogin
@@ -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/config/app.js b/config/app.js
index adddc06..29070a6 100644
--- a/config/app.js
+++ b/config/app.js
@@ -9,8 +9,8 @@ let httpApiThree
// 网络接口修改此字符 小程序域名要求https
// let httpApi = 'http://192.168.31.110:8324' // 测试
if (process.env.NODE_ENV === "development") {
- // httpApi = 'https://shop.lihaink.cn' // 生产
- httpApi = "https://crmeb-test.shop.lihaink.cn"
+ httpApi = 'https://shop.lihaink.cn' // 生产
+ // httpApi = "https://crmeb-test.shop.lihaink.cn"
// httpApi = "http://192.168.0.222"
// httpApi = "http://192.168.0.108:8325"
// httpApi = 'http://192.168.0.108:8325'
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 4cd438d..d750591 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -104,6 +104,9 @@
+
+
@@ -181,8 +184,8 @@ export default {
],
nowMenuList: [],
street: '',
- showPicker: false,
- columnData: [],
+ showPicker: false,
+ columnData: [],
bgColor: '',
isFshow: false,
backColor: 'rgba(252, 252, 252, 0)'
@@ -362,14 +365,14 @@ export default {
}
},
- Area () {
- getArea({
- city_code: 510500
- }).then(res => {
- this.$refs.uPicker.setColumnValues(0, res.data);
- this.Street(res.data[0]['code']);
- });
- },
+ 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
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a76ee01..1ce2725 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,7 +5,8 @@
-
+
{{street}}
@@ -22,8 +23,8 @@
-
+
@@ -37,78 +38,6 @@
-
-
-
-
-
-
@@ -226,19 +155,22 @@
this.getCateList()
this.cateGoods = []
this.getGoods()
-
this.Area()
uni.stopPullDownRefresh()
},
onLoad() {
+
+
this.getCateList()
- this.getArticle()
+ // this.getArticle()
this.getGoods()
-
this.Area()
- this.setPermissions()
+ //this.setPermissions()
+
+
+
// this.openTongZhi()
uni.$on('connectstatusChange', (connectstatus) => {
@@ -253,11 +185,12 @@
})
},
-
+ onTabItemTap(e) {
+ console.log(e)
+ },
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
-
this.where.page = ++this.where.page;
this.getGoods()
},
@@ -271,7 +204,7 @@
this.$bus.$on('value-updated', (newValue) => {
// 更新父组件的值
this.street = newValue.split(',')[0]
-
+
});
},
// #ifdef APP-PLUS
@@ -286,11 +219,11 @@
this.isFshow = false
this.show = true
} else if (20 < scrollTop && scrollTop <= 100) {
- this.backColor = 'rgba(255, 255, 255, 0.5)'
+ this.backColor = 'rgba(255, 255, 255, 0.5)'
this.isFshow = true
this.show = false
} else if (scrollTop > 100) {
- this.backColor = 'rgba(252, 252, 252, 1.0)'
+ this.backColor = 'rgba(252, 252, 252, 1.0)'
this.isFshow = true
this.show = false
}
@@ -298,7 +231,10 @@
},
// #endif
-
+ beforeDestroy() {
+ // 销毁监听事件
+ this.$bus.$off('value-updated')
+ },
methods: {
scrolling() {
@@ -334,7 +270,13 @@
this.backColor = 'rgba(252, 252, 252, 1.0)'
this.isFshow = true
-
+ uni.setTabBarItem({
+ index: 0,
+ text: '',
+ id:'1',
+ iconPath: '/static/tabbar_icon/top.png',
+ selectedIconPath: '/static/tabbar_icon/top.png'
+ });
}
@@ -399,10 +341,10 @@
confirm(e) {
this.street = e.value[1].name
-
- this.$nextTick(() => {
- this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
-
+
+ this.$nextTick(() => {
+ this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
})
this.showPicker = false
},
@@ -479,6 +421,7 @@
graphicLstApi(this.where).then(res => {
this.cateGoods.push(...res.data.list)
+
if (res.data.list.length < this.where.limit) this.status = 'nomore'
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
@@ -513,6 +456,7 @@
this.cateGoods = []
this.where.category_id = item.category_id
this.emptyShow = false
+ this.status = 'loadmore'
this.where.page = 1
this.getGoods(item)
this.street_id = item.id
@@ -541,11 +485,12 @@
let town = res.data.address_reference.town.title
let street_id = res.data.address_reference.town.id
this.street = res.data.address_component.street
-
+
this.$nextTick(() => {
- this.$bus.$emit('value-updated',this.street + ',' +street_id);
-
- })
+ this.$bus.$emit('value-updated', this.street + ',' +
+ street_id);
+
+ })
}).catch(err => {
uni.showToast({
title: err,
@@ -792,6 +737,7 @@
/deep/.u-tabs__wrapper__nav__line {
width: 46rpx;
+ margin-left: -2rpx;
}
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 666b762..ef93489 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -281,7 +281,7 @@
-->
-
+
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 994a540..2c9e80f 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -320,7 +320,7 @@
-
+
@@ -704,8 +704,13 @@
// });
// })'
// that.isUser ?
- videoList().then(res=>{
- that.getVideoData(res.data.list);
+ videoList({
+ page: that.page,
+ limit: that.limit,
+ id:this.videoID
+
+ }).then(res=>{
+ that.getVideoData(res.data.list);
})
@@ -1325,7 +1330,7 @@
.userInfo {
position: absolute;
- bottom: 120px;
+ bottom: 400rpx;
right: 10px;
display: flex;
align-items: center;
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 681e11a..4dac07e 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -15,9 +15,14 @@
-
-
+ -->
+
+
+
@@ -249,7 +255,7 @@
-
+