Merge branch 'feature/shuang' into 'develop-3.18.0'

Feature/shuang

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

src/utils/shop/index.js

@@ -133,8 +133,8 @@ export const getRefundDesc = (params) => {
   return fetch({
     headers,
     url: getBaseUrl(`/store/orders/admin/queryRefundDesc/${params.orderId}/${params.goodsId}`),
-    method: 'post',
-    data: params,
+    method: 'get',
+    params: params,
     description: '退货',
   })
 };

src/views/goods/order-manage.vue

@@ -188,11 +188,21 @@
           </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"
@@ -402,9 +412,10 @@
                 size="small"
                 >配送完成</el-button
               > -->
-              <el-button type="text" size="small" @click="goDetail(scope.row)" v-if="[3,6].includes(scope.row.showStatus)">发货</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)">退款退货</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) &&