|
@@ -82,6 +82,7 @@
|
|
|
uni.$on('login', (data) => {
|
|
|
this.loginStatus = data.msg
|
|
|
})
|
|
|
+ // uni.startPullDownRefresh();
|
|
|
},
|
|
|
onReady() {
|
|
|
if (this.loginStatus == "登录成功") {
|
|
@@ -98,6 +99,7 @@
|
|
|
axios.all([this.getBanners(), this.getTiceList()])
|
|
|
.then(axios.spread((one, two) => {
|
|
|
this.bannersList = one.data.data.map(t => t.imgPath)
|
|
|
+ console.log(one)
|
|
|
this.noticebarList = two.data.data.map(t => t.msgContent)
|
|
|
}))
|
|
|
.catch(err => {
|
|
@@ -112,6 +114,23 @@
|
|
|
onShow() {
|
|
|
this.system()
|
|
|
},
|
|
|
+ onPullDownRefresh() {
|
|
|
+ axios.all([this.getBanners(), this.getTiceList()])
|
|
|
+ .then(axios.spread((one, two) => {
|
|
|
+ this.bannersList = one.data.data.map(t => t.imgPath)
|
|
|
+ this.noticebarList = two.data.data.map(t => t.msgContent)
|
|
|
+ }))
|
|
|
+ .catch(err => {
|
|
|
+
|
|
|
+ })
|
|
|
+ .finally(() => {
|
|
|
+ this.loading = false;
|
|
|
+ uni.stopPullDownRefresh();
|
|
|
+ })
|
|
|
+ // setTimeout(function() {
|
|
|
+
|
|
|
+ // }, 1000);
|
|
|
+ },
|
|
|
computed: {
|
|
|
...mapState(['hasLogin'])
|
|
|
},
|
|
@@ -238,18 +257,12 @@
|
|
|
// })
|
|
|
|
|
|
} else if (wgtinfo.version != res.data.forceVersion) {
|
|
|
-
|
|
|
this.Copywriting = res.data.msg
|
|
|
-
|
|
|
this.show_s = true
|
|
|
-
|
|
|
this.url = res.data.url
|
|
|
this.is_force = true
|
|
|
} else if (wgtinfo.version == res.data.forceVersion) {
|
|
|
-
|
|
|
this.Copywriting = res.data.msg
|
|
|
-
|
|
|
-
|
|
|
this.is_force = false
|
|
|
this.show_s = true
|
|
|
this.url = res.data.url
|
|
@@ -332,18 +345,6 @@
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- inInlineshop() {
|
|
|
- this.$u.toast('线上订货暂不开放');
|
|
|
- // this.$u.route({
|
|
|
- // url: 'pages/home/inline-shop/inline_shop',
|
|
|
- // })
|
|
|
- },
|
|
|
- inIntegral() {
|
|
|
- this.$u.toast('积分商城暂不开放');
|
|
|
- // this.$u.route({
|
|
|
- // url: 'pages/home/integral-mall/integral_mall',
|
|
|
- // })
|
|
|
- }
|
|
|
},
|
|
|
}
|
|
|
</script>
|