Merge remote-tracking branch 'origin/master'

src/api/system/user.js

@@ -14,7 +14,7 @@ export function listUser(query) {
 // 用户余额
 export function userRecharge(data) {
   return request({
-    url: '/user/alipay/recharge',
+    url: '/money/alipay/recharge',
     method: 'post',
     params: data
   })
@@ -23,7 +23,7 @@ export function userRecharge(data) {
 // 查询用户余额
 export function userBalance(userId) {
   return request({
-    url: '/user/balance/' + userId,
+    url: '/money/balance/' + userId,
     method: 'get',
   })
 }

src/views/engine/engine/index.vue

@@ -14,7 +14,7 @@
       <el-form-item label="规则状态">
         <el-input v-model="engine.status"></el-input>
       </el-form-item>
-      <el-button @click="findSelectSourceList()">
+      <el-button @click="select()">
         查询
       </el-button>
     </el-form>
@@ -263,6 +263,9 @@ export default {
       this.download('engine/engine/export', {
         ...this.engineReq
       }, `source_${new Date().getTime()}.xlsx`)
+    },
+    select(){
+      this.findSelectSourceList();
     }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",

src/views/money/user/index.vue

@@ -7,7 +7,7 @@
         label="用户余额"
         width="180">
         <template slot-scope="scope">
-          <span style="margin-left: 10px">{{ scope.row.paymentAmount }}</span>
+          <span style="margin-left: 10px">{{ scope.row.userBalance }}</span>
         </template>
       </el-table-column>
     </el-table>