diff --git a/.env.production b/.env.production index 6133334..91c8741 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ ENV = 'production' -VUE_APP_BASE_API = 'http://local.medical-record.host' \ No newline at end of file +VUE_APP_BASE_API = 'http://baozhitang.abcdefg.fun' \ No newline at end of file diff --git a/src/components/cu-editor.vue b/src/components/cu-editor.vue index c0ed94f..374ceb6 100644 --- a/src/components/cu-editor.vue +++ b/src/components/cu-editor.vue @@ -103,24 +103,24 @@ export default { ]}, { name: '图片', type: 'image', action: 'insert'}, ], - [ - { name: '字体颜色', type: 'format', action: 'color', options: [ - { name: '黑色', value: '#000000', style: { color: '#000000' } }, - { name: '红色', value: '#FF0000', style: { color: '#FF0000' } }, - { name: '绿色', value: '#008000', style: { color: '#008000' } }, - { name: '白色', value: '#ffffff', style: { color: '#ffffff', background: 'grey' } }, - ]}, - { name: '背景色', type: 'format', action: 'backgroundColor', options: [ - { name: '黑色', value: '#000000', style: { background: '#000000', color: '#ffffff' } }, - { name: '红色', value: '#FF0000', style: { background: '#FF0000', color: '#ffffff' } }, - { name: '绿色', value: '#008000', style: { background: '#008000', color: '#ffffff' } }, - { name: '白色', value: '#ffffff', style: { background: '#ffffff', color: '#ffffff' } }, - ]}, - { name: '缩进', type: 'format', action: 'indent', options: [ - { name: '增加缩进', value: '+1' }, - { name: '减少缩进', value: '-1' }, - ]}, - ], + // [ + // { name: '字体颜色', type: 'format', action: 'color', options: [ + // { name: '黑色', value: '#000000', style: { color: '#000000' } }, + // { name: '红色', value: '#FF0000', style: { color: '#FF0000' } }, + // { name: '绿色', value: '#008000', style: { color: '#008000' } }, + // { name: '白色', value: '#ffffff', style: { color: '#ffffff', background: 'grey' } }, + // ]}, + // { name: '背景色', type: 'format', action: 'backgroundColor', options: [ + // { name: '黑色', value: '#000000', style: { background: '#000000', color: '#ffffff' } }, + // { name: '红色', value: '#FF0000', style: { background: '#FF0000', color: '#ffffff' } }, + // { name: '绿色', value: '#008000', style: { background: '#008000', color: '#ffffff' } }, + // { name: '白色', value: '#ffffff', style: { background: '#ffffff', color: '#ffffff' } }, + // ]}, + // { name: '缩进', type: 'format', action: 'indent', options: [ + // { name: '增加缩进', value: '+1' }, + // { name: '减少缩进', value: '-1' }, + // ]}, + // ], ], options: [], btn: '', diff --git a/src/pages.json b/src/pages.json index d1885bb..feb9d3d 100644 --- a/src/pages.json +++ b/src/pages.json @@ -6,6 +6,12 @@ "navigationBarTitleText": "宝芝堂" } }, + { + "path": "pages/index/welcome", + "style": { + "navigationBarTitleText": "宝芝堂" + } + }, { "path": "pages/login/login", "style": { diff --git a/src/pages/index/welcome.vue b/src/pages/index/welcome.vue new file mode 100644 index 0000000..06ef403 --- /dev/null +++ b/src/pages/index/welcome.vue @@ -0,0 +1,22 @@ + + + \ No newline at end of file diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index c98c330..6423049 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -42,7 +42,9 @@ export default { username: '', password: '', captcha: '', - sys_captcha: '' + sys_captcha: '', + openid: '', + open_type: '' }, rules: { username: { @@ -67,8 +69,15 @@ export default { captcha: '', logo: '', appName: '', + + openid: '', + open_type: '' } }, + onLoad(e) { + this.user.openid = e.openid + this.user.open_type = e.open_type + }, onReady() { this.$refs['form'].setRules(this.rules) this.$ajax.get('/admin-api/_settings').then(res => {