Merge remote-tracking branch 'origin/master'

xinruanbaba · Sep 23, 2022 · 2ccc93f · 2ccc93f
2 parents 0f2f091 + 207916a
commit 2ccc93f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/doc/基本开发文档/文件上传.md b/doc/基本开发文档/文件上传.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
@@ -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
@@ -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
@@ -31,7 +31,7 @@
       <!-- 状态 -->
       <el-table-column label="状态" prop="status" align="center">
         <template slot-scope="{row}">
-          <el-tag v-if="row.status === 0" size="small" type="danger">{{ $t("product.category.offline") }}</el-tag>
+          <el-tag v-if="row.status === 0" size="small" type="danger">{{ $t("product.category.disable") }}</el-tag>
           <el-tag v-else size="small">{{ $t("product.category.normal") }}</el-tag>
         </template>
       </el-table-column>

diff --git 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
@@ -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")));
     }
 }