Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

This commit is contained in:
From-wh 2023-04-23 15:28:55 +08:00
commit c801f89915
41 changed files with 83 additions and 19 deletions

View File

@ -87,18 +87,25 @@ class SystemCrud extends AuthController
];
}
if ($item['from_type']) {
if (!$item['table_name']) {
return app('json')->fail('表单标题必须填写');
$name = $item['table_name'] ?: $item['comment'];
if (!$name) {
return app('json')->fail($item['field'] . '字段的表单标题必须填写');
}
$fromField[] = [
'field' => $item['field'],
'type' => $item['from_type'],
'name' => $item['table_name'],
'name' => $name,
'required' => $item['required'],
'option' => $item['option'] ?? [],
];
}
}
if (!$fromField) {
return app('json')->fail('至少选择一个字段作为表单项');
}
if (!$columnField) {
return app('json')->fail('至少选择一个字段作为列展示在列表中');
}
$data['fromField'] = $fromField;
$data['columnField'] = $columnField;
if (!$data['tableName']) {
@ -134,17 +141,7 @@ class SystemCrud extends AuthController
$routeName = 'crud/' . Str::snake($tableName);
$make = $this->services->makeFile($tableName, $routeName, false, [
'menuName' => '',
'fromField' => [],
'columnField' => [],
]);
$makePath = [];
foreach ($make as $key => $item) {
$makePath[$key] = $item['path'];
}
$key = 'id';
$tableField = [];
if ($isTable) {
$field = $this->services->getColumnNamesList($tableName);
@ -152,6 +149,9 @@ class SystemCrud extends AuthController
return app('json')->fail('表不存在');
}
foreach ($field as $item) {
if ($item['primaryKey']) {
$key = $item['name'];
}
$tableField[] = [
'field' => $item['name'],
'field_type' => $item['type'],
@ -167,6 +167,18 @@ class SystemCrud extends AuthController
}
}
$make = $this->services->makeFile($tableName, $routeName, false, [
'menuName' => '',
'key' => $key,
'fromField' => [],
'columnField' => [],
]);
$makePath = [];
foreach ($make as $k => $item) {
$makePath[$k] = $item['path'];
}
return app('json')->success(compact('makePath', 'tableField'));
}

View File

