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

 Conflicts:

	yudao-ui-admin/yarn.lock

yudao-ui-admin/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",

yudao-ui-admin/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 {
 }

yudao-ui-admin/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,7 +20,7 @@ export function updateProperty(data) {
   })
 }
 
-// 删除规格名称
+// 删除属性项
 export function deleteProperty(id) {
   return request({
     url: '/product/property/delete?id=' + id,
@@ -26,7 +28,7 @@ export function deleteProperty(id) {
   })
 }
 
-// 获得规格名称
+// 获得属性项
 export function getProperty(id) {
   return request({
     url: '/product/property/get?id=' + id,
@@ -34,7 +36,7 @@ export function getProperty(id) {
   })
 }
 
-// 获得规格名称分页
+// 获得属性项分页
 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 {
+}

yudao-ui-admin/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'
   })
 }

yudao-ui-admin/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
+  })
+}

yudao-ui-admin/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'
+  })
+}

yudao-ui-admin/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
+  })
+}

yudao-ui-admin/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',
+  })
+}

yudao-ui-admin/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'
+  })
+}

yudao-ui-admin/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;
 }

yudao-ui-admin/src/components/HeaderSearch/index.vue

@@ -88,7 +88,6 @@ export default {
         threshold: 0.4,
         location: 0,
         distance: 100,
-        maxPatternLength: 32,
         minMatchCharLength: 1,
         keys: [{
           name: 'title',

yudao-ui-admin/src/components/RightPanel/index.vue

@@ -53,7 +53,6 @@ export default {
     }
   },
   mounted() {
-    this.insertToBody()
     this.addEventClick()
   },
   beforeDestroy() {
@@ -70,11 +69,6 @@ export default {
         this.show = false
         window.removeEventListener('click', this.closeSidebar)
       }
-    },
-    insertToBody() {
-      const elx = this.$refs.rightPanel
-      const body = document.querySelector('body')
-      body.insertBefore(elx, body.firstChild)
     }
   }
 }

yudao-ui-admin/src/components/RightToolbar/index.vue

