前端：商品分类列表

admin-web/README.md

@@ -32,3 +32,7 @@ http://www.tuicool.com/articles/YrQ7j2a
 
 1.route目录下的文件需要加上文件头部注释（写清楚文件是什么功能）
 2.component文件需要加上头部注释 （写清楚改控件的用处）
+
+## 补充规范
+
+1. services 目录中，每个 api 文件，对应后端一个 api 服务。主要考虑是
\ No newline at end of file

admin-web/src/components/GlobalFooter/index.js

@@ -6,20 +6,20 @@ const GlobalFooter = ({ className, links, copyright }) => {
   const clsString = classNames(styles.globalFooter, className);
   return (
     <footer className={clsString}>
-      {links && (
-        <div className={styles.links}>
-          {links.map(link => (
-            <a
-              key={link.key}
-              title={link.key}
-              target={link.blankTarget ? '_blank' : '_self'}
-              href={link.href}
-            >
-              {link.title}
-            </a>
-          ))}
-        </div>
-      )}
+      {/*{links && (*/}
+        {/*<div className={styles.links}>*/}
+          {/*{links.map(link => (*/}
+            {/*<a*/}
+              {/*key={link.key}*/}
+              {/*title={link.key}*/}
+              {/*target={link.blankTarget ? '_blank' : '_self'}*/}
+              {/*href={link.href}*/}
+            {/*>*/}
+              {/*{link.title}*/}
+            {/*</a>*/}
+          {/*))}*/}
+        {/*</div>*/}
+      {/*)}*/}
       {copyright && <div className={styles.copyright}>{copyright}</div>}
     </footer>
   );

admin-web/src/defaultSettings.js

@@ -9,7 +9,7 @@ module.exports = {
   menu: {
     disableLocal: false,
   },
-  title: 'Ant Design Pro',
+  title: '小商城管理平台',
   pwa: true,
   // your iconfont Symbol Scrip Url
   // eg：//at.alicdn.com/t/font_1039637_btcrd5co4w.js

admin-web/src/layouts/UserLayout.js

@@ -29,9 +29,7 @@ const links = [
 ];
 
 const copyright = (
-  <Fragment>
-    Copyright <Icon type="copyright" /> 2018 蚂蚁金服体验技术部出品
-  </Fragment>
+  <a href='https://pc.qq.com/detail/1/detail_2661.html'>请使用谷歌浏览器(Chrome)获取最佳用户体验</a>
 );
 
 class UserLayout extends Component {
@@ -63,10 +61,10 @@ class UserLayout extends Component {
               <div className={styles.header}>
                 <Link to="/">
                   <img alt="logo" className={styles.logo} src={logo} />
-                  <span className={styles.title}>后台管理系统</span>
+                  <span className={styles.title}>小商城管理平台</span>
                 </Link>
               </div>
-              <div className={styles.desc}>TODO....</div>
+              {/*<div className={styles.desc}>TODO....</div>*/}
             </div>
             {children}
           </div>

admin-web/src/pages/Admin/AdminList.js

@@ -105,7 +105,7 @@ function List ({ dataSource, loading, pagination, searchParams, dispatch,
                   <a className={styles.tableDelete} onClick={() => handleDelete(record)}>
                     删除
                   </a>
-                </span> : ''
+                </span> : null
             }
           </Fragment>
         );
@@ -379,13 +379,14 @@ const RoleAssignModal = Form.create()(props => {
   );
 });
 
-@connect(({ adminList, loading }) => ({
+
+@connect(({ adminList }) => ({
   // list: adminList.list,
   // pagination: adminList.pagination,
   ...adminList,
-  loading: loading.models.resourceList,
 }))
 
+// 主界面
 @Form.create()
 class AdminList extends PureComponent {
   state = {

admin-web/src/pages/User/Login.js

@@ -108,62 +108,45 @@ class LoginPage extends Component {
               }}
             />
           </Tab>
-          <Tab key="mobile" tab={formatMessage({ id: 'app.login.tab-login-mobile' })}>
-            {login.status === 'error' &&
-              login.type === 'mobile' &&
-              !submitting &&
-              this.renderMessage(
-                formatMessage({ id: 'app.login.message-invalid-verification-code' })
-              )}
-            <Mobile
-              name="username"
-              placeholder={formatMessage({ id: 'form.phone-number.placeholder' })}
-              rules={[
-                {
-                  required: true,
-                  message: formatMessage({ id: 'validation.phone-number.required' }),
-                },
-                {
-                  pattern: /^1\d{10}$/,
-                  message: formatMessage({ id: 'validation.phone-number.wrong-format' }),
-                },
-              ]}
-            />
-            <Captcha
-              name="password"
-              placeholder={formatMessage({ id: 'form.verification-code.placeholder' })}
-              countDown={120}
-              onGetCaptcha={this.onGetCaptcha}
-              getCaptchaButtonText={formatMessage({ id: 'form.get-captcha' })}
-              getCaptchaSecondText={formatMessage({ id: 'form.captcha.second' })}
-              rules={[
-                {
-                  required: true,
-                  message: formatMessage({ id: 'validation.verification-code.required' }),
-                },
-              ]}
-            />
-          </Tab>
-          <div>
-            <Checkbox checked={autoLogin} onChange={this.changeAutoLogin}>
-              <FormattedMessage id="app.login.remember-me" />
-            </Checkbox>
-            <a style={{ float: 'right' }} href="">
-              <FormattedMessage id="app.login.forgot-password" />
-            </a>
-          </div>
+          {/*<Tab key="mobile" tab={formatMessage({ id: 'app.login.tab-login-mobile' })}>*/}
+            {/*{login.status === 'error' &&*/}
+              {/*login.type === 'mobile' &&*/}
+              {/*!submitting &&*/}
+              {/*this.renderMessage(*/}
+                {/*formatMessage({ id: 'app.login.message-invalid-verification-code' })*/}
+              {/*)}*/}
+            {/*<Mobile*/}
+              {/*name="username"*/}
+              {/*placeholder={formatMessage({ id: 'form.phone-number.placeholder' })}*/}
+              {/*rules={[*/}
+                {/*{*/}
+                  {/*required: true,*/}
+                  {/*message: formatMessage({ id: 'validation.phone-number.required' }),*/}
+                {/*},*/}
+                {/*{*/}
+                  {/*pattern: /^1\d{10}$/,*/}
+                  {/*message: formatMessage({ id: 'validation.phone-number.wrong-format' }),*/}
+                {/*},*/}
+              {/*]}*/}
+            {/*/>*/}
+            {/*<Captcha*/}
+              {/*name="password"*/}
+              {/*placeholder={formatMessage({ id: 'form.verification-code.placeholder' })}*/}
+              {/*countDown={120}*/}
+              {/*onGetCaptcha={this.onGetCaptcha}*/}
+              {/*getCaptchaButtonText={formatMessage({ id: 'form.get-captcha' })}*/}
+              {/*getCaptchaSecondText={formatMessage({ id: 'form.captcha.second' })}*/}
+              {/*rules={[*/}
+                {/*{*/}
+                  {/*required: true,*/}
+                  {/*message: formatMessage({ id: 'validation.verification-code.required' }),*/}
+                {/*},*/}
+              {/*]}*/}
+            {/*/>*/}
+          {/*</Tab>*/}
           <Submit loading={submitting}>
             <FormattedMessage id="app.login.login" />
           </Submit>
-          <div className={styles.other}>
-            <FormattedMessage id="app.login.sign-in-with" />
-            <Icon type="alipay-circle" className={styles.icon} theme="outlined" />
-            <Icon type="taobao-circle" className={styles.icon} theme="outlined" />
-            <Icon type="weibo-circle" className={styles.icon} theme="outlined" />
-            <Link className={styles.register} to="/user/register">
-              <FormattedMessage id="app.login.signup" />
-            </Link>
-          </div>
         </Login>
       </div>
     );

admin-web/src/pages/document.ejs

@@ -7,7 +7,7 @@
       name="viewport"
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
     />
-    <title>Ant Design Pro</title>
+    <title>小商城管理平台</title>
     <link rel="icon" href="/favicon.png" type="image/x-icon" />
   </head>
   <body>

mobile-web/src/api/product.js

+import request from "../config/request";
+
+export function getProductCategoryList(pid) {
+  return request({
+    url: 'product-api/users/category/list',
+    method: 'get',
+    params: {
+      pid
+    }
+  });
+}
\ No newline at end of file

mobile-web/src/config/request.js

-
 import axios from 'axios'
-import {baseUrl,dataSources} from './env';
+import {baseUrl, dataSources} from './env';
 import datas from '../data/data';
 
 
-const service =axios.create({
+const service = axios.create({
   baseURL: baseUrl, // api 的 base_url
   timeout: 5000, // request timeout
 });
 
-
-const servicef =function(parameter){
-  if(dataSources=='local'){
+const servicef = function (parameter) {
+  // debugger;
+  if (dataSources == 'local') {
     //定义回调函数和axios一致
-    const promist = new Promise(function(resolve,reject){
-        var data=datas[parameter.url];
-        if(typeof data=='string'){
-          data= JSON.parse(data);
+    const promist = new Promise(function (resolve, reject) {
+      var data = datas[parameter.url];
+      if (typeof data == 'string') {
+        data = JSON.parse(data);
       }
       resolve(data);
     })
@@ -26,7 +25,7 @@ const servicef =function(parameter){
 }
 
 
-  service.interceptors.request.use(
+service.interceptors.request.use(
   config => {
     // Do something before request is sent
     //   if (store.getters.token) {
@@ -41,9 +40,9 @@ const servicef =function(parameter){
     console.log(error) // for debug
     Promise.reject(error)
   }
-  )
+)
 
-  // response interceptor
+// response interceptor
 service.interceptors.response.use(
   //response => response,
   /**
@@ -53,8 +52,9 @@ service.interceptors.response.use(
    * 以下代码均为样例，请结合自生需求加以修改，若不需要，则可删除
    */
   response => {
+    // debugger;
     const res = response.data;
-      if (res.ResultCode !== 200) {
+    if (res.code !== 0) {
       // Message({
       //   message: res.message,
       //   type: 'error',
@@ -77,18 +77,20 @@ service.interceptors.response.use(
       console.log(1);
       return Promise.reject('error')
     } else {
-        if(typeof response.data.Tag=='string'){
-          return JSON.parse(response.data.Tag);
-        }else{
-          return response.data.Tag;
-        }
+      // if (typeof response.data.Tag == 'string') {
+      //   return JSON.parse(response.data.Tag);
+      // } else {
+      //   return response.data.Tag;
+      // }
+      // debugger;
+      return res.data;
     }
   },
   error => {
 
     return Promise.reject(error)
   }
-  )
+)
 
 
-  export default servicef
+export default servicef
\ No newline at end of file

product/product-application/src/main/java/cn/iocoder/mall/product/application/config/MVCConfiguration.java

@@ -3,10 +3,7 @@ package cn.iocoder.mall.product.application.config;
 import cn.iocoder.common.framework.config.GlobalExceptionHandler;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.*;
 
 @EnableWebMvc
 @Configuration
@@ -31,4 +28,13 @@ public class MVCConfiguration implements WebMvcConfigurer {
         registry.addResourceHandler("webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
     }
 
+    // TODO 芋艿，允许跨域
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedHeaders("*")
+                .allowedMethods("*")
+                .allowedOrigins("*");
+    }
+
 }
\ No newline at end of file

product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java

 package cn.iocoder.mall.product.application.controller.users;
 
+import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.product.api.ProductCategoryService;
 import cn.iocoder.mall.product.api.bo.ProductCategoryBO;
 import cn.iocoder.mall.product.application.convert.ProductCategoryConvert;
@@ -26,9 +27,9 @@ public class UsersProductCategoryController {
     @GetMapping("/list")
     @ApiOperation("获得指定编号下的子分类的数组")
     @ApiImplicitParam(name = "pid", value = "指定分类编号", required = true, example = "0")
-    public List<UsersProductCategoryVO> list(@RequestParam("pid") Integer pid) {
+    public CommonResult<List<UsersProductCategoryVO>> list(@RequestParam("pid") Integer pid) {
         List<ProductCategoryBO> result = productCategoryService.getListByPid(pid);
-        return ProductCategoryConvert.INSTANCE.convertToVO(result);
+        return CommonResult.success(ProductCategoryConvert.INSTANCE.convertToVO(result));
     }
 
 }
\ No newline at end of file