YY 2 년 전
부모
커밋
543ced9751
2개의 변경된 파일38개의 추가작업 그리고 31개의 파일을 삭제
  1. 19 13
      src/views/selfShop/order/detail_orderDetail.vue
  2. 19 18
      src/views/system/order/detail_orderDetail.vue

+ 19 - 13
src/views/selfShop/order/detail_orderDetail.vue

@@ -21,7 +21,7 @@
           </el-col>
           <el-col :span="24" class="shop"> <i class="el-icon-s-shop"></i>{{ shop.name }}</el-col>
           <el-col :span="24" v-for="(item, index) in list" :key="index">
-            <el-col :span="24" class="goods">
+            <el-col :span="24" class="goods bode">
               <el-col :span="6"><el-image :src="item.goods.file[0].url"></el-image></el-col>
               <el-col :span="18">
                 <el-col :span="12">
@@ -43,56 +43,56 @@
                 </el-col>
               </el-col>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="24" class="bode">
               <el-col :span="6">运费</el-col>
               <el-col :span="18" class="other" v-if="!item.goods.freight == '0'">{{ item.goods.freight }}</el-col>
               <el-col :span="18" class="other" v-else>包邮</el-col>
             </el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">订单备注</el-col>
             <el-col :span="18" class="other" v-if="form.remarks">{{ form.remarks }}</el-col>
             <el-col :span="18" class="other" v-else>暂无备注</el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">配送方式</el-col>
             <el-col :span="18" class="other">快递配送</el-col>
           </el-col>
-          <el-col :span="24" class="goods_total">
+          <el-col :span="24" class="goods_total bode">
             <el-col :span="6">商品金额</el-col>
             <el-col :span="18" class="other">
               <p>¥{{ total_detail.goods_total }}</p>
             </el-col>
           </el-col>
-          <el-col :span="24" class="goods_total">
+          <el-col :span="24" class="goods_total bode">
             <el-col :span="6">快递费</el-col>
             <el-col :span="18" class="other">
               <p>¥{{ total_detail.freight_total }}</p>
             </el-col>
           </el-col>
-          <el-col :span="24" class="goods_total">
+          <el-col :span="24" class="goods_total bode">
             <el-col :span="8">优惠后实付金额</el-col>
             <el-col :span="16" class="other">
               <p>¥{{ pay.pay_money }}</p>
             </el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">下单时间</el-col>
             <el-col :span="18" class="other">{{ form.buy_time }}</el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">支付时间</el-col>
             <el-col :span="18" class="other">{{ form.pay_time }}</el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">寄出运单号</el-col>
             <el-col :span="18" class="other">{{ transport.shop_transport_no || '暂无单号' }}</el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">寄出快递类型</el-col>
             <el-col :span="18" class="other">{{ transport.shop_transport_name || '暂无快递信息' }}</el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="form">
             <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
               <el-form-item
                 label="寄出运单号"
@@ -325,7 +325,13 @@ export default {
       }
     }
     .el-col {
-      margin: 4px 0;
+      margin: 3px 0;
+    }
+    .bode {
+      border-bottom: 1px solid rgb(238, 237, 237);
+    }
+    .form {
+      margin: 20px 0 0 0;
     }
   }
 }

+ 19 - 18
src/views/system/order/detail_orderDetail.vue

@@ -21,7 +21,7 @@
           </el-col>
           <el-col :span="24" class="shop"> <i class="el-icon-s-shop"></i>{{ shop.name }}</el-col>
           <el-col :span="24" v-for="(item, index) in list" :key="index">
-            <el-col :span="24" class="goods">
+            <el-col :span="24" class="goods bode">
               <el-col :span="6"><el-image :src="item.goods.file[0].url"></el-image></el-col>
               <el-col :span="18">
                 <el-col :span="12">
@@ -43,56 +43,56 @@
                 </el-col>
               </el-col>
             </el-col>
-            <el-col :span="24">
+            <el-col :span="24" class="bode">
               <el-col :span="6">运费</el-col>
               <el-col :span="18" class="other" v-if="!item.goods.freight == '0'">{{ item.goods.freight }}</el-col>
               <el-col :span="18" class="other" v-else>包邮</el-col>
             </el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">订单备注</el-col>
             <el-col :span="18" class="other" v-if="form.remarks">{{ form.remarks }}</el-col>
             <el-col :span="18" class="other" v-else>暂无备注</el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">配送方式</el-col>
             <el-col :span="18" class="other">快递配送</el-col>
           </el-col>
-          <el-col :span="24" class="goods_total">
+          <el-col :span="24" class="goods_total bode">
             <el-col :span="6">商品金额</el-col>
             <el-col :span="18" class="other">
               <p>¥{{ total_detail.goods_total }}</p>
             </el-col>
           </el-col>
-          <el-col :span="24" class="goods_total">
+          <el-col :span="24" class="goods_total bode">
             <el-col :span="6">快递费</el-col>
             <el-col :span="18" class="other">
               <p>¥{{ total_detail.freight_total }}</p>
             </el-col>
           </el-col>
-          <el-col :span="24" class="goods_total">
+          <el-col :span="24" class="goods_total bode">
             <el-col :span="8">优惠后实付金额</el-col>
             <el-col :span="16" class="other">
               <p>¥{{ pay.pay_money }}</p>
             </el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">下单时间</el-col>
             <el-col :span="18" class="other">{{ form.buy_time }}</el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">支付时间</el-col>
             <el-col :span="18" class="other">{{ form.pay_time }}</el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">寄出运单号</el-col>
             <el-col :span="18" class="other">{{ transport.shop_transport_no || '暂无单号' }}</el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="bode">
             <el-col :span="6">寄出快递类型</el-col>
             <el-col :span="18" class="other">{{ transport.shop_transport_name || '暂无快递信息' }}</el-col>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="24" class="form">
             <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
               <el-form-item
                 label="寄出运单号"
@@ -272,11 +272,6 @@ export default {
       if (this.$checkRes(res)) {
         this.$set(this, `order_processList`, res.data);
       }
-      // 快递类型
-      // res = await this.dictQuery({ code: 'transport_type' });
-      // if (this.$checkRes(res)) {
-      //   this.$set(this, `shop_transport_typeList`, res.data);
-      // }
     },
   },
   computed: {
@@ -325,7 +320,13 @@ export default {
       }
     }
     .el-col {
-      margin: 4px 0;
+      margin: 3px 0;
+    }
+    .bode {
+      border-bottom: 1px solid rgb(238, 237, 237);
+    }
+    .form {
+      margin: 20px 0 0 0;
     }
   }
 }