优化结算、订单ui

orderSubPackage/pages/settlement/index.vue

@@ -4,7 +4,8 @@
 			<h3>门店确认</h3>
 			<div class="address">
 				<div class="address_1">{{ shopData.name }}</div>
-				<div class="address_2">距您{{ shopData.distance }}，请确定门店后下单</div>
+				<div v-if="shopData.distance" class="address_2">距您{{ shopData.distance }}，请确定门店后下单</div>
+				<div v-else class="address_2">请确定门店后下单</div>
 			</div>
 			<div class="take_order">
 				<div class="title">取单时间</div>
@@ -26,7 +27,10 @@
 						</div>
 						<div class="goods_psce">
 							<div class="psce_name">
-								<span v-for="rule in item.sku.rules" :key="rule.ruleId">{{ rule.ruleName }}/</span>
+								<span v-for="(rule,index) in item.sku.rules" :key="rule.ruleId">
+									{{ rule.ruleName }}
+									<span v-if="index!=item.sku.rules.length-1">/</span>
+								</span>
 							</div>
 							<div class="size">x {{ item.num }}</div>
 						</div>
@@ -345,7 +349,7 @@ export default {
 	.goods {
 		margin-top: 42rpx;
 		border-bottom: 1rpx solid #EEEEEE;
-		padding-bottom: 20rpx;
+		padding-bottom: 30rpx;
 
 		.goods_item {
 			display: flex;
@@ -356,7 +360,7 @@ export default {
 			height: 80rpx;
 			width: 80rpx;
 			background-color: #eee;
-			margin-right: 50rpx;
+			margin-right: 30rpx;
 		}
 
 		.goods_text {
@@ -400,15 +404,12 @@ export default {
 				margin-top: 10rpx;
 			}
 		}
-
-
 	}
 
 	.discount {
 		margin-top: 15rpx;
 		padding-top: 15rpx;
 
-
 		.discount_1 {
 			display: flex;
 			justify-content: space-between;
@@ -419,7 +420,6 @@ export default {
 			color: #333333;
 
 			.price {
-
 				font-family: Arial-BoldMT, Arial;
 				font-weight: normal;
 				color: #EB5F17;
@@ -450,7 +450,7 @@ export default {
 		align-items: center;
 		display: flex;
 		justify-content: space-between;
-		margin-top: 52rpx;
+		margin-top: 30rpx;
 
 		.size {
 			font-size: 24rpx;
@@ -464,7 +464,6 @@ export default {
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 600;
 			color: #000000;
-
 		}
 
 		.money {

pages/order/order.vue

@@ -18,23 +18,7 @@
 						<h3 class="order_adrass">{{ item.shop.name }}</h3>
 						<text class="order_time">{{ item.createdAt }}</text>
 					</view>
-					<view class="order_status" v-if="item.state == 0">创建未校验</view>
-					<view class="order_status" v-if="item.state == 1">未支付</view>
-					<view class="order_status" v-if="item.state == 2">待制作</view>
-					<view class="order_status" v-if="item.state == 3">制作中</view>
-					<view class="order_status" v-if="item.state == 4">待取餐</view>
-					<view class="order_status" v-if="item.state == 5">取餐中</view>
-					<view class="order_status" v-if="item.state == 6">已完成</view>
-					<view class="order_status" v-if="item.state == 7">待取超时</view>
-					<view class="order_status" v-if="item.state == 8">已取消</view>
-					<view class="order_status" v-if="item.state == 9">已取消</view>
-					<view class="order_status" v-if="item.state == 10">已取消</view>
-					<view class="order_status" v-if="item.state == 11">已取消</view>
-					<view class="order_status" v-if="item.state == 12">退款中</view>
-					<view class="order_status" v-if="item.state == 13">退款失败</view>
-					<view class="order_status" v-if="item.state == 14">部分退款</view>
-					<view class="order_status" v-if="item.state == 15">已退款</view>
-					<view class="order_status" v-if="item.state == 50">未知状态</view>
+					<view class="order_status">{{ getStateText(item.state) }}></view>
 				</view>
 				<div class="order_content">
 					<view>
@@ -102,9 +86,46 @@ export default {
 	computed: {
 		userms() {
 			return this.$store.getters.Authorization;
-		},
+		}
 	},
 	methods: {
+		getStateText(state) {
+			state = '' + state;
+			switch (state) {
+				case '1':
+					return '未支付'
+				case '2':
+					return '待制作'
+				case '3':
+					return '制作中'
+				case '4':
+					return '待取餐'
+				case '5':
+					return '取餐中'
+				case '6':
+					return '已完成'
+				case '7':
+					return '待取超时'
+				case '8':
+					return '已取消'
+				case '9':
+					return '已取消'
+				case '10':
+					return '已取消'
+				case '11':
+					return '已取消'
+				case '12':
+					return '退款中'
+				case '13':
+					return '退款失败'
+				case '14':
+					return '部分退款'
+				case '15':
+					return '已退款'
+				default:
+					return '未知状态'
+			}
+		},
 		async oneMoreOrder(item) {
 			uni.removeStorageSync('shopCarInfo');
 			$EventBus.$emit('updateCar');