修改状态显示

components/OrderQrCode/index.vue

@@ -53,14 +53,14 @@ export default {
 		// 15 已退款 
 		// 50 其他人工干预状态
 		showMask() {
-			return ['2', '3'].indexOf(this.orderInfo.state) != -1
+			return ['2', '3'].indexOf(this.orderInfo.state) != -1;
 		},
 		orderStatusText() {
 			switch (this.orderInfo.state) {
 				case '2':
 					return '已支付'
 				case '3':
-					return '等待中'
+					return '制作中'
 				default:
 					return ''
 			}

orderSubPackage/pages/orderInfo/index.vue

@@ -73,9 +73,6 @@
 				</div>
 			</div>
 		</div>
-
-
-
 		<div class="order_describe">
 			<h3>订单信息</h3>
 			<div class="item">
@@ -90,14 +87,12 @@
 				<span class="label">订单编号：</span>
 				<span class="value">{{ orderInfo.orderNo }}</span>
 			</div>
-
 		</div>
-
 		<div class="customer_service">
-				<button class="function_item_text" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
-					<span>有疑问，联系客服</span>
-					<u-icon name="arrow-right" color="#000" size="20"></u-icon>
-				</button>
+			<button class="function_item_text" open-type="contact" bindcontact="handleContact" session-from="sessionFrom">
+				<span>有疑问，联系客服</span>
+				<u-icon name="arrow-right" color="#000" size="20"></u-icon>
+			</button>
 		</div>
 	</div>
 </template>
@@ -114,7 +109,7 @@ export default {
 		const resData = uni.getStorageSync('orderInfo');
 		this.orderInfo = resData
 		this.ewmImg = '/static/imgs/noQr.png'
-		const isBuild = ['4', '5', '6', '7'].indexOf(this.orderInfo.state) != -1;
+		const isBuild = ['2', '3', '4', '5'].indexOf(this.orderInfo.state) != -1;
 
 		if (isBuild) {
 			new QRCode('myQrcode', {
@@ -188,9 +183,9 @@ export default {
 		},
 	},
 	computed: {
-
 		qrShow() {
-			return ['8', '9', '10', '11', '12', '13', '14', '15', '50'].indexOf(this.orderInfo.state) == -1
+			console.log("order state:"+this.orderInfo.state);
+			return ['2','3','4','5'].indexOf(this.orderInfo.state) != -1
 		},
 		isBuildQrcode() {
 			return
@@ -300,7 +295,7 @@ export default {
 	.btn_cancel {
 		width: 160rpx;
 		height: 52rpx;
-		border: 1rpx solid #006ECF;
+		border: 1rpx solid #CCCCCC;
 		border-radius: 6rpx;
 		display: inline-block;
 		margin: 20rpx;
@@ -485,7 +480,7 @@ export default {
 	.discount {
 		margin-top: 24rpx;
 		padding-bottom: 24rpx;
-		border-bottom: 1rpx solid #666;
+		border-bottom: 1rpx solid #CCCCCC;
 
 		.discount_1 {
 			display: flex;
@@ -566,7 +561,7 @@ export default {
 		font-family: PingFangSC-Medium, PingFang SC;
 		font-weight: 600;
 		color: #000000;
-		border-bottom: 1rpx solid #666;
+		border-bottom: 1rpx solid #CCCCCC;
 	}
 
 	.item {

pages/order/order.vue

@@ -54,7 +54,7 @@
 							</view>
 						</view>
 					</view>
-					<view v-if="item.state == 4 || item.state == 5 || item.state == 6 || item.state == 7"
+					<view v-if="item.state == 2 || item.state == 3 || item.state == 4 || item.state == 5"
 						class="qr_code">
 						<image class="qr_code_img" src="/static/imgs/icon-barcode.png"></image>
 						<view class="qr_text">点击二维码取单</view>