From f93f455134ff234be9d257c0f432c8052f1c32cd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 七月 2025 19:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/demand-hall/demand-hall.vue | 831 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 505 insertions(+), 326 deletions(-)
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index 2e0e331..7503f8a 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -6,278 +6,276 @@
<text>鎴戠殑璁㈠崟</text>
</view>
</view>
- <!-- 鍙戝崟鏂� -->
- <view class="index-labs" v-if="type === 0" :style="{ top: statusbarHeight + navHeight + 'px' }">
- <view class="index-labs-row">
- 鍏ㄩ儴
- <view class="index-labs-row-x"></view>
- </view>
- <view class="index-labs-row active">寰呮帴鍗�</view>
- <view class="index-labs-row">宸叉帴鍗�</view>
- <view class="index-labs-row">杩涜涓�</view>
- <view class="index-labs-row">寰呰瘎浠�</view>
- <view class="index-labs-row">宸插彇娑�</view>
- </view>
- <!-- 鎺ュ崟鏂� -->
- <view class="index-labs" v-if="type === 1" :style="{ top: statusbarHeight + navHeight + 'px' }">
- <view class="index-labs-row">
- 鍏ㄩ儴
- <view class="index-labs-row-x"></view>
- </view>
- <view class="index-labs-row active">宸叉帴鍗�</view>
- <view class="index-labs-row">杩涜涓�</view>
- <view class="index-labs-row">宸插畬鎴�</view>
- <view class="index-labs-row">宸插彇娑�</view>
- </view>
- <!-- 鍙戝崟鏂� -->
- <view class="index-list" v-if="type === 0">
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>璁㈤鍗�</text>
- </view>
- <view class="index-list-item-head-r">寰呮帴鍗曟柟鎺ュ崟</view>
- </view>
- <view class="index-list-item-info">
- 鍗堥5鍏�(30浠�)锝滄櫄椁�8鍏�(20浠�)
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view></view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>杩愯揣鍗�-灏忚揣杞�-鍘㈠紡</text>
- </view>
- <view class="index-list-item-head-r">寰呮帴鍗曟柟鎺ュ崟</view>
- </view>
- <view class="index-list-item-info">
- 钁¤悇锝�20000鏂わ綔闇�2杈�
- </view>
- <view class="index-list-item-date">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="address">
- <view class="address-xian"></view>
- <view class="address-row">
- <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="address-row">
- <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥笢闂ㄤ繚瀹夊</text>
- </view>
- <view class="address-row">
- <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
- <text>瀹夊窘鑾茶姳绉戞妧浜т笟鍥眴绫崇鎶�鏈夐檺鍏徃</text>
- </view>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view></view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>鐢ㄥ伐鍗�-閲囨憳宸�</text>
- </view>
- <view class="index-list-item-head-r">寰呮帴鍗�</view>
- </view>
- <view class="index-list-item-info">
- 钁¤悇锝�2000鏂�
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view></view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- </view>
- <!-- 鎺ュ崟鏂� -->
- <view class="index-list" v-if="type === 1">
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>璁㈤鍗�</text>
- <view class="tips">绯荤粺娲惧崟</view>
- </view>
- <view class="index-list-item-head-r">宸叉帴鍗�</view>
- </view>
- <view class="index-list-item-info">
- 鍗堥5鍏�(30浠�)锝滄櫄椁�8鍏�(20浠�)
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view class="eidt-tips">
- <image src="/static/icon/ic_tip@2x.png" mode="widthFix"></image>
- <text>璁㈠崟宸蹭慨鏀�</text>
- </view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>杩愯揣鍗�-灏忚揣杞�-鍘㈠紡</text>
- <view class="tips1">鑷富鎶㈠崟</view>
- </view>
- <view class="index-list-item-head-r">宸叉帴鍗�</view>
- </view>
- <view class="index-list-item-info">
- 钁¤悇锝�20000鏂わ綔闇�2杈�
- </view>
- <view class="index-list-item-date">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="address">
- <view class="address-xian"></view>
- <view class="address-row">
- <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="address-row">
- <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥笢闂ㄤ繚瀹夊</text>
- </view>
- <view class="address-row">
- <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
- <text>瀹夊窘鑾茶姳绉戞妧浜т笟鍥眴绫崇鎶�鏈夐檺鍏徃</text>
- </view>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view></view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>鐢ㄥ伐鍗�-閲囨憳宸�</text>
- <view class="tips1">鑷富鎶㈠崟</view>
- </view>
- <view class="index-list-item-head-r">寰呮帴鍗�</view>
- </view>
- <view class="index-list-item-info">
- 钁¤悇锝�2000鏂�
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view></view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- </view>
- <!-- <view class="index-wu">
+
+ <!-- 鏈櫥褰� -->
+ <view class="index-wu" v-if="!isLogin">
<image src="/static/icon/default_login@2x.png" mode="widthFix"></image>
<text>鎮ㄨ繕娌℃湁鐧诲綍锛岃鐧诲綍鍚庢煡鐪嬭鍗�</text>
<button>鐧诲綍</button>
- </view> -->
+ </view>
+
+ <!-- 宸茬櫥闄� -->
+ <template v-else>
+ <!-- 鍙戝崟鏂� -->
+ <view class="index-labs" v-if="typeViewId === 0" :style="{ top: statusbarHeight + navHeight + 'px' }">
+ <scroll-view scroll-x class="scroll-view_H">
+ <view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list1" :key="index" @click="clickOrderType(item.id)">
+ {{item.name}}
+ <view class="index-labs-row-x" v-if="item.id === status"></view>
+ </view>
+ </scroll-view>
+ </view>
+ <!-- 鎺ュ崟鏂� -->
+ <view class="index-labs" v-if="typeViewId === 1" :style="{ top: statusbarHeight + navHeight + 'px' }">
+ <scroll-view scroll-x class="scroll-view_H">
+ <view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list" :key="index" @click="clickOrderType(item.id)">
+ {{item.name}}
+ <view class="index-labs-row-x" v-if="item.id === status"></view>
+ </view>
+ </scroll-view>
+ </view>
+ <!-- 鍙戝崟鏂� -->
+ <view class="index-list" v-if="typeViewId === 0">
+ <view class="index-list-item" v-for="(item, index) in orderList" :key="index">
+ <view class="index-list-item-head">
+ <view class="index-list-item-head-l">
+ <view class="xoam"></view>
+ <text v-if="item.type === 0 && item.workType === 0">鐢ㄥ伐鍗� - 閲囨憳宸�</text>
+ <text v-else-if="item.type === 0 && item.workType === 1">鐢ㄥ伐鍗� - 鍒嗘嫞宸�</text>
+ <text v-else-if="item.type === 0 && item.workType === 2">鐢ㄥ伐鍗� - 鍖呰宸�</text>
+ <text v-else-if="item.type === 1">杩愯揣鍗�-{{item.categoryName}}-{{item.carUnit}}</text>
+ <text v-else-if="item.type === 2">璁㈤鍗�</text>
+ </view>
+ <view class="index-list-item-head-r" v-if="item.status === 1">寰呮帴鍗曟柟鎺ュ崟</view>
+ <view class="index-list-item-head-r" v-if="item.status === 2">宸叉帴鍗�</view>
+ <view class="index-list-item-head-r" v-if="item.status === 3">杩涜涓�</view>
+ <view class="index-list-item-head-r" v-if="item.status === 2 && item.isUpdate === 1">宸蹭慨鏀癸紝寰呮帴鍗曟柟纭</view>
+ <view class="index-list-item-head-r hui" v-if="item.status === 4">宸插畬鎴�</view>
+ <view class="index-list-item-head-r hui" v-if="item.status === 99">宸插彇娑�</view>
+ <view class="index-list-item-head-r" v-if="item.status === 4 && item.commentStatus === 0">寰呰瘎浠�</view>
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0">
+ {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
+ {{item.categoryName}}锝渰{item.priceNum1}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
+ {{item.categoryName}}锝渰{item.priceNum1}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 1">
+ {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 2">
+ {{item.wayInfoCopy}}
+ </view>
+ <view class="address" v-if="item.type === 1">
+ <view class="address-xian"></view>
+ <view class="address-row" v-for="(address, i) in item.wayInfo" :key="i">
+ <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
+ <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
+ <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
+ <text>{{item.location}}</text>
+ </view>
+ </view>
+ <template v-if="[0, 2].includes(item.type)">
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
+ <text>{{item.location}}</text>
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.priceNum1}}澶╋級</text>
+ </view>
+ </template>
+ <view class="index-list-item-price">
+ <text>棰勪及锛�</text>
+ <text>楼{{item.estimatedAccount / 100}}</text>
+ </view>
+ <view class="eidt">
+ <view></view>
+ <view class="eidt-right">
+ <view class="eidt-close" v-if="[0,1,2].includes(item.status)" @click="orderId = item.id, show = true">鍙栨秷璁㈠崟</view>
+ <view class="eidt-phone" v-if="[2].includes(item.status)">鑱旂郴甯堝倕</view>
+ <view class="eidt-phone" v-if="item.status === 4 && item.commentStatus === 0">璇勪环璁㈠崟</view>
+ <view class="eidt-btn" v-if="[0,1,2].includes(item.status)" @click="jumpEdit(item)">淇敼璁㈠崟</view>
+ <view class="eidt-btn" v-if="(item.type === 2 && item.status === 0) || (item.type === 2 && item.status === 3)" @click="jumpEdit(item)">缁х画鏀粯</view>
+ <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
+ <view class="eidt-phone">鑱旂郴甯堝倕</view>
+ <view class="eidt-phone">璇勪环璁㈠崟</view>
+ <view class="eidt-btn">淇敼璁㈠崟</view>
+ <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
+ </view>
+ </view>
+ </view>
+ </view>
+ <!-- 鎺ュ崟鏂� -->
+ <view class="index-list" v-if="typeViewId === 1">
+ <view class="index-list-item" v-for="(item, index) in orderList" :key="index">
+ <view class="index-list-item-head">
+ <view class="index-list-item-head-l">
+ <view class="xoam"></view>
+ <text v-if="item.type === 0 && item.workType === 0">鐢ㄥ伐鍗� - 閲囨憳宸�</text>
+ <text v-else-if="item.type === 0 && item.workType === 1">鐢ㄥ伐鍗� - 鍒嗘嫞宸�</text>
+ <text v-else-if="item.type === 0 && item.workType === 2">鐢ㄥ伐鍗� - 鍖呰宸�</text>
+ <text v-else-if="item.type === 1">杩愯揣鍗�-{{item.categoryName}}-{{item.carUnit}}</text>
+ <text v-else-if="item.type === 2">璁㈤鍗�</text>
+ <view class="tips" v-if="item.acceptType === 1">绯荤粺娲惧崟</view>
+ <view class="tips1" v-if="item.acceptType === 0">鎵嬪姩鎺ュ崟</view>
+ </view>
+ <view class="index-list-item-head-r" v-if="item.status === 2">宸叉帴鍗�</view>
+ <view class="index-list-item-head-r" v-if="item.status === 3">杩涜涓�</view>
+ <view class="index-list-item-head-r hui" v-if="item.status === 4">宸插畬鎴�</view>
+ <view class="index-list-item-head-r hui" v-if="item.status === 99">宸插彇娑�</view>
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0">
+ {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
+ {{item.categoryName}}锝渰{item.priceNum1}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
+ {{item.categoryName}}锝渰{item.priceNum1}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 1">
+ {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 2">
+ {{item.wayInfoCopy}}
+ </view>
+ <view class="address" v-if="item.type === 1">
+ <view class="address-xian"></view>
+ <view class="address-row" v-for="(address, i) in item.wayInfo" :key="i">
+ <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
+ <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
+ <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
+ <text>{{item.location}}</text>
+ </view>
+ </view>
+ <template v-if="[0, 2].includes(item.type)">
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
+ <text>{{item.location}}</text>
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.priceNum1}}澶╋級</text>
+ </view>
+ </template>
+ <view class="index-list-item-price">
+ <text>棰勪及锛�</text>
+ <text>楼{{item.estimatedAccount / 100}}</text>
+ </view>
+ <view class="eidt">
+ <view class="eidt-tips" v-if="item.isUpdate === 1">
+ <image src="/static/icon/ic_tip@2x.png" mode="widthFix"></image>
+ <text>璁㈠崟宸蹭慨鏀�</text>
+ </view>
+ <view class="eidt-tips" v-else></view>
+
+ <view class="eidt-right">
+ <view class="eidt-close" v-if="item.status === 2" @click="orderId = item.id, show = true">鍙栨秷璁㈠崟</view>
+ <view class="eidt-phone" v-if="[2,3].includes(item.status)" @click="phoneCall(item.linkPhone)">鑱旂郴涓氫富</view>
+
+ <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
+ <view class="eidt-phone">鑱旂郴甯堝倕</view>
+ <view class="eidt-phone">璇勪环璁㈠崟</view>
+ <view class="eidt-btn">淇敼璁㈠崟</view>
+ <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
+ </view>
+ </view>
+ </view>
+ <!-- <view class="index-list-item">
+ <view class="index-list-item-head">
+ <view class="index-list-item-head-l">
+ <view class="xoam"></view>
+ <text>杩愯揣鍗�-灏忚揣杞�-鍘㈠紡</text>
+ <view class="tips1">鑷富鎶㈠崟</view>
+ </view>
+ <view class="index-list-item-head-r">宸叉帴鍗�</view>
+ </view>
+ <view class="index-list-item-info">
+ 钁¤悇锝�20000鏂わ綔闇�2杈�
+ </view>
+ <view class="index-list-item-date">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>07-26 鑷� 07-27锛�2澶╋級</text>
+ </view>
+ <view class="address">
+ <view class="address-xian"></view>
+ <view class="address-row">
+ <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
+ <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
+ </view>
+ <view class="address-row">
+ <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
+ <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥笢闂ㄤ繚瀹夊</text>
+ </view>
+ <view class="address-row">
+ <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
+ <text>瀹夊窘鑾茶姳绉戞妧浜т笟鍥眴绫崇鎶�鏈夐檺鍏徃</text>
+ </view>
+ </view>
+ <view class="index-list-item-price">
+ <text>棰勪及锛�</text>
+ <text>楼1000.00</text>
+ </view>
+ <view class="eidt">
+ <view></view>
+ <view class="eidt-right">
+ <view class="eidt-close">鍙栨秷璁㈠崟</view>
+ </view>
+ </view>
+ </view> -->
+ <!-- <view class="index-list-item">
+ <view class="index-list-item-head">
+ <view class="index-list-item-head-l">
+ <view class="xoam"></view>
+ <text>鐢ㄥ伐鍗�-閲囨憳宸�</text>
+ <view class="tips1">鑷富鎶㈠崟</view>
+ </view>
+ <view class="index-list-item-head-r">寰呮帴鍗�</view>
+ </view>
+ <view class="index-list-item-info">
+ 钁¤悇锝�2000鏂�
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
+ <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>07-26 鑷� 07-27锛�2澶╋級</text>
+ </view>
+ <view class="index-list-item-price">
+ <text>棰勪及锛�</text>
+ <text>楼1000.00</text>
+ </view>
+ <view class="eidt">
+ <view></view>
+ <view class="eidt-right">
+ <view class="eidt-close">鍙栨秷璁㈠崟</view>
+ </view>
+ </view>
+ </view> -->
+ </view>
+ </template>
+
+ <u-modal
+ title="娓╅Θ鎻愮ず"
+ :show="show"
+ closeOnClickOverlay
+ showCancelButton
+ >
+ <view class="slot-content">
+ 纭鍙栨秷璁㈠崟鍚楋紵
+ </view>
+ <view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
+ <view class="btn1" @click="show = false">鎴戝啀鎯虫兂</view>
+ <view class="btn2" @click="cancelOrder">纭鍙栨秷</view>
+ </view>
+ </u-modal>
+
</view>
</template>
@@ -285,12 +283,143 @@
import { mapState } from 'vuex'
export default {
computed: {
- ...mapState(['navHeight', 'statusbarHeight'])
+ ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid', 'latitude', 'longitude'])
+ },
+ onShow(options) {
+ this.typeViewId = 0
+ if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
+ this.isLogin = true
+ }
+ if (this.userInfo && this.userInfo.useIdentity == 1) {
+ this.typeViewId = 1
+ } else {
+ this.typeViewId = 0
+ }
},
data() {
return {
- type: 1
+ show: false,
+ isLogin: false,
+ typeViewId: 0,
+ list: [
+ { name: '鍏ㄩ儴', id: '' },
+ { name: '宸叉帴鍗�', id: 2 },
+ { name: '杩涜涓�', id: 3 },
+ { name: '宸插畬鎴�', id: 4 },
+ { name: '宸插彇娑�', id: 99 },
+ ],
+ list1: [
+ { name: '鍏ㄩ儴', id: '' },
+ { name: '寰呮敮浠�', id: 0 },
+ { name: '寰呮帴鍗�', id: 1 },
+ { name: '宸叉帴鍗�', id: 2 },
+ { name: '杩涜涓�', id: 3 },
+ { name: '宸插畬鎴�', id: 4 },
+ { name: '宸插彇娑�', id: 99 },
+ { name: '寰呰瘎浠�', id: [4, 0] }
+ ],
+ orderId: null,
+ status: '',
+ commentStatus: '',
+
+ next: true,
+ page: 1,
+ orderList: []
};
+ },
+ async onLoad() {
+ await this.$onLaunched;
+ uni.$on('refresh', (data) => {
+ console.log('鎴戠殑璁㈠崟椤靛埛鏂�');
+ this.status = ''
+ this.commentStatus = ''
+ this.orderList = []
+ this.next = true
+ this.page = 1
+ this.getOrderList()
+ })
+ this.getOrderList()
+ },
+ onReachBottom() {
+ this.getOrderList()
+ },
+ methods: {
+ // 淇敼
+ jumpEdit(item) {
+ if (item.type === 0 && item.workType === 0) {
+ uni.navigateTo({
+ url: `/pages/using-workers/using-workers?id=${item.id}`
+ })
+ } else if (item.type === 0 && item.workType === 1) {
+ uni.navigateTo({
+ url: `/pages/sorting/sorting?id=${item.id}`
+ })
+ } else if (item.type === 0 && item.workType === 2) {
+ uni.navigateTo({
+ url: `/pages/packaging-worker/packaging-worker?id=${item.id}`
+ })
+ }
+ },
+ cancelOrder() {
+ this.$u.api.receiveCancelOrder({
+ orderId: this.orderId
+ }).then(res => {
+ this.show = false
+ this.orderList = []
+ this.next = true
+ this.page = 1
+ this.getOrderList()
+ })
+ },
+ phoneCall(phoneNumber) {
+ uni.makePhoneCall({
+ phoneNumber
+ });
+ },
+ // 璁㈠崟鍒嗛〉
+ getOrderList() {
+ if (!this.next) return;
+ this.$u.api.orderPage({
+ capacity: 10,
+ page: this.page,
+ model: {
+ queryMyOrderType: this.userInfo.useIdentity,
+ status: this.status,
+ queryLat: this.latitude,
+ queryLgt: this.longitude
+ }
+ }).then(res => {
+ res.data.records.forEach(item => {
+ // 璁㈤鍗�
+ if (item.type === 2) {
+ item.wayInfoCopy = JSON.parse(item.wayInfo).map(item => {
+ return `${item.name}${item.price / 100}鍏�(${item.num}浠�)`
+ }).join(' | ')
+ // 杩愯揣
+ } else if (item.type === 1) {
+ item.wayInfo = JSON.parse(item.wayInfo)
+ }
+ })
+ this.orderList = [...this.orderList, ...res.data.records]
+
+ if (this.orderList.length === res.data.total) {
+ this.next = false
+ }
+ })
+ },
+ clickOrderType(id) {
+ if (typeof id === 'object') {
+ this.status = id[0]
+ this.commentStatus = id[1]
+ } else {
+ this.commentStatus = ''
+ this.status = id
+ }
+ this.orderList = []
+ this.next = true
+ this.page = 1
+ this.getOrderList()
+ }
}
}
</script>
@@ -304,6 +433,36 @@
<style lang="scss" scoped>
.index {
width: 100%;
+ .slot-content {
+ width: 100%;
+ text-align: center;
+ font-weight: 400;
+ font-size: 30rpx;
+ color: #333333;
+ margin: 30rpx 0;
+ }
+ .btn1 {
+ width: 264rpx;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ font-weight: 400;
+ font-size: 32rpx;
+ color: #666666;
+ border-radius: 44rpx;
+ border: 1rpx solid #B2B2B2;
+ }
+ .btn2 {
+ width: 264rpx;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ background: #00BC12;
+ border-radius: 44rpx;
+ }
.index-j-head {
width: 100%;
background-color: #ffffff;
@@ -358,38 +517,47 @@
color: #FF0000;
}
}
- .eidt-close {
- width: 160rpx;
- height: 64rpx;
- font-weight: 400;
- font-size: 28rpx;
- color: #666666;
- line-height: 64rpx;
- text-align: center;
- border-radius: 34rpx;
- border: 1rpx solid #B2B2B2;
- }
- .eidt-phone {
- width: 160rpx;
- height: 64rpx;
- line-height: 64rpx;
- text-align: center;
- font-weight: 400;
- font-size: 28rpx;
- color: #00BC12;
- border-radius: 34rpx;
- border: 1rpx solid #00BC12;
- }
- .eidt-btn {
- width: 160rpx;
- height: 64rpx;
- line-height: 64rpx;
- text-align: center;
- font-weight: 400;
- font-size: 28rpx;
- color: #FFFFFF;
- background: #00BC12;
- border-radius: 34rpx;
+ .eidt-right {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ .eidt-close {
+ width: 160rpx;
+ height: 64rpx;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #666666;
+ line-height: 64rpx;
+ text-align: center;
+ border-radius: 34rpx;
+ border: 1rpx solid #B2B2B2;
+ margin-left: 20rpx;
+ }
+ .eidt-phone {
+ width: 160rpx;
+ height: 64rpx;
+ line-height: 64rpx;
+ text-align: center;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #00BC12;
+ border-radius: 34rpx;
+ border: 1rpx solid #00BC12;
+ margin-left: 20rpx;
+ }
+ .eidt-btn {
+ width: 160rpx;
+ height: 64rpx;
+ line-height: 64rpx;
+ text-align: center;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #FFFFFF;
+ background: #00BC12;
+ border-radius: 34rpx;
+ margin-left: 20rpx;
+ }
}
}
.index-list-item-price {
@@ -530,6 +698,9 @@
border: 2rpx solid #FD9E24;
}
}
+ .hui {
+ color: #999999 !important;
+ }
.index-list-item-head-r {
font-weight: 400;
font-size: 28rpx;
@@ -541,35 +712,43 @@
.index-labs {
width: 100%;
height: 90rpx;
+ padding: 0 30rpx;
+ box-sizing: border-box;
display: flex;
align-items: center;
- justify-content: space-between;
background: #FFFFFF;
position: sticky;
left: 0;
- .active {
- font-weight: 500 !important;
- font-size: 32rpx !important;
- color: #222222 !important;
- }
- .index-labs-row {
- flex: 1;
+ .scroll-view_H {
+ width: 100%;
height: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- font-weight: 400;
- font-size: 30rpx;
- color: #666666;
- position: relative;
- .index-labs-row-x {
- position: absolute;
- bottom: 0;
- left: 50%;
- width: 40rpx;
- height: 2rpx;
- background-color: #00BC12;
- transform: translate(-50%, 0);
+ white-space: nowrap;
+ .active {
+ font-weight: 500 !important;
+ font-size: 32rpx !important;
+ color: #222222 !important;
+ }
+ .index-labs-row {
+ display: inline-block;
+ height: 100%;
+ line-height: 90rpx;
+ font-weight: 400;
+ font-size: 30rpx;
+ color: #666666;
+ position: relative;
+ margin-right: 62rpx;
+ &:last-child {
+ margin: 0 !important;
+ }
+ .index-labs-row-x {
+ position: absolute;
+ bottom: 0;
+ left: 50%;
+ width: 40rpx;
+ height: 2rpx;
+ background-color: #00BC12;
+ transform: translate(-50%, 0);
+ }
}
}
}
--
Gitblit v1.9.3