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

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

Author: shizhong

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yudao-ui-admin",
-  "version": "1.6.4-snapshot",
+  "version": "1.6.5-snapshot",
   "description": "芋道管理系统",
   "author": "芋道",
   "license": "MIT",
@@ -47,7 +47,7 @@
     "clipboard": "2.0.8",
     "core-js": "^3.26.0",
     "crypto-js": "^4.0.0",
-    "echarts": "4.9.0",
+    "echarts": "5.4.0",
     "element-ui": "2.15.10",
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
@@ -60,7 +60,7 @@
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
     "throttle-debounce": "2.1.0",
-    "vue": "2.7.0",
+    "vue": "2.7.14",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.8",
     "vue-meta": "^2.4.0",
@@ -89,7 +89,7 @@
     "fs-extra": "^8.1.0",
     "lint-staged": "12.5.0",
     "runjs": "4.4.2",
-    "sass": "1.3.0",
+    "sass": "1.32.13",
     "sass-loader": "10.2.0",
     "script-ext-html-webpack-plugin": "2.1.5",
     "svg-sprite-loader": "5.1.1",

src/api/login.js

@@ -126,5 +126,23 @@ export function authorize(responseType, clientId, redirectUri, state,
   })
 }
 
+// 获取验证图片  以及token
+export function reqGet(data) {
+  return request({
+    url: 'system/captcha/get',
+    method: 'post',
+    data
+  })
+}
+
+// 滑动或者点选验证
+export function reqCheck(data) {
+  return request({
+    url: '/system/captcha/check',
+    method: 'post',
+    data
+  })
+}
+
 export class socialBindLogin {
 }

src/api/mall/product/property.js

@@ -1,6 +1,8 @@
 import request from '@/utils/request'
 
