修改

src/components/orderParts/card-1.vue

@@ -6,7 +6,7 @@
         <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 ref="dataTable" :fields="fields" :opera="opera" @query="search" :data="list" :total="total" @detail="toDetail" @sales="toSales">
         </data-table>
       </el-col>
     </el-row>
@@ -36,7 +36,8 @@ export default {
         { 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: 'goods', format: (i) => this.getShopName(i) },
+        { label: '店铺名称', model: 'shop.name' },
         { label: '需支付金额', model: 'real_pay' },
         { label: '商品数量', model: 'buy_num_total' },
       ],

src/components/orderParts/card-2.vue

@@ -36,7 +36,8 @@ export default {
         { 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: 'goods', format: (i) => this.getShopName(i) },
+        { label: '店铺名称', model: 'shop.name' },
         { label: '需支付金额', model: 'real_pay' },
         { label: '商品数量', model: 'buy_num_total' },
       ],

src/components/orderParts/detail/detail_sales_orderDetail.vue

@@ -65,6 +65,11 @@
                 <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" 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>
@@ -93,12 +98,17 @@
                   </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>
-            <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 :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>
+                </el-col>
+                <el-col :span="24"> X{{ item.buy_num }} </el-col>
+              </el-col>
             </el-col>
           </el-col>
           <el-col :span="24" class="bode">

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

@@ -50,6 +50,11 @@
           </el-col>
           <el-col :span="24" class="form" v-if="form.status == '1' || form.status == '2' || form.status == '2-'">
             <el-form :model="form" ref="form" :rules="rules" label-width="100px" class="demo-ruleForm">
+              <el-form-item label="快递类型" prop="transport_type">
+                <el-select v-model="form.transport_type" clearable filterable placeholder="请选择快递类型" size="small" style="width: 100%">
+                  <el-option v-for="i in transport_typeList" :key="i.label" :label="i.label" :value="i.value"> </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="寄出运单号" prop="shop_transport_no" v-if="form.transport_type == '0'">
                 <el-input v-model="form.shop_transport_no" placeholder="请输入运单号,快递公司,同时填入" size="small"></el-input>
               </el-form-item>
@@ -69,11 +74,7 @@
                   <el-option v-for="item in shop_transport_typeList" :key="item.id" :label="item.label" :value="item.value"> </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="快递类型" prop="transport_type">
-                <el-select v-model="form.transport_type" clearable filterable placeholder="请选择快递类型" size="small" style="width: 100%">
-                  <el-option v-for="i in transport_typeList" :key="i.label" :label="i.label" :value="i.value"> </el-option>
-                </el-select>
-              </el-form-item>
+
               <el-form-item>
                 <el-col>
                   <el-button type="primary" @click="onSubmit('form', '2')" v-if="(form.status == '1' || form.status == '2-') && status == '0'">

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

@@ -60,7 +60,7 @@ export default {
         { label: '下单时间', model: 'buy_time' },
         { label: '顾客', model: 'customer.name' },
         { label: '收货人', model: 'address', showTip: false, format: (i) => this.getAddress(i) },
-        // { label: '店铺名称', model: 'shop.name' },
+        { label: '店铺名称', model: 'shop.name' },
         { label: '支付金额', model: 'real_pay' },
         { label: '商品数量', model: 'buy_num_total' },
         { label: '是否售后', model: 'is_afterSale', format: (i) => (i === true ? '该订单有商品申请售后' : '未申请售后'), custom: true },

src/views/zr/zrOrder/detail_orderDetail.vue

@@ -65,6 +65,11 @@
           </el-col>
           <el-col :span="24" class="form">
             <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
+              <el-form-item label="快递类型" prop="transport_type">
+                <el-select v-model="form.transport_type" clearable filterable placeholder="请选择快递类型" size="small" style="width: 100%">
+                  <el-option v-for="i in transport_typeList" :key="i.label" :label="i.label" :value="i.value"> </el-option>
+                </el-select>
+              </el-form-item>
               <el-form-item label="寄出运单号" prop="shop_transport_no">
                 <el-input v-model="form.shop_transport_no" placeholder="请输入运单号,快递公司,同时填入" size="small"></el-input>
               </el-form-item>
@@ -84,11 +89,7 @@
                   <el-option v-for="item in shop_transport_typeList" :key="item.id" :label="item.label" :value="item.value"> </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="快递类型" prop="transport_type">
-                <el-select v-model="form.transport_type" clearable filterable placeholder="请选择快递类型" size="small" style="width: 100%">
-                  <el-option v-for="i in transport_typeList" :key="i.label" :label="i.label" :value="i.value"> </el-option>
-                </el-select>
-              </el-form-item>
+
               <el-form-item>
                 <el-button type="primary" @click="onSubmit('2')" v-if="form.status == '1'"> 发货 </el-button>
                 <el-button type="primary" @click="onSubmit('3')" v-if="form.status == '2'"> 确认收货 </el-button>