Accept Merge Request #158: (develop -> master)

Merge Request: Accept Merge Request #157: (feature/dgg -> develop)

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/wanyu_frontend/git/merge/158?initial=true

pages/index/index.vue

@@ -79,7 +79,7 @@ const acceptOrder = (index, id) => {
 
 const rejectOrder = (index, id) => {
   uni.showModal({
-    title: '拒接提示',
+    title: '请您确认是否拒单？多次拒单平台会减少对您的派单量！',
     confirmText: '确认',
     editable: true,
     placeholderText: '请输入拒接原因',

pages/order/order-info.vue

@@ -331,7 +331,7 @@ const acceptOrder = () => {
 
 const rejectOrder = () => {
   uni.showModal({
-    title: '拒接提示',
+    title: '请您确认是否拒单？多次拒单平台会减少对您的派单量！',
     confirmText: '确认',
     editable: true,
     placeholderText: '请输入拒接原因',

pages/order/update-progress.vue

@@ -91,7 +91,7 @@ const submit = throttle(() => {
 
 const init = () => {
   api.orderInfo({order_dispatch_id: id.value}).then(res => {
-    submitData.is_finish_today = res.is_finish_today
+    submitData.is_finish_today = res.is_finish_today === null ? 1 : res.is_finish_today
     submitData.estimated_finish_time = res.estimated_finish_time
     submitData.work_progress = res.work_progress