Merge remote-tracking branch 'yudao/dev' into dev-crm

# Conflicts:
#	src/router/modules/remaining.ts

src/api/crm/product/index.ts

@@ -41,3 +41,8 @@ export const deleteProduct = async (id: number) => {
 export const exportProduct = async (params) => {
   return await request.download({ url: `/crm/product/export-excel`, params })
 }
+
+// 查询产品操作日志
+export const getOperateLogPage = async (params: any) => {
+  return await request.get({ url: '/crm/product/operate-log-page', params })
+}

src/api/mall/product/category.ts

@@ -20,10 +20,6 @@ export interface CategoryVO {
    * 移动端分类图
    */
   picUrl: string
-  /**
-   * PC 端分类图
-   */
-  bigPicUrl?: string
   /**
    * 分类排序
    */

src/api/mall/product/property.ts

@@ -65,16 +65,6 @@ export const getPropertyPage = (params: PageParam) => {
   return request.get({ url: '/product/property/page', params })
 }
 
-// 获得属性项列表
-export const getPropertyList = (params: any) => {
-  return request.get({ url: '/product/property/list', params })
-}
-
-// 获得属性项列表
-export const getPropertyListAndValue = (data: any) => {
-  return request.post({ url: '/product/property/get-value-list', data })
-}
-
 // ------------------------ 属性值 -------------------
 
 // 获得属性值分页

src/api/mall/product/spu.ts

@@ -33,14 +33,15 @@ export interface GiveCouponTemplate {
 export interface Spu {
   id?: number
   name?: string // 商品名称
-  categoryId?: number | undefined // 商品分类
+  categoryId?: number // 商品分类
   keyword?: string // 关键字
   unit?: number | undefined // 单位
   picUrl?: string // 商品封面图
   sliderPicUrls?: string[] // 商品轮播图
   introduction?: string // 商品简介
+  deliveryTypes?: number[] // 配送方式
   deliveryTemplateId?: number | undefined // 运费模版
-  brandId?: number | undefined // 商品品牌编号
+  brandId?: number // 商品品牌编号
   specType?: boolean // 商品规格
   subCommissionType?: boolean // 分销类型
   skus?: Sku[] // sku数组
@@ -48,11 +49,6 @@ export interface Spu {
   sort?: number // 商品排序
   giveIntegral?: number // 赠送积分
   virtualSalesCount?: number // 虚拟销量
-  recommendHot?: boolean // 是否热卖
-  recommendBenefit?: boolean // 是否优惠
-  recommendBest?: boolean // 是否精品
-  recommendNew?: boolean // 是否新品
-  recommendGood?: boolean // 是否优品
   price?: number // 商品价格
   salesCount?: number // 商品销量
   marketPrice?: number // 市场价
@@ -60,7 +56,6 @@ export interface Spu {
   stock?: number // 商品库存
   createTime?: Date // 商品创建时间
   status?: number // 商品状态
-  activityOrders: number[] // 活动排序
 }
 
 // 获得 Spu 列表

src/api/mall/promotion/diy/page.ts

@@ -5,7 +5,7 @@ export interface DiyPageVO {
   templateId?: number
   name: string
   remark: string
-  previewImageUrls: string[]
+  previewPicUrls: string[]
   property: string
 }
 

src/api/mall/promotion/diy/template.ts

@@ -7,7 +7,7 @@ export interface DiyTemplateVO {
   used: boolean
   usedTime?: Date
   remark: string
-  previewImageUrls: string[]
+  previewPicUrls: string[]
   property: string
 }
 

src/api/mall/promotion/reward/rewardActivity.ts

@@ -1,17 +1,18 @@
 import request from '@/config/axios'
 
 export interface DiscountActivityVO {
-  id?:number,
+  id?: number
   name?: string
-  startTime?:Date
-  endTime?:Date
-  remark?:string
-  conditionType?:number
-  productScope?:number
-  productSpuIds?:number[]
-  rules?:DiscountProductVO[]
+  startTime?: Date
+  endTime?: Date
+  remark?: string
+  conditionType?: number
+  productScope?: number
+  productSpuIds?: number[]
+  rules?: DiscountProductVO[]
 }
-//优惠规则
+
+// 优惠规则
 export interface DiscountProductVO {
   limit: number
   discountPrice: number
@@ -21,23 +22,26 @@ export interface DiscountProductVO {
   couponCounts: number[]
 }
 
-
 // 新增满减送活动
 export const createRewardActivity = async (data: DiscountActivityVO) => {
   return await request.post({ url: '/promotion/reward-activity/create', data })
 }
+
 // 更新满减送活动
 export const updateRewardActivity = async (data: DiscountActivityVO) => {
   return await request.put({ url: '/promotion/reward-activity/update', data })
 }
+
 // 查询满减送活动列表
 export const getRewardActivityPage = async (params) => {
   return await request.get({ url: '/promotion/reward-activity/page', params })
 }
+
 // 查询满减送活动详情
-export const getReward = async (id:number) => {
-  return await request.get({ url: '/promotion/reward-activity/get?id='+id,  })
+export const getReward = async (id: number) => {
+  return await request.get({ url: '/promotion/reward-activity/get?id=' + id })
 }
+
 // 删除限时折扣活动
 export const deleteRewardActivity = async (id: number) => {
   return await request.delete({ url: '/promotion/reward-activity/delete?id=' + id })