diff --git a/package.json b/package.json index 85e5383..0cc0489 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "nprogress": "^0.2.0", "vue": "^2.6.12", "vue-clipboard2": "^0.3.1", + "vue-image-crop-upload": "^2.5.0", "vue-meta": "^2.4.0", "vue-qr": "^2.3.0", "vue-router": "^3.4.8", diff --git a/public/index.html b/public/index.html index bddcb44..1c6c016 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,6 @@ - <%= htmlWebpackPlugin.options.title %> <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %> diff --git a/src/components/parser/Parser.vue b/src/components/parser/Parser.vue index 7af4f54..aa0e903 100644 --- a/src/components/parser/Parser.vue +++ b/src/components/parser/Parser.vue @@ -31,12 +31,7 @@ const layouts = { if (config.showLabel === false) labelWidth = '0' let label = config.label if (formConfCopy.showNumber) { - this.serialNumber = this.serialNumber + 1 - label = serialNumber + ': ' + label - } - //不同项目地址区分 - if (config.tag === 'el-upload') { - scheme.action = scheme.action + this.formConf.projectKey + label = scheme.serialNumber + ': ' + label } return ( @@ -238,7 +233,6 @@ export default { }, data() { const data = { - // serialNumber: 1,//序号 formConfCopy: deepClone(this.formConf), [this.formConf.formModel]: {}, [this.formConf.labelFormModel]: {}, diff --git a/src/router/modules/root.js b/src/router/modules/root.js index caf85ef..19d3ced 100644 --- a/src/router/modules/root.js +++ b/src/router/modules/root.js @@ -54,6 +54,11 @@ export default [ path: '/', meta: {requireLogin: true}, component: () => import(/* webpackChunkName: 'root' */ '@/views/home/HomeView') + }, + { + path: 'member', + meta: {requireLogin: true}, + component: () => import(/* webpackChunkName: 'root' */ '@/views/account/member') } ] }, { diff --git a/src/utils/convert.js b/src/utils/convert.js index 1789b72..7f39bf5 100644 --- a/src/utils/convert.js +++ b/src/utils/convert.js @@ -16,6 +16,7 @@ export function formItemConvertData(item, projectKey) { 'required': item.__config__.required, 'placeholder': item.placeholder, 'regList': item.__config__.regList, + 'showLabel': item.__config__.showLabel, 'projectKey': projectKey } let expand = {} @@ -58,6 +59,7 @@ export function dbDataConvertForItemJson(data) { jsonItem.__config__.label = data.label jsonItem.__config__.required = data.required jsonItem.__config__.regList = data.regList + jsonItem.__config__.showLabel = data.showLabel if (data.defaultValue) { if (data.defaultValue.json) { jsonItem.__config__.defaultValue = JSON.parse(data.defaultValue.value) @@ -65,7 +67,10 @@ export function dbDataConvertForItemJson(data) { jsonItem.__config__.defaultValue = data.defaultValue.value } } - + //不同项目地址区分 + if (jsonItem.tag === 'el-upload') { + jsonItem.action = jsonItem.action + data.projectKey + } jsonItem.regList = data.regList jsonItem.placeholder = data.placeholder jsonItem.__vModel__ = 'field' + data.formItemId diff --git a/src/views/account/member.vue b/src/views/account/member.vue new file mode 100644 index 0000000..ccaf52b --- /dev/null +++ b/src/views/account/member.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/views/form/ProjectForm.vue b/src/views/form/ProjectForm.vue index e6cdbd0..6f53cd1 100644 --- a/src/views/form/ProjectForm.vue +++ b/src/views/form/ProjectForm.vue @@ -51,7 +51,7 @@ export default { }, data() { return { - startParser:false, + startParser: false, projectTheme: { headImgUrl: '', logoImg: '', @@ -60,7 +60,7 @@ export default { }, formConf: { fields: [], - projectKey:'', + projectKey: '', __methods__: {}, formRef: 'elForm', formModel: 'formData', @@ -92,16 +92,20 @@ export default { // this.formConf.formBtns = this.projectConfig.showBtns //不存去路由中尝试获取 iframe } else if (this.$route.query.key) { - this.formConf.projectKey = this.$route.query.key + this.formConf.projectKey = this.$route.query.key this.formConf.formBtns = true } this.formConf.size = window.innerWidth < 480 ? 'medium' : 'small' }, mounted() { - this.$api.get(`/user/project/details/${this.formConf.projectKey }`).then(res => { + this.$api.get(`/user/project/details/${this.formConf.projectKey}`).then(res => { if (res.data) { + let serialNumber = 1 let fields = res.data.projectItems.map(item => { - return dbDataConvertForItemJson(item) + let projectItem = dbDataConvertForItemJson(item) + projectItem.serialNumber = serialNumber + serialNumber++ + return projectItem }) this.formConf.fields = fields this.formConf.title = res.data.project.name @@ -120,7 +124,7 @@ export default { this.formConf.submitBtnColor = btnsColor } } - this.startParser=true + this.startParser = true } }) @@ -184,6 +188,7 @@ export default { width: 80%; } } + @media screen and (max-width: 500px) { .el-message { min-width: 300px !important; diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 432e549..fbb7b91 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -2,7 +2,7 @@
- + 升级 -
+
@@ -42,7 +45,7 @@
-

+

我的账户

@@ -157,13 +160,14 @@ export default { .home-header-view { line-height: 92px; height: 92px; + min-width: 960px; background-color: rgba(255, 255, 255, 100); color: rgba(16, 16, 16, 100); font-size: 14px; text-align: center; .header-logo-img { - width: 225px; - height: 62px; + width: 90%; + height: 90%; float: left; } } @@ -182,6 +186,7 @@ export default { } .person-menu-item:hover { cursor: pointer; + color: rgba(32, 91, 181, 100); } .person-menu-divider { background-color: rgba(210, 210, 210, 78); diff --git a/src/views/official/index.vue b/src/views/official/index.vue index ee32c36..12b3d07 100644 --- a/src/views/official/index.vue +++ b/src/views/official/index.vue @@ -2,15 +2,17 @@
- +
- - +