-// 创建规格名称
+// ------------------------ 属性项 -------------------
+
+// 创建属性项
 export function createProperty(data) {
   return request({
     url: '/product/property/create',
@@ -9,7 +11,7 @@ export function createProperty(data) {
   })
 }
 
-// 更新规格名称
+// 更新属性项
 export function updateProperty(data) {
   return request({
     url: '/product/property/update',
@@ -18,23 +20,23 @@ export function updateProperty(data) {
   })
 }
 
-// 删除规格名称
+// 删除属性项
 export function deleteProperty(id) {
   return request({
     url: '/product/property/delete?id=' + id,
     method: 'delete'
   })
 }
 
-// 获得规格名称
+// 获得属性项
 export function getProperty(id) {
   return request({
     url: '/product/property/get?id=' + id,
     method: 'get'
   })
 }
 
-// 获得规格名称分页
+// 获得属性项分页
 export function getPropertyPage(query) {
   return request({
     url: '/product/property/page',
@@ -43,7 +45,7 @@ export function getPropertyPage(query) {
   })
 }
 
-// 获得规格名称列表
+// 获得属性项列表
 export function getPropertyList(query) {
   return request({
     url: '/product/property/list',
@@ -52,29 +54,18 @@ export function getPropertyList(query) {
   })
 }
 
-// 获得规格名称列表
+// 获得属性项列表
 export function getPropertyListAndValue(query) {
   return request({
-    url: '/product/property/listAndValue',
+    url: '/product/property/get-value-list',
     method: 'get',
     params: query
   })
 }
 
+// ------------------------ 属性值 -------------------
 
-// 导出规格名称 Excel
-export function exportPropertyExcel(query) {
-  return request({
-    url: '/product/property/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// ------------------------ 规格名称值 -------------------
-
-// 获得规格名称值分页
+// 获得属性值分页
 export function getPropertyValuePage(query) {
   return request({
     url: '/product/property/value/page',
@@ -83,7 +74,7 @@ export function getPropertyValuePage(query) {
   })
 }
 
-// 获得规格名称值
+// 获得属性值
 export function getPropertyValue(id) {
   return request({
     url: '/product/property/value/get?id=' + id,
@@ -92,7 +83,7 @@ export function getPropertyValue(id) {
 }
 
 
-// 创建规格名称值
+// 创建属性值
 export function createPropertyValue(data) {
   return request({
     url: '/product/property/value/create',
@@ -101,7 +92,7 @@ export function createPropertyValue(data) {
   })
 }
 
-// 更新规格名称值
+// 更新属性值
 export function updatePropertyValue(data) {
   return request({
     url: '/product/property/value/update',
@@ -110,10 +101,13 @@ export function updatePropertyValue(data) {
   })
 }
 
-// 删除规格名称
+// 删除属性值
 export function deletePropertyValue(id) {
   return request({
     url: '/product/property/value/delete?id=' + id,
     method: 'delete'
   })
 }
+
+export class exportPropertyExcel {
+}

src/api/mall/product/spu.js

@@ -26,18 +26,10 @@ export function deleteSpu(id) {
   })
 }
 
-// 获得商品spu
-export function getSpu(id) {
-  return request({
-    url: '/product/spu/get?id=' + id,
-    method: 'get'
-  })
-}
-
 // 获得商品 SPU 详情
 export function getSpuDetail(id) {
   return request({
-    url: '/product/spu/get/detail?id=' + id,
+    url: '/product/spu/get-detail?id=' + id,
     method: 'get'
   })
 }

src/api/mall/promotion/seckillActivity.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建秒杀活动
+export function createSeckillActivity(data) {
+  return request({
+    url: '/promotion/seckill-activity/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新秒杀活动
+export function updateSeckillActivity(data) {
+  return request({
+    url: '/promotion/seckill-activity/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 关闭限时折扣活动
+export function closeSeckillActivity(id) {
+  return request({
+    url: '/promotion/seckill-activity/close?id=' + id,
+    method: 'put'
+  })
+}
+
+// 删除秒杀活动
+export function deleteSeckillActivity(id) {
+  return request({
+    url: '/promotion/seckill-activity/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得秒杀活动
+export function getSeckillActivity(id) {
+  return request({
+    url: '/promotion/seckill-activity/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得秒杀活动分页
+export function getSeckillActivityPage(query) {
+  return request({
+    url: '/promotion/seckill-activity/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/mall/promotion/seckillTime.js

@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 创建秒杀时段
+export function createSeckillTime(data) {
+  return request({
+    url: '/promotion/seckill-time/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新秒杀时段
+export function updateSeckillTime(data) {
+  return request({
+    url: '/promotion/seckill-time/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除秒杀时段
+export function deleteSeckillTime(id) {
+  return request({
+    url: '/promotion/seckill-time/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得秒杀时段
+export function getSeckillTime(id) {
+  return request({
+    url: '/promotion/seckill-time/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得秒杀时段分页
+export function getSeckillTimePage(query) {
+  return request({
+    url: '/promotion/seckill-time/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取所有的秒杀时段
+export function getSeckillTimeList() {
+  return request({
+    url: '/promotion/seckill-time/list',
+    method: 'get'
+  })
+}
+
+// 导出秒杀时段 Excel
+export function exportSeckillTimeExcel(query) {
+  return request({
+    url: '/promotion/seckill-time/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/mall/trade/afterSale.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获得交易售后
+export function getAfterSale(id) {
+  return request({
+    url: '/trade/after-sale/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得交易售后分页
+export function getAfterSalePage(query) {
+  return request({
+    url: '/trade/after-sale/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/mall/trade/order.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获得交易订单分页
+export function getOrderPage(query) {
+  return request({
+    url: '/trade/order/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得交易订单详情
+export function getOrderDetail(id) {
+  return request({
+    url: '/trade/order/get-detail?id=' + id,
+    method: 'get',
+  })
+}

src/api/system/area.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+// 获得地区树
+export function getAreaTree() {
+  return request({
+    url: '/system/area/tree',
+    method: 'get'
+  })
+}
+
+// 获得 IP 对应的地区名
+export function getAreaByIp(ip) {
+  return request({
+    url: '/system/area/get-by-ip?ip=' + ip,
+    method: 'get'
+  })
+}

src/assets/styles/ruoyi.scss

@@ -60,6 +60,10 @@
   color: inherit;
 }
 
+.el-message-box__status + .el-message-box__message{
+  word-break: break-word;
+}
+
 .el-dialog:not(.is-fullscreen) {
   margin-top: 6vh !important;
 }