Merge branch 'develop' into 'test'

Develop

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

src/views/goods/order-manage.vue

@@ -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"