diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index 35fcb97..3ee16cd 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -142,6 +142,15 @@ each(@colors, {
   text-align: right;
 }
 
+.v12-btn{
+  width: 136rpx;
+  height: 50rpx;
+  text-align: center;
+  line-height: 50rpx;
+  border-radius: 50rpx;
+  color: #fff;
+  font-size: 27rpx;
+}
 
 
 
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 858595a..073f1df 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -33,11 +33,10 @@
 
         <view class="title acea-row row-between-wrapper" style="padding: 0 0 0 30rpx !important;">
           <view class="acea-row row-middle">
-                        <span class="sign cart-color acea-row row-center-wrapper"
-                              v-if="order.combinationId > 0">拼团</span>
-            <span class="sign cart-color acea-row row-center-wrapper" v-if="order.seckillId > 0">秒杀</span>
-            <span class="sign cart-color acea-row row-center-wrapper" v-if="order.bargainId > 0">砍价</span>
-            <span class="sign cart-color acea-row row-center-wrapper" v-if="order.storeId > 0">门店</span>
+            <span class="sign cart-color acea-row row-center-wrapper v12-priamry-text v12-priamry-border v12-radius-40" v-if="order.combinationId > 0">拼团</span>
+            <span class="sign cart-color acea-row row-center-wrapper v12-priamry-text v12-priamry-border v12-radius-40" v-if="order.seckillId > 0">秒杀</span>
+            <span class="sign cart-color acea-row row-center-wrapper v12-priamry-text v12-priamry-border v12-radius-40" v-if="order.bargainId > 0">砍价</span>
+            <span class="sign cart-color acea-row row-center-wrapper v12-priamry-text v12-priamry-border v12-radius-40" v-if="order.storeId > 0">门店</span>
             订单号:{{ order.orderId }}
           </view>
           <view class="font-color-white statusTag v12-primary" v-if="order.isTickets===1 && order._status._type === 1">
@@ -85,7 +84,7 @@
                   v-if="cart.productInfo.attrInfo"
                   class="attr v12-secondary-dark-text v12-font-24 "
                 >
-                  规格：{{ cart.productInfo.attrInfo.sku }}
+                  {{ cart.productInfo.attrInfo.sku }}
                 </view>
                 <view class="v12-dark-text v12-font-22">x{{ cart.cartNum }}</view>
               </view>
@@ -111,14 +110,20 @@
             <text class="btn-more v12-font-24" @click="tapShowMore(order,orderListIndex)">更多</text>
             <view class="group-float" v-show="order.showMore">
               <view class="btn btn-service flex jc-center ai-center v12-font-24" @click="goRoom(order)"
-                    v-if="order.merName">联系客服
+                    v-if="order.merName">联系商家
               </view>
               <view class="btn flex jc-center ai-center v12-font-24" @click="goRefund(order)">申请退款</view>
             </view>
           </view>
           <template v-else>
-            <view class="bnt service" @click="goRoom(order)" v-if="order.merName">联系客服</view>
-            <view v-else></view>
+            <view class="v12-justify-between" style="width: 100%">
+              <view class="bnt service" @click="goRoom(order)" v-if="order.merName">联系商家</view>
+              <view class="v12-justify-between">
+                <view class="bnt service" @click="goOrderDetails(order)" v-if="['-1','-2','-3'].includes(order._status._type)">查看详情</view>
+                <view class="bnt v12-primary-text v12-primary-border" @click="takeOrder(order)" v-if="['-2','-3'].includes(order._status._type)">确认收货</view>
+              </view>
+            </view>
+            <!-- <view v-else></view> -->
           </template>
 
           <view class="flex">
@@ -200,6 +205,7 @@ export default {
         {name: '待付款'},
         {name: '待发货'},
         {name: '待收货/待核销'},
+        {name: '退款/售后'},
         {name: '待评价'},
         {name: '已完成'}],
       offlinePayStatus: 2,
@@ -252,7 +258,7 @@ export default {
         // 打开售后的目的就是开启已完成/待评价订单的退款功能，确认打开售后之后，小程序用户再点击申请退款，就可以进入退款申请填写页面，正常走退款流程，提交退款申请以后，订单状态变为退款中
         if (order.refundSystemStatus === 0) {
           uni.showToast({
-            title: '订单已收货，如需退款请联系客服',
+            title: '订单已收货，如需退款请联系商家',
             mask: false,
             icon: 'none',
             duration: 3000
@@ -345,7 +351,9 @@ export default {
       this.changeType(this.type);
     },
     tabChange(item) {
-      this.type = item.index;
+      
+      
+      this.type = item.index
       this.changeType();
     },
     changeType() {
@@ -358,10 +366,19 @@ export default {
     getOrderListReq() {
       if (this.loading || this.loaded) return;
       this.loading = true;
+      const types = {
+        0: 0,
+        1: 1,
+        2: 2,
+        3: 3,
+        4: -3,
+        5: 4,
+        6: 5,
+      }
+      const type = types[this.type]
       const {
         page,
         limit,
-        type
       } = this;
       getOrderList({
         page,
@@ -406,10 +423,10 @@ export default {
           status = "退款中";
           break;
         case -2:
-          status = "已退款";
+          status = "退款成功";
           break;
         case -3:
-          status = "已驳回";
+          status = "退款失败";
           break;
         case 9:
           status = "已取消";