diff --git a/buyer/src/components/goodsDetail/ShowGoods.vue b/buyer/src/components/goodsDetail/ShowGoods.vue index 35864d24c..2049fb989 100644 --- a/buyer/src/components/goodsDetail/ShowGoods.vue +++ b/buyer/src/components/goodsDetail/ShowGoods.vue @@ -127,26 +127,6 @@ - -
-

- 促销 - 限时折扣 - - 享 {{ promotionMap["DISCOUNT"].discount }} 折 - -

-
- -
-

- 促销 - 第N件 - - 第 {{ promotionMap["NTH"].nthNum || promotionMap["NTH"].num }} 件优惠 - -

-

diff --git a/buyer/src/components/indexDecorate/components/BrandWall.vue b/buyer/src/components/indexDecorate/components/BrandWall.vue index 618d87b95..d1cf5b126 100644 --- a/buyer/src/components/indexDecorate/components/BrandWall.vue +++ b/buyer/src/components/indexDecorate/components/BrandWall.vue @@ -49,7 +49,7 @@ const brandList = computed(() => { { title: '数码潮玩 · 爆款立减500', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_1.png', url: '/goodsList?category=1' }, { title: '美妆奢宠 · 每满300减50', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_2.png', url: '/goodsList?category=2' }, { title: '运动潮品 · 爆款低至5折', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_3.png', url: '/goodsList?category=3' }, - { title: '品质生活 · 限时第2件半价', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' } + { title: '品质生活 · 精选好物', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' } ]; }); diff --git a/buyer/src/constants/goodsType.js b/buyer/src/constants/goodsType.js index 70f278722..93e1f21d0 100644 --- a/buyer/src/constants/goodsType.js +++ b/buyer/src/constants/goodsType.js @@ -14,7 +14,7 @@ export const E_COUPON_ORDER_TYPE = "E_COUPON"; /** 单次购买数量上限（O-09 默认：min(quantity, 999)） */ export const E_COUPON_MAX_BUY_NUM = 999; -/** 常规立即购买（秒杀/满减/券/限时/第N件等） */ +/** 常规立即购买（秒杀/满减/券等） */ export const E_COUPON_CART_BUY_NOW = "BUY_NOW"; export const E_COUPON_CART_PINTUAN = "PINTUAN"; export const E_COUPON_CART_POINTS = "POINTS"; @@ -72,8 +72,6 @@ export function createEmptyPromotionMap() { SECKILL: null, FULL_DISCOUNT: null, COUPON: [], - DISCOUNT: null, - NTH: null, PINTUAN: null, KANJIA: null, }; diff --git a/manager/src/api/setting.js b/manager/src/api/setting.js index f0634e51a..53b228045 100644 --- a/manager/src/api/setting.js +++ b/manager/src/api/setting.js @@ -5,14 +5,10 @@ import { postRequest } from '@/libs/axios'; -// 查询短信站内信信息 +// 查询站内信信息 export const getMessageData = params => { return getRequest("/other/message", params); }; -//修改短信模板 -export const editSmsMessageTemplate = (id, params) => { - return putRequest(`/sms/sms/${id}`, params) -} //修改站内信模板 export const editNoticeMessage = (id, params) => { return putRequest(`/setting/noticeMessage/${id}`, params) @@ -45,14 +41,6 @@ export const openNoticeMessage = (id) => { export const updateMessageStatus = (id,status) => { return putRequest(`/setting/noticeMessage/${id}/${status}`); }; -//获取短信模板 -export const getSmsTemplatePage = (params) => { - return getRequest("/sms/sms/template", params); -}; -//获取短信签名 -export const getSmsSignPage = (params) => { - return getRequest("/sms/sms/sign", params); -}; //获取设置 export const getSetting = (key) => { return getRequest(`/setting/setting/get/${key}`); @@ -66,42 +54,6 @@ export const setSetting = (key, params) => { return postRequest(`/setting/setting/put/${key}`, params); }; -//查看短信签名 -export const getSmsSign = () => { - return getRequest(`/sms/sms/sign`); -}; -//添加短信签名 -export const addSmsSign = (params) => { - return postRequest(`/sms/sms/sign`, params); -}; -//修改短信签名 -export const editSmsSign = (params) => { - return putRequest(`/sms/sms/sign`, params); -}; -//删除短信签名 -export const delSmsSign = (id) => { - return deleteRequest(`/sms/sms/sign/${id}`); -}; -//添加短信模板 -export const addSmsTemplate = (params) => { - return postRequest(`/sms/sms/template`, params); -}; -//修改短信模板 -export const editSmsTemplate = (params) => { - return putRequest(`/sms/sms/template`, params); -}; -//删除短信模板 -export const delSmsTemplate = (id) => { - return deleteRequest(`/sms/sms/template/${id}`); -}; -//查询短信发送记录 -export const getSmsReachPage = (params) => { - return getRequest(`/sms/sms`, params); -}; -//重新发送 -export const repeatSendSms = (id) => { - return postRequest(`/sms/sms/repeat/${id}`); -}; //获取设置 export const getExperienceData = (key) => { return getRequest(`/setting/experience/get/${key}`); @@ -218,41 +170,11 @@ export const updateWechatMpMessageTemplate = params => { // ------------------------------------------------------------- -// 补充缺失的系统配置、短信、版本及验证码 API +// 补充缺失的系统配置、版本及验证码 API // ------------------------------------------------------------- -// 短信任务发送与记录 (sms.vue) -export const getSmsPage = (params) => { - return getRequest(`/sms/sms`, params); -}; -export const sendSms = (params) => { - return postRequest(`/sms/sms`, params); -}; -// 短信签名同步与详细 (sms.vue, smsSign.vue) -export const syncSign = () => { - return putRequest(`/sms/sign/querySmsSign`); -}; -export const deleteSign = (id) => { - return deleteRequest(`/sms/sign/${id}`); -}; -export const smsSignDetail = (id) => { - return getRequest(`/sms/sign/${id}`); -}; -// 短信模板管理与同步 (sms.vue) -export const syncTemplate = () => { - return putRequest(`/sms/template/querySmsSign`); -}; -export const addSmsTemplatePage = (params) => { - return postRequest(`/sms/template`, params); -}; -export const editSmsTemplatePage = (params) => { - return putRequest(`/sms/template/modifySmsTemplate`, params); -}; -export const deleteSmsTemplatePage = (params) => { - return deleteRequest(`/sms/template`, params); -}; // 支付支持方式表单 (PAYMENT_SUPPORT.vue) export const getPaymentSupportForm = () => { diff --git a/manager/src/libs/util.js b/manager/src/libs/util.js index 64d241cae..e8794b5a6 100644 --- a/manager/src/libs/util.js +++ b/manager/src/libs/util.js @@ -7,6 +7,8 @@ let util = {}; /** 已弃用、前端未实现或已移除的菜单 frontRoute，注册路由时跳过 */ const DEPRECATED_FRONT_ROUTES = new Set([ + "sys/message/sms", + "sys/message/smsSign", "goods/goods-manage/spec", "member/list/memberRecycle", "order/order/fictitiousOrderList", diff --git a/manager/src/router/router.js b/manager/src/router/router.js index 0c173aae7..5341d77dd 100644 --- a/manager/src/router/router.js +++ b/manager/src/router/router.js @@ -385,12 +385,6 @@ export const otherRouter = { component: () => import("@/views/promotions/seckill/seckill-goods.vue") }, - { - path: "add-sms-sign", - title: "短信签名", - name: "add-sms-sign", - component: () => import("@/views/sys/message/smsSign.vue") - }, { path: "live-add", title: "创建直播", diff --git a/manager/src/views/page-decoration/pc/config.js b/manager/src/views/page-decoration/pc/config.js index d560cadbd..0937cf0c9 100644 --- a/manager/src/views/page-decoration/pc/config.js +++ b/manager/src/views/page-decoration/pc/config.js @@ -443,7 +443,7 @@ export const COMPONENT_DEFINITIONS = [ { title: '数码潮玩 · 爆款立减500', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_1.png', url: '/goodsList?category=1' }, { title: '美妆奢宠 · 每满300减50', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_2.png', url: '/goodsList?category=2' }, { title: '运动潮品 · 爆款低至5折', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_3.png', url: '/goodsList?category=3' }, - { title: '品质生活 · 限时第2件半价', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' } + { title: '品质生活 · 精选好物', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' } ] }, defaultComponentStyle: { diff --git a/manager/src/views/page-decoration/pc/template/TplBrandWall.vue b/manager/src/views/page-decoration/pc/template/TplBrandWall.vue index 7f377a186..c26b1a8e7 100644 --- a/manager/src/views/page-decoration/pc/template/TplBrandWall.vue +++ b/manager/src/views/page-decoration/pc/template/TplBrandWall.vue @@ -49,7 +49,7 @@ const brandList = computed(() => { { title: '数码潮玩 · 爆款立减500', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_1.png', url: '/goodsList?category=1' }, { title: '美妆奢宠 · 每满300减50', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_2.png', url: '/goodsList?category=2' }, { title: '运动潮品 · 爆款低至5折', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_3.png', url: '/goodsList?category=3' }, - { title: '品质生活 · 限时第2件半价', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' } + { title: '品质生活 · 精选好物', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' } ]; }); diff --git a/manager/src/views/sys/message/sms.vue b/manager/src/views/sys/message/sms.vue deleted file mode 100644 index a22230d2e..000000000 --- a/manager/src/views/sys/message/sms.vue +++ /dev/null @@ -1,701 +0,0 @@ - - - - - diff --git a/manager/src/views/sys/message/smsSign.vue b/manager/src/views/sys/message/smsSign.vue deleted file mode 100644 index 1a3f5cc9c..000000000 --- a/manager/src/views/sys/message/smsSign.vue +++ /dev/null @@ -1,181 +0,0 @@ - - - - - diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue index 382474f87..8d99b6c5a 100644 --- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue +++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue @@ -2539,7 +2539,6 @@ function save() { } baseInfoForm.value.salesModel = "RETAIL"; - baseInfoForm.value.wholesaleList = []; // 判断是否是复制商品（复制商品时不复用原有 goodsId，重新生成） if (!route.query.copyId) { @@ -2550,7 +2549,6 @@ function save() { syncIntroFromEditors(); let submit = JSON.parse(JSON.stringify(baseInfoForm.value)); submit.salesModel = "RETAIL"; - submit.wholesaleList = []; // 5. 商品主图相册校验 if ( @@ -3357,51 +3355,6 @@ onBeforeUnmount(() => { margin-left: 10px; } -.wholesale-rule-form-item { - width: 100% !important; - min-width: 900px; -} - -.wholesale-preview-table { - width: 480px; -} - -.wholesale-preview-table :deep(.el-table__cell .cell) { - overflow: visible; - white-space: nowrap; -} - -.wholesale-rule-form-item :deep(.el-form-item__content) { - width: 100%; -} - -.wholesale-num-input { - width: 190px; -} - -.wholesale-num-input :deep(.el-input__wrapper) { - min-width: 140px; -} - -.wholesale-price-cell { - position: relative; - display: flex; - justify-content: center; - align-items: center; -} - -.wholesale-price-input { - width: 190px; -} - -.wholesale-price-del { - position: absolute; - top: 50%; - left: 50%; - margin-left: 100px; - transform: translateY(-50%); -} - /* 单/多规格切换与单规格表格样式 */ .spec-mode-switch-bar { display: flex; diff --git a/seller/src/views/shop/pc/config.js b/seller/src/views/shop/pc/config.js index a001dcc1f..a965c1f22 100644 --- a/seller/src/views/shop/pc/config.js +++ b/seller/src/views/shop/pc/config.js @@ -283,7 +283,7 @@ const ALL_COMPONENT_DEFINITIONS = [ { title: '数码潮玩 · 爆款立减500', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_1.png', url: '/goodsList?category=1' }, { title: '美妆奢宠 · 每满300减50', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_2.png', url: '/goodsList?category=2' }, { title: '运动潮品 · 爆款低至5折', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_3.png', url: '/goodsList?category=3' }, - { title: '品质生活 · 限时第2件半价', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' } + { title: '品质生活 · 精选好物', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' } ] }, defaultComponentStyle: { diff --git a/seller/src/views/shop/pc/template/TplBrandWall.vue b/seller/src/views/shop/pc/template/TplBrandWall.vue index 7f377a186..c26b1a8e7 100644 --- a/seller/src/views/shop/pc/template/TplBrandWall.vue +++ b/seller/src/views/shop/pc/template/TplBrandWall.vue @@ -49,7 +49,7 @@ const brandList = computed(() => { { title: '数码潮玩 · 爆款立减500', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_1.png', url: '/goodsList?category=1' }, { title: '美妆奢宠 · 每满300减50', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_2.png', url: '/goodsList?category=2' }, { title: '运动潮品 · 爆款低至5折', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_3.png', url: '/goodsList?category=3' }, - { title: '品质生活 · 限时第2件半价', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' } + { title: '品质生活 · 精选好物', img: 'https://lilishop-pc.oss-cn-beijing.aliyuncs.com/static/brand-wall/brand_4.png', url: '/goodsList?category=4' } ]; });