Browse Source

feat:(渠道端):任务详情,首页任务,任务列表修改bug

Jake 2 months ago
parent
commit
e268b856a7

+ 2 - 2
packages/merchant/env/.env.development

@@ -6,5 +6,5 @@ VITE_DELETE_CONSOLE=false
 VITE_SHOW_SOURCEMAP=true
 
 #VITE_SERVER_BASEURL='https://www.zhuchaohui.com'
-# VITE_SERVER_BASEURL = 'http://39.106.91.179:48080'
- VITE_SERVER_BASEURL='http://192.168.2.58:48080'
+VITE_SERVER_BASEURL = 'http://39.106.91.179:48080'
+#VITE_SERVER_BASEURL='http://192.168.2.58:48080'

+ 4 - 0
packages/merchant/src/pages/agent/components/task-card.vue

@@ -40,6 +40,7 @@ const acceptingOrders = async (item: AgentTask) => {
           isOrders: true,
         })
         uni.hideLoading()
+        uni.showToast({ title: '接单成功', icon: 'none' })
         emits('change')
       } else if (res.cancel) {
       }
@@ -62,6 +63,9 @@ const acceptingNoOrders = async (item: AgentTask) => {
           isOrders: false,
         })
         uni.hideLoading()
+        if (res){
+          uni.showToast({ title: '已拒绝接单', icon: 'none' })
+        }
         emits('change')
       } else if (res.cancel) {
         /* empty */

+ 8 - 2
packages/merchant/src/pages/agent/tasks/detail/index.vue

@@ -89,6 +89,9 @@ const acceptingOrders = async () => {
           orders: true,
         })
         uni.hideLoading()
+        if (res) {
+          uni.showToast({ title: '接单成功', icon: 'none' })
+        }
         await initData()
       }
     },
@@ -110,6 +113,9 @@ const acceptingNoOrders = async () => {
           orders: false,
         })
         uni.hideLoading()
+        if (res) {
+          uni.showToast({ title: '已拒绝接单', icon: 'none' })
+        }
         await initData()
       }
     },
@@ -277,7 +283,7 @@ onLoad(async (query?: Record<string | 'taskId', string>) => {
     <Card>
       <div class="flex items-center">
         <div class="mr-2.5 w-1 h-4 rotate-180 bg-[#2357e9] rounded-[20px]"></div>
-        <SectionHeading title="数据明细" size="base"></SectionHeading>
+        <SectionHeading title="个人数据明细" size="base"></SectionHeading>
       </div>
       <!-- 到店打卡-->
       <div v-if="taskDetails?.finalType == '1'" class="flex flex-col gap-4 mt-5">
@@ -304,7 +310,7 @@ onLoad(async (query?: Record<string | 'taskId', string>) => {
       </div>
       <!-- 上报-->
       <div v-else>
-        <template v-for="(item, i) in taskDetails?.reportList" :key="i">
+        <template v-for="(item, i) in  finalType == 2 ? taskDetails?.reportList : taskDetails?.qrList" :key="i">
           <div class="bg-[#f7fbff] rounded-[10px] py-[22px] px-[16px] mt-[20px]">
             <div class="flex items-center justify-between">
               <div class="text-black/40 text-xs font-normal font-['PingFang_SC'] leading-normal">