更新Note

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

app/pages/users/order_confirm/index.vue

@@ -24,7 +24,7 @@
 							<view class='name'>{{system_store.name}}
 								<text class='phone'>{{system_store.phone}}</text>
 							</view>
-							<view> {{system_store.address}}{{", " + system_store.detailedAddress}}</view>
+							<view class="line1"> {{system_store.address}}{{", " + system_store.detailedAddress}}</view>
 						</view>
 						<view class='iconfont icon-jiantou'></view>
 					</block>
@@ -271,7 +271,8 @@
 				from: '',
 				news: true,
 				again: false,
-				addAgain: false
+				addAgain: false,
+				secKill: false //是否是秒杀
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -296,6 +297,7 @@
 			this.news = options.new || true;
 			this.again = options.again || false;
 			this.addAgain = options.addAgain || false;
+			this.secKill = options.secKill || false;
 			if (this.isLogin) {
 				this.getaddressInfo();
 				this.getConfirm();
@@ -375,7 +377,11 @@
 					let list = res.data.list || [];
 					this.$set(this, 'storeList', list);
 					this.$set(this, 'system_store', list[0]);
-				}).catch(err => {})
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					});
+				})
 			},
 			// 关闭地址弹窗；
 			changeClose: function() {
@@ -501,7 +507,7 @@
 			 */
 			getConfirm: function() {
 				let that = this;
-				orderConfirm(that.cartId,that.news,this.addAgain).then(res => {
+				orderConfirm(that.cartId,that.news,this.addAgain,this.secKill).then(res => {
 					that.$set(that, 'userInfo', res.data.userInfo);
 					that.$set(that, 'integral', res.data.userInfo.integral);
 					that.$set(that, 'cartInfo', res.data.cartInfo);
@@ -512,7 +518,7 @@
 					that.$set(that, 'priceGroup', res.data.priceGroup);
 					that.$set(that, 'totalPrice', that.$util.$h.Add(parseFloat(res.data.priceGroup.totalPrice), parseFloat(res.data
 						.priceGroup.storePostage)));
-					that.$set(that, 'seckillId', parseInt(res.data.seckill_id));
+					that.$set(that, 'seckillId', parseInt(res.data.secKillId));
 					that.$set(that, 'store_self_mention', res.data.storeSelfMention == 'true'?true:false);
 					that.cartArr[1].title = '可用余额:' + res.data.userInfo.nowMoney;
 					that.cartArr[0].payStatus = res.data.payWeixinOpen || 0
@@ -526,15 +532,14 @@
 					// that.$set(that, 'cartArr', that.cartArr);
 					that.$set(that, 'ChangePrice', that.totalPrice);
 					that.getBargainId();
-					that.getCouponList();
+					if(!that.secKill) that.getCouponList();
 				}).catch(err => {
-					console.log(err, 'err')
-					// return this.$util.Tips({
-					// 	title: err
-					// }, {
-					// 	tab: 3,
-					// 	url: 1
-					// });
+					return this.$util.Tips({
+						title: err
+					}, {
+						tab: 3,
+						url: 1
+					});
 				});
 			},
 			/*