添加结束订单

composables/order/useOrderListItem.ts

@@ -110,26 +110,7 @@ export default function useOrderListItem(props) {
 			res = await request(orderList, options);
 			const data = stringToJson(res.bizContent);
 			console.log("ordersList.value", ordersList.value)
-			// 订单发货后未激活  30天 以后 结束订单功能  insertTime   >30  算出来距离今天是负数
-			for (var k = 0; k < ordersList.value.length; k++) {
-				console.log("ordersList.value1111", ordersList.value[k]['insertTime'].replace("T", " "))
-				console.log("ordersList.value1111", timesDiff(ordersList.value[k]['insertTime'].replace("T", " ")))
-				if (ordersList.value[k]['insertTime']) {
-					if (timesDiff(ordersList.value[k]['insertTime'].replace("T", " ")).days > 30) {
-						ordersList.value[k]['finishOrder'] = true  //可以结束
-					} else {
-						ordersList.value[k]['finishOrder'] = false  //不可以结束
-					}
-				}
-				if (ordersList.value[k]['updateTime']) {
-					if (timesDiff(ordersList.value[k]['updateTime'].replace("T", " ")).days <= 30) {
-						ordersList.value[k]['isUseAgain'] = true  //可以再次使用
-					} else {
-						ordersList.value[k]['isUseAgain'] = false  //不可以再次使用
-					}
-				}
 
-			}
 			params.total = data.totalCount;
 
 			if (params.pageNum === 1) {
@@ -149,6 +130,26 @@ export default function useOrderListItem(props) {
 			if (params.pageNum === 1) {
 				uni.stopPullDownRefresh();
 			}
+			// 订单发货后未激活  30天 以后 结束订单功能  insertTime   >30  算出来距离今天是负数  updateTime<30(结束订单)
+			for (var k = 0; k < ordersList.value.length; k++) {
+				console.log("ordersList.value1111", ordersList.value[k]['insertTime'].replace("T", " "))
+				console.log("ordersList.value1111", timesDiff(ordersList.value[k]['insertTime'].replace("T", " ")))
+				if (ordersList.value[k]['insertTime']) {
+					if (timesDiff(ordersList.value[k]['insertTime'].replace("T", " ")).days > 30) {
+						ordersList.value[k]['finishOrder'] = true  //可以结束
+					} else {
+						ordersList.value[k]['finishOrder'] = false  //不可以结束
+					}
+				}
+				if (ordersList.value[k]['updateTime']) {
+					if (timesDiff(ordersList.value[k]['updateTime'].replace("T", " ")).days <= 30) {
+						ordersList.value[k]['isUseAgain'] = true  //可以再次使用
+					} else {
+						ordersList.value[k]['isUseAgain'] = false  //不可以再次使用
+					}
+				}
+
+			}
 			uni.$emit('refreshFinish');
 		} catch (e) {
 			console.log('输出内容', e)

composables/order/useOrderSkip.ts

@@ -6,6 +6,20 @@ import { getItem, setItem } from "@/utils/storage";
 import { request } from "@/utils/network/request.js";
 import { gotoAgainUseOrderApi, finishUseOrderApi } from "@/utils/network/api.js";
 import { stringToJson } from "@/utils/network/encryption.js";
+// import useOrderListItem from "@/composables/order/useOrderListItem";
+// const props = defineProps({
+// 	index: {
+// 		type: Number,
+// 		default() {
+// 			return 0
+// 		}
+// 	},
+// 	refresh: { //是否刷新列表
+// 		type: Boolean,
+// 		default: true
+// 	}
+// })
+// const { doSearch } = useOrderListItem();
 export default function useOrderSkip() {
 	const gotoOrderDetailsPay = (orderInfo) => {
 		// #ifdef MP-WEIXIN
@@ -216,8 +230,9 @@ export default function useOrderSkip() {
 			const data = stringToJson(res.bizContent);
 			// 刷新本页面
 			console.log("再次使用订单", data)
+			// doSearch()
 			uni.reLaunch({
-				url: `../order/order?index=${0}`
+				url: `/pages/order/order?index=${0}`
 			})
 		});
 	}
@@ -237,8 +252,9 @@ export default function useOrderSkip() {
 			const data = stringToJson(res.bizContent);
 			// 刷新本页面
 			console.log("结束订单", orderInfo)
+			// doSearch()
 			uni.reLaunch({
-				url: `../order/order?index=${0}`
+				url: `/pages/order/order?index=${0}`
 			})
 		});
 	}

pages/order/components/order-list-item-new.vue

@@ -41,6 +41,7 @@
 		</view>
 
 		<template v-if="item.orderStatus != OrderStatus.已取消">
+
 			<!-- 信息填写未完成 -->
 			<view class="btns"
 				v-if="item.orderStep == OrderStatus['完成个人/单位信息上传'] || item.orderStep == OrderStatus.完成填写基本信息 || item.orderStep == OrderStatus.完成车辆信息上传 || item.orderStep == OrderStatus.待支付3">
@@ -93,8 +94,8 @@
 				<view class="btn btn-normal" @click.stop="gotoReturnOrder(item)">申请退货
 				</view>
 				<!-- <view class="btn btn-normal" @click.stop="gotoExchangeOrder(item)">申请换货</view> -->
-				<view class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货
-				</view>
+				<view class="btn btn-primary" @click.stop="gotoConfirmReceipt(item)">确认收货</view>
+				<view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view>
 			</view>
 
 			<!-- 待激活 -->
@@ -120,10 +121,7 @@
 						去评价业务员</view> -->
 				</view>
 			</view>
-			<!-- 结束订单 -->
-			<!-- <view class="btns" v-else-if="item.orderStep == OrderStatus.待激活 && item.finishOrder">
-				<view class="btn btn-primary" @click.stop="closeOrder(item)">结束订单</view>
-			</view> -->
+
 			<!-- 已结束 -->
 			<view class="btns" v-else-if="item.orderStep == OrderStatus.已结束 && item.isUseAgain">
 				<!-- <view class="btn btn-primary" @click.stop="showActiveOrder = true">重新激活订单</view> --> <!-- 以前的 -->
@@ -378,9 +376,9 @@
 		line-height: 58rpx;
 		border-radius: 30rpx;
 		padding: 0 24rpx;
-		font-size: 26rpx;
+		font-size: 23rpx;
 		box-sizing: border-box;
-		margin-right: 20rpx;
+		margin-right: 12rpx;
 	}
 
 

