更新Note

1. 修复购物车,订单和退单后后置任务正确执行
	2. 修复佣金记录金额和详情
	3. 修复管理端 移动应用界面下订单管理数据统计不准确的问题
	4. 修复短信API升级-后台使用一号通
	5. 修复用户管理相关问题
	6. 修复核销点核销后核销地址不准确
	7. 修复资源同步云服务的问题
新增功能
	1. 秒杀
		a. 秒杀时段配置
		b. 秒杀商品维护
	2. 财务管理
		a. 申请提现
		b. 财务记录
			i. 充值记录
			ii. 资金监控
		c. 佣金记录
	3. 普通商品显示该商品正在参加的活动信息[秒杀]
This commit is contained in:
337031187
2020-11-05 16:21:06 +08:00
parent e4f4192f07
commit 177a270dd2
574 changed files with 45105 additions and 4899 deletions

View File

@@ -1,5 +1,5 @@
<template>
<div class="page-account">
<div class="page-account" :style="backgroundImages ? { backgroundImage: 'url(' + backgroundImages + ')'} : { backgroundImage: 'url(' + backgroundImageMo + ')'}">
<div class="container" :class="[ fullWidth > 768 ? 'containerSamll':'containerBig']">
<template v-if="fullWidth>768">
<swiper :options="swiperOption" class="swiperPross">
@@ -119,7 +119,8 @@ export default {
captchatImg: '',
swiperList: [],
loginLogo: '',
backgroundImage: '',
backgroundImages: '',
backgroundImageMo: require("@/assets/imgs/bg.jpg"),
fullWidth: document.body.clientWidth,
swiperOption: {
pagination: {
@@ -241,7 +242,7 @@ export default {
getLoginPicApi().then(res => {
this.swiperList = res.banner
this.loginLogo = res.logo
this.backgroundImage = res.backgroundImage
this.backgroundImages = res.backgroundImage
// Cookies.set('MerInfo', JSON.stringify(data))
})
},
@@ -270,7 +271,6 @@ export default {
this.$store.dispatch('user/login', this.loginForm)
.then(() => {
this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
console.log('lalaalalala')
getStoreStaff()
this.loading = false
}).catch((err) => {
@@ -435,7 +435,6 @@ export default {
}
@media (min-width: $screen-md) {
.page-account {
background-image: url('../../assets/imgs/bg.jpg');
background-repeat: no-repeat;
background-position: center;
background-size: cover;