From 0e3b376df9e592389fe6f3105457130ca0dca81f Mon Sep 17 00:00:00 2001 From: From-wh Date: Sun, 23 Apr 2023 16:37:00 +0800 Subject: [PATCH 1/9] =?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 2/9] =?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 3/9] =?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; From 838d9a588396b94d245eb0967216782419f10763 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Sun, 23 Apr 2023 17:33:42 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=89=A9=E6=B5=81=E6=98=BE=E7=A4=BA=E8=A7=84=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/points_mall/logistics_details.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/template/uni-app/pages/points_mall/logistics_details.vue b/template/uni-app/pages/points_mall/logistics_details.vue index 3c5a792c0..6a7964c35 100644 --- a/template/uni-app/pages/points_mall/logistics_details.vue +++ b/template/uni-app/pages/points_mall/logistics_details.vue @@ -10,7 +10,8 @@ {{orderInfo.total_price}}{{$t(`积分`)}} x{{orderInfo.total_num}} - + + {{orderInfo.suk}} @@ -295,5 +296,10 @@ .logistics .logisticsCon .item .text .data .time { margin-left: 15rpx; + } + .gray-sty { + width: 100%; + font-size: 24rpx; + color: #999999; } From 1be3e759e3d26bc9b49869a35e6c49845b425271 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Sun, 23 Apr 2023 17:37:43 +0800 Subject: [PATCH 5/9] youhua --- template/admin/src/setting.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/admin/src/setting.js b/template/admin/src/setting.js index 3b51eaa25..84a509ef8 100644 --- a/template/admin/src/setting.js +++ b/template/admin/src/setting.js @@ -1,5 +1,5 @@ // 请求接口地址 如果没有配置自动获取当前网址路径 -const VUE_APP_API_URL = `https://v5.wuht.net/adminapi`||process.env.VUE_APP_API_URL || `${location.origin}/adminapi`; +const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`; const Setting = { // 路由前缀 From 3940ef3e391575551f08cb0380b25f0bba038501 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sun, 23 Apr 2023 17:43:47 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E9=97=AE=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/pages/system/backendRouting/index.vue | 1 + .../admin/src/pages/system/codeGeneration/index.vue | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/template/admin/src/pages/system/backendRouting/index.vue b/template/admin/src/pages/system/backendRouting/index.vue index 5921d074e..1bc485ada 100644 --- a/template/admin/src/pages/system/backendRouting/index.vue +++ b/template/admin/src/pages/system/backendRouting/index.vue @@ -589,6 +589,7 @@ export default { syncRoute(this.app_name).then((res) => { this.getInterfaceList('one'); this.$Message.success(res.msg); + this.$Modal.remove(); }); }, }); diff --git a/template/admin/src/pages/system/codeGeneration/index.vue b/template/admin/src/pages/system/codeGeneration/index.vue index a61ed5714..5d067e507 100644 --- a/template/admin/src/pages/system/codeGeneration/index.vue +++ b/template/admin/src/pages/system/codeGeneration/index.vue @@ -143,6 +143,19 @@ export default { this.bus.$emit('routesListChange'); }); }, + formatTwoStageRoutes(arr) { + if (arr.length <= 0) return false; + const newArr = []; + const cacheList = []; + arr.forEach((v) => { + if (v && v.meta && v.meta.keepAlive) { + newArr.push({ ...v }); + cacheList.push(v.name); + this.$store.dispatch('keepAliveNames/setCacheKeepAlive', cacheList); + } + }); + return newArr; + }, }, }; From 40b20bdd496206e74c9ca864bdd7e38612430728 Mon Sep 17 00:00:00 2001 From: From-wh Date: Sun, 23 Apr 2023 18:57:50 +0800 Subject: [PATCH 7/9] =?UTF-8?q?improve:=20=E6=96=87=E5=AD=97=E5=8F=8A?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/i18n/lang/zh-cn.js | 312 +++++++++--------- .../components/FoundationFor.vue | 4 +- .../src/pages/system/codeGeneration/index.vue | 2 +- 3 files changed, 159 insertions(+), 159 deletions(-) diff --git a/template/admin/src/i18n/lang/zh-cn.js b/template/admin/src/i18n/lang/zh-cn.js index 41b0e64eb..c20568800 100644 --- a/template/admin/src/i18n/lang/zh-cn.js +++ b/template/admin/src/i18n/lang/zh-cn.js @@ -1,159 +1,159 @@ // 定义内容 export default { - router: { - home: '首页', - system: '系统设置', - systemMenu: '菜单管理', - systemUser: '用户管理', - limits: '权限管理', - limitsFrontEnd: '前端控制', - limitsFrontEndPage: '页面权限', - limitsFrontEndBtn: '按钮权限', - limitsBackEnd: '后端控制', - limitsBackEndEndPage: '页面权限', - menu: '菜单嵌套', - menu1: '菜单1', - menu11: '菜单11', - menu12: '菜单12', - menu121: '菜单121', - menu122: '菜单122', - menu13: '菜单13', - menu2: '菜单2', - funIndex: '功能', - funTagsView: 'tagsView 操作', - funSignCanvas: '在线签名', - funCountup: 'countup 数字滚动', - funEchartsTree: 'echartsTree 树图', - funSelector: '图标选择器', - funWangEditor: 'wangEditor 编辑器', - funCropper: 'cropper 图片裁剪', - funMindMap: 'G6 思维导图', - funQrcode: 'qrcode 二维码生成', - funEchartsMap: '地理坐标/地图', - funPrintJs: '页面打印', - funClipboard: '复制剪切', - funScreenShort: 'web端自定义截屏', - pagesIndex: '页面', - pagesFiltering: '过滤筛选组件', - pagesFilteringDetails: '过滤筛选组件详情', - pagesFilteringDetails1: '过滤筛选组件详情111', - pagesIocnfont: 'iconfont 字体图标', - pagesElement: 'element 字体图标', - pagesAwesome: 'awesome 字体图标', - pagesCityLinkage: '城市多级联动', - pagesFormAdapt: '表单自适应', - pagesListAdapt: '列表自适应', - pagesWaterfall: '瀑布屏', - pagesSteps: '步骤条', - chartIndex: '大数据图表', - personal: '个人中心', - tools: '工具类集合', - layoutLinkView: '外链', - layoutIfameView: '内嵌 iframe', - }, - staticRoutes: { - signIn: '登录', - notFound: '找不到此页面', - noPower: '没有权限', - }, - user: { - title0: '组件大小', - title1: '语言切换', - title2: '菜单搜索', - title3: '布局配置', - title4: '消息', - title5: '开全屏', - title6: '关全屏', - dropdownDefault: '默认', - dropdownMedium: '中等', - dropdownSmall: '小型', - dropdownMini: '超小', - dropdown1: '首页', - dropdown2: '个人中心', - dropdown3: '404', - dropdown4: '401', - dropdown5: '退出登录', - dropdown6: '代码仓库', - searchPlaceholder: '菜单搜索：支持中文、路由路径', - newTitle: '通知', - newBtn: '全部已读', - newGo: '前往通知中心', - newDesc: '暂无通知', - logOutTitle: '提示', - logOutMessage: '此操作将退出登录, 是否继续?', - logOutConfirm: '确定', - logOutCancel: '取消', - logOutExit: '退出中', - logOutSuccess: '安全退出成功！', - }, - tagsView: { - refresh: '刷新', - close: '关闭', - closeOther: '关闭其它', - closeAll: '全部关闭', - fullscreen: '当前页全屏', - }, - notFound: { - foundTitle: '地址输入错误，请重新输入地址~', - foundMsg: '您可以先检查网址，然后重新输入或给我们反馈问题。', - foundBtn: '返回首页', - }, - layout: { - configTitle: '布局配置', - oneTitle: '全局主题', - menuBag: '菜单背景色', - twoTitle: '菜单 / 顶栏', - twoTopBar: '顶栏背景', - twoMenuBar: '菜单背景', - twoColumnsMenuBar: '分栏菜单背景', - twoTopBarColor: '顶栏默认字体颜色', - twoMenuBarColor: '菜单默认字体颜色', - twoColumnsMenuBarColor: '分栏菜单默认字体颜色', - twoIsTopBarColorGradual: '顶栏背景渐变', - twoIsMenuBarColorGradual: '菜单背景渐变', - twoIsMenuBarColorHighlight: '菜单字体背景高亮', - threeTitle: '界面设置', - threeIsCollapse: '菜单水平折叠', - threeIsUniqueOpened: '菜单手风琴', - threeIsFixedHeader: '固定 Header', - threeIsClassicSplitMenu: '经典布局分割菜单', - threeIsLockScreen: '开启锁屏', - threeLockScreenTime: '自动锁屏(s/秒)', - fourTitle: '界面显示', - fourIsShowLogo: '侧边栏 Logo', - fourIsBreadcrumb: '面包屑', - fourIsBreadcrumbIcon: '面包屑图标', - fourIsTagsview: '历史菜单', - fourIsTagsviewIcon: '历史菜单 图标', - fourIsFooter: 'Footer', - fourIsGrayscale: '灰色模式', - fourIsInvert: '色弱模式', - fourIsDark: '深色模式', - fourIsWartermark: '开启水印', - fourWartermarkText: '水印文案', - fiveTitle: '其它设置', - fiveTagsStyle: '标签风格', - themeStyle: '主题', - fiveAnimation: '主页面切换动画', - fiveColumnsAsideStyle: '分栏高亮风格', - fiveColumnsAsideLayout: '分栏布局风格', - sixTitle: '布局切换', - sixDefaults: '默认', - sixClassic: '经典', - sixTransverse: '横向', - sixColumns: '分栏', - tipText: '点击下方按钮，复制布局配置去 `src/store/modules/themeConfig.js` 中修改。', - copyText: '一键复制配置', - resetText: '一键恢复默认', - copyTextSuccess: '复制成功！', - copyTextError: '复制失败！', - }, - upgrade: { - title: '新版本升级', - msg: '新版本来啦，马上更新尝鲜吧！不用担心，更新很快的哦！', - desc: '提示：更新会还原默认配置', - btnOne: '残忍拒绝', - btnTwo: '马上更新', - btnTwoLoading: '更新中', - }, + router: { + home: '首页', + system: '系统设置', + systemMenu: '菜单管理', + systemUser: '用户管理', + limits: '权限管理', + limitsFrontEnd: '前端控制', + limitsFrontEndPage: '页面权限', + limitsFrontEndBtn: '按钮权限', + limitsBackEnd: '后端控制', + limitsBackEndEndPage: '页面权限', + menu: '菜单嵌套', + menu1: '菜单1', + menu11: '菜单11', + menu12: '菜单12', + menu121: '菜单121', + menu122: '菜单122', + menu13: '菜单13', + menu2: '菜单2', + funIndex: '功能', + funTagsView: 'tagsView 操作', + funSignCanvas: '在线签名', + funCountup: 'countup 数字滚动', + funEchartsTree: 'echartsTree 树图', + funSelector: '图标选择器', + funWangEditor: 'wangEditor 编辑器', + funCropper: 'cropper 图片裁剪', + funMindMap: 'G6 思维导图', + funQrcode: 'qrcode 二维码生成', + funEchartsMap: '地理坐标/地图', + funPrintJs: '页面打印', + funClipboard: '复制剪切', + funScreenShort: 'web端自定义截屏', + pagesIndex: '页面', + pagesFiltering: '过滤筛选组件', + pagesFilteringDetails: '过滤筛选组件详情', + pagesFilteringDetails1: '过滤筛选组件详情111', + pagesIocnfont: 'iconfont 字体图标', + pagesElement: 'element 字体图标', + pagesAwesome: 'awesome 字体图标', + pagesCityLinkage: '城市多级联动', + pagesFormAdapt: '表单自适应', + pagesListAdapt: '列表自适应', + pagesWaterfall: '瀑布屏', + pagesSteps: '步骤条', + chartIndex: '大数据图表', + personal: '个人中心', + tools: '工具类集合', + layoutLinkView: '外链', + layoutIfameView: '内嵌 iframe', + }, + staticRoutes: { + signIn: '登录', + notFound: '找不到此页面', + noPower: '没有权限', + }, + user: { + title0: '组件大小', + title1: '语言切换', + title2: '菜单搜索', + title3: '布局配置', + title4: '消息', + title5: '开全屏', + title6: '关全屏', + dropdownDefault: '默认', + dropdownMedium: '中等', + dropdownSmall: '小型', + dropdownMini: '超小', + dropdown1: '首页', + dropdown2: '个人中心', + dropdown3: '404', + dropdown4: '401', + dropdown5: '退出登录', + dropdown6: '代码仓库', + searchPlaceholder: '菜单搜索：支持中文、路由路径', + newTitle: '通知', + newBtn: '全部已读', + newGo: '前往通知中心', + newDesc: '暂无通知', + logOutTitle: '提示', + logOutMessage: '此操作将退出登录, 是否继续?', + logOutConfirm: '确定', + logOutCancel: '取消', + logOutExit: '退出中', + logOutSuccess: '安全退出成功！', + }, + tagsView: { + refresh: '刷新', + close: '关闭', + closeOther: '关闭其它', + closeAll: '全部关闭', + fullscreen: '当前页全屏', + }, + notFound: { + foundTitle: '地址输入错误，请重新输入地址~', + foundMsg: '您可以先检查网址，然后重新输入或给我们反馈问题。', + foundBtn: '返回首页', + }, + layout: { + configTitle: '布局配置', + oneTitle: '全局主题', + menuBag: '菜单背景色', + twoTitle: '菜单 / 顶栏', + twoTopBar: '顶栏背景', + twoMenuBar: '菜单背景', + twoColumnsMenuBar: '分栏菜单背景', + twoTopBarColor: '顶栏默认字体颜色', + twoMenuBarColor: '菜单默认字体颜色', + twoColumnsMenuBarColor: '分栏菜单默认字体颜色', + twoIsTopBarColorGradual: '顶栏背景渐变', + twoIsMenuBarColorGradual: '菜单背景渐变', + twoIsMenuBarColorHighlight: '菜单字体背景高亮', + threeTitle: '界面设置', + threeIsCollapse: '菜单水平折叠', + threeIsUniqueOpened: '菜单手风琴', + threeIsFixedHeader: '固定 Header', + threeIsClassicSplitMenu: '经典布局分割菜单', + threeIsLockScreen: '开启锁屏', + threeLockScreenTime: '自动锁屏(s/秒)', + fourTitle: '界面显示', + fourIsShowLogo: '侧边栏 Logo', + fourIsBreadcrumb: '面包屑', + fourIsBreadcrumbIcon: '面包屑图标', + fourIsTagsview: '历史菜单', + fourIsTagsviewIcon: '历史菜单 图标', + fourIsFooter: 'Footer', + fourIsGrayscale: '灰色模式', + fourIsInvert: '色弱模式', + fourIsDark: '深色模式', + fourIsWartermark: '开启水印', + fourWartermarkText: '水印文案', + fiveTitle: '其它设置', + fiveTagsStyle: '历史菜单风格', + themeStyle: '主题', + fiveAnimation: '主页面切换动画', + fiveColumnsAsideStyle: '分栏高亮风格', + fiveColumnsAsideLayout: '分栏布局风格', + sixTitle: '布局切换', + sixDefaults: '默认', + sixClassic: '经典', + sixTransverse: '横向', + sixColumns: '分栏', + tipText: '点击下方按钮，复制布局配置去 `src/store/modules/themeConfig.js` 中修改。', + copyText: '一键复制配置', + resetText: '一键恢复默认', + copyTextSuccess: '复制成功！', + copyTextError: '复制失败！', + }, + upgrade: { + title: '新版本升级', + msg: '新版本来啦，马上更新尝鲜吧！不用担心，更新很快的哦！', + desc: '提示：更新会还原默认配置', + btnOne: '残忍拒绝', + btnTwo: '马上更新', + btnTwoLoading: '更新中', + }, }; diff --git a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue index 3471d0104..8355d8ff4 100644 --- a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue +++ b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue @@ -42,7 +42,7 @@ -
用于生成模块名称
+
模块名称为中文或者英文，用在接口名称前缀、表单头部标题
 - +
- 代码生成 + 添加功能
From 44ce2bf685af597f1468020a6a301aa6024ea5fa Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 24 Apr 2023 10:44:15 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=92=8Cpc?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0icp=E5=A4=87=E6=A1=88=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E7=BD=91=E5=AE=89=E5=A4=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/pc/PublicController.php | 2 ++ .../api/controller/v1/PublicController.php | 3 +++ crmeb/app/api/route/v1.php | 2 -- .../pages/index/visualization/index.vue | 21 ++++++++++++++----- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/crmeb/app/api/controller/pc/PublicController.php b/crmeb/app/api/controller/pc/PublicController.php index a27240474..2af4a81e3 100644 --- a/crmeb/app/api/controller/pc/PublicController.php +++ b/crmeb/app/api/controller/pc/PublicController.php @@ -51,6 +51,8 @@ class PublicController $data['site_keywords'] = sys_config('site_keywords'); $data['site_description'] = sys_config('site_description'); $data['network_security'] = sys_config('network_security'); + $data['icp_url'] = sys_config('icp_url'); + $data['network_security_url'] = sys_config('network_security_url'); $logoUrl = sys_config('pc_logo'); if (strstr($logoUrl, 'http') === false && $logoUrl) { $logoUrl = sys_config('site_url') . $logoUrl; diff --git a/crmeb/app/api/controller/v1/PublicController.php b/crmeb/app/api/controller/v1/PublicController.php index 377c6c25e..e10d2d1a2 100644 --- a/crmeb/app/api/controller/v1/PublicController.php +++ b/crmeb/app/api/controller/v1/PublicController.php @@ -117,6 +117,9 @@ class PublicController public function getSiteConfig() { $data['record_No'] = sys_config('record_No'); + $data['icp_url'] = sys_config('icp_url'); + $data['network_security'] = sys_config('network_security'); + $data['network_security_url'] = sys_config('network_security_url'); return app('json')->success($data); } diff --git a/crmeb/app/api/route/v1.php b/crmeb/app/api/route/v1.php index a87fd31ee..24010e15d 100644 --- a/crmeb/app/api/route/v1.php +++ b/crmeb/app/api/route/v1.php @@ -365,8 +365,6 @@ Route::group(function () { Route::post('user/set_visit', 'v1.user.UserController/set_visit')->name('setVisit');// 添加用户访问记录 //复制口令接口 Route::get('copy_words', 'v1.PublicController/copy_words')->name('copyWords');// 复制口令接口 - //获取网站配置 - Route::get('site_config', 'v1.PublicController/getSiteConfig')->name('getSiteConfig');//获取网站配置 //活动---积分商城 Route::get('store_integral/index', 'v1.activity.StoreIntegralController/index')->name('storeIntegralIndex');//积分商城首页数据 diff --git a/template/uni-app/pages/index/visualization/index.vue b/template/uni-app/pages/index/visualization/index.vue index 96bf02933..b9d96666f 100644 --- a/template/uni-app/pages/index/visualization/index.vue +++ b/template/uni-app/pages/index/visualization/index.vue @@ -89,7 +89,8 @@ - {{site_config}} + {{site_config.record_No}} + {{site_config.network_security}} { - this.site_config = res.data.record_No; + this.site_config = res.data; }) .catch((err) => { return this.$util.Tips({ @@ -486,13 +487,23 @@ // #endif goICP() { // #ifdef H5 - window.open("http://beian.miit.gov.cn/"); + window.open(this.site_config.icp_url); // #endif // #ifdef MP uni.navigateTo({ - url: `/pages/annex/web_view/index?url=https://beian.miit.gov.cn/`, + url: `/pages/annex/web_view/index?url=` + this.site_config.icp_url, }); // #endif + }, + goNetwork() { + // #ifdef H5 + window.open(this.site_config.network_security_url); + // #endif + // #ifdef MP + uni.navigateTo({ + url: `/pages/annex/web_view/index?url=` + this.site_config.network_security_url, + }); + // #endif }, onLoadFun() {}, reconnect() { From a4a6bd7f3d7690800edbdd74c1d6e75b7950875a Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 24 Apr 2023 10:44:30 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/system/SystemDatabackupServices.php | 6 +++++- crmeb/app/services/system/log/SystemFileServices.php | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/crmeb/app/services/system/SystemDatabackupServices.php b/crmeb/app/services/system/SystemDatabackupServices.php index 1d5e79a1b..90ed20369 100644 --- a/crmeb/app/services/system/SystemDatabackupServices.php +++ b/crmeb/app/services/system/SystemDatabackupServices.php @@ -53,6 +53,9 @@ class SystemDatabackupServices extends BaseServices public function getDataList() { $list = $this->dbBackup->dataList(); + foreach ($list as &$item) { + $item['is_edit'] = false; + } $count = count($list); return compact('list', 'count'); } @@ -69,6 +72,7 @@ class SystemDatabackupServices extends BaseServices $count = count($list); foreach ($list as $key => $f) { $list[$key]['EXTRA'] = ($f['EXTRA'] == 'auto_increment' ? '是' : ' '); + $list[$key]['is_edit'] = false; } return compact('list', 'count'); } @@ -91,7 +95,7 @@ class SystemDatabackupServices extends BaseServices { $tables = explode(',', $tables); $data = ''; - ini_set ("memory_limit","-1"); + ini_set("memory_limit", "-1"); foreach ($tables as $t) { $res = $this->dbBackup->backup($t, 0); if ($res == false && $res != 0) { diff --git a/crmeb/app/services/system/log/SystemFileServices.php b/crmeb/app/services/system/log/SystemFileServices.php index 8990fa77d..ee84f82b7 100644 --- a/crmeb/app/services/system/log/SystemFileServices.php +++ b/crmeb/app/services/system/log/SystemFileServices.php @@ -288,6 +288,7 @@ class SystemFileServices extends BaseServices $navList[$key]['pathname'] = $value['pathname']; $navList[$key]['contextmenu'] = true; $list[$key]['mark'] = $markList[str_replace(root_path(), '/', $value['pathname'])] ?? ''; + $list[$key]['is_edit'] = false; } return compact('dir', 'list', 'navList'); }