@ -150,11 +150,11 @@ class Local extends BaseUpload
/**
* 文件流上传
* @param string $fileContent
* @param $fileContent
* @param string|null $key
* @return array|bool|mixed|\StdClass
*/
public function stream(string $fileContent, string $key = null)
public function stream($fileContent, string $key = null)
{
if (!$key) {
$key = $this->saveFileName();

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
.monaco-editor[data-v-7498ac45]{min-height:300px}.vxe-select--panel.is--transfer{z-index:99999!important}.content[data-v-7fa8cb00]{padding:12px}.content .head .item[data-v-7fa8cb00],.content .head[data-v-7fa8cb00]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.content .head .item[data-v-7fa8cb00]{margin-bottom:12px;font-size:14px}.content .head .item .title[data-v-7fa8cb00]{margin-right:14px}.copy-btn[data-v-7fa8cb00]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:right;-ms-flex-pack:right;justify-content:right}.reset[data-v-d641217a]{margin-left:10px}.card-tree[data-v-d641217a]{height:72px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow-x:scroll;white-space:nowrap;overflow-y:hidden;scrollbar-width:none;-ms-overflow-style:none}.card-tree[data-v-d641217a]::-webkit-scrollbar{display:none}.main[data-v-d641217a]{width:100%}.main .main-btn[data-v-d641217a],.main[data-v-d641217a]{display:-webkit-box;display:-ms-flexbox;display:flex}.main .card-tree[data-v-d641217a]{width:270px;height:calc(100vh - 115px);overflow-y:scroll}.main[data-v-d641217a] .tree .tree-list{margin-left:10px}.main[data-v-d641217a] .tree .vtl-caret{padding-right:2px}.main[data-v-d641217a] .tree .req-method{display:block;padding:0 2px;font-size:12px;margin-right:5px;border-radius:4px;text-transform:uppercase}.main[data-v-d641217a] .tree .tree-node{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;padding:3px 7px 3px 0}.main[data-v-d641217a] .tree .node{padding:7px 2px 7px 0}.main[data-v-d641217a] .tree .open{font-weight:500;color:#333}.main[data-v-d641217a] .vtl-node-main .vtl-operation{position:absolute;right:20px}.main[data-v-d641217a] .vtl-node-content{width:100%}.main .pop-menu[data-v-d641217a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.main[data-v-d641217a] .vtl-node-content .add{display:none;margin-right:10px}.main[data-v-d641217a] .vtl-node-content:hover .add{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-radius:50%;width:20px;height:20px}.main[data-v-d641217a] .vtl-node-content:hover .add:hover{background-color:#fff}.main[data-v-d641217a] .vtl-node-content:hover .add:hover .pop-menu{font-size:16px}.main[data-v-d641217a] .vtl-node-main{padding:0}.main[data-v-d641217a] .line1{display:table-caption;white-space:nowrap;width:120px;overflow:hidden;text-overflow:ellipsis}.main[data-v-d641217a] .ivu-form-item{margin-bottom:10px}.main .right-card[data-v-d641217a]{max-height:calc(100vh - 115px);overflow-y:scroll}.main .data[data-v-d641217a],.main .right-card[data-v-d641217a]{-webkit-box-flex:1;-ms-flex:1;flex:1}.main .data .req-method[data-v-d641217a]{text-transform:uppercase;border-radius:4px;color:#fff;padding:3px 7px}.main .data .eidt-sub[data-v-d641217a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.main .data .eidt-sub .name[data-v-d641217a]{font-size:20px;font-weight:500}.main .data .title[data-v-d641217a]{font-size:16px;font-weight:500;margin-bottom:15px}.main .data .perW20[data-v-d641217a]{width:500px}.main .data .text-area[data-v-d641217a]{white-space:pre-wrap;word-break:break-word}.main[data-v-d641217a] .ivu-tree-title{width:100%!important}.main[data-v-d641217a] .vtl-tree-margin{margin-left:5px}.main[data-v-d641217a] .ivu-btn-icon-only.ivu-btn-small{width:28px}.main .nothing[data-v-d641217a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;min-height:800px}.main .nothing .box[data-v-d641217a]:hover{border:1px solid pink}.main .nothing .box[data-v-d641217a]{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:150px;height:200px;margin:0 20px;border-radius:10px;cursor:pointer;overflow:hidden;border:1px solid #fff}.main .nothing .box .icon[data-v-d641217a],.main .nothing .box[data-v-d641217a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.main .nothing .box .icon[data-v-d641217a]{width:100%;height:150px;font-size:40px;color:#2d8cf0;background:#f1f1f1}.main .nothing .box .text[data-v-d641217a]{width:100%;height:50px;background:#ddd;text-align:center;line-height:50px;font-size:14px;font-weight:500}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
.monaco-editor[data-v-74f95c46]{min-height:300px}.vxe-select--panel.is--transfer{z-index:99999!important}.content[data-v-7aac1b53]{padding:12px}.content .head .item[data-v-7aac1b53],.content .head[data-v-7aac1b53]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.content .head .item[data-v-7aac1b53]{margin-bottom:12px;font-size:14px}.content .head .item .title[data-v-7aac1b53]{margin-right:14px}.copy-btn[data-v-7aac1b53]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:right;-ms-flex-pack:right;justify-content:right}.reset[data-v-5139aef0]{margin-left:10px}.card-tree[data-v-5139aef0]{height:72px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow-x:scroll;white-space:nowrap;overflow-y:hidden;scrollbar-width:none;-ms-overflow-style:none}.card-tree[data-v-5139aef0]::-webkit-scrollbar{display:none}.main[data-v-5139aef0]{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.main .card-tree[data-v-5139aef0]{width:270px;height:calc(100vh - 115px);overflow-y:scroll}.main[data-v-5139aef0] .tree .tree-list{margin-left:10px}.main[data-v-5139aef0] .tree .vtl-caret{padding-right:2px}.main[data-v-5139aef0] .tree .req-method{display:block;padding:0 2px;font-size:12px;margin-right:5px;border-radius:4px;text-transform:uppercase}.main[data-v-5139aef0] .tree .tree-node{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;padding:3px 7px 3px 0}.main[data-v-5139aef0] .tree .node{padding:7px 2px 7px 0}.main[data-v-5139aef0] .tree .open{font-weight:500;color:#333}.main[data-v-5139aef0] .vtl-node-main .vtl-operation{position:absolute;right:20px}.main[data-v-5139aef0] .vtl-node-content{width:100%}.main .pop-menu[data-v-5139aef0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.main[data-v-5139aef0] .vtl-node-content .add{display:none;margin-right:10px}.main[data-v-5139aef0] .vtl-node-content:hover .add{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;border-radius:50%;width:20px;height:20px}.main[data-v-5139aef0] .vtl-node-content:hover .add:hover{background-color:#fff}.main[data-v-5139aef0] .vtl-node-content:hover .add:hover .pop-menu{font-size:16px}.main[data-v-5139aef0] .vtl-node-main{padding:0}.main[data-v-5139aef0] .line1{display:table-caption;white-space:nowrap;width:120px;overflow:hidden;text-overflow:ellipsis}.main[data-v-5139aef0] .ivu-form-item{margin-bottom:10px}.main .right-card[data-v-5139aef0]{max-height:calc(100vh - 115px);overflow-y:scroll}.main .data[data-v-5139aef0],.main .right-card[data-v-5139aef0]{-webkit-box-flex:1;-ms-flex:1;flex:1}.main .data .req-method[data-v-5139aef0]{text-transform:uppercase;border-radius:4px;color:#fff;padding:3px 7px}.main .data .eidt-sub[data-v-5139aef0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.main .data .eidt-sub .name[data-v-5139aef0]{font-size:20px;font-weight:500}.main .data .title[data-v-5139aef0]{font-size:16px;font-weight:500;margin-bottom:15px}.main .data .perW20[data-v-5139aef0]{width:500px}.main .data .text-area[data-v-5139aef0]{white-space:pre-wrap}.main[data-v-5139aef0] .ivu-tree-title{width:100%!important}.main[data-v-5139aef0] .vtl-tree-margin{margin-left:5px}.main[data-v-5139aef0] .ivu-btn-icon-only.ivu-btn-small{width:28px}.main .nothing[data-v-5139aef0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;min-height:800px}.main .nothing .box[data-v-5139aef0]:hover{border:1px solid pink}.main .nothing .box[data-v-5139aef0]{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:150px;height:200px;margin:0 20px;border-radius:10px;cursor:pointer;overflow:hidden;border:1px solid #fff}.main .nothing .box .icon[data-v-5139aef0],.main .nothing .box[data-v-5139aef0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.main .nothing .box .icon[data-v-5139aef0]{width:100%;height:150px;font-size:40px;color:#2d8cf0;background:#f1f1f1}.main .nothing .box .text[data-v-5139aef0]{width:100%;height:50px;background:#ddd;text-align:center;line-height:50px;font-size:14px;font-weight:500}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
.form-width[data-v-4cd76107],.form-width[data-v-568ced54]{width:500px}.item[data-v-568ced54]{display:-webkit-box;display:-ms-flexbox;display:flex;margin-bottom:10px}.item .row[data-v-568ced54]{width:140px;margin-right:10px}.ivu-steps .ivu-steps-title[data-v-6e644c2a]{line-height:26px}.code-wapper[data-v-6e644c2a]{padding-bottom:90px}.btn[data-v-6e644c2a]{position:fixed;bottom:10px;height:80px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:88.7%;background-color:hsla(0,0%,100%,.6);-webkit-backdrop-filter:blur(4px);backdrop-filter:blur(4px)}.tab-1[data-v-6e644c2a]{padding-bottom:100px}[data-v-6e644c2a] .el-input__inner{padding-left:7px}[data-v-6e644c2a] .ivu-form-item{margin-bottom:17px}[data-v-6e644c2a] .ivu-form-item-error-tip{padding-top:2px}[data-v-6e644c2a] .tip{color:#bbb;line-height:16px;padding-top:5px}

View File

@ -0,0 +1 @@
.template_sp_box[data-v-60931ffc]{padding:5px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.template_sp[data-v-60931ffc]{display:block;padding:2px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.flex-wrapper[data-v-60931ffc]{display:-webkit-box;display:-ms-flexbox;display:flex;border-radius:10px}.iframe-box[data-v-60931ffc]{width:312px;height:550px;border-radius:10px}.ivu-mt[data-v-60931ffc]{height:600px}.content[data-v-60931ffc]{padding:0 20px}.content>.title[data-v-60931ffc]{padding-bottom:26px}.content-box[data-v-60931ffc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:20px 20px 0 20px;color:#333}.content-box.last[data-v-60931ffc]{margin-top:0;color:#999}.line[data-v-60931ffc]{width:3px;height:16px;background-color:#1890ff;margin-right:11px}.content-box .title[data-v-60931ffc]{font-size:16px;font-weight:700}.content-box>span[data-v-60931ffc]{color:#f5222d;font-size:20px}.content-box .left[data-v-60931ffc]{width:100px;text-align:right}.content-box .right[data-v-60931ffc]{width:400px}.rad[data-v-60931ffc]{margin-left:20px}.mask[data-v-60931ffc]{position:absolute;left:0;top:0;width:312px;height:550px;background-color:transparent}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
.order_detail .msg-box[data-v-21ea8aec]{border-bottom:1px solid #e8eaed}.order_detail .msg-box .box-title[data-v-21ea8aec]{padding-top:20px;font-size:16px;color:#333}.order_detail .msg-box .msg-wrapper[data-v-21ea8aec]{margin-top:15px;padding-bottom:10px}.order_detail .msg-box .msg-wrapper .msg-item[data-v-21ea8aec]{display:-webkit-box;display:-ms-flexbox;display:flex}.order_detail .msg-box .msg-wrapper .msg-item .item[data-v-21ea8aec]{-webkit-box-flex:1;-ms-flex:1;flex:1;margin-bottom:15px}.order_detail .msg-box .msg-wrapper .msg-item .item span[data-v-21ea8aec]{color:#333}.order_detail .msg-box:first-child .box-title[data-v-21ea8aec]{padding-top:0}.order_detail .product_info[data-v-21ea8aec]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.order_detail .product_info img[data-v-21ea8aec]{width:36px;height:36px;border-radius:4px;margin-right:10px}.order_box .list[data-v-216dd365]{font-size:12px;color:#17233d;border-bottom:1px solid #e7eaec;margin:0 10px;padding-bottom:22px}.ivu-form-item[data-v-216dd365]{margin-left:10px;margin-right:10px}[data-v-216dd365] .ivu-form-item-label{text-align:left;width:83px!important}[data-v-216dd365] .ivu-form-item-content{margin-left:83px!important}.order_box .list .title[data-v-216dd365]{color:#000;font-weight:700}.order_box .list .row[data-v-216dd365]{margin-top:13px}.order_box .list .info[data-v-216dd365]{color:#515a6e}.tab_data[data-v-216dd365] .ivu-form-item-content{margin-left:0!important}.table_box[data-v-216dd365] .ivu-divider-horizontal{margin-top:0!important}.table_box[data-v-216dd365] .ivu-form-item{margin-bottom:15px!important}.tabform[data-v-216dd365]{margin-bottom:10px}.Refresh[data-v-216dd365]{font-size:12px;color:#1890ff;cursor:pointer}

View File

@ -0,0 +1 @@
[data-v-3d16b9f1] .center{text-align:center;margin-right:0!important;margin-left:5px}.layout-columns-aside[data-v-6f79edf2]{width:70px;height:100%;background:var(--prev-bg-columnsMenuBar);-webkit-box-shadow:0 1px 4px rgba(0,21,41,.08);box-shadow:0 1px 4px rgba(0,21,41,.08)}.layout-columns-aside ul[data-v-6f79edf2]{position:relative}.layout-columns-aside ul li[data-v-6f79edf2]{color:var(--prev-bg-columnsMenuBarColor);width:100%;height:50px;text-align:center;display:-webkit-box;display:-ms-flexbox;display:flex;cursor:pointer;position:relative;z-index:1}.layout-columns-aside ul li .columns-vertical[data-v-6f79edf2]{margin:auto}.layout-columns-aside ul li .columns-vertical .columns-vertical-title[data-v-6f79edf2]{padding-top:1px}.layout-columns-aside ul li .columns-horizontal[data-v-6f79edf2]{display:-webkit-box;display:-ms-flexbox;display:flex;height:50px;width:100%;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:0 5px}.layout-columns-aside ul li .columns-horizontal i[data-v-6f79edf2]{margin-right:3px}.layout-columns-aside ul li .columns-horizontal a[data-v-6f79edf2]{display:-webkit-box;display:-ms-flexbox;display:flex}.layout-columns-aside ul li .columns-horizontal a .columns-horizontal-title[data-v-6f79edf2]{padding-top:1px}.layout-columns-aside ul li a[data-v-6f79edf2]{text-decoration:none;color:var(--prev-bg-columnsMenuBarColor)}.layout-columns-aside ul .layout-columns-active[data-v-6f79edf2],.layout-columns-aside ul .layout-columns-active a[data-v-6f79edf2]{color:var(--prev-bg-columnsMenuActiveColor);-webkit-transition:.3s ease-in-out;transition:.3s ease-in-out}.layout-columns-aside ul .columns-card[data-v-6f79edf2],.layout-columns-aside ul .columns-round[data-v-6f79edf2]{background:var(--prev-color-primary);position:absolute;left:50%;top:2px;height:50px;width:65px;-webkit-transform:translateX(-50%);transform:translateX(-50%);z-index:0;-webkit-transition:.3s ease-in-out;transition:.3s ease-in-out;border-radius:5px}.layout-columns-aside ul .columns-card[data-v-6f79edf2]{top:0;height:50px;width:100%;border-radius:0}

View File

@ -0,0 +1 @@
.right-box[data-v-d33c835e]{width:700px;margin-left:50px;border:1px solid #ddd;border-radius:4px;height:700px;overflow-y:scroll}.right-box[data-v-d33c835e]::-webkit-scrollbar{width:4px;height:1px}.right-box[data-v-d33c835e]::-webkit-scrollbar-thumb{border-radius:4px;-webkit-box-shadow:inset 0 0 5px rgba(0,0,0,.2);box-shadow:inset 0 0 5px rgba(0,0,0,.2);background:#535353}.right-box[data-v-d33c835e]::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 5px #fff;box-shadow:inset 0 0 5px #fff;border-radius:4px;background:#fff}.title-bar[data-v-d33c835e]{width:100%;height:38px;line-height:38px;padding-left:24px;color:#333;border-radius:4px;border-bottom:1px solid #eee}.right-box[data-v-3bcf00cc]{width:400px;margin-left:50px;border:1px solid #ddd;border-radius:4px;height:700px;overflow-y:scroll;padding:0 10px}.right-box[data-v-3bcf00cc]::-webkit-scrollbar{width:4px;height:1px}.right-box[data-v-3bcf00cc]::-webkit-scrollbar-thumb{border-radius:4px;-webkit-box-shadow:inset 0 0 5px rgba(0,0,0,.2);box-shadow:inset 0 0 5px rgba(0,0,0,.2);background:#535353}.right-box[data-v-3bcf00cc]::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 5px #fff;box-shadow:inset 0 0 5px #fff;border-radius:4px;background:#fff}.right-box .link-item[data-v-3bcf00cc]{padding:10px 0;border-bottom:1px solid #f5f5f5}.right-box .link-item .title[data-v-3bcf00cc]{font-size:14px;color:#2d8cf0}.right-box .link-item .txt[data-v-3bcf00cc]{margin:5px 0;font-size:12px}.right-box .link-item .txt span[data-v-3bcf00cc]{color:#333}.right-box .link-item .txt p[data-v-3bcf00cc]{display:inline-block;color:#19be6b;margin-right:10px}.right-box .link-item .txt p span[data-v-3bcf00cc]{color:#333}.right-box .link-item .txt p.red[data-v-3bcf00cc]{color:red}.right-box .link-item .tips[data-v-3bcf00cc]{font-size:12px;color:#999}.right-box .link-item .tips .copy[data-v-3bcf00cc]{padding:3px 5px;border:1px solid #ccc;border-radius:5px;color:#333;cursor:pointer;margin-left:5px}.right-box .link-item .tips .copy[data-v-3bcf00cc]:hover{border-color:#2d8cf0;color:#2d8cf0}.flex-wrapper[data-v-61bc3366]{display:-webkit-box;display:-ms-flexbox;display:flex}.iframe-box[data-v-61bc3366]{min-width:375px;height:700px;border-radius:4px;-webkit-box-shadow:0 0 7px #ccc;box-shadow:0 0 7px #ccc}.right-box[data-v-61bc3366]{width:500px;margin-left:50px;border:1px solid #ddd;border-radius:4px}.right-box .title-bar[data-v-61bc3366]{width:100%;height:38px;line-height:38px;padding-left:24px;color:#333;border-radius:4px;border-bottom:1px solid #eee}

View File

@ -0,0 +1 @@
.trees-coadd[data-v-54f42439]{width:100%;height:500px;border-radius:4px;overflow:hidden}.scollhide[data-v-54f42439]{width:100%;height:100%;overflow:auto;margin-left:18px;padding:10px 0 10px 0;-webkit-box-sizing:border-box;box-sizing:border-box}.content[data-v-54f42439]{font-size:12px}.time[data-v-54f42439]{font-size:12px;color:#2d8cf0}.icons-item[data-v-54f42439]{float:left;margin:6px 6px 6px 0;width:53px;text-align:center;list-style:none;cursor:pointer;height:50px;color:#5c6b77;-webkit-transition:all .2s ease;transition:all .2s ease;position:relative;padding-top:10px}.icons-item .ivu-icon[data-v-54f42439]{font-size:16px}.search-rule[data-v-54f42439]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:10px;background-color:#f2f2f2}.rule[data-v-54f42439]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;max-height:700px;overflow:scroll}.rule[data-v-54f42439]::-webkit-scrollbar{width:10px;height:10px;background-color:#f5f5f5}.rule[data-v-54f42439]::-webkit-scrollbar-track{border-radius:4px;background-color:#f5f5f5}.rule[data-v-54f42439]::-webkit-scrollbar-thumb{border-radius:4px;background-color:#555}.rule-list[data-v-54f42439]{background-color:#f8f5f5;width:32%;margin:5px;border-radius:3px;padding:10px;color:#333;cursor:pointer;-webkit-transition:all .1s;transition:all .1s}.rule-list[data-v-54f42439]:hover{background-color:#c5d1dd}.rule-list div[data-v-54f42439]{white-space:nowrap}.select-rule[data-v-54f42439]{background-color:#c5d1dd}.add[data-v-54f42439]{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.add[data-v-54f42439],.df[data-v-54f42439]{display:-webkit-box;display:-ms-flexbox;display:flex}.df[data-v-54f42439]{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.vxeTable>.vxe-table--header-wrapper[data-v-38644b92]{background:#fff!important}.rule[data-v-38644b92]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;max-height:600px;overflow-y:scroll}.rule[data-v-38644b92]::-webkit-scrollbar{width:10px;height:10px;background-color:#f5f5f5}.rule[data-v-38644b92]::-webkit-scrollbar-track{border-radius:4px;background-color:#f5f5f5}.rule[data-v-38644b92]::-webkit-scrollbar-thumb{border-radius:4px;background-color:#ccc}.rule-list[data-v-38644b92]{background-color:#f2f2f2;width:32%;margin:5px;border-radius:3px;padding:10px;color:#333;cursor:pointer;-webkit-transition:all .1s;transition:all .1s}.rule-list[data-v-38644b92]:hover{background-color:#badbfb}.rule-list div[data-v-38644b92]{white-space:nowrap}.select-rule[data-v-38644b92]{background-color:#badbfb}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
.tabBox_img[data-v-ce9e058c]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-ce9e058c]{width:100%;height:100%}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -49,7 +49,7 @@
</div>
</template>
<div v-else class="upLoad pictrueTab acea-row row-center-wrapper">
<Icon type="ios-camera-outline" size="26" @click="modals = true" />
<Icon type="ios-camera-outline" size="26" @click="changeGoods" />
</div>
</FormItem>
<FormItem label="奖品名称" prop="name">
@ -116,7 +116,7 @@
width="900"
@on-cancel="cancel"
>
<goods-list ref="goodslist" v-if="modals" @getProductId="getProductId"></goods-list>
<goods-list ref="goodslist" @getProductId="getProductId"></goods-list>
</Modal>
<coupon-list ref="couponTemplates" :luckDraw="true" @getCouponId="getCouponId"></coupon-list>
<!--<coupon-list-->
@ -232,6 +232,14 @@ export default {
});
},
methods: {
// 选择商品
changeGoods() {
this.modals = true;
this.$refs.goodslist.formValidate.is_presale = 0;
this.$refs.goodslist.formValidate.is_virtual = 0;
this.$refs.goodslist.getList();
this.$refs.goodslist.goodsCategory();
},
getCouponId(e) {
this.formValidate.coupon_id = e.id;
this.formValidate.coupon_title = e.coupon_title;

View File

@ -955,6 +955,7 @@ export default {
changeGoods() {
this.modals = true;
this.$refs.goodslist.formValidate.is_presale = 0;
this.$refs.goodslist.formValidate.is_virtual = 0;
this.$refs.goodslist.getList();
this.$refs.goodslist.goodsCategory();
},

View File

@ -949,6 +949,7 @@ export default {
changeGoods() {
this.modals = true;
this.$refs.goodslist.formValidate.is_presale = 0;
this.$refs.goodslist.formValidate.is_virtual = 0;
this.$refs.goodslist.getList();
this.$refs.goodslist.goodsCategory();
},

View File

@ -699,6 +699,7 @@ export default {
changeGoods() {
this.modals = true;
this.$refs.goodslist.formValidate.is_presale = 0;
this.$refs.goodslist.formValidate.is_virtual = 0;
this.$refs.goodslist.getList();
this.$refs.goodslist.goodsCategory();
}, // 移动

View File

@ -875,6 +875,7 @@ export default {
changeGoods() {
this.modals = true;
this.$refs.goodslist.formValidate.is_presale = 0;
this.$refs.goodslist.formValidate.is_virtual = 0;
this.$refs.goodslist.getList();
this.$refs.goodslist.goodsCategory();
}, // 移动