auto commit

pages/index/modal/quickBuy.css

@@ -7,6 +7,7 @@
 .input-number .num::after{content: 'kg';position: absolute;right: 24rpx;top: 14rpx;font-size: 30rpx;color: #666;}
 .input-number .num .input{height: 100%;padding-left: 24rpx;border: 2rpx solid #D8D8D8;border-radius: 8rpx;}
 .input-number .conditions-item-til{margin-bottom: 0;}
+.close-img{width: 40rpx;height: 40rpx;padding: 20rpx;}
 
 .remark{border: 2rpx solid #DFDFDF;padding: 30rpx 24rpx 24rpx;}
 .remark-textarea{font-size: 24rpx;color: #ccc;line-height: 33rpx;height: 100rpx;}

pages/index/modal/quickBuy.vue

@@ -4,7 +4,8 @@
 			<view class="popup-head">				
 				<text v-if="customerType==1">购买碳汇</text>
 				<text v-else>线下认购</text>
-				<text class="close" @click="closePop">X</text>
+				<!-- <text class="close" @click="closePop">X</text> -->
+				<image :src="$getimg+'icon-close.png'" class="close-img" @click="closePop" mode="scaleToFill"></image>
 			</view>
 			<view class="popup-body">
 				<view class="conditions-item input-number">
@@ -82,6 +83,7 @@
 		},
 		data() {
 			return {
+				$getimg:this.config.$getimg,
 				customerType:null,
 				shoppingNum:'',
 				remark:'',

pages/usercenter/orderList/orderdetails/orderdetails.vue

@@ -12,10 +12,14 @@
 			</view>
 			<view class="order-info" v-if="item.payNo">支付流水号：{{item.payNo}}</view>
 			<view class="order-status">
-				<view class="status" v-if="item.orderStatus == 1">
+				<view class="status" v-if="item.orderStatus == 1 && item.state ==1">
 					<image :src="$getInnerImg+'icon-vipcard.png'" class="status-img" mode="scaleToFill"></image>
 					<text class="status-text">待付款</text>
 				</view>
+				<view class="status" v-if="item.state == 0">
+					<image :src="$getInnerImg+'icon-vipcard.png'" class="status-img" mode="scaleToFill"></image>
+					<text class="status-text">已失效</text>
+				</view>
 				<view class="status"  v-if="item.orderStatus == 2">
 					<image :src="$getInnerImg+'icon-vipcard-green.png'" class="status-img" mode="scaleToFill"></image>
 					<text class="status-text">已支付</text>