subpackage/personal-center/get-code.vue

@@ -23,9 +23,9 @@
 
 <script setup lang="ts">
 	import { reactive } from "vue";
-	import { checkStr, msg, navTo, subscribeMessages } from "@/utils/utils";
+	import { checkStr, msg, navTo } from "@/utils/utils";
 	import { onLoad, onUnload } from "@dcloudio/uni-app";
-	import { checkCode, loginCode, loginTime } from "@/utils/network/api.js";
+	import { checkCode } from "@/utils/network/api.js";
 	import { request } from "@/utils/network/request.js";
 	import { stringToJson } from "@/utils/network/encryption";
 	import { useUserStore } from "@/stores/user";
@@ -50,19 +50,19 @@
 			console.log(q);
 			state.json = getRequest(q)
 			console.log("state.json", state.json, getItem("mobile"), getItem("mobile") == state.json.phone)
-			// setItem('scanCode', state.json)
-			// if (!getItem("mobile")) {
-			// 	uni.showModal({
-			// 		title: '提示',
-			// 		content: '您还未登录小程序,请先登录小程序',
-			// 		showCancel: false,
-			// 		success: function (res) {
-			// 			if (res.confirm) {
-			// 				navTo('/login/login')
-			// 			}
-			// 		}
-			// 	});
-			// }
+			setItem('scanCode', state.json)
+			if (!getItem("mobile")) {
+				uni.showModal({
+					title: '提示',
+					content: '您还未登录小程序,请先登录小程序',
+					showCancel: false,
+					success: function (res) {
+						if (res.confirm) {
+							navTo('/login/login')
+						}
+					}
+				});
+			}
 			// 直接用传过来的手机号（不让他修改）
 			state.mobile = state.json.phone
 		} else {
@@ -87,43 +87,33 @@
 			msg("请输入正确的手机号！");
 			return;
 		}
-		// 直接去登录
-		reqLogin(loginCode, {
-			mobile: state.mobile,
-			code: state.code,
-			loginTime: loginTime,
-		});
-	};
-	/* 执行登录 */
-	const reqLogin = (code : string, data : object) => {
-		console.log(code, data);
+
 		const options = {
 			type: 2,
-			data: data,
+			data: {
+				mobile: state.mobile,
+				code: state.code
+			},
 			method: "POST",
 			showLoading: true,
 		};
-		request(code, options).then((res) => {
-			const result = stringToJson(res.bizContent);
-			console.log(result);
-			console.log(typeof (result));
-			fetchToken(result.code).then((data : any) => {
-				console.log("登录", data);
-				setItem('mobile', state.mobile)
-				subscribeMessages();
-				if (state.json.type == 1) {
-					uni.navigateTo({
-						url: `/subpackage/orders/order_payment?orderId=${state.json.orderId}`,
-					});
-				} else if (state.json.type == 2) {
-					uni.navigateTo({
-						url: `/subpackage/orders/product-detail?orderId=${state.json.orderId}&url=${state.json.url}&typeScanCode=${state.json.type}`,
-					});
-				}
+		request(checkCode, options).then((res) => {
+			console.log("过来了", res)
+			// type  1扫码支付  2扫描协议确认
+			if (state.json.type == 1) {
+				uni.navigateTo({
+					url: `/subpackage/orders/order_payment?orderId=${state.json.orderId}`,
+				});
+			} else if (state.json.type == 2) {
+				uni.navigateTo({
+					url: `/subpackage/orders/product-detail?orderId=${state.json.orderId}&url=${state.json.url}&typeScanCode=${state.json.type}`,
+				});
+			}
+		})
+			.catch((err) => {
+				// msg("验证码错误");
 			});
-		});
 	};
-
 	//解析URL获取参数
 	const getRequest = (urlStr) => {
 		if (typeof urlStr == "undefined") {