@@ -92,13 +92,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .el-transfer__button {
+:deep(.el-transfer__button) {
   border-radius: 50%;
   padding: 12px;
   display: block;
   margin-left: 0px;
 }
-::v-deep .el-transfer__button:first-child {
+:deep(.el-transfer__button:first-child) {
   margin-bottom: 10px;
 }
 </style>

yudao-ui-admin/src/components/TopNav/index.vue

@@ -1,14 +1,14 @@
 <template>
   <el-menu
-      :default-active="activeMenu"
-      mode="horizontal"
-      @select="handleSelect"
+    :default-active="activeMenu"
+    mode="horizontal"
+    @select="handleSelect"
   >
     <template v-for="(item, index) in topMenus">
-      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
-      ><svg-icon :icon-class="item.meta.icon" />
-        {{ item.meta.title }}</el-menu-item
-      >
+      <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
+        <svg-icon :icon-class="item.meta.icon"/>
+        {{ item.meta.title }}
+      </el-menu-item>
     </template>
 
     <!-- 顶部菜单超出数量折叠 -->
@@ -16,12 +16,13 @@
       <template slot="title">更多菜单</template>
       <template v-for="(item, index) in topMenus">
         <el-menu-item
-            :index="item.path"
-            :key="index"
-            v-if="index >= visibleNumber"
-        ><svg-icon :icon-class="item.meta.icon" />
-          {{ item.meta.title }}</el-menu-item
+          :index="item.path"
+          :key="index"
+          v-if="index >= visibleNumber"
         >
+          <svg-icon :icon-class="item.meta.icon"/>
+          {{ item.meta.title }}
+        </el-menu-item>
       </template>
     </el-submenu>
   </el-menu>
@@ -92,7 +93,9 @@ export default {
       if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
         const tmpPath = path.substring(1, path.length);
         activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
-        this.$store.dispatch('app/toggleSideBarHide', false);
+        if (!this.$route.meta.link) {
+          this.$store.dispatch('app/toggleSideBarHide', false)
+        }
       } else if(!this.$route.children) {
         activePath = path;
         this.$store.dispatch('app/toggleSideBarHide', true);
@@ -145,6 +148,8 @@ export default {
       }
       if(routes.length > 0) {
         this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+      } else {
+        this.$store.dispatch("app/toggleSideBarHide", true);
       }
     },
     ishttp(url) {

yudao-ui-admin/src/components/Verifition/Verify.vue

@@ -139,7 +139,6 @@ export default {
       let slider = 'slider' + '-' + s.join('')
       let point = 'point' + '-' + s.join('')
       // 判断下是否存在 slider
-      console.log(localStorage.getItem('slider'))
       if (!localStorage.getItem('slider')) {
         localStorage.setItem('slider', slider)
       }

yudao-ui-admin/src/components/Verifition/Verify/VerifyPoints.vue

@@ -60,7 +60,7 @@
  * */
 import { resetSize } from './../utils/util'
 import { aesEncrypt } from '@/utils/ase'
-import { reqGet, reqCheck } from './../api/index'
+import { reqGet, reqCheck } from '@/api/login'
 
 export default {
   name: 'VerifyPoints',
@@ -223,7 +223,6 @@ export default {
       this.checkPosArr.splice(0, this.checkPosArr.length)
       this.num = 1
       this.getPictrue()
-      this.text = '验证失败'
       this.showRefresh = true
     },
 

yudao-ui-admin/src/components/Verifition/Verify/VerifySlide.vue

@@ -64,7 +64,7 @@
  * */
 import { aesEncrypt } from '@/utils/ase'
 import { resetSize } from './../utils/util'
-import { reqGet, reqCheck } from './../api/index'
+import { reqGet, reqCheck } from '@/api/login'
 
 //  "captchaType":"blockPuzzle",
 export default {

yudao-ui-admin/src/components/Verifition/api/index.js

@@ -1,27 +0,0 @@
-/**
- * 此处可直接引用自己项目封装好的 axios 配合后端联调
- */
-
-import request from './../utils/axios' // 组件内部封装的axios
-// import request from "@/api/axios.js"       //调用项目封装的axios
-
-// 获取验证图片  以及token
-export function reqGet(data) {
-  return request({
-    // url: '/captcha/get',
-    url: '/admin-api/system/captcha/get', // 使用项目自定义的 /admin-api/ 前缀
-    method: 'post',
-    data
-  })
-}
-
-// 滑动或者点选验证
-export function reqCheck(data) {
-  return request({
-    // url: '/captcha/check',
-    url: '/admin-api/system/captcha/check', // 使用项目自定义的 /admin-api/ 前缀
-    method: 'post',
-    data
-  })
-}
-

yudao-ui-admin/src/components/Verifition/utils/axios.js

@@ -1,29 +0,0 @@
-import axios from 'axios'
-
-axios.defaults.baseURL = process.env.VUE_APP_BASE_API
-
-const service = axios.create({
-  timeout: 40000,
-  headers: {
-    'X-Requested-With': 'XMLHttpRequest',
-    'Content-Type': 'application/json; charset=UTF-8'
-  },
-})
-service.interceptors.request.use(
-  config => {
-    return config
-  },
-  error => {
-    Promise.reject(error)
-  }
-)
-
-// response interceptor
-service.interceptors.response.use(
-  response => {
-    return response.data
-  },
-  error => {
-  }
-)
-export default service

yudao-ui-admin/src/layout/components/TagsView/index.vue

@@ -239,7 +239,7 @@ export default {
 
 <style lang="scss" scoped>
 .tags-view-container {
-  height: 34px;
+  height: 36px;
   width: 100%;
   background: #fff;
   border-bottom: 1px solid #d8dce5;
@@ -249,15 +249,16 @@ export default {
       display: inline-block;
       position: relative;
       cursor: pointer;
-      height: 26px;
-      line-height: 26px;
+      height: 28px;
+      line-height: 28px;
       border: 1px solid #d8dce5;
       color: #495060;
       background: #fff;
-      padding: 0 8px;
+      padding: 0 6px;
       font-size: 12px;
-      margin-left: 5px;
+      margin-left: 4px;
       margin-top: 4px;
+      border-radius: 3px 3px 3px 3px;
       &:first-of-type {
         margin-left: 15px;
       }

yudao-ui-admin/src/router/index.js

@@ -106,7 +106,7 @@ export const constantRoutes = [
         path: 'value/:propertyId(\\d+)',
         component: (resolve) => require(['@/views/mall/product/property/value'], resolve),
         name: 'PropertyValue',
-        meta: {title: '规格数据', icon: '', activeMenu: '/product/property'}
+        meta: {title: '商品属性值', icon: '', activeMenu: '/product/property'}
       }
     ]
   }, {
@@ -198,20 +198,12 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/order',
+    path: '/trade/order',
     component: Layout,
-    name: '订单管理',
-    meta: { title: '订单管理' },
-    alwaysShow: true,
+    hidden: true,
     children: [
       {
-        path: '/mall/trade/order',
-        name: '商品订单',
-        meta: { title: '商品订单' },
-        component: (resolve) => require(['@/views/mall/trade/order'], resolve)
-      },
-      {
-        path: '/mall/trade/order/detail',
+        path: 'detail',
         name: '订单详情',
         hidden: true,
         meta: { title: '订单详情' },

yudao-ui-admin/src/store/modules/permission.js

@@ -1,8 +1,8 @@
-import { constantRoutes } from '@/router'
-import { getRouters } from '@/api/menu'
+import {constantRoutes} from '@/router'
+import {getRouters} from '@/api/menu'
 import Layout from '@/layout/index'
 import ParentView from '@/components/ParentView';
-import { toCamelCase } from "@/utils";
+import {toCamelCase} from "@/utils";
 
 const permission = {
   state: {
@@ -28,7 +28,7 @@ const permission = {
   },
   actions: {
     // 生成路由
-    GenerateRoutes({ commit }) {
+    GenerateRoutes({commit}) {
       return new Promise(resolve => {
         // 向后端请求路由数据（菜单）
         getRouters().then(res => {
@@ -36,7 +36,7 @@ const permission = {
           const rdata = JSON.parse(JSON.stringify(res.data)) // 用于最后添加到 Router 中的数据
           const sidebarRoutes = filterAsyncRouter(sdata)
           const rewriteRoutes = filterAsyncRouter(rdata, false, true)
-          rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
+          rewriteRoutes.push({path: '*', redirect: '/404', hidden: true})
           commit('SET_ROUTES', rewriteRoutes)
           commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
           commit('SET_DEFAULT_ROUTES', sidebarRoutes)
@@ -60,6 +60,11 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
     }
     // 路由地址转首字母大写驼峰，作为路由名称，适配 keepAlive
     route.name = toCamelCase(route.path, true)
+    // 处理三级及以上菜单路由缓存问题，将path名字赋值给name
+    if (route.path.indexOf("/") !== -1) {
+      const pathArr = route.path.split("/");
+      route.name = toCamelCase(pathArr[pathArr.length - 1], true)
+    }
     route.hidden = !route.visible
     // 处理 component 属性
     if (route.children) { // 父节点
@@ -86,10 +91,10 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
 }
 
 function filterChildren(childrenMap, lastRouter = false) {
-  let children = []
+  let children = [];
   childrenMap.forEach((el, index) => {
     if (el.children && el.children.length) {
-      if (el.component === 'ParentView' && !lastRouter) {
+      if (!el.component && !lastRouter) {
         el.children.forEach(c => {
           c.path = el.path + '/' + c.path
           if (c.children && c.children.length) {

yudao-ui-admin/src/utils/constants.js

@@ -3,6 +3,37 @@
  *
  * 枚举类
  */
+import {beginOfDay, endOfDay} from "@/utils/dateUtils";
+
+export const datePickerOptions = {
+  shortcuts: [{
+    text: '最近一周',
+    onClick(picker) {
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      const end = new Date();
+      picker.$emit('pick', [beginOfDay(start), endOfDay(end)]);
+    }
+  }, {
+    text: '最近一个月',
+    onClick(picker) {
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      const end = new Date();
+      picker.$emit('pick', [beginOfDay(start), endOfDay(end)]);
+    }
+  }, {
+    text: '最近三个月',
+    onClick(picker) {
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+      const end = new Date();
+      picker.$emit('pick', [beginOfDay(start), endOfDay(end)]);
+    }
+  }]
+}
+
+// ========== 静态变量 ==========
 
 /**
  * 全局通用状态枚举

yudao-ui-admin/src/utils/dateUtils.js

@@ -24,3 +24,11 @@ export function getDate(ms) {
     return 0 + "秒";
   }
 }
+
+export function beginOfDay(date) {
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate());
+}
+
+export function endOfDay(date) {
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59, 999);
+}

yudao-ui-admin/src/utils/dict.js

@@ -8,6 +8,7 @@ import store from '@/store'
 export const DICT_TYPE = {
   USER_TYPE: 'user_type',
   COMMON_STATUS: 'common_status',
+  TERMINAL: 'terminal',
 
   // ========== SYSTEM 模块 ==========
   SYSTEM_USER_SEX: 'system_user_sex',
@@ -60,6 +61,14 @@ export const DICT_TYPE = {
   // ========== MALL - PRODUCT 模块 ==========
   PRODUCT_SPU_STATUS: 'product_spu_status', // 商品 SPU 状态
 
+  // ========== MALL - ORDER 模块 ==========
+  TRADE_AFTER_SALE_STATUS: 'trade_after_sale_status', // 售后 - 状态
+  TRADE_AFTER_SALE_WAY: 'trade_after_sale_way', // 售后 - 方式
+  TRADE_AFTER_SALE_TYPE: 'trade_after_sale_type', // 售后 - 类型
+  TRADE_ORDER_TYPE: 'trade_order_type', // 订单 - 类型
+  TRADE_ORDER_STATUS: 'trade_order_status', // 订单 - 状态
+  TRADE_ORDER_ITEM_AFTER_SALE_STATUS: 'trade_order_item_after_sale_status', // 订单项 - 售后状态
+
   // ========== MALL - PROMOTION 模块 ==========
   PROMOTION_DISCOUNT_TYPE: 'promotion_discount_type', // 优惠类型
   PROMOTION_PRODUCT_SCOPE: 'promotion_product_scope', // 营销的商品范围

yudao-ui-admin/src/views/dashboard/BarChart.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 

yudao-ui-admin/src/views/dashboard/LineChart.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 

yudao-ui-admin/src/views/dashboard/PieChart.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 

yudao-ui-admin/src/views/dashboard/RaddarChart.vue

@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 

yudao-ui-admin/src/views/infra/codegen/editTable.vue

@@ -31,7 +31,7 @@
                 <el-option label="Integer" value="Integer" />
                 <el-option label="Double" value="Double" />
                 <el-option label="BigDecimal" value="BigDecimal" />
-                <el-option label="Date" value="Date" />
+                <el-option label="LocalDateTime" value="LocalDateTime" />
                 <el-option label="Boolean" value="Boolean" />
               </el-select>
             </template>

yudao-ui-admin/src/views/login.vue

@@ -53,10 +53,10 @@
                 <el-form-item prop="mobileCode">
                   <el-input v-model="loginForm.mobileCode" type="text" auto-complete="off" placeholder="短信验证码"
                             @keyup.enter.native="handleLogin">
-                    <template slot="icon">
+                    <template v-slot="icon">
                       <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
                     </template>
-                    <template slot="append">
+                    <template v-slot="append">
                       <span v-if="mobileCodeTimer <= 0" class="getMobileCode" @click="getSmsCode" style="cursor: pointer;">获取验证码</span>
                       <span v-if="mobileCodeTimer > 0" class="getMobileCode">{{ mobileCodeTimer }}秒后可重新获取</span>
                     </template>
@@ -115,6 +115,7 @@ import {
 } from "@/utils/auth";
 
 import Verify from '@/components/Verifition/Verify';
+import {resetUserPwd} from "@/api/system/user";
 
 export default {
   name: "Login",
@@ -254,19 +255,40 @@ export default {
         }
       });
     },
-    doSocialLogin(socialTypeEnum) {
+    async doSocialLogin(socialTypeEnum) {
       // 设置登录中
       this.loading = true;
-      // 计算 redirectUri
-      const redirectUri = location.origin + '/social-login?'
-        + encodeURIComponent('type=' + socialTypeEnum.type + '&redirect=' + (this.redirect || "/")); // 重定向不能丢
-      // const redirectUri = 'http://127.0.0.1:48080/api/gitee/callback';
-      // const redirectUri = 'http://127.0.0.1:48080/api/dingtalk/callback';
-      // 进行跳转
-      socialAuthRedirect(socialTypeEnum.type, encodeURIComponent(redirectUri)).then((res) => {
-        // console.log(res.url);
-        window.location.href = res.data;
-      });
+      let tenant = false;
+      if (this.tenantEnable) {
+        await this.$prompt('请输入租户名称', "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消"
+        }).then(({value}) => {
+          getTenantIdByName(value).then(res => {
+            const tenantId = res.data;
+            tenant = true
+            if (tenantId && tenantId >= 0) {
+              setTenantId(tenantId)
+            }
+          });
+        }).catch(() => {
+          return false
+        });
+      } else {
+        tenant = true
+      }
+     if(tenant){
+       // 计算 redirectUri
+       const redirectUri = location.origin + '/social-login?'
+         + encodeURIComponent('type=' + socialTypeEnum.type + '&redirect=' + (this.redirect || "/")); // 重定向不能丢
+       // const redirectUri = 'http://127.0.0.1:48080/api/gitee/callback';
+       // const redirectUri = 'http://127.0.0.1:48080/api/dingtalk/callback';
+       // 进行跳转
+       socialAuthRedirect(socialTypeEnum.type, encodeURIComponent(redirectUri)).then((res) => {
+         // console.log(res.url);
+         window.location.href = res.data;
+       });
+     }
     },
     /** ========== 以下为升级短信登录 ========== */
     getSmsCode() {

yudao-ui-admin/src/views/mall/product/property/index.vue

@@ -3,14 +3,8 @@
 
     <!-- 搜索工作栏 -->
     <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>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择开启状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
-        </el-select>
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
@@ -33,25 +27,20 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="规格id" align="center" prop="id" />
-      <el-table-column label="规格名称" align="center" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="名称" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <router-link :to="'/property/value/' + scope.row.id" class="link-type">
             <span>{{ scope.row.name }}</span>
           </router-link>
         </template>
       </el-table-column>
-      <el-table-column label="开启状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="left" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -68,18 +57,8 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="规格id" prop="id" v-if="form.id != null">
-          <el-input v-model="form.id" disabled />
-        </el-form-item>
-        <el-form-item label="规格名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入规格名称" />
-        </el-form-item>
-        <el-form-item label="开启状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                      :key="dict.value" :label="parseInt(dict.value)">{{ dict.label }}
-            </el-radio>
-          </el-radio-group>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="备注" />
@@ -94,7 +73,7 @@
 </template>
 
 <script>
-import { createProperty, updateProperty, deleteProperty, getProperty, getPropertyPage, exportPropertyExcel } from "@/api/mall/product/property";
+import { createProperty, updateProperty, deleteProperty, getProperty, getPropertyPage } from "@/api/mall/product/property";
 
 export default {
   name: "Property",
@@ -104,13 +83,11 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
       total: 0,
-      // 规格名称列表
+      // 属性项列表
       list: [],
       // 弹出层标题
       title: "",
@@ -121,23 +98,18 @@ export default {
         pageNo: 1,
         pageSize: 10,
         name: null,
-        status: null,
         createTime: []
       },
       // 表单参数
       form: {
         name:'',
-        status:'',
         remark:"",
         id: null,
       },
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "规格不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "状态不能为空", trigger: "blur" }
+          { required: true, message: "名称不能为空", trigger: "blur" }
         ]
       }
     };
@@ -165,7 +137,6 @@ export default {
     reset() {
       this.form = {
         name:'',
-        status:'',
         remark:"",
         id: null,
       };
@@ -185,7 +156,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加规格";
+      this.title = "添加属性项";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -194,7 +165,7 @@ export default {
       getProperty(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改规格";
+        this.title = "修改属性项";
       });
     },
     /** 提交按钮 */
@@ -223,28 +194,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm('是否确认删除规格名称为"' + row.name + '"的数据项?').then(function() {
+      this.$modal.confirm('是否确认删除名称为"' + row.name + '"的数据项?').then(function() {
           return deleteProperty(id);
         }).then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      // 执行导出
-      this.$modal.confirm('是否确认导出所有规格名称数据项?').then(() => {
-          this.exportLoading = true;
-          return exportPropertyExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '规格名称.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    },
   }
 };
 </script>

yudao-ui-admin/src/views/mall/product/property/value.vue

@@ -1,19 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="规格名称" prop="propertyId">
+      <el-form-item label="属性项" prop="propertyId">
         <el-select v-model="queryParams.propertyId">
-          <el-option v-for="item in propertyOptions" :key="item.id" :label="item.id +'-'+ item.name" :value="item.id"/>
+          <el-option v-for="item in propertyOptions" :key="item.id" :label="item.name" :value="item.id"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="规格值" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入规格值" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="状态" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
-        </el-select>
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -27,21 +21,12 @@
                    v-hasPermi="['system:dict:create']">新增
         </el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['system:dict:export']">导出</el-button>
-      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column label="规格值id" align="center" prop="id"/>
-      <el-table-column label="规格值" align="center" prop="name"/>
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="编号" align="center" prop="id"/>
+      <el-table-column label="名称" align="center" prop="name"/>
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
@@ -66,18 +51,11 @@
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="规格值编码">
+        <el-form-item label="属性项">
           <el-input v-model="form.propertyId" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="规格值" prop="name">
-          <el-input v-model="form.name" placeholder="请输入数据标签"/>
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                      :key="dict.value" :label="parseInt(dict.value)">{{ dict.label }}
-            </el-radio>
-          </el-radio-group>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称"/>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
@@ -108,8 +86,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -130,17 +106,13 @@ export default {
         pageSize: 10,
         propertyId: undefined,
         name: undefined,
-        status: undefined
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         name: [
-          {required: true, message: "规格值不能为空", trigger: "blur"}
-        ],
-        status: [
-          {required: true, message: "状态不能为空", trigger: "blur"}
+          {required: true, message: "名称不能为空", trigger: "blur"}
         ]
       },
 
@@ -186,7 +158,6 @@ export default {
         id: undefined,
         propertyId: undefined,
         name: undefined,
-        status: undefined,
         remark: undefined
       };
       this.resetForm("form");
@@ -206,17 +177,17 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加规格值";
+      this.title = "添加属性值";
       this.form.propertyId = this.queryParams.propertyId;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const id = row.id;
       getPropertyValue(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改规格值";
+        this.title = "修改属性值";
       });
     },
     /** 提交按钮 */

yudao-ui-admin/src/views/mall/product/spu/save.vue

@@ -4,9 +4,8 @@
     <el-tabs v-model="activeName" class="tabs">
       <!-- 基础设置 -->
       <!-- TODO @luowenfeng：基础设置，分成基础信息、配送信息 -->
-      <!-- TODO @luowenfeng：base=》basic 会更好哈 -->
-      <el-tab-pane label="基础设置" name="base">
-        <el-form ref="base" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
+      <el-tab-pane label="基础设置" name="basic">
+        <el-form ref="basic" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
           <el-form-item label="商品名称" prop="name">
             <el-input v-model="baseForm.name" placeholder="请输入商品名称" />
           </el-form-item>
@@ -80,15 +79,6 @@
                   <ImageUpload v-model="scope.row.picUrl" :limit="1" :isShowTip="false" style="width: 100px; height: 50px"/>
                 </template>
               </el-table-column>
-              <template v-if="this.specSwitch">
-                <el-table-column label="sku名称" :render-header="addRedStar" key="91">
-                  <template slot-scope="scope">
-                    <el-form-item :prop="'rates.'+ scope.$index + '.name'" :rules="[{required: true, trigger: 'change'}]">
-                      <el-input v-model="scope.row.name"/>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-              </template>
               <el-table-column label="市场价(元)" :render-header="addRedStar" key="92">
                 <template slot-scope="scope">
                   <el-form-item :prop="'rates.'+ scope.$index + '.marketPrice'" :rules="[{required: true, trigger: 'change'}]">
@@ -164,9 +154,8 @@
       </el-tab-pane>
 
       <!-- 商品详情 -->
-      <!-- TODO @luowenfeng：third=》detail 会更好哈 -->
-      <el-tab-pane label="商品详情" name="third">
-        <el-form ref="third" :model="baseForm" :rules="rules">
+      <el-tab-pane label="商品详情" name="detail">
+        <el-form ref="detail" :model="baseForm" :rules="rules">
           <el-form-item prop="description">
             <editor v-model="baseForm.description" :min-height="380"/>
           </el-form-item>
@@ -174,9 +163,8 @@
       </el-tab-pane>
 
       <!-- 销售设置 -->
-      <!-- TODO @luowenfeng：fourth=》senior 会更好哈 -->
-      <el-tab-pane label="高级设置" name="fourth">
-        <el-form ref="fourth" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
+      <el-tab-pane label="高级设置" name="senior">
+        <el-form ref="senior" :model="baseForm" :rules="rules" label-width="100px" style="width: 95%">
           <el-form-item label="排序字段">
             <el-input v-model="baseForm.sort" placeholder="请输入排序字段" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
           </el-form-item>
@@ -217,7 +205,7 @@ export default {
   data() {
     return {
       specSwitch: false,
-      activeName: "base",
+      activeName: "basic",
       propName: {
         checkStrictly: true,
         label: "name",

yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue

@@ -0,0 +1,490 @@
+<template>
+    <div class="app-container">
+
+        <!-- 搜索工作栏 -->
+        <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>
+            <el-form-item label="活动状态" prop="status">
+                <el-select v-model="queryParams.status" placeholder="请选择活动状态" clearable size="small">
+                    <el-option v-for="dict in this.getDictDatas(DICT_TYPE.PROMOTION_ACTIVITY_STATUS)" :key="dict.value"
+                        :label="dict.label" :value="dict.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="参与场次" prop="timeId">
+                <el-select v-model="queryParams.timeId" placeholder="请选择参与场次" clearable size="small">
+                    <el-option v-for="item in seckillTimeList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间" prop="createTime">
+                <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                    type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                    :default-time="['00:00:00', '23:59:59']" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <!-- 操作工具栏 -->
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                    v-hasPermi="['promotion:seckill-activity:create']">新增秒杀活动</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-menu" size="mini" @click="openSeckillTime"
+                    v-hasPermi="['promotion:seckill-activity:create']">管理参与场次</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <!-- 列表 -->
+        <el-table v-loading="loading" :data="list">
+            <el-table-column label="活动名称" align="center" prop="name" />
+            <el-table-column label="活动状态" align="center" prop="status">
+                <template slot-scope="scope">
+                    <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" />
+                </template>
+            </el-table-column>
+            <el-table-column label="参与场次" prop="timeIds" width="250">
+                <template slot-scope="scope">
+                    <span v-for="item in seckillTimeList" :key="item.id"
+                        v-if="scope.row.timeIds.includes(item.id)">
+                        <el-tag style="margin:4px;" size="small">{{ item.name }}</el-tag>
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="活动开始时间" align="center" prop="startTime" width="190">
+                <template slot-scope="scope">
+                    <span>{{ "开始: " + parseTime(scope.row.startTime) }}</span>
+                    <span>{{ "结束: " + parseTime(scope.row.endTime) }}</span>
+                </template>
+            </el-table-column>
+
+            <el-table-column label="付款订单数" align="center" prop="orderCount" />
+            <el-table-column label="付款人数" align="center" prop="userCount" />
+            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['promotion:seckill-activity:update']">修改</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-close" @click="handleClose(scope.row)"
+                        v-hasPermi="['promotion:seckill-activity:delete']">关闭</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['promotion:seckill-activity:delete']">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <!-- 分页组件 -->
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+            @pagination="getList" />
+
+        <!-- 对话框(添加 / 修改) -->
+        <el-dialog :title="title" :visible.sync="open" width="1200px" v-dialogDrag append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                <el-form-item label="活动名称" prop="name">
+                    <el-input v-model="form.name" placeholder="请输入秒杀活动名称" />
+                </el-form-item>
+                <el-form-item label="活动时间" prop="startAndEndTime">
+                    <el-date-picker clearable v-model="form.startAndEndTime" type="datetimerange"
+                        value-format="timestamp" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                        style="width: 1080px" />
+                </el-form-item>
+                <el-form-item label="排序" prop="sort">
+                    <el-input-number v-model="form.sort" controls-position="right" :min="0" :max="10000">
+                    </el-input-number>
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" />
+                </el-form-item>
+                <el-form-item label="场次选择">
+                    <el-select v-model="form.timeIds" placeholder="请选择参与场次" clearable size="small" multiple filterable
+                        style="width: 880px">
+                        <el-option v-for="item in seckillTimeList" :key="item.id" :label="item.name" :value="item.id">
+                            <span style="float: left">{{ item.name + ': { ' }} {{ item.startTime }} -- {{ item.endTime +
+                                    ' }'
+                            }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px"></span>
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="商品选择">
+                    <el-select v-model="form.skuIds" placeholder="请选择活动商品" clearable size="small" multiple filterable
+                        style="width: 880px" @change="changeFormSku">
+                        <el-option v-for="item in productSkus" :key="item.id" :label="item.spuName + ' ' + item.name"
+                            :value="item.id">
+                            <span style="float: left">{{ item.spuName }} &nbsp; {{ item.name }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px">￥{{ (item.price /
+                                    100.0).toFixed(2)
+                            }}</span>
+                        </el-option>
+                    </el-select>
+                    <el-row>
+                        <el-button type="primary" size="mini" @click="batchEditProduct('limitBuyCount')">限购</el-button>
+                        <el-button type="primary" size="mini" @click="batchEditProduct('seckillPrice')">秒杀价</el-button>
+                        <el-button type="primary" size="mini" @click="batchEditProduct('seckillStock')">秒杀库存</el-button>
+                    </el-row>
+                    <el-table v-loading="loading" ref="productsTable" :data="form.products">
+                        <el-table-column type="selection" width="55">
+                        </el-table-column>
+                        <el-table-column label="商品名称" align="center" width="200">
+                            <template slot-scope="scope">
+                                {{ scope.row.spuName }} &nbsp; {{ scope.row.name }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="商品价格" align="center" prop="price">
+                            <template slot-scope="scope">
+                                ￥{{ (scope.row.price / 100.0).toFixed(2) }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="库存" align="center" prop="productStock" />
+                        <el-table-column label="限购(0为不限购)" align="center" width="150">
+                            <template slot-scope="scope">
+                                <el-input-number v-model="scope.row.limitBuyCount" size="mini" :min="0" :max="10000">
+                                </el-input-number>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="秒杀价(元)" align="center" width="150">
+                            <template slot-scope="scope">
+                                <el-input-number v-model="scope.row.seckillPrice" size="mini" :precision="2" :min="0"
+                                    :max="10000">
+                                </el-input-number>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="秒杀库存" align="center" width="150" prop="seckillStock">
+                            <template slot-scope="scope">
+                                <el-input-number v-model="scope.row.seckillStock" size="mini" :min="0" :max="10000">
+                                </el-input-number>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                            <template slot-scope="scope">
+                                <el-button size="mini" type="text" icon="el-icon-delete"
+                                    @click="removeFormSku(scope.row.skuId)">删除
+                                </el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { getSkuOptionList } from "@/api/mall/product/sku";
+import { createSeckillActivity, updateSeckillActivity, closeSeckillActivity, deleteSeckillActivity, getSeckillActivity, getSeckillActivityPage, exportSeckillActivityExcel } from "@/api/mall/promotion/seckillActivity";
+import { getSeckillTimeList } from "@/api/mall/promotion/seckillTime";
+import { deepClone } from "@/utils";
+
+export default {
+    name: "SeckillActivity",
+    components: {
+    },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 秒杀活动列表
+            list: [],
+            // 秒杀场次列表
+            seckillTimeList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNo: 1,
+                pageSize: 10,
+                name: null,
+                status: null,
+                timeId: null,
+                createTime: [],
+            },
+            // 表单参数
+            form: {
+                skuIds: [], // 选中的 SKU
+                products: [], // 商品信息
+                timeIds: [], //选中的秒杀场次id
+            },
+            // 商品 SKU 列表
+            productSkus: [],
+            // 表单校验
+            rules: {
+                name: [{ required: true, message: "秒杀活动名称不能为空", trigger: "blur" }],
+                status: [{ required: true, message: "活动状态不能为空", trigger: "blur" }],
+                startAndEndTime: [{ required: true, message: "活动时间不能为空", trigger: "blur" }],
+                sort: [{ required: true, message: "排序不能为空", trigger: "blur" }],
+                timeIds: [{ required: true, message: "秒杀场次不能为空", trigger: "blur" }],
+                totalPrice: [{ required: true, message: "订单实付金额，单位：分不能为空", trigger: "blur" }],
+            }
+        };
+    },
+    created() {
+        this.getList();
+    },
+    watch: {
+        $route: 'getList'
+    },
+    methods: {
+        /** 查询列表 */
+        getList() {
+            // 从秒杀时段跳转过来并鞋带timeId参数进行查询
+            const timeId = this.$route.params && this.$route.params.timeId;
+            if (timeId) {
+                this.queryParams.timeId = timeId
+            }
+            this.loading = true;
+            // 执行查询
+            getSeckillActivityPage(this.queryParams).then(response => {
+                console.log(response.data.list, "查询出的值");
+                this.list = response.data.list;
+                this.total = response.data.total;
+                this.loading = false;
+            });
+            if (timeId) {
+                //查询完成后设置为空
+                this.$route.params.timeId = undefined
+            }
+            // 获得 SKU 商品列表
+            getSkuOptionList().then(response => {
+                this.productSkus = response.data;
+            });
+            // 获取参与场次列表
+            getSeckillTimeList().then(response => {
+                this.seckillTimeList = response.data;
+            });
+        },
+        /** 取消按钮 */
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        /** 表单重置 */
+        reset() {
+            this.form = {
+                id: undefined,
+                name: undefined,
+                status: undefined,
+                remark: undefined,
+                startTime: undefined,
+                endTime: undefined,
+                sort: undefined,
+                timeIds: [],
+                totalPrice: undefined,
+                skuIds: [],
+                products: [],
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNo = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        /**打开秒杀场次管理页面 */
+        openSeckillTime() {
+            this.$tab.openPage("秒杀场次管理", "/promotion/seckill-time");
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加秒杀活动";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const id = row.id;
+            getSeckillActivity(id).then(response => {
+                this.form = response.data;
+                // 修改数据
+                this.form.startAndEndTime = [response.data.startTime, response.data.endTime];
+                this.form.skuIds = response.data.products.map(item => item.skuId);
+                this.form.products.forEach(product => {
+                    // 获得对应的 SKU 信息
+                    const sku = this.productSkus.find(item => item.id === product.skuId);
+                    if (!sku) {
+                        return;
+                    }
+                    // 设置商品信息
+                    product.name = sku.name;
+                    product.spuName = sku.spuName;
+                    product.price = sku.price;
+                    product.productStock = sku.stock;
+                    this.$set(product, 'seckillStock', product.stock);
+                    product.seckillPrice = product.seckillPrice !== undefined ? product.seckillPrice / 100 : undefined;
+
+                });
+                // 打开弹窗
+                this.open = true;
+                this.title = "修改限时折扣活动";
+            })
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate(valid => {
+                if (!valid) {
+                    return;
+                }
+                // 处理数据
+                const data = deepClone(this.form);
+                data.startTime = this.form.startAndEndTime[0];
+                data.endTime = this.form.startAndEndTime[1];
+                data.products.forEach(product => {
+                    product.stock = product.seckillStock;
+                    product.seckillPrice = product.seckillPrice !== undefined ? product.seckillPrice * 100 : undefined;
+                });
+                // 修改的提交
+                if (this.form.id != null) {
+                    updateSeckillActivity(data).then(response => {
+                        this.$modal.msgSuccess("修改成功");
+                        this.open = false;
+                        this.getList();
+                    });
+                    return;
+                }
+                // 添加的提交
+                createSeckillActivity(data).then(response => {
+                    this.$modal.msgSuccess("新增成功");
+                    this.open = false;
+                    this.getList();
+                });
+            });
+        },
+        /** 关闭按钮操作 */
+        handleClose(row) {
+            const id = row.id;
+            this.$modal.confirm('是否确认关闭秒杀活动编号为"' + id + '"的数据项?').then(function () {
+                return closeSeckillActivity(id);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("关闭成功");
+            }).catch(() => { });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const id = row.id;
+            this.$modal.confirm('是否确认删除秒杀活动编号为"' + id + '"的数据项?').then(function () {
+                return deleteSeckillActivity(id);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        },
+        /** 批量修改商品秒杀价，秒杀库存，每人限购数量 */
+        batchEditProduct(editType) {
+            const selectProducts = this.$refs.productsTable.selection;
+            if (selectProducts.length === 0) {
+                this.$modal.msgError("请选择需要修改的商品");
+                return;
+            }
+            let promptTitle = '请输入';
+            let regularPattern = /^[\s\S]*.*[^\s][\s\S]*$/; // 判断非空，且非空格
+            //限购数
+            if (editType === 'limitBuyCount') {
+                promptTitle = '限购数';
+                regularPattern = /^[0-9]*$/; //数字
+            }
+            //秒杀价
+            if (editType === 'seckillPrice') {
+                promptTitle = '秒杀价(元)';
+                regularPattern = /^[0-9]+(\.[0-9]{1,2})?$/; // 有一位或两位小数的正数
+            }
+            //秒杀库存
+            if (editType === 'seckillStock') {
+                promptTitle = '秒杀库存';
+                regularPattern = /^[0-9]*$/; //数字
+            }
+
+            this.$prompt(promptTitle, '提示', {
+                confirmButtonText: '保存',
+                cancelButtonText: '取消',
+                inputPattern: regularPattern,
+                inputErrorMessage: promptTitle + '格式不正确'
+            }).then(({ value }) => {
+                if (editType === 'limitBuyCount') {
+                    selectProducts.forEach((item) => {
+                        item.limitBuyCount = value;
+                    })
+                }
+                if (editType === 'seckillPrice') {
+                    selectProducts.forEach((item) => {
+                        item.seckillPrice = value;
+                    })
+                }
+                if (editType === 'seckillStock') {
+                    selectProducts.forEach((item) => {
+                        item.seckillStock = value;
+                    })
+                }
+            }).catch();
+        },
+        /** 当 Form 的 SKU 发生变化时 */
+        changeFormSku(skuIds) {
+            // 处理【新增】
+            skuIds.forEach(skuId => {
+                // 获得对应的 SKU 信息
+                const sku = this.productSkus.find(item => item.id === skuId);
+                if (!sku) {
+                    return;
+                }
+                // 判断已存在，直接跳过
+                const product = this.form.products.find(item => item.skuId === skuId);
+                if (product) {
+                    return;
+                }
+                this.form.products.push({
+                    skuId: sku.id,
+                    name: sku.name,
+                    price: sku.price,
+                    productStock: sku.stock,
+                    spuId: sku.spuId,
+                    spuName: sku.spuName,
+                    limitBuyCount: 1,
+                    seckillStock: sku.stock,
+                    seckillPrice: sku.price,
+                });
+            });
+            // 处理【移除】
+            this.form.products.map((product, index) => {
+                if (!skuIds.includes(product.skuId)) {
+                    this.form.products.splice(index, 1);
+                }
+            });
+        },
+        /** 移除 Form 的 SKU */
+        removeFormSku(skuId) {
+            this.form.skuIds.map((id, index) => {
+                if (skuId === id) {
+                    this.form.skuIds.splice(index, 1);
+                }
+            });
+            this.changeFormSku(this.form.skuIds);
+        },
+    }
+};
+</script>

yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue

@@ -0,0 +1,197 @@
+<template>
+  <div class="app-container">
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['promotion:seckill-time:create']">新增秒杀时段</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="秒杀时段名称" align="center" prop="name" />
+      <el-table-column label="开始时间点" align="center" prop="startTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.startTime }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="结束时间点" align="center" prop="endTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.endTime }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="秒杀活动数量" align="center" prop="seckillActivityCount" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleOpenSeckillActivity(scope.row)">
+            查看秒杀活动</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['promotion:seckill-time:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['promotion:seckill-time:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" v-dialogDrag append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="秒杀场次名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入秒杀时段名称" clearable />
+        </el-form-item>
+        <el-form-item label="秒杀时间段" prop="startAndEndTime">
+          <el-time-picker is-range v-model="form.startAndEndTime" range-separator="至" start-placeholder="开始时间"
+            end-placeholder="结束时间" placeholder="选择时间范围" value-format="HH:mm:ss">
+          </el-time-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createSeckillTime, updateSeckillTime, deleteSeckillTime, getSeckillTime, getSeckillTimePage, exportSeckillTimeExcel, getSeckillTimeList } from "@/api/mall/promotion/seckillTime";
+import router from "@/router";
+import { deepClone } from "@/utils";
+
+export default {
+  name: "SeckillTime",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      // total: 0,
+      // 秒杀时段列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: "秒杀时段名称不能为空", trigger: "blur" }],
+        startAndEndTime: [{ required: true, message: "秒杀时间段不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getSeckillTimeList().then(response => {
+        this.list = response.data;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+        startAndEndTime: undefined,
+        startTime: undefined,
+        endTime: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /**查看当前秒杀时段的秒杀活动 */
+    handleOpenSeckillActivity(row) {
+      router.push({ name: 'SeckillActivity', params: { timeId: row.id } })
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加秒杀时段";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getSeckillTime(id).then(response => {
+        response.data.startAndEndTime = [response.data.startTime, response.data.endTime]
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改秒杀时段";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        console.log(valid, "是否通过");
+        if (!valid) {
+          return;
+        }
+        // 处理数据
+        const data = deepClone(this.form);
+        data.startTime = this.form.startAndEndTime[0];
+        data.endTime = this.form.startAndEndTime[1];
+        // 修改的提交
+        if (this.form.id != null) {
+          updateSeckillTime(data).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createSeckillTime(data).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除秒杀时段编号为"' + id + '"的数据项?').then(function () {
+        return deleteSeckillTime(id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+  }
+};
+</script>

yudao-ui-admin/src/views/mall/trade/afterSale/index.vue

@@ -0,0 +1,228 @@
+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="商品名称" prop="spuName">
+        <el-input v-model="queryParams.spuName" placeholder="请输入商品 SPU 名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="退款编号" prop="no">
+        <el-input v-model="queryParams.no" placeholder="请输入退款编号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="订单编号" prop="orderNo">
+        <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="售后状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择售后状态" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TRADE_AFTER_SALE_STATUS)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="售后方式" prop="way">
+        <el-select v-model="queryParams.way" placeholder="请选择售后方式" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TRADE_AFTER_SALE_WAY)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="售后类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择售后类型" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TRADE_AFTER_SALE_TYPE)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                        :picker-options="datePickerOptions" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- Tab 选项：真正的内容在 Table -->
+    <el-tabs v-model="activeTab" type="card" @tab-click="tabClick" style="margin-top: -40px;">
+      <el-tab-pane v-for="tab in statusTabs" :key="tab.value" :label="tab.label" :name="tab.value" />
+    </el-tabs>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="退款编号" align="center" prop="no" />
+      <el-table-column label="订单编号" align="center" prop="orderNo" /> <!-- TODO 芋艿：未来要加个订单链接 -->
+      <el-table-column label="商品信息" align="center" prop="spuName" width="auto" min-width="300">
+        <!-- TODO @小红：样式不太对，辛苦改改 -->
+<!--        <div slot-scope="{ row }" class="goods-info">-->
+<!--          <img :src="row.picUrl"/>-->
+<!--          <span class="ellipsis-2" :title="row.name">{{row.name}}</span>-->
+<!--        </div>-->
+      </el-table-column>
+      <el-table-column label="订单金额" align="center" prop="refundPrice">
+        <template v-slot="scope">
+          <span>￥{{ (scope.row.refundPrice / 100.0).toFixed(2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="买家" align="center" prop="user.nickname" /> <!-- TODO 芋艿：未来要加个会员链接 -->
+      <el-table-column label="申请时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="售后状态" align="center">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.TRADE_AFTER_SALE_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="售后方式" align="center">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.TRADE_AFTER_SALE_WAY" :value="scope.row.way" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-thumb"
+                     >处理退款</el-button>
+<!--      @click="handleUpdate(scope.row)"    v-hasPermi="['trade:after-sale:update']"-->
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+  </div>
+</template>
+
+<script>
+import { getAfterSalePage } from "@/api/mall/trade/afterSale";
+import { datePickerOptions } from "@/utils/constants";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+
+export default {
+  name: "AfterSale",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 交易售后列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        no: null,
+        status: null,
+        orderNo: null,
+        spuName: null,
+        createTime: [],
+        way: null,
+        type: null,
+      },
+      // Tab 筛选
+      activeTab: 'all',
+      statusTabs: [{
+        label: '全部',
+        value: 'all'
+      }],
+      // 静态变量
+      datePickerOptions: datePickerOptions
+    };
+  },
+  created() {
+    this.getList();
+    // 设置 statuses 过滤
+    for (const dict of getDictDatas(DICT_TYPE.TRADE_AFTER_SALE_STATUS)) {
+      this.statusTabs.push({
+        label: dict.label,
+        value: dict.value
+      })
+    }
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getAfterSalePage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.activeTab = this.queryParams.status ? this.queryParams.status : 'all'; // 处理 tab
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.activeTab = 'all'; // 处理 tab
+      this.handleQuery();
+    },
+    /** tab 切换 */
+    tabClick(tab) {
+      this.queryParams.status = tab.name === 'all' ? undefined : tab.name;
+      this.getList();
+    },
+    goToDetail (row) {
+      this.$router.push({ path: '/mall/trade/order/detail', query: { orderNo: row.orderNo }})
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .table-wrapper {
+  .el-table__row{
+    .el-table__cell {
+      border-bottom: none;
+      .cell{
+        .el-table {
+          .el-table__row {
+            >.el-table__cell {
+              .goods-info{
+                display: flex;
+                img{
+                  margin-right: 10px;
+                  width: 60px;
+                  height: 60px;
+                  border: 1px solid #e2e2e2;
+                }
+              }
+              .ellipsis-2 {
+                display: -webkit-box;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: normal;
+                -webkit-line-clamp: 2; /* 要显示的行数 */
+                -webkit-box-orient: vertical;
+                word-break: break-all;
+                line-height: 22px !important;
+                max-height: 44px !important;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

yudao-ui-admin/src/views/mall/trade/order/detail.vue

@@ -1,19 +1,105 @@
 <template>
   <div class="app-container order-detail-page">
+    <!-- 订单信息 -->
+    <el-descriptions title="订单信息">
+      <el-descriptions-item label="订单号">{{ order.no }}</el-descriptions-item>
+      <el-descriptions-item label="配送方式">物流配送</el-descriptions-item> <!-- TODO 芋艿：待实现 -->
+      <el-descriptions-item label="营销活动">物流配送</el-descriptions-item> <!-- TODO 芋艿：待实现 -->
+      <el-descriptions-item label="订单类型">
+        <dict-tag :type="DICT_TYPE.TRADE_ORDER_TYPE" :value="order.type" />
+      </el-descriptions-item>
+      <el-descriptions-item label="收货人">{{ order.receiverName }}</el-descriptions-item>
+      <el-descriptions-item label="买家留言">{{ order.userRemark }}</el-descriptions-item>
+      <el-descriptions-item label="订单来源">
+        <dict-tag :type="DICT_TYPE.TERMINAL" :value="order.terminal" />
+      </el-descriptions-item>
+      <el-descriptions-item label="联系电话">{{ order.receiverMobile }}</el-descriptions-item>
+      <el-descriptions-item label="商家备注">{{ order.remark }}</el-descriptions-item>
+      <el-descriptions-item label="支付单号">{{ order.payOrderId }}</el-descriptions-item>
+      <el-descriptions-item label="付款方式">
+        <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE_TYPE" :value="order.payChannelCode" />
+      </el-descriptions-item>
+      <el-descriptions-item label="买家">{{ order.user.nickname }}</el-descriptions-item> <!-- TODO 芋艿：待实现：跳转会员 -->
+      <el-descriptions-item label="收货地址">
+        {{ order.receiverAreaName }} &nbsp; {{ order.receiverDetailAddress }} &nbsp;
+        <el-link v-clipboard:copy="order.receiverAreaName + ' ' + order.receiverDetailAddress"
+                 v-clipboard:success="clipboardSuccess" icon="el-icon-document-copy" type="primary"/>
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 订单状态 -->
+    <el-descriptions title="订单状态" :column="1">
+      <el-descriptions-item label="订单状态">
+        <dict-tag :type="DICT_TYPE.TRADE_ORDER_STATUS" :value="order.status" />
+      </el-descriptions-item>
+      <el-descriptions-item label-class-name="no-colon">
+        <el-button type="primary" size="small">调整价格</el-button>  <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">备注</el-button> <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">发货</el-button> <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">关闭订单</el-button>  <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">修改地址</el-button>  <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">打印电子面单</el-button>  <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">打印发货单</el-button>  <!-- TODO 芋艿：待实现 -->
+        <el-button type="primary" size="small">确认收货</el-button>  <!-- TODO 芋艿：待实现 -->
+      </el-descriptions-item>
+      <el-descriptions-item label="提醒" label-style="color: red">
+        买家付款成功后，货款将直接进入您的商户号（微信、支付宝）<br />
+        请及时关注你发出的包裹状态，确保可以配送至买家手中 <br />
+        如果买家表示没收到货或货物有问题，请及时联系买家处理，友好协商
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <!-- 物流信息 TODO -->
+
+    <!-- 商品信息 -->
+    <el-descriptions title="商品信息" :column="6">
+      <el-descriptions-item labelClassName="no-colon">
+        <el-table :data="order.items" border>
+          <el-table-column prop="spuName" label="商品" width="700">
+            <template slot-scope="{ row }">
+              {{row.spuName}}
+              <el-tag size="medium" v-for="property in row.properties">{{property.propertyName}}：{{property.valueName}}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="originalUnitPrice" label="单价(元)" width="180">
+            <template slot-scope="{ row }">
+              ￥{{ (row.originalUnitPrice / 100.0).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="count" label="数量" width="180"/>
+          <el-table-column prop="originalPrice" label="小计（元）" width="180">
+            <template slot-scope="{ row }">
+              ￥{{ (row.originalPrice / 100.0).toFixed(2) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="afterSaleStatus" label="退款状态">
+            <template slot-scope="{ row }">
+              <dict-tag :type="DICT_TYPE.TRADE_ORDER_ITEM_AFTER_SALE_STATUS" :value="row.afterSaleStatus" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-descriptions-item>
+      <el-descriptions-item v-for="(item,index) in 5" label-class-name="no-colon" /> <!-- 占位 -->
+      <el-descriptions-item label="商品总额">￥{{ (order.originalPrice / 100.0).toFixed(2) }}</el-descriptions-item>
+      <el-descriptions-item label="运费金额">￥{{ (order.deliveryPrice / 100.0).toFixed(2) }}</el-descriptions-item>
+      <el-descriptions-item label="订单调价">￥{{ (order.adjustPrice / 100.0).toFixed(2) }}</el-descriptions-item>
+      <el-descriptions-item label="商品优惠" label-style="color: red">
+        ￥{{ ((order.originalPrice - order.originalPrice) / 100.0).toFixed(2) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="订单优惠" label-style="color: red">
+        ￥{{ (order.discountPrice / 100.0).toFixed(2) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="积分抵扣" label-style="color: red">
+        ￥{{ (order.pointPrice / 100.0).toFixed(2) }}
+      </el-descriptions-item>
+      <el-descriptions-item v-for="(item,index) in 5" label-class-name="no-colon" /> <!-- 占位 -->
+      <el-descriptions-item label="应付金额">
+        ￥{{ (order.payPrice / 100.0).toFixed(2) }}
+      </el-descriptions-item>
+    </el-descriptions>
+
     <template v-for="(group, index) in detailGroups">
       <el-descriptions v-bind="group.groupProps" :key="`group_${index}`" :title="group.title">
-        <!-- 商品信息 -->
-        <el-descriptions-item  v-if="group.key === 'goodsInfo'" labelClassName="no-colon">
-          <el-table border>
-            <el-table-column prop="date" label="商品" width="180"/>
-            <el-table-column prop="jg" label="价格"/>
-            <el-table-column prop="spbm" label="商品编码"/>
-            <el-table-column prop="xl" label="数量"/>
-            <el-table-column prop="xj" label="小计（元）"/>
-            <el-table-column prop="tkzt" label="退款状态"/>
-            <el-table-column prop="zt" label="状态"/>
-          </el-table>
-        </el-descriptions-item>
 
         <!-- 订单操作日志 -->
         <el-descriptions-item  v-if="group.key === 'orderLog'" labelClassName="no-colon">
@@ -69,64 +155,19 @@
             </el-tab-pane>
           </el-tabs>
         </el-descriptions-item>
-
-        <!--订单详情、订单状态-->
-        <el-descriptions-item v-else v-for="(child, cIdx) in group.children" v-bind="child.childProps" :key="`child_${cIdx}`" :label="child.label">
-
-          <!-- 操作按钮(订单状态)-->
-          <template v-if="group.key === 'orderStatus' && child.valueKey === 'actions'" slot="label">
-            <el-button type="primary">备注</el-button>
-            <el-button type="primary">打印发货单</el-button>
-          </template>
-
-          <!-- 内容 -->
-          <template v-else>
-            {{detailInfo[child.valueKey]}}
-            <!--复制地址(订单详情) -->
-            <el-link v-if="child.valueKey==='shdz'" v-clipboard:copy="detailInfo[child.valueKey]" v-clipboard:success="clipboardSuccess" icon="el-icon-document-copy" type="primary"/>
-          </template>
-        </el-descriptions-item>
       </el-descriptions>
     </template>
   </div>
 </template>
 
 <script>
+import { getOrderDetail } from "@/api/mall/trade/order";
+
 export default {
   name: "detail",
   data () {
     return {
       detailGroups: [
-        {
-          title: '订单详情',
-          children: [
-            { label: '交易流水号', valueKey: 'jylsh'},
-            { label: '配送方式', valueKey: 'psfs'},
-            { label: '营销活动', valueKey: 'yxhd'},
-            { label: '订单编号', valueKey: 'ddbh'},
-            { label: '收货人', valueKey: 'shr'},
-            { label: '买家留言', valueKey: 'mjly'},
-            { label: '订单类型', valueKey: 'ddlx'},
-            { label: '联系电话', valueKey: 'lxdh'},
-            { label: '备注', valueKey: 'bz'},
-            { label: '订单来源', valueKey: 'ddly'},
-            { label: '付款方式', valueKey: 'fkfs'},
-            { label: '买家', valueKey: 'mj'},
-            { label: '收货地址', valueKey: 'shdz'}
-          ]
-        },
-        {
-          title: '订单状态',
-          key: 'orderStatus',
-          groupProps: {
-            column: 1
-          },
-          children: [
-            { label: '订单状态', valueKey: 'ddzt', childProps: { contentStyle: { color: 'red' }}},
-            { label: '', valueKey: 'actions', childProps: { labelClassName: 'no-colon'}},
-            { label: '提醒', valueKey: 'tx', childProps: { labelStyle: { color: 'red' }}}
-          ]
-        },
         {
           title: '物流信息',
           key: 'expressInfo',
@@ -134,36 +175,16 @@ export default {
             { label: '发货时间', valueKey: 'fhsj'},
             { label: '物流公司', valueKey: 'wlgs'},
             { label: '运单号', valueKey: 'ydh'},
-            { label: '商品信息', valueKey: 'goodsList', childProps: { span: 3 }},
             { label: '物流状态', valueKey: 'wlzt', childProps: { span: 3 }},
             { label: '物流详情', valueKey: 'wlxq'}
           ]
         },
-        {
-          title: '商品信息',
-          key: 'goodsInfo'
-        },
         {
           title: '订单操作日志',
           key: 'orderLog'
         }
       ],
       detailInfo: {
-        jylsh: '16674653573152181000',
-        psfs: '物流配送',
-        yxhd: '',
-        ddbh: '20221103164918001',
-        shr: '',
-        mjly: '',
-        ddlx: '',
-        lxdh: '',
-        bz: '',
-        ddly: '',
-        shdz: '陕西省-西安市-莲湖区-九座花园西区(莲湖区二环南路西段202)陕西省-西安市-莲湖区-九座花园西区(莲湖区二环南路西段202)',
-        fkfs: '',
-        mj: '',
-        ddzt: '已完成',
-        tx: '买家付款成功后，货款将直接进入您的商户号（微信、支付宝）请及时关注你发出的包裹状态，确保可以配送至买家手中如果买家表示没收到货或货物有问题，请及时联系买家处理，友好协商',
         expressInfo: [ // 物流信息
           {
             label: '包裹1',
@@ -193,32 +214,7 @@ export default {
                 content: '快件已发车',
                 timestamp: '2018-04-11 12:55:52'
               }
-            ],
-            goodsList: [ // 包裹下的商品列表
-              {
-                name: 'Otic 巴拉啦小魔仙联名麦克风儿童早教家用一体卡拉OK宝宝话筒唱歌 魔仙粉',
-                count: 6,
-                imgUrl: 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg'
-              }
             ]
-          },
-          {
-            label: '包裹2',
-            name: 'bg1',
-            fhsj: '',
-            wlgs: '',
-            ydh: '',
-            wlzt: '',
-            goodsInfo: {}
-          },
-          {
-            label: '包裹3',
-            name: 'bg1',
-            fhsj: '',
-            wlgs: '',
-            ydh: '',
-            wlzt: '',
-            goodsInfo: {}
           }
         ],
         orderLog: [ // 订单操作日志
@@ -232,9 +228,18 @@ export default {
           }
         ],
         goodsInfo: [] // 商品详情tableData
-      }
+      },
+      order: {
+        items: [],
+        user: {},
+      },
     }
   },
+  created() {
+    getOrderDetail(this.$route.query.id).then(res => {
+      this.order = res.data
+    })
+  },
   methods: {
     clipboardSuccess() {
       this.$modal.msgSuccess("复制成功");
@@ -244,7 +249,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  ::v-deep .el-descriptions{
+  :deep(.el-descriptions){
     &:not(:nth-child(1)) {
       margin-top: 20px;
     }

yudao-ui-admin/src/views/mall/trade/order/index.vue

@@ -3,373 +3,276 @@
     <!-- 搜索工作栏 -->
     <!-- TODO: inline 看看是不是需要; v-show= 那块逻辑还是要的 -->
     <el-row :gutter="20">
-      <el-form :model="queryParams" label-width="68px" size="small">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-col :span="6" :xs="24">
-          <el-form-item label="搜索方式">
-            <el-input style="width: 240px">
-              <el-select v-model="queryParams.searchType" slot="prepend" clearable style="width: 100px">
-                <el-option v-for="dict in dicData.searchType" v-bind="dict" :key="dict.value"/>
+          <el-form-item label="搜索方式" prop="searchValue">
+            <el-input v-model="queryParams.searchValue" style="width: 240px">
+              <el-select v-model="queryParams.searchType" slot="prepend" style="width: 100px">
+                <el-option v-for="dict in searchTypes" :key="dict.value" :label="dict.label" :value="dict.value"/>
               </el-select>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6" :xs="24">
-          <el-form-item label="订单类型">
-            <el-select v-model="queryParams.orderType" clearable style="width: 240px">
-              <el-option v-for="dict in dicData.orderType" v-bind="dict" :key="dict.value"/>
+          <el-form-item label="订单类型" prop="type">
+            <el-select v-model="queryParams.type" clearable style="width: 240px">
+              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TRADE_ORDER_TYPE)"
+                         :key="dict.value" :label="dict.label" :value="dict.value"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6" :xs="24">
-          <el-form-item label="订单状态">
-            <el-select v-model="queryParams.orderStatus" clearable style="width: 240px">
-              <el-option v-for="dict in dicData.orderStatus" v-bind="dict" :key="dict.value"/>
+          <el-form-item label="订单状态" prop="status">
+            <el-select v-model="queryParams.status" clearable style="width: 240px">
+              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TRADE_ORDER_STATUS)"
+                         :key="dict.value" :label="dict.label" :value="dict.value"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6" :xs="24">
-          <el-form-item label="订单来源">
-            <el-select v-model="queryParams.orderSource" clearable style="width: 240px">
-              <el-option v-for="dict in dicData.orderSource" v-bind="dict" :key="dict.value"/>
+          <el-form-item label="订单来源" prop="terminal">
+            <el-select v-model="queryParams.terminal" clearable style="width: 240px">
+              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TERMINAL)"
+                         :key="dict.value" :label="dict.label" :value="dict.value"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6" :xs="24">
-          <el-form-item label="付款方式">
-            <el-select v-model="queryParams.payWay" clearable style="width: 240px">
-              <el-option v-for="dict in dicData.payWay" v-bind="dict" :key="dict.value"/>
+          <el-form-item label="支付方式" prop="payChannelCode">
+            <el-select v-model="queryParams.payChannelCode" clearable style="width: 240px">
+              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.PAY_CHANNEL_CODE_TYPE)"
+                         :key="dict.value" :label="dict.label" :value="dict.value"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6" :xs="24">
-          <el-form-item label="营销类型">
-            <el-select v-model="queryParams.marketingType" clearable style="width: 240px">
-              <el-option v-for="dict in dicData.marketingType" v-bind="dict" :key="dict.value"/>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6" :xs="24">
-          <el-form-item label="下单时间">
-            <el-date-picker v-model="queryParams.date" type="daterange" range-separator="至"
-                            start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="rangePickerOptions" style="width: 240px"/>
+          <el-form-item label="下单时间" prop="createTime">
+            <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                            range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+                            :picker-options="datePickerOptions" :default-time="['00:00:00', '23:59:59']" />
           </el-form-item>
         </el-col>
         <el-col :span="6" :xs="24" style="line-height: 32px">
-          <el-button type="primary" icon="el-icon-search" size="mini">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini">重置</el-button>
-          <el-button icon="el-icon-document" size="mini">导出订单</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         </el-col>
       </el-form>
     </el-row>
 
-    <!-- tab切换-->
-    <el-radio-group v-model="activeTabName">
-      <el-radio-button v-for="tabPane in tabPanes" :label="tabPane.label">{{tabPane.text}}</el-radio-button>
-    </el-radio-group>
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-    <!-- table -->
-    <el-table :data="tableData" :show-header="false" class="order-table">
-      <el-table-column label="订单信息">
-        <template slot-scope="{ row }">
-          <el-row>
-            <el-col :span="5">
-              订单号：{{row.orderNo}}
-              <el-popover title="支付流水号：" :content="row.payNo" ref="popover" placement="right" width="200" trigger="click"/>
-              <el-button type="text" v-popover:popover>更多</el-button>
-            </el-col>
-            <el-col :span="5">下单时间：{{row.time}}</el-col>
-            <el-col :span="4">订单来源：{{row.orderSource}}</el-col>
-            <el-col :span="4">支付方式：{{row.payWay}}</el-col>
-            <el-col :span="6" align="right" type="flex">
-              <el-button type="text">关闭订单</el-button>
-              <el-button type="text">修改地址</el-button>
-              <el-button type="text">调整价格</el-button>
-              <el-dropdown style="margin-left: 10px">
-                <el-button type="text">
-                  更多操作<i class="el-icon-arrow-down el-icon--right"></i>
-                </el-button>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item><el-button type="text">打印发货单</el-button></el-dropdown-item>
-                  <el-dropdown-item><el-button type="text" @click="goToDetail(row)">详情</el-button></el-dropdown-item>
-                  <el-dropdown-item><el-button type="text">备注</el-button></el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </el-col>
-          </el-row>
-          <!-- 订单下的商品 -->
-          <el-table :data="row.goods" border>
-            <el-table-column label="商品" prop="goods" header-align="center" width="360">
-              <template slot-scope="{ row, $index }">
-                <div class="goods-info">
-                  <img :src="row.picture"/>
-                  <span class="ellipsis-2" :title="row.name">{{row.name}}</span>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column label="单价(元)/数量" prop="fee" align="center" width="115">
-              <template slot-scope="{ row }">
-                <div>{{row.price}}</div>
-                <div>{{row.count}}</div>
-              </template>
-            </el-table-column>
-            <el-table-column label="维权" prop="safeguard" align="center" width="115"/>
-            <el-table-column label="实付金额(元)" prop="amount" align="center" width="115"/>
-            <el-table-column label="买家/收货人" prop="buyer" header-align="center" width="360">
-              <template slot-scope="{ row }">
-                <div>{{row.buyer}}</div>
-                <div>{{row.receiver}}{{row.tel}}</div>
-                <div class="ellipsis-2" :title="row.address">{{row.address}}</div>
-              </template>
-            </el-table-column>
-            <el-table-column label="配送方式" prop="sendWay" align="center" width="115"/>
-            <el-table-column label="交易状态" prop="status" align="center"/>
-          </el-table>
-        </template>
-      </el-table-column>
-    </el-table>
+    <!-- tab切换 -->
+    <!-- TODO @小程：看看能不能往上挪 -40px，和【隐藏搜索】【刷新】对齐 -->
+    <el-tabs v-model="activeTab" type="card" @tab-click="tabClick">
+      <el-tab-pane v-for="tab in statusTabs" :key="tab.value" :label="tab.label" :name="tab.value">
+        <!-- 列表 -->
+        <el-table v-loading="loading" :data="list" :show-header="false" class="order-table">
+          <el-table-column>
+            <template slot-scope="{ row }">
+              <el-row type="flex" align="middle">
+                <el-col :span="5">
+                  订单号：{{row.no}}
+                  <el-popover title="支付单号：" :content="row.payOrderId + ''" placement="right" width="200" trigger="click">
+                    <el-button slot="reference" type="text">更多</el-button>
+                  </el-popover>
+                </el-col>
+                <el-col :span="5">下单时间：{{ parseTime(row.createTime) }}</el-col>
+                <el-col :span="4">订单来源：
+                  <dict-tag :type="DICT_TYPE.TERMINAL" :value="row.terminal" />
+                </el-col>
+                <el-col :span="4">支付方式：
+                  <dict-tag v-if="row.payChannelCode" :type="DICT_TYPE.PAY_CHANNEL_CODE_TYPE" :value="row.payChannelCode" />
+                  <span v-else>未支付</span>
+                </el-col>
+                <el-col :span="6" align="right">
+                  <el-button type="text" @click="goToDetail(row)">详情</el-button>
+                </el-col>
+              </el-row>
+              <!-- 订单下的商品 -->
+              <el-table :data="row.items" border :show-header="true">
+                <el-table-column label="商品" prop="goods" header-align="center" width="auto" min-width="300">
+                  <template slot-scope="{ row, $index }">
+                    <div class="goods-info">
+                      <img :src="row.picUrl"/>
+                      <span class="ellipsis-2" :title="row.spuName">{{row.spuName}}</span>
+                      <!-- TODO @小程：下面是商品属性，想当度一行，放在商品名下面 -->
+                      <el-tag size="medium" v-for="property in row.properties">{{property.propertyName}}：{{property.valueName}}</el-tag>
+                    </div>
+                  </template>
+                </el-table-column>
+                <el-table-column label="单价(元)/数量" prop="fee" align="center" width="115">
+                  <template slot-scope="{ row }">
+                    <div>￥{{ (row.originalUnitPrice / 100.0).toFixed(2) }}</div>
+                    <div>{{row.count}} 件</div>
+                  </template>
+                </el-table-column>
+                <!-- TODO @小程：这里应该是一个订单下，多个商品，只展示订单上的总金额，就是 order.payPrice -->
+                <el-table-column label="实付金额(元)" prop="amount" align="center" width="100"/>
+                <!-- TODO @小程：这里应该是一个订单下，多个商品，只展示订单上的收件信息；使用 order.receiverXXX 开头的字段 -->
+                <el-table-column label="买家/收货人" prop="buyer" header-align="center" width="auto" min-width="300">
+                  <template slot-scope="{ row }">
+                    <!-- TODO @芋艿：以后增加一个会员详情界面 -->
+                    <div>{{row.buyer}}</div>
+                    <div>{{row.receiver}}{{row.tel}}</div>
+                    <div class="ellipsis-2" :title="row.address">{{row.address}}</div>
+                  </template>
+                </el-table-column>
+                <!-- TODO @小程：这里应该是一个订单下，多个商品，交易状态是统一的；使用 order.status 字段 -->
+                <el-table-column label="交易状态" prop="status" align="center" width="100"/>
+              </el-table>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
   </div>
 </template>
 
 <script>
-  const dicData = {
-    searchType: [
-      { label: '订单号', value: 'ddh' },
-      { label: '交易流水号', value: 'jylsh' },
-      { label: '订单备注', value: 'ddbz' },
-      { label: '收货人姓名', value: 'shrxm' },
-      { label: '商品名称', value: 'spmc' },
-      { label: '收货人电话', value: 'shrdh' },
-      { label: '会员昵称', value: 'hync' },
-      { label: '商品编号', value: 'spbh' }
-    ],
-    orderType: [
-      { label: '全部', value: 'qb' },
-      { label: '物流订单', value: 'wldd' },
-      { label: '自提订单', value: 'ztdd' },
-      { label: '外卖订单', value: 'wmdd' },
-      { label: '虚拟订单', value: 'xndd' },
-      { label: '收银订单', value: 'sydd' }
-    ],
-    orderStatus: [
-      { label: '全部', value: 'qb' },
-      { label: '待支付', value: 'dzf' },
-      { label: '待发货', value: 'dfh' },
-      { label: '已发货', value: 'yfh' },
-      { label: '已收货', value: 'ysh' },
-      { label: '已完成', value: 'ywc' },
-      { label: '已关闭', value: 'ygb' },
-      { label: '退款中', value: 'tkz' }
-    ],
-    orderSource: [
-      { label: '全部', value: 'qb' },
-      { label: '微信公众号', value: 'wxgzh' },
-      { label: '微信小程序', value: 'wxxcx' },
-      { label: 'PC', value: 'pc' },
-      { label: 'H5', value: 'h5' },
-      { label: 'APP', value: 'app' },
-      { label: '收银台', value: 'syt' },
-      { label: '代客下单', value: 'dkxd' }
-    ],
-    payWay: [
-      { label: '全部', value: 'qb' },
-      { label: '在线支付', value: 'zxzf' },
-      { label: '余额支付', value: 'yezf' },
-      { label: '线下支付', value: 'xxzf' },
-      { label: '积分兑换', value: 'jfdh' },
-      { label: '支付宝支付', value: 'zfbzf' },
-      { label: '微信支付', value: 'wxzf' }
-    ],
-    marketingType: [
-      { label: '全部', value: 'qb' },
-      { label: '一口价', value: 'ykj' },
-      { label: '专题', value: 'zt' },
-      { label: '团购', value: 'tg' },
-      { label: '拼团', value: 'pt' },
-      { label: '拼团返利', value: 'ptfl' },
-      { label: '盲盒', value: 'mh' },
-      { label: '砍价', value: 'kj' },
-      { label: '礼品卡优惠', value: 'lpkyh' },
-      { label: '秒杀', value: 'ms' },
-      { label: '积分兑换', value: 'jfdh' },
-      { label: '组合套餐', value: 'zhtc' },
-      { label: '预售', value: 'ys' }
-    ]
-  }
-  const rangePickerOptions = {
-    shortcuts: [{
-      text: '最近一周',
-      onClick(picker) {
-        const end = new Date();
-        const start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-        picker.$emit('pick', [start, end]);
-      }
-    }, {
-      text: '最近一个月',
-      onClick(picker) {
-        const end = new Date();
-        const start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-        picker.$emit('pick', [start, end]);
-      }
-    }, {
-      text: '最近三个月',
-      onClick(picker) {
-        const end = new Date();
-        const start = new Date();
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-        picker.$emit('pick', [start, end]);
-      }
-    }]
-  }
-  export default {
-    name: "index",
-    data () {
-      return {
-        dicData,
-        rangePickerOptions,
-        queryParams: {
-          searchType: 'ddh',
-          orderType: ''
-        },
-        activeTabName: 'all',
-        tabPanes: [
-          { text: '全部', label: 'all' },
-          { text: '待支付', label: 'toBePay' },
-          { text: '待发货', label: 'toBeSend' },
-          { text: '已发货', label: 'send' },
-          { text: '已收货', label: 'received' },
-          { text: '已完成', label: 'finished' },
-          { text: '已关闭', label: 'closed' },
-          { text: '退款中', label: 'refund' }
-        ],
-        tableData: [
-          {
-            orderInfo: '',
-            orderNo: '20221026220424001',
-            payNo: '20221026220424001',
-            time: '2022-10-26 22:04:20',
-            orderSource: 'PC',
-            payWay: '微信支付',
-            goods: [
-              {
-                name: '颜衫短袖男polo衫夏季翻领衣服潮牌休闲上衣夏天翻领半袖男士t恤',
-                picture: 'https://b2c-v5-yanshi.oss-cn-hangzhou.aliyuncs.com/upload/1/common/images/20220723/20220723115621165854858145027_SMALL.webp',
-                price: '199',
-                count: '5件',
-                amount: 460,
-                safeguard: '主动退款',
-                buyer: '小明',
-                receiver: '小花',
-                tel: '15823655095',
-                address: '北京市-北京市-东城区 观音桥',
-                sendWay: '物流配送',
-                status: '已完成'
-              },
-              {
-                name: '颜衫短袖男polo衫夏季翻领衣服潮牌休闲上衣夏天翻领半袖男士t恤',
-                picture: 'https://b2c-v5-yanshi.oss-cn-hangzhou.aliyuncs.com/upload/1/common/images/20220723/20220723115621165854858145027_SMALL.webp',
-                price: '199',
-                count: '5件',
-                amount: 460,
-                safeguard: '主动退款',
-                buyer: '小明',
-                receiver: '小花',
-                tel: '15823655095',
-                address: '北京市-北京市-东城区 观音桥',
-                sendWay: '物流配送',
-                status: '已完成'
-              }
-            ]
-          },
-          {
-            orderInfo: '',
-            orderNo: '20221026220424001',
-            payNo: '20221026220424001',
-            time: '2022-10-26 22:04:20',
-            orderSource: 'PC',
-            payWay: '微信支付',
-            goods: [
-              {
-                name: '颜衫短袖男polo衫夏季翻领衣服潮牌休闲上衣夏天翻领半袖男士t恤',
-                picture: 'https://b2c-v5-yanshi.oss-cn-hangzhou.aliyuncs.com/upload/1/common/images/20220723/20220723115621165854858145027_SMALL.webp',
-                price: '199',
-                count: '5件',
-                amount: 460,
-                safeguard: '主动退款',
-                buyer: '小明',
-                receiver: '小花',
-                tel: '15823655095',
-                address: '北京市-北京市-东城区 观音桥',
-                sendWay: '物流配送',
-                status: '已完成'
-              },
-              {
-                name: '颜衫短袖男polo衫夏季翻领衣服潮牌休闲上衣夏天翻领半袖男士t恤',
-                picture: 'https://b2c-v5-yanshi.oss-cn-hangzhou.aliyuncs.com/upload/1/common/images/20220723/20220723115621165854858145027_SMALL.webp',
-                price: '199',
-                count: '5件',
-                amount: 460,
-                safeguard: '主动退款',
-                buyer: '小明',
-                receiver: '小花',
-                tel: '15823655095',
-                address: '北京市-北京市-东城区 观音桥',
-                sendWay: '物流配送',
-                status: '已完成'
-              }
-            ]
-          }
-        ]
-      }
+import { getOrderPage } from "@/api/mall/trade/order";
+import { datePickerOptions } from "@/utils/constants";
+import { DICT_TYPE, getDictDatas } from "@/utils/dict";
+
+export default {
+  name: "index",
+  data () {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 交易售后列表
+      list: [],
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        searchType: 'no',
+        searchValue: '',
+        type: null,
+        status: null,
+        payChannelCode: null,
+        createTime: [],
+      },
+      // Tab 筛选
+      activeTab: 'all',
+      statusTabs: [{
+        label: '全部',
+        value: 'all'
+      }],
+      // 静态变量
+      datePickerOptions: datePickerOptions,
+      searchTypes: [
+        { label: '订单号', value: 'no' },
+        { label: '会员编号', value: 'userId' },
+        { label: '会员昵称', value: 'userNickname' },
+        { label: '会员手机号', value: 'userMobile' },
+        { label: '收货人姓名', value: 'receiverName' },
+        { label: '收货人手机号码', value: 'receiverMobile' },
+      ],
+    }
+  },
+  created() {
+    this.getList();
+    // 设置 statuses 过滤
+    for (const dict of getDictDatas(DICT_TYPE.TRADE_ORDER_STATUS)) {
+      this.statusTabs.push({
+        label: dict.label,
+        value: dict.value
+      })
+    }
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getOrderPage({
+        ...this.queryParams,
+        searchType: undefined,
+        searchValue: undefined,
+        no: this.queryParams.searchType === 'no' ? this.queryParams.searchValue : undefined,
+        userId: this.queryParams.searchType === 'userId' ? this.queryParams.searchValue : undefined,
+        userNickname: this.queryParams.searchType === 'userNickname' ? this.queryParams.searchValue : undefined,
+        userMobile: this.queryParams.searchType === 'userMobile' ? this.queryParams.searchValue : undefined,
+        receiverName: this.queryParams.searchType === 'receiverName' ? this.queryParams.searchValue : undefined,
+        receiverMobile: this.queryParams.searchType === 'receiverMobile' ? this.queryParams.searchValue : undefined,
+      }).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
-    methods: {
-      goToDetail (row) {
-        this.$router.push({ path: '/mall/trade/order/detail', query: { orderNo: row.orderNo }})
-      }
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.activeTab = this.queryParams.status ? this.queryParams.status : 'all'; // 处理 tab
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** tab 切换 */
+    tabClick(tab) {
+      this.queryParams.status = tab.name === 'all' ? undefined : tab.name;
+      this.getList();
+    },
+    goToDetail (row) {
+      this.$router.push({ path: '/trade/order/detail', query: { id: row.id }})
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  ::v-deep .order-table{
-    margin-top: 20px;
-    border-bottom: none;
-    &::before{
-      height: 0;
-    }
-    .el-table__row{
-      .el-table__cell{
-        border-bottom: none;
-        .cell{
-          .el-table {
-            .el-table__row{
-              >.el-table__cell{
-                .goods-info{
-                  display: flex;
-                  img{
-                    margin-right: 10px;
-                    width: 60px;
-                    height: 60px;
-                    border: 1px solid #e2e2e2;
-                  }
-                }
-                .ellipsis-2{
-                  display: -webkit-box;
-                  overflow: hidden;
-                  text-overflow: ellipsis;
-                  white-space: normal;
-                  -webkit-line-clamp: 2; /* 要显示的行数 */
-                  -webkit-box-orient: vertical;
-                  word-break: break-all;
-                  line-height: 22px !important;
-                  max-height: 44px !important;
+::v-deep .order-table{
+  border-bottom: none;
+  &::before{
+    height: 0;
+  }
+  .el-table__row{
+    .el-table__cell{
+      border-bottom: none;
+      .cell{
+        .el-table {
+          .el-table__row{
+            >.el-table__cell{
+              .goods-info{
+                display: flex;
+                img{
+                  margin-right: 10px;
+                  width: 60px;
+                  height: 60px;
+                  border: 1px solid #e2e2e2;
                 }
               }
+              .ellipsis-2{
+                display: -webkit-box;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: normal;
+                -webkit-line-clamp: 2; /* 要显示的行数 */
+                -webkit-box-orient: vertical;
+                word-break: break-all;
+                line-height: 22px !important;
+                max-height: 44px !important;
+              }
             }
           }
         }
       }
     }
   }
+}
 </style>

yudao-ui-admin/src/views/system/area/index.vue

@@ -0,0 +1,114 @@
+<template>
+  <div class="app-container">
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">IP 查询
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-if="refreshTable" v-loading="loading" :data="list"  row-key="id"
+              :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column label="编号" prop="id"/>
+      <el-table-column label="名字" prop="name"/>
+    </el-table>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog title="IP 查询" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="IP" prop="ip">
+          <el-input v-model="form.ip" placeholder="请输入 IP 地址"/>
+        </el-form-item>
+        <el-form-item label="地址" prop="result">
+          <el-input v-model="form.result" readonly placeholder="展示查询 IP 结果" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">查 询</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {getAreaByIp, getAreaTree} from "@/api/system/area";
+
+export default {
+  name: "Area",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 地区列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 表单参数
+      form: {
+        ip: undefined,
+        result: undefined,
+      },
+      // 表单校验
+      rules: {
+        ip: [{required: true, message: "IP 地址不能为控", trigger: "blur"}],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      getAreaTree().then(response => {
+        this.list = response.data;
+        this.loading = false;
+      })
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        ip: undefined,
+        result: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        getAreaByIp(this.form.ip).then(response => {
+          this.$modal.msgSuccess("查询成功");
+          this.form.result = response.data
+        });
+      });
+    }
+  }
+};
+</script>

yudao-ui-admin/src/views/system/notice/index.vue

@@ -4,12 +4,9 @@
       <el-form-item label="公告标题" prop="title">
         <el-input v-model="queryParams.title" placeholder="请输入公告标题" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="操作人员" prop="createBy">
-        <el-input v-model="queryParams.createBy" placeholder="请输入操作人员" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="公告类型" clearable>
-          <el-option v-for="dict in noticeTypeDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+      <el-form-item label="公告状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="公告状态" clearable>
+          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -136,7 +133,6 @@ export default {
         pageNo: 1,
         pageSize: 10,
         title: undefined,
-        createBy: undefined,
         status: undefined
       },
       // 表单参数

yudao-ui-admin/src/views/system/oauth2/token/index.vue

@@ -6,6 +6,9 @@
       <el-form-item label="用户编号" prop="userId">
         <el-input v-model="queryParams.userId" placeholder="请输入用户编号" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
+      <el-form-item label="客户端编号" prop="clientId">
+        <el-input v-model="queryParams.clientId" placeholder="请输入客户端编号" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
       <el-form-item label="用户类型" prop="userType">
         <el-select v-model="queryParams.userType" placeholder="请选择用户类型" clearable>
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.USER_TYPE)"
@@ -68,7 +71,8 @@ export default {
         pageNo: 1,
         pageSize: 10,
         userId: undefined,
-        userType: undefined
+        userType: undefined,
+        clientId: undefined
       }
     };
   },

yudao-ui-admin/src/views/system/sms/smsChannel.vue

@@ -231,7 +231,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal.confirm('是否确认删除短信渠道编号为"' + row.id + '"的数据项?').then(function() {
-        return deleteSmsChannel(id);
+        return deleteSmsChannel(row.id);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");