no message

pages/visa/visa_MyOrder.vue

@@ -245,13 +245,15 @@
 		methods: {
 			//获取订单状态名称
 			getOrderStateName(item) {
-				var str = "待付款";
-				if (item.visaOrderStatus == 1&&item.income>0) {
+				var str = "";
+				if (item.visaOrderStatus == 1&&(item.income+item.platformTax)<item.totalPrice) {
 					str = "正常"
-				} else if (item.visaOrderStatus == 1&&item.income==item.totalPrice) {
+				} else if (item.visaOrderStatus == 1&&(item.income+item.platformTax)==item.totalPrice) {
 					str = "已付款"
 				} else if (item.visaOrderStatus == 2) {
 					str = "已取消"
+				} else if (item.visaOrderStatus == 3) {
+					str = "待付款"
 				}
 				return str;
 			},

pages/visa/visa_SureOrder.vue

@@ -500,8 +500,8 @@
 				</view>
 			</view>
 		</view>
-		<view class="jz_orderbox flex">
-			<view style="display: flex" v-if="showPayBtn">
+		<view class="jz_orderbox flex" v-if="showPayBtn">
+			<view style="display: flex">
 				<view class="jz_OrderReNow" @click="goCancel" style="background: #fff; color: #111; border: 1px solid #111">
 					<text v-if="!submitCancel">取消</text>
 					<u-loading v-if="submitCancel" size="32" color="#111"></u-loading>
@@ -633,7 +633,8 @@
 							this.formatStatus(
 								this.orderData.OrderModel.VisaOrderStatus,
 								this.orderData.OrderModel.Income,
-								this.orderData.OrderModel.TotalPrice
+								this.orderData.OrderModel.TotalPrice,
+								this.orderData.OrderModel.PlatformTax
 								);
 						} else {
 							this.orderData = {
@@ -644,7 +645,7 @@
 					(e) => {}
 				);
 			},
-			formatStatus(status,Income,TotalPrice) {
+			formatStatus(status,Income,TotalPrice,PlatformTax) {
 				if (status == 2) {
 					this.orderStatus.code = -1;
 					this.orderStatus.text = "已取消";
@@ -653,11 +654,11 @@
 					this.orderStatus.code = 0;
 					this.orderStatus.text = "待付款";
 					this.showPayBtn = true;
-				} else if (status == 1&&Income>0) {
+				} else if (status == 1&&(Income+PlatformTax)<TotalPrice) {
 					this.orderStatus.code = 1;
 					this.orderStatus.text = "正常";
 					this.showPayBtn = false;
-				} else if (status == 1&&Income==TotalPrice) {
+				} else if (status == 1&&(Income+PlatformTax)==TotalPrice) {
 					this.orderStatus.code = 1;
 					this.orderStatus.text = "已付款";
 					this.showPayBtn = false;