修改首页

pages/goods/leader_order_list/index.vue

@@ -139,7 +139,7 @@ export default {
 			orderList: [], //订单数组
 			grouponState: 0, //订单状态
 			page: 1,
-			limit: 20,
+			limit: 5,
 		};
 	},
 	computed: mapGetters(['isLogin']),
@@ -217,15 +217,27 @@ export default {
 		},
 		getCommanderOrderList() {
 			let that = this;
+			if (that.loadend) return;
+			if (that.loading) return;
+			that.loading = true;
+			that.loadTitle = that.$t(`加载更多`);
 			getCommanderOrder({
 				grouponState: that.grouponState,
 				current: that.page,
 				size: that.limit,
 			}).then(res => {
-				console.log(res)
-				that.orderList = res.data.records;
-				console.log(that.orderList)
-			})
+				let list = res.data.records || [];
+				let loadend = list.length < that.limit;
+				that.orderList = that.$util.SplitArray(list, that.orderList);
+				that.$set(that, 'orderList', that.orderList);
+				that.loadend = loadend;
+				that.loading = false;
+				that.loadTitle = loadend ? that.$t(`没有更多内容啦~`) : that.$t(`加载更多`);
+				that.page = that.page + 1;
+			}).catch(err => {
+				that.loading = false;
+				that.loadTitle = that.$t(`加载更多`);
+			});
 		},
 		/**
 		 * 获取订单列表
@@ -260,7 +272,7 @@ export default {
 
 	},
 	onReachBottom: function () {
-		this.getOrderList();
+		this.getCommanderOrder();
 	}
 };
 </script>
@@ -368,13 +380,15 @@ export default {
 		color: #111111;
 		line-height: 44rpx;
 		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
 
 		.nv {
 			flex-grow: 1;
 		}
 
 		.status {
-			width: 300rpx;
+			
 			text-align: right;
 			margin-left: 30rpx;
 			color: #FEA800;

pages/groupbuying/publish_group/index.vue

@@ -10,8 +10,8 @@
 					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view class='name'>副标题</view>
-						<input type='number' placeholder='请填写副标题' name="subTitle" :value='grouponReqData.subTitle'
-							placeholder-class='placeholder' pattern="\d*" maxlength="11"></input>
+						<input type='text' placeholder='请填写副标题' name="subTitle" :value='grouponReqData.subTitle'
+							placeholder-class='placeholder'></input>
 					</view>
 				</view>
 				<view class="list" style="margin-top:50rpx;">

pages/index/diy/components/latestGroupBuying.vue

@@ -4,8 +4,6 @@
 		<!-- 拼团列表 -->
 
 		<view class="list-box animated" v-for="(e, index) in grouponData" :key="index">
-
-
 			<productConSwiperGroupbuying class="skeleton-rect" :imgUrls="e.slideshow" :videoline="e.video_link"
 				@videoPause="videoPause"></productConSwiperGroupbuying>
 
@@ -45,9 +43,10 @@
 						</block>
 
 						<text class="red">{{ e.grouponUserTotal }}人</text>
-						<text class="yellow">正在参团中</text>
+						<text class="yellow" v-if="currentId == 0">正在参团中</text>
+						<text class="yellow" v-if="currentId == 1">已参团</text>
 					</view>
-					<view class="countdown-r">
+					<view class="countdown-r" v-if="currentId == 0">
 						<image src="http://www.gzzzyd.com/groupon/home_slices/倒计时@2x.png" mode="scaleToFill" />
 						<text class="yellow">截止倒计时</text>
 						<!-- <text class="red2">02时25分19秒</text> -->
@@ -84,7 +83,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="btn-area">
+			<view class="btn-area" v-if="currentId == 0">
 				<button class="share">
 					<image src="http://www.gzzzyd.com/groupon/home_slices/分享@2x.png" mode="scaleToFill" />
 					<text>分享有礼</text>
@@ -94,14 +93,16 @@
 					<text>立即下单</text>
 				</button>
 			</view>
-
 		</view>
+
 	</view>
 </template>
 
 <script>
+const app = getApp();
 import productConSwiperGroupbuying from "@/components/productConSwiperGroupbuying";
 import { latestGroupon, historyGroupon, detailGroupon, goodsDetail } from '@/api/groupon.js'
+
 export default {
 	components: {
 		productConSwiperGroupbuying
@@ -156,9 +157,14 @@ export default {
 			labelColor: "rgba(29,176,252,1)",
 			typeId: '',
 			grouponData: [],
+			loading: false, //是否加载中
+			loadend: false, //是否加载完毕
+			loadTitle: this.$t(`加载更多`), //提示语
 		};
 	},
 	created () {
+		console.log("created...")
+		this.grouponData = [];
 		this.onLoadData(this.currentId);
 	},
 	methods: {
@@ -180,7 +186,6 @@ export default {
 		getLatestGroupon() {
 			let longitude = uni.getStorageSync('user_longitude');
 			let latitude = uni.getStorageSync('user_latitude');
-			console.log("+++++++++++++++++++++++++++")
 			let that = this;
 			latestGroupon({
 				current: 1,
@@ -201,7 +206,6 @@ export default {
 				longitude: longitude,
 				latitude: latitude
 			}).then(res => {
-
 				that.grouponData = res.data.records;
 			})
 		},

pages/order/index.vue

@@ -25,9 +25,9 @@
 							<view class="nl">
 								{{item.mainTitle}}
 							</view>
-							<view class="status">
-								{{item.orderStateDesc}}
-							</view>
+							<view v-if="item.orderState == 4" class="success_status">{{item.orderStateDesc}}</view>
+							<view v-else-if="item.orderState == 8" class="after_sales_status">{{item.orderStateDesc}}</view>
+							<view v-else class="status">{{item.orderStateDesc}}</view>
 						</view>
 						<view class="myclient_list_content">
 
@@ -678,6 +678,20 @@ export default {
 			margin-right: 30rpx;
 			color: #FEA800;
 		}
+		
+		.success_status {
+			min-width: 100rpx;
+			text-align: right;
+			margin-right: 30rpx;
+			color: #75BE00;
+		}
+		
+		.after_sales_status {
+			min-width: 100rpx;
+			text-align: right;
+			margin-right: 30rpx;
+			color: #666666;
+		}
 	}
 
 	.myclient_list_content {