From f793e917f02497ebb5a1813dd69c878fa721fb7d Mon Sep 17 00:00:00 2001 From: From-wh Date: Sun, 23 Apr 2023 15:28:46 +0800 Subject: [PATCH 1/8] =?UTF-8?q?improve:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/systemOutInterface/index.vue | 2 ++ .../pages/system/backendRouting/debugging.vue | 6 +--- .../src/pages/system/backendRouting/index.vue | 36 ++++++++++++++----- .../components/FoundationFor.vue | 10 +++++- 4 files changed, 40 insertions(+), 14 deletions(-) diff --git a/template/admin/src/pages/setting/systemOutInterface/index.vue b/template/admin/src/pages/setting/systemOutInterface/index.vue index 72b4e9335..76fd5010f 100644 --- a/template/admin/src/pages/setting/systemOutInterface/index.vue +++ b/template/admin/src/pages/setting/systemOutInterface/index.vue @@ -1010,6 +1010,8 @@ export default { .text-area { white-space: pre-wrap; + word-break: break-word; + } } diff --git a/template/admin/src/pages/system/backendRouting/debugging.vue b/template/admin/src/pages/system/backendRouting/debugging.vue index d07bba3fe..0226219bd 100644 --- a/template/admin/src/pages/system/backendRouting/debugging.vue +++ b/template/admin/src/pages/system/backendRouting/debugging.vue @@ -330,11 +330,7 @@ export default { ? this.jsonBody : this.filtersData((await this.$refs.yTable.getTableData().tableData) || []); let h = this.filtersData((await this.$refs.zTable.getTableData().tableData) || []); - let h1 = this.filtersData((await this.$refs.zaTable.getTableData().tableData) || []); - headers = { - ...h, - ...h1, - }; + headers = h; console.log(url, method, params, body, headers); this.codes = ''; requestMethod(url, method, params, body, headers) diff --git a/template/admin/src/pages/system/backendRouting/index.vue b/template/admin/src/pages/system/backendRouting/index.vue index 73ef78695..5921d074e 100644 --- a/template/admin/src/pages/system/backendRouting/index.vue +++ b/template/admin/src/pages/system/backendRouting/index.vue @@ -9,11 +9,11 @@ --> - +
- +
@@ -24,7 +24,8 @@ :model="treeData" default-tree-node-name="默认文件夹" default-leaf-node-name="默认接口名" - v-bind:default-expanded="true" + v-bind:default-expanded="false" + :expand-only-one="true" >
- +
@@ -581,9 +582,15 @@ export default { }, methods: { syncRoute() { - syncRoute(this.app_name).then((res) => { - this.getInterfaceList('one'); - this.$Message.success(res.msg); + this.$Modal.warning({ + title: '立即同步', + content: '您确认立即同步路由权限？', + onOk: () => { + syncRoute(this.app_name).then((res) => { + this.getInterfaceList('one'); + this.$Message.success(res.msg); + }); + }, }); }, debugging() { @@ -616,6 +623,9 @@ export default { if (res.data.length) { res.data[0].expand = false; this.treeData = new Tree(res.data); + this.$nextTick((e) => { + if (disk_type) document.querySelectorAll('.vtl-icon-caret-right')[0].click(); + }); if (res.data[0].children && res.data[0].children.length) { this.onClick(res.data[0].children[0]); } @@ -960,12 +970,14 @@ export default { margin-left: 10px; } .card-tree { + background: #fff; height: 72px; box-sizing: border-box; overflow-x: scroll; /* 设置溢出滚动 */ white-space: nowrap; overflow-y: hidden; /* 隐藏滚动条 */ + border-radius: 4px; scrollbar-width: none; /* firefox */ -ms-overflow-style: none; /* IE 10+ */ } @@ -977,15 +989,23 @@ export default { display: flex; .main-btn { display:flex; + position: sticky; + padding: 15px 15px 0 15px; + width: 100%; + background: #fff; + top: 0px; + background-color: rgba(255, 255, 255, 0.6); + backdrop-filter: blur(4px); } .card-tree{ - width: 270px; + width: 290px; height: calc(100vh - 115px); overflow-y: scroll; } >>> .tree { .tree-list{ margin-left:10px; + padding: 0 15px; } .vtl-caret{ diff --git a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue index 16de791c8..3471d0104 100644 --- a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue +++ b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue @@ -45,7 +45,12 @@
用于生成模块名称
- +
用于生成CRUD指定的表名，不需要携带表前缀；对于生成过的表将不能在进行生成；或者可以删除对应的文件重新生成！对应系统中重要的数据表将不允许生成！
@@ -269,6 +274,9 @@ export default { this.addRow(); } }, + initTableName() { + this.tableField = []; + }, addRow() { if (!this.foundation.tableName) return this.$Message.warning('请先填写表名'); if (!this.tableField.length) { From 913d8453399299051a8ecef2be4a930da25f0dca Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sun, 23 Apr 2023 15:36:06 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/system/SystemCrudServices.php | 4 +- crmeb/crmeb/services/crud/Service.php | 2 + crmeb/crmeb/services/crud/Validate.php | 37 +++++++++++++++++++ .../crud/stubs/validate/crudValidate.stub | 4 +- 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index 6f0673bc4..d48bacfec 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -538,7 +538,9 @@ class SystemCrudServices extends BaseServices ]); //生成验证器 $validate = app()->make(Validate::class); - $validate->setFilePathName($filePath['validate'] ?? '')->setbasePath($basePath)->handle($tableName); + $validate->setFilePathName($filePath['validate'] ?? '')->setbasePath($basePath)->handle($tableName, [ + 'field' => $options['fromField'], + ]); //生成控制器 $controller = app()->make(Controller::class); $controller->setFilePathName($filePath['controller'] ?? '')->setbasePath($basePath)->handle($tableName, [ diff --git a/crmeb/crmeb/services/crud/Service.php b/crmeb/crmeb/services/crud/Service.php index 43aded7dc..995a75a15 100644 --- a/crmeb/crmeb/services/crud/Service.php +++ b/crmeb/crmeb/services/crud/Service.php @@ -148,6 +148,7 @@ class Service extends Make */ protected function getframeImageOnePhpContent(string $field, string $name, bool $required = false, string $icon = 'ios-add', string $width = '950px', string $height = '505px') { + $name = addslashes($name); $requiredText = $required ? '->required()' : ''; $content = << '$field']), \$info['$field'] ?? '')->icon('$icon')->width('$width')->height('$height')->modal(['footer-hide' => true])$requiredText @@ -170,6 +171,7 @@ CONTENT; */ protected function getframeImagesPhpContent(string $field, string $name, bool $required = false, string $icon = 'ios-images', int $maxLength = 10, string $width = '950px', string $height = '505px') { + $name = addslashes($name); $requiredText = $required ? '->required()' : ''; $content = << '$field', 'type' => 'many', 'maxLength' => $maxLength]), \$info['$field'] ?? [])->maxLength($maxLength)->icon('$icon')->width('$width')->height('$height')->modal(['footer-hide' => true])$requiredText diff --git a/crmeb/crmeb/services/crud/Validate.php b/crmeb/crmeb/services/crud/Validate.php index 0bcf3b099..ba19816f6 100644 --- a/crmeb/crmeb/services/crud/Validate.php +++ b/crmeb/crmeb/services/crud/Validate.php @@ -38,6 +38,43 @@ class Validate extends Make return 'app' . DS . 'adminapi' . DS . 'validate' . DS . 'crud'; } + /** + * @param string $name + * @param array $options + * @return Validate + * @author 等风来 + * @email 136327134@qq.com + * @date 2023/4/23 + */ + public function handle(string $name, array $options = []) + { + [$rule, $message] = $this->getRuleContent($options['field']); + $this->value['rule-php'] = $rule; + $this->value['message-php'] = $message; + return parent::handle($name, $options); // TODO: Change the autogenerated stub + } + + /** + * @param array $field + * @return array + * @author 等风来 + * @email 136327134@qq.com + * @date 2023/4/23 + */ + protected function getRuleContent(array $field) + { + $content = []; + $message = []; + foreach ($field as $item) { + $item['name'] = addslashes($item['name']); + if ($item['required']) { + $content[] = $this->tab(2) . '\'' . $item['field'] . '\'=>\'require\''; + $message[] = $this->tab(2) . '\'' . $item['field'] . '.require\'=>\'' . $item['name'] . '必须填写\''; + } + } + return [implode("\n", $content), implode("\n", $message)]; + } + /** * 模板文件配置 * @param string $type diff --git a/crmeb/crmeb/services/crud/stubs/validate/crudValidate.stub b/crmeb/crmeb/services/crud/stubs/validate/crudValidate.stub index 1c952bae7..b77ce6a09 100644 --- a/crmeb/crmeb/services/crud/stubs/validate/crudValidate.stub +++ b/crmeb/crmeb/services/crud/stubs/validate/crudValidate.stub @@ -33,14 +33,14 @@ class {%nameCamel%}Validate extends Validate * @var array */ protected $rule = [ - +{%rule-php%} ]; /** * @var array */ protected $message = [ - +{%message-php%} ]; /** From e7349e6a9e6c49a8ddbfcb401eced7e8ea6d401e Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sun, 23 Apr 2023 16:17:27 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemCrudServices.php | 6 ++++++ crmeb/app/services/system/SystemRouteServices.php | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index d48bacfec..df4442d25 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -354,6 +354,12 @@ class SystemCrudServices extends BaseServices 'add_time' => date('Y-m-d H:i:s') ], ]; + $routeService = app()->make(SystemRouteServices::class); + foreach ($ruleData as $key => $item) { + if ($routeService->count(['method' => $item['method'], 'path' => $item['path']])) { + unset($ruleData[$key]); + } + } app()->make(SystemRouteServices::class)->saveAll($ruleData); //记录权限加入菜单表 $menuData = []; diff --git a/crmeb/app/services/system/SystemRouteServices.php b/crmeb/app/services/system/SystemRouteServices.php index 73fa48f41..20b17b1ac 100644 --- a/crmeb/app/services/system/SystemRouteServices.php +++ b/crmeb/app/services/system/SystemRouteServices.php @@ -204,7 +204,8 @@ class SystemRouteServices extends BaseServices $cateId = $commmonId; } else { if (!isset($item['option']['cate_name'])) { - $cateId = $id; + $rule = explode('/', $item['rule']); + $cateId = $this->topCateId($app, $rule[0]); } else { $cateId = $this->topCateId($app, $item['option']['cate_name']); } From a397a9b51aabefc7564f3ce13a924611e8578803 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sun, 23 Apr 2023 16:23:02 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=9A=84=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemCrudServices.php | 6 +++--- crmeb/crmeb/services/crud/stubs/route/delete.stub | 2 +- crmeb/crmeb/services/crud/stubs/route/save.stub | 2 +- crmeb/crmeb/services/crud/stubs/route/update.stub | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crmeb/app/services/system/SystemCrudServices.php b/crmeb/app/services/system/SystemCrudServices.php index df4442d25..e76702b81 100644 --- a/crmeb/app/services/system/SystemCrudServices.php +++ b/crmeb/app/services/system/SystemCrudServices.php @@ -320,7 +320,7 @@ class SystemCrudServices extends BaseServices [ 'path' => $routeName, 'method' => 'POST', - 'name' => $modelName . '保存数据接口', + 'name' => $modelName . '保存接口', 'app_name' => 'adminapi', 'cate_id' => $cateId, 'unique_auth' => '', @@ -338,7 +338,7 @@ class SystemCrudServices extends BaseServices [ 'path' => $routeName . '/', 'method' => 'PUT', - 'name' => $modelName . '修改数据接口', + 'name' => $modelName . '修改接口', 'app_name' => 'adminapi', 'cate_id' => $cateId, 'unique_auth' => '', @@ -347,7 +347,7 @@ class SystemCrudServices extends BaseServices [ 'path' => $routeName . '/', 'method' => 'DELETE', - 'name' => $modelName . '删除数据接口', + 'name' => $modelName . '删除接口', 'app_name' => 'adminapi', 'cate_id' => $cateId, 'unique_auth' => '', diff --git a/crmeb/crmeb/services/crud/stubs/route/delete.stub b/crmeb/crmeb/services/crud/stubs/route/delete.stub index a38392a27..c75398711 100644 --- a/crmeb/crmeb/services/crud/stubs/route/delete.stub +++ b/crmeb/crmeb/services/crud/stubs/route/delete.stub @@ -1 +1 @@ -Route::delete('{%route%}/:id', 'crud.{%routePath%}{%controller%}/delete')->option(['real_name' => '{%menus%}删除数据接口']); +Route::delete('{%route%}/:id', 'crud.{%routePath%}{%controller%}/delete')->option(['real_name' => '{%menus%}删除接口']); diff --git a/crmeb/crmeb/services/crud/stubs/route/save.stub b/crmeb/crmeb/services/crud/stubs/route/save.stub index b950a91d8..795390ab9 100644 --- a/crmeb/crmeb/services/crud/stubs/route/save.stub +++ b/crmeb/crmeb/services/crud/stubs/route/save.stub @@ -1 +1 @@ -Route::post('{%route%}', 'crud.{%routePath%}{%controller%}/save')->option(['real_name' => '{%menus%}保存数据接口']); +Route::post('{%route%}', 'crud.{%routePath%}{%controller%}/save')->option(['real_name' => '{%menus%}保存接口']); diff --git a/crmeb/crmeb/services/crud/stubs/route/update.stub b/crmeb/crmeb/services/crud/stubs/route/update.stub index d982677d3..5e03fd7ab 100644 --- a/crmeb/crmeb/services/crud/stubs/route/update.stub +++ b/crmeb/crmeb/services/crud/stubs/route/update.stub @@ -1 +1 @@ -Route::put('{%route%}/:id', 'crud.{%routePath%}{%controller%}/update')->option(['real_name' => '{%menus%}修改数据接口']); +Route::put('{%route%}/:id', 'crud.{%routePath%}{%controller%}/update')->option(['real_name' => '{%menus%}修改接口']); From 2098f485c7b86b50acea2fbd636614dc72435198 Mon Sep 17 00:00:00 2001 From: liaofei <136327134@qq.com> Date: Sun, 23 Apr 2023 16:25:24 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9miss=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E4=B8=8D=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemRouteServices.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/crmeb/app/services/system/SystemRouteServices.php b/crmeb/app/services/system/SystemRouteServices.php index 20b17b1ac..3eab6d611 100644 --- a/crmeb/app/services/system/SystemRouteServices.php +++ b/crmeb/app/services/system/SystemRouteServices.php @@ -204,8 +204,13 @@ class SystemRouteServices extends BaseServices $cateId = $commmonId; } else { if (!isset($item['option']['cate_name'])) { - $rule = explode('/', $item['rule']); - $cateId = $this->topCateId($app, $rule[0]); + if (strstr($item['rule'], '') === false) { + $rule = explode('/', $item['rule']); + $cateId = $this->topCateId($app, $rule[0]); + } else { + //miss路由不写入 + continue; + } } else { $cateId = $this->topCateId($app, $item['option']['cate_name']); } From 0e3b376df9e592389fe6f3105457130ca0dca81f Mon Sep 17 00:00:00 2001 From: From-wh Date: Sun, 23 Apr 2023 16:37:00 +0800 Subject: [PATCH 6/8] =?UTF-8?q?improve:=20=E8=A3=85=E4=BF=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/src/components/diyComponents/c_txt_list.vue | 11 ++++++----- template/admin/src/pages/setting/devise/diyIndex.vue | 5 +++-- template/admin/src/pages/setting/devise/index.vue | 7 ++++--- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/template/admin/src/components/diyComponents/c_txt_list.vue b/template/admin/src/components/diyComponents/c_txt_list.vue index 9de81f043..e11bbc216 100644 --- a/template/admin/src/components/diyComponents/c_txt_list.vue +++ b/template/admin/src/components/diyComponents/c_txt_list.vue @@ -115,24 +115,25 @@ export default { }, addHotTxt() { let val = { - children: [ + chiild: [ { max: 20, pla: '选填，不超过四个字', title: '标题', - val: 'CRMEB v4.2.2 正式发布', + val: '', }, { max: 99, pla: '选填', title: '链接', - val: '链接', + val: '', }, ], }; if (this.name == 'newList') { - let obj = JSON.parse(JSON.stringify(this.datas[this.name].list[this.datas[this.name].list.length - 1])); - this.datas[this.name].list.push(obj); + let arrs = this.datas[this.name].list[this.datas[this.name].list.length - 1]; + let obj = arrs ? JSON.parse(JSON.stringify(arrs)) : ''; + this.datas[this.name].list.push(obj || val); return; } if (this.datas[this.name].list.length == 0) { diff --git a/template/admin/src/pages/setting/devise/diyIndex.vue b/template/admin/src/pages/setting/devise/diyIndex.vue index a9baa851e..ce7708b81 100644 --- a/template/admin/src/pages/setting/devise/diyIndex.vue +++ b/template/admin/src/pages/setting/devise/diyIndex.vue @@ -477,9 +477,10 @@ export default { log(evt) { // 中间拖拽排序 if (evt.moved) { - if (evt.moved.element.name == 'search_box') { + if (evt.moved.element.name == 'search_box' || evt.moved.element.name == 'nav_bar') { return this.$Message.warning('该组件禁止拖拽'); } + // if (evt.moved.element.name == "nav_bar") { // return this.$Message.warning("该组件禁止拖拽"); // } @@ -542,7 +543,7 @@ export default { return; } } - if (item.name == 'search_box') { + if (item.name == 'search_box' || item.name == 'nav_bar') { return this.$Message.warning('该组件禁止移动'); } // if (item.name == "nav_bar") { diff --git a/template/admin/src/pages/setting/devise/index.vue b/template/admin/src/pages/setting/devise/index.vue index ef5c3f1ba..67778be2f 100644 --- a/template/admin/src/pages/setting/devise/index.vue +++ b/template/admin/src/pages/setting/devise/index.vue @@ -207,7 +207,7 @@ export default { components: { footPage, html2canvas, - draggable: vuedraggable + draggable: vuedraggable, }, filters: { filterTxt(val) { @@ -402,7 +402,7 @@ export default { log(evt) { // 中间拖拽排序 if (evt.moved) { - if (evt.moved.element.name == 'search_box') { + if (evt.moved.element.name == 'search_box' || evt.moved.element.name == 'nav_bar') { return this.$Message.warning('该组件禁止拖拽'); } // if (evt.moved.element.name == "nav_bar") { @@ -467,9 +467,10 @@ export default { return; } } - if (item.name == 'search_box') { + if (item.name == 'search_box' || item.name == 'nav_bar') { return this.$Message.warning('该组件禁止移动'); } + console.log(item); // if (item.name == "nav_bar") { // return this.$Message.warning("该组件禁止移动"); // } From cbdeee0c2d53bf43bff07bcb6f80955e5b3770cc Mon Sep 17 00:00:00 2001 From: From-wh Date: Sun, 23 Apr 2023 16:37:44 +0800 Subject: [PATCH 7/8] =?UTF-8?q?improve:=20=E5=95=86=E5=93=81=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E9=93=BE=E6=8E=A5=E5=A4=84=E7=90=86;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/App.vue | 1 - template/uni-app/components/productConSwiper/index.vue | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/template/uni-app/App.vue b/template/uni-app/App.vue index c3e89caa2..89173b6ee 100644 --- a/template/uni-app/App.vue +++ b/template/uni-app/App.vue @@ -163,7 +163,6 @@ getLangVersion().then(res => { let version = res.data.version if (version != uni.getStorageSync('LANG_VERSION')) { - console.log('我变了') getLangJson().then(res => { let value = Object.keys(res.data)[0] Cache.set('locale', Object.keys(res.data)[0]) diff --git a/template/uni-app/components/productConSwiper/index.vue b/template/uni-app/components/productConSwiper/index.vue index 6f408941c..aba0879b6 100644 --- a/template/uni-app/components/productConSwiper/index.vue +++ b/template/uni-app/components/productConSwiper/index.vue @@ -6,14 +6,14 @@ - - + @@ -33,7 +33,7 @@ - + @@ -95,8 +95,8 @@ }, bindPause: function() { // #ifndef APP-PLUS - this.videoContext.play(); this.$set(this, 'controls', false) + this.videoContext.play(); this.autoplay = false // #endif // #ifdef APP-PLUS From 56a982ec253c17ab622950d38fb17cce490ab6f4 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sun, 23 Apr 2023 16:37:59 +0800 Subject: [PATCH 8/8] =?UTF-8?q?improve:=20=E8=81=8A=E5=A4=A9=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/extension/customer_list/chat.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/template/uni-app/pages/extension/customer_list/chat.vue b/template/uni-app/pages/extension/customer_list/chat.vue index e2552b5df..e2dac913e 100644 --- a/template/uni-app/pages/extension/customer_list/chat.vue +++ b/template/uni-app/pages/extension/customer_list/chat.vue @@ -80,8 +80,7 @@ - + {{$t(`订单号`)}}: {{ item.orderInfo.order_id }} @@ -639,18 +638,19 @@ .footer-box { display: flex; align-items: center; - padding: 0 30rpx; color: rgba(0, 0, 0, 0.8); background: #f7f7f7; /* #ifdef APP-PLUS */ + padding: 0 30rpx; height: 70rpx; height: (70rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ height: calc(70rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ - /* #endif */ - /* #ifndef APP-PLUS */ - height: 100rpx; - height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ - height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ + /* #endif */ + + /* #ifndef APP-PLUS */ + padding: 0 30rpx 15rpx 30rpx; + height: 115rpx; + /* #endif */ .words .icon-tupian { font-size: 50rpx;