|
@@ -25,7 +25,7 @@
|
|
|
</view>
|
|
|
<!-- 收回统计 -->
|
|
|
<view class="statistics-title">今日上门回收价格</view>
|
|
|
- <view class="bottom-statistics" v-if="hasLogin">
|
|
|
+ <view class="bottom-statistics">
|
|
|
<view class="statistics-rubbishType">
|
|
|
<view class="statistics-box">
|
|
|
<view class="rubbishType-type"><span class="t-icon t-icon-home_icon_paper" style="display: inline-block;margin: 0 10upx;"></span>{{rubbishPaperName ? rubbishPaperName :''}}</view>
|
|
@@ -156,9 +156,13 @@
|
|
|
})
|
|
|
},
|
|
|
gotoYueYu(){
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/index/yuyue'
|
|
|
- })
|
|
|
+ if(hasLogin){
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/index/yuyue'
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+
|
|
|
+ }
|
|
|
},
|
|
|
// 回收指引
|
|
|
toZY(){
|
|
@@ -166,6 +170,22 @@
|
|
|
url: '/pages/index/zhiyin'
|
|
|
})
|
|
|
},
|
|
|
+ // 未登录弹窗
|
|
|
+ loginModal(){
|
|
|
+ uni.showModal({
|
|
|
+ title: '提示',
|
|
|
+ content: '您尚未登录或登录已过期,请登录后使用',
|
|
|
+ success: (res)=> {
|
|
|
+ if (res.confirm) {
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/login/login'
|
|
|
+ })
|
|
|
+ } else if (res.cancel) {
|
|
|
+ console.log('用户点击取消');
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
// 检查更新
|
|
|
checkUpdate(){
|
|
|
if (uni.canIUse('getUpdateManager')) {
|
|
@@ -200,55 +220,7 @@
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- // scroll-view到底部加载更多
|
|
|
- onreachBottom() {
|
|
|
- },
|
|
|
- // 总计
|
|
|
- getTotal(){
|
|
|
- // this.titleStatus = true
|
|
|
- // gatherTotal({
|
|
|
- // beginDate: this.searchForm.beginDate?moment(this.searchForm.beginDate).format('YYYY-MM-DD 00:00:00'):'',
|
|
|
- // endDate: this.searchForm.endDate ? moment(this.searchForm.endDate).format('YYYY-MM-DD 23:59:59'):''}).then(res=>{
|
|
|
- // if(res.status==200){
|
|
|
- // const a = res.data.find(item=>item.rubbishType=='GATHER_BUILDING')
|
|
|
- // const b = res.data.find(item=>item.rubbishType=='GATHER_OTHER')
|
|
|
- // const c = res.data.find(item=>item.rubbishType=='GATHER_KITCHEN')
|
|
|
- // this.jianzhuTotal= a ? (a.rubbishWeight/1000).toFixed(3)/1 : '0'
|
|
|
- // this.chuyuTotal= c ? (c.rubbishWeight/1000).toFixed(3)/1 : '0'
|
|
|
- // this.otherTotal= b ? (b.rubbishWeight/1000).toFixed(3)/1 : '0'
|
|
|
- // }
|
|
|
- // console.log(res)
|
|
|
- // this.titleStatus = false
|
|
|
- // })
|
|
|
- },
|
|
|
- // 打开垃圾数据录入页面
|
|
|
- intoPage(item) {
|
|
|
- // const flag=item ? item.gatherId : ''
|
|
|
- // console.log(flag,'---------hangid,;;;;')
|
|
|
- // let url = flag ? `/pages/index/addData?id=${flag}` : `/pages/index/addData`
|
|
|
- // // uni.navigateTo({
|
|
|
- // // url: url
|
|
|
- // // })
|
|
|
- // if(!this.hasLogin){
|
|
|
- // uni.showModal({
|
|
|
- // title: '提示',
|
|
|
- // content: '您尚未登录或登录已过期,请登录后使用',
|
|
|
- // success: (res)=> {
|
|
|
- // if (res.confirm) {
|
|
|
- // uni.navigateTo({
|
|
|
- // url: '/pages/login/login'
|
|
|
- // })
|
|
|
- // } else if (res.cancel) {
|
|
|
- // console.log('用户点击取消');
|
|
|
- // }
|
|
|
- // }
|
|
|
- // });
|
|
|
- // } else {
|
|
|
- // uni.navigateTo({
|
|
|
- // url: url
|
|
|
- // })
|
|
|
- // }
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
</script>
|