取消订单的ui兼容

pages.json

@@ -128,7 +128,8 @@
     {
       "path": "pages/shop/GoodsEvaluate/index",
       "style": {
-        "navigationBarTitleText": "商品评价"
+        "navigationBarTitleText": "商品评价",
+        "navigationStyle": "custom"
       }
     },
     {

pages/order/MyOrder/index.vue

@@ -48,8 +48,8 @@
 							<span class="sign cart-color acea-row row-center-wrapper" v-if="order.storeId > 0">门店</span>
 							{{ order.createTime }}
 						</view> -->
-						
-						<view class="font-color-red">{{ getStatus(order) || order._status._title }}</view>
+						<view class="" v-if="order.status == 8">已取消</view>
+						<view class="font-color-red" v-else>{{ getStatus(order) || order._status._title }}</view>
 					</view>
 					<view @click="goOrderDetails(order)" style="padding-bottom: 6rpx;">
 						<view class="item-info acea-row" v-for="(cart, cartInfoIndex) in order.cartInfo" :key="cartInfoIndex">
@@ -106,11 +106,11 @@
 							<text class="money" v-if="order.payType == 'integral'">{{ order.payIntegral }}积分</text>
 						</view>
 						<view class="bottom acea-row row-right row-middle">
-							<template v-if="order._status._type == 0">
+							<template v-if="order._status._type == 0 && order.status != 8">
 								<view class="bnt" @click="cancelOrder(order)">取消订单</view>
 								<view class="bnt bg-color-red" @click="goOrderDetails(order)">立即付款</view>
 							</template>
-							<template v-if="order._status._type == 1 || order._status._type == 9">
+							<template v-if="order._status._type == 1 || order._status._type == 9 || order.status == 8">
 								<view class="bnt" @click="goOrderDetails(order)">查看详情</view>
 							</template>
 							<template v-if="order._status._type == 2">
@@ -207,8 +207,7 @@ export default {
       orderData: {},
       type: '',
       page: 1,
-      limit: 4,
-      // limit: 20,
+      limit: 10,
       loaded: false,
       loading: false,
       orderList: [],

pages/order/OrderDetails/index.vue

@@ -15,7 +15,11 @@
 		
     <!-- 给header上与data上加on为退款订单-->
     <view class="top-box bg-color-red acea-row row-between-wrapper" :class="refundOrder ? 'on' : ''">
-			<view class="acea-row row-middle" v-if="status.type === 0 || status.type === 9">
+			<view class="acea-row row-middle" v-if="orderInfo.status == 8">
+				<image class="icon" src="../../../static/images/order-close.png" mode=""></image>
+				<view class="status">订单已取消</view>
+			</view>
+			<view class="acea-row row-middle" v-else-if="status.type === 0 || status.type === 9">
 				<image class="icon" src="../../../static/images/order-status1.png" mode=""></image>
 				<view class="status">等待付款</view>
 			</view>
@@ -35,7 +39,7 @@
 				<image class="icon" src="../../../static/images/order-status1.png" mode=""></image>
 				<view class="status">{{ orderInfo._status._title }}</view>
 			</view>
-      <view class="data" :class="refundOrder ? 'on' : ''">
+      <view class="data" :class="refundOrder ? 'on' : ''" v-if="orderInfo.status !== 8">
 				<view class="" v-if="status.type === 0 || status.type === 9">{{ orderInfo._status._msg }}</view>
 				<view class="" v-else-if="status.type === 1">{{ orderInfo._status._msg }}</view>
 				<view class="" v-else-if="status.type === 2">{{ orderInfo.deliveryName }}</view>
@@ -315,8 +319,8 @@
       </view>
     </view> -->
 		
-    <view :style="addBottom?'height: 162rpx;':'height: 122rpx'" v-if="!refundOrder && offlineStatus"></view>
-    <view class="footer acea-row row-right" v-if="!refundOrder && offlineStatus" :style="addBottom?'':'height: 122rpx'">
+    <view :style="addBottom?'height: 162rpx;':'height: 122rpx'" v-if="!refundOrder && offlineStatus && orderInfo.status !== 8"></view>
+    <view class="footer acea-row row-right" v-if="!refundOrder && offlineStatus && orderInfo.status !== 8" :style="addBottom?'':'height: 122rpx'">
       <template v-if="status.type == 0">
         <view class="bnt cancel" @click="cancelOrder">取消订单</view>
         <view class="bnt bg-color-red" @click="pay = true">立即付款</view>

pages/shop/GoodsEvaluate/index.vue

@@ -1,5 +1,18 @@
 <template>
   <view class="evaluate-con">
+		<view class="header">
+			<cu-custom :isBack="true" :isCenter="true">
+				<block slot="backText">
+					<view class="backImg">
+						<image src="@/static/images/back-btn.png" mode=""></image>
+					</view>
+				</block>
+				<block slot="content">
+					<view class="tab-title">商品评价</view>
+				</block>
+			</cu-custom>
+		</view>
+		
     <view class="goodsStyle acea-row row-between" v-if="orderCon.productInfo">
       <view class="pictrue">
         <image :src="orderCon.productInfo.image" class="image" />
@@ -54,11 +67,6 @@
     </view>
   </view>
 </template>
-<style scoped lang="less">
-.evaluate-con .score .textarea .list .pictrue.uploadBnt {
-  border: 1px solid #ddd;
-}
-</style>
 <script>
 import { postOrderProduct, postOrderComment } from "@/api/store";
 import { trim, chooseImage } from "@/utils";
@@ -197,3 +205,27 @@ export default {
   }
 };
 </script>
+<style scoped lang="less">
+	.header {
+		.tab-title {
+			font-size: 32rpx;
+			font-family: PingFang SC;
+			font-weight: 600;
+			color: #2DB5AE;
+			line-height: 42rpx;
+		}
+		.backImg {
+			width: 88rpx;
+			height: 62rpx;
+			padding-left: 26rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	
+.evaluate-con .score .textarea .list .pictrue.uploadBnt {
+  border: 1px solid #ddd;
+}
+</style>