diff --git "a/doc/\345\237\272\346\234\254\345\274\200\345\217\221\346\226\207\346\241\243/\346\226\207\344\273\266\344\270\212\344\274\240.md" "b/doc/\345\237\272\346\234\254\345\274\200\345\217\221\346\226\207\346\241\243/\346\226\207\344\273\266\344\270\212\344\274\240.md" index e27c248a..57dbe718 100644 --- "a/doc/\345\237\272\346\234\254\345\274\200\345\217\221\346\226\207\346\241\243/\346\226\207\344\273\266\344\270\212\344\274\240.md" +++ "b/doc/\345\237\272\346\234\254\345\274\200\345\217\221\346\226\207\346\241\243/\346\226\207\344\273\266\344\270\212\344\274\240.md" @@ -50,12 +50,7 @@ biz: - VUE_APP_RESOURCES_URL: 对应上面后台配置的resources-url - VUE_APP_RESOURCES_TYPE: 对应上面后台配置的type -2. `mall4cloud-pc` 这个项目修改 `plugins/config.js` - -- resourcesUrl: 对应上面后台配置的resources-url -- resourcesActionType: 对应上面后台配置的type - -3. `mall4cloud-uniapp` 这个项目修改 `src/utils/config.js` +2. `mall4cloud-uniapp` 这个项目修改 `src/utils/config.js` - resourcesUrl: 对应上面后台配置的resources-url - resourcesActionType: 对应上面后台配置的type diff --git a/front-end/mall4cloud-platform-master/src/lang/product/category/en.js b/front-end/mall4cloud-platform-master/src/lang/product/category/en.js index f01aa4dc..06c3eaab 100644 --- a/front-end/mall4cloud-platform-master/src/lang/product/category/en.js +++ b/front-end/mall4cloud-platform-master/src/lang/product/category/en.js @@ -12,6 +12,7 @@ export default { seq: 'seq', normal: 'normal', offline: 'Off shelf', + disable: 'disable', recommImgSize: 'Carousel pictures', categoryParent: 'Category parent', categoryNoNull: 'Category name cannot be empty', diff --git a/front-end/mall4cloud-platform-master/src/lang/product/category/zh.js b/front-end/mall4cloud-platform-master/src/lang/product/category/zh.js index fdf3c478..77405f5f 100644 --- a/front-end/mall4cloud-platform-master/src/lang/product/category/zh.js +++ b/front-end/mall4cloud-platform-master/src/lang/product/category/zh.js @@ -12,6 +12,7 @@ export default { seq: '排序', normal: '正常', offline: '下架', + disable: '禁用', recommImgSize: '建议图片尺寸为', categoryParent: '上级分类', categoryNoNull: '分类名称不能为空', diff --git a/front-end/mall4cloud-platform-master/src/views/platform/index-img/index.vue b/front-end/mall4cloud-platform-master/src/views/platform/index-img/index.vue index dc7f5e6c..1c01f2a3 100644 --- a/front-end/mall4cloud-platform-master/src/views/platform/index-img/index.vue +++ b/front-end/mall4cloud-platform-master/src/views/platform/index-img/index.vue @@ -31,7 +31,7 @@ diff --git a/front-end/mall4cloud-uniapp-master/src/pages/my/my.vue b/front-end/mall4cloud-uniapp-master/src/pages/my/my.vue index 98962d38..96313b43 100644 --- a/front-end/mall4cloud-uniapp-master/src/pages/my/my.vue +++ b/front-end/mall4cloud-uniapp-master/src/pages/my/my.vue @@ -229,9 +229,16 @@ export default { url: '/pages/free-shop/free-shop' }) } else { - uni.navigateTo({ - url: '/' + uni.showToast({ + title: '请登录账号', + duration: 2000, + icon: 'error' }) + setTimeout(() => { + uni.navigateTo({ + url: '/' + }) + }, 2000) } }, notOpen(title) { diff --git a/mall4cloud-search/src/main/java/com/mall4j/cloud/search/config/ElasticConfig.java b/mall4cloud-search/src/main/java/com/mall4j/cloud/search/config/ElasticConfig.java index 056fb8f3..930821b1 100644 --- a/mall4cloud-search/src/main/java/com/mall4j/cloud/search/config/ElasticConfig.java +++ b/mall4cloud-search/src/main/java/com/mall4j/cloud/search/config/ElasticConfig.java @@ -17,6 +17,6 @@ public class ElasticConfig { public RestHighLevelClient restHighLevelClient() { return new RestHighLevelClient( RestClient.builder( - new HttpHost("mall4cloud-elasticsearch", 9200, "http"))); + new HttpHost("192.168.1.46", 9200, "http"))); } }