diff --git a/front/package.json b/front/package.json index 392cdb1..49860e7 100644 --- a/front/package.json +++ b/front/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "1.0.12", + "version": "1.0.14", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "lichong", diff --git a/front/src/renderer/src/App.vue b/front/src/renderer/src/App.vue index 8a62fb5..d4e87f7 100644 --- a/front/src/renderer/src/App.vue +++ b/front/src/renderer/src/App.vue @@ -7,9 +7,9 @@ - + diff --git a/front/src/renderer/src/assets/css/base.css b/front/src/renderer/src/assets/css/base.css index aa1aaa1..1e21bd2 100644 --- a/front/src/renderer/src/assets/css/base.css +++ b/front/src/renderer/src/assets/css/base.css @@ -10,4 +10,7 @@ body { } .cell{ padding: 0 !important; +} +.rightCard .el-card__header{ + padding-bottom: 8px; } \ No newline at end of file diff --git a/front/src/renderer/src/assets/json/changci.json b/front/src/renderer/src/assets/json/changci.json index f892eef..8d04b68 100644 --- a/front/src/renderer/src/assets/json/changci.json +++ b/front/src/renderer/src/assets/json/changci.json @@ -10,6 +10,7 @@ "label": "时间", "prop": "time", "type": "date", + "width": 150, "tableShow": true, "formShow": true }, @@ -47,6 +48,24 @@ "tableShow": true, "formShow": true }, + { + "label": "开奖类型", + "prop": "type", + "type": "radio", + "default": "2", + "options": [ + { + "label": "体彩", + "value": "1" + }, + { + "label": "福彩", + "value": "2" + } + ], + "tableShow": true, + "formShow": true + }, { "label": "创建时间", "prop": "create_at", diff --git a/front/src/renderer/src/assets/json/dailishang.json b/front/src/renderer/src/assets/json/dailishang.json index 40aaab7..fb00003 100644 --- a/front/src/renderer/src/assets/json/dailishang.json +++ b/front/src/renderer/src/assets/json/dailishang.json @@ -3,6 +3,7 @@ "label": "姓名", "prop": "name", "type": "text", + "width": 80, "tableShow": true, "formShow": true }, @@ -10,6 +11,7 @@ "label": "联系方式", "prop": "phone", "type": "text", + "width": 120, "tableShow": true, "formShow": true }, @@ -17,11 +19,165 @@ "label": "代理费(%)", "prop": "dailifei", "type": "number", + "required": true, "min": 0, "max": 100, "tableShow": true, "formShow": true }, + { + "label": "组选(倍率)", + "prop": "zuxuan", + "type": "number", + "required": true, + "default": 150, + "tableShow": true, + "formShow": true + }, + { + "label": "双飞(倍率)", + "prop": "shuangfei", + "type": "number", + "required": true, + "default": 15, + "tableShow": true, + "formShow": true + }, + { + "label": "毒胆(倍率)", + "prop": "dudan", + "type": "number", + "required": true, + "default": 3.3, + "tableShow": true, + "formShow": true + }, + { + "label": "定位(一码)(倍率)", + "prop": "dingwei1", + "type": "number", + "required": true, + "default": 9, + "tableShow": true, + "formShow": true + }, + { + "label": "定位(二码)(倍率)", + "prop": "dingwei2", + "type": "number", + "required": true, + "default": 80, + "tableShow": true, + "formShow": true + }, + { + "label": "复式对子(倍率)", + "prop": "fushiduizi", + "type": "number", + "required": true, + "default": 300, + "tableShow": true, + "formShow": true + }, + { + "label": "复式(倍率)", + "prop": "fushi", + "type": "number", + "required": true, + "default": 150, + "tableShow": true, + "formShow": true + }, + { + "label": "全包对子(倍率)", + "prop": "quanbaoduizi", + "type": "number", + "required": true, + "default": 3.3, + "tableShow": true, + "formShow": true + }, + { + "label": "组六(四码)(倍率)", + "prop": "zuliu4", + "type": "number", + "required": true, + "default": 35, + "tableShow": true, + "formShow": true + }, + { + "label": "组六(五码)(倍率)", + "prop": "zuliu5", + "type": "number", + "required": true, + "default": 15, + "tableShow": true, + "formShow": true + }, + { + "label": "组六(六码)(倍率)", + "prop": "zuliu6", + "type": "number", + "required": true, + "default": 7, + "tableShow": true, + "formShow": true + }, + { + "label": "组六(七码)(倍率)", + "prop": "zuliu7", + "type": "number", + "required": true, + "default": 4, + "tableShow": true, + "formShow": true + }, + { + "label": "组三(四码)(倍率)", + "prop": "zusan4", + "type": "number", + "required": true, + "default": 24, + "tableShow": true, + "formShow": true + }, + { + "label": "组三(五码)(倍率)", + "prop": "zusan5", + "type": "number", + "required": true, + "default": 15, + "tableShow": true, + "formShow": true + }, + { + "label": "组三(六码)(倍率)", + "prop": "zusan6", + "type": "number", + "required": true, + "default": 8, + "tableShow": true, + "formShow": true + }, + { + "label": "组三(七码)(倍率)", + "prop": "zusan7", + "type": "number", + "required": true, + "default": 6, + "tableShow": true, + "formShow": true + }, + { + "label": "豹子(倍率)", + "prop": "baozi", + "type": "number", + "required": true, + "default": 900, + "tableShow": true, + "formShow": true + }, { "label": "备注", "prop": "note", diff --git a/front/src/renderer/src/components/formcomponent.vue b/front/src/renderer/src/components/formcomponent.vue index d366d58..71662bd 100644 --- a/front/src/renderer/src/components/formcomponent.vue +++ b/front/src/renderer/src/components/formcomponent.vue @@ -1,7 +1,8 @@ + diff --git a/front/src/renderer/src/components/formcomponentchangci.vue b/front/src/renderer/src/components/formcomponentchangci.vue new file mode 100644 index 0000000..4764dcf --- /dev/null +++ b/front/src/renderer/src/components/formcomponentchangci.vue @@ -0,0 +1,84 @@ + + + + diff --git a/front/src/renderer/src/components/tablecomponent.vue b/front/src/renderer/src/components/tablecomponent.vue index 59ea4a3..e31ad71 100644 --- a/front/src/renderer/src/components/tablecomponent.vue +++ b/front/src/renderer/src/components/tablecomponent.vue @@ -10,7 +10,7 @@ + :key="headerIndex" :min-width="`${headerItem.label.length * 15 + 8}px`" :width="headerItem.width">