!265 商品模块 60%

Merge pull request !265 from 芋道源码/feature/1.8.0-uniapp

Author: YunaiV

.eslintignore

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

src/api/mall/CouponTemplete/CouponTemplete.js

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

src/api/mall/product/brand.js

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

src/api/mall/product/category.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 创建商品分类
-export function createCategory(data) {
+export function createProductCategory(data) {
   return request({
     url: '/product/category/create',
     method: 'post',
@@ -10,7 +10,7 @@ export function createCategory(data) {
 }
 
 // 更新商品分类
-export function updateCategory(data) {
+export function updateProductCategory(data) {
   return request({
     url: '/product/category/update',
     method: 'put',
@@ -19,45 +19,26 @@ export function updateCategory(data) {
 }
 
 // 删除商品分类
-export function deleteCategory(id) {
+export function deleteProductCategory(id) {
   return request({
     url: '/product/category/delete?id=' + id,
     method: 'delete'
   })
 }
 
 // 获得商品分类
-export function getCategory(id) {
+export function getProductCategory(id) {
   return request({
     url: '/product/category/get?id=' + id,
     method: 'get'
   })
 }
 
-// 获得商品分类
-export function listCategory(query) {
-  return request({
-    url: '/product/category/listByQuery',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得商品分类分页
-export function getCategoryPage(query) {
+// 获得商品分类列表
+export function getProductCategoryList(query) {
   return request({
-    url: '/product/category/page',
+    url: '/product/category/list',
     method: 'get',
     params: query
   })
 }
-
-// 导出商品分类 Excel
-export function exportCategoryExcel(query) {
-  return request({
-    url: '/product/category/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/api/mall/product/spu.js

@@ -42,13 +42,3 @@ export function getSpuPage(query) {
     params: query
   })
 }
-
-// 导出商品spu Excel
-export function exportSpuExcel(query) {
-  return request({
-    url: '/product/spu/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}

src/components/ImageUpload/index.vue

@@ -85,8 +85,8 @@ export default {
     value: {
       handler(val) {
         if (val) {
-          // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          // 首先将值转为数组, 当只穿了一个图片时，会报map方法错误
+          const list = Array.isArray(val) ? val :  Array.isArray(this.value.split(',')) ? this.value.split(','): Array.of(this.value);
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {

src/layout/components/Sidebar/SidebarItem.vue

@@ -13,8 +13,8 @@
         <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
       </template>
       <sidebar-item
-        v-for="child in item.children"
-        :key="child.path"
+        v-for="(child, index) in item.children"
+        :key="child.path + index"
         :is-nest="true"
         :item="child"
         :base-path="resolvePath(child.path)"

src/main.js

@@ -16,7 +16,7 @@ import './permission' // permission control
 import './tongji' // 百度统计
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/infra/config";
-import { parseTime, resetForm, handleTree} from "@/utils/ruoyi";
+import { parseTime, resetForm, handleTree, addBeginAndEndTime, divide} from "@/utils/ruoyi";
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
@@ -35,6 +35,8 @@ Vue.prototype.getDictDatas2 = getDictDatas2
 Vue.prototype.getDictDataLabel = getDictDataLabel
 Vue.prototype.DICT_TYPE = DICT_TYPE
 Vue.prototype.handleTree = handleTree
+Vue.prototype.addBeginAndEndTime = addBeginAndEndTime
+Vue.prototype.divide = divide
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)

src/utils/ruoyi.js

@@ -235,3 +235,17 @@ export function getPath(path) {
   }
   return basePath + path;
 }
+
+/**
+ * 除法保留两位小数
+ *
+ * @param {*} divisor 除数
+ * @param {*} dividend 被除数
+ * @returns
+ */
+ export function divide(divisor, dividend) {
+  if(divisor == null || dividend == null || dividend == 0){
+    return null;
+  }
+  return Math.floor(divisor/dividend*100)/100;
+}