更新Note

1. 修复购物车,订单和退单后后置任务正确执行
	2. 修复佣金记录金额和详情
	3. 修复管理端 移动应用界面下订单管理数据统计不准确的问题
	4. 修复短信API升级-后台使用一号通
	5. 修复用户管理相关问题
	6. 修复核销点核销后核销地址不准确
	7. 修复资源同步云服务的问题
新增功能
	1. 秒杀
		a. 秒杀时段配置
		b. 秒杀商品维护
	2. 财务管理
		a. 申请提现
		b. 财务记录
			i. 充值记录
			ii. 资金监控
		c. 佣金记录
	3. 普通商品显示该商品正在参加的活动信息[秒杀]

app/pages/activity/goods_seckill/index.vue

@@ -2,9 +2,23 @@
 	<div>
 		<view class='flash-sale'>
 			<view class="saleBox"></view>
-			<view class='header' v-if="timeList.length>0">
-				<image :src='timeList[active].slide'></image>
+			<!-- banner -->
+			<view class="header" v-if="timeList.length">
+				<swiper indicator-dots="true" autoplay="true" :circular="circular" interval="3000" duration="1500"
+				 indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
+					<block v-for="(item,index) in JSON.parse(timeList[active].slide)" :key="index">
+						<swiper-item>
+							<image :src="item.sattDir" class="slide-image" lazy-load></image>
+							<!-- <navigator :url='item.url' class='slide-navigator acea-row row-between-wrapper' hover-class='none'>
+								<image :src="item.pic" class="slide-image" lazy-load></image>
+							</navigator> -->
+						</swiper-item>
+					</block>
+				</swiper>
 			</view>
+			<!-- <view class='header' v-if="timeList.length>0">
+				<image :src='timeList[active].slide'></image>
+			</view> -->
 			<view class="seckillList acea-row row-between-wrapper">
 				<view class="priceTag">
 					<image src="/static/images/priceTag.png"></image>
@@ -13,14 +27,14 @@
 					<scroll-view class="scroll-view_x" scroll-x scroll-with-animation :scroll-left="scrollLeft" style="width:auto;overflow:hidden;height:106rpx;">
 						<block v-for="(item,index) in timeList" :key='index'>
 							<view @tap='settimeList(item,index)' class='item' :class="active == index?'on':''">
-								<view class='time'>{{item.time}}</view>
-								<view class="state">{{item.state}}</view>
+								<view class='time'>{{item.time.split(',')[0]}}</view>
+								<view class="state">{{item.statusName}}</view>
 							</view>
 						</block>
 					</scroll-view>
 				</view>
 			</view>
-			<view class='list'>
+			<view class='list' v-if='seckillList.length>0'>
 				<block v-for="(item,index) in seckillList" :key='index'>
 					<view class='item acea-row row-between-wrapper' @tap='goDetails(item)'>
 						<view class='pictrue'>
@@ -30,16 +44,16 @@
 							<view class='name line1'>{{item.title}}</view>
 							<view class='money'>￥
 								<text class='num font-color'>{{item.price}}</text>
-								<text class="y_money">￥{{item.ot_price}}</text>
+								<text class="y_money">￥{{item.otPrice}}</text>
 							</view>
-							<view class="limit">限量 <text class="limitPrice">{{item.quota}}件</text></view>
+							<view class="limit">限量 <text class="limitPrice">{{item.quotaShow}} {{item.unitName}}</text></view>
 							<view class="progress">
 								<view class='bg-reds' :style="'width:'+item.percent+'%;'"></view>
 								<view class='piece'>已抢{{item.percent}}%</view>
 							</view>
 						</view>
-						<view class='grab bg-color' v-if="status == 1">马上抢</view>
-						<view class='grab bg-color' v-else-if="status == 2">未开始</view>
+						<view class='grab bg-color' v-if="status == 2">马上抢</view>
+						<view class='grab bg-color' v-else-if="status == 1">未开始</view>
 						<view class='grab bg-color-hui' v-else>已结束</view>
 					</view>
 				</block>
@@ -56,7 +70,7 @@
 
 <script>
 	import {
-		getSeckillIndexTime,
+		getSeckillHeaderApi,
 		getSeckillList
 	} from '../../../api/activity.js';
 	import home from '@/components/home/index.vue'
@@ -66,6 +80,10 @@
 		},
 		data() {
 			return {
+				circular: true,
+				autoplay: true,
+				interval: 500,
+				// duration: 500,
 				topImage: '',
 				seckillList: [],
 				timeList: [],
@@ -81,6 +99,7 @@
 				loading: false,
 				loadend: false,
 				pageloading: false,
+				seckillHeader: [],
 			}
 		},
 		onLoad() {
@@ -89,8 +108,7 @@
 		methods: {
 			getSeckillConfig: function() {
 				let that = this;
-				getSeckillIndexTime().then(res => {
-					that.topImage = res.data.lovely;
+				getSeckillHeaderApi().then(res => {
 					that.timeList = res.data.seckillTime;
 					that.active = res.data.seckillTimeIndex;
 					if (that.timeList.length) {
@@ -116,7 +134,7 @@
 				if (that.pageloading) return;
 				this.pageloading = true
 				getSeckillList(that.timeList[that.active].id, data).then(res => {
-					var seckillList = res.data;
+					var seckillList = res.data.list;
 					var loadend = seckillList.length < that.limit;
 					that.page++;
 					that.seckillList = that.seckillList.concat(seckillList),
@@ -147,7 +165,7 @@
 			},
 			goDetails(item){
 				uni.navigateTo({
-					url: '/pages/activity/goods_seckill_details/index?id=' + item.id + '&time=' + this.timeList[this.active].stop + '&status=' + this.status
+					url: '/pages/activity/goods_seckill_details/index?id=' + item.id + '&time=' + this.timeList[this.active].timeSwap + '&status=' + this.status + '&productId=' + item.productId
 				})
 			}
 		},
@@ -263,6 +281,7 @@
 		width: 180rpx;
 		height: 180rpx;
 		border-radius: 10rpx;
+		background-color: #F5F5F5;
 	}
 
 	.flash-sale .list .item .pictrue image {