shish 7 месяцев назад
Родитель
Сommit
4e5b4538aa

+ 1 - 3
ghsApp/src/admin/home/components/OrderItem.vue

@@ -11,9 +11,7 @@
         <text class="other-book" v-if="item.book == 1">预订单</text>
         <text class="other-presell" v-if="item.presell == 1">预售单</text>
         <view :class="['status', currentStatus == 4 ? 'buleColor' : currentStatus == 3 ? 'buleColor' : currentStatus == 1 ? 'defColor' : '']">
-          {{
-            currentStatus == 1 ? '待付款' : currentStatus == 2 ? '待发货' : currentStatus == 3 ? '配送中' : currentStatus == 4 ? '已完成' : '已取消'
-          }}
+          {{currentStatus == 1 ? '待付款' : currentStatus == 2 ? '待发货' : currentStatus == 3 ? '配送中' : currentStatus == 4 ? '已完成' : currentStatus == 5?'已取消':''}}
         </view>
       </view>
       <view class="order-list_info">

+ 1 - 1
ghsApp/src/pagesOrder/detail.vue

@@ -7,7 +7,7 @@
 			<view class="address-des_bx content-box">
 				<view @click.stop="goCustom(detailInfo)">
 					<view style="overflow:hidden;text-overflow:ellipsis;white-space: nowrap;width:450upx;"> {{ detailInfo.customName }} {{ detailInfo.customMobile }}</view>
-					<view style="margin-bottom:20upx;color:#333333">店长 {{ detailInfo.customSuper.name||''}}</view>
+					<view style="margin-bottom:20upx;color:#333333;padding:10upx 0 10upx 0;">店长 {{ detailInfo.customSuper.name||''}}</view>
 					<view style="margin-bottom:15upx;color:black;">{{ detailInfo.customAddress}}</view>
 					<view v-if="!$util.isEmpty(detailInfo.showAddress) && detailInfo.showAddress != detailInfo.customAddress" style="color:#656363;">{{detailInfo.showAddress}}</view>
 				</view>