Commit 2b437de57d447e17fc3d9db2d2a48dfde60896ab
1 parent
ea602bf3
feat: 优化界面
Showing
15 changed files
with
173 additions
and
128 deletions
garbage-removal/src/pages/order/index.vue
| ... | ... | @@ -13,7 +13,6 @@ import OrderDriver from './order-driver/index.vue'; |
| 13 | 13 | import OrderOther from './order-other/index.vue'; |
| 14 | 14 | const mainStore = useMainStore() |
| 15 | 15 | const userType = computed(() => mainStore.userType) |
| 16 | -console.log(userType.value); | |
| 17 | 16 | </script> |
| 18 | 17 | <style lang="scss" scoped> |
| 19 | 18 | .container { | ... | ... |
garbage-removal/src/pages/order/order-disposal/index.vue
| 1 | 1 | <template> |
| 2 | 2 | <view class="order-container"> |
| 3 | - <z-paging-swiper> | |
| 4 | - <template v-slot:top> | |
| 5 | - <view class="header-box" :style="{ | |
| 6 | - 'height': lightHeight, 'line-height': lightHeight, | |
| 7 | - 'padding-top': topMargin | |
| 8 | - } | |
| 9 | - "> | |
| 10 | - <view class="header-box-left-message"> | |
| 11 | - | |
| 12 | - </view> | |
| 13 | - <view class="header-box-title"> | |
| 14 | - {{ title }} | |
| 3 | + <!-- #ifdef H5 --> | |
| 4 | + <z-paging-swiper :fixed="false"> | |
| 5 | + <!-- #endif --> | |
| 6 | + <!-- #ifdef MP-WEIXIN --> | |
| 7 | + <z-paging-swiper> | |
| 8 | + <!-- #endif --> | |
| 9 | + <template v-slot:top> | |
| 10 | + <view class="header-box" :style="{ | |
| 11 | + 'height': lightHeight, 'line-height': lightHeight, | |
| 12 | + 'padding-top': topMargin | |
| 13 | + } | |
| 14 | + "> | |
| 15 | + <view class="header-box-left-message"> | |
| 16 | + | |
| 17 | + </view> | |
| 18 | + <view class="header-box-title"> | |
| 19 | + {{ title }} | |
| 20 | + </view> | |
| 15 | 21 | </view> |
| 16 | - </view> | |
| 17 | - <u-tabs lineWidth=" 40" lineColor="#ffffff" lineHeight="6" | |
| 18 | - :activeStyle="{ 'color': '#ffffff', 'font-weight': 'bolder' }" :inactiveStyle="{ color: '#ffffff' }" | |
| 19 | - ref="uTabsElement" :list="list" :current="current" @change="tabsChange" :scrollable="false"></u-tabs> | |
| 20 | - </template> | |
| 21 | - <swiper class="swiper" :current="swiperCurrent" @translation="translation" @animationfinish="animationfinish"> | |
| 22 | - <swiper-item class="swiper-item" v-for="( item, index ) in list " :key="index"> | |
| 23 | - <swiper-list-item :tabIndex="index" :currentIndex="swiperCurrent"></swiper-list-item> | |
| 24 | - </swiper-item> | |
| 25 | - </swiper> | |
| 26 | - </z-paging-swiper> | |
| 22 | + <u-tabs lineWidth=" 40" lineColor="#ffffff" lineHeight="6" | |
| 23 | + :activeStyle="{ 'color': '#ffffff', 'font-weight': 'bolder' }" :inactiveStyle="{ color: '#ffffff' }" | |
| 24 | + ref="uTabsElement" :list="list" :current="current" @change="tabsChange" :scrollable="false"></u-tabs> | |
| 25 | + </template> | |
| 26 | + <swiper class="swiper" :current="swiperCurrent" @translation="translation" @animationfinish="animationfinish"> | |
| 27 | + <swiper-item class="swiper-item" v-for="( item, index ) in list " :key="index"> | |
| 28 | + <swiper-list-item :tabIndex="index" :currentIndex="swiperCurrent"></swiper-list-item> | |
| 29 | + </swiper-item> | |
| 30 | + </swiper> | |
| 31 | + </z-paging-swiper> | |
| 27 | 32 | |
| 28 | 33 | </view> |
| 29 | 34 | <view class="scan-box"> |
| ... | ... | @@ -37,8 +42,7 @@ |
| 37 | 42 | |
| 38 | 43 | <script setup> |
| 39 | 44 | import { checkCode } from '@/apis/order.js'; |
| 40 | -import { onShow } from '@dcloudio/uni-app'; | |
| 41 | -import { nextTick, ref } from 'vue'; | |
| 45 | +import { nextTick, onMounted, ref } from 'vue'; | |
| 42 | 46 | import swiperListItem from './swiper-list-item/index.vue'; |
| 43 | 47 | const list = ref([{ name: '处理中' }, { name: '已完成' }]) |
| 44 | 48 | const current = ref(0); |
| ... | ... | @@ -48,6 +52,7 @@ const title = ref('处置场所'); |
| 48 | 52 | const topMargin = ref(); |
| 49 | 53 | const lightHeight = ref(); |
| 50 | 54 | const tabsChange = (el) => { |
| 55 | + console.log("tabsChange", el); | |
| 51 | 56 | swiperCurrent.value = Number(el.index) |
| 52 | 57 | } |
| 53 | 58 | |
| ... | ... | @@ -89,7 +94,7 @@ const handleScan = () => { |
| 89 | 94 | } |
| 90 | 95 | |
| 91 | 96 | |
| 92 | -onShow(() => { | |
| 97 | +onMounted(() => { | |
| 93 | 98 | console.log("处理场所"); |
| 94 | 99 | nextTick(() => { |
| 95 | 100 | try { | ... | ... |
garbage-removal/src/pages/order/order-disposal/swiper-list-item/index.vue
| ... | ... | @@ -85,7 +85,9 @@ onShow(() => { |
| 85 | 85 | if (props.currentIndex == props.tabIndex) { |
| 86 | 86 | if (firstLoaded.value) { |
| 87 | 87 | setTimeout(() => { |
| 88 | - paging.value.reload(); | |
| 88 | + if (paging.value) { | |
| 89 | + paging.value.reload(); | |
| 90 | + } | |
| 89 | 91 | }, 50); |
| 90 | 92 | } |
| 91 | 93 | } |
| ... | ... | @@ -96,7 +98,9 @@ watch(() => props.currentIndex, (val1, val2) => { |
| 96 | 98 | if (props.currentIndex == props.tabIndex) { |
| 97 | 99 | if (!firstLoaded.value) { |
| 98 | 100 | setTimeout(() => { |
| 99 | - paging.value.reload(); | |
| 101 | + if (paging.value) { | |
| 102 | + paging.value.reload(); | |
| 103 | + } | |
| 100 | 104 | }, 50); |
| 101 | 105 | } |
| 102 | 106 | } | ... | ... |
garbage-removal/src/pages/order/order-driver/index.vue
| 1 | 1 | <template> |
| 2 | 2 | <view class="order-container"> |
| 3 | - <z-paging-swiper> | |
| 4 | - <template v-slot:top> | |
| 5 | - <view class="header-box" :style="{ | |
| 6 | - 'height': lightHeight, 'line-height': lightHeight, | |
| 7 | - 'padding-top': topMargin | |
| 8 | - } | |
| 9 | - "> | |
| 10 | - <view class="header-box-left-message"> | |
| 11 | - | |
| 12 | - </view> | |
| 13 | - <view class="header-box-title"> | |
| 14 | - {{ title }} | |
| 3 | + <!-- #ifdef H5 --> | |
| 4 | + <z-paging-swiper :fixed="false"> | |
| 5 | + <!-- #endif --> | |
| 6 | + <!-- #ifdef MP-WEIXIN --> | |
| 7 | + <z-paging-swiper> | |
| 8 | + <!-- #endif --> | |
| 9 | + <template v-slot:top> | |
| 10 | + <view class="header-box" :style="{ | |
| 11 | + 'height': lightHeight, 'line-height': lightHeight, | |
| 12 | + 'padding-top': topMargin | |
| 13 | + } | |
| 14 | + "> | |
| 15 | + <view class="header-box-left-message"> | |
| 16 | + | |
| 17 | + </view> | |
| 18 | + <view class="header-box-title"> | |
| 19 | + {{ title }} | |
| 20 | + </view> | |
| 15 | 21 | </view> |
| 16 | - </view> | |
| 17 | - <u-tabs lineWidth=" 40" lineColor="#ffffff" lineHeight="6" | |
| 18 | - :activeStyle="{ 'color': '#ffffff', 'font-weight': 'bolder' }" :inactiveStyle="{ color: '#ffffff' }" | |
| 19 | - ref="uTabsElement" :list="list" :current="current" @change="tabsChange" :scrollable="false"></u-tabs> | |
| 20 | - </template> | |
| 21 | - <swiper class="swiper" :current="swiperCurrent" @translation="translation" @animationfinish="animationfinish"> | |
| 22 | - <swiper-item class="swiper-item" v-for="(item, index) in list" :key="index"> | |
| 23 | - <swiper-list-item :tabIndex="index" :currentIndex="swiperCurrent"></swiper-list-item> | |
| 24 | - </swiper-item> | |
| 25 | - </swiper> | |
| 26 | - </z-paging-swiper> | |
| 22 | + <u-tabs lineWidth=" 40" lineColor="#ffffff" lineHeight="6" | |
| 23 | + :activeStyle="{ 'color': '#ffffff', 'font-weight': 'bolder' }" :inactiveStyle="{ color: '#ffffff' }" | |
| 24 | + ref="uTabsElement" :list="list" :current="current" @change="tabsChange" :scrollable="false"></u-tabs> | |
| 25 | + </template> | |
| 26 | + <swiper class="swiper" :current="swiperCurrent" @translation="translation" @animationfinish="animationfinish"> | |
| 27 | + <swiper-item class="swiper-item" v-for="(item, index) in list" :key="index"> | |
| 28 | + <swiper-list-item :tabIndex="index" :currentIndex="swiperCurrent"></swiper-list-item> | |
| 29 | + </swiper-item> | |
| 30 | + </swiper> | |
| 31 | + </z-paging-swiper> | |
| 27 | 32 | </view> |
| 28 | 33 | </template> |
| 29 | 34 | <script setup> |
| 30 | -import { onShow } from '@dcloudio/uni-app'; | |
| 31 | -import { nextTick, ref } from 'vue'; | |
| 35 | +import { nextTick, onMounted, ref } from 'vue'; | |
| 32 | 36 | import swiperListItem from './swiper-list-item/index.vue'; |
| 33 | 37 | const list = ref([{ name: '待清运' }, { name: '清运中' }, { name: '全部' }, { name: '已完成' }]) |
| 34 | 38 | const current = ref(0); |
| ... | ... | @@ -38,6 +42,7 @@ const topMargin = ref() |
| 38 | 42 | const lightHeight = ref() |
| 39 | 43 | const title = ref('订单列表') |
| 40 | 44 | const tabsChange = (el) => { |
| 45 | + console.log("tabsChange", el); | |
| 41 | 46 | swiperCurrent.value = Number(el.index) |
| 42 | 47 | } |
| 43 | 48 | const animationfinish = (e) => { |
| ... | ... | @@ -47,7 +52,7 @@ const animationfinish = (e) => { |
| 47 | 52 | const translation = (e) => { |
| 48 | 53 | uTabsElement.value.setDx(e.detail.dx) |
| 49 | 54 | } |
| 50 | -onShow(() => { | |
| 55 | +onMounted(() => { | |
| 51 | 56 | console.log("驾驶员"); |
| 52 | 57 | nextTick(() => { |
| 53 | 58 | try { | ... | ... |
garbage-removal/src/pages/order/order-driver/swiper-list-item/index.vue
| ... | ... | @@ -33,7 +33,6 @@ |
| 33 | 33 | |
| 34 | 34 | <script setup> |
| 35 | 35 | import { queryOrderList } from "@/apis/order.js"; |
| 36 | -import { useMainStore } from '@/stores/index.js'; | |
| 37 | 36 | import { onShow } from "@dcloudio/uni-app"; |
| 38 | 37 | import { ref, watch } from 'vue'; |
| 39 | 38 | const props = defineProps({ |
| ... | ... | @@ -45,10 +44,6 @@ const props = defineProps({ |
| 45 | 44 | } |
| 46 | 45 | }) |
| 47 | 46 | |
| 48 | -const store = useMainStore(); | |
| 49 | -const currentCancelOrderId = ref(""); | |
| 50 | -const currentCancelName = ref(""); | |
| 51 | -const cancelShow = ref(false) | |
| 52 | 47 | const dataList = ref([]); |
| 53 | 48 | const paging = ref(null); |
| 54 | 49 | const firstLoaded = ref(false) |
| ... | ... | @@ -93,7 +88,9 @@ onShow(() => { |
| 93 | 88 | if (props.currentIndex == props.tabIndex) { |
| 94 | 89 | if (firstLoaded.value) { |
| 95 | 90 | setTimeout(() => { |
| 96 | - paging.value.reload(); | |
| 91 | + if (paging.value) { | |
| 92 | + paging.value.reload(); | |
| 93 | + } | |
| 97 | 94 | }, 50); |
| 98 | 95 | } |
| 99 | 96 | } |
| ... | ... | @@ -104,7 +101,9 @@ watch(() => props.currentIndex, (val1, val2) => { |
| 104 | 101 | if (props.currentIndex == props.tabIndex) { |
| 105 | 102 | if (!firstLoaded.value) { |
| 106 | 103 | setTimeout(() => { |
| 107 | - paging.value.reload(); | |
| 104 | + if (paging.value) { | |
| 105 | + paging.value.reload(); | |
| 106 | + } | |
| 108 | 107 | }, 50); |
| 109 | 108 | } |
| 110 | 109 | } | ... | ... |
garbage-removal/src/pages/order/order-other/index.vue
| 1 | 1 | <template> |
| 2 | 2 | <view class="order-container"> |
| 3 | - <z-paging-swiper> | |
| 4 | - <template v-slot:top> | |
| 5 | - <view class="header-box" :style="{ | |
| 6 | - 'height': lightHeight, 'line-height': lightHeight, | |
| 7 | - 'padding-top': topMargin | |
| 8 | - } | |
| 9 | - "> | |
| 10 | - <view class="header-box-left-message" v-if="userType == '用户'" @click="handlerMessageClick"> | |
| 11 | - <u-icon name="bell-fill" size="37" color="#ffffff" @click="goBack"></u-icon> | |
| 12 | - <up-badge :type="type" max="99" :value="messageCount"></up-badge> | |
| 13 | - </view> | |
| 14 | - <view class="header-box-left-message" v-else> | |
| 15 | - | |
| 16 | - </view> | |
| 17 | - <view class="header-box-title"> | |
| 18 | - {{ title }} | |
| 3 | + <!-- #ifdef H5 --> | |
| 4 | + <z-paging-swiper :fixed="false"> | |
| 5 | + <!-- #endif --> | |
| 6 | + <!-- #ifdef MP-WEIXIN --> | |
| 7 | + <z-paging-swiper> | |
| 8 | + <!-- #endif --> | |
| 9 | + <template v-slot:top> | |
| 10 | + <view class="header-box" :style="{ | |
| 11 | + 'height': lightHeight, 'line-height': lightHeight, | |
| 12 | + 'padding-top': topMargin | |
| 13 | + } | |
| 14 | + "> | |
| 15 | + <view class="header-box-left-message" v-if="userType == '用户'" @click="handlerMessageClick"> | |
| 16 | + <u-icon name="bell-fill" size="37" color="#ffffff" @click="goBack"></u-icon> | |
| 17 | + <up-badge :type="type" max="99" :value="messageCount"></up-badge> | |
| 18 | + </view> | |
| 19 | + <view class="header-box-left-message" v-else> | |
| 20 | + | |
| 21 | + </view> | |
| 22 | + <view class="header-box-title"> | |
| 23 | + {{ title }} | |
| 24 | + </view> | |
| 19 | 25 | </view> |
| 20 | - </view> | |
| 21 | - <u-tabs lineWidth=" 40" lineColor="#ffffff" lineHeight="6" | |
| 22 | - :activeStyle="{ 'color': '#ffffff', 'font-weight': 'bolder' }" :inactiveStyle="{ color: '#ffffff' }" | |
| 23 | - ref="uTabsElement" :list="list" :current="current" @change="tabsChange" :scrollable="false"></u-tabs> | |
| 24 | - </template> | |
| 25 | - <swiper class="swiper" :current="swiperCurrent" @translation="translation" @animationfinish="animationfinish"> | |
| 26 | - <swiper-item class="swiper-item" v-for="( item, index ) in list " :key="index"> | |
| 27 | - <swiper-list-item :tabIndex="index" :currentIndex="swiperCurrent"></swiper-list-item> | |
| 28 | - </swiper-item> | |
| 29 | - </swiper> | |
| 30 | - </z-paging-swiper> | |
| 26 | + <u-tabs lineWidth=" 40" lineColor="#ffffff" lineHeight="6" | |
| 27 | + :activeStyle="{ 'color': '#ffffff', 'font-weight': 'bolder' }" :inactiveStyle="{ color: '#ffffff' }" | |
| 28 | + ref="uTabsElement" :list="list" :current="current" @change="tabsChange" :scrollable="false"></u-tabs> | |
| 29 | + </template> | |
| 30 | + <swiper class="swiper" :current="swiperCurrent" @translation="translation" @animationfinish="animationfinish"> | |
| 31 | + <swiper-item class="swiper-item" v-for="( item, index ) in list " :key="index"> | |
| 32 | + <swiper-list-item :tabIndex="index" :currentIndex="swiperCurrent"></swiper-list-item> | |
| 33 | + </swiper-item> | |
| 34 | + </swiper> | |
| 35 | + </z-paging-swiper> | |
| 31 | 36 | </view> |
| 32 | 37 | |
| 33 | 38 | </template> |
| 34 | 39 | <script setup> |
| 35 | 40 | import { queryOrderMessageCount } from '@/apis/order.js'; |
| 36 | 41 | import { useMainStore } from '@/stores/index.js'; |
| 37 | -import { onShow } from '@dcloudio/uni-app'; | |
| 38 | -import { computed, nextTick, ref } from 'vue'; | |
| 42 | +import { computed, nextTick, onMounted, ref } from 'vue'; | |
| 39 | 43 | import swiperListItem from './swiper-list-item/index.vue'; |
| 40 | 44 | const store = useMainStore(); |
| 41 | 45 | const list = ref([{ name: '待清运' }, { name: '清运中' }, { name: '全部' }, { name: '已完成' }]) |
| ... | ... | @@ -48,6 +52,7 @@ const lightHeight = ref() |
| 48 | 52 | const messageCount = ref(0) |
| 49 | 53 | const title = ref("订单列表") |
| 50 | 54 | const tabsChange = (el) => { |
| 55 | + console.log("tabsChange:", el); | |
| 51 | 56 | swiperCurrent.value = Number(el.index) |
| 52 | 57 | } |
| 53 | 58 | const animationfinish = (e) => { |
| ... | ... | @@ -55,12 +60,19 @@ const animationfinish = (e) => { |
| 55 | 60 | swiperCurrent.value = e.detail.current |
| 56 | 61 | } |
| 57 | 62 | const translation = (e) => { |
| 63 | + console.log("uTabs:", e.detail.dx); | |
| 58 | 64 | uTabsElement.value.setDx(e.detail.dx) |
| 59 | 65 | } |
| 60 | 66 | const handlerMessageClick = () => { |
| 61 | 67 | uni.$u.route("pages/order-info/order-other/user-message/index") |
| 62 | 68 | } |
| 63 | -onShow(() => { | |
| 69 | +onMounted(() => { | |
| 70 | + | |
| 71 | + if (userType.value == '用户') { | |
| 72 | + queryOrderMessageCount().then(res => { | |
| 73 | + messageCount.value = res.data.data | |
| 74 | + }) | |
| 75 | + } | |
| 64 | 76 | nextTick(() => { |
| 65 | 77 | try { |
| 66 | 78 | const { height, top } = uni.getMenuButtonBoundingClientRect(); |
| ... | ... | @@ -73,13 +85,6 @@ onShow(() => { |
| 73 | 85 | } |
| 74 | 86 | }) |
| 75 | 87 | }) |
| 76 | -onShow(() => { | |
| 77 | - if (userType.value == '用户') { | |
| 78 | - queryOrderMessageCount().then(res => { | |
| 79 | - messageCount.value = res.data.data | |
| 80 | - }) | |
| 81 | - } | |
| 82 | -}) | |
| 83 | 88 | </script> |
| 84 | 89 | <style lang="scss" scoped> |
| 85 | 90 | .order-container { | ... | ... |
garbage-removal/src/pages/order/order-other/swiper-list-item/index.vue
| ... | ... | @@ -200,7 +200,9 @@ onShow(() => { |
| 200 | 200 | if (props.currentIndex == props.tabIndex) { |
| 201 | 201 | if (firstLoaded.value) { |
| 202 | 202 | setTimeout(() => { |
| 203 | - paging.value.reload(); | |
| 203 | + if (paging.value) { | |
| 204 | + paging.value.reload(); | |
| 205 | + } | |
| 204 | 206 | }, 50); |
| 205 | 207 | } |
| 206 | 208 | } |
| ... | ... | @@ -211,7 +213,9 @@ watch(() => props.currentIndex, (val1, val2) => { |
| 211 | 213 | if (props.currentIndex == props.tabIndex) { |
| 212 | 214 | if (!firstLoaded.value) { |
| 213 | 215 | setTimeout(() => { |
| 214 | - paging.value.reload(); | |
| 216 | + if (paging.value) { | |
| 217 | + paging.value.reload(); | |
| 218 | + } | |
| 215 | 219 | }, 50); |
| 216 | 220 | } |
| 217 | 221 | } | ... | ... |
garbage-removal/src/pages/wode-info/wode-info-choose/index.vue
| ... | ... | @@ -127,10 +127,17 @@ const submit = (userType) => { |
| 127 | 127 | } |
| 128 | 128 | store.userType = userType; |
| 129 | 129 | store.userInfo = unitInfo.value[userType] |
| 130 | + // #ifdef H5 | |
| 130 | 131 | uni.$u.route({ |
| 131 | 132 | type: "switchTab", |
| 132 | - url: `pages/home/index`, | |
| 133 | + url: `pages/order/index`, | |
| 133 | 134 | }) |
| 135 | + // #endif | |
| 136 | + // #ifdef MP-WEIXIN | |
| 137 | + uni.switchTab({ | |
| 138 | + url: `/pages/home/index` | |
| 139 | + }) | |
| 140 | + // #endif | |
| 134 | 141 | } |
| 135 | 142 | }) |
| 136 | 143 | ... | ... |
garbage-removal/src/pages/wode-info/wode-info-disposal-order/index.vue
garbage-removal/src/pages/wode-info/wode-info-driver-order/index.vue
| ... | ... | @@ -43,9 +43,6 @@ const props = defineProps({ |
| 43 | 43 | }) |
| 44 | 44 | |
| 45 | 45 | const type = ref(0); |
| 46 | -const currentCancelOrderId = ref(""); | |
| 47 | -const currentCancelName = ref(""); | |
| 48 | -const cancelShow = ref(false) | |
| 49 | 46 | const dataList = ref([]); |
| 50 | 47 | const paging = ref(null); |
| 51 | 48 | const firstLoaded = ref(false) |
| ... | ... | @@ -87,6 +84,9 @@ const queryList = (pageNo, pageSize) => { |
| 87 | 84 | } |
| 88 | 85 | |
| 89 | 86 | onLoad((options) => { |
| 87 | + uni.setNavigationBarTitle({ | |
| 88 | + title: options.title | |
| 89 | + }) | |
| 90 | 90 | type.value = options.type; |
| 91 | 91 | }) |
| 92 | 92 | ... | ... |
garbage-removal/src/pages/wode-info/wode-info-other-order/index.vue
| ... | ... | @@ -193,6 +193,9 @@ const queryList = (pageNo, pageSize) => { |
| 193 | 193 | |
| 194 | 194 | onLoad((options) => { |
| 195 | 195 | type.value = options.type; |
| 196 | + uni.setNavigationBarTitle({ | |
| 197 | + title: options.title | |
| 198 | + }) | |
| 196 | 199 | if (options.evaluateFlag) { |
| 197 | 200 | evaluateFlag.value = options.evaluateFlag; |
| 198 | 201 | } | ... | ... |
garbage-removal/src/pages/wode/wode-disposal/index.vue
| ... | ... | @@ -34,11 +34,12 @@ import { onShow } from "@dcloudio/uni-app"; |
| 34 | 34 | import { ref } from 'vue'; |
| 35 | 35 | const cleanBadgeCount = ref(0); |
| 36 | 36 | const querySuccessOrderList = () => { |
| 37 | - // TODO 查询我的订单 | |
| 37 | + // TODO 查询已完成 | |
| 38 | 38 | uni.$u.route({ |
| 39 | 39 | url: `pages/wode-info/wode-info-disposal-order/index`, |
| 40 | 40 | params: { |
| 41 | - type: 3 | |
| 41 | + type: 3, | |
| 42 | + title: '已完成' | |
| 42 | 43 | } |
| 43 | 44 | }) |
| 44 | 45 | } |
| ... | ... | @@ -46,7 +47,8 @@ const queryCleanOrderList = () => { |
| 46 | 47 | uni.$u.route({ |
| 47 | 48 | url: `pages/wode-info/wode-info-disposal-order/index`, |
| 48 | 49 | params: { |
| 49 | - type: 1 | |
| 50 | + type: 1, | |
| 51 | + title: '处理中' | |
| 50 | 52 | } |
| 51 | 53 | }) |
| 52 | 54 | } | ... | ... |
garbage-removal/src/pages/wode/wode-driver/index.vue
| ... | ... | @@ -63,7 +63,8 @@ const queryMyOrderList = () => { |
| 63 | 63 | uni.$u.route({ |
| 64 | 64 | url: `pages/wode-info/wode-info-driver-order/index`, |
| 65 | 65 | params: { |
| 66 | - type: 2 | |
| 66 | + type: 2, | |
| 67 | + title: "我的订单" | |
| 67 | 68 | } |
| 68 | 69 | }) |
| 69 | 70 | } |
| ... | ... | @@ -72,7 +73,8 @@ const queryNoCleanOrderList = () => { |
| 72 | 73 | uni.$u.route({ |
| 73 | 74 | url: `pages/wode-info/wode-info-driver-order/index`, |
| 74 | 75 | params: { |
| 75 | - type: 0 | |
| 76 | + type: 0, | |
| 77 | + title: "待清运" | |
| 76 | 78 | } |
| 77 | 79 | }) |
| 78 | 80 | } |
| ... | ... | @@ -81,7 +83,8 @@ const queryCleanOrderList = () => { |
| 81 | 83 | uni.$u.route({ |
| 82 | 84 | url: `pages/wode-info/wode-info-driver-order/index`, |
| 83 | 85 | params: { |
| 84 | - type: 1 | |
| 86 | + type: 1, | |
| 87 | + title: "清运中" | |
| 85 | 88 | } |
| 86 | 89 | }) |
| 87 | 90 | } |
| ... | ... | @@ -90,7 +93,8 @@ const querySuccessOrderList = () => { |
| 90 | 93 | uni.$u.route({ |
| 91 | 94 | url: `pages/wode-info/wode-info-driver-order/index`, |
| 92 | 95 | params: { |
| 93 | - type: 3 | |
| 96 | + type: 3, | |
| 97 | + title: "已完成" | |
| 94 | 98 | } |
| 95 | 99 | }) |
| 96 | 100 | } | ... | ... |
garbage-removal/src/pages/wode/wode-other/index.vue
| ... | ... | @@ -64,7 +64,8 @@ const queryMyOrderList = () => { |
| 64 | 64 | uni.$u.route({ |
| 65 | 65 | url: `pages/wode-info/wode-info-other-order/index`, |
| 66 | 66 | params: { |
| 67 | - type: 2 | |
| 67 | + type: 2, | |
| 68 | + title: "我的订单" | |
| 68 | 69 | } |
| 69 | 70 | }) |
| 70 | 71 | } |
| ... | ... | @@ -73,7 +74,8 @@ const queryNoCleanOrderList = () => { |
| 73 | 74 | uni.$u.route({ |
| 74 | 75 | url: `pages/wode-info/wode-info-other-order/index`, |
| 75 | 76 | params: { |
| 76 | - type: 0 | |
| 77 | + type: 0, | |
| 78 | + title: "待清运" | |
| 77 | 79 | } |
| 78 | 80 | }) |
| 79 | 81 | } |
| ... | ... | @@ -82,7 +84,8 @@ const queryCleanOrderList = () => { |
| 82 | 84 | uni.$u.route({ |
| 83 | 85 | url: `pages/wode-info/wode-info-other-order/index`, |
| 84 | 86 | params: { |
| 85 | - type: 1 | |
| 87 | + type: 1, | |
| 88 | + title: "清运中" | |
| 86 | 89 | } |
| 87 | 90 | }) |
| 88 | 91 | } |
| ... | ... | @@ -93,7 +96,8 @@ const queryEvaluateOrderList = () => { |
| 93 | 96 | url: `pages/wode-info/wode-info-other-order/index`, |
| 94 | 97 | params: { |
| 95 | 98 | type: 3, |
| 96 | - evaluateFlag: 1 | |
| 99 | + evaluateFlag: 1, | |
| 100 | + title: "待评价" | |
| 97 | 101 | } |
| 98 | 102 | }) |
| 99 | 103 | } | ... | ... |
garbage-removal/src/uview-plus/components/u-tabs/u-tabs.vue
| ... | ... | @@ -27,22 +27,22 @@ |
| 27 | 27 | </view> |
| 28 | 28 | <!-- #ifdef APP-NVUE --> |
| 29 | 29 | <view class="u-tabs__wrapper__nav__line" ref="u-tabs__wrapper__nav__line" :style="[{ |
| 30 | - width: $u.addUnit(lineWidth), | |
| 31 | - height: $u.addUnit(lineHeight), | |
| 32 | - background: lineColor, | |
| 33 | - backgroundSize: lineBgSize, | |
| 34 | - }]"> | |
| 30 | + width: $u.addUnit(lineWidth), | |
| 31 | + height: $u.addUnit(lineHeight), | |
| 32 | + background: lineColor, | |
| 33 | + backgroundSize: lineBgSize, | |
| 34 | + }]"> | |
| 35 | 35 | </view> |
| 36 | 36 | <!-- #endif --> |
| 37 | 37 | <!-- #ifndef APP-NVUE --> |
| 38 | 38 | <view class="u-tabs__wrapper__nav__line" ref="u-tabs__wrapper__nav__line" :style="[{ |
| 39 | - width: $u.addUnit(lineWidth), | |
| 40 | - transform: `translate(${lineOffsetLeft}px)`, | |
| 41 | - transitionDuration: `${firstTime ? 0 : duration}ms`, | |
| 42 | - height: $u.addUnit(lineHeight), | |
| 43 | - background: lineColor, | |
| 44 | - backgroundSize: lineBgSize, | |
| 45 | - }]"> | |
| 39 | + width: $u.addUnit(lineWidth), | |
| 40 | + transform: `translate(${lineOffsetLeft}px)`, | |
| 41 | + transitionDuration: `${firstTime ? 0 : duration}ms`, | |
| 42 | + height: $u.addUnit(lineHeight), | |
| 43 | + background: lineColor, | |
| 44 | + backgroundSize: lineBgSize, | |
| 45 | + }]"> | |
| 46 | 46 | </view> |
| 47 | 47 | <!-- #endif --> |
| 48 | 48 | </view> |
| ... | ... | @@ -214,6 +214,7 @@ export default { |
| 214 | 214 | if (this.list.length === 0) { |
| 215 | 215 | return |
| 216 | 216 | } |
| 217 | + console.log("resize"); | |
| 217 | 218 | Promise.all([this.getTabsRect(), this.getAllItemRect()]).then(([tabsRect, itemRect = []]) => { |
| 218 | 219 | this.tabsRect = tabsRect |
| 219 | 220 | this.scrollViewWidth = 0 | ... | ... |