Merge branch 'develop-3.18.0' into 'release'

Develop 3.18.0

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!330

src/utils/shop/index.js

@@ -128,3 +128,12 @@ export const brokerOwnerListAll = (params) => {
     description: '云鹊店铺-订单管理-招募人列表',
   })
 };
+// 获取退款说明
+export const getRefundDesc = (aid) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`/store/orders/admin/queryRefundDesc/${aid}`),
+    method: 'get',
+    description: '退款说明',
+  })
+};

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,18 +136,27 @@
                 @click="ShowExportDialog(2)"
                 >批量取消订单</el-button
               >
-            </div>
+            </div> -->
           </el-col>
         </el-row>
       </el-form>
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="全部" name="all"></el-tab-pane>
         <el-tab-pane label="等待买家付款" name="first"></el-tab-pane>
         <el-tab-pane label="等待发货" name="second"></el-tab-pane>
         <el-tab-pane label="已发货" name="third"></el-tab-pane>
         <el-tab-pane label="交易成功" name="fourth"></el-tab-pane>
         <el-tab-pane label="退款/关闭" name="five"></el-tab-pane>
-      </el-tabs>
+      </el-tabs> -->
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="全部" name="all"></el-tab-pane>
+        <el-tab-pane label="待支付" name="first"></el-tab-pane>
+        <el-tab-pane label="待发货" name="second"></el-tab-pane>
+        <el-tab-pane label="已发货" name="third"></el-tab-pane>
+        <el-tab-pane label="已完成" name="fourth"></el-tab-pane>
+        <el-tab-pane label="已取消" name="six"></el-tab-pane>
+        <el-tab-pane label="退款/关闭" name="five"></el-tab-pane>
+    </el-tabs>
       <el-table
         :data="tableData"
         border
@@ -179,15 +188,25 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="showStatusStr"
+          prop="goodsShowStatusStrList"
           label="交易状态"
           min-width="100"
           align="center"
         >
+        <template slot-scope="scope">
+            <!--<span>{{ scope.row.goodsName }}</span>-->
+            <p
+              v-for="(item, index) in scope.row.goodsShowStatusStrList"
+              :key="index"
+              class="p-normal"
+            >
+              {{ item }}
+            </p>
+          </template>
         </el-table-column>
         <el-table-column
           prop="amount"
-          label="实收款"
+          label="订单实付"
           min-width="100"
           align="center"
         >
@@ -195,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="创建人"
@@ -258,6 +287,38 @@
             </p>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="goodsTotalPrice"
+          label="商品总额"
+          min-width="100"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <p
+              v-for="(item, index) in scope.row.goodsTotalPriceList"
+              :key="index"
+              class="p-normal"
+            >
+              ￥{{ item | toFixed2 }}
+            </p>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="goodsRealPay"
+          label="商品实付"
+          min-width="100"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <p
+              v-for="(item, index) in scope.row.goodsRealPayList"
+              :key="index"
+              class="p-normal"
+            >
+              ￥{{ item | toFixed2 }}
+            </p>
+          </template>
+        </el-table-column>
 
         <el-table-column
           prop="commissionAmount"
@@ -265,13 +326,13 @@
           min-width="100"
           align="center"
         >
-         <template slot-scope="scope">
-            <!--<span>￥{{ scope.row.price }}</span>-->
-            <p v-if="scope.row.commissionAmount>0">
-              ￥{{ scope.row.commissionAmount | toFixed2 }}
-            </p>
-            <p v-else>
-              -
+        <template slot-scope="scope">
+            <p
+              v-for="(item, index) in scope.row.goodsCommissionAmountList"
+              :key="index"
+              class="p-normal"
+            >
+              ￥{{ item | toFixed2 }}
             </p>
           </template>
         </el-table-column>
@@ -322,7 +383,7 @@
               <!--<el-button @click="closeTrade(scope.row)" type="text" size="small">关闭交易</el-button>-->
               <!--<el-button @click="changePrice(scope.row)" type="text" size="small">修改价格</el-button>-->
               <!--              <el-button @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>-->
-              <el-button
+              <!-- <el-button
                 v-if="
                   scope.row.storeType == 1 &&
                   scope.row.showStatus == 3 &&
@@ -360,11 +421,9 @@
                 type="text"
                 size="small"
                 >配送完成</el-button
-              >
-              <el-button @click="goDetail(scope.row)" type="text" size="small"
-                >查看详情</el-button
-              >
-              <el-button
+              > -->
+              <el-button type="text" size="small" @click="goDetail(scope.row)">查看详情</el-button>
+              <!-- <el-button
                 v-if="
                   (scope.row.storeType == 1 || scope.row.storeType == 2) &&
                   scope.row.showStatus == 3 &&
@@ -374,7 +433,7 @@
                 type="text"
                 size="small"
                 >退款退货</el-button
-              >
+              > -->
               <!-- <el-button type="text" size="small">查看物流</el-button> -->
             </div>
           </template>
@@ -1278,6 +1337,9 @@ export default {
       } else if (this.activeName == "five") {
         //交易关闭
         this.searchForm.showStatus = 5;
+      } else if (this.activeName == "six") {
+        //交易关闭
+        this.searchForm.showStatus = 6;
       }
       this.searchForm.pageNo = 1;
       this.searchList();