microservice / sl-express · Commits

Commit 0e9dc5431300740bee1ef0861266e6ae6c7ba14d

Authored by tianwu
1 parent 98321197
build: skipped

左侧返回按钮和注释掉去付款

Inline Side-by-side
Showing 10 changed files with 31 additions and 21 deletions
project-wl-kuaidiyuan-uniapp-vue3/src/components/uni-nav/index.vue
  View file @0e9dc54
1 <template> 1 <template>
2 <uni-nav-bar :title="title" statusBar="true" fixed="true" v-if="isLeftText"></uni-nav-bar> 2 <uni-nav-bar :title="title" statusBar="true" fixed="true" v-if="isLeftText"></uni-nav-bar>
3 - <uni-nav-bar v-else @clickLeft="goBack" left-icon="back" leftIcon="arrowleft" :title="title" statusBar="true" fixed="true" :right-text="rithtText" @clickRight="handleAll"></uni-nav-bar> 3 + <uni-nav-bar v-else @clickLeft="goBack" :title="title" statusBar="true" fixed="true" :right-text="rithtText" @clickRight="handleAll">
  4 + <template #left>
  5 + <image src="/static/back-filled.png" class="left-image"></image>
  6 + </template>
  7 + </uni-nav-bar>
4 </template> 8 </template>
5 9
6 <script setup> 10 <script setup>
@@ -32,3 +36,9 @@ const handleAll = ()=&gt;{ @@ -32,3 +36,9 @@ const handleAll = ()=&gt;{
32 emit('handleAll') 36 emit('handleAll')
33 } 37 }
34 </script> 38 </script>
  39 +<style lang="scss" scoped>
  40 +.left-image {
  41 + height: 64rpx;
  42 + width: 32rpx;
  43 +}
  44 +</style>
35 \ No newline at end of file 45 \ No newline at end of file
project-wl-kuaidiyuan-uniapp-vue3/src/pages/history/commponents/delivery.vue
  View file @0e9dc54
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 v-if="item.status === 1" 38 v-if="item.status === 1"
39 ><button class="uni-btn btn-default">去派件</button></text 39 ><button class="uni-btn btn-default">去派件</button></text
40 > 40 >
41 - <text 41 + <!-- <text
42 @click.stop="handleDetails($event, item)" 42 @click.stop="handleDetails($event, item)"
43 class="delete" 43 class="delete"
44 v-else-if=" 44 v-else-if="
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 item.signStatus !== 2 48 item.signStatus !== 2
49 " 49 "
50 ><button class="uni-btn btn-default">去收款</button></text 50 ><button class="uni-btn btn-default">去收款</button></text
51 - > 51 + > -->
52 <text @click.stop="handleOpen($event, item.id)" class="delete" v-else 52 <text @click.stop="handleOpen($event, item.id)" class="delete" v-else
53 ><button class="uni-btn concelBtn">删除</button></text 53 ><button class="uni-btn concelBtn">删除</button></text
54 > 54 >
project-wl-kuaidiyuan-uniapp-vue3/src/pages/history/commponents/pickup.vue
  View file @0e9dc54
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 v-if="item.status === 1" 37 v-if="item.status === 1"
38 ><button class="uni-btn btn-default">去取件</button></text 38 ><button class="uni-btn btn-default">去取件</button></text
39 > 39 >
40 - <text 40 + <!-- <text
41 @click.stop="handleDetails($event, item)" 41 @click.stop="handleDetails($event, item)"
42 class="delete" 42 class="delete"
43 v-else-if=" 43 v-else-if="
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 item.paymentMethod === 1 46 item.paymentMethod === 1
47 " 47 "
48 ><button class="uni-btn btn-default">去收款</button></text 48 ><button class="uni-btn btn-default">去收款</button></text
49 - > 49 + > -->
50 <text @click.stop="handleOpen($event, item.id)" class="delete" v-else 50 <text @click.stop="handleOpen($event, item.id)" class="delete" v-else
51 ><button class="uni-btn concelBtn">删除</button></text 51 ><button class="uni-btn concelBtn">删除</button></text
52 > 52 >
project-wl-kuaidiyuan-uniapp-vue3/src/pages/pay/index.vue
  View file @0e9dc54
@@ -10,22 +10,22 @@ @@ -10,22 +10,22 @@
10 <icon></icon> 10 <icon></icon>
11 <view>{{ users.isDelivery ? "签收成功" : "取件成功" }}</view> 11 <view>{{ users.isDelivery ? "签收成功" : "取件成功" }}</view>
12 <view class="btnBox" v-if="users.isDelivery"> 12 <view class="btnBox" v-if="users.isDelivery">
13 - <navigator 13 + <!-- <navigator
14 url="/pages/pay/scanPay?pay=true" 14 url="/pages/pay/scanPay?pay=true"
15 open-type="redirect" 15 open-type="redirect"
16 v-if="type === '2'" 16 v-if="type === '2'"
17 >去收款</navigator 17 >去收款</navigator
18 - >  
19 - <view class="navigator-wrap" v-else @click="handleBack">返回主页</view> 18 + > -->
  19 + <view class="navigator-wrap" @click="handleBack">返回主页</view>
20 </view> 20 </view>
21 <view class="btnBox" v-else> 21 <view class="btnBox" v-else>
22 - <navigator 22 + <!-- <navigator
23 url="/pages/pay/scanPay?pay=true" 23 url="/pages/pay/scanPay?pay=true"
24 open-type="redirect" 24 open-type="redirect"
25 v-if="type === '1'" 25 v-if="type === '1'"
26 >去收款</navigator 26 >去收款</navigator
27 - >  
28 - <view class="navigator-wrap" v-else @click="handleBack">返回主页</view> 27 + > -->
  28 + <view class="navigator-wrap" @click="handleBack">返回主页</view>
