|
@@ -7,9 +7,9 @@
|
|
</view>
|
|
</view>
|
|
<view class="content-bottom">
|
|
<view class="content-bottom">
|
|
<!-- 预约 -->
|
|
<!-- 预约 -->
|
|
- <u-button :custom-style="yuYueBtn" :hair-line="false" @click="gotoYueYu">一键预约</u-button>
|
|
|
|
|
|
+ <!-- <u-button :custom-style="yuYueBtn" :hair-line="false" @click="gotoYueYu">一键预约</u-button> -->
|
|
<!-- 接单信息 -->
|
|
<!-- 接单信息 -->
|
|
- <view class="bottom-new-notice" v-if="orderStatusText">
|
|
|
|
|
|
+ <view class="bottom-new-notice" v-if="orderStatusText" @click="checkOrderDetail()">
|
|
<view class="notice-content">
|
|
<view class="notice-content">
|
|
<view class="notice-content-item"><u-icon class="icon" name="home_icon_bells" custom-prefix="custom-icon" size="38" color="#333"></u-icon></span><span class="item-title">最新通知</span></view>
|
|
<view class="notice-content-item"><u-icon class="icon" name="home_icon_bells" custom-prefix="custom-icon" size="38" color="#333"></u-icon></span><span class="item-title">最新通知</span></view>
|
|
<view class="notice-content-item" v-if="itemOrderStatus=='CONFIRM'">订单<span>{{orderStatusText ? orderStatusText :''}},</span>请耐心等待</view>
|
|
<view class="notice-content-item" v-if="itemOrderStatus=='CONFIRM'">订单<span>{{orderStatusText ? orderStatusText :''}},</span>请耐心等待</view>
|
|
@@ -22,44 +22,78 @@
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<!-- 回收指引 -->
|
|
<!-- 回收指引 -->
|
|
- <view class="bottom-zhiyin" @click="toZY">
|
|
|
|
|
|
+ <!-- <view class="bottom-zhiyin" @click="toZY">
|
|
<u-image src="/static/houme_bg_guide.png" mode="" height="160"></u-image>
|
|
<u-image src="/static/houme_bg_guide.png" mode="" height="160"></u-image>
|
|
|
|
+ </view> -->
|
|
|
|
+ <!-- 下单 -->
|
|
|
|
+ <view class="bottom-order flex justify_between align_center">
|
|
|
|
+ <view class="order-type flex flex_column justify_center" @click="gotoYueYu">
|
|
|
|
+ <u-image src="/static/index/home_icon_code.png" width="186rpx" height="144rpx"></u-image>
|
|
|
|
+ <view class="type type-saoma">扫码下单</view>
|
|
|
|
+ <view class="type-info">在线下单</view>
|
|
|
|
+ </view>
|
|
|
|
+ <view class="order-type flex flex_column justify_center" @click="gotoYueYu">
|
|
|
|
+ <u-image src="/static/index/home_icon.png" width="176rpx" height="164rpx"></u-image>
|
|
|
|
+ <view class="type">自主下单</view>
|
|
|
|
+ <view class="type-info">免费上门回收</view>
|
|
|
|
+ </view>
|
|
</view>
|
|
</view>
|
|
<!-- 收回统计 -->
|
|
<!-- 收回统计 -->
|
|
<view class="statistics-title">今日上门回收价格</view>
|
|
<view class="statistics-title">今日上门回收价格</view>
|
|
- <view class="bottom-statistics">
|
|
|
|
- <view class="statistics-rubbishType">
|
|
|
|
- <view class="statistics-box" v-if="rubbishPaperList.length">
|
|
|
|
- <view class="rubbishType-type"><u-icon class="icon" name="home_icon_paper" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishPaperName ? rubbishPaperName :''}}</span></view>
|
|
|
|
- <view v-for="item in rubbishPaperList" class="rubbishType-item">
|
|
|
|
- <span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
|
|
|
|
- </view>
|
|
|
|
|
|
+ <view>
|
|
|
|
+ <!-- 纸张类 -->
|
|
|
|
+ <view class="statistics-box" v-if="rubbishPaperList.length">
|
|
|
|
+ <view class="rubbishType-type">
|
|
|
|
+ {{rubbishPaperName ? rubbishPaperName :''}}
|
|
</view>
|
|
</view>
|
|
- <view class="statistics-box" v-if="rubbishYWList.length">
|
|
|
|
- <view class="rubbishType-type"><u-icon class="icon" name="home_icon_clothing" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishYWName ? rubbishYWName :''}}</span></view>
|
|
|
|
- <view v-for="item in rubbishYWList" class="rubbishType-item">
|
|
|
|
- <span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
|
|
|
|
|
|
+ <view class="flex rubbish">
|
|
|
|
+ <view v-for="item in rubbishPaperList" class="rubbishType-item">
|
|
|
|
+ <u-image :src="item.image" width="92" height="92"></u-image>
|
|
|
|
+ <span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
- <view class="statistics-rubbishType">
|
|
|
|
- <view class="statistics-box" v-if="rubbishSLList.length">
|
|
|
|
- <view class="rubbishType-type"><u-icon class="icon" name="home_icon_plastic" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishSLName ? rubbishSLName :''}}</span></view>
|
|
|
|
|
|
+ <!-- 塑料类 -->
|
|
|
|
+ <view class="statistics-box" v-if="rubbishSLList.length">
|
|
|
|
+ <view class="rubbishType-type">
|
|
|
|
+ {{rubbishSLName ? rubbishSLName :''}}
|
|
|
|
+ </view>
|
|
|
|
+ <view class="flex rubbish">
|
|
<view v-for="item in rubbishSLList" class="rubbishType-item">
|
|
<view v-for="item in rubbishSLList" class="rubbishType-item">
|
|
- <span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
|
|
|
|
|
|
+ <u-image :src="item.image" width="92" height="92"></u-image>
|
|
|
|
+ <span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
- <view class="statistics-box" v-if="rubbishJSList.length">
|
|
|
|
- <view class="rubbishType-type"><u-icon class="icon" name="home_icon_metal" custom-prefix="custom-icon" size="36" color="#333"></u-icon><span style="display:in;ine-block; margin-left:10upx">{{rubbishJSName ? rubbishJSName :''}}</span></view>
|
|
|
|
|
|
+ </view>
|
|
|
|
+ <!-- 金属类 -->
|
|
|
|
+ <view class="statistics-box" v-if="rubbishJSList.length">
|
|
|
|
+ <view class="rubbishType-type">
|
|
|
|
+ {{rubbishJSName ? rubbishJSName :''}}
|
|
|
|
+ </view>
|
|
|
|
+ <view class="flex rubbish">
|
|
<view v-for="item in rubbishJSList" class="rubbishType-item">
|
|
<view v-for="item in rubbishJSList" class="rubbishType-item">
|
|
- <span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? ':'+(item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
|
|
|
|
|
|
+ <u-image :src="item.image" width="92" height="92"></u-image>
|
|
|
|
+ <span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
|
|
+ <!-- 衣物类 -->
|
|
|
|
+ <view class="statistics-box" v-if="rubbishYWList.length">
|
|
|
|
+ <view class="rubbishType-type">
|
|
|
|
+ {{rubbishYWName ? rubbishYWName :''}}
|
|
|
|
+ </view>
|
|
|
|
+ <view class="flex rubbish">
|
|
|
|
+ <view v-for="item in rubbishYWList" class="rubbishType-item">
|
|
|
|
+ <u-image :src="item.image" width="92" height="92"></u-image>
|
|
|
|
+ <span>{{item.name ? item.name :''}}</span><span>{{item.customerPrice ? (item.customerPrice).toFixed(2)/1+'元/kg' :''}} </span>
|
|
|
|
+ </view>
|
|
|
|
+ </view>
|
|
|
|
+ </view>
|
|
|
|
+ <view class="nodata" v-if="rubbishPriceList.length==0">
|
|
|
|
+ <u-empty src="/static/def_result.png" :text="noDataText" icon-size="260" ></u-empty>
|
|
|
|
+ </view>
|
|
</view>
|
|
</view>
|
|
- <view class="nodata" v-if="rubbishPriceList.length==0">
|
|
|
|
- <u-empty src="/static/def_result.png" :text="noDataText" icon-size="260" ></u-empty>
|
|
|
|
- </view>
|
|
|
|
|
|
+
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</template>
|
|
</template>
|
|
@@ -146,6 +180,12 @@
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
+ // 查看订单详情
|
|
|
|
+ checkOrderDetail(){
|
|
|
|
+ uni.navigateTo({
|
|
|
|
+ url:'/pages/order/orderDetails'
|
|
|
|
+ })
|
|
|
|
+ },
|
|
// 获取垃圾分类
|
|
// 获取垃圾分类
|
|
geRubbishTypeList(){
|
|
geRubbishTypeList(){
|
|
geRubbishType().then(res=>{
|
|
geRubbishType().then(res=>{
|
|
@@ -156,10 +196,64 @@
|
|
const b= res.data.find(item=>item.code=='PLASTIC')
|
|
const b= res.data.find(item=>item.code=='PLASTIC')
|
|
const c= res.data.find(item=>item.code=='CLOTHES')
|
|
const c= res.data.find(item=>item.code=='CLOTHES')
|
|
const d= res.data.find(item=>item.code=='METAL')
|
|
const d= res.data.find(item=>item.code=='METAL')
|
|
|
|
+ /* 纸张类 */
|
|
this.rubbishPaperList=a.rubbishTypeVOList
|
|
this.rubbishPaperList=a.rubbishTypeVOList
|
|
|
|
+ this.rubbishPaperList.map(item=>{
|
|
|
|
+ if(item.code=='YELLOW_PAPER'){
|
|
|
|
+ item.image='/static/index/icon_aper_yellow.png'
|
|
|
|
+ }
|
|
|
|
+ if(item.code=='COLOUR_PAPER'){
|
|
|
|
+ item.image='/static/index/icon_aper_flower.png'
|
|
|
|
+ }
|
|
|
|
+ if(item.code=='BOOK_PAPER'){
|
|
|
|
+ item.image='/static/index/icon_book.png'
|
|
|
|
+ }
|
|
|
|
+ if(item.code=='MAGAZINE'){
|
|
|
|
+ item.image='/static/index/icon_magazine.png'
|
|
|
|
+ }
|
|
|
|
+ if(item.code=='OTHER_PAPER'){
|
|
|
|
+ item.image='/static/index/icon_aper_miscellaneous.png'
|
|
|
|
+ }
|
|
|
|
+ if(item.code=='NEWS_PAPER'){
|
|
|
|
+ item.image='/static/index/icon_newspaper.png'
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ // 塑料类
|
|
this.rubbishSLList=b.rubbishTypeVOList
|
|
this.rubbishSLList=b.rubbishTypeVOList
|
|
|
|
+ this.rubbishSLList.map(item=>{
|
|
|
|
+ if(item.code=='PLASTIC_WHITE'){
|
|
|
|
+ item.image='/static/index/icon_frame_white.png'
|
|
|
|
+ }
|
|
|
|
+ if(item.code=='PLASTIC_BLACK'){
|
|
|
|
+ item.image='/static/index/icon_frame_black.png'
|
|
|
|
+ }
|
|
|
|
+ if(item.code=='PMMA'){
|
|
|
|
+ item.image='/static/index/icon_acrylic.png'
|
|
|
|
+ }
|
|
|
|
+ if(item.code=='PLASTIC_LUCENCY'){
|
|
|
|
+ item.image='/static/index/icon_bottle.png'
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ // 衣物
|
|
this.rubbishYWList=c.rubbishTypeVOList
|
|
this.rubbishYWList=c.rubbishTypeVOList
|
|
|
|
+ this.rubbishYWList.map(item=>{
|
|
|
|
+ if(item.code=='SIMPLE_CLOTHES'){
|
|
|
|
+ item.image='/static/index/icon_clothes.png'
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ // 金属
|
|
this.rubbishJSList=d.rubbishTypeVOList
|
|
this.rubbishJSList=d.rubbishTypeVOList
|
|
|
|
+ this.rubbishJSList.map(item=>{
|
|
|
|
+ if(item.code=='THIN_IRON'){
|
|
|
|
+ item.image='/static/index/icon_iron_thin.png'
|
|
|
|
+ }
|
|
|
|
+ if(item.code=='THICK_IRON'){
|
|
|
|
+ item.image='/static/index/icon_iron_thick.png'
|
|
|
|
+ }
|
|
|
|
+ if(item.code=='STAINLESS_IRON'){
|
|
|
|
+ item.image='/static/index/icon_steel.png'
|
|
|
|
+ }
|
|
|
|
+ })
|
|
this.rubbishPaperName=a.name
|
|
this.rubbishPaperName=a.name
|
|
this.rubbishSLName=b.name
|
|
this.rubbishSLName=b.name
|
|
this.rubbishYWName=c.name
|
|
this.rubbishYWName=c.name
|
|
@@ -170,7 +264,7 @@
|
|
gotoYueYu(){
|
|
gotoYueYu(){
|
|
if(this.hasLogin){
|
|
if(this.hasLogin){
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: '/pages/index/yuyue'
|
|
|
|
|
|
+ url: '/pages/index/YY'
|
|
})
|
|
})
|
|
}else{
|
|
}else{
|
|
this.loginModal()
|
|
this.loginModal()
|
|
@@ -245,12 +339,12 @@
|
|
flex-direction: column;
|
|
flex-direction: column;
|
|
padding: 0;
|
|
padding: 0;
|
|
.content-top{
|
|
.content-top{
|
|
- width: 100%;
|
|
|
|
- height:260upx ;
|
|
|
|
- background-color: #4F88F7;
|
|
|
|
- border-bottom-left-radius: 50%; /* 左下角 */
|
|
|
|
- border-bottom-right-radius:50%; /* 右下角 */
|
|
|
|
- opacity: 1;
|
|
|
|
|
|
+ // width: 100%;
|
|
|
|
+ // height:260upx ;
|
|
|
|
+ // background-color: #4F88F7;
|
|
|
|
+ // border-bottom-left-radius: 50%; /* 左下角 */
|
|
|
|
+ // border-bottom-right-radius:50%; /* 右下角 */
|
|
|
|
+ // opacity: 1;
|
|
.top-banner{
|
|
.top-banner{
|
|
padding: 20upx 30upx 0;
|
|
padding: 20upx 30upx 0;
|
|
.banner{
|
|
.banner{
|
|
@@ -260,7 +354,7 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.content-bottom{
|
|
.content-bottom{
|
|
- padding: 30upx;
|
|
|
|
|
|
+ padding: 0 30upx 30upx;
|
|
background-color: #f5f5f5;
|
|
background-color: #f5f5f5;
|
|
.bottom-new-notice{
|
|
.bottom-new-notice{
|
|
background-image: url('../../static/home_bg_expressage.png');
|
|
background-image: url('../../static/home_bg_expressage.png');
|
|
@@ -303,6 +397,32 @@
|
|
.bottom-zhiyin{
|
|
.bottom-zhiyin{
|
|
margin: 30upx 0;
|
|
margin: 30upx 0;
|
|
}
|
|
}
|
|
|
|
+ .bottom-order{
|
|
|
|
+ padding: 50upx 86upx;
|
|
|
|
+ margin:30upx 0 56upx;
|
|
|
|
+ background: #FFFFFF;
|
|
|
|
+ box-shadow: 0px 18px 35px rgba(1, 136, 209, 0.1);
|
|
|
|
+ opacity: 1;
|
|
|
|
+ border-radius: 12px;
|
|
|
|
+ .order-type{
|
|
|
|
+ text-align: center;
|
|
|
|
+ .type{
|
|
|
|
+ font-size: 42upx;
|
|
|
|
+ font-weight: bold;
|
|
|
|
+ color: #000000;
|
|
|
|
+ margin-top: 10upx;
|
|
|
|
+ }
|
|
|
|
+ .type-saoma{
|
|
|
|
+ margin-top: 35upx;
|
|
|
|
+ }
|
|
|
|
+ .type-info{
|
|
|
|
+ color:#999999;
|
|
|
|
+ font-size: 24upx;
|
|
|
|
+ font-weight: 400;
|
|
|
|
+ margin-top: 10upx;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
.statistics-title{
|
|
.statistics-title{
|
|
font-size: 36upx;
|
|
font-size: 36upx;
|
|
font-family: PingFang SC;
|
|
font-family: PingFang SC;
|
|
@@ -311,41 +431,67 @@
|
|
opacity: 1;
|
|
opacity: 1;
|
|
margin-bottom: 30upx;
|
|
margin-bottom: 30upx;
|
|
}
|
|
}
|
|
- .bottom-statistics{
|
|
|
|
- display: flex;
|
|
|
|
- width: 100%;
|
|
|
|
- justify-content: space-between;
|
|
|
|
- .statistics-rubbishType{
|
|
|
|
- width: 48%;
|
|
|
|
- .statistics-box{
|
|
|
|
- margin-bottom:30upx ;
|
|
|
|
- background-color: #fff;
|
|
|
|
- padding: 20upx 10upx 20upx 20upx;
|
|
|
|
- border-radius:16upx;
|
|
|
|
- }
|
|
|
|
- .statistics-box:last-child{
|
|
|
|
- margin-bottom:0 ;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ .statistics-box{
|
|
|
|
+ padding: 20upx 30upx;
|
|
|
|
+ margin-bottom: 30upx;
|
|
|
|
+ background-color: #FFFFFF;
|
|
|
|
+ border-radius: 12px;
|
|
.rubbishType-type{
|
|
.rubbishType-type{
|
|
- display: flex;
|
|
|
|
- align-items: center;
|
|
|
|
- justify-content: flex-start;
|
|
|
|
|
|
+ margin-bottom: 36upx;
|
|
font-size: 28upx;
|
|
font-size: 28upx;
|
|
- font-family: PingFang SC;
|
|
|
|
font-weight: 400;
|
|
font-weight: 400;
|
|
color: #000000;
|
|
color: #000000;
|
|
}
|
|
}
|
|
- .rubbishType-item{
|
|
|
|
- display: flex;
|
|
|
|
- justify-content: flex-start;
|
|
|
|
- margin:10upx 0 ;
|
|
|
|
- font-size: 26upx;
|
|
|
|
- font-family: PingFang SC;
|
|
|
|
- font-weight: 400;
|
|
|
|
- color: #444444;
|
|
|
|
|
|
+ .rubbish{
|
|
|
|
+ font-size:24upx;
|
|
|
|
+ overflow-x: scroll;
|
|
|
|
+ .rubbishType-item{
|
|
|
|
+ display: flex;
|
|
|
|
+ flex-direction: column;
|
|
|
|
+ align-items: center;
|
|
|
|
+ min-width: 24.5%;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ .statistics-box:last-child{
|
|
|
|
+ margin-bottom:0 ;
|
|
}
|
|
}
|
|
|
|
+ // .bottom-statistics{
|
|
|
|
+ // display: flex;
|
|
|
|
+ // width: 100%;
|
|
|
|
+ // justify-content: space-between;
|
|
|
|
+ // .statistics-rubbishType{
|
|
|
|
+ // width: 48%;
|
|
|
|
+ // .statistics-box{
|
|
|
|
+ // margin-bottom:30upx ;
|
|
|
|
+ // background-color: #fff;
|
|
|
|
+ // padding: 20upx 10upx 20upx 20upx;
|
|
|
|
+ // border-radius:16upx;
|
|
|
|
+ // }
|
|
|
|
+ // .statistics-box:last-child{
|
|
|
|
+ // margin-bottom:0 ;
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
+ // .rubbishType-type{
|
|
|
|
+ // display: flex;
|
|
|
|
+ // align-items: center;
|
|
|
|
+ // justify-content: flex-start;
|
|
|
|
+ // font-size: 28upx;
|
|
|
|
+ // font-family: PingFang SC;
|
|
|
|
+ // font-weight: 400;
|
|
|
|
+ // color: #000000;
|
|
|
|
+ // }
|
|
|
|
+ // .rubbishType-item{
|
|
|
|
+ // display: flex;
|
|
|
|
+ // justify-content: flex-start;
|
|
|
|
+ // margin:10upx 0 ;
|
|
|
|
+ // font-size: 26upx;
|
|
|
|
+ // font-family: PingFang SC;
|
|
|
|
+ // font-weight: 400;
|
|
|
|
+ // color: #444444;
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</style>
|
|
</style>
|