提交全部代码

composables/order/useOrderListItem.ts

@@ -110,19 +110,19 @@ export default function useOrderListItem(props) {
 			res = await request(orderList, options);
 			const data = stringToJson(res.bizContent);
 			console.log("ordersList.value", ordersList.value)
-			// 订单发货后未激活  30天 以后 结束订单功能  insertTime   >30
+			// 订单发货后未激活  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) {
+					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) {
+					if (timesDiff(ordersList.value[k]['updateTime'].replace("T", " ")).days <= 30) {
 						ordersList.value[k]['isUseAgain'] = true  //可以再次使用
 					} else {
 						ordersList.value[k]['isUseAgain'] = false  //不可以再次使用

login/login.vue

@@ -169,7 +169,10 @@
 				subscribeMessages();
 				msg("登录成功！");
 				uni.$emit("refreshOrder");
-				uni.navigateBack();
+				// uni.navigateBack();
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
 			});
 		});
 	};

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

@@ -98,11 +98,11 @@
 			</view>
 
 			<!-- 待激活 -->
-			<view class="btns" v-else-if="item.orderStep == OrderStatus.待激活">
+			<view class="btns" v-else-if="item.orderStep == OrderStatus.待激活 ">
 				<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="gotoActiveOrder(item)">去激活
-				</view>
+				<view class="btn btn-primary" @click.stop="gotoActiveOrder(item)">去激活</view>
+				<view class="btn btn-primary" @click.stop="closeOrder(item)" v-if="item.finishOrder">结束订单</view>
 			</view>
 
 			<!-- 已完成 -->
@@ -121,9 +121,9 @@
 				</view>
 			</view>
 			<!-- 结束订单 -->
-			<view class="btns" v-else-if="item.orderStep == OrderStatus.待激活 && item.finishOrder">
+			<!-- <view class="btns" v-else-if="item.orderStep == OrderStatus.待激活 && item.finishOrder">
 				<view class="btn btn-primary" @click.stop="closeOrder(item)">结束订单</view>
-			</view>
+			</view> -->
 			<!-- 已结束 -->
 			<view class="btns" v-else-if="item.orderStep == OrderStatus.已结束 && item.isUseAgain">
 				<!-- <view class="btn btn-primary" @click.stop="showActiveOrder = true">重新激活订单</view> --> <!-- 以前的 -->

subpackage/after-sale/to-bookkeeping-card/choice-product-new.vue