29 </view> 29 </view>
30 </view> 30 </view>
31 </template> 31 </template>
project-wl-kuaidiyuan-uniapp-vue3/src/pages/pickup/components/components/alreadyParcel.vue
  View file @0e9dc54
@@ -18,9 +18,9 @@ @@ -18,9 +18,9 @@
18 <view class="address">取件地址：{{ item.address }}</view> 18 <view class="address">取件地址：{{ item.address }}</view>
19 <view class="time">取件时间：{{ item.taskTime }}</view> 19 <view class="time">取件时间：{{ item.taskTime }}</view>
20 <view class="time" v-if="item.amount > 0 && item.status === 2 && item.paymentMethod === 1">运费：{{ item.amount }}元</view> 20 <view class="time" v-if="item.amount > 0 && item.status === 2 && item.paymentMethod === 1">运费：{{ item.amount }}元</view>
21 - <text @click.stop="handleDetails($event, item)" class="delete" v-if="item.status === 2 && item.paymentStatus === 1 && item.paymentMethod === 1"> 21 + <!-- <text @click.stop="handleDetails($event, item)" class="delete" v-if="item.status === 2 && item.paymentStatus === 1 && item.paymentMethod === 1">
22 <button class="uni-btn btn-default">去收款</button> 22 <button class="uni-btn btn-default">去收款</button>
23 - </text> 23 + </text> -->
24 </view> 24 </view>
25 </view> 25 </view>
26 </view> 26 </view>
project-wl-kuaidiyuan-uniapp-vue3/src/pages/search/components/Accomplish.vue
  View file @0e9dc54
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <view class="time" v-if="item.amount > 0 && item.status === 2" 8 <view class="time" v-if="item.amount > 0 && item.status === 2"
9 >运费：{{ item.amount }}元</view 9 >运费：{{ item.amount }}元</view
10 > 10 >
11 - <text 11 + <!-- <text
12 @click.stop="handleDetails($event, item)" 12 @click.stop="handleDetails($event, item)"
13 class="delete" 13 class="delete"
14 v-if=" 14 v-if="
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 " 18 "
19 > 19 >
20 <button class="uni-btn btn-default">去收款</button> 20 <button class="uni-btn btn-default">去收款</button>
21 - </text> 21 + </text> -->
22 </view> 22 </view>
23 </template> 23 </template>
24 <script setup> 24 <script setup>
project-wl-kuaidiyuan-uniapp-vue3/src/pages/search/components/AlreadyPicUp.vue
  View file @0e9dc54
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 v-if="item.amount > 0 && item.status === 2 && item.paymentMethod === 1" 10 v-if="item.amount > 0 && item.status === 2 && item.paymentMethod === 1"
11 >运费：{{ item.amount }}元</view 11 >运费：{{ item.amount }}元</view
12 > 12 >
13 - <text 13 + <!-- <text
14 @click.stop="handleDetails($event, item)" 14 @click.stop="handleDetails($event, item)"
15 class="delete" 15 class="delete"
16 v-if=" 16 v-if="
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 " 20 "
21 > 21 >
22 <button class="uni-btn btn-default">去收款</button> 22 <button class="uni-btn btn-default">去收款</button>
23 - </text> 23 + </text> -->
24 </view> 24 </view>
25 </template> 25 </template>
26 <script setup> 26 <script setup>
project-wl-kuaidiyuan-uniapp-vue3/src/pages/search/components/SignFor.vue
  View file @0e9dc54
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <view class="time" v-if="item.amount > 0 && item.status === 2" 8 <view class="time" v-if="item.amount > 0 && item.status === 2"
9 >运费：{{ item.amount }}元</view 9 >运费：{{ item.amount }}元</view
10 > 10 >
11 - <text 11 + <!-- <text
12 @click.stop="handleDetails($event, item)" 12 @click.stop="handleDetails($event, item)"
13 class="delete" 13 class="delete"
14 v-if=" 14 v-if="
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 " 18 "
19 > 19 >
20 <button class="uni-btn btn-default">去收款</button> 20 <button class="uni-btn btn-default">去收款</button>
21 - </text> 21 + </text> -->
22 </view> 22 </view>
23 </template> 23 </template>
24 <script setup> 24 <script setup>
project-wl-kuaidiyuan-uniapp-vue3/src/pages/search/components/StayPicUp.vue
  View file @0e9dc54
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 {{ overTimeFormat(item.estimatedEndTime) }}</view 15 {{ overTimeFormat(item.estimatedEndTime) }}</view
16 > 16 >
17 <view class="time" v-else>运单号：{{ item.transportOrderId }}</view> 17 <view class="time" v-else>运单号：{{ item.transportOrderId }}</view>
18 - <text 18 + <!-- <text
19 @click.stop="handleDetails($event, item)" 19 @click.stop="handleDetails($event, item)"
20 class="delete" 20 class="delete"
21 v-if=" 21 v-if="
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 " 26 "
27 > 27 >
28 <button class="uni-btn btn-default">去收款</button> 28 <button class="uni-btn btn-default">去收款</button>
29 - </text> 29 + </text> -->
30 </view> 30 </view>
31 </template> 31 </template>
32 <script setup> 32 <script setup>
project-wl-kuaidiyuan-uniapp-vue3/src/static/back-filled.png 0 → 100644
View file @0e9dc54

210 Bytes