feat: 新增取消订单，双向评价。

guzijian
1 parent 6ed7080a
Showing 7 changed files with 163 additions and 32 deletions
garbage-removal/src/pages/home/clean/company-detail/index.vue
garbage-removal/src/pages/home/clean/index.vue
garbage-removal/src/pages/order/detail/index.vue
garbage-removal/src/pages/order/evaluate/index.vue
garbage-removal/src/pages/order/swiper-list-item/index.vue
garbage-removal/src/pages/wode/choose/index.vue
garbage-removal/src/stores/main.js
@@ -46,7 +46,7 @@
           核准说明：以上为市容环境卫生主管部门核准信息
         </view>
       </view>
-      <view class="company-content-server">
+      <view class="company-content-server" v-if="false">
         <view class="company-content-server-title">企业服务承诺</view>
         <view class="company-content-server-detail">
           <view class="company-content-server-detail-info-item" v-for="(item, index) in  serverData" :key="index">
@@ -60,8 +60,8 @@
           <text style="color: red;">*</text>现场照片（最多上传10张）
         </view>
         <view class="company-clean-container-site-image-info-img">
-          <u-upload :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="3" multiple :maxCount="10"
-            :previewFullImage="true"></u-upload>
+          <u-upload width="200" height="150" :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="3"
+            multiple :maxCount="10" :previewFullImage="true"></u-upload>
         </view>
         <view class="company-clean-container-site-image-info-input-remark">
           填写备注
@@ -34,8 +34,8 @@
         <view class="order-detail-container-header-item">
           <text class="order-detail-container-header-title">现场图片：</text>
           <view class="order-detail-container-header-content">
-            <u-upload :fileList="currentImages" name="3" multiple :maxCount="10" :previewFullImage="true"
-              :isReadOnly="true"></u-upload>
+            <u-upload width="180" height="130" :fileList="currentImages" name="3" multiple :maxCount="10"
+              :previewFullImage="true" :isReadOnly="true"></u-upload>
           </view>
         </view>
         <view class="order-detail-container-header-item">
@@ -84,7 +84,8 @@
           <text class="order-detail-container-header-title">联系电话：</text>
           <view class="order-detail-container-header-content">
             {{ dataGram.garOrderContactTel }}
-            <u-icon name="phone" size="28" @click="handleContactClick(dataGram.garOrderContactTel)"></u-icon>
+            <u-icon v-if="dataGram.handleFlag" name="phone" size="28"
+              @click="handleContactClick(dataGram.garOrderContactTel)"></u-icon>
           </view>
         </view>
         <view class="order-detail-container-header-item">
@@ -121,15 +122,15 @@
           <view class="order-detail-container-header-item">
             <text class="order-detail-container-header-title">装车照片：</text>
             <view class="order-detail-container-header-content">
-              <u-upload :fileList="putOnImages" name="3" multiple :maxCount="20" :previewFullImage="true"
-                :isReadOnly="true"></u-upload>
+              <u-upload width="180" height="130" :fileList="putOnImages" name="3" multiple :maxCount="20"
+                :previewFullImage="true" :isReadOnly="true"></u-upload>
             </view>
           </view>
           <view class="order-detail-container-header-item">
             <text class="order-detail-container-header-title">卸车照片：</text>
             <view class="order-detail-container-header-content">
-              <u-upload :fileList="putDownImages" name="3" multiple :maxCount="20" :previewFullImage="true"
-                :isReadOnly="true"></u-upload>
+              <u-upload width="180" height="130" :fileList="putDownImages" name="3" multiple :maxCount="20"
+                :previewFullImage="true" :isReadOnly="true"></u-upload>
             </view>
           </view>
         </view>
@@ -144,35 +145,46 @@
     <!-- 占位符 -->
     <view class="order-detail-bottom">
       <view class="order-detail-bottom-box">
-        <view class="order-detail-bottom-left">
-          <!-- <u-button @click="handleOderCancelClick(orderId)" shape="circle" color="#a9e08f" text="取消订单"></u-button> -->
+        <view class=" order-detail-bottom-left">
+          <u-button v-if="dataGram.garOrderHandlerStatus === 0 && userType == '管理负责人'" @click="handleOderCancelClick()"
+            shape="circle" color="#a9e08f" text="取消订单"></u-button>
         </view>
         <view class="order-detail-bottom-right">
