bug修复

src/views/goods/order-detail.vue

@@ -76,7 +76,7 @@
           </el-table-column>
           <el-table-column prop="refundDesc" label="退款说明" min-width="100" align="center">
             <template slot-scope="scope">
-              <el-button v-if="[6, 7, 8].includes(scope.row.status)" type="text" @click="showRefundDetail(scope.row.goodsId,scope.row.id)">查看</el-button>
+              <el-button v-if="[6, 7, 8].includes(scope.row.goodsShowStatus)" type="text" @click="showRefundDetail(scope.row.goodsId,scope.row.id)">查看</el-button>
               <span v-else> -- </span>
             </template>
           </el-table-column>
@@ -132,7 +132,7 @@
                           >
                             <div>物流公司：{{ item.expressCompany }}</div>
                             <div>快递单号：{{item.expressNo }}
-                              <el-button type="text" @click="copyTxt">复制</el-button>
+                              <el-button type="text" @click="copyTxt">复制单号</el-button>
                               <input type="text" id="copyInput" class="hidden-input" />
                             </div>
                             <div>备注：{{ item.remark }}</div>
@@ -409,7 +409,12 @@
             this.showStatusStr = res.data.showStatusStr;
             this.expressType = res.data.expressType; // 小店 1.普通快递，2云鹊快递            
             this.tableData = goodsInfoDtoList;  
-            let expressNo = goodsInfoDtoList[0].expressNo;       
+            let expressNo = '';
+            goodsInfoDtoList.map(item => {
+            if (item.belongPackage == '包裹1') {
+              expressNo = item.expressNo
+            }
+            })     
             let receiverMobile = this.orderDetailData.receiverMobile;
             this.expressList = expressList; // 包裹信息
             this.viewLogistics(expressNo, receiverMobile);

src/views/goods/order-manage.vue

@@ -123,7 +123,7 @@
                 >导出订单</el-button
               >
             </div>
-            <div class="button-container">
+            <!-- <div class="button-container">
               <el-button
                 type="primary"
                 size="small"
@@ -136,7 +136,7 @@
                 @click="ShowExportDialog(2)"
                 >批量取消订单</el-button
               >
-            </div>
+            </div> -->
           </el-col>
         </el-row>
       </el-form>
@@ -214,6 +214,16 @@
             <span>￥{{ scope.row.amount | toFixed2 }}</span>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="expressFee"
+          label="运费"
+          min-width="100"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <span>￥{{ scope.row.expressFee | toFixed2 }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="prescriberName"
           label="创建人"
@@ -285,7 +295,7 @@
         >
           <template slot-scope="scope">
             <p
-              v-for="(item, index) in scope.row.goodsTotalPrice"
+              v-for="(item, index) in scope.row.goodsTotalPriceList"
               :key="index"
               class="p-normal"
             >
@@ -301,7 +311,7 @@
         >
           <template slot-scope="scope">
             <p
-              v-for="(item, index) in scope.row.goodsRealPay"
+              v-for="(item, index) in scope.row.goodsRealPayList"
               :key="index"
               class="p-normal"
             >
@@ -412,10 +422,7 @@
                 size="small"
                 >配送完成</el-button
               > -->
-              <el-button type="text" size="small" @click="goDetail(scope.row)" v-if="[2].includes(scope.row.showStatus) && scope.row.storeType == 2">配送完成</el-button>
-              <el-button type="text" size="small" @click="goDetail(scope.row)" v-if="[3,6].includes(scope.row.showStatus)">{{scope.row.storeType == 2 ? '配送' : '发货'}}</el-button>
               <el-button type="text" size="small" @click="goDetail(scope.row)">查看详情</el-button>
-              <el-button type="text" size="small" @click="goDetail(scope.row)" v-if="[3,6].includes(scope.row.showStatus) && scope.row.storeType != 3">退款退货</el-button>
               <!-- <el-button
                 v-if="
                   (scope.row.storeType == 1 || scope.row.storeType == 2) &&