Merge branch 'test' into 'release'

Test

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

src/views/goods/order-manage.vue

@@ -109,7 +109,7 @@
           </el-col>
           <el-col :span="6" style="text-align: right">
             <div class="button-container">
-              <el-button type="primary" size="small" @click="searchList"
+              <el-button type="primary" size="small" @click="searchFormOrder"
                 >查询</el-button
               >
               <el-button
@@ -259,13 +259,22 @@
           </template>
         </el-table-column>
 
-        <!-- <el-table-column
-          prop="fanxxxx"
+        <el-table-column
+          prop="commissionAmount"
           label="返现"
           min-width="100"
           align="center"
         >
-        </el-table-column> -->
+         <template slot-scope="scope">
+            <!--<span>￥{{ scope.row.price }}</span>-->
+            <p v-if="scope.row.commissionAmount>0">
+              ￥{{ scope.row.commissionAmount | toFixed2 }}
+            </p>
+            <p v-else>
+              -
+            </p>
+          </template>
+        </el-table-column>
 
         <el-table-column
           prop="saleTypeStr"
@@ -988,6 +997,10 @@ export default {
     this.brokerOwnerListAll();
   },
   methods: {
+    searchFormOrder(){
+      this.searchForm.pageNo=1
+      this.searchList();
+    },
     //  确认导入
     confirmExport() {
       if (this.ExportType == 1) {