Merge branch 'dev' into 'master'

Dev

See merge request !63

src/common/api/user/user.js

@@ -7,6 +7,30 @@ export function getSubjectListApi(params) {
   return axios.get('/pay/businessPayRecord/subjectList', params)
 }
 
+// 线下充值 列表
+export function getOfflineRechargeRecordListApi(params) {
+  return axios.post('/offline-recharge/list_page', params)
+}
+
+// 线下充值 收款账户列表
+export function getOfflineBaseProceedsAccountListApi() {
+  return axios.get('/manage/rest/base-proceeds-account/list')
+}
+
+// 线下充值 充值方式列表
+export function getRechargeTypeListApi() {
+  return axios.get('/manage/rest/base-proceeds-account/pay-type-list')
+}
+// 线下充值 账户类型列表
+export function getOfflineAccountTypeListApi() {
+  return axios.get('/manage/rest/base-proceeds-account/business-type-list')
+}
+
+// 线下充值 日志
+export function getOfflineRechargeLogListApi(params) {
+  return axios.get('/offline-recharge/log?id=' + params.id)
+}
+
 // 收款账户管理 获取账户类型
 export function getAccountTypeListApi() {
   return axios.get('/baseProceedsAccount/accountTypeList')

src/common/components/element-ui.js

@@ -18,6 +18,7 @@ import {
   Switch,
   Select,
   Option,
+  OptionGroup,
   Cascader,
   Radio,
   RadioGroup,
@@ -42,7 +43,8 @@ import {
   Descriptions,
   DescriptionsItem,
   InputNumber,
-  Link
+  Link,
+  Image
 } from 'element-ui'
 
 const components = [
@@ -58,6 +60,7 @@ const components = [
   Switch,
   Select,
   Option,
+  OptionGroup,
   Cascader,
   Radio,
   RadioGroup,
@@ -84,7 +87,8 @@ const components = [
   Descriptions,
   DescriptionsItem,
   InputNumber,
-  Link
+  Link,
+  Image
 ]
 
 export default {

src/components/wangeditor/index.vue

 <template>
   <div style="border: 1px solid #ccc; z-index: 9999">
     <Toolbar
+      v-if="editable"
       class="editor_toolbar"
       style="border-bottom: 1px solid #ccc"
       :editor="editor"
       :defaultConfig="toolbarConfig"
       :mode="mode" />
     <Editor
-      style="height: 300px; overflow-y: hidden"
+      :style="{ height: height, overflowY: 'hidden' }"
       v-model="html"
       :defaultConfig="editorConfig"
       :mode="mode"
@@ -41,6 +42,15 @@ export default {
       type: String,
       default: ''
     },
+    editable: {
+      type: Boolean,
+      default: true
+    },
+    /** 编辑区高度（px） */
+    height: {
+      type: String,
+      default: '300px'
+    },
     isInsert: {
       type: Boolean,
       default: false
@@ -83,6 +93,7 @@ export default {
       const _this = this
       return {
         placeholder: this.placeholder || '请输入内容...',
+        readOnly: !this.editable,
         MENU_CONF: {
           uploadImage: {
             allowedFileTypes: ['jpg', 'jpeg', 'png', 'gif', 'bmp'],
@@ -108,12 +119,25 @@ export default {
       }
     }
   },
-  watch: {},
+  watch: {
+    editable(val) {
+      this.syncEditorEditable(val)
+    }
+  },
   methods: {
     onCreated(editor) {
       this.editor = Object.seal(editor) // 一定要用 Object.seal() ，否则会报错
-      console.log(editor.getConfig())
-      this.editor.getAllMenuKeys()
+      this.$nextTick(() => {
+        this.syncEditorEditable(this.editable)
+      })
+    },
+    syncEditorEditable(editable) {
+      if (!this.editor) return
+      if (editable) {
+        this.editor.enable()
+      } else {
+        this.editor.disable()
+      }
     }
   },
   mounted() {