+          <u-button v-if="dataGram.garOrderHandlerStatus === 0 && userType == '居民用户'" @click="handleOderCancelClick()"
+            shape="circle" color="#a9e08f" text="取消订单"></u-button>
           <u-button @click="handleOrder(orderId)"
-            v-if="dataGram.garOrderHandlerStatus == 0 && dataGram.handleFlag && dataGram.garCancelFlag" shape="circle"
-            color="#a9e08f" text="处理派单"></u-button>
+            v-if="dataGram.garOrderHandlerStatus === 0 && dataGram.handleFlag && dataGram.garCancelFlag === 0"
+            shape="circle" color="#a9e08f" text="处理派单"></u-button>
           <u-button @click="handleUploadImage(orderId, 'putOnImages')"
-            v-if="dataGram.garOrderHandlerStatus === 1 && dataGram.putOnImages.length === 0 && dataGram.handleFlag && dataGram.garCancelFlag"
+            v-if="dataGram.garOrderHandlerStatus === 1 && dataGram.putOnImages.length === 0 && dataGram.handleFlag && dataGram.garCancelFlag === 0"
             shape="circle" color="#a9e08f" text="装车照片"></u-button>
           <u-button @click="handleUploadImage(orderId, 'putDownImages')"
-            v-else-if="dataGram.garOrderHandlerStatus === 1 && dataGram.putDownImages.length === 0 && dataGram.handleFlag && dataGram.garCancelFlag"
+            v-else-if="dataGram.garOrderHandlerStatus === 1 && dataGram.putDownImages.length === 0 && dataGram.handleFlag && dataGram.garCancelFlag === 0"
             shape="circle" color="#a9e08f" text="卸车照片"></u-button>
-          <u-button @click="handleEvaluate(orderId)" v-if="dataGram.garEvaluateFlag == 0" shape="circle" color="#a9e08f"
-            text="去评价"></u-button>
+          <u-button @click="handleEvaluate(orderId, userType)" v-if="dataGram.garEvaluateFlag === 0" shape="circle"
+            color="#a9e08f" text="去评价"></u-button>
+          <u-button @click="handleEvaluate(orderId, userType)" v-if="dataGram.garHandlerEvaluateFlag === 0" shape="circle"
+            color="#a9e08f" text="去评价"></u-button>
           <u-button
-            v-if="dataGram.garOrderHandlerStatus == 1 && dataGram.putOnImages.length != 0 && dataGram.putDownImages.length != 0 && dataGram.garCancelFlag"
+            v-if="dataGram.garOrderHandlerStatus === 1 && dataGram.putOnImages.length != 0 && dataGram.putDownImages.length != 0 && dataGram.garCancelFlag === 0"
             @click="handleSubmitSuccess(orderId)" shape="circle" color="#a9e08f" text="完成派单"></u-button>
         </view>
       </view>
     </view>
+    <u-action-sheet :closeOnClickOverlay="true" :closeOnClickAction="false" @actionSheetClose="handleClose"
+      @submitFunction="submitFunction" @select="selectClick" :actions="list" round="15" title="取消派单" :show="cancelShow">
+    </u-action-sheet>
   </view>
 </template>
 <script setup>
 import { queryOrderDetail, updateOrder } from "@/apis/order.js";
 import zStatic from '@/components/z-paging/js/z-paging-static';
+import { useMainStore } from '@/stores/index.js';
 import { onLoad, onShow } from '@dcloudio/uni-app';
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
+const store = useMainStore();
+const userType = computed(() => store.userType)
 const dataGram = ref();
 const orderId = ref(null)
 const currentImages = ref([])
@@ -180,12 +192,40 @@ const putOnImages = ref([])
 const putDownImages = ref([])
 const emptyBase64Image = ref(zStatic.base64Empty)
 const spaceStr = ref("")
+const cancelShow = ref(false)
+const currentCancelName = ref("")
+const list = ref([
+  {
+    name: '长时间无人接单',
+  },
+  {
+    name: '订单信息填写有误',
+  },
+  {
+    name: '线下协商有问题',
+  },
+  {
+    name: '不需要清运了',
+  },
+  {
+    name: '其他',
+  },
+  {
+    name: '提交',
+  }
+])
 /**
  * 初始化信息
  */
 onLoad((options) => {
   orderId.value = options.orderId
 })
