提交

composables/order/useOrderListItem.ts

@@ -62,6 +62,7 @@ export default function useOrderListItem(props) {
 		params.total = 0;
 		params.status = 'more';
 		params.reload = false;
+
 		getList();
 	}
 
@@ -107,69 +108,83 @@ export default function useOrderListItem(props) {
 		}
 		console.log("订单列表查询", options)
 		try {
-			res = await request(orderList, options);
-			const data = stringToJson(res.bizContent);
-			console.log("ordersList.value", ordersList.value)
-
-			params.total = data.totalCount;
-
-			if (params.pageNum === 1) {
-				ordersList.value = [];
-			}
-			if (params.total > 0) {
-				const curList = data.data || [];
-				ordersList.value = params.reload ? curList : ordersList.value.concat(curList);
-				params.reload = false;
-			}
-
-			if (params.total === ordersList.value.length) {
-				params.reload = false;
-				params.status = 'noMore';
-			}
-
-			if (params.pageNum === 1) {
-				uni.stopPullDownRefresh();
-			}
-			// 订单发货后未激活  30天 以后 结束订单功能  insertTime   >30  算出来距离今天是负数  updateTime<30(结束订单)
-			for (var k = 0; k < ordersList.value.length; k++) {
-				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  //不可以结束
-					}
+			// res = await request(orderList, options);
+
+			console.log('输出内容1111111')
+
+			request(orderList, options).then((res) => {
+				const data = stringToJson(res.bizContent);
+				console.log("ordersList.value", ordersList.value)
+
+				params.total = data.totalCount;
+
+				if (params.pageNum === 1) {
+					ordersList.value = [];
+				}
+				if (params.total > 0) {
+					const curList = data.data || [];
+					ordersList.value = params.reload ? curList : ordersList.value.concat(curList);
+					params.reload = 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  //不可以再次使用
+
+				if (params.total === ordersList.value.length) {
+					params.reload = false;
+					params.status = 'noMore';
+				}
+
+				if (params.pageNum === 1) {
+					uni.stopPullDownRefresh();
+				}
+				// 订单发货后未激活  30天 以后 结束订单功能  insertTime   >30  算出来距离今天是负数  updateTime<30(结束订单)
+				for (var k = 0; k < ordersList.value.length; k++) {
+					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  //不可以再次使用
+						}
+					}
+
 				}
+			})
+				.catch((err) => {
+					console.log(err);
+				});
 
-			}
 			uni.$emit('refreshFinish');
 		} catch (e) {
-			console.log('输出内容', e)
+			console.log('输出内容222222', e)
+
 			uni.stopPullDownRefresh();
 			uni.$emit('refreshFinish');
 		}
 	}
 
 	watch(() => props.index, () => {
+		console.log("111")
 		refreshList(true);
 	});
 	watch(() => props.refresh, (nv) => {
+		console.log("222")
 		if (nv) {
 			refreshList(false);
 		}
 	});
 	onMounted(() => {
+		console.log("333")
 		if (props.refresh) {
 			refreshList(false);
 		}
 	})
 	onPullDownRefresh(() => {
+		console.log("444")
 		refreshList(true);
 	});
 

pages.json

@@ -17,8 +17,8 @@
 		{
 			"path": "pages/order/order",
 			"style": {
-				"navigationBarTitleText": "我的订单",
-				"enablePullDownRefresh": true
+				"navigationBarTitleText": "我的订单"
+				// "enablePullDownRefresh": true
 			}
 		},
 		{

subpackage/orders/product-detail.vue

@@ -81,7 +81,7 @@
 				<checkbox-group @change="checkboxChange">
 					<checkbox :checked="state.checked" style="transform: scale(0.8)" />我已阅读并同意
 				</checkbox-group>
-				<a style="color:#007AFF;text-decoration: underline;" @click="downAuthD()">《产品协议》</a>
+				<text style="color:#007AFF;text-decoration: underline;" @click="downAuthD()">《产品协议》</text>
 			</view>
 		</view>
 
@@ -186,6 +186,7 @@
 	};
 	const downAuthD = () => {
 		// tools.showLoadingAlert("加载中");
+		console.log('=======123')
 		console.log("uni.env.USER_DATA_PATH '", uni.env.USER_DATA_PATH + '/' + '产品协议.docx')
 		uni.downloadFile({
 			url: state.agreeURL,