Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

� Conflicts:
�	yudao-ui-admin/yarn.lock

Author: shizhong

.env.demo1024

@@ -17,6 +17,9 @@ VUE_APP_APP_NAME ='/admin-ui/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.dev

@@ -13,6 +13,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.local

@@ -14,6 +14,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.prod

@@ -15,6 +15,9 @@ VUE_APP_APP_NAME ='yudao-admin'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.env.stage

@@ -15,6 +15,9 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.eslintignore

@@ -7,4 +7,4 @@ public
 # 忽略当前目录下为js的文件的语法检查
 *.js
 # 忽略当前目录下为vue的文件的语法检查
-*.vue
+*.vue

package.json

@@ -51,6 +51,7 @@
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
     "jsencrypt": "3.0.0-rc.1",
+    "crypto-js": "^4.0.0",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

src/api/login.js

@@ -1,17 +1,17 @@
 import request from '@/utils/request'
-import {getRefreshToken} from "@/utils/auth";
-import service from "@/utils/request";
+import { getRefreshToken } from '@/utils/auth'
+import service from '@/utils/request'
 
 // 登录方法
-export function login(username, password, code, uuid,
-                      socialType, socialCode, socialState) {
+export function login(username, password, captchaVerification, socialType, socialCode, socialState) {
   const data = {
     username,
     password,
-    code,
-    uuid,
+    captchaVerification,
     // 社交相关
-    socialType, socialCode, socialState
+    socialType,
+    socialCode,
+    socialState
   }
   return request({
     url: '/system/auth/login',
@@ -36,15 +36,6 @@ export function logout() {
   })
 }
 
-// 获取验证码
-export function getCodeImg() {
-  return request({
-    url: '/system/captcha/get-image',
-    method: 'get',
-    timeout: 20000
-  })
-}
-
 // 社交授权的跳转
 export function socialAuthRedirect(type, redirectUri) {
   return request({
@@ -108,20 +99,20 @@ export function getAuthorize(clientId) {
 }
 
 export function authorize(responseType, clientId, redirectUri, state,
-                          autoApprove, checkedScopes, uncheckedScopes) {
+  autoApprove, checkedScopes, uncheckedScopes) {
   // 构建 scopes
-  const scopes = {};
+  const scopes = {}
   for (const scope of checkedScopes) {
-    scopes[scope] = true;
+    scopes[scope] = true
   }
   for (const scope of uncheckedScopes) {
-    scopes[scope] = false;
+    scopes[scope] = false
   }
   // 发起请求
   return service({
     url: '/system/oauth2/authorize',
-    headers:{
-      'Content-type': 'application/x-www-form-urlencoded',
+    headers: {
+      'Content-type': 'application/x-www-form-urlencoded'
     },
     params: {
       response_type: responseType,

src/api/mall/CouponTemplete/CouponTemplete.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 创建优惠券模板
+export function create(data) {
+  return request({
+    url: '/coupon/template/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新优惠券模板
+export function update(data) {
+  return request({
+    url: '/coupon/template/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除优惠券模板
+export function deleteCouponTemplete (id) {
+  return request({
+    url: '/coupon/template/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得优惠券模板
+export function get(id) {
+  return request({
+    url: '/coupon/template/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得优惠券模板分页
+export function getPage(query) {
+  return request({
+    url: '/coupon/template/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出优惠券模板 Excel
+export function exportExcel(query) {
+  return request({
+    url: '/coupon/template/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/mall/product/brand.js

@@ -34,6 +34,15 @@ export function getBrand(id) {
   })
 }
 
+// 获得品牌list
+export function getBrandList() {
+  return request({
+    url: '/product/brand/list',
+    method: 'get'
+  })
+}
+
+
 // 获得品牌分页
 export function getBrandPage(query) {
   return request({