确认

ghsApp/src/api/order/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const confirmReachFn = data => {
+	return https.get("/order/confirm-reach", data)
+}
+
 export const modifyRemarkFn = data => {
 	return https.post("/order/modify-remark", data);
 };

ghsApp/src/pagesOrder/detail.vue

@@ -4,16 +4,6 @@
 		<view v-if="!$util.isEmpty(detailInfo)" class="info-content_box">
 			<view class="flex-space title">
 				客户
-				<view class="flex" style="font-weight:normal;">
-					<block v-if="detailInfo.status == 2">
-						<button class="admin-button-com bule" @click.stop="directFh(detailInfo)">一键发货</button>
-						<button class="admin-button-com bule" style="margin-left:50upx;" @click.stop="fillNoFh(detailInfo)">填单发货</button>
-					</block>
-					<block v-else>
-						<button disabled="true" class="admin-button-com bule active" style="border:1rpx solid #ccc;">一键发货</button>
-						<button disabled="true" class="admin-button-com bule active" style="margin-left:50upx;border:1rpx solid #ccc;">填单发货</button>
-					</block>
-				</view>
 			</view>
 			<view class="address-des_bx content-box" @click="copyCustom(detailInfo)">
 				<view>
@@ -167,11 +157,21 @@
 			</view>
 			<view class="flex-space title">
 				商品信息
+				<view class="flex" style="font-weight:normal;">
+					<block v-if="detailInfo.status == 2">
+						<button class="admin-button-com bule" @click.stop="directFh(detailInfo)">一键发货</button>
+						<button class="admin-button-com bule" style="margin-left:50upx;" @click.stop="fillNoFh(detailInfo)">填单发货</button>
+					</block>
+					<block v-else>
+						<button disabled="true" class="admin-button-com bule active" style="border:1rpx solid #ccc;">一键发货</button>
+						<button disabled="true" class="admin-button-com bule active" style="margin-left:50upx;border:1rpx solid #ccc;">填单发货</button>
+					</block>
+				</view>
 				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="detailInfo.status == 4">
-					<view @click.stop="goRefund()" style="margin-left: 20upx;">发起售后</view>
+					<button class="admin-button-com bule" @click.stop="goRefund()">发起售后</button>
 				</view>
 				<view class="flex" style="color: #3385ff;font-weight: 400" v-if="detailInfo.status == 3 || detailInfo.status == 2">
-					<view @click.stop="confirmReach()" style="margin-left: 20upx;">确认送达</view>
+					<button class="admin-button-com bule" @click.stop="confirmReach(detailInfo)">确认送达</button>
 				</view>
 			</view>
 			<view class="module-com content-box">
@@ -386,7 +386,7 @@ import { getOrderProduct,giveItem } from "@/api/order-item";
 import productMins from "@/mixins/product";
 import { ORDER_STATUS } from "@/utils/declare";
 import BLE from "@/mixins/BLE";
-import { cloudPrintOrder, cancelOrder } from "@/api/order";
+import { cloudPrintOrder, cancelOrder,confirmReachFn } from "@/api/order";
 import { hasHitNavigate } from "@/api/map";
 import { getWeixinId } from "@/api/invite";
 import { IMGHOST } from '@/config'
@@ -645,10 +645,15 @@ export default {
 				}
 			})
 		},
-		confirmReach(){
+		confirmReach(info){
 			let that = this
-			that.$util.confirmModal({content:'确认已经送到？'},() => {
-
+			that.$util.confirmModal({content:'确认已经送达？'},() => {
+				confirmReachFn({id:info.id}).then(res=>{
+					if(res.code == 1){
+						that.init()
+						that.$msg('已确认')
+					}
+				})
             })
 		},
 		goRefund(){