feat: 新增确认送达弹框组件、添加安卓打包测试证书、骑手配送流程接口对接

sheep/api/member/delivery.js

@@ -1,6 +1,15 @@
 import request from '@/sheep/request';
 
 const DeliveryApi = {
+	// 注册骑手
+	registerRider: (data) => {
+	  return request({
+	    url: '/member/user/register/rider',
+	    method: 'POST',
+			data
+	  });
+	},
+	
   // 骑手上线
   postOnline: () => {
     return request({

sheep/api/member/deliveryOrder.js

@@ -10,6 +10,14 @@ const DeliveryOrderApi = {
     });
   },
 	
+	// 获取配送单详情信息
+	getDetail: (id) => {
+	  return request({
+	    url: `/deliveryOrder/getDetail/${id}`,
+	    method: 'POST',
+	  });
+	},
+	
 	// 当前配送员确认到店
 	riderConfirmArrival: (id) => {
 	  return request({
@@ -35,11 +43,10 @@ const DeliveryOrderApi = {
 	},
 	
 	// 批量送达交接点
-	riderDeliveryHandoverBatch: (data) => {
+	riderDeliveryHandoverBatch: (ids) => {
 	  return request({
-	    url: `/deliveryOrder/riderDeliveryHandoverBatch`,
+	    url: `/deliveryOrder/riderDeliveryHandoverBatch?ids=${ids}`,
 	    method: 'POST',
-			params: data
 	  });
 	},
 	
@@ -53,13 +60,23 @@ const DeliveryOrderApi = {
 	},
 
 	// 当前配送员确认送达顾客
-	riderConfirmDelivery: (id) => {
+	riderConfirmDelivery: (data) => {
 	  return request({
-	    url: `/deliveryOrder/riderConfirmDelivery/${id}`,
+	    url: `/deliveryOrder/riderConfirmDelivery/${data.deliveryOrderId}`,
+	    method: 'POST',
+			data
+	  });
+	},
+	
+	// 获取配送单交接记录
+	getHandoverRecord: (id) => {
+	  return request({
+	    url: `/deliveryOrder/getHandoverRecord/${id}`,
 	    method: 'POST',
 	  });
 	},
-
+	
+	
 };
 
 export default DeliveryOrderApi;

sheep/api/member/user.js

@@ -56,8 +56,8 @@ const UserApi = {
   // 修改密码
   updateUserPassword: (data) => {
     return request({
-      url: '/member/user/update-password',
-      method: 'PUT',
+      url: '/member/auth/update-password',
+      method: 'POST',
       data,
       custom: {
         loadingMsg: '验证中',
@@ -69,8 +69,8 @@ const UserApi = {
 	// 修改密码
 	updateUserPasswordReset: (data) => {
 	  return request({
-	    url: '/member/user/update-password-by-reset',
-	    method: 'PUT',
+	    url: '/member/auth/update-password-by-reset',
+	    method: 'POST',
 	    data,
 	    custom: {
 	      loadingMsg: '验证中',
@@ -82,8 +82,8 @@ const UserApi = {
   // 重置密码
   resetUserPassword: (data) => {
     return request({
-      url: '/member/user/reset-password',
-      method: 'PUT',
+      url: '/member/auth/reset-password',
+      method: 'POST',
       data,
       custom: {
         loadingMsg: '验证中',

sheep/api/system/area.js

@@ -4,7 +4,7 @@ const AreaApi = {
   // 获得地区树
   getAreaTree: () => {
     return request({
-      url: '/system/area/tree',
+      url: '/app/area/tree',
       method: 'GET'
     });
   },

sheep/components/s-auth-modal/components/account-login.vue

@@ -45,9 +45,9 @@
 			<text class="head-title-active head-title-line" @tap="showAuthModal('smsLogin')">
 			  验证码登录
 			</text>
-			<text class="head-title-active head-title-line" style="margin-left:25rpx;" @click="toRegister">
+			<!-- <text class="head-title-active head-title-line" style="margin-left:25rpx;" @click="toRegister">
 			  骑手注册
-			</text>
+			</text> -->
 		</view>
   </view>
 </template>

sheep/hooks/useModal.js

@@ -62,12 +62,16 @@ export function closeMenuTools() {
 export function getSmsCode(event, mobile) {
   const modalStore = $store('modal');
   const lastSendTimer = modalStore.lastTimer[event];
+  // 如果场景未初始化，先初始化为0（表示可以发送）
   if (typeof lastSendTimer === 'undefined') {
-    $helper.toast('短信发送事件错误');
-    return;
+    modalStore.$patch((state) => {
+      if (typeof state.lastTimer[event] === 'undefined') {
+        state.lastTimer[event] = 0;
+      }
+    });
   }
 
-  const duration = dayjs().unix() - lastSendTimer;
+  const duration = dayjs().unix() - (modalStore.lastTimer[event] || 0);
   const canSend = duration >= 60;
   if (!canSend) {
     $helper.toast('请稍后再试');
@@ -82,6 +86,9 @@ export function getSmsCode(event, mobile) {
   // 发送验证码 + 更新上次发送验证码时间
   let scene = -1;
   switch (event) {
+		case 'registerDelivery':
+		  scene = 5;
+		  break;
     case 'resetPassword':
       scene = 4;
       break;
@@ -109,9 +116,9 @@ export function getSmsTimer(event, mobile = '') {
   const modalStore = $store('modal');
   const lastSendTimer = modalStore.lastTimer[event];
 
+  // 如果场景未初始化，返回"获取验证码"
   if (typeof lastSendTimer === 'undefined') {
-    $helper.toast('短信发送事件错误');
-    return;
+    return '获取验证码';
   }
 
   const duration = ref(dayjs().unix() - lastSendTimer - 60);

sheep/store/user.js

@@ -60,6 +60,18 @@ const user = defineStore({
 				}, 700)
 			}
       this.userInfo = data;
+			if (!data.auditStatus) {
+				uni.reLaunch({
+					url: '/pages/registered/registerRiders'
+				})
+				return
+			}
+			if (data.auditStatus == 1 || data.auditStatus == 3) {
+				uni.reLaunch({
+					url: '/pages/registered/audit'
+				})
+				return
+			}
       return Promise.resolve(data);
     },