修改订单样式

src/views/platmanag/order/parts/detail/detail_order.vue

@@ -11,7 +11,7 @@
         <el-col class="top-btn">
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
-        <el-col :span="8" class="one">
+        <el-col :span="12" class="one">
           <el-col :span="24" class="add">
             <el-col :span="2">
               <i class="el-icon-location"></i>
@@ -24,7 +24,7 @@
           <el-col :span="24" v-for="(item, index) in list" :key="index">
             <el-col :span="24" class="shop"> <i class="el-icon-s-shop"></i>{{ item.shop_name }}</el-col>
             <el-col :span="24" v-for="(goods, index) in item.goods" :key="index">
-              <el-col :span="24" class="goods">
+              <el-col :span="24" class="goods bode">
                 <el-col :span="6"><el-image :src="goods.goods.file[0].url"></el-image></el-col>
                 <el-col :span="18">
                   <el-col :span="12">
@@ -33,7 +33,8 @@
                   </el-col>
                   <el-col :span="12" class="money">
                     <el-col :span="24" style="color: red; font-size: 20px">
-                      <p v-if="info.type == '0'">￥{{ goods.sell_money }}</p>
+                      <p v-if="info.type == '0' && goods.price">￥{{ goods.price }}</p>
+                      <p v-else-if="info.type == '0' && !goods.price">￥{{ goods.sell_money }}</p>
                       <p v-else-if="info.type == '1'">￥{{ goods.group_config.money }}</p>
                     </el-col>
                     <p>X{{ goods.buy_num }}</p>
@@ -43,21 +44,55 @@
                   </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="!goods.freight == '0'">{{ goods.freight }}</el-col>
                 <el-col :span="18" class="other" v-else>包邮</el-col>
               </el-col>
-              <el-col :span="24">
-                <el-col :span="6">订单备注</el-col>
-                <el-col :span="18" class="other" v-if="item.remarks">{{ item.remarks }}</el-col>
-                <el-col :span="18" class="other" v-else>暂无备注</el-col>
+              <el-col :span="24" class="bode" v-if="goods.act">
+                <el-col :span="24">平台活动优惠</el-col>
+                <el-col :span="24" v-for="(act, index) in goods.act" :key="index">
+                  <el-col :span="8">
+                    {{
+                      act.platform_act_type == '0'
+                        ? '优惠商品合集'
+                        : act.platform_act_type == '1'
+                        ? '按单返现'
+                        : act.platform_act_type == '2'
+                        ? '买赠'
+                        : act.platform_act_type == '3'
+                        ? '特价'
+                        : act.platform_act_type == '4'
+                        ? ''
+                        : act.platform_act_type == '5'
+                        ? '满减'
+                        : act.platform_act_type == '6'
+                        ? '满减折扣'
+                        : '套装促销'
+                    }}
+                  </el-col>
+                  <el-col :span="16" class="other" v-if="act.platform_act_type == '4'">加价购 </el-col>
+                  <el-col :span="16" class="other" v-if="act.platform_act_type == '3'">
+                    <p>{{ act.sp_price }} 元</p>
+                  </el-col>
+                  <el-col :span="16" class="other" v-if="act.platform_act_type == '5' || act.platform_act_type == '6'">
+                    <p>{{ act.discount }} 元</p>
+                  </el-col>
+                  <el-col :span="24" class="other" v-if="act.platform_act_type == '2'">
+                    <el-table :data="act.gift" border style="width: 100%">
+                      <el-table-column prop="goods_name" label="商品" width="180"> </el-table-column>
+                      <el-table-column prop="spec_name" label="规格" width="180"> </el-table-column>
+                      <el-table-column prop="num" label="数量"> </el-table-column>
+                      <el-table-column prop="desc" label="备注"> </el-table-column>
+                    </el-table>
+                  </el-col>
+                </el-col>
               </el-col>
             </el-col>
-          </el-col>
-          <el-col :span="24">
-            <el-col :span="6">配送方式</el-col>
-            <el-col :span="18" class="other">快递配送</el-col>
+            <el-col :span="24" class="bode">
+              <el-col :span="6">订单备注</el-col>
+              <el-col :span="18" class="other">{{ item.remarks || '' }}</el-col>
+            </el-col>
           </el-col>
           <el-col :span="24" class="goods_total bode">
             <el-col :span="24" v-for="(item, index) in total_detail" :key="index">
@@ -67,17 +102,17 @@
               </el-col>
             </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">{{ info.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">{{ info.pay_time || '未支付' }}</el-col>
           </el-col>
@@ -190,5 +225,8 @@ export default {
       margin: 4px 0;
     }
   }
+  .bode {
+    border-bottom: 1px solid rgb(238, 237, 237);
+  }
 }
 </style>

src/views/selfShop/order/parts/detail/detail_order.vue

