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

Feature/shuang

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

src/views/goods/order-detail.vue

@@ -516,8 +516,10 @@
               if (res.data.data && res.data.data.length) {
                 this.expressData = res.data.data;
               } else {
-                this.expressData[0].time = res.data.updateTime || "";
-                this.expressData = this.expressData;
+                this.expressData = [{
+                  time: res.data.updateTime || '',
+                  context: "待揽收1"
+                }];
               }
             }
           });

src/views/goods/order-manage.vue

@@ -326,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>