修改

src/components/orderParts/card-1.vue

@@ -1,128 +0,0 @@
-<template>
-  <div id="card-1">
-    <el-row>
-      <!-- 平台订单待付款列表 -->
-      <el-col :span="24" class="main">
-        <el-col :span="24" class="one">
-          <search-1 :form="searchForm" @onSubmit="toSearch" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-        </el-col>
-        <data-table ref="dataTable" :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetail" @sales="toSales">
-        </data-table>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-const _ = require('lodash');
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions } = createNamespacedHelpers('order');
-const { mapActions: shop } = createNamespacedHelpers('shop');
-export default {
-  name: 'card-1',
-  props: { statusList: { type: Array } },
-  components: {
-    search1: () => import('@/components/orderParts/search/search-1.vue'),
-  },
-
-  data: function () {
-    return {
-      searchForm: {},
-      list: [],
-      total: 0,
-      opera: [
-        { label: '详情', method: 'detail' },
-        { label: '售后', method: 'sales', type: 'danger' },
-      ],
-      fields: [
-        { label: '订单号', model: 'no', showTip: false },
-        { label: '下单时间', model: 'buy_time' },
-        { label: '顾客', model: 'customer.name' },
-        { label: '收货人', model: 'address', showTip: false, format: (i) => this.getAddress(i) },
-        // { label: '店铺名称', model: 'goods', format: (i) => this.getShopName(i) },
-        { label: '店铺名称', model: 'shop.name' },
-        { label: '需支付金额', model: 'real_pay' },
-        { label: '商品数量', model: 'buy_num_total' },
-      ],
-      shopList: [],
-      // 查询条件
-      searchQuery: {},
-    };
-  },
-  async created() {
-    await this.search();
-  },
-  methods: {
-    ...shop({ shopQuery: 'query' }),
-    ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
-    toSearch() {
-      this.$refs.dataTable.resetPage();
-      let res = this.$refs.dataTable.getPageConfig();
-      this.search(res);
-    },
-    // 查询
-    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
-      let condition = _.cloneDeep(this.searchForm);
-      if (condition.buy_time) {
-        condition[`buy_time@start`] = _.head(condition.buy_time);
-        condition[`buy_time@end`] = _.last(condition.buy_time);
-        delete condition.buy_time;
-      }
-      info.status = '0';
-      let query = { skip, limit, ...info };
-      if (Object.keys(condition).length > 0) query = { ...query, ...condition };
-      let res = await this.query(query);
-      if (this.$checkRes(res)) {
-        this.$set(this, 'list', res.data);
-        this.$set(this, 'total', res.total);
-        this.$set(this, `searchQuery`, query);
-      }
-    },
-    getAddress(i) {
-      let name = i.name + ',' + i.phone;
-      return name;
-    },
-    // 店铺名称
-    getShopName(i) {
-      let shopname = i.map((e) => e.shop_name);
-      return shopname.join(',');
-    },
-    // 详情
-    toDetail({ data }) {
-      this.$emit('toDetail', data._id);
-    },
-    toSales({ data }) {
-      this.$emit('toSales', data._id);
-    },
-    // 重置
-    toClose() {
-      this.searchForm = {};
-      this.search();
-    },
-    // 店铺名称远程查询
-    async querySearch(value) {
-      let res = await this.shopQuery({ name: value });
-      if (this.$checkRes(res)) this.$set(this, 'shopList', res.data);
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.one {
-  margin: 0 0 10px 0;
-}
-</style>

src/components/orderParts/card-2.vue

@@ -1,129 +0,0 @@
-<template>
-  <div id="card-1">
-    <el-row>
-      <!-- 自营订单待付款列表 -->
-      <el-col :span="24" class="main" v-loading="loadings" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
-        <el-col :span="24" class="one">
-          <search-1 :form="searchForm" @onSubmit="toSearch" @querySearch="querySearch" @toReset="toClose" :shopList="shopList"> </search-1>
-        </el-col>
-        <data-table ref="dataTable" :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetail" @sales="toSales">
-        </data-table>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-const _ = require('lodash');
-import { mapState, createNamespacedHelpers } from 'vuex';
-const { mapActions } = createNamespacedHelpers('order');
-const { mapActions: shop } = createNamespacedHelpers('shop');
-export default {
-  name: 'card-1',
-  props: { statusList: { type: Array } },
-  components: { search1: () => import('@/components/orderParts/search/search-2.vue') },
-  data: function () {
-    return {
-      searchForm: {},
-      list: [],
-      total: 0,
-      opera: [
-        { label: '详情', method: 'detail' },
-        { label: '售后', method: 'sales', type: 'danger' },
-      ],
-      fields: [
-        { label: '订单号', model: 'no', showTip: false },
-        { label: '下单时间', model: 'buy_time' },
-        { label: '顾客', model: 'customer.name' },
-        { label: '收货人', model: 'address', showTip: false, format: (i) => this.getAddress(i) },
-        // { label: '店铺名称', model: 'goods', format: (i) => this.getShopName(i) },
-        { label: '店铺名称', model: 'shop.name' },
-        { label: '需支付金额', model: 'real_pay' },
-        { label: '商品数量', model: 'buy_num_total' },
-      ],
-      shopList: [],
-      skip: 0,
-      loadings: true,
-      // 查询条件
-      searchQuery: {},
-    };
-  },
-  async created() {
-    await this.search();
-  },
-  methods: {
-    ...shop({ shopQuery: 'query' }),
-    ...mapActions(['query', 'fetch', 'create', 'update', 'delete']),
-    toSearch() {
-      this.$refs.dataTable.resetPage();
-      let res = this.$refs.dataTable.getPageConfig();
-      this.search(res);
-    },
-    // 查询
-    async search({ skip = 0, limit = this.$limit, ...info } = {}) {
-      let condition = _.cloneDeep(this.searchForm);
-      if (condition.buy_time) {
-        condition[`buy_time@start`] = _.head(condition.buy_time);
-        condition[`buy_time@end`] = _.last(condition.buy_time);
-        delete condition.buy_time;
-      }
-      info.status = '0';
-      info.shop = this.user.shop.id;
-      let query = { skip, limit, ...info };
-      if (Object.keys(condition).length > 0) query = { ...query, ...condition };
-      let res = await this.query(query);
-      if (this.$checkRes(res)) {
-        this.$set(this, 'list', res.data);
-        this.$set(this, 'total', res.total);
-        this.$set(this, `searchQuery`, query);
-      }
-      this.loadings = false;
-    },
-    getAddress(i) {
-      let name = i.name + ',' + i.phone;
-      return name;
-    },
-    // 店铺名称
-    getShopName(i) {
-      let shopname = i.map((e) => e.shop_name);
-      return shopname.join(',');
-    },
-    // 详情
-    toDetail({ data }) {
-      this.$emit('toDetail', data._id);
-    },
-    toSales({ data }) {
-      this.$emit('toSales', data._id);
-    },
-    // 重置
-    toClose() {
-      this.searchForm = {};
-      this.search();
-    },
-    // 店铺名称远程查询
-    async querySearch(value) {
-      let res = await this.shopQuery({ name: value });
-      if (this.$checkRes(res)) this.$set(this, 'shopList', res.data);
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.one {
-  margin: 0 0 10px 0;
-}
-</style>

src/components/orderParts/card-3.vue

@@ -1,69 +0,0 @@
-<template>
-  <div id="card-1">
-    <el-row>
-      <!-- 平台订单待发货列表 -->
-      <el-col :span="24" class="main">
-        <detail-1 v-if="num == '1'" @toDeliver="toDeliver" :statusList="statusList" @toDetails="toDetails" @toSaless="toSaless"></detail-1>
-        <detail-2 v-else-if="num == '2'" :deliverList="list" @toBack="toBack"></detail-2>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-const _ = require('lodash');
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'card-1',
-  props: { statusList: { type: Array } },
-  components: {
-    detail1: () => import('@/components/orderParts/parts/detail-1.vue'),
-    detail2: () => import('@/components/orderParts/parts/detail-2.vue'),
-  },
-  data: function () {
-    return {
-      num: '1',
-      list: [],
-    };
-  },
-  async created() {},
-  methods: {
-    // 生成发货清单
-    toDeliver({ data }) {
-      if (data.length == '0') this.$message('请选择订单');
-      else {
-        this.$set(this, 'list', data);
-        this.$set(this, 'num', '2');
-      }
-    },
-    toBack() {
-      this.$set(this, 'num', '1');
-    },
-    toDetails(val) {
-      this.$emit('toDetails', val);
-    },
-    toSaless(val) {
-      this.$emit('toSaless', { id: val.id, status: val.status });
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.one {
-  margin: 0 0 10px 0;
-}
-</style>

src/components/orderParts/card-4.vue

@@ -1,69 +0,0 @@
-<template>
-  <div id="card-1">
-    <el-row>
-      <!-- 团购订单待发货 -->
-      <el-col :span="24" class="main">
-        <detail-1 v-if="num == '1'" @toDeliver="toDeliver" :statusList="statusList" @toDetails="toDetails" @toSaless="toSaless"></detail-1>
-        <detail-2 v-else-if="num == '2'" :deliverList="list" @toBack="toBack"></detail-2>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-const _ = require('lodash');
-import { mapState, createNamespacedHelpers } from 'vuex';
-export default {
-  name: 'card-1',
-  props: { statusList: { type: Array } },
-  components: {
-    detail1: () => import('./parts/detail-3.vue'),
-    detail2: () => import('./parts/detail-4.vue'),
-  },
-  data: function () {
-    return {
-      num: '1',
-      list: [],
-    };
-  },
-  async created() {},
-  methods: {
-    // 生成发货清单
-    toDeliver({ data }) {
-      if (data.length == '0') this.$message('请选择订单');
-      else {
-        this.$set(this, 'list', data);
-        this.$set(this, 'num', '2');
-      }
-    },
-    toBack() {
-      this.$set(this, 'num', '1');
-    },
-    toDetails(val) {
-      this.$emit('toDetails', val);
-    },
-    toSaless(val) {
-      this.$emit('toSaless', val);
-    },
-  },
-  computed: {
-    ...mapState(['user']),
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
-  },
-  watch: {
-    test: {
-      deep: true,
-      immediate: true,
-      handler(val) {},
-    },
-  },
-};
-</script>
-
-<style lang="less" scoped>
-.one {
-  margin: 0 0 10px 0;
-}
-</style>

src/components/orderParts/card/card-2.vue

@@ -37,7 +37,7 @@ export default {
         { label: '顾客', model: 'customer.name' },
         { label: '收货人', model: 'address', showTip: false, format: (i) => this.getAddress(i) },
         // { label: '店铺名称', model: 'goods', format: (i) => this.getShopName(i) },
-        { label: '店铺名称', model: 'shop.name' },
+        // { label: '店铺名称', model: 'shop.name' },
         { label: '需支付金额', model: 'real_pay' },
         { label: '商品数量', model: 'buy_num_total' },
       ],

src/components/orderParts/card/card-3.vue

@@ -17,8 +17,8 @@ export default {
   name: 'card-1',
   props: { statusList: { type: Array } },
   components: {
-    detail1: () => import('./parts/detail-1.vue'),
-    detail2: () => import('./parts/detail-2.vue'),
+    detail1: () => import('@/components/orderParts/card/parts/detail-1.vue'),
+    detail2: () => import('@/components/orderParts/card/parts/detail-2.vue'),
   },
   data: function () {
     return {

src/components/orderParts/card/card-4.vue

@@ -17,8 +17,8 @@ export default {
   name: 'card-1',
   props: { statusList: { type: Array } },
   components: {
-    detail1: () => import('./parts/detail-3.vue'),
-    detail2: () => import('./parts/detail-4.vue'),
+    detail1: () => import('@/components/orderParts/card/parts/detail-3.vue'),
+    detail2: () => import('@/components/orderParts/card/parts/detail-4.vue'),
   },
   data: function () {
     return {

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

@@ -9,8 +9,8 @@
           </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"></goods-1>
-            <goodsSet-1 v-else-if="item.is_set == '0'" :list="list"></goodsSet-1>
+            <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>
         </el-col>

src/components/orderParts/detail/group_order.vue

@@ -43,8 +43,8 @@ export default {
   name: 'form-1',
   props: { id: { type: String } },
   components: {
-    card1: () => import('./parts/card-3.vue'),
-    card2: () => import('./parts/card-4.vue'),
+    card1: () => import('@/components/orderParts/detail/parts/card-3.vue'),
+    card2: () => import('@/components/orderParts/detail/parts/card-4.vue'),
   },
   data: function () {
     return {

src/components/orderParts/detail/order.vue

@@ -15,8 +15,8 @@
         <el-col :span="11" class="one">
           <add-1 :address="address"></add-1>
           <el-col :span="24" v-for="item in list" :key="item._id || item.set_id">
-            <goods-1 v-if="!item.set_id" :list="list" :info="info"></goods-1>
-            <goodsSet-1 v-else-if="item.is_set == '0'" :list="list"></goodsSet-1>
+            <goods-1 v-if="!item.set_id" :list="list" :info="info" @toUrl="toUrl"></goods-1>
+            <goodsSet-1 v-else-if="item.is_set == '0'" :list="list" @toUrl="toUrl"></goodsSet-1>
           </el-col>
           <el-col :span="24">
             <pay-1 :info="info" :total_detail="total_detail" :pay="pay"></pay-1>

src/components/orderParts/detail/orderDetaile.vue

@@ -14,7 +14,7 @@
       >
         <el-tabs type="border-card">
           <el-tab-pane label="订单详情">
-            <card-1 :address="address" :list="list" :pay="pay" :form="form" :total_detail="total_detail" :shop="shop"></card-1>
+            <card-1 :address="address" :list="list" :pay="pay" :form="form" :total_detail="total_detail" :shop="shop" :transport="transport"></card-1>
           </el-tab-pane>
           <el-tab-pane label="发货信息">
             <card-2
@@ -47,8 +47,8 @@ export default {
   name: 'form-1',
   props: { id: { type: String } },
   components: {
-    card1: () => import('@/components/orderParts/deliver/card-1.vue'),
-    card2: () => import('@/components/orderParts/deliver/card-2.vue'),
+    card1: () => import('@/components/orderParts/detail/deliver/card-1.vue'),
+    card2: () => import('@/components/orderParts/detail/deliver/card-2.vue'),
   },
   data: function () {
     return {

src/components/orderParts/detail/salseOrder.vue

@@ -19,8 +19,12 @@
               <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="6" v-if="goods.file && goods.file.length != 0"><el-image class="image" :src="goods.file[0].url"></el-image></el-col>
-                  <el-col :span="6" v-else><el-image class="image" :src="goods.goods.file[0].url"></el-image></el-col>
+                  <el-col :span="6" v-if="goods.file && goods.file.length != 0">
+                    <el-image class="image" :src="goods.file[0].url" style="width: 120px; height: 100px"></el-image>
+                  </el-col>
+                  <el-col :span="6" v-else>
+                    <el-image class="image" :src="goods.goods.file[0].url" style="width: 120px; height: 100px"></el-image>
+                  </el-col>
                   <el-col :span="18">
                     <el-col :span="12">
                       <p>{{ goods.goods.name }}</p>
@@ -91,8 +95,12 @@
             <el-col :span="24" class="goods bode" v-else-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="6" class="image" v-if="i.spec.file && i.spec.file.length != 0"><el-image :src="i.spec.file[0].url"></el-image></el-col>
-                <el-col :span="6" class="image" v-else-if="i.goods.file && i.goods.file.length != 0"><el-image :src="i.goods.file[0].url"></el-image></el-col>
+                <el-col :span="6" class="image" v-if="i.spec.file && i.spec.file.length != 0">
+                  <el-image :src="i.spec.file[0].url" style="width: 120px; height: 100px"></el-image>
+                </el-col>
+                <el-col :span="6" class="image" v-else-if="i.goods.file && i.goods.file.length != 0">
+                  <el-image :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>
@@ -107,8 +115,12 @@
                   </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" style="text-align: right; font-size: 18px"> X{{ item.buy_num }} </el-col>
+              <el-col :span="24" style="text-align: right; font-size: 20px"> X{{ item.buy_num }} </el-col>
+              <el-col :span="24" style="text-align: right; font-size: 20px; color: red"> ￥{{ item.sell_money }} </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>
           <pay-1 :info="info" :total_detail="total_detail" :pay="pay"></pay-1>

src/components/orderParts/detail/salseOrderDetail.vue

@@ -17,11 +17,13 @@
           <el-col :span="24" class="shop"> <i class="el-icon-s-shop"></i>{{ shop.name }}</el-col>
           <el-col :span="24" v-for="item in list" :key="item._id || item.set_id">
             <el-col :span="24" class="goods bode" v-if="!item.is_set">
-              <el-col :span="6" v-if="item.file && item.file.length != 0"><el-image class="image" :src="item.file[0].url"></el-image></el-col>
+              <el-col :span="6" v-if="item.file && item.file.length != 0">
+                <el-image class="image" :src="item.file[0].url" style="width: 120px; height: 100px"></el-image>
+              </el-col>
               <el-col :span="6" v-else-if="item.goods && item.goods.file && item.goods.file.length != 0">
-                <el-image class="image" :src="item.goods.file[0].url"></el-image>
+                <el-image class="image" :src="item.goods.file[0].url" style="width: 120px; height: 100px"></el-image>
               </el-col>
-              <el-col :span="6" v-else><el-image class="image" :src="item.url"></el-image></el-col>
+              <el-col :span="6" v-else><el-image class="image" :src="item.url" style="width: 120px; height: 100px"></el-image></el-col>
               <el-col :span="18">
                 <el-col :span="12">
                   <el-col
@@ -53,6 +55,10 @@
                 <p>{{ item.is_afterSale == true ? '已申请售后' : '未申请售后' }}</p>
                 <p>{{ item.is_rate == true ? '已评价' : '未评价' }}</p>
               </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">
                 <el-col :span="6">运费</el-col>
                 <el-col :span="18" class="other" v-if="!item.goods.freight == '0'">{{ item.goods.freight }}</el-col>
@@ -63,8 +69,12 @@
             <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="6" class="image" v-if="i.spec.file && i.spec.file.length != 0"><el-image :src="i.spec.file[0].url"></el-image></el-col>
-                <el-col :span="6" class="image" v-else-if="i.goods.file && i.goods.file.length != 0"><el-image :src="i.goods.file[0].url"></el-image></el-col>
+                <el-col :span="6" class="image" v-if="i.spec.file && i.spec.file.length != 0">
+                  <el-image :src="i.spec.file[0].url" style="width: 120px; height: 100px"></el-image>
+                </el-col>
+                <el-col :span="6" class="image" v-else-if="i.goods.file && i.goods.file.length != 0">
+                  <el-image :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>
@@ -87,11 +97,16 @@
                   </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">
                 <el-col :span="6">运费</el-col>
                 <el-col :span="18" class="other" v-if="!item.freight == '0'">{{ item.freight }}</el-col>
                 <el-col :span="18" class="other" v-else>包邮</el-col>
               </el-col>
+
               <el-col :span="24" class="money">
                 <el-col :span="24" style="color: red; font-size: 20px">
                   <p>￥{{ item.sell_money }}</p>

src/components/orderParts/parts/goodsSet-1.vue

@@ -26,6 +26,10 @@
           </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>
     <!-- </el-col>
@@ -45,7 +49,11 @@ export default {
     return {};
   },
   created() {},
-  methods: {},
+  methods: {
+    toUrl(url) {
+      this.$emit('toUrl', url);
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

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

@@ -34,6 +34,10 @@
                   </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="!goods.freight == '0'">{{ goods.freight }}</el-col>
@@ -103,7 +107,11 @@ export default {
     return {};
   },
   created() {},
-  methods: {},
+  methods: {
+    toUrl(url) {
+      this.$emit('toUrl', url);
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

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

@@ -28,6 +28,10 @@
             <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>
@@ -53,7 +57,11 @@ export default {
     return {};
   },
   created() {},
-  methods: {},
+  methods: {
+    toUrl(url) {
+      this.$emit('toUrl', url);
+    },
+  },
   computed: {
     ...mapState(['user']),
   },

src/components/orderParts/parts/orderDetail/pay-1.vue

@@ -10,10 +10,6 @@
           <el-col :span="6">支付时间</el-col>
           <el-col :span="18" class="other">{{ form.pay_time }}</el-col>
         </el-col>
-        <el-col :span="24" class="bode">
-          <el-col :span="6">订单备注</el-col>
-          <el-col :span="18" class="other">{{ form.remarks || '' }}</el-col>
-        </el-col>
         <el-col :span="24" class="bode">
           <el-col :span="6">配送方式</el-col>
           <el-col :span="18" class="other">{{ form.transport_type_name || '' }}</el-col>
@@ -32,14 +28,6 @@
             <p>￥{{ pay.pay_money }} 元</p>
           </el-col>
         </el-col>
-        <el-col :span="24" class="bode" v-if="form.status == '3'">
-          <el-col :span="6">寄出运单号</el-col>
-          <el-col :span="18" class="other">{{ transport.shop_transport_no || '暂无单号' }}</el-col>
-        </el-col>
-        <el-col :span="24" class="bode" v-if="form.status == '3'">
-          <el-col :span="6">寄出快递公司</el-col>
-          <el-col :span="18" class="other">{{ transport.shop_transport_name || '暂无快递信息' }}</el-col>
-        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -53,6 +41,7 @@ export default {
     form: { type: Object },
     total_detail: { type: Array },
     pay: { type: Object },
+    transport: { type: Object },
   },
   components: {},
   data: function () {

src/views/platGroup/order/index.vue

@@ -63,7 +63,7 @@ export default {
   name: 'index',
   props: {},
   components: {
-    card2: () => import('@/components/orderParts/card-4.vue'),
+    card2: () => import('@/components/orderParts/card/card-4.vue'),
     group_order: () => import('@/components/orderParts/detail/group_order.vue'),
     group_sales: () => import('@/components/orderParts/detail/group_sales.vue'),
     search1: () => import('@/components/orderParts/search/search-3.vue'),

src/views/selfShop/order/index.vue

@@ -60,8 +60,8 @@ export default {
   name: 'index',
   props: {},
   components: {
-    card1: () => import('@/components/orderParts/card-2.vue'),
-    card2: () => import('@/components/orderParts/card-3.vue'),
+    card1: () => import('@/components/orderParts/card/card-2.vue'),
+    card2: () => import('@/components/orderParts/card/card-3.vue'),
     // 未付款---详情
     order: () => import('@/components/orderParts/detail/order.vue'),
     // 待发货，待收货，已收货---详情