+const handleClose = (e) => {
+  cancelShow.value = false
+}
+const selectClick = (index) => {
+  currentCancelName.value = index.name;
+}
 const handleOrderDetail = (orderId) => {
   queryOrderDetail(orderId).then(res => {
     dataGram.value = res.data.data;
@@ -207,8 +247,50 @@ const handleContactClick = (val) =&gt; {
   uni.makePhoneCall({ phoneNumber: val }).then(res => {
   }).catch(err => { });
 }
-const handleOderCancelClick = (orderId) => {
+/**
+ * 取消派单
+ * @param {*} orderId
+ */
+const handleOderCancelClick = () => {
+  cancelShow.value = true;
+}
+
+/**
+ * 提交取消订单
+ */
+const submitFunction = (otherReason) => {
+  let reason = otherReason
+  if (currentCancelName.value != "其他") {
+    reason = currentCancelName.value
+  }
+  if (!reason) {
+    uni.$u.toast("请提供取消派单的原因")
+    return
+  }
+  let params = {
+    garOrderId: orderId.value,
+    garCancelFlag: 1,
+    garReason: reason
+  }
+  updateOrder(params).then(res => {
+    if (res.data.success) {
+      cancelShow.value = false
+      uni.$u.toast(res.data.data)
+      uni.$u.route({
+        type: "reLaunch",
+        url: `pages/order/index`,
+      })
+    }
+  })
+}
+const handleClick = (orderId) => {
+  uni.$u.route({
+    url: `pages/order/detail/index`,
+    params: {
+      orderId: orderId
+    }
+  })
 }
 // 提交完成
 const handleSubmitSuccess = (orderId) => {
@@ -228,17 +310,27 @@ const handleSubmitSuccess = (orderId) =&gt; {
     }
   });
 }
-const handleEvaluate = (orderId) => [
-  uni.$u.route(`pages/order/evaluate/index?orderId=${orderId}`)
+const handleEvaluate = (orderId, userType) => [
+  uni.$u.route(`pages/order/evaluate/index?orderId=${orderId}&userType=${userType}`)
 ]
 // 接收订单
 const handleOrder = (orderId) => {
   updateOrder({ garOrderId: orderId, handleType: 0 }).then(res => {
     if (res.data.success) {
-      uni.$u.toast(res.data.data)
-      handleOrderDetail(orderId)
+      if (res.data.data === "订单已经被别人接受啦") {
+        uni.$u.toast(res.data.data)
+        uni.$u.route({
+          type: "reLaunch",
+          url: `pages/order/index`,
+        })
+      } else {
+        uni.$u.toast(res.data.data)
+        handleOrderDetail(orderId)
+      }
     }
+
+
   })
 }
@@ -9,7 +9,7 @@
     </view>
     <textarea v-if="textareaShow" @blur="blur" :value="textareaValue" :placeholder="textareaPlaceholder" />
     <view class="issue-btn-box">
-      <button class="submit-btn" type="primary" @click="doSubmit(orderId, score, content)">提交评价</button>
+      <button class="submit-btn" type="primary" @click="doSubmit(orderId, score, content, evaluateType)">提交评价</button>
     </view>
   </view>
 </template>
@@ -21,12 +21,13 @@ import { ref } from &#39;vue&#39;;
 let maxScore = ref(5);
 const orderId = ref()
 const maxStar = ref([])
+const evaluateType = ref()
 const score = ref(5)
 const textareaShow = ref(true)
 const textareaPlaceholder = ref("请输入对此次服务得评价")
 const content = ref("")
-const doSubmit = (orderId, score, content) => {
-  uploadEvaluate({ orderId, score, content }).then(res => {
+const doSubmit = (orderId, score, content, evaluateType) => {
+  uploadEvaluate({ orderId, score, content, evaluateType }).then(res => {
     if (res.data.success) {
       uni.$u.toast("评价成功")
       setTimeout(() => {
@@ -46,6 +47,7 @@ const blur = (e) =&gt; {
 }
 onLoad((options) => {
   orderId.value = options.orderId
+  evaluateType.value = options.userType === "居民用户" ? 0 : 1
   // 积分初始化
   for (let index = 0; index < maxScore.value; index++) {
     maxStar.value.push(index);
@@ -13,8 +13,14 @@
             <view v-if="item.garOrderHandlerStatus === 0 && item.garCancelFlag === 0" class="right">待清运 </view>
             <view v-if="item.garCancelFlag === 1" class="right">已取消 </view>
             <view v-if="item.garOrderHandlerStatus === 1 && item.garCancelFlag === 0" class="right">清运中 </view>
-            <view v-if="item.garEvaluateFlag === 0 && item.garCancelFlag === 0" class="right">待评价 </view>
-            <view v-if="item.garEvaluateFlag === 1 && item.garCancelFlag === 0" class="right">已评价 </view>
+            <view v-if="item.garEvaluateFlag === 0 && userType === '居民用户'" class="right">待评价
+            </view>
+            <view v-if="item.garHandlerEvaluateFlag === 0 && userType === '管理负责人'" class="right">待评价
+            </view>
+            <view v-if="item.garEvaluateFlag === 1 && userType === '居民用户'" class="right">已评价
+            </view>
+            <view v-if="item.garHandlerEvaluateFlag === 1 && userType === '管理负责人'" class="right">已评价
+            </view>
           </view>
           <view class="item" @click="handleClick(item.garOrderId)">
             <view class="left">
@@ -32,6 +38,24 @@
             </view>
             <view hover-class="btn-hover" class="logistics btn" @click="handleCancelOrder(item.garOrderId)">取消派单</view>
           </view>
+          <!-- 用户对公司评价 -->
+          <view class="bottom"
+            v-if="item.garEvaluateFlag === 0 && item.garOrderHandlerStatus === 3 && userType === '居民用户'">
+            <view class="more">
+              <!-- <u-icon name="more-dot-fill" color="rgb(203,203,203)"></u-icon> -->
+            </view>
+            <view hover-class="btn-hover" class="logistics btn" @click="handleUserEvaluate(item.garOrderId, userType)">去评价
+            </view>
+          </view>
+          <!-- 公司对用户评价 -->
+          <view class="bottom"
+            v-if="item.garHandlerEvaluateFlag === 0 && item.garOrderHandlerStatus === 3 && userType === '管理负责人'">
+            <view class="more">
+              <!-- <u-icon name="more-dot-fill" color="rgb(203,203,203)"></u-icon> -->
+            </view>
+            <view hover-class="btn-hover" class="logistics btn" @click="handleUserEvaluate(item.garOrderId, userType)">去评价
+            </view>
+          </view>
         </view>
       </view>
     </z-paging>
@@ -43,7 +67,8 @@
 <script setup>
 import { queryOrderList, updateOrder } from "@/apis/order.js";
-import { ref, watch } from 'vue';
+import { useMainStore } from '@/stores/index.js';
+import { computed, ref, watch } from 'vue';
 const props = defineProps({
   tabIndex: {
     type: Number
@@ -53,6 +78,8 @@ const props = defineProps({
   }
 })
+const store = useMainStore();
+const userType = computed(() => store.userType)
 const currentCancelOrderId = ref("");
 const currentCancelName = ref("");
 const cancelShow = ref(false)
@@ -127,6 +154,14 @@ const handleClick = (orderId) =&gt; {
     }
   })
 }
+
+/**
+ * 订单评价
+ * @param {*} orderId
+ */
+const handleUserEvaluate = (orderId, userType) => {
+  uni.$u.route(`pages/order/evaluate/index?orderId=${orderId}&userType=${userType}`)
+}
 // list集合
 const queryList = (pageNo, pageSize) => {
   //这里的pageNo和pageSize会自动计算好，直接传给服务器即可
@@ -31,6 +31,7 @@ const submit = (userType) =&gt; {
     store.token = store.tempToken
     store.tempToken = "";
     if (res.data.success) {
+      store.userType = userType;
       uni.$u.route({
         type: "switchTab",
         url: `pages/home/index`,
@@ -5,8 +5,9 @@ export const useMainStore = defineStore(
   () => {
     const token = ref(null);
     const tempToken = ref(null);
+    const userType = ref("")
-    return { token,tempToken };
+    return { token,tempToken,userType };
   },
   {
     persist: {