修改订单详情显示两个组件

src/components/orderParts/detail/deliver/card-1.vue

@@ -9,9 +9,108 @@
           </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">
-            <goods-1 v-if="!item.set_id" :list="list" :form="form" @toUrl="toUrl"></goods-1>
-            <goodsSet-1 v-else-if="item.is_set == '0'" :list="list" @toUrl="toUrl"></goodsSet-1>
-            <act-1 v-if="item.act" :list="list"></act-1>
+            <el-col :span="24" class="goods" v-if="!item.is_set">
+              <el-col :span="6" class="image">
+                <el-image v-if="item.file && item.file.length != 0" :src="item.file[0].url" style="width: 120px; height: 100px"></el-image>
+                <el-image v-else-if="item.goods.file && item.goods.file" :src="item.goods.file[0].url" style="width: 120px; height: 100px"></el-image>
+                <el-image v-else-if="item.url" :src="item.url" style="width: 120px; height: 100px"> </el-image>
+              </el-col>
+              <el-col :span="18">
+                <el-col :span="12">
+                  <el-col :span="24"> {{ item.goods.name }} </el-col>
+                  <el-col :span="24"> 规格：{{ item.name }} </el-col>
+                </el-col>
+                <el-col :span="12" class="money">
+                  <el-col :span="24" style="color: red; font-size: 20px">
+                    <p v-if="form.type == '0' && item.price">￥{{ item.price }}</p>
+                    <p v-else-if="form.type == '0' && !item.price">￥{{ item.sell_money }}</p>
+                    <p v-else-if="form.type == '1'">￥{{ item.group_config.money }}</p>
+                  </el-col>
+                  <el-col :span="24"> X{{ item.buy_num }} </el-col>
+                  <el-col :span="24">
+                    <span class="spanfour" style="color: blue; cursor: pointer" @click="toUrl(item.goods.url)"> 查看商品来源:{{ item.goods.source }}</span>
+                  </el-col>
+                  <el-col :span="24"> {{ item.is_afterSale == true ? '已申请售后' : '未申请售后' }} </el-col>
+                  <el-col :span="24">{{ item.is_rate == true ? '已评价' : '未评价' }}</el-col>
+                </el-col>
+              </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 :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" class="goods bode" v-if="item.is_set == '0'">
+              <el-col :span="24" style="text-align: center; font-size: 18px">{{ item.name || '套装名称' }}</el-col>
+              <el-col :span="24" v-for="i in item.goods" :key="i.spec._id">
+                <el-col :span="24" class="bode">
+                  <el-col :span="6" class="image">
+                    <el-image v-if="i.spec.file && i.spec.file.length != 0" :src="i.spec.file[0].url" style="width: 120px; height: 100px"></el-image>
+                    <el-image v-else-if="i.goods.file && i.goods.file.length != 0" :src="i.goods.file[0].url" style="width: 120px; height: 100px"></el-image>
+                  </el-col>
+                  <el-col :span="18">
+                    <el-col :span="12">
+                      <el-col :span="24"> {{ i.goods_name }} </el-col>
+                      <el-col :span="24"> 规格：{{ i.spec_name }} </el-col>
+                    </el-col>
+                    <el-col :span="12" class="money">
+                      <el-col :span="24"> X{{ i.set_num }} </el-col>
+                      <el-col :span="24">
+                        <span class="spanfour" style="color: blue; cursor: pointer" @click="toUrl(i.goods.url)"> 查看商品来源:{{ i.goods.source }}</span>
+                      </el-col>
+                    </el-col>
+                  </el-col>
+                </el-col>
+              </el-col>
+              <el-col :span="24" style="text-align: right; font-size: 18px"> X{{ item.buy_num }} </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="bode" v-if="item.act">
+              <el-col :span="24">平台活动优惠</el-col>
+              <el-col :span="24" v-for="(item, index) in item.act" :key="index">
+                <el-col :span="8">
+                  {{
+                    item.platform_act_type == '0'
+                      ? '优惠商品合集'
+                      : item.platform_act_type == '1'
+                      ? '按单返现'
+                      : item.platform_act_type == '2'
+                      ? '买赠'
+                      : item.platform_act_type == '3'
+                      ? '特价'
+                      : item.platform_act_type == '4'
+                      ? ''
+                      : item.platform_act_type == '5'
+                      ? '满减'
+                      : item.platform_act_type == '6'
+                      ? '满减折扣'
+                      : '套装促销'
+                  }}
+                </el-col>
+                <el-col :span="16" class="other" v-if="item.platform_act_type == '4'">加价购 </el-col>
+                <el-col :span="16" class="other" v-if="item.platform_act_type == '3'">
+                  <p>{{ item.sp_price }} 元</p>
+                </el-col>
+                <el-col :span="16" class="other" v-if="item.platform_act_type == '5' || item.platform_act_type == '6'">
+                  <p>-{{ item.discount }} 元</p>
+                </el-col>
+                <el-col :span="24" class="other" v-if="item.platform_act_type == '2'">
+                  <el-table :data="item.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="12" class="main_one">
@@ -37,9 +136,6 @@ export default {
   components: {
     add1: () => import('@/components/orderParts/parts/add-1.vue'),
     pay1: () => import('@/components/orderParts/parts/orderDetail/pay-1.vue'),
-    goods1: () => import('@/components/orderParts/parts/orderDetail/goods-1.vue'),
-    goodsSet1: () => import('@/components/orderParts/parts/goodsSet-1.vue'),
-    act1: () => import('@/components/orderParts/parts/act-1.vue'),
   },
   data: function () {
     return {};
@@ -81,4 +177,35 @@ export default {
     border-bottom: 1px solid #ccc;
   }
 }
+.shop {
+  padding: 4px 0;
+  font-size: 18px;
+  border-bottom: 1px solid #ccc;
+}
+.goods {
+  padding: 10px 0;
+  .image {
+    padding: 0 10px 0 0;
+  }
+  .money {
+    text-align: right;
+  }
+}
+.other {
+  text-align: right;
+  word-break: break-all;
+  p {
+    color: red;
+    font-size: 20px;
+  }
+  .spanfour {
+    color: blue;
+  }
+}
+.el-col {
+  margin: 4px 0;
+}
+.bode {
+  border-bottom: 1px solid rgb(238, 237, 237);
+}
 </style>

src/components/orderParts/parts/order/goods-1.vue

@@ -83,10 +83,10 @@
                 </el-col>
               </el-col>
             </el-col>
-            <el-col :span="24" class="bode">
+            <!-- <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>
         </el-col>
       </el-col>