guzijian / garbage-removal · Commits

Commit 2b437de57d447e17fc3d9db2d2a48dfde60896ab

Authored by guzijian
1 parent ea602bf3
build: skipped

feat: 优化界面

Inline Side-by-side
Showing 15 changed files with 173 additions and 128 deletions
garbage-removal/src/pages/order/index.vue
  View file @2b437de
@@ -13,7 +13,6 @@ import OrderDriver from './order-driver/index.vue'; @@ -13,7 +13,6 @@ import OrderDriver from './order-driver/index.vue';
13 import OrderOther from './order-other/index.vue'; 13 import OrderOther from './order-other/index.vue';
14 const mainStore = useMainStore() 14 const mainStore = useMainStore()
15 const userType = computed(() => mainStore.userType) 15 const userType = computed(() => mainStore.userType)
16 -console.log(userType.value);  
17 </script> 16 </script>
18 <style lang="scss" scoped> 17 <style lang="scss" scoped>
19 .container { 18 .container {
garbage-removal/src/pages/order/order-disposal/index.vue
  View file @2b437de
1 <template> 1 <template>
2 <view class="order-container"> 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 - &nbsp;  
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 + &nbsp;
  17 + </view>
  18 + <view class="header-box-title">
  19 + {{ title }}
  20 + </view>
15 </view> 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 </view> 33 </view>
29 <view class="scan-box"> 34 <view class="scan-box">
@@ -37,8 +42,7 @@ @@ -37,8 +42,7 @@
37 42
38 <script setup> 43 <script setup>
39 import { checkCode } from '@/apis/order.js'; 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 import swiperListItem from './swiper-list-item/index.vue'; 46 import swiperListItem from './swiper-list-item/index.vue';
43 const list = ref([{ name: '处理中' }, { name: '已完成' }]) 47 const list = ref([{ name: '处理中' }, { name: '已完成' }])
44 const current = ref(0); 48 const current = ref(0);
@@ -48,6 +52,7 @@ const title = ref(&#39;处置场所&#39;); @@ -48,6 +52,7 @@ const title = ref(&#39;处置场所&#39;);
48 const topMargin = ref(); 52 const topMargin = ref();
49 const lightHeight = ref(); 53 const lightHeight = ref();
50 const tabsChange = (el) => { 54 const tabsChange = (el) => {
  55 + console.log("tabsChange", el);
51 swiperCurrent.value = Number(el.index) 56 swiperCurrent.value = Number(el.index)
52 } 57 }
53 58
@@ -89,7 +94,7 @@ const handleScan = () =&gt; { @@ -89,7 +94,7 @@ const handleScan = () =&gt; {
89 } 94 }
90 95
91 96
92 -onShow(() => { 97 +onMounted(() => {
93 console.log("处理场所"); 98 console.log("处理场所");
94 nextTick(() => { 99 nextTick(() => {
95 try { 100 try {
garbage-removal/src/pages/order/order-disposal/swiper-list-item/index.vue
  View file @2b437de
@@ -85,7 +85,9 @@ onShow(() =&gt; { @@ -85,7 +85,9 @@ onShow(() =&gt; {
85 if (props.currentIndex == props.tabIndex) { 85 if (props.currentIndex == props.tabIndex) {
86 if (firstLoaded.value) { 86 if (firstLoaded.value) {
87 setTimeout(() => { 87 setTimeout(() => {
88 - paging.value.reload(); 88 + if (paging.value) {
  89 + paging.value.reload();
  90 + }
89 }, 50); 91 }, 50);
90 } 92 }
91 } 93 }
@@ -96,7 +98,9 @@ watch(() =&gt; props.currentIndex, (val1, val2) =&gt; { @@ -96,7 +98,9 @@ watch(() =&gt; props.currentIndex, (val1, val2) =&gt; {
96 if (props.currentIndex == props.tabIndex) { 98 if (props.currentIndex == props.tabIndex) {
97 if (!firstLoaded.value) { 99 if (!firstLoaded.value) {
98 setTimeout(() => { 100 setTimeout(() => {
99 - paging.value.reload(); 101 + if (paging.value) {
  102 + paging.value.reload();
  103 + }
100 }, 50); 104 }, 50);
101 } 105 }
102 } 106 }
garbage-removal/src/pages/order/order-driver/index.vue
  View file @2b437de
1 <template> 1 <template>
2 <view class="order-container"> 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 - &nbsp;  
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 + &nbsp;
  17 + </view>
  18 + <view class="header-box-title">
  19 + {{ title }}
  20 + </view>
15 </view> 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 </view> 32 </view>
28 </template> 33 </template>
29 <script setup> 34 <script setup>
30 -import { onShow } from '@dcloudio/uni-app';  
31 -import { nextTick, ref } from 'vue'; 35 +import { nextTick, onMounted, ref } from 'vue';
32 import swiperListItem from './swiper-list-item/index.vue'; 36 import swiperListItem from './swiper-list-item/index.vue';
33 const list = ref([{ name: '待清运' }, { name: '清运中' }, { name: '全部' }, { name: '已完成' }]) 37 const list = ref([{ name: '待清运' }, { name: '清运中' }, { name: '全部' }, { name: '已完成' }])
34 const current = ref(0); 38 const current = ref(0);
@@ -38,6 +42,7 @@ const topMargin = ref() @@ -38,6 +42,7 @@ const topMargin = ref()
38 const lightHeight = ref() 42 const lightHeight = ref()
39 const title = ref('订单列表') 43 const title = ref('订单列表')
40 const tabsChange = (el) => { 44 const tabsChange = (el) => {
  45 + console.log("tabsChange", el);
41 swiperCurrent.value = Number(el.index) 46 swiperCurrent.value = Number(el.index)
42 } 47 }
43 const animationfinish = (e) => { 48 const animationfinish = (e) => {
@@ -47,7 +52,7 @@ const animationfinish = (e) =&gt; { @@ -47,7 +52,7 @@ const animationfinish = (e) =&gt; {
47 const translation = (e) => { 52 const translation = (e) => {
48 uTabsElement.value.setDx(e.detail.dx) 53 uTabsElement.value.setDx(e.detail.dx)
49 } 54 }
50 -onShow(() => { 55 +onMounted(() => {
51 console.log("驾驶员"); 56 console.log("驾驶员");
52 nextTick(() => { 57 nextTick(() => {
53 try { 58 try {
garbage-removal/src/pages/order/order-driver/swiper-list-item/index.vue
  View file @2b437de
@@ -33,7 +33,6 @@ @@ -33,7 +33,6 @@
33 33
34 <script setup> 34 <script setup>
35 import { queryOrderList } from "@/apis/order.js"; 35 import { queryOrderList } from "@/apis/order.js";
36 -import { useMainStore } from '@/stores/index.js';  
37 import { onShow } from "@dcloudio/uni-app"; 36 import { onShow } from "@dcloudio/uni-app";
38 import { ref, watch } from 'vue'; 37 import { ref, watch } from 'vue';
39 const props = defineProps({ 38 const props = defineProps({
@@ -45,10 +44,6 @@ 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 const dataList = ref([]); 47 const dataList = ref([]);
53 const paging = ref(null); 48 const paging = ref(null);
54 const firstLoaded = ref(false) 49 const firstLoaded = ref(false)
@@ -93,7 +88,9 @@ onShow(() =&gt; { @@ -93,7 +88,9 @@ onShow(() =&gt; {
93 if (props.currentIndex == props.tabIndex) { 88 if (props.currentIndex == props.tabIndex) {
94 if (firstLoaded.value) { 89 if (firstLoaded.value) {
95 setTimeout(() => { 90 setTimeout(() => {
96 - paging.value.reload(); 91 + if (paging.value) {
  92 + paging.value.reload();
  93 + }
97 }, 50); 94 }, 50);
98 } 95 }
99 } 96 }
@@ -104,7 +101,9 @@ watch(() =&gt; props.currentIndex, (val1, val2) =&gt; { @@ -104,7 +101,9 @@ watch(() =&gt; props.currentIndex, (val1, val2) =&gt; {
104 if (props.currentIndex == props.tabIndex) { 101 if (props.currentIndex == props.tabIndex) {
105 if (!firstLoaded.value) { 102 if (!firstLoaded.value) {
106 setTimeout(() => { 103 setTimeout(() => {
107 - paging.value.reload(); 104 + if (paging.value) {
  105 + paging.value.reload();
  106 + }
108 }, 50); 107 }, 50);
109 } 108 }
110 } 109 }
garbage-removal/src/pages/order/order-other/index.vue
  View file @2b437de
1 <template> 1 <template>
2 <view class="order-container"> 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 - &nbsp;  
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 + &nbsp;
  21 + </view>
  22 + <view class="header-box-title">
  23 + {{ title }}
  24 + </view>
19 </view> 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 </view> 36 </view>
32 37
33 </template> 38 </template>
34 <script setup> 39 <script setup>
35 import { queryOrderMessageCount } from '@/apis/order.js'; 40 import { queryOrderMessageCount } from '@/apis/order.js';
36 import { useMainStore } from '@/stores/index.js'; 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 import swiperListItem from './swiper-list-item/index.vue'; 43 import swiperListItem from './swiper-list-item/index.vue';
40 const store = useMainStore(); 44 const store = useMainStore();
41 const list = ref([{ name: '待清运' }, { name: '清运中' }, { name: '全部' }, { name: '已完成' }]) 45 const list = ref([{ name: '待清运' }, { name: '清运中' }, { name: '全部' }, { name: '已完成' }])
@@ -48,6 +52,7 @@ const lightHeight = ref() @@ -48,6 +52,7 @@ const lightHeight = ref()
48 const messageCount = ref(0) 52 const messageCount = ref(0)
49 const title = ref("订单列表") 53 const title = ref("订单列表")
50 const tabsChange = (el) => { 54 const tabsChange = (el) => {
  55 + console.log("tabsChange:", el);
51 swiperCurrent.value = Number(el.index) 56 swiperCurrent.value = Number(el.index)
52 } 57 }
53 const animationfinish = (e) => { 58 const animationfinish = (e) => {
@@ -55,12 +60,19 @@ const animationfinish = (e) =&gt; { @@ -55,12 +60,19 @@ const animationfinish = (e) =&gt; {
55 swiperCurrent.value = e.detail.current 60 swiperCurrent.value = e.detail.current
56 } 61 }
57 const translation = (e) => { 62 const translation = (e) => {
  63 + console.log("uTabs:", e.detail.dx);
58 uTabsElement.value.setDx(e.detail.dx) 64 uTabsElement.value.setDx(e.detail.dx)
59 } 65 }
60 const handlerMessageClick = () => { 66 const handlerMessageClick = () => {
61 uni.$u.route("pages/order-info/order-other/user-message/index") 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 nextTick(() => { 76 nextTick(() => {
65 try { 77 try {
66 const { height, top } = uni.getMenuButtonBoundingClientRect(); 78 const { height, top } = uni.getMenuButtonBoundingClientRect();
@@ -73,13 +85,6 @@ onShow(() =&gt; { @@ -73,13 +85,6 @@ onShow(() =&gt; {
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 </script> 88 </script>
84 <style lang="scss" scoped> 89 <style lang="scss" scoped>
85 .order-container { 90 .order-container {
garbage-removal/src/pages/order/order-other/swiper-list-item/index.vue
  View file @2b437de
@@ -200,7 +200,9 @@ onShow(() =&gt; { @@ -200,7 +200,9 @@ onShow(() =&gt; {
200 if (props.currentIndex == props.tabIndex) { 200 if (props.currentIndex == props.tabIndex) {
201 if (firstLoaded.value) { 201 if (firstLoaded.value) {
202 setTimeout(() => { 202 setTimeout(() => {
203 - paging.value.reload(); 203 + if (paging.value) {
  204 + paging.value.reload();
  205 + }
204 }, 50); 206 }, 50);
205 } 207 }
206 } 208 }
@@ -211,7 +213,9 @@ watch(() =&gt; props.currentIndex, (val1, val2) =&gt; { @@ -211,7 +213,9 @@ watch(() =&gt; props.currentIndex, (val1, val2) =&gt; {
211 if (props.currentIndex == props.tabIndex) { 213 if (props.currentIndex == props.tabIndex) {
212 if (!firstLoaded.value) { 214 if (!firstLoaded.value) {
213 setTimeout(() => { 215 setTimeout(() => {
214 - paging.value.reload(); 216 + if (paging.value) {
  217 + paging.value.reload();
  218 + }
215 }, 50); 219 }, 50);
216 } 220 }
217 } 221 }
garbage-removal/src/pages/wode-info/wode-info-choose/index.vue
  View file @2b437de
@@ -127,10 +127,17 @@ const submit = (userType) =&gt; { @@ -127,10 +127,17 @@ const submit = (userType) =&gt; {
127 } 127 }
128 store.userType = userType; 128 store.userType = userType;
129 store.userInfo = unitInfo.value[userType] 129 store.userInfo = unitInfo.value[userType]
  130 + // #ifdef H5
130 uni.$u.route({ 131 uni.$u.route({
131 type: "switchTab", 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
  View file @2b437de
@@ -73,6 +73,9 @@ const goDetail = (val) =&gt; { @@ -73,6 +73,9 @@ const goDetail = (val) =&gt; {
73 }) 73 })
74 } 74 }
75 onLoad((options) => { 75 onLoad((options) => {
  76 + uni.setNavigationBarTitle({
  77 + title: options.title
  78 + })
76 type.value = options.type; 79 type.value = options.type;
77 if (options.evaluateFlag) { 80 if (options.evaluateFlag) {
78 evaluateFlag.value = options.evaluateFlag; 81 evaluateFlag.value = options.evaluateFlag;
garbage-removal/src/pages/wode-info/wode-info-driver-order/index.vue
  View file @2b437de
@@ -43,9 +43,6 @@ const props = defineProps({ @@ -43,9 +43,6 @@ const props = defineProps({
43 }) 43 })
44 44
45 const type = ref(0); 45 const type = ref(0);
46 -const currentCancelOrderId = ref("");  
47 -const currentCancelName = ref("");  
48 -const cancelShow = ref(false)  
49 const dataList = ref([]); 46 const dataList = ref([]);
50 const paging = ref(null); 47 const paging = ref(null);
51 const firstLoaded = ref(false) 48 const firstLoaded = ref(false)
@@ -87,6 +84,9 @@ const queryList = (pageNo, pageSize) =&gt; { @@ -87,6 +84,9 @@ const queryList = (pageNo, pageSize) =&gt; {
87 } 84 }
88 85
89 onLoad((options) => { 86 onLoad((options) => {
  87 + uni.setNavigationBarTitle({
  88 + title: options.title
  89 + })
90 type.value = options.type; 90 type.value = options.type;
91 }) 91 })
92 92
garbage-removal/src/pages/wode-info/wode-info-other-order/index.vue
  View file @2b437de
@@ -193,6 +193,9 @@ const queryList = (pageNo, pageSize) =&gt; { @@ -193,6 +193,9 @@ const queryList = (pageNo, pageSize) =&gt; {
193 193
194 onLoad((options) => { 194 onLoad((options) => {
195 type.value = options.type; 195 type.value = options.type;
  196 + uni.setNavigationBarTitle({
  197 + title: options.title
  198 + })
196 if (options.evaluateFlag) { 199 if (options.evaluateFlag) {
197 evaluateFlag.value = options.evaluateFlag; 200 evaluateFlag.value = options.evaluateFlag;
198 } 201 }
garbage-removal/src/pages/wode/wode-disposal/index.vue
  View file @2b437de
@@ -34,11 +34,12 @@ import { onShow } from &quot;@dcloudio/uni-app&quot;; @@ -34,11 +34,12 @@ import { onShow } from &quot;@dcloudio/uni-app&quot;;
34 import { ref } from 'vue'; 34 import { ref } from 'vue';
35 const cleanBadgeCount = ref(0); 35 const cleanBadgeCount = ref(0);
36 const querySuccessOrderList = () => { 36 const querySuccessOrderList = () => {
37 - // TODO 查询我的订单 37 + // TODO 查询已完成
38 uni.$u.route({ 38 uni.$u.route({
39 url: `pages/wode-info/wode-info-disposal-order/index`, 39 url: `pages/wode-info/wode-info-disposal-order/index`,
40 params: { 40 params: {
41 - type: 3 41 + type: 3,
  42 + title: '已完成'
42 } 43 }
43 }) 44 })
44 } 45 }
@@ -46,7 +47,8 @@ const queryCleanOrderList = () =&gt; { @@ -46,7 +47,8 @@ const queryCleanOrderList = () =&gt; {
46 uni.$u.route({ 47 uni.$u.route({
47 url: `pages/wode-info/wode-info-disposal-order/index`, 48 url: `pages/wode-info/wode-info-disposal-order/index`,
48 params: { 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
  View file @2b437de
@@ -63,7 +63,8 @@ const queryMyOrderList = () =&gt; { @@ -63,7 +63,8 @@ const queryMyOrderList = () =&gt; {
63 uni.$u.route({ 63 uni.$u.route({
64 url: `pages/wode-info/wode-info-driver-order/index`, 64 url: `pages/wode-info/wode-info-driver-order/index`,
65 params: { 65 params: {
66 - type: 2 66 + type: 2,
  67 + title: "我的订单"
67 } 68 }
68 }) 69 })
69 } 70 }
@@ -72,7 +73,8 @@ const queryNoCleanOrderList = () =&gt; { @@ -72,7 +73,8 @@ const queryNoCleanOrderList = () =&gt; {
72 uni.$u.route({ 73 uni.$u.route({
73 url: `pages/wode-info/wode-info-driver-order/index`, 74 url: `pages/wode-info/wode-info-driver-order/index`,
74 params: { 75 params: {
75 - type: 0 76 + type: 0,
  77 + title: "待清运"
76 } 78 }
77 }) 79 })
78 } 80 }
@@ -81,7 +83,8 @@ const queryCleanOrderList = () =&gt; { @@ -81,7 +83,8 @@ const queryCleanOrderList = () =&gt; {
81 uni.$u.route({ 83 uni.$u.route({
82 url: `pages/wode-info/wode-info-driver-order/index`, 84 url: `pages/wode-info/wode-info-driver-order/index`,
83 params: { 85 params: {
84 - type: 1 86 + type: 1,
  87 + title: "清运中"
85 } 88 }
86 }) 89 })
87 } 90 }
@@ -90,7 +93,8 @@ const querySuccessOrderList = () =&gt; { @@ -90,7 +93,8 @@ const querySuccessOrderList = () =&gt; {
90 uni.$u.route({ 93 uni.$u.route({
91 url: `pages/wode-info/wode-info-driver-order/index`, 94 url: `pages/wode-info/wode-info-driver-order/index`,
92 params: { 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
  View file @2b437de
@@ -64,7 +64,8 @@ const queryMyOrderList = () =&gt; { @@ -64,7 +64,8 @@ const queryMyOrderList = () =&gt; {
64 uni.$u.route({ 64 uni.$u.route({
65 url: `pages/wode-info/wode-info-other-order/index`, 65 url: `pages/wode-info/wode-info-other-order/index`,
66 params: { 66 params: {
67 - type: 2 67 + type: 2,
  68 + title: "我的订单"
68 } 69 }
69 }) 70 })
70 } 71 }
@@ -73,7 +74,8 @@ const queryNoCleanOrderList = () =&gt; { @@ -73,7 +74,8 @@ const queryNoCleanOrderList = () =&gt; {
73 uni.$u.route({ 74 uni.$u.route({
74 url: `pages/wode-info/wode-info-other-order/index`, 75 url: `pages/wode-info/wode-info-other-order/index`,
75 params: { 76 params: {
76 - type: 0 77 + type: 0,
  78 + title: "待清运"
77 } 79 }
78 }) 80 })
79 } 81 }
@@ -82,7 +84,8 @@ const queryCleanOrderList = () =&gt; { @@ -82,7 +84,8 @@ const queryCleanOrderList = () =&gt; {
82 uni.$u.route({ 84 uni.$u.route({
83 url: `pages/wode-info/wode-info-other-order/index`, 85 url: `pages/wode-info/wode-info-other-order/index`,
84 params: { 86 params: {
85 - type: 1 87 + type: 1,
  88 + title: "清运中"
86 } 89 }
87 }) 90 })
88 } 91 }
@@ -93,7 +96,8 @@ const queryEvaluateOrderList = () =&gt; { @@ -93,7 +96,8 @@ const queryEvaluateOrderList = () =&gt; {
93 url: `pages/wode-info/wode-info-other-order/index`, 96 url: `pages/wode-info/wode-info-other-order/index`,
94 params: { 97 params: {
95 type: 3, 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
  View file @2b437de
@@ -27,22 +27,22 @@ @@ -27,22 +27,22 @@
27 </view> 27 </view>
28 <!-- #ifdef APP-NVUE --> 28 <!-- #ifdef APP-NVUE -->
29 <view class="u-tabs__wrapper__nav__line" ref="u-tabs__wrapper__nav__line" :style="[{ 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 </view> 35 </view>
36 <!-- #endif --> 36 <!-- #endif -->
37 <!-- #ifndef APP-NVUE --> 37 <!-- #ifndef APP-NVUE -->
38 <view class="u-tabs__wrapper__nav__line" ref="u-tabs__wrapper__nav__line" :style="[{ 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 </view> 46 </view>
47 <!-- #endif --> 47 <!-- #endif -->
48 </view> 48 </view>
@@ -214,6 +214,7 @@ export default { @@ -214,6 +214,7 @@ export default {
214 if (this.list.length === 0) { 214 if (this.list.length === 0) {
215 return 215 return
216 } 216 }
  217 + console.log("resize");
217 Promise.all([this.getTabsRect(), this.getAllItemRect()]).then(([tabsRect, itemRect = []]) => { 218 Promise.all([this.getTabsRect(), this.getAllItemRect()]).then(([tabsRect, itemRect = []]) => {
218 this.tabsRect = tabsRect 219 this.tabsRect = tabsRect
219 this.scrollViewWidth = 0 220 this.scrollViewWidth = 0