@@ -78,7 +78,7 @@
 		} else if (n == '储值卡') {
 			state.isValueCard = 1
 		} else {
-			state.isValueCard = 3
+			state.isValueCard = 2
 		}
 		uni.redirectTo({
 			url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isSign=${state.isSign}&isValueCard=${state.isValueCard}`,
@@ -137,9 +137,9 @@
 			for (var i = 0; i < state.dataArray.length; i++) {
 				const cardTypeArr = []
 				for (var j = 0; j < state.dataArray[i]['releaseProductStandards']['productStandards'].cardType.length; j++) {
-					if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '1') {
+					if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '2') {
 						cardTypeArr.push('储值卡')
-					} else if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '2') {
+					} else if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '1') {
 						cardTypeArr.push('记账卡')
 					} else if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '3') {
 						cardTypeArr.push('预存卡')
@@ -150,7 +150,7 @@
 			state.dataArray = state.dataArray.filter(function (e) {
 				console.log("e", e['releaseProductStandards']['productStandards']['cardType'])
 				for (var i = 0; i < e['releaseProductStandards']['productStandards']['cardType'].length; i++) {
-					if (e['releaseProductStandards']['productStandards']['cardType'][i] == "2") {
+					if (e['releaseProductStandards']['productStandards']['cardType'][i] == "1") {
 						return e['releaseProductStandards']['productStandards']['cardType'];
 					}
 				}

subpackage/orders/choice-product.vue

@@ -75,7 +75,7 @@
 		} else if (n == '储值卡') {
 			state.isValueCard = 1
 		} else {
-			state.isValueCard = 3
+			state.isValueCard = 2
 		}
 		// uni.redirectTo({
 		// 	url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isSign=${state.isSign}&isValueCard=${state.isValueCard}`,
@@ -113,7 +113,7 @@
 			} else if (val['releaseProductStandards']['productStandards']['cardTypeArr'].split(",")[0] == '储值卡') {
 				state.isValueCard = 1
 			} else {
-				state.isValueCard = 3
+				state.isValueCard = 2
 			}
 			console.log("state.isValueCard", state.isValueCard)
 			setItem("isValueCard", state.isValueCard);
@@ -181,9 +181,9 @@
 			for (var i = 0; i < state.dataArray.length; i++) {
 				const cardTypeArr = []
 				for (var j = 0; j < state.dataArray[i]['releaseProductStandards']['productStandards'].cardType.length; j++) {
-					if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '1') {
+					if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '2') {
 						cardTypeArr.push('储值卡')
-					} else if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '2') {
+					} else if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '1') {
 						cardTypeArr.push('记账卡')
 					} else if (state.dataArray[i]['releaseProductStandards']['productStandards'].cardType[j] == '3') {
 						cardTypeArr.push('预存卡')

subpackage/orders/order_payment.vue

@@ -90,7 +90,7 @@
 		} else if (n == '储值卡') {
 			state.isValueCard = 1
 		} else {
-			state.isValueCard = 3
+			state.isValueCard = 2
 		}
 		uni.redirectTo({
 			url: `/subpackage/orders/essential-information?promoteId=${getItem("promoteId")}&userType=${state.userType}&type=${state.type}&isSign=${state.isSign}&isValueCard=${state.isValueCard}`,

utils/utils.ts

@@ -497,28 +497,28 @@ export const uploadFile = (tempImagePath, imageType, code) => {
  * @param {*} timesData  '2018-05-17 16:58:00'
  * @returns 
  */
-export function timesDiff(timesData:any) {
-  var dateBegin = new Date();//获取当前时间
-  var dateEnd = new Date(timesData.replace(/-/g, "/"));//将-转化为/，使用new Date
-  var dateDiff = dateEnd.getTime() - dateBegin.getTime();//时间差的毫秒数
-  var days = Math.floor(dateDiff / (24 * 3600 * 1000));//计算出相差天数
-  var leave1 = dateDiff % (24 * 3600 * 1000)    //计算天数后剩余的毫秒数
-  var hours = Math.floor(leave1 / (3600 * 1000))//计算出小时数
-  var leave2 = leave1 % (3600 * 1000)    //计算小时数后剩余的毫秒数
-  var minutes = Math.floor(leave2 / (60 * 1000))//计算相差分钟数
-  var diffObj = {
-    days: 0,
-    hours: 0,
-    minutes: 0,
-  };
+export function timesDiff(timesData : any) {
+	var dateBegin = new Date();//获取当前时间
+	var dateEnd = new Date(timesData.replace(/-/g, "/"));//将-转化为/，使用new Date
+	var dateDiff = dateEnd.getTime() - dateBegin.getTime();//时间差的毫秒数
+	var days = Math.floor(dateDiff / (24 * 3600 * 1000));//计算出相差天数
+	var leave1 = dateDiff % (24 * 3600 * 1000)    //计算天数后剩余的毫秒数
+	var hours = Math.floor(leave1 / (3600 * 1000))//计算出小时数
+	var leave2 = leave1 % (3600 * 1000)    //计算小时数后剩余的毫秒数
+	var minutes = Math.floor(leave2 / (60 * 1000))//计算相差分钟数
+	var diffObj = {
+		days: 0,
+		hours: 0,
+		minutes: 0,
+	};
 
-  if (days != 0) {
-    diffObj.days = days;
-  } else if (days == 0 && hours != 0) {
-    diffObj.hours = hours;
-  } else if (days == 0 && hours == 0) {
-    diffObj.minutes = minutes;
-  }
+	if (days != 0) {
+		diffObj.days = Math.abs(days);
+	} else if (days == 0 && hours != 0) {
+		diffObj.hours = hours;
+	} else if (days == 0 && hours == 0) {
+		diffObj.minutes = minutes;
+	}
 
-  return diffObj
+	return diffObj
 }