Merge branch 'master' of http://git.liuniu946.com/lhl/tlfb

pages/product/newPeople.vue

@@ -9,7 +9,7 @@
 		<!-- <data-list :data='data'></data-list> -->
 		<view class="good-wrap">
 			<view class="good" v-for="item in list"
-				@click="navto('/pages/product/wholesaleDetail?id=' + item.id + '&time=' + item.time_id + '&status=' + item.status + '&is_new=' + is_new)">
+				 @click="tobuy(item)">
 				<image :src="item.image" mode="" class="goo-img"></image>
 				<view class="good-tit clamp">
 					{{item.title}}
@@ -61,6 +61,8 @@
 		},
 		onLoad() {
 			this.getNewList()
+		},
+		onShow() {
 			this.getUserInfo()
 		},
 		// mounted() {
@@ -68,11 +70,19 @@
 		// },
 		methods: {
 			...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+			tobuy(item) {
+				if(this.is_new == 'isn') {
+					this.navto('/pages/product/wholesaleDetail?id=' + item.id + '&time=' + item.time_id + '&status=' + item.status + '&is_new=' + this.is_new)
+				}else {
+					this.$api.msg('您已不是新人，无法预约新人专区商品')
+				}
+				
+			},
 			getUserInfo() {
 				getUserInfo().then(res => {
 					console.log(res)
 					this.setUserInfo(res.data);
-					this.is_new = res.data.is_whole
+					this.is_new = res.data.is_whole == 0? 'isn': 'non'
 				})
 			},
 			navto(url) {

pages/product/wholesale.vue

@@ -28,7 +28,7 @@
 			<view class="good-wrap">
 
 				<view class="good" v-for="item in list" @click="gotoDetail(item)">
-					<image src="" mode="" class="goo-img"></image>
+					<image :src="item.whole.image" mode="" class="goo-img"></image>
 					<view class="good-tit clamp">
 						{{item.whole.title}}
 					</view>
@@ -134,13 +134,15 @@
 		methods: {
 			gotoDetail(item) {
 				let obj = this
-				if(obj.status == '' ) {
-					
+				if(obj.status == 1 ) {
+					obj.navto('/pages/product/wholesaleDetail?id=' + item.id + '&time=' + item.time_id + '&status=' + item.status)
+				}
+				if(obj.status == 0) {
+					obj.$api.msg('今日该场次已结束')
+				}
+				if(obj.status == 2) {
+					obj.$api.msg('今日该场次未开始，请稍后')
 				}
-				let query = 'id=' + item.id + '&time=' + item.time_id + '&status=' + item.status
-				
-				
-				obj.navto('/pages/product/wholesaleDetail?' + query)
 			},
 			navto(url) {
 				uni.navigateTo({
@@ -283,7 +285,7 @@
 			width: 345rpx;
 			height: 345rpx;
 			border-radius: 10rpx 10rpx 0 0;
-			background-color: #bfa;
+			// background-color: #bfa;
 		}
 
 		.good-tit {

pages/product/wholesaleDetail.vue

@@ -19,7 +19,7 @@
 		<view class="btn-ts" style="height: 130rpx; background-color: #fff;">
 
 		</view>
-		<view class="btm-btn" @click="loading? '':reservePackage">
+		<view class="btm-btn" @click="loading? '':reservePackage()">
 			立即预约
 		</view>
 	</view>
@@ -47,7 +47,7 @@
 				good_id: '',
 				time_id: '',
 				status: 1,
-				is_new: 0,//是否是新人 0->是 1->不是
+				is_new: '',
 				description: '',
 				loading: false,
 			}
@@ -56,19 +56,33 @@
 			this.good_id = opt.id
 			this.time_id = opt.time
 			this.status = opt.status
-			this.is_new = opt.is_new == 0 ? 1 : 0
+			if(opt.is_new) {
+				this.is_new = opt.is_new
+			}
+			
 			this.getWholeDetai()
 		},
 		methods: {
 			getWholeDetai() {
 				let obj = this
-				getWholeDetai({}, obj.good_id, obj.time_id, obj.status, obj.is_new).then(({
-					data
-				}) => {
-					obj.goodItem = data.storeInfo
-					obj.imgList = data.storeInfo.images
-					obj.description = data.storeInfo.description.replace(/\<img/gi, '<img class="rich-img"')
-				})
+				if(obj.is_new) {
+					getWholeDetai({}, obj.good_id, obj.time_id, obj.status, 1).then(({
+						data
+					}) => {
+						obj.goodItem = data.storeInfo
+						obj.imgList = data.storeInfo.images
+						obj.description = data.storeInfo.description.replace(/\<img/gi, '<img class="rich-img"')
+					})
+				}else {
+					getWholeDetai({}, obj.good_id, obj.time_id, obj.status,0).then(({
+						data
+					}) => {
+						obj.goodItem = data.storeInfo
+						obj.imgList = data.storeInfo.images
+						obj.description = data.storeInfo.description.replace(/\<img/gi, '<img class="rich-img"')
+					})
+				}
+				
 			},
 			// 预约包
 			reservePackage() {
@@ -77,9 +91,9 @@
 					whole_id: obj.good_id,
 					time_id: obj.time_id,
 					price: obj.goodItem.price,
-					to_uid: obj.is_new == 0 ? '':0,
-					first_price: obj.is_new == 0?'':0,
-					last_id: obj.is_new== 0? '': 0
+					to_uid: obj.is_new == 'isn' ? 0:'',
+					first_price: obj.is_new =='isn'?0:'',
+					last_id: obj.is_new== 'isn'? 0: ''
 				}
 				obj.loading = true
 				reservePackage(updata).then(res => {

pages/user/myWholesale.vue

@@ -92,7 +92,7 @@
 					</view>
 					<uni-load-more :status="navList[1].loadingType"></uni-load-more>
 				</scroll-view>
-				
+
 			</swiper-item>
 		</swiper>
 		<uni-popup ref="lookimg" type="center">
@@ -286,10 +286,11 @@
 				// 重新加载地址
 				let navItem = this.navList[this.tabCurrentIndex]
 				navItem.orderList = []
-				navItem.page = 1,
-					navItem.loadingType = 'more'
+				navItem.page = 1
+				navItem.loadingType = 'more'
+				navItem.loaded = false
+				this.getMyPackage()
 
-				this.loadAddress()
 			},
 			// 同意
 			passPackage(item) {