-
@@ -20,7 +20,7 @@ export default {
}
},
computed: {
- skuDetail () {
+ storeDetail () { // 店铺详情
return this.detail;
}
}
@@ -46,57 +46,17 @@ export default {
color: #fff;
}
-.shop-title {
- display: flex;
- flex-direction: row;
-}
-
-.shop-title-icon {
- font-size: 46px;
-}
-
.shop-title-content {
- padding-top: 8px;
- margin-left: 15px;
display: flex;
+ align-items: center;
}
.shop-title-content p {
- line-height: 26px;
font-size: 20px;
-
-}
-.shop-title-content p:nth-child(2) {
- font-size: 16px;
margin-left: 20px;
}
.shop-title-content a {
color: #fff;
}
-.shop-another-item {
- display: flex;
- flex-direction: row;
-}
-
-.shop-another-item-detail {
- display: flex;
- flex-direction: row;
- align-items: center;
- margin-left: 15px;
-}
-
-.shop-another-item-img {
- height: 80px;
- border-radius: 40px;
- overflow: hidden;
-}
-
-.shop-another-item-img img {
- width: 80px;
-}
-
-.shop-anoter-item-intro {
- margin-left: 15px;
-}
diff --git a/buyer/src/components/header/hoverSearch.vue b/buyer/src/components/header/hoverSearch.vue
index 5c9e21a0..a81980b8 100644
--- a/buyer/src/components/header/hoverSearch.vue
+++ b/buyer/src/components/header/hoverSearch.vue
@@ -23,7 +23,7 @@ export default {
}
},
methods: {
- goCartList () {
+ goCartList () { // 跳转购物车页面
let routerUrl = this.$router.resolve({
path: '/cart'
})
diff --git a/buyer/src/components/indexDecorate/modelList/carousel.vue b/buyer/src/components/indexDecorate/modelList/carousel.vue
index 0c737399..45c6be95 100644
--- a/buyer/src/components/indexDecorate/modelList/carousel.vue
+++ b/buyer/src/components/indexDecorate/modelList/carousel.vue
@@ -67,14 +67,14 @@ export default {
};
},
methods: {
- getArticleList () {
+ getArticleList () { // 获取常见问题列表
articleList(this.params).then(res => {
if (res.success) {
this.articleList = res.result.records
}
})
},
- goArticle (id) {
+ goArticle (id) { // 跳转文章详情
let routeUrl = this.$router.resolve({
path: '/article',
query: {id}
diff --git a/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue b/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue
index 270e6377..7d35c935 100644
--- a/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue
+++ b/buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue
@@ -32,7 +32,6 @@ export default {
options: this.data.options // 装修数据
};
},
- methods: {}
};
\ No newline at end of file
diff --git a/buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue b/buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue
new file mode 100644
index 00000000..d36c6927
--- /dev/null
+++ b/buyer/src/pages/home/memberCenter/memberMsg/MsgList.vue
@@ -0,0 +1,41 @@
+
+
-
-
+
+ ![]()
+
+
+
+
+
\ No newline at end of file
diff --git a/buyer/src/pages/home/orderCenter/AddAddress.vue b/buyer/src/pages/home/orderCenter/AddAddress.vue
index 46e0c553..f5bf0beb 100644
--- a/buyer/src/pages/home/orderCenter/AddAddress.vue
+++ b/buyer/src/pages/home/orderCenter/AddAddress.vue
@@ -79,7 +79,7 @@ export default {
};
},
methods: {
- save () {
+ save () { // 保存地址
this.$refs.form.validate((valid) => {
if (valid) {
const params = JSON.parse(JSON.stringify(this.formData));
diff --git a/buyer/src/pages/home/orderCenter/AfterSale.vue b/buyer/src/pages/home/orderCenter/AfterSale.vue
index e79ed999..c5f896db 100644
--- a/buyer/src/pages/home/orderCenter/AfterSale.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSale.vue
@@ -133,7 +133,7 @@ export default {
});
window.open(routeUrl.href, '_blank');
},
- getList () {
+ getList () { // 获取售后列表
this.spinShow = true;
let params = JSON.parse(JSON.stringify(this.params))
afterSaleList(params).then(res => {
@@ -144,11 +144,11 @@ export default {
}
});
},
- changePageNum (val) {
+ changePageNum (val) { // 修改页码
this.params.pageNumber = val;
this.getList()
},
- changePageSize (val) {
+ changePageSize (val) { // 修改页数
this.pageNumber = 1;
this.params.pageSize = val;
this.getList()
diff --git a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
index 1f3a1add..7adcfd1a 100644
--- a/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
+++ b/buyer/src/pages/home/orderCenter/AfterSaleDetail.vue
@@ -75,7 +75,7 @@ export default {
}
})
},
- getLog () {
+ getLog () { // 获取售后日志
afterSaleLog(this.$route.query.sn).then(res => {
this.logList = res.result;
})
diff --git a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue
index 8d56a2f4..b05f8c6a 100644
--- a/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue
+++ b/buyer/src/pages/home/orderCenter/ApplyAfterSale.vue
@@ -139,7 +139,7 @@ export default {
}
},
methods: {
- getInfo () {
+ getInfo () { // 获取售后信息
afterSaleInfo(this.$route.query.sn).then(res => {
if (res.success) {
this.info = res.result
@@ -147,15 +147,15 @@ export default {
}
})
},
- getReason (type) {
+ getReason (type) { // 获取售后原因
afterSaleReason(type).then(res => {
if (res.success) this.reasonList = res.result
})
},
- changeReason (type) {
+ changeReason (type) { // 改变售后原因列表
this.getReason(type)
},
- apply () {
+ apply () { // 售后申请提交
this.$refs.form.validate(valid => {
if (valid) {
let params = Object.assign(this.info, this.form)
@@ -170,19 +170,19 @@ export default {
}
})
},
- handleView (name) {
+ handleView (name) { // 预览图片
this.previewImage = name;
this.visible = true;
},
- handleRemove (index) {
+ handleRemove (index) { // 移除图片
this.uploadList.splice(index, 1)
this.$forceUpdate()
},
- handleSuccess (res, file) {
+ handleSuccess (res, file) { // 上传成功回调
this.uploadList.push(res.result)
this.$forceUpdate()
},
- handleBeforeUpload () {
+ handleBeforeUpload () { // 上传之前钩子函数
const check = this.uploadList.length < 6;
if (!check) {
this.$Notice.warning({
diff --git a/buyer/src/pages/home/orderCenter/Complain.vue b/buyer/src/pages/home/orderCenter/Complain.vue
index 851cb6e3..d47499f0 100644
--- a/buyer/src/pages/home/orderCenter/Complain.vue
+++ b/buyer/src/pages/home/orderCenter/Complain.vue
@@ -78,7 +78,7 @@ export default {
}
},
methods: {
- getOrderDetail () {
+ getOrderDetail () { // 获取订单详情
orderDetail(this.$route.query.sn).then(res => {
this.order = res.result
this.orderGoods = res.result.orderItems[this.$route.query.index]
@@ -92,7 +92,7 @@ export default {
}
})
},
- save () {
+ save () { // 提交投诉信息
let params = {
goodsId: this.orderGoods.goodsId,
complainTopic: this.form.complainTopic,
@@ -108,26 +108,26 @@ export default {
}
})
},
- goGoodsDetail (skuId, goodsId) {
+ goGoodsDetail (skuId, goodsId) { // 跳转商品详情
let routerUrl = this.$router.resolve({
path: '/goodsDetail',
query: {skuId, goodsId}
})
window.open(routerUrl.href, '_blank')
},
- handleView (name) {
+ handleView (name) { // 预览图片
this.previewImage = name;
this.visible = true;
},
- handleRemove (index) {
+ handleRemove (index) { // 移除图片
this.orderGoods.uploadList.splice(index, 1)
this.$forceUpdate()
},
- handleSuccess (res, file) {
+ handleSuccess (res, file) { // 上传成功回调
this.orderGoods.uploadList.push(res.result)
this.$forceUpdate()
},
- handleBeforeUpload () {
+ handleBeforeUpload () { // 上传之前钩子函数
const check = this.orderGoods.uploadList.length < 6;
if (!check) {
this.$Notice.warning({
diff --git a/buyer/src/pages/home/orderCenter/MyOrder.vue b/buyer/src/pages/home/orderCenter/MyOrder.vue
index aaae009a..c66c1ec5 100644
--- a/buyer/src/pages/home/orderCenter/MyOrder.vue
+++ b/buyer/src/pages/home/orderCenter/MyOrder.vue
@@ -240,7 +240,7 @@ export default {
complainResult (sn) { // 投诉结果
},
- delOrder (sn) {
+ delOrder (sn) { // 删除订单
this.$Modal.confirm({
title: '删除订单',
content: '确认删除当前订单吗？
', @@ -255,7 +255,7 @@ export default { onCancel: () => {} }); }, - getList () { + getList () { // 获取订单列表 this.spinShow = true; let params = JSON.parse(JSON.stringify(this.params)) if (params.orderStatus === 'ALL') { @@ -269,11 +269,11 @@ export default { } }); }, - changePageNum (val) { + changePageNum (val) { // 修改页码 this.params.pageNumber = val; this.getList() }, - changePageSize (val) { + changePageSize (val) { // 修改页数 this.pageNumber = 1; this.params.pageSize = val; this.getList() @@ -289,7 +289,7 @@ export default { } }) }, - sureCancel () { + sureCancel () { // 确定取消 cancelOrder(this.cancelParams).then(res => { if (res.success) { this.$Message.success('取消订单成功') diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue index a21d8731..629ac5aa 100644 --- a/buyer/src/pages/home/orderCenter/OrderDetail.vue +++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue @@ -128,7 +128,7 @@ export default { } }) }, - traces () { + traces () { // 物流信息 getTraces(this.$route.query.sn).then(res => { if (res.success) { this.logistics = res.result diff --git a/buyer/src/pages/user/menu.js b/buyer/src/pages/user/menu.js index 78c3c093..7a9cf9ab 100644 --- a/buyer/src/pages/user/menu.js +++ b/buyer/src/pages/user/menu.js @@ -41,6 +41,11 @@ const member = [{ title: '账户安全', path: 'AccountSafe' }, + { + icon: '', + title: '我的消息', + path: 'MsgList' + }, { icon: '', title: '我的足迹', diff --git a/buyer/src/plugins/request.js b/buyer/src/plugins/request.js index c2c2b108..b937df34 100644 --- a/buyer/src/plugins/request.js +++ b/buyer/src/plugins/request.js @@ -1,77 +1,133 @@ // import Vue from 'vue'; -import axios from 'axios'; -import https from 'https'; -import { - Message, - Spin, - Modal -} from 'view-design'; -import Storage from './storage'; -import config from '@/config'; -import router from '../router/index.js'; -import store from '../vuex/store'; -import { - handleRefreshToken -} from '@/api/index'; -const qs = require('qs'); - -export const buyerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.buyer : config.api_prod.buyer); -export const commonUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.common : config.api_prod.common); -export const managerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.manager : config.api_prod.manager); -export const sellerUrl = (process.env.NODE_ENV === 'development' ? config.api_dev.seller : config.api_prod.seller); +import axios from "axios"; +import https from "https"; +import { Message, Spin, Modal } from "view-design"; +import Storage from "./storage"; +import config from "@/config"; +import router from "../router/index.js"; +import store from "../vuex/store"; +import { handleRefreshToken } from "@/api/index"; +const qs = require("qs"); +export const buyerUrl = + process.env.NODE_ENV === "development" + ? config.api_dev.buyer + : config.api_prod.buyer; +export const commonUrl = + process.env.NODE_ENV === "development" + ? config.api_dev.common + : config.api_prod.common; +export const managerUrl = + process.env.NODE_ENV === "development" + ? config.api_dev.manager + : config.api_prod.manager; +export const sellerUrl = + process.env.NODE_ENV === "development" + ? config.api_dev.seller + : config.api_prod.seller; // 创建axios实例 var isRefreshToken = 0; -const refreshToken = getTokenDebounce() +const refreshToken = getTokenDebounce(); const service = axios.create({ timeout: 10000, // 请求超时时间 baseURL: buyerUrl, // API httpsAgent: new https.Agent({ rejectUnauthorized: false }), - paramsSerializer: params => qs.stringify(params, { - arrayFormat: 'repeat' - }) + paramsSerializer: params => + qs.stringify(params, { + arrayFormat: "repeat" + }) }); // request拦截器 -service.interceptors.request.use(config => { - const { - loading - } = config; - // 如果是put/post请求，用qs.stringify序列化参数 - const isPutPost = config.method === 'put' || config.method === 'post'; - const isJson = config.headers['Content-Type'] === 'application/json'; - const isFile = config.headers['Content-Type'] === 'multipart/form-data'; - if (isPutPost && isJson) { - config.data = JSON.stringify(config.data); +service.interceptors.request.use( + config => { + const { loading } = config; + // 如果是put/post请求，用qs.stringify序列化参数 + const isPutPost = config.method === "put" || config.method === "post"; + const isJson = config.headers["Content-Type"] === "application/json"; + const isFile = config.headers["Content-Type"] === "multipart/form-data"; + if (isPutPost && isJson) { + config.data = JSON.stringify(config.data); + } + if (isPutPost && !isFile && !isJson) { + config.data = qs.stringify(config.data, { + arrayFormat: "repeat" + }); + } + /** 配置全屏加载 */ + if (process.client && loading !== false) { + config.loading = Spin.show(); + } + + const uuid = Storage.getItem("uuid"); + config.headers["uuid"] = uuid; + + // 获取访问Token + let accessToken = Storage.getItem("accessToken"); + if (accessToken && config.needToken) { + config.headers["accessToken"] = accessToken; + // 解析当前token时间 + let jwtData = JSON.parse( + decodeURIComponent(escape(window.atob(accessToken.split(".")[1]))) + ); + if (jwtData.exp < Math.round(new Date() / 1000)) { + refresh() + } + } + + return config; + }, + error => { + Promise.reject(error); } - if (isPutPost && !isFile && !isJson) { - config.data = qs.stringify(config.data, { - arrayFormat: 'repeat' +); + +async function refresh() { + const getTokenRes = await refreshToken(); + if (getTokenRes === "success") { + // 刷新token + if (isRefreshToken === 1) { + error.response.config.headers.accessToken = Storage.getItem( + "accessToken" + ); + return service(error.response.config); + } else { + router.go(0); + } + } else { + Storage.removeItem("accessToken"); + Storage.removeItem("refreshToken"); + Storage.removeItem("userInfo"); + Storage.setItem("cartNum", 0); + store.commit("SET_CARTNUM", 0); + console.log("1111"); + Modal.confirm({ + title: "请登录", + content: "请登录后执行此操作
", + okText: "立即登录", + cancelText: "继续浏览", + onOk: () => { + router.push({ + path: "/login", + query: { + rePath: router.history.current.path, + query: JSON.stringify(router.history.current.query) + } + }); + }, + onCancel: () => { + Modal.remove(); + } }); } - /** 配置全屏加载 */ - if (process.client && loading !== false) { - config.loading = Spin.show(); - } - - const uuid = Storage.getItem('uuid'); - config.headers['uuid'] = uuid; - - // 获取访问Token - let accessToken = Storage.getItem('accessToken'); - if (accessToken && config.needToken) { - config.headers['accessToken'] = accessToken; - } - return config; -}, error => { - Promise.reject(error); -}); +} // respone拦截器 service.interceptors.response.use( async response => { await closeLoading(response); + return response.data; }, async error => { @@ -84,45 +140,15 @@ service.interceptors.response.use( isRefreshToken++; if (isRefreshToken === 1) { - const getTokenRes = await refreshToken(); - if (getTokenRes === 'success') { // 刷新token - if (isRefreshToken === 1) { - error.response.config.headers.accessToken = Storage.getItem('accessToken') - return service(error.response.config) - } else { - router.go(0) - } - } else { - Storage.removeItem('accessToken'); - Storage.removeItem('refreshToken'); - Storage.removeItem('userInfo'); - Storage.setItem('cartNum', 0) - store.commit('SET_CARTNUM', 0) - console.log('1111'); - Modal.confirm({ - title: '请登录', - content: '请登录后执行此操作
', - okText: '立即登录', - cancelText: '继续浏览', - onOk: () => { - router.push({ - path: '/login', - query: { - rePath: router.history.current.path, - query: JSON.stringify(router.history.current.query) - } - }); - }, - onCancel: () => { - Modal.remove(); - } - }); - } - isRefreshToken = 0 + refresh() + isRefreshToken = 0; } } else { if (error.message) { - let _message = error.code === 'ECONNABORTED' ? '连接超时，请稍候再试！' : '网络错误，请稍后再试！'; + let _message = + error.code === "ECONNABORTED" + ? "连接超时，请稍候再试！" + : "网络错误，请稍后再试！"; Message.error(errorData.message || _message); } } @@ -134,7 +160,7 @@ service.interceptors.response.use( * 关闭全局加载 * @param target */ -const closeLoading = (target) => { +const closeLoading = target => { if (!target.config || !target.config.loading) return true; return new Promise((resolve, reject) => { setTimeout(() => { @@ -145,13 +171,13 @@ const closeLoading = (target) => { }; export const Method = { - GET: 'get', - POST: 'post', - PUT: 'put', - DELETE: 'delete' + GET: "get", + POST: "post", + PUT: "put", + DELETE: "delete" }; -export default function request (options) { +export default function request(options) { // 如果是服务端或者是请求的刷新token，不需要检查token直接请求。 // if (process.server || options.url.indexOf('passport/token') !== -1) { return service(options); @@ -160,47 +186,46 @@ export default function request (options) { } // 防抖闭包来一波 -function getTokenDebounce () { - let lock = false - let success = false - return function () { +function getTokenDebounce() { + let lock = false; + let success = false; + return function() { if (!lock) { - lock = true - let oldRefreshToken = Storage.getItem('refreshToken'); - handleRefreshToken(oldRefreshToken).then(res => { - if (res.success) { - let { - accessToken, - refreshToken - } = res.result; - Storage.setItem('accessToken', accessToken); - Storage.setItem('refreshToken', refreshToken); + lock = true; + let oldRefreshToken = Storage.getItem("refreshToken"); + handleRefreshToken(oldRefreshToken) + .then(res => { + if (res.success) { + let { accessToken, refreshToken } = res.result; + Storage.setItem("accessToken", accessToken); + Storage.setItem("refreshToken", refreshToken); - success = true - lock = false - } else { - success = false - lock = false - // router.push('/login') - } - }).catch((err) => { - console.log(err); - success = false - lock = false - }) + success = true; + lock = false; + } else { + success = false; + lock = false; + // router.push('/login') + } + }) + .catch(err => { + console.log(err); + success = false; + lock = false; + }); } return new Promise(resolve => { // 一直看lock,直到请求失败或者成功 const timer = setInterval(() => { if (!lock) { - clearInterval(timer) + clearInterval(timer); if (success) { - resolve('success') + resolve("success"); } else { - resolve('fail') + resolve("fail"); } } - }, 500) // 轮询时间间隔 - }) - } + }, 500); // 轮询时间间隔 + }); + }; } diff --git a/buyer/src/router/index.js b/buyer/src/router/index.js index 5eb51b0d..e8272c84 100644 --- a/buyer/src/router/index.js +++ b/buyer/src/router/index.js @@ -47,6 +47,8 @@ const ComplainList = resolve => require(['@/pages/home/memberCenter/ComplainList const ComplainDetail = resolve => require(['@/pages/home/memberCenter/ComplainDetail'], resolve); const Invoice = resolve => require(['@/pages/home/memberCenter/Invoice'], resolve); const Point = resolve => require(['@/pages/home/memberCenter/Point'], resolve); +const MsgList = resolve => require(['@/pages/home/memberCenter/memberMsg/MsgList'], resolve); +const MsgDetail = resolve => require(['@/pages/home/memberCenter/memberMsg/MsgDetail'], resolve); /* * 会员中心 @@ -316,6 +318,18 @@ export default new Router({ name: 'AddAddress', component: AddAddress }, + { + path: 'MsgList', + name: 'MsgList', + component: MsgList, + meta: {title: '我的消息'} + }, + { + path: 'MsgDetail', + name: 'MsgDetail', + component: MsgDetail, + meta: {title: '我的消息'} + }, { path: 'MyOrder', name: 'MyOrder', diff --git a/manager/package.json b/manager/package.json index feb7da85..112223b4 100644 --- a/manager/package.json +++ b/manager/package.json @@ -27,7 +27,6 @@ "print-js": "^1.0.63", "qrcodejs2": "0.0.2", "quill": "^1.3.7", - "vue-qr": "^2.3.0", "sass-loader": "^8.0.2", "sockjs-client": "^1.4.0", "stompjs": "^2.3.3", @@ -40,14 +39,17 @@ "vue-clipboard2": "^0.3.0", "vue-cropper": "^0.4.9", "vue-i18n": "^8.15.1", + "vue-json-excel": "^0.3.0", "vue-json-pretty": "^1.4.1", "vue-lazyload": "^1.3.3", + "vue-qr": "^2.3.0", "vue-router": "^3.1.3", "vuedraggable": "^2.23.2", "vuex": "^3.4.0", "wangeditor": "^4.5.3", "xlsx": "^0.16.2", - "xss": "^1.0.7" + "xss": "^1.0.7", + "uuid": "^8.3.2" }, "devDependencies": { "@vue/cli-plugin-babel": "^4.4.4", diff --git a/manager/src/App.vue b/manager/src/App.vue index e75223ee..1f8e3787 100644 --- a/manager/src/App.vue +++ b/manager/src/App.vue @@ -5,6 +5,7 @@ diff --git a/manager/src/api/common.js b/manager/src/api/common.js index aea5012d..d0690dda 100644 --- a/manager/src/api/common.js +++ b/manager/src/api/common.js @@ -1,4 +1,4 @@ -import {commonUrl, getRequest} from '@/libs/axios'; +import {commonUrl, getRequest, getRequestWithNoToken, postRequestWithNoToken} from '@/libs/axios'; // 通过id获取子地区 export const getChildRegion = (id) => { @@ -6,6 +6,16 @@ export const getChildRegion = (id) => { }; // 点地图获取地址信息 -export const getRegion = (parpams) => { - return getRequest(`${commonUrl}/common/region/region`, parpams); +export const getRegion = (params) => { + return getRequest(`${commonUrl}/common/region/region`, params); +}; + +// 获取拼图验证 +export const getVerifyImg = (verificationEnums) => { + return getRequestWithNoToken(`${commonUrl}/common/slider/${verificationEnums}`); +}; + +// 拼图验证 +export const postVerifyImg = (params) => { + return postRequestWithNoToken(`${commonUrl}/common/slider/${params.verificationEnums}`, params); }; diff --git a/manager/src/api/promotion.js b/manager/src/api/promotion.js index 4fd81dfd..42173562 100644 --- a/manager/src/api/promotion.js +++ b/manager/src/api/promotion.js @@ -1,174 +1,231 @@ // 统一请求路径前缀在libs/axios.js中修改 -import { getRequest, postRequest, putRequest, deleteRequest } from '@/libs/axios'; - - +import { + getRequest, + postRequest, + putRequest, + deleteRequest +} from "@/libs/axios"; // 获取限时抢购申请列表 -export const getPromotionSeckill = (params) => { +export const getPromotionSeckill = params => { + return getRequest(`/promotion/seckill/apply`, params); +}; - return getRequest(`/promotion/seckill/apply`, params) -} +// 是否推荐直播间 +export const whetherStar = params => { + return putRequest(`/broadcast/studio/recommend/${params.id}`,params); +}; + +// 添加优惠券活动 +export const addCouponActivity = params => { + return postRequest(`/promotion/couponActivity/addCouponActivity`, params); +}; + + +// 获取店铺直播间列表 +export const getLiveList = params => { + return getRequest("/broadcast/studio", params); +}; + +// 获取直播间详情 +export const getLiveInfo = studioId => { + return getRequest(`/broadcast/studio/studioInfo/${studioId}`); +}; // 获取当前进行中的促销活动商品 -export const getPromotionGoods = (promotionId,params) => { - return getRequest(`/promotion/${promotionId}/goods`, params) -} +export const getPromotionGoods = (promotionId, params) => { + return getRequest(`/promotion/${promotionId}/goods`, params); +}; // 获取当前进行中的促销活动 -export const getAllPromotion = (params) => { - return getRequest('/promotion/current', params) -} +export const getAllPromotion = params => { + return getRequest("/promotion/current", params); +}; // 获取拼团数据 -export const getPintuanList = (params) => { - return getRequest('/promotion/pintuan', params) -} +export const getPintuanList = params => { + return getRequest("/promotion/pintuan", params); +}; // 获取拼团详情 -export const getPintuanDetail = (id) => { - return getRequest(`/promotion/pintuan/${id}`) -} +export const getPintuanDetail = id => { + return getRequest(`/promotion/pintuan/${id}`); +}; // 获取拼团商品数据 -export const getPintuanGoodsList = (params) => { - return getRequest(`/promotion/pintuan/goods/${params.pintuanId}`,params) -} +export const getPintuanGoodsList = params => { + return getRequest(`/promotion/pintuan/goods/${params.pintuanId}`, params); +}; // 关闭拼团活动 -export const closePintuan = (pintuanId) => { - return putRequest(`/promotion/pintuan/close/${pintuanId}`) -} +export const closePintuan = pintuanId => { + return putRequest(`/promotion/pintuan/close/${pintuanId}`); +}; // 保存平台优惠券 -export const savePlatformCoupon = (params) => { - return postRequest('/promotion/coupon', params,{'Content-type': 'application/json'}) -} +export const savePlatformCoupon = params => { + return postRequest("/promotion/coupon", params, { + "Content-type": "application/json" + }); +}; // 修改平台优惠券 -export const editPlatformCoupon = (params) => { - return putRequest('/promotion/coupon', params,{'Content-type': 'application/json'}) -} +export const editPlatformCoupon = params => { + return putRequest("/promotion/coupon", params, { + "Content-type": "application/json" + }); +}; // 获取平台优惠券 -export const getPlatformCouponList = (params) => { - return getRequest('/promotion/coupon', params) -} +export const getPlatformCouponList = params => { + return getRequest("/promotion/coupon", params); +}; // 作废优惠券 -export const deletePlatformCoupon = (ids) => { - return deleteRequest(`/promotion/coupon/${ids}`) -} +export const deletePlatformCoupon = ids => { + return deleteRequest(`/promotion/coupon/${ids}`); +}; // 更新优惠券状态 -export const updatePlatformCouponStatus = ( params) => { - return putRequest(`/promotion/coupon/status`, params) -} +export const updatePlatformCouponStatus = params => { + return putRequest(`/promotion/coupon/status`, params); +}; // 获取单个优惠券 -export const getPlatformCoupon = (id) => { - return getRequest(`/promotion/coupon/${id}`) -} - +export const getPlatformCoupon = id => { + return getRequest(`/promotion/coupon/${id}`); +}; // 获取优惠券领取详情 -export const getMemberReceiveCouponList = (id) => { - return getRequest(`/promotion/coupon/member/${id}`) -} +export const getMemberReceiveCouponList = id => { + return getRequest(`/promotion/coupon/member/${id}`); +}; // 作废会员优惠券 -export const deleteMemberReceiveCoupon = (id) => { - return putRequest(`/promotion/coupon/member/cancellation/${id}`) -} +export const deleteMemberReceiveCoupon = id => { + return putRequest(`/promotion/coupon/member/cancellation/${id}`); +}; + + +// 保存平台优惠券 +export const saveActivityCoupon = params => { + return postRequest("/promotion/couponActivity", params, { + "Content-type": "application/json" + }); +}; +// 获取活动优惠券列表 +export const getActivityCouponList = params => { + return getRequest("/promotion/couponActivity/activityCoupons", params); +}; +// 获取平台优惠券活动 +export const getCouponActivityList = params => { + return getRequest("/promotion/couponActivity", params); +}; +// 作废优惠券 +export const closeActivity = id => { + return deleteRequest(`/promotion/couponActivity/${id}`); +}; +// 更新优惠券活动 +export const updateCouponActivity = params => { + return putRequest(`/promotion/couponActivity/status`, params); +}; +// 获取单个优惠券活动 +export const getCouponActivity = id => { + return getRequest(`/promotion/couponActivity/${id}`); +}; // 获取限时抢购数据 -export const getSeckillList = (params) => { - return getRequest('/promotion/seckill', params) -} +export const getSeckillList = params => { + return getRequest("/promotion/seckill", params); +}; // 获取限时抢购审核列表 -export const seckillGoodsList = (params) => { - return getRequest('/promotion/seckill/apply', params) -} +export const seckillGoodsList = params => { + return getRequest("/promotion/seckill/apply", params); +}; // 获取限时抢购详情数据 export const seckillDetail = (id, params) => { - return getRequest(`/promotion/seckill/${id}`, params) -} + return getRequest(`/promotion/seckill/${id}`, params); +}; // 删除限时抢购 -export const delSeckill = (id) => { - return deleteRequest(`/promotion/seckill/${id}`) -} +export const delSeckill = id => { + return deleteRequest(`/promotion/seckill/${id}`); +}; // 保存限时抢购 -export const saveSeckill = (params) => { - return postRequest('/promotion/seckill', params) -} +export const saveSeckill = params => { + return postRequest("/promotion/seckill", params); +}; // 修改限时抢购 -export const updateSeckill = (params) => { - return putRequest('/promotion/seckill', params) -} +export const updateSeckill = params => { + return putRequest("/promotion/seckill", params); +}; // 关闭限时抢购 -export const closeSeckill = (id) => { - return putRequest(`/promotion/seckill/close/${id}`) -} +export const closeSeckill = id => { + return putRequest(`/promotion/seckill/close/${id}`); +}; // 审核限时抢购 -export const auditApplySeckill = (params) => { - return putRequest(`/promotion/seckill/apply/audit/${params.ids}`, params) -} +export const auditApplySeckill = params => { + return putRequest(`/promotion/seckill/apply/audit/${params.ids}`, params); +}; // 满优惠列表 -export const getFullDiscountList = (params) => { - return getRequest(`/promotion/fullDiscount`,params) -} +export const getFullDiscountList = params => { + return getRequest(`/promotion/fullDiscount`, params); +}; // 满优惠列表 -export const getFullDiscountById = (id) => { - return getRequest(`/promotion/fullDiscount/${id}`) -} +export const getFullDiscountById = id => { + return getRequest(`/promotion/fullDiscount/${id}`); +}; // 积分商品列表 -export const getPointsGoodsList = (params) => { - return getRequest(`/promotion/pointsGoods`,params) -} +export const getPointsGoodsList = params => { + return getRequest(`/promotion/pointsGoods`, params); +}; // 积分商品详情 -export const getPointsGoodsById = (id) => { - return getRequest(`/promotion/pointsGoods/${id}`) -} +export const getPointsGoodsById = id => { + return getRequest(`/promotion/pointsGoods/${id}`); +}; // 添加积分商品 -export const addPointsGoods = (params) => { - return postRequest(`/promotion/pointsGoods`,params, {'Content-type': 'application/json'}) -} +export const addPointsGoods = params => { + return postRequest(`/promotion/pointsGoods`, params, { + "Content-type": "application/json" + }); +}; // 修改积分商品 -export const updatePointsGoods = (params) => { - return putRequest(`/promotion/pointsGoods`,params, {'Content-type': 'application/json'}) -} +export const updatePointsGoods = params => { + return putRequest(`/promotion/pointsGoods`, params, { + "Content-type": "application/json" + }); +}; // 修改积分商品状态 export const editPointsGoodsStatus = (id, params) => { - return putRequest(`/promotion/pointsGoods/${id}`,params) -} + return putRequest(`/promotion/pointsGoods/${id}`, params); +}; // 删除积分商品 -export const deletePointsGoodsStatus = (id) => { - return deleteRequest(`/promotion/pointsGoods/${id}`) -} - +export const deletePointsGoodsStatus = id => { + return deleteRequest(`/promotion/pointsGoods/${id}`); +}; // 积分商品分类列表 -export const getPointsGoodsCategoryList = (params) => { - return getRequest(`/promotion/pointsGoodsCategory`,params) -} +export const getPointsGoodsCategoryList = params => { + return getRequest(`/promotion/pointsGoodsCategory`, params); +}; // 积分商品分类详情 -export const getPointsGoodsCategoryById = (id) => { - return getRequest(`/promotion/pointsGoodsCategory/${id}`) -} +export const getPointsGoodsCategoryById = id => { + return getRequest(`/promotion/pointsGoodsCategory/${id}`); +}; // 添加积分商品分类 -export const addPointsGoodsCategory = (params) => { - return postRequest(`/promotion/pointsGoodsCategory`, params) -} +export const addPointsGoodsCategory = params => { + return postRequest(`/promotion/pointsGoodsCategory`, params); +}; // 更新积分商品分类 -export const updatePointsGoodsCategory = (params) => { - return putRequest(`/promotion/pointsGoodsCategory`, params) -} +export const updatePointsGoodsCategory = params => { + return putRequest(`/promotion/pointsGoodsCategory`, params); +}; // 删除积分商品分类 -export const deletePointsGoodsCategoryById = (id) => { - return deleteRequest(`/promotion/pointsGoodsCategory/${id}`) -} +export const deletePointsGoodsCategoryById = id => { + return deleteRequest(`/promotion/pointsGoodsCategory/${id}`); +}; diff --git a/manager/src/config/index.js b/manager/src/config/index.js index e8363c9d..8b6b162f 100644 --- a/manager/src/config/index.js +++ b/manager/src/config/index.js @@ -21,11 +21,10 @@ export default { // buyer: "https://buyer-api.pickmall.cn", // seller: "https://store-api.pickmall.cn", // manager: "https://admin-api.pickmall.cn" - common: "http://192.168.0.109:8890", - buyer: "http://192.168.0.109:8888", - seller: "http://192.168.0.109:8889", - manager: "http://192.168.0.109:8887" - + common: 'http://192.168.0.109:8890', + buyer: 'http://192.168.0.109:8888', + seller: 'http://192.168.0.109:8889', + manager: 'http://192.168.0.109:8887' }, api_prod: { common: "https://common-api.pickmall.cn", diff --git a/manager/src/libs/axios.js b/manager/src/libs/axios.js index 3e91766a..6bd6d6c1 100644 --- a/manager/src/libs/axios.js +++ b/manager/src/libs/axios.js @@ -24,6 +24,8 @@ service.interceptors.request.use( ...config.params } } + const uuid = getStore('uuid'); + config.headers['uuid'] = uuid; return config; }, err => { diff --git a/manager/src/router/router.js b/manager/src/router/router.js index 5e3497f7..d60e240f 100644 --- a/manager/src/router/router.js +++ b/manager/src/router/router.js @@ -5,7 +5,7 @@ export const loginRouter = { path: "/login", name: "login", meta: { - title: "登录 - lili " + title: "登录 - lili运营后台" }, component: () => import("@/views/login.vue") }; @@ -243,6 +243,43 @@ export const otherRouter = { name: "platform-coupon-info", component: () => import("@/views/promotion/coupon/couponInfo.vue") }, + { + path: "coupon-activity/add", + title: "添加优惠券活动", + name: "add-coupon-activity", + component: () => import("@/views/promotion/couponActivity/couponPublish.vue") + }, + { + path: "coupon-activity/edit", + title: "编辑平台优惠券活动", + name: "edit-coupon-activity", + component: () => import("@/views/promotion/couponActivity/couponPublish.vue") + }, + { + path: "promotion/coupon-activity-info", + title: "券活动详情", + name: "coupon-activity-info", + component: () => import("@/views/promotion/couponActivity/couponInfo.vue") + }, + { + path: "promotion/member-receive-coupon", + title: "领取详情", + name: "member-coupon-activity", + component: () => + import("@/views/promotion/coupon/memberReceiveCoupon.vue") + }, + { + path: "promotion/platform-coupon-info", + title: "详情", + name: "platform-coupon-activity", + component: () => import("@/views/promotion/coupon/couponInfo.vue") + }, + { + path: "promotion/add-coupon-specify", + title: "精准发劵", + name: "add-coupon-specify", + component: () => import("@/views/promotion/coupon/couponSpecify.vue") + }, { path: "promotion/manager-pintuan", title: "平台拼团", @@ -296,6 +333,12 @@ export const otherRouter = { title: "短信签名", name: "add-sms-sign", component: () => import("@/views/sys/message/smsSign.vue") + }, + { + path: "liveDetail", + title: "查看直播", + name: "liveDetail", + component: () => import("@/views/promotion/live/liveDetail.vue") } ] }; diff --git a/manager/src/utils/filters.js b/manager/src/utils/filters.js index d581cc7d..71c092db 100644 --- a/manager/src/utils/filters.js +++ b/manager/src/utils/filters.js @@ -18,6 +18,72 @@ export function unitPrice(val, unit, location) { + +let timer, flag; +/** + * 节流原理：在一定时间内，只能触发一次 + * + * @param {Function} func 要执行的回调函数 + * @param {Number} wait 延时的时间 + * @param {Boolean} immediate 是否立即执行 + * @return null + */ + export function throttle(func, wait = 500, immediate = true) { + if (immediate) { + if (!flag) { + flag = true; + // 如果是立即执行，则在wait毫秒内开始时执行 + typeof func === 'function' && func(); + timer = setTimeout(() => { + flag = false; + }, wait); + } + } else { + if (!flag) { + flag = true + // 如果是非立即执行，则在wait毫秒内的结束处执行 + timer = setTimeout(() => { + flag = false + typeof func === 'function' && func(); + }, wait); + } + + } +}; + + + + + +let timeout = null; + +/** + * 防抖原理：一定时间内，只有最后一次操作，再过wait毫秒后才执行函数 + * + * @param {Function} func 要执行的回调函数 + * @param {Number} wait 延时的时间 + * @param {Boolean} immediate 是否立即执行 + * @return null + */ + export function debounce(func, wait = 500, immediate = false) { + // 清除定时器 + if (timeout !== null) clearTimeout(timeout); + // 立即执行，此类情况一般用不到 + if (immediate) { + var callNow = !timeout; + timeout = setTimeout(function() { + timeout = null; + }, wait); + if (callNow) typeof func === 'function' && func(); + } else { + // 设置定时器，当最后一次操作后，timeout不会再被清除，所以在延时wait毫秒后执行func回调方法 + timeout = setTimeout(function() { + typeof func === 'function' && func(); + }, wait); + } +} + + /** * 货币格式化 * @param price @@ -172,4 +238,4 @@ export function formatLinkType (item) { break; } return url; -} \ No newline at end of file +} diff --git a/manager/src/views/distribution/distributionSetting.vue b/manager/src/views/distribution/distributionSetting.vue index 096c33ac..8a6e48cb 100644 --- a/manager/src/views/distribution/distributionSetting.vue +++ b/manager/src/views/distribution/distributionSetting.vue @@ -10,67 +10,77 @@ 关闭 +
+
+
+
+
diff --git a/manager/src/views/lili-dialog/index.vue b/manager/src/views/lili-dialog/index.vue
index 49b3b1c1..bc5a47d8 100644
--- a/manager/src/views/lili-dialog/index.vue
+++ b/manager/src/views/lili-dialog/index.vue
@@ -1,7 +1,7 @@
+
+
+
+
+
+ 搜索范围
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+ {{ item.goodsName }}
+ {{ item.goodsUnit }}
+
+
+ ￥{{ item.price | unitPrice }}
+ 暂无商品信息
+
-
-
-
-
-
-
-
-
-
- {{ item.name }}
- {{
- item.pageShow == "OPEN" ? "已发布" : "未发布"
- }}
-
-
-
-
-
-
-
-
-
-
-
-
- 新建模板
- 全屏广告
-
+
-
\ No newline at end of file
diff --git a/manager/src/views/lili-floor-renovation/wap/index.js b/manager/src/views/lili-floor-renovation/wap/index.js
index c7aa1a99..37aa9768 100644
--- a/manager/src/views/lili-floor-renovation/wap/index.js
+++ b/manager/src/views/lili-floor-renovation/wap/index.js
@@ -1,5 +1,5 @@
import index from './index.vue' //首页
-import btn from './btn.vue' //按钮
+
import advertising from './advertising.vue' //全屏活动
import alertAdvertising from './alertAdvertising.vue' //弹窗活动
@@ -7,7 +7,7 @@ import alertAdvertising from './alertAdvertising.vue' //弹窗活动
const templates = {
index,
- btn,
+
advertising,
alertAdvertising
}
diff --git a/manager/src/views/lili-floor-renovation/wap/navbar.vue b/manager/src/views/lili-floor-renovation/wap/navbar.vue
index a777e892..d439741a 100644
--- a/manager/src/views/lili-floor-renovation/wap/navbar.vue
+++ b/manager/src/views/lili-floor-renovation/wap/navbar.vue
@@ -3,35 +3,22 @@
-
@@ -15,13 +14,13 @@ export default {
diff --git a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
index 68738da7..aabb380e 100644
--- a/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
+++ b/manager/src/views/main-components/shrinkable-menu/shrinkable-menu.vue
@@ -55,6 +55,7 @@ export default {
},
methods: {
changeMenu(name) { //二级路由点击
+ console.log(name)
this.$router.push({
name: name
});
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 73d13435..fdffb632 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -21,11 +21,11 @@
-
-
+
+
-
@@ -137,12 +137,14 @@ export default {
loading: true, // 表单加载状态
addFlag: false, // modal显隐控制
updateRegion: false, // 地区
- addMemberForm: { // 添加用户表单
+ addMemberForm: {
+ // 添加用户表单
mobile: "",
username: "",
password: "",
},
- searchForm: { // 请求参数
+ searchForm: {
+ // 请求参数
pageNumber: 1,
pageSize: 10,
order: "desc",
@@ -152,7 +154,8 @@ export default {
},
picModelFlag: false, // 选择图片
formValidate: {}, // 表单数据
- addRule: { // 验证规则
+ addRule: {
+ // 验证规则
mobile: [
{ required: true, message: "请输入手机号码" },
{
@@ -229,6 +232,7 @@ export default {
{
props: {
size: "small",
+ type: params.row.___selected ? "primary" : "",
},
style: {
marginRight: "5px",
@@ -236,11 +240,11 @@ export default {
},
on: {
click: () => {
- this.callback(params.row);
+ this.callback(params.row, params.index);
},
},
},
- "选择"
+ params.row.___selected ? "已选择" : "选择"
),
h(
@@ -251,7 +255,8 @@ export default {
size: "small",
},
style: {
- marginRight: "5px", display: this.selectedMember ? "none" : "block",
+ marginRight: "5px",
+ display: this.selectedMember ? "none" : "block",
},
on: {
click: () => {
@@ -270,7 +275,8 @@ export default {
ghost: true,
},
style: {
- marginRight: "5px", display: this.selectedMember ? "none" : "block",
+ marginRight: "5px",
+ display: this.selectedMember ? "none" : "block",
},
on: {
click: () => {
@@ -306,18 +312,75 @@ export default {
],
data: [], // 表单数据
total: 0, // 表单数据总数
+ selectMember: [], //保存选中的用户
};
},
+ props: {
+ // 是否为选中模式
+ selectedMember: {
+ type: Boolean,
+ default: false,
+ },
+ // 已选择用户数据
+ selectedList: {
+ type: null,
+ default: "",
+ },
+ },
+ watch: {
+ selectedList: {
+ handler(val) {
+ this.$set(this, "selectMember", JSON.parse(JSON.stringify(val)));
+ this.init(this.data);
+ // 将父级数据与当前组件数据进行匹配
+
+ },
+ deep: true,
+ immediate: true,
+ },
+ },
methods: {
// 回调给父级
- callback(val) {
+ callback(val, index) {
+ this.$set(val, "___selected", !val.___selected);
+ console.log(val.___selected);
+ let findUser = this.selectMember.find((item) => {
+ return item.id == val.id;
+ });
+ // 如果没有则添加
+ if (!findUser) {
+ this.selectMember.push(val);
+ } else {
+ // 有重复数据就删除
+ this.selectMember.map((item, index) => {
+ if (item.id == findUser.id) {
+ this.selectMember.splice(index, 1);
+ }
+ });
+ }
+
this.$emit("callback", val);
},
- init() {
- this.getData();
+ // 初始化信息
+ init(data) {
+ data.forEach((item) => {
+ if (this.selectMember.length != 0) {
+ this.selectMember.forEach((member) => {
+ if (member.id == item.id) {
+ this.$set(item, "___selected", true);
+ }
+ });
+ } else {
+ this.$set(item, "___selected", false);
+ }
+ });
+ this.data = data;
},
changePage(v) {
this.searchForm.pageNumber = v;
+ // 此处如果是父子级传值的时候需要做一下处理
+ //selectedMember
+
this.getData();
},
changePageSize(v) {
@@ -373,12 +436,13 @@ export default {
}
});
},
+
//查询会员列表
getData() {
API_Member.getMemberListData(this.searchForm).then((res) => {
if (res.result.records) {
this.loading = false;
- this.data = res.result.records;
+ this.init(res.result.records);
this.total = res.result.total;
}
});
@@ -467,7 +531,7 @@ export default {
},
},
mounted() {
- this.init();
+ this.getData();
},
};
@@ -476,7 +540,7 @@ export default {
/deep/ .ivu-table-wrapper {
width: 100%;
}
-/deep/ .ivu-card{
+/deep/ .ivu-card {
width: 100%;
}
.face {
diff --git a/manager/src/views/my-components/lili/coupon-choose.vue b/manager/src/views/my-components/lili/coupon-choose.vue
new file mode 100644
index 00000000..2f84c134
--- /dev/null
+++ b/manager/src/views/my-components/lili/coupon-choose.vue
@@ -0,0 +1,346 @@
+
+
- 店铺装修
-
-
+
+
+
-
+
@@ -21,18 +21,22 @@ export default {
props: ["res"],
mounted() {
console.log(this.res);
- }
+ },
};
\ No newline at end of file
+.view-height-75 {
+ .image-mode {
+ height: 75px;
+ }
+}
+
diff --git a/manager/src/views/login.vue b/manager/src/views/login.vue
index e5c43a0d..f428e847 100644
--- a/manager/src/views/login.vue
+++ b/manager/src/views/login.vue
@@ -22,6 +22,8 @@
+
+
模板名称
@@ -61,17 +48,14 @@ export default {
progress: true, // 展示进度
num: 20, // 提交进度
saveDialog: false, // 加载状态
- way: [ // 装修tab栏切换
+ way: [
+ // 装修tab栏切换
{
title: "首页",
name: "index",
selected: true,
},
- {
- title: "悬浮按钮",
- name: "btn",
- selected: false,
- },
+
{
title: "全屏广告",
name: "advertising",
@@ -84,7 +68,8 @@ export default {
},
],
qrcode: "", // 二维码
- submitWay: { // 表单信息
+ submitWay: {
+ // 表单信息
pageShow: this.$route.query.type || false,
name: this.$route.query.name || "模板名称",
pageClientType: "H5",
@@ -128,11 +113,13 @@ export default {
// 更新
update() {
- this.progress = false;
+ this.progress = false;
API_Other.updateHome(this.$route.query.id, {
pageData: JSON.stringify(this.$store.state.styleStore),
name: this.submitWay.name,
pageShow: this.submitWay.pageShow,
+ pageType: "INDEX",
+ pageClientType: "H5",
})
.then((res) => {
this.num = 50;
@@ -175,7 +162,7 @@ export default {
this.goback();
}, 1000);
} else {
- this.progress = true;
+ this.progress = true;
this.saveDialog = false;
this.$Message.error("保存失败，请稍后重试");
}
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl.scss b/manager/src/views/lili-floor-renovation/wap/template/tpl.scss
index b8e63cf7..638dd1cc 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl.scss
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl.scss
@@ -1,6 +1,6 @@
.image-mode {
- max-width: 100%;
- height: auto;
+ width: 100%;
+ height: 100%;
display: block;
padding: 1px;
}
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
index 8abfba18..7b405c4a 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_five.vue
@@ -1,11 +1,11 @@
- ![]()
- ![]()
- ![]()
- ![]()
- ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
+ ![]()
@@ -13,21 +13,18 @@
export default {
title: "五列单行图片模块",
props: ["res"],
- mounted() {
- console.log(this.res);
- }
};
\ No newline at end of file
+
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
index 4ef37368..a3ac9350 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_four.vue
@@ -12,21 +12,22 @@
export default {
title: "四列单行图片模块",
props: ["res"],
- mounted() {
- console.log(this.res);
- }
+
};
\ No newline at end of file
+
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
index 262313ce..e0916e1b 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_flex_three.vue
@@ -11,14 +11,12 @@
export default {
title: "三列单行图片模块",
props: ["res"],
- mounted() {
- console.log(this.res);
- }
};
\ No newline at end of file
+
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
index 378b07a3..fcf0936f 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_one_right_two.vue
@@ -20,7 +20,7 @@ export default {
title: "左一右二",
props: ["res"],
mounted() {
- console.log(this.res);
+
}
};
@@ -34,4 +34,4 @@ export default {
background-size: cover;
}
-
\ No newline at end of file
+
diff --git a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
index 884c01a3..e77470cf 100644
--- a/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
+++ b/manager/src/views/lili-floor-renovation/wap/template/tpl_left_two_right_one.vue
@@ -10,7 +10,7 @@
- ![]()
+ ![]()
-
+
+ 清空已选
+
+
+ 已选择
+ {{ selectObj.length }} 件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/manager/src/views/my-components/lili/editor.vue b/manager/src/views/my-components/lili/editor.vue
index bc7811a2..697bc9ed 100644
--- a/manager/src/views/my-components/lili/editor.vue
+++ b/manager/src/views/my-components/lili/editor.vue
@@ -15,20 +15,8 @@
+
@@ -56,21 +44,21 @@ export default {
props: {
id: {
type: String,
- default: "editor"
+ default: "editor",
},
value: String,
base64: {
type: Boolean,
- default: false
+ default: false,
},
showExpand: {
type: Boolean,
- default: true
+ default: true,
},
openXss: {
type: Boolean,
- default: false
- }
+ default: false,
+ },
},
data() {
return {
@@ -79,16 +67,17 @@ export default {
dataEdit: "", // 编辑数据
showHTMLModal: false, // 显示html
full: false, // html全屏开关
- fullscreenModal: false // 显示全屏预览
+ fullscreenModal: false, // 显示全屏预览
};
},
methods: {
+
initEditor() {
let that = this;
// 详见wangeditor3官网文档 https://www.kancloud.cn/wangfupeng/wangeditor3/332599
editor = new E(`#${this.id}`);
// 编辑内容绑定数据
- editor.config.onchange = html => {
+ editor.config.onchange = (html) => {
if (this.openXss) {
this.data = xss(html);
} else {
@@ -108,30 +97,30 @@ export default {
editor.config.uploadImgServer = uploadFile;
// lili如要header中传入token鉴权
editor.config.uploadImgHeaders = {
- accessToken: that.getStore("accessToken")
+ accessToken: that.getStore("accessToken"),
};
editor.config.uploadFileName = "file";
editor.config.uploadImgHooks = {
- before: function(xhr, editor, files) {
+ before: function (xhr, editor, files) {
// 图片上传之前触发
},
- success: function(xhr, editor, result) {
+ success: function (xhr, editor, result) {
// 图片上传并返回结果，图片插入成功之后触发
},
- fail: function(xhr, editor, result) {
+ fail: function (xhr, editor, result) {
// 图片上传并返回结果，但图片插入错误时触发
that.$Message.error("上传图片失败");
},
- error: function(xhr, editor) {
+ error: function (xhr, editor) {
// 图片上传出错时触发
that.$Message.error("上传图片出错");
},
- timeout: function(xhr, editor) {
+ timeout: function (xhr, editor) {
// 图片上传超时时触发
that.$Message.error("上传图片超时");
},
// 如果服务器端返回的不是 {errno:0, data: [...]} 这种格式，可使用该配置
- customInsert: function(insertImg, result, editor) {
+ customInsert: function (insertImg, result, editor) {
if (result.success == true) {
let url = result.result;
insertImg(url);
@@ -139,10 +128,11 @@ export default {
} else {
that.$Message.error(result.message);
}
- }
+ },
};
}
- editor.config.customAlert = function(info) {
+
+ editor.config.customAlert = function (info) {
// info 是需要提示的内容
// that.$Message.info(info);
};
@@ -156,8 +146,8 @@ export default {
// type -> 'emoji' / 'image'
type: "image",
// content -> 数组
- content: sina
- }
+ content: sina,
+ },
];
editor.create();
if (this.value) {
@@ -187,7 +177,7 @@ export default {
editor.txt.html(this.data);
this.$emit("input", this.data);
this.$emit("on-change", this.data);
- }
+ },
});
},
setData(value) {
@@ -200,22 +190,21 @@ export default {
this.$emit("input", this.data);
this.$emit("on-change", this.data);
}
- }
+ },
},
watch: {
value(val) {
this.setData(val);
- }
+ },
},
mounted() {
this.initEditor();
- }
+ },
};
diff --git a/manager/src/views/my-components/verify/verify.js b/manager/src/views/my-components/verify/verify.js
new file mode 100644
index 00000000..9282f5b3
--- /dev/null
+++ b/manager/src/views/my-components/verify/verify.js
@@ -0,0 +1,13 @@
+
+import {commonUrl, getRequestWithNoToken, postRequestWithNoToken} from '@/libs/axios';
+
+
+// 获取拼图验证
+export const getVerifyImg = (verificationEnums) => {
+ return getRequestWithNoToken(`${commonUrl}/common/slider/${verificationEnums}`);
+};
+
+// 拼图验证
+export const postVerifyImg = (params) => {
+ return postRequestWithNoToken(`${commonUrl}/common/slider/${params.verificationEnums}`, params);
+};
diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index a64378e9..19bb9905 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -1,16 +1,27 @@
-
-
-
+
+
+
+
-
@@ -131,19 +102,25 @@
+
+
diff --git a/manager/src/views/seller/shop/shopOperation.vue b/manager/src/views/seller/shop/shopOperation.vue
index 05295e05..ccafc805 100644
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@@ -224,7 +224,6 @@ import memberLayout from "@/views/member/list/index";
import ossManage from "@/views/sys/oss-manage/ossManage";
import { getCategoryTree } from "@/api/goods";
import { shopDetail, shopAdd, shopEdit, getShopByMemberId } from "@/api/shops";
-import * as filters from "@/utils/filters";
import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
import region from "@/views/lili-components/region";
import liliMap from "@/views/my-components/map/index";
diff --git a/manager/src/views/statistics/traffic.vue b/manager/src/views/statistics/traffic.vue
index 6f571a97..f5fbe08d 100644
--- a/manager/src/views/statistics/traffic.vue
+++ b/manager/src/views/statistics/traffic.vue
@@ -66,7 +66,8 @@ export default {
uvs: 0, // 访客数
pvs: 0, // 浏览量
- dateList: [ // 选择项
+ dateList: [
+ // 选择项
{
title: "今天",
selected: false,
@@ -90,7 +91,8 @@ export default {
],
orderChart: "", // 初始化图表
- params: { // 请求参数
+ params: {
+ // 请求参数
searchType: "LAST_SEVEN",
year: "",
month: "",
@@ -117,6 +119,8 @@ export default {
watch: {
params: {
handler(val) {
+ this.uvs = 0;
+ this.pvs = 0;
this.init();
},
deep: true,
diff --git a/manager/src/views/sys/app-version/appVersion.vue b/manager/src/views/sys/app-version/appVersion.vue
index a869d30b..3d411d76 100644
--- a/manager/src/views/sys/app-version/appVersion.vue
+++ b/manager/src/views/sys/app-version/appVersion.vue
@@ -347,6 +347,7 @@ export default {
this.form.versionUpdateDate / 1000
);
this.form.versionUpdateDate = versionUpdateDate;
+
this.form.updateTime = versionUpdateDate;
if (this.modalType == 0) {
// 添加 避免编辑后传入id等数据 记得删除
diff --git a/manager/src/views/sys/menu-manage/menuManage.vue b/manager/src/views/sys/menu-manage/menuManage.vue
index b2e07467..57bfcd58 100644
--- a/manager/src/views/sys/menu-manage/menuManage.vue
+++ b/manager/src/views/sys/menu-manage/menuManage.vue
@@ -70,7 +70,7 @@
size="16"
style="margin-right: 5px"
>
- 顶部菜单
+ 顶级菜单
+
+
+
+
-
+
+
+
+
diff --git a/manager/src/views/promotion/coupon/memberReceiveCoupon.vue b/manager/src/views/promotion/coupon/memberReceiveCoupon.vue
index 2a5dcd3e..4291c1e3 100644
--- a/manager/src/views/promotion/coupon/memberReceiveCoupon.vue
+++ b/manager/src/views/promotion/coupon/memberReceiveCoupon.vue
@@ -1,30 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/manager/src/views/promotion/couponActivity/couponInfo.vue b/manager/src/views/promotion/couponActivity/couponInfo.vue
new file mode 100644
index 00000000..2b800adf
--- /dev/null
+++ b/manager/src/views/promotion/couponActivity/couponInfo.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
diff --git a/manager/src/views/promotion/couponActivity/couponPublish.scss b/manager/src/views/promotion/couponActivity/couponPublish.scss
new file mode 100644
index 00000000..31b5fdc1
--- /dev/null
+++ b/manager/src/views/promotion/couponActivity/couponPublish.scss
@@ -0,0 +1,253 @@
+/*选择商品品类*/
+.content-goods-publish {
+ padding: 15px;
+ margin: 0 auto;
+ text-align: center;
+ border: 1px solid #ddd;
+ background: none repeat 0 0 #fff;
+ height: 100%;
+ margin-bottom: 20px;
+
+ /*商品品类*/
+ .goods-category {
+ text-align: left;
+ padding: 10px;
+ background: #fafafa;
+ border: 1px solid #e6e6e6;
+
+ ul {
+ padding: 8px 4px 8px 8px;
+ list-style: none;
+ width: 300px;
+ background: none repeat 0 0 #fff;
+ border: 1px solid #e6e6e6;
+ display: inline-block;
+ letter-spacing: normal;
+ margin-right: 15px;
+ vertical-align: top;
+ word-spacing: normal;
+
+ li {
+ line-height: 20px;
+ padding: 5px;
+ cursor: pointer;
+ color: #333;
+ font-size: 12px;
+ display: flex;
+ flex-wrap: nowrap;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ }
+ }
+ }
+
+ /** 当前品类被选中的样式 */
+ .activeClass {
+ background-color: #d9edf7;
+ border: 1px solid #bce8f1;
+ color: #3a87ad;
+ }
+
+ /*!*当前选择的商品品类文字*!*/
+ .current-goods-category {
+ text-align: left;
+ padding: 10px;
+ width: 100%;
+ border: 1px solid #fbeed5;
+ color: #c09853;
+ background-color: #fcf8e3;
+ margin: 10px auto;
+ padding: 8px 35px 8px 14px;
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+ font-size: 12px;
+ font-weight: bold;
+ }
+}
+
+/*编辑基本信息*/
+.el-form {
+ padding-bottom: 80px;
+
+ .el-form-item {
+ width: 100%;
+ color: gray;
+ text-align: left;
+ }
+}
+
+div.base-info-item {
+
+ h4 {
+ margin-bottom: 10px;
+ padding: 0 10px;
+ border: 1px solid #ddd;
+ background-color: #f8f8f8;
+ font-weight: bold;
+ color: #333;
+ font-size: 14px;
+ line-height: 40px;
+ text-align: left;
+ }
+
+ .form-item-view {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ justify-content: space-between;
+ padding-left: 80px;
+
+ .shop-category-text {
+ font-size: 12px;
+ }
+ }
+
+ .item-goods-properts-row {
+ display: flex;
+ flex-direction: row;
+ word-break: break-all;
+ white-space: normal;
+ width: 300px;
+ height: 100px;
+ }
+
+ .item-goods-properts {
+ display: flex;
+ flex-direction: row;
+ margin-bottom: 10px;
+ }
+
+ .form-item {
+ display: flex;
+ align-items: center;
+ }
+
+
+
+ .el-form-item {
+ width: 30%;
+ min-width: 300px;
+ }
+
+ .goods-name-width {
+ width: 50%;
+ min-width: 300px;
+ }
+
+ .el-form-item__content {
+ margin-left: 120px;
+ text-align: left;
+ }
+
+ p.goods-group-manager {
+ padding-left: 7.5%;
+ text-align: left;
+ color: #999;
+ font-size: 13px;
+ }
+
+ /*teatarea*/
+ /deep/ .el-textarea {
+ width: 150%;
+ }
+
+ .seo-text {
+ width: 150%;
+ }
+}
+
+/*折叠面板*/
+.el-collapse-item {
+ /deep/ .el-collapse-item__header {
+ text-align: left;
+ background-color: #f8f8f8;
+ padding: 0 10px;
+ font-weight: bold;
+ color: #333;
+ font-size: 14px;
+ }
+
+ .el-form-item {
+ margin-left: 5%;
+ width: 25%;
+ }
+
+ /deep/ .el-form-item__content {
+ margin-left: 120px;
+ text-align: left;
+ }
+
+ p.goods-group-manager {
+ padding-left: 12%;
+ text-align: left;
+ color: #999;
+ }
+
+ /deep/ .el-collapse-item__content {
+ padding: 10px 0;
+ text-align: left;
+ }
+}
+
+/*商品描述*/
+.goods-intro {
+ line-height: 40;
+}
+
+/** 底部步骤 */
+.footer {
+ width: 88.7%;
+ padding: 10px;
+ background-color: #ffc;
+ position: fixed;
+ bottom: 0px;
+ left: 10%;
+ text-align: center;
+ z-index: 9999;
+}
+
+/*图片上传组件第一张图设置封面*/
+.goods-images {
+ /deep/ li.el-upload-list__item:first-child {
+ position: relative;
+ }
+
+ /deep/ li.el-upload-list__item:first-child:after {
+ content: "封";
+ color: #fff;
+ font-weight: bold;
+ font-size: 12px;
+ position: absolute;
+ left: -15px;
+ top: -6px;
+ width: 40px;
+ height: 24px;
+ padding-top: 6px;
+ background: #13ce66;
+ text-align: center;
+ -webkit-transform: rotate(-45deg);
+ transform: rotate(-45deg);
+ -webkit-box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+ box-shadow: 0 0 1pc 1px rgba(0, 0, 0, 0.2);
+ }
+}
+
+.el-form-item__label {
+ word-break: break-all;
+}
+
+.step-view {
+ width: 33%;
+ height: 40px;
+ font-size: 19px;
+ text-align: center;
+ display: flex;
+ background-color: #fff;
+ justify-content: center;
+ align-items: center;
+}
+
+.page {
+ margin-top: 2vh;
+ margin-bottom: 5vh;
+}
diff --git a/manager/src/views/promotion/couponActivity/couponPublish.vue b/manager/src/views/promotion/couponActivity/couponPublish.vue
new file mode 100644
index 00000000..d2954c63
--- /dev/null
+++ b/manager/src/views/promotion/couponActivity/couponPublish.vue
@@ -0,0 +1,365 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/manager/src/views/promotion/live/live.vue b/manager/src/views/promotion/live/live.vue
new file mode 100644
index 00000000..b7d7498c
--- /dev/null
+++ b/manager/src/views/promotion/live/live.vue
@@ -0,0 +1,249 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/manager/src/views/promotion/live/liveDetail.vue b/manager/src/views/promotion/live/liveDetail.vue
new file mode 100644
index 00000000..e7880dfc
--- /dev/null
+++ b/manager/src/views/promotion/live/liveDetail.vue
@@ -0,0 +1,300 @@
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
diff --git a/manager/src/views/promotion/seckill/seckill.vue b/manager/src/views/promotion/seckill/seckill.vue
index 47ae392a..00e634dd 100644
--- a/manager/src/views/promotion/seckill/seckill.vue
+++ b/manager/src/views/promotion/seckill/seckill.vue
@@ -2,29 +2,12 @@
-
@@ -191,8 +158,8 @@ export default {
this.getDataList();
},
handleReset() {
- this.searchForm = {}
- this.selectDate = ''
+ this.searchForm = {};
+ this.selectDate = "";
this.searchForm.pageNumber = 0;
this.searchForm.pageSize = 10;
this.getDataList();
@@ -232,9 +199,12 @@ export default {
return hourArr;
},
},
- activated () {
+ activated() {
this.init();
- }
+ },
+ mounted() {
+ this.init();
+ },
};