12-29-2

api/whole.js

@@ -10,9 +10,9 @@ export function getWholeTimeArea(data) {
 }
 
 // 获取批发商品列表
-export function getWholeList(data) {
+export function getWholeList(data,id) {
 	return request({
-		url: '/api/whole/list/',
+		url: '/api/whole/list/' + id,
 		method: 'get',
 		data
 	});
@@ -37,7 +37,7 @@ export function reservePackage(data) {
 }
 
 // 我的包
-export function getMyPackage() {
+export function getMyPackage(data) {
 	return request({
 		url: '/api/package/mylist',
 		method: 'post',
@@ -46,7 +46,7 @@ export function getMyPackage() {
 }
 
 // 上传评证
-export function upEvaluation() {
+export function upEvaluation(data) {
 	return request({
 		url: '/api/package/evaluation',
 		method: 'post',

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "基础项目",
-    "appid" : "__UNI__F0EBD91",
+    "appid" : "__UNI__1E53CF7",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/index/child/wholesale.vue

@@ -9,7 +9,7 @@
 		</view>
 		<view class="date" v-if="list.length > 0">
 			<view class="date-item"
-				@click="navto('/pages/product/wholesale?bin=' + encodeURI(list[0].time) + '&stp=' + list[0].stop + '&status=' + list[0].status + '&state=' + list[0].state + '&wid=' + list[0].state)">
+				@click="navto('/pages/product/wholesale?bin=' + encodeURI(list[0].time) + '&stp=' + list[0].stop + '&status=' + list[0].status + '&state=' + list[0].state + '&wid=' + list[0].id)">
 				<image src="../../../static/img/mom.png"></image>
 				<view class="item-name">
 					上午场
@@ -19,7 +19,7 @@
 				</view>
 			</view>
 			<view class="date-item"
-				@click="navto('/pages/product/wholesale?bin=' + encodeURI(list[1].time) + '&stp=' + list[1].stop + '&status=' + list[1].status  + '&state=' + list[1].state + '&wid=' + list[1].state)">
+				@click="navto('/pages/product/wholesale?bin=' + encodeURI(list[1].time) + '&stp=' + list[1].stop + '&status=' + list[1].status  + '&state=' + list[1].state + '&wid=' + list[1].id)">
 				<image src="../../../static/img/aft.png"></image>
 				<view class="item-name">
 					下午场
@@ -29,7 +29,7 @@
 				</view>
 			</view>
 			<view class="date-item"
-				@click="navto('/pages/product/wholesale?bin=' + encodeURI(list[2].time) + '&stp=' + list[2].stop + '&status=' + list[2].status  + '&state=' + list[2].state + '&wid=' + list[2].state)">
+				@click="navto('/pages/product/wholesale?bin=' + encodeURI(list[2].time) + '&stp=' + list[2].stop + '&status=' + list[2].status  + '&state=' + list[2].state + '&wid=' + list[2].id)">
 				<image src="../../../static/img/eve.png"></image>
 				<view class="item-name">
 					晚上场

pages/product/wholesale.vue

@@ -23,24 +23,26 @@
 			</view>
 			<image src="../../static/img/img74.png" mode="" class="look-more"></image>
 		</view>
-		<scroll-view scroll-y="true" class="scroll-wrap" :style="{'height': height}">
+		<scroll-view scroll-y="true" class="swiper-box" :style="{'height': height}">
+			<!-- <empty v-if="loadingType == 'noMore' && list.length === 0"></empty> -->
 			<view class="good-wrap">
-				<view class="good" v-for="item in 9" @click="navto('/pages/product/wholesaleDetail')">
+
+				<view class="good" v-for="item in list" @click="navto('/pages/product/wholesaleDetail')">
 					<image src="" mode="" class="goo-img"></image>
 					<view class="good-tit clamp">
-						无患子植物家居眼罩无患子植物家居眼罩无患子植物家居眼罩
+						{{item.order_id}}
 					</view>
 					<view class="good-price flex">
 						<view class="new-price">
-							¥2690
-						</view>
-						<view class="old-price">
-							¥3600
+							¥{{item.price}}
 						</view>
+						<!-- <view class="old-price">
+								¥{{item.}}
+							</view> -->
 					</view>
 				</view>
 			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
+			<uni-load-more :status="loadingType" v-if="loadingType == 'loading'"></uni-load-more>
 		</scroll-view>
 	</view>
 </template>
@@ -49,16 +51,25 @@
 	import {
 		timeComputed
 	} from '@/utils/rocessor.js'
+	import {
+		getWholeList
+	} from '@/api/whole.js'
+
 	import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
-	import { getWholeList } from '@/api/whole.js'
+	import empty from '@/components/empty';
+
 	export default {
+		components: {
+			empty,
+			uniCountdown
+		},
 		data() {
 			return {
 				height: '',
 				list: [],
 				page: 1,
 				limit: 10,
-				loadingType: 'more',
+				loadingType: 'loading',
 				loaded: false,
 				bin: '',
 				stop: '',
@@ -76,7 +87,7 @@
 			uni.getSystemInfo({
 				success: resu => {
 					const query = uni.createSelectorQuery();
-					query.select('.scroll-wrap').boundingClientRect();
+					query.select('.swiper-box').boundingClientRect();
 					query.exec(function(res) {
 						obj.height = resu.windowHeight - res[0].top + 'px';
 						console.log('打印页面的剩余高度', obj.height);
@@ -92,14 +103,14 @@
 			obj.status = opt.status
 			obj.state = opt.state
 			obj.wid = opt.wid
-			
+
 			obj.getWholeList()
 			console.log(obj.bin, obj.stop, obj.status)
 		},
 		onShow() {
 			let obj = this
 			if (obj.status == 1) {
-				if(obj.timer) {
+				if (obj.timer) {
 					clearTimeout(obj.timer)
 				}
 				this.getSyTime()
@@ -134,34 +145,41 @@
 				obj.stopTimeH = stopTime.hours
 				obj.stopTimeM = stopTime.minutes >= 10 ? stopTime.minutes : ('0' + stopTime.minutes)
 				obj.stopTimeS = stopTime.seconds >= 10 ? stopTime.seconds : ('0' + stopTime.seconds)
-				if(stopTime.hours == 0 && stopTime.minutes == 0 && stopTime.seconds == 0) {
+				if (stopTime.hours == 0 && stopTime.minutes == 0 && stopTime.seconds == 0) {
 					obj.status = 0
 				}
-				if(!obj.timer) {
-					if(obj.status == 1) {
-						obj.timer = setTimeout(this.getSyTime,1000)
+				if (!obj.timer) {
+					if (obj.status == 1) {
+						obj.timer = setTimeout(this.getSyTime, 1000)
 					}
-					
-				}else {
+
+				} else {
 					clearTimeout(obj.timer)
-					if(obj.status == 1) {
-						obj.timer = setTimeout(this.getSyTime,1000)
+					if (obj.status == 1) {
+						obj.timer = setTimeout(this.getSyTime, 1000)
 					}
 				}
-				
+
 				// console.log(obj.stopTimeH + ':' + obj.stopTimeM + ':' + obj.stopTimeS)
 			},
 			getWholeList() {
 				let obj = this
-				getWholeList({},obj.wid).then(res => {
-					console.log(res)
+				// obj.loadingType == 'loading'
+				getWholeList({}, obj.wid).then(({
+					data
+				}) => {
+					obj.list = data.data
+					// if()
+					obj.loadingType = 'noMore'
+					console.log(obj.loadingType)
+					console.log(obj.list, 'obj.list+++++')
 				})
 			}
 		}
 	}
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 	.to-bg {
 		width: 750rpx;
 		height: 427rpx;
@@ -230,9 +248,9 @@
 		}
 	}
 
-	.scroll-wrap {
+	.swiper-box {
 		// background-color: red;
-
+		// position: relative;
 	}
 
 	.good-wrap {

pages/redirect/redirect.vue

@@ -1,122 +1,158 @@
-<template>
-	<view>
-	</view>
-</template>
-<script>
-import { getUserInfo } from '@/api/user.js';
-import { mapMutations,mapState } from 'vuex';
-// #ifdef H5
-import { wechatAuth } from '@/api/wx';
-// #endif
-// #ifdef MP-WEIXIN
-import { wechatMpAuth } from '@/api/wx';
-// #endif
-export default {
-	computed: {
-		...mapState(['urlFile'])
-	},
-	onLoad(option) {
-		let obj = this;
-		// 判断是否需要保存定向地址
-		// #ifdef H5
-		this.loadH5()
-		// #endif
-		// #ifdef MP-WEIXIN
-		this.loadMp(option)
-		// #endif
-	},
-	methods: {
-		...mapMutations('user',['login', 'setUserInfo']),
-		// #ifdef H5
-		loadH5() {
-			let obj = this;
-			let url = window.location.href;
-			let code = url.match(/code=([0-9]|[a-z]|[A-Z])*/g)[0].replace('code=', '');
-			let spread = uni.getStorageSync('spread')||'';
-			wechatAuth({
-				code: code,
-				spread:spread,
-			}).then(({ data }) => {
-				obj.wchatAuth(data);
-			}).catch((e) => {
-				uni.showModal({
-					title: '错误',
-					content: JSON.stringify(e),
-					showCancel: false,
-				});
-			});;
-		},
-		// #endif
-		// #ifdef MP-WEIXIN
-		loadMp(option) {
-			let obj = this;
-			// 获取登录授权页数据
-			let user = obj.$api.prePage().userInfo;
-			// #ifndef MP
-			// 获取推广人id
-			let spread_spid = uni.getStorageSync('spread') || '';
-			// #endif
-			// #ifdef MP
-			// 小程序推广人
-			let spread_code = uni.getStorageSync('spread_code') || '';
-			// #endif
-			wechatMpAuth({
-				code: option.code,
-				iv: user.target.iv,
-				encryptedData: user.target.encryptedData,
-				// #ifndef MP
-				spread_spid: spread_spid,
-				// #endif
-				// #ifdef MP
-				spread_code:spread_code
-				// #endif
-			}).then(({ data }) => {
-				obj.wchatAuth(data);
-			}).catch((e) => {
-				uni.showModal({
-					title: '错误',
-					content: JSON.stringify(e),
-					showCancel: false,
-				});
-			});
-		},
-		// #endif
-		wchatAuth(data) {
-			let obj = this;
-			// 保存token
-			uni.setStorageSync('token', data.token);
-			// 获取用户基础信息
-			getUserInfo({}).then(e => {
-				obj.login();
-				// 保存返回用户数据
-				obj.setUserInfo(e.data);
-				let ur = uni.getStorageSync('present')|| '/pages/index/index';
-				// 用于处理缓存bug
-				if (ur=='pages/product/product') {
-					ur = '/pages/index/index'
-				}
-				uni.switchTab({
-					url: ur,
-					fail(e) {
-						uni.navigateTo({
-							url: ur,
-							fail(e) {
-								uni.navigateTo({
-									url: '/pages/index/index',
-								});
-							}
-						});
-					}
-				});
-			}).catch((e) => {
-				uni.showModal({
-					title: '错误',
-					content: JSON.stringify(e),
-					showCancel: false,
-				});
-			});;
-		}
-	}
-};
-</script>
+<template>
+	<view>
+	</view>
+</template>
+<script>
+	import {
+		getUserInfo
+	} from '@/api/user.js';
+	import {
+		mapMutations,
+		mapState
+	} from 'vuex';
+	// #ifdef H5
+	import {
+		wechatAuth
+	} from '@/api/wx';
+	// #endif
+	// #ifdef MP-WEIXIN
+	import {
+		wechatMpAuth
+	} from '@/api/wx';
+	// #endif
+	export default {
+		computed: {
+			...mapState(['urlFile'])
+		},
+		onLoad(option) {
+			let obj = this;
+			// 判断是否需要保存定向地址
+			// #ifdef H5
+			this.loadH5()
+			// #endif
+			// #ifdef MP-WEIXIN
+			this.loadMp(option)
+			// #endif
+		},
+		methods: {
+			...mapMutations('user', ['login', 'setUserInfo']),
+			// #ifdef H5
+			loadH5() {
+				let obj = this;
+				let url = window.location.href;
+				let code = url.match(/code=([0-9]|[a-z]|[A-Z])*/g)[0].replace('code=', '');
+				let spread = uni.getStorageSync('spread') || '';
+				wechatAuth({
+					code: code,
+					spread: spread,
+				}).then(({
+					data
+				}) => {
+					obj.wchatAuth(data);
+				}).catch((e) => {
+					uni.showModal({
+						title: '错误',
+						content: JSON.stringify(e),
+						showCancel: false,
+					});
+				});;
+			},
+			// #endif
+			// #ifdef MP-WEIXIN
+			loadMp(option) {
+				let obj = this;
+				// 获取登录授权页数据
+				let user = obj.$api.prePage().userInfo;
+				// #ifndef MP
+				// 获取推广人id
+				let spread_spid = uni.getStorageSync('spread') || '';
+				// #endif
+				// #ifdef MP
+				// 小程序推广人
+				let spread_code = uni.getStorageSync('spread_code') || '';
+				// #endif
+				wechatMpAuth({
+					code: option.code,
+					iv: user.target.iv,
+					encryptedData: user.target.encryptedData,
+					// #ifndef MP
+					spread_spid: spread_spid,
+					// #endif
+					// #ifdef MP
+					spread_code: spread_code
+					// #endif
+				}).then(({
+					data
+				}) => {
+					obj.wchatAuth(data);
+				}).catch((e) => {
+					uni.showModal({
+						title: '错误',
+						content: JSON.stringify(e),
+						showCancel: false,
+					});
+				});
+			},
+			// #endif
+			wchatAuth(data) {
+				let obj = this;
+				// 保存token
+				uni.setStorageSync('token', data.token);
+				// 获取用户基础信息
+				getUserInfo({}).then(e => {
+					obj.login();
+					// 保存返回用户数据
+					obj.setUserInfo(e.data);
+
+					let ur = uni.getStorageSync('present') || '/pages/index/index';
+					// 用于处理缓存bug
+					if (ur == 'pages/product/product') {
+						ur = '/pages/index/index'
+					}
+					if (e.data.wx_qr) {
+						uni.switchTab({
+							url: ur,
+							fail(e) {
+								uni.navigateTo({
+									url: ur,
+									fail(e) {
+										uni.navigateTo({
+											url: '/pages/index/index',
+										});
+									}
+								});
+							}
+						});
+					} else {
+						obj.$api.msg('请完善用户信息');
+						setTimeout(() => {
+							uni.navigateTo({
+								url: '/pages/set/userinfo'
+							});
+						}, 1000);
+					}
+					// uni.switchTab({
+					// 	url: ur,
+					// 	fail(e) {
+					// 		uni.navigateTo({
+					// 			url: ur,
+					// 			fail(e) {
+					// 				uni.navigateTo({
+					// 					url: '/pages/index/index',
+					// 				});
+					// 			}
+					// 		});
+					// 	}
+					// });
+				}).catch((e) => {
+					uni.showModal({
+						title: '错误',
+						content: JSON.stringify(e),
+						showCancel: false,
+					});
+				});;
+			}
+		}
+	};
+</script>
 <style></style>

pages/user/buySellDetail.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="content">
 		<view class="top-status">
-			待支付
+			{{chooseItem.status | statusTitle}}
 		</view>
 		<view class="good-info">
 			<view class="good-img-tit flex">
-				<image src="" mode="" class="good-img"></image>
+				<image :src="chooseItem.whole.image" mode="" class="good-img"></image>
 				<view class="good-tit ">
 					<view class="clamp2">
-						竹胎酵素健康饮健康生态竹胎酵素健康饮健康生态竹胎酵素健康饮健康生态竹胎酵素健康饮健康生态
+						{{chooseItem.whole.title}}
 					</view>
 					<view class="good-time">
-						下单时间：2019-06-09
+						{{chooseItem.whole.add_time}}
 					</view>
 				</view>
 			</view>
@@ -20,7 +20,7 @@
 					订单总价
 				</view>
 				<view class="">
-					￥699
+					￥{{chooseItem.price}}
 				</view>
 			</view>
 		</view>
@@ -35,25 +35,25 @@
 				<view class="info-tit">
 					订单编号:
 				</view>
-				<view class="info-val">45875487854</view>
+				<view class="info-val">{{chooseItem.order_id}}</view>
 			</view>
 			<view class="info-wrap">
 				<view class="info-tit">
-					收款银行:
+					所属支行:
 				</view>
-				<view class="info-val">45875487854</view>
+				<view class="info-val">{{chooseItem.touser.bank_branch}}</view>
 			</view>
 			<view class="info-wrap">
 				<view class="info-tit">
 					开户行:
 				</view>
-				<view class="info-val">45875487854</view>
+				<view class="info-val">{{chooseItem.touser.account_Bank}}</view>
 			</view>
 			<view class="info-wrap">
 				<view class="info-tit">
 					开户名:
 				</view>
-				<view class="info-val">45875487854</view>
+				<view class="info-val">{{chooseItem.touser.bank_name}}</view>
 				<view class="fz" @click="fz()">
 					复制
 				</view>
@@ -71,7 +71,7 @@
 				<view class="info-tit">
 					支付宝账号:
 				</view>
-				<view class="info-val">45875487854</view>
+				<view class="info-val">{{chooseItem.touser.alipay_no}}</view>
 				<view class="fz" @click="fz()">
 					复制
 				</view>
@@ -80,27 +80,27 @@
 				<view class="info-tit">
 					微信收款码:
 				</view>
-				<image src="" mode="" class="info-img"></image>
+				<image :src="chooseItem.touser.wx_qr" mode="" class="info-img"></image>
 			</view>
 			<view class="info-wrap">
 				<view class="info-tit">
 					卖家电话:
 				</view>
-				<view class="info-val">45875487854</view>
+				<view class="info-val">{{chooseItem.touser.bank_card}}</view>
 				<view class="fz" @click="fz()">
 					复制
 				</view>
 			</view>
 		</view>
-		<view class="up-wrap">
+		<view class="up-wrap" v-if="can_addit">
 			<view class="up-tit">
 				上传凭证
 			</view>
 			<image src="../../static/img/upimg.png" mode="" class="upimg" v-if="upimg == ''" @click="imgsub()"></image>
-			<image src="" mode="" class="upimg" v-else @click="imgsub()"></image>
+			<image :src="upimg" mode="" class="upimg" v-else @click="imgsub()"></image>
 		</view>
-		<view class="apply-wrap">
-			<view class="apply-btn">
+		<view class="apply-wrap" v-if="can_addit">
+			<view class="apply-btn" @click="upnew">
 				立即支付
 			</view>
 		</view>
@@ -109,10 +109,56 @@
 
 <script>
 	import { upload} from '@/api/order.js';
+	import { upEvaluation } from '@/api/whole.js'
 	export default {
 		data() {
 			return {
 				upimg: '',
+				chooseItem: '',
+				can_addit: false
+			}
+		},
+		onLoad(opt) {
+			if(opt.type == 'look') {
+				this.can_addit = false
+			}
+			if(opt.type == 'up') {
+				this.can_addit = true
+			}
+			this.chooseItem = this.$api.prePage().chooseItem
+		},
+		filters: {
+			statusTitle(val) {
+				let str = ''
+				switch (val) {
+					case -2:
+						str = '支付超时'
+						break;
+					case -1:
+						str = '待支付'
+						break;
+					case 0:
+						str = '待支付'
+						break;
+					case 1:
+						str = '待审核'
+						break;
+					case 2:
+						str = '收款'
+						break;
+					case 3:
+						str = '重新发放'
+						break;
+					case 4:
+						str = '完成'
+						break;
+					default:
+						str = ''
+						break
+				}
+		
+				return str
+		
 			}
 		},
 		methods: {
@@ -125,6 +171,18 @@
 					// this.$set(this, text, data[0].url)
 				});
 			},
+			upnew() {
+				let obj = this
+				if(obj.upimg == '') {
+					return obj.$api.msg('请上传凭证')
+				}
+				upEvaluation({
+					id: obj.chooseItem.id,
+					pay_evaluation: obj.upimg
+				}).then(res => {
+					console.log(res)
+				})
+			}
 		}
 	}
 </script>

pages/user/myWholesale.vue

@@ -1,71 +1,67 @@
 <template>
 	<view class="content">
 		<view class="navbar flex">
-			<view class="nav-item" v-for="(navitem,index) in navList" :class="{'action': index == currentIndex}"
+			<view class="nav-item" v-for="(navitem,index) in navList" :class="{'action': index == tabCurrentIndex}"
 				@click="navClick(index)">
 				{{navitem.tit}}
 			</view>
 		</view>
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab"
+			:style="{'height': height}">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex"
+				:style="{'height': height}">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="getMyPackage">
 					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-		
-					<!-- 订单列表 -->
-					<view @click="goToOrderDetail(item)" v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
+
+					<view @click="goToOrderDetail(item)" v-for="(item, index) in tabItem.orderList" :key="index"
+						class="order-item">
 						<view class="i-top b-b">
 							<text class="time">订单编号:{{ item.order_id }}</text>
-							<text class="state" :style="{ color: item.stateTipColor }">{{ item._status._title }}</text>
-							<text v-if="item.status === 4" class="del-btn iconfont icondelete" @click="deleteOrder(index)"></text>
+							<!-- :style="{ color: item.stateTipColor }" -->
+							<text class="state">{{ item.status | statusTitle }}</text>
+							<text v-if="item.status === 4" class="del-btn iconfont icondelete"
+								@click="deleteOrder(index)"></text>
 						</view>
-						<scroll-view v-if="item.cartInfo.length > 1" class="goods-box" scroll-x>
-							<view v-for="(goodsItem, goodsIndex) in item.cartInfo" :key="goodsIndex" class="goods-item">
+						<!-- <scroll-view v-if="item.whole.length > 1" class="goods-box" scroll-x> -->
+						<!-- <view v-for="(goodsItem, goodsIndex) in item.whole" :key="goodsIndex" class="goods-item">
 								<image class="goods-img" :src="goodsItem.productInfo.image" mode="aspectFill"></image>
-							</view>
-						</scroll-view>
-						<view class="goods-box-single" v-for="(goodsItem, goodsIndex) in item.cartInfo" :key="goodsIndex">
-							<image class="goods-img" :src="goodsItem.productInfo.image" mode="scaleToFill"></image>
+							</view> -->
+						<!-- </scroll-view> -->
+
+						<view class="goods-box-single">
+							<image class="goods-img" :src="item.whole.image" mode="scaleToFill"></image>
 							<view class="right">
 								<view class="flex-start" style="justify-content: space-between;">
-									<text class="title clamp">{{ goodsItem.productInfo.store_name }}</text>
-									<text class="price">{{ moneyNum(goodsItem.truePrice) }}</text>
+									<text class="title clamp">{{ item.whole.title }}</text>
+									<text class="price">{{ moneyNum(item.whole.price) }}</text>
 								</view>
 								<view class="row flex">
-									<text class="row_title">{{ goodsItem.productInfo.attrInfo ? goodsItem.productInfo.attrInfo.suk : '' }}</text>
-									<text class="attr-box"> x {{ goodsItem.cart_num }}</text>
+									<!-- <text class="row_title">{{ goodsItem.productInfo.attrInfo ? goodsItem.productInfo.attrInfo.suk : '' }}</text> -->
+									<text class="attr-box"> x {{ item.whole.num }}</text>
 								</view>
 							</view>
 						</view>
-		
-						<view class="price-box">
-							共
-							<text class="num">{{ item.cartInfo.length }}</text>
-							件商品 合计
-							<text class="price">{{ moneyNum(item.pay_price)}}</text>
-							（含邮费
-							<text class="price">{{ moneyNum(item.pay_postage)}}</text>
-							）
-						</view>
 						<view class="action-box b-t" v-if="item.status != 5">
-							<button v-if="item._status._title == '未支付'" class="action-btn" @click.stop="cancelOrder(item)">取消订单</button>
-							<button v-if="item._status._title == '未支付'" @click.stop="orderPay(item)" class="action-btn recom">付款</button>
-							<button v-if="item._status._title == '待评价'" class="action-btn">评价</button>
-							<button v-if="item._status._title == '待收货'" @click.stop="orderTake(item, index)" class="action-btn">确认收货</button>
-							<!-- <button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button> -->
+							<button class="action-btn" @click.stop="lookMore(item)">查看详情</button>
+							<button v-if="item.status == 0" class="action-btn recom"
+								@click.stop="payNew(item)">立即支付</button>
 						</view>
 					</view>
-		
+
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
 				</scroll-view>
 			</swiper-item>
 		</swiper>
-	</view>
-</template>
-
+	</view>
+</template>
+
 <script>
 	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	import empty from '@/components/empty';
+
+	import {
+		getMyPackage
+	} from '@/api/whole.js'
 	export default {
 		components: {
 			uniLoadMore,
@@ -73,44 +69,144 @@
 		},
 		data() {
 			return {
-				currentIndex: 0,
+				chooseItem: {},
+				height: '',
+				tabCurrentIndex: 0,
 				navList: [{
-						status: 'today',
 						tit: '当天预约',
 						orderList: [],
 						page: 1,
 						limit: 10,
 						loadingType: 'more',
 						loaded: false,
+						day: 'today',
+						status: -4
 					},
 					{
-						status: 1,
 						tit: '待支付',
 						orderList: [],
 						page: 1,
 						limit: 10,
 						loadingType: 'more',
 						loaded: false,
+						day: 'today',
+						status: 1
 					},
 				],
 			}
 		},
+		onReady(res) {
+			// 初始化获取页面宽度
+			var _this = this;
+			uni.getSystemInfo({
+				success: resu => {
+					const query = uni.createSelectorQuery();
+					query.select('.swiper-box').boundingClientRect();
+					query.exec(function(res) {
+						_this.height = resu.windowHeight - res[0].top + 'px';
+						console.log('打印页面的剩余高度', _this.height);
+					});
+				},
+				fail: res => {}
+			});
+		},
 		onLoad() {
-			
+			this.getMyPackage()
+		},
+		filters: {
+			statusTitle(val) {
+				let str = ''
+				switch (val) {
+					case -2:
+						str = '支付超时'
+						break;
+					case -1:
+						str = '待支付'
+						break;
+					case 0:
+						str = '待支付'
+						break;
+					case 1:
+						str = '待审核'
+						break;
+					case 2:
+						str = '收款'
+						break;
+					case 3:
+						str = '重新发放'
+						break;
+					case 4:
+						str = '完成'
+						break;
+					default:
+						str = ''
+						break
+				}
+
+				return str
+
+			}
 		},
 		methods: {
+			// 查看详情
+			lookMore(item) {
+				this.chooseItem = item
+				uni.navigateTo({
+					url: '/pages/user/buySellDetail?type=look'
+				})
+			},
+			// 立即支付
+			payNew(item) {
+				this.chooseItem = item
+				uni.navigateTo({
+					url: '/pages/user/buySellDetail?type=up'
+				})
+			},
+			// 转换金额为数字
+			moneyNum(value) {
+				return +value;
+			},
 			navClick(index) {
-				this.currentIndex = index
+				this.tabCurrentIndex = index
+			},
+			getMyPackage(tab) {
+				let obj = this
+				let index = obj.tabCurrentIndex
+				let navItem = obj.navList[index]
+				if (navItem.loadingType == 'noMore' || navItem.loadingType == 'loading') {
+					return
+				}
+				if (tab == 'tab' && navItem.loaded) {
+					return
+				}
+				navItem.loadingType == 'loading'
+				getMyPackage({
+					page: navItem.page,
+					limit: navItem.limit,
+					data: navItem.day,
+					status: navItem.status
+				}).then(({
+					data
+				}) => {
+					navItem.orderList = navItem.orderList.concat(data.data)
+					navItem.page++
+					if (navItem.limit == data.data.length) {
+						navItem.loadingType = 'more'
+					} else {
+						navItem.loadingType = 'noMore'
+					}
+					navItem.loaded = true
+				})
 			}
 		}
-	}
-</script>
-
+	}
+</script>
+
 <style lang="scss" scoped>
 	.navbar {
 		background-color: #fff;
 		height: 40px;
-	
+
 		.nav-item {
 			width: 50%;
 			text-align: center;
@@ -119,11 +215,12 @@
 			font-weight: 500;
 			color: #333333;
 		}
-	
+
 		.action {
 			font-weight: bold;
 			position: relative;
-			color:  #FF4C4C;
+			color: #FF4C4C;
+
 			&::after {
 				content: '';
 				width: 84rpx;
@@ -138,18 +235,24 @@
 			}
 		}
 	}
+
 	.swiper-box {
-		height: calc(100% - 40px);
+		padding-top: 20rpx;
+		// height: calc(100% - 40px);
+		// background-color: red;
 	}
+
 	.list-scroll-content {
 		height: 100%;
 	}
+
 	.order-item {
 		display: flex;
 		flex-direction: column;
 		padding-left: 30rpx;
 		background: #fff;
-		margin-top: 16rpx;
+		margin-bottom: 16rpx;
+
 		.i-top {
 			display: flex;
 			align-items: center;
@@ -158,17 +261,21 @@
 			font-size: $font-base;
 			color: $font-color-dark;
 			position: relative;
+
 			.time {
 				flex: 1;
 			}
+
 			.state {
 				color: $base-color;
 			}
+
 			.del-btn {
 				padding: 10rpx 0 10rpx 36rpx;
 				font-size: $font-lg;
 				color: $font-color-light;
 				position: relative;
+
 				&:after {
 					content: '';
 					width: 0;
@@ -181,72 +288,85 @@
 				}
 			}
 		}
+
 		/* 多条商品 */
 		.goods-box {
 			height: 160rpx;
 			padding: 20rpx 0;
 			white-space: nowrap;
+
 			.goods-item {
 				width: 120rpx;
 				height: 120rpx;
 				display: inline-block;
 				margin-right: 24rpx;
 			}
+
 			.goods-img {
 				display: block;
 				width: 100%;
 				height: 100%;
 			}
 		}
+
 		/* 单条商品 */
 		.goods-box-single {
 			display: flex;
 			padding: 20rpx 0;
+
 			.goods-img {
 				display: block;
 				width: 120rpx;
 				height: 120rpx;
 			}
+
 			.right {
 				flex: 1;
 				display: flex;
 				flex-direction: column;
 				padding: 0 30rpx 0 24rpx;
 				overflow: hidden;
-				.row{
+
+				.row {
 					margin-top: 10rpx;
 				}
-				.row_title{
-					padding:5rpx 10rpx;
+
+				.row_title {
+					padding: 5rpx 10rpx;
 					background-color: #dddddd;
 					border-radius: 10rpx;
 					font-size: 22rpx;
 					color: #ffffff;
 				}
+
 				.title {
 					font-size: $font-base + 2rpx;
 					color: $font-color-dark;
 					line-height: 1;
 					width: 80%;
 				}
+
 				.attr-box {
 					display: flex;
 					justify-content: flex-end;
 					font-size: $font-sm + 2rpx;
 					color: $font-color-light;
 				}
+
 				.price {
 					display: inline;
 					font-size: $font-base + 2rpx;
 					color: $font-color-dark;
+
 					&:before {
 						content: '￥';
 						font-size: $font-sm;
-						
+
 					}
 				}
 			}
 		}
+
 		.price-box {
 			display: flex;
 			justify-content: flex-end;
@@ -254,13 +374,16 @@
 			padding: 20rpx 30rpx;
 			font-size: $font-sm + 2rpx;
 			color: $font-color-light;
+
 			.num {
 				margin: 0 8rpx;
 				color: $font-color-dark;
 			}
+
 			.price {
 				font-size: $font-lg;
 				color: $font-color-dark;
+
 				&:before {
 					content: '￥';
 					font-size: $font-sm;
@@ -268,6 +391,7 @@
 				}
 			}
 		}
+
 		.action-box {
 			display: flex;
 			justify-content: flex-end;
@@ -276,6 +400,7 @@
 			position: relative;
 			padding-right: 30rpx;
 		}
+
 		.action-btn {
 			width: 160rpx;
 			height: 60rpx;
@@ -288,21 +413,26 @@
 			color: $font-color-dark;
 			background: #fff;
 			border-radius: 100px;
+
 			&:after {
 				border-radius: 100px;
 			}
+
 			&.recom {
 				color: $base-color;
+
 				&:after {
 					border-color: $base-color;
 				}
 			}
+
 			&.evaluate {
 				color: $color-yellow;
+
 				&:after {
 					border-color: $color-yellow;
 				}
 			}
 		}
-	}
+	}
 </style>

store/index.js

@@ -6,10 +6,10 @@ Vue.use(Vuex)
 const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
-		baseURL:'http://tl.frp.liuniu946.com',//请求地址配置 
+		baseURL:'http://tl.liuniu946.com',//请求地址配置 
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息
-		loginInterceptor:false,//是否打开强制登录
+		loginInterceptor:true,//是否打开强制登录
 		// #ifdef H5 || MP-WEIXIN
 		weichatInfo:{},//保存微信注册信息
 		weichatObj:'',//微信对象

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.6808189b.js></script><script src=/index/static/js/index.d22f25e6.js></script></body></html>

unpackage/dist/build/h5/static/css/cmy.css

@@ -0,0 +1,551 @@
+/*初始化类*/
+@font-face {
+	font-family: 'iconfont';
+	/* project id 1482221 */
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot');
+	src: url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.eot?#iefix') format('embedded-opentype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff2') format('woff2'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.woff') format('woff'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.ttf') format('truetype'),
+		url('https://at.alicdn.com/t/font_1482221_x9emymthrxs.svg#iconfont') format('svg');
+}
+
+.acea-row {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -webkit-flex;
+	display: -ms-flexbox;
+	display: flex;
+	-webkit-box-lines: multiple;
+	-moz-box-lines: multiple;
+	-o-box-lines: multiple;
+	-webkit-flex-wrap: wrap;
+	-ms-flex-wrap: wrap;
+	flex-wrap: wrap
+}
+
+.acea-row.row-middle {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center
+}
+
+.bg-color-red {
+	background-color: #e93323 !important;
+}
+
+.acea-row.row-right {
+	-webkit-box-pack: end;
+	-moz-box-pack: end;
+	-o-box-pack: end;
+	-ms-flex-pack: end;
+	-webkit-justify-content: flex-end;
+	justify-content: flex-end
+}
+
+.acea-row.row-between-wrapper {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: justify;
+	-moz-box-pack: justify;
+	-o-box-pack: justify;
+	-ms-flex-pack: justify;
+	-webkit-justify-content: space-between;
+	justify-content: space-between
+}
+
+.acea-row.row-column-around {
+	-webkit-flex-direction: column;
+	-ms-flex-direction: column;
+	flex-direction: column;
+	justify-content: space-around;
+	-webkit-justify-content: space-around
+}
+
+.acea-row.row-center-wrapper {
+	-webkit-box-align: center;
+	-moz-box-align: center;
+	-o-box-align: center;
+	-ms-flex-align: center;
+	-webkit-align-items: center;
+	align-items: center;
+	-webkit-box-pack: center;
+	-moz-box-pack: center;
+	-o-box-pack: center;
+	-ms-flex-pack: center;
+	-webkit-justify-content: center;
+	justify-content: center
+}
+
+.iconfont {
+	font-family: "iconfont" !important;
+	font-size: 34rpx;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: 0rpx;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.iconedit:before {
+	content: "\e649";
+}
+
+.iconfavorfill:before {
+	content: "\e64b";
+}
+
+.iconfavor:before {
+	content: "\e64c";
+}
+
+.iconlocation:before {
+	content: "\e651";
+}
+
+.iconroundcheckfill:before {
+	content: "\e656";
+}
+
+.iconroundcheck:before {
+	content: "\e657";
+}
+
+.iconunfold:before {
+	content: "\e661";
+}
+
+.iconlikefill:before {
+	content: "\e668";
+}
+
+.iconlike:before {
+	content: "\e669";
+}
+
+.iconshop:before {
+	content: "\e676";
+}
+
+.iconcart:before {
+	content: "\e6af";
+}
+
+.icondelete:before {
+	content: "\e6b4";
+}
+
+.iconhome:before {
+	content: "\e6b8";
+}
+
+.iconcartfill:before {
+	content: "\e6b9";
+}
+
+.iconhomefill:before {
+	content: "\e6bb";
+}
+
+.iconlock:before {
+	content: "\e6c0";
+}
+
+.iconfriendadd:before {
+	content: "\e6ca";
+}
+
+.iconfold:before {
+	content: "\e6de";
+}
+
+.iconapps:before {
+	content: "\e729";
+}
+
+.iconadd:before {
+	content: "\e767";
+}
+
+.iconmove:before {
+	content: "\e768";
+}
+
+.icontriangledownfill:before {
+	content: "\e79b";
+}
+
+.icontriangleupfill:before {
+	content: "\e79c";
+}
+
+.iconshaixuan:before {
+	content: "\e74a";
+}
+
+.iconyanzhengma:before {
+	content: "\e684";
+}
+
+.iconjifen:before {
+	content: "\e60f";
+}
+
+.iconwuliuxinxi:before {
+	content: "\e62b";
+}
+
+.iconmessage:before {
+	content: "\e78a";
+}
+
+.iconsetting:before {
+	content: "\e78e";
+}
+
+.iconaddition:before {
+	content: "\e6e0";
+}
+
+.iconclose:before {
+	content: "\e6e9";
+}
+
+.iconenter:after {
+	content: "\e6f8";
+}
+
+.iconprompt:before {
+	content: "\e71b";
+}
+
+.iconreturn:before {
+	content: "\e720";
+}
+
+.iconsearch:before {
+	content: "\e741";
+}
+
+.iconpengyouquan:before {
+	content: "\e62c";
+}
+
+.iconweixin:before {
+	content: "\e60e";
+}
+
+.iconzhifubao:before {
+	content: "\e673";
+}
+
+.iconyue:before {
+	content: "\e618";
+}
+
+.iconweixin1:before {
+	content: "\e622";
+}
+
+.iconlock1:before {
+	content: "\e64d";
+}
+
+.iconuser:before {
+	content: "\e64e";
+}
+
+.iconchenggongtixianshouyi:before {
+	content: "\e64f";
+}
+
+.iconviptuiguangdingdan:before {
+	content: "\e650";
+}
+
+.icondaifukuan:before {
+	content: "\e652";
+}
+
+.icondaijiesuanshouyi:before {
+	content: "\e653";
+}
+
+.icondaidakuanshouyi:before {
+	content: "\e654";
+}
+
+.icondaifahuo:before {
+	content: "\e655";
+}
+
+.icondaishouhuoshouyi:before {
+	content: "\e658";
+}
+
+.icondaishouhuo:before {
+	content: "\e659";
+}
+
+.iconwuxiaoshouyi:before {
+	content: "\e65a";
+}
+
+.icontixianmingxi:before {
+	content: "\e65b";
+}
+
+.iconshouyi:before {
+	content: "\e65c";
+}
+
+.iconkouchutixianshouxufei:before {
+	content: "\e65d";
+}
+
+.iconyishenqingshouyi:before {
+	content: "\e65e";
+}
+
+.icontuihuanhuo:before {
+	content: "\e65f";
+}
+
+
+/*水平线*/
+.hr {
+	width: 100%;
+	position: relative;
+	border-bottom: 1px solid #dddddd;
+	/* height: 0.5rpx; */
+}
+
+/* 一行显示 */
+.clamp {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: block;
+}
+
+/* 二行显示 */
+.clamp2 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+/* 二行显示 */
+.ellipsis {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+.common-hover {
+	background: #f5f5f5;
+}
+
+/* 角标 */
+.corner {
+	background-color: #e51c23;
+	position: absolute;
+	right: -18rpx;
+	top: -18rpx;
+	color: #FFFFFF;
+	text-align: center;
+	border-radius: 999px;
+	font-size: 24rpx !important;
+	min-width: 35rpx;
+	min-height: 35rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	line-height: 1;
+}
+
+.flex_item {
+	display: flex;
+	align-items: center;
+	/* justify-content: space-between; */
+}
+
+/* 左右顶格加上下居中 */
+.flex-between-center {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+/* flex布局-整体居中 */
+.flex-center {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.flex-start {
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+}
+
+/*文字对齐*/
+.text-left {
+	text-align: left !important;
+}
+
+.text-center {
+	text-align: center !important;
+}
+
+.text-justify {
+	text-align: justify !important;
+}
+
+.text-right {
+	text-align: right !important;
+}
+
+.text-default {
+	color: #212121 !important;
+}
+
+.text-white {
+	color: #ffffff !important;
+}
+
+.text-primary {
+	color: #00bcd4 !important;
+}
+
+.text-success {
+	color: #009688 !important;
+}
+
+.text-info {
+	color: #03a9f4 !important;
+}
+
+.text-warning {
+	color: #ffc107 !important;
+}
+
+.text-danger {
+	color: #e51c23 !important;
+}
+
+.text-pink {
+	color: #e91e63 !important;
+}
+
+.text-purple {
+	color: #673ab7 !important;
+}
+
+.text-indigo {
+	color: #3f51b5 !important;
+}
+
+.text-gray {
+	color: #999999 !important;
+}
+
+.bg-default {
+	background-color: #f5f5f5 !important;
+}
+
+.bg-primary {
+	background-color: #00bcd4 !important;
+}
+
+.bg-success {
+	background-color: #009688 !important;
+}
+
+.bg-info {
+	background-color: #03a9f4 !important;
+}
+
+.bg-warning {
+	background-color: #FFB238 !important;
+}
+
+.bg-danger {
+	background-color: #DC4D46 !important;
+}
+
+.bg-pink {
+	background-color: #e91e63 !important;
+}
+
+.bg-purple {
+	background-color: #673ab7 !important;
+}
+
+.bg-indigo {
+	background-color: #3f51b5 !important;
+}
+
+.bg-white {
+	background-color: white !important;
+}
+
+.bg-gray {
+	background-color: #e3e3e3 !important;
+}
+
+/* 边框 */
+.border-radius-15 {
+	border-radius: 15rpx;
+}
+
+.border-radius-10 {
+	border-radius: 10rpx;
+}
+
+.border-radius-all {
+	border-radius: 1000rpx;
+}
+
+/* 底部边线 */
+.borde-b {
+	border-bottom: 1px solid #dddddd;
+}
+
+/* 弹性盒子 */
+.flex {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.items-left {
+	justify-content: flex-start;
+}
+
+.items-right {
+	justify-content: flex-end;
+}
+
+.flex-shrink-false {
+	flex-shrink: 0;
+}
+
+.flex-grow-true {
+	flex-grow: 1;
+}
+
+.position-relative {
+	position: relative;
+}