@@ -11,7 +11,7 @@
         <el-col class="top-btn">
           <el-button type="primary" size="mini" @click="toBack()">返回</el-button>
         </el-col>
-        <el-col :span="8" class="one">
+        <el-col :span="12" class="one">
           <el-col :span="24" class="add">
             <el-col :span="2">
               <i class="el-icon-location"></i>
@@ -24,7 +24,7 @@
           <el-col :span="24" v-for="(item, index) in list" :key="index">
             <el-col :span="24" class="shop"> <i class="el-icon-s-shop"></i>{{ item.shop_name }}</el-col>
             <el-col :span="24" v-for="(goods, index) in item.goods" :key="index">
-              <el-col :span="24" class="goods">
+              <el-col :span="24" class="goods bode">
                 <el-col :span="6"><el-image :src="goods.goods.file[0].url"></el-image></el-col>
                 <el-col :span="18">
                   <el-col :span="12">
@@ -33,7 +33,8 @@
                   </el-col>
                   <el-col :span="12" class="money">
                     <el-col :span="24" style="color: red; font-size: 20px">
-                      <p v-if="info.type == '0'">￥{{ goods.sell_money }}</p>
+                      <p v-if="info.type == '0' && goods.price">￥{{ goods.price }}</p>
+                      <p v-else-if="info.type == '0' && !goods.price">￥{{ goods.sell_money }}</p>
                       <p v-else-if="info.type == '1'">￥{{ goods.group_config.money }}</p>
                     </el-col>
                     <p>X{{ goods.buy_num }}</p>
@@ -43,21 +44,55 @@
                   </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="!goods.freight == '0'">{{ goods.freight }}</el-col>
                 <el-col :span="18" class="other" v-else>包邮</el-col>
               </el-col>
-              <el-col :span="24">
-                <el-col :span="6">订单备注</el-col>
-                <el-col :span="18" class="other" v-if="item.remarks">{{ item.remarks }}</el-col>
-                <el-col :span="18" class="other" v-else>暂无备注</el-col>
+              <el-col :span="24" class="bode" v-if="goods.act">
+                <el-col :span="24">平台活动优惠</el-col>
+                <el-col :span="24" v-for="(act, index) in goods.act" :key="index">
+                  <el-col :span="8">
+                    {{
+                      act.platform_act_type == '0'
+                        ? '优惠商品合集'
+                        : act.platform_act_type == '1'
+                        ? '按单返现'
+                        : act.platform_act_type == '2'
+                        ? '买赠'
+                        : act.platform_act_type == '3'
+                        ? '特价'
+                        : act.platform_act_type == '4'
+                        ? ''
+                        : act.platform_act_type == '5'
+                        ? '满减'
+                        : act.platform_act_type == '6'
+                        ? '满减折扣'
+                        : '套装促销'
+                    }}
+                  </el-col>
+                  <el-col :span="16" class="other" v-if="act.platform_act_type == '4'">加价购 </el-col>
+                  <el-col :span="16" class="other" v-if="act.platform_act_type == '3'">
+                    <p>{{ act.sp_price }} 元</p>
+                  </el-col>
+                  <el-col :span="16" class="other" v-if="act.platform_act_type == '5' || act.platform_act_type == '6'">
+                    <p>{{ act.discount }} 元</p>
+                  </el-col>
+                  <el-col :span="24" class="other" v-if="act.platform_act_type == '2'">
+                    <el-table :data="act.gift" border style="width: 100%">
+                      <el-table-column prop="goods_name" label="商品" width="180"> </el-table-column>
+                      <el-table-column prop="spec_name" label="规格" width="180"> </el-table-column>
+                      <el-table-column prop="num" label="数量"> </el-table-column>
+                      <el-table-column prop="desc" label="备注"> </el-table-column>
+                    </el-table>
+                  </el-col>
+                </el-col>
               </el-col>
             </el-col>
-          </el-col>
-          <el-col :span="24">
-            <el-col :span="6">配送方式</el-col>
-            <el-col :span="18" class="other">快递配送</el-col>
+            <el-col :span="24" class="bode">
+              <el-col :span="6">订单备注</el-col>
+              <el-col :span="18" class="other">{{ item.remarks || '' }}</el-col>
+            </el-col>
           </el-col>
           <el-col :span="24" class="goods_total bode">
             <el-col :span="24" v-for="(item, index) in total_detail" :key="index">
@@ -67,17 +102,17 @@
               </el-col>
             </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">{{ info.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">{{ info.pay_time || '未支付' }}</el-col>
           </el-col>
@@ -190,5 +225,8 @@ export default {
       margin: 4px 0;
     }
   }
+  .bode {
+    border-bottom: 1px solid rgb(238, 237, 237);
+  }
 }
 </style>