Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/customer/creditRule/index.vue

@@ -61,7 +61,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
@@ -120,8 +120,8 @@ export default {
       dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         name: null,
         type: null,
       },

src/views/ecw/order/batchSingleApplication.vue

@@ -236,7 +236,7 @@ export default {
       orderWarehouseInAdjustApply(this.params).then(r => {
         if (r.code === 0) {
           this.$emit('update:dialogVisible', false)
-          this.$message.success('调仓成功');
+          this.$message.success('调仓申请提交成功，请耐心等待审核');
         }
       })
     },