feat: 角色信息提示

guzijian
1 parent fec135c8
Showing 7 changed files with 38 additions and 39 deletions
garbage-removal/src/pages/home/clean/company-detail/index.vue
garbage-removal/src/pages/home/clean/index.vue
garbage-removal/src/pages/home/index.vue
garbage-removal/src/pages/order/detail/index.vue
garbage-removal/src/pages/order/upload/index.vue
garbage-removal/src/pages/wode/choose/index.vue
garbage-removal/src/stores/main.js
@@ -36,10 +36,10 @@
       </view>
       <view class="company-content-car-info">
         <view class="company-content-car-info-title">核准车辆信息</view>
-        <view class="company-content-car-info-sub-title">车牌号（车型）</view>
+        <view class="company-content-car-info-sub-title">车牌号</view>
         <view class="company-content-car-info-car-list">
           <view v-for="(item, index) in  carList" :key="index" class="company-content-car-info-car-list-item">
-            {{ item.carCode }}<text class="car-type">({{ item.carType }})</text>
+            {{ item.carCode }}
           </view>
         </view>
         <view class="company-content-remark">
@@ -403,10 +403,11 @@ const handleOderSure = () =&gt; {
       if (userType.value === "运输驾驶员") {
         uni.$u.toast("派单成功，请切换成且角色查看订单详情")
         setTimeout(() => {
-          uni.navigateBack({
-            delta: 1,
+          uni.$u.route({
+            type: 'navigateBack',
+            url: `pages/home/index`,
           })
-        }, 50)
+        }, 300)
       } else {
         uni.$u.route({
           type: "redirect",
@@ -47,7 +47,7 @@
                         :src="item.carParkPanorama ? item.carParkPanorama : 'https://ijry.github.io/uview-plus/h5/assets/logo-8d54bbeb.png'" />
                     </view>
                     <view class="company-list-item-main-right"
-                      @click="handleDetailClick(item, item.service_phone, userAddress)">
+                      @click="handleDetailClick(item, item.servicePhone, userAddress)">
                       <view class="company-list-item-main-right-name">
                         {{ item.name }}
                       </view>
@@ -77,11 +77,11 @@
                   </view>
                   <view class="company-list-item-bottom">
                     <view class="company-list-item-bottom-contact-company">
-                      <u-button @click="handleContactClick(item.service_phone)" color="#a9e08f" size="normal"
+                      <u-button @click="handleContactClick(item.servicePhone)" color="#a9e08f" size="normal"
                         type="success" :hairline="true" shape="circle" text="联系公司"></u-button>
                     </view>
                     <view class="company-list-item-bottom-button-clean">
-                      <u-button @click="handleCleanGarbage(item, item.service_phone, userAddress)" type="success"
+                      <u-button @click="handleCleanGarbage(item, item.servicePhone, userAddress)" type="success"
                         :hairline="true" size="normal" shape="circle" text="垃圾清运"></u-button>
                     </view>
                   </view>
@@ -233,8 +233,9 @@ import uqrcode from &#39;@/components/Sansnn-uQRCode_4.0.6/components/uqrcode/uqrcod
 import clashDispatch from '@/components/clash-dispatch/index.vue';
 import zStatic from '@/components/z-paging/js/z-paging-static';
 import { useMainStore } from '@/stores/index.js';
-import { onLoad } from '@dcloudio/uni-app';
+import { onLoad, onShow } from '@dcloudio/uni-app';
 import { computed, ref } from 'vue';
+const isOnloadIn = ref(false)
 const clashDispatchRef = ref()
 const personnelList = ref([])
 const store = useMainStore();
@@ -532,20 +533,18 @@ onLoad((options) =&gt; {
   handleOrderDetail(orderId.value)
 })
  
-// onShow(() => {
-//   try {
-//     let pages = getCurrentPages();
-//     let currPage = pages[pages.length - 1];
-//     if (currPage.__data__.isRefresh) {
-//       // 重新获取数据
-//       this.getData(true)//获取列表数据
-//       // 每一次需要清除，否则会参数会缓存
-//       currPage.__data__.isRefresh = false
-//     }
-//   } catch (error) {
-//     console.log(error);
-//   }
-// })
+onShow(() => {
+
+  try {
+    if (isOnloadIn.value) {
+      handleOrderDetail(orderId.value)
+    } else {
+      isOnloadIn.value = true
+    }
+  } catch (error) {
+    console.log(error);
+  }
+})
 </script>
  
 <style lang="scss" scoped>
@@ -82,15 +82,12 @@ const handleSubmit = (id, type) =&gt; {
   uploadImageUrlByType(params).then(res => {
     if (res.data.success) {
       uni.$u.toast("图片上传完毕！");
-      let pages = getCurrentPages();
-      console.log(pages);
-      uni.navigateBack({
-        delta: 1,
-        success() {
-          //pages.length-1 即最后一个为当前页，所以取当前页面的上一级
-          pages[pages.length - 2].$vm.handleOrderDetail(id); // init 是上一个页面的方法名称
-        }
-      })
+      setTimeout(() => {
+        uni.$u.route({
+          type: 'navigateBack',
+          url: `pages/order/detail/index`,
+        })
+      }, 300)
     }
   })
 }
@@ -14,18 +14,18 @@
         </view>
       </view>
       <view class="manager-info" v-if="userType === '运输驾驶员'">
-        <view class="manager-info-parent-company-name">
-          长沙有限运输运输公司-运输驾驶员-李伟
+        <view v-if="tempUserType === '运输驾驶员'" class="manager-info-parent-company-name">
+          {{ unitInfo.transportCompanyName }}运输公司-运输驾驶员
         </view>
-        <view class="manager-info-parent-company-name">
+        <view v-else class="manager-info-parent-company-name">
           未匹配到该手机号绑定的运输公司！
         </view>
       </view>
       <view class="manager-info" v-if="userType === '企业负责人'">
-        <view class="manager-info-parent-company-name">
-          长沙有限运输运输公司公司服务账号！
+        <view v-if="tempUserType === '企业负责人'" class="manager-info-parent-company-name">
+          {{ unitInfo.transportCompanyName }}服务账号
         </view>
-        <view class="manager-info-parent-company-name">
+        <view v-else class="manager-info-parent-company-name">
           未匹配到该手机号绑定运输公司公司服务账号！
         </view>
       </view>
@@ -44,6 +44,7 @@ import { onLoad } from &quot;@dcloudio/uni-app&quot;;
 import { ref } from 'vue';
 const store = useMainStore();
 const userType = ref("居民用户")
+const tempUserType = ref()
 const typeList = ref([{ name: "居民用户" }, { name: "运输驾驶员" }, { name: "企业负责人" }])
 const unitInfo = ref({})
 const radioChange = (e) => {
@@ -71,6 +72,7 @@ const submit = (userType) =&gt; {
 onLoad((options) => {
   unitInfo.value = options
   userType.value = options.userType
+  tempUserType.value = options.userType
   // submit(options.userType)
 })
 </script>
@@ -30,7 +30,7 @@ export const useMainStore = defineStore(
 export const useMainStoreNoPersist = defineStore(
   "main",
   () => {
-    const info = ref("hhhh");
+    const handleOrderDetail = ref("hhhh");
     return { info };
   }
 );