圣诞快乐

# v1.3 更新列表
    1. 【新增】砍价
	2. 【新增】拼团
	3. 【新增】一号通
	4. 【修复】商品sku 编辑时出现商品属性对应错误的问题
	5. 【修复】商品推广海报生成二维码可能会出错的问题【小程序调试中】
	6. 【修复】微信公众号和小程序头像可能获取不到的问题
	7. 【修复】下单时可能会出错的问题
	8. 【修复】pc管理端用户访问量
	9. 【修复】微信退款
	10. 【修复】管理端订单状态可能出现不正确的情况
	11. 【修复】WEB管理端-菜单色调，短信API更新，首页用户访问量，系统设置tab是自动选择下一及表单
	12. 【修复】系统设置出现更新不正确的问题

app/pages/activity/goods_bargain/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class='bargain-list'>
-			<view class='iconfont icon-xiangzuo' @tap='goBack' :style="'top:'+ (navH/2) +'rpx'"></view>
+			<view class='iconfont icon-xiangzuo' @tap='goBack' :style="'top:'+ (navH/2) +'rpx'" v-if="returnShow"></view>
 			<view class='header'></view>
 			<view class='list'>
 				<block v-for="(item,index) in bargainList" :key="index">
@@ -11,12 +11,15 @@
 						</view>
 						<view class='text acea-row row-column-around'>
 							<view class='name line1'>{{item.title}}</view>
-							<view class='num'><text class='iconfont icon-pintuan'></text>{{item.people}}人正在参与</view>
-							<view class='money font-color'>最低: ￥<text class='price'>{{item.min_price}}</text></view>
+							<view class='num'><text class='iconfont icon-pintuan'></text>{{item.countPeopleAll}}人正在参与</view>
+							<view class='money font-color'>最低: ￥<text class='price'>{{item.minPrice}}</text></view>
 						</view>
 						<view class='cutBnt bg-color'><text class='iconfont icon-kanjia'></text>参与砍价</view>
 					</view>
 				</block>
+				<view class='loadingicon acea-row row-center-wrapper' v-if='bargainList.length > 0'>
+					<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
+				</view>
 			</view>
 		</view>
 		<!-- #ifdef MP -->
@@ -57,21 +60,24 @@
 			return {
 				bargainList: [],
 				page: 1,
-				limit: 20,
+				limit: 10,
 				loading: false,
 				loadend: false,
 				userInfo: {},
 				navH: '',
 				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false //是否隐藏授权
+				isShowAuth: false, //是否隐藏授权
+				returnShow:true,
+				loadTitle: '加载更多'
 			};
 		},
 		computed: mapGetters(['isLogin']),
 		onLoad: function(options) {
+			var pages = getCurrentPages();
+			this.returnShow = pages.length===1?false:true;
 			uni.setNavigationBarTitle({
 				title:"砍价列表"
 			})
-
 			this.navH = app.globalData.navHeight;
 			if (this.isLogin) {
 				this.getUserInfo();
@@ -136,16 +142,22 @@
 				if (that.loadend) return;
 				if (that.loading) return;
 				that.loading = true;
+				that.loadTitle = '';
 				getBargainList({
 					page: that.page,
 					limit: that.limit
 				}).then(function(res) {
-					that.$set(that, 'bargainList', that.bargainList.concat(res.data));
+					let list = res.data.list;
+					let bargainList = that.$util.SplitArray(list, that.bargainList);
+					let loadend = list.length < that.limit;
+					that.loadend = loadend;
+					that.loading = false;
+					that.loadTitle = loadend ? '已全部加载' : '加载更多';
+					that.$set(that, 'bargainList', bargainList);
 					that.$set(that, 'page', that.page + 1);
-					that.$set(that, 'loadend', that.limit > res.data.length);
-					that.$set(that, 'loading', false);
 				}).catch(res => {
 					that.loading = false;
+					that.loadTitle = '加载更多';
 				});
 			}
 		},