!396 增加商城的提示

Merge pull request !396 from 芋道源码/feature/dev-yunai

!396 增加商城的提示
Merge pull request !396 from 芋道源码/feature/dev-yunai
芋道源码 · Gitee
2 parents 111e944d 53767614
Showing 22 changed files with 48 additions and 10 deletions
yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/package-info.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/web/package-info.java
yudao-server/src/main/java/cn/iocoder/yudao/server/controller/DefaultController.java
yudao-ui-admin/src/components/DocAlert/index.vue
yudao-ui-admin/src/utils/request.js
yudao-ui-admin/src/views/infra/build/RightPanel.vue
yudao-ui-admin/src/views/mall/market/banner/index.vue
yudao-ui-admin/src/views/mall/product/brand/index.vue
yudao-ui-admin/src/views/mall/product/category/index.vue
yudao-ui-admin/src/views/mall/product/property/index.vue
yudao-ui-admin/src/views/mall/product/property/value.vue
yudao-ui-admin/src/views/mall/product/spu/index.vue
yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue
yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
@@ -44,6 +44,10 @@ public class BannerApplicationRunner implements ApplicationRunner {
             if (isNotPresent("cn.iocoder.yudao.module.mp.framework.mp.config.MpConfiguration")) {
                 System.out.println("[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]");
             }
+            // 微信公众号
+            if (isNotPresent("cn.iocoder.yudao.module.trade.framework.web.config.TradeWebConfiguration")) {
+                System.out.println("[商城 yudao-module-mall - 已禁用][参考 https://doc.iocoder.cn/mall/build/ 开启]");
+            }
         });
     }
  
 /**
- * 属于 order 模块的 framework 封装
+ * 属于 trade 模块的 framework 封装
  *
  * @author 芋道源码
  */
@@ -6,19 +6,19 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
  
 /**
- * order 模块的 web 组件的 Configuration
+ * trade 模块的 web 组件的 Configuration
  *
  * @author 芋道源码
  */
 @Configuration(proxyBeanMethods = false)
-public class OrderWebConfiguration {
+public class TradeWebConfiguration {
  
     /**
-     * order 模块的 API 分组
+     * trade 模块的 API 分组
      */
     @Bean
-    public GroupedOpenApi orderGroupedOpenApi() {
-        return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("order");
+    public GroupedOpenApi tradeGroupedOpenApi() {
+        return YudaoSwaggerAutoConfiguration.buildGroupedOpenApi("trade");
     }
  
 }
 /**
- * order 模块的 web 配置
+ * trade 模块的 web 配置
  */
 package cn.iocoder.yudao.module.trade.framework.web;
@@ -27,4 +27,12 @@ public class DefaultController {
                 "[微信公众号 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mp/build/ 开启]");
     }
  
+    @RequestMapping(value = {"/admin-api/product/**", // 商品中心
+            "/admin-api/trade/**", // 交易中心
+            "/admin-api/promotion/**"})  // 营销中心
+    public CommonResult<Boolean> mall404() {
+        return CommonResult.error(NOT_IMPLEMENTED.getCode(),
+                "[商城 yudao-module-mp - 已禁用][参考 https://doc.iocoder.cn/mall/build/ 开启]");
+    }
+
 }
@@ -28,5 +28,6 @@ export default {
 <style scoped>
 .el-alert--success.is-light {
   margin-bottom: 10px;
+  cursor: pointer;
 }
 </style>
@@ -119,6 +119,13 @@ service.interceptors.response.use(async res =&gt; {
       type: 'error'
     })
     return Promise.reject(new Error(msg))
+  } else if (code === 501) {
+    Message({
+      type: 'error',
+      duration: 0,
+      message: msg
+    })
+    return Promise.reject(new Error(msg))
   } else if (code === 901) {
     Message({
       type: 'error',
@@ -545,7 +545,7 @@
             <el-switch v-model="activeData.__config__.required" />
           </el-form-item>
  
-          <template v-if="activeData.__config__.layoutTree">
+          <template v-if="activeData.__config__.layoutTree" v-slot="{ node, data }">
             <el-divider>布局结构树</el-divider>
             <el-tree
               :data="[activeData.__config__]"
@@ -554,7 +554,7 @@
               default-expand-all
               draggable
             >
-              <span v-slot="{ node, data }">
+              <span>
                 <span class="node-label">
                   <svg-icon class="node-icon" :icon-class="data.__config__?data.__config__.tagIcon:data.tagIcon" />
                   {{ node.label }}
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
  
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
  
-«    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="品牌名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入品牌名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
  
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
  
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
+
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="属性项" prop="propertyId">
         <el-select v-model="queryParams.propertyId">
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
+
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="商品名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery"/>
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
+
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="会员昵称" prop="nickname">
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
  
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="82px">
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
  
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
  
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 <template>
     <div class="app-container">
+      <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
  
         <!-- 搜索工作栏 -->
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
  
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
  
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 <template>
   <div class="app-container">
+    <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
+
     <!-- 搜索工作栏 -->
     <!-- TODO: inline 看看是不是需要; v-show= 那块逻辑还是要的 -->
     <el-row :gutter="20">