app转售修改

common/style.scss

@@ -749,7 +749,7 @@
 		}
 		.desc {
 			float: right;
-			width: 60%;
+			width: 70%;
 			text-align: right;
 		}
 		input {

pages.json

@@ -440,6 +440,15 @@
                 "enablePullDownRefresh": false
             }
 
+        },
+		{
+            "path" : "pages/market/one/cooperative/peopleOrders",
+            "style" :
+            {
+                "navigationBarTitleText": "合作社边民订单",
+                "enablePullDownRefresh": false
+            }
+
         }
     ],
 	"tabBar": {

pages/market/one/cooperative/order.vue

@@ -1,6 +1,36 @@
 <template>
 	<view>
-		
+		<view class="goodsManageList">
+			<view class="item" v-for="(item, index) in list" :key="index">
+				<view class="top">
+					<view class="title omit">{{ item.cooperativeName }}</view>
+				</view>
+				<view class="con">
+					<view class="flex fs">
+						<view class="f">
+							<view class="tag">订单编号</view>
+							<view class="v omit">{{ item.orderNo }}</view>
+						</view>
+						<view class="f">
+							<view class="tag">总金额</view>
+							<view class="v omit" style="color: coral;">￥{{ item.totalPrice }}</view>
+						</view>
+					</view>
+					<view class="tradeAreaName">{{ item.tradeAreaName }}</view>
+					<view class="date">创建于：{{ item.createTime }}</view>
+				</view>
+				<view class="op">
+					<view class="flex">
+						<view class="f" style="color: #0081ff" @click.stop="peopleOrders(item.id)">
+							<text>边民订单</text>
+						</view>
+					</view>
+				</view>
+				<view class="clear"></view>
+			</view>
+			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
+			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
+		</view>
 	</view>
 </template>
 
@@ -8,8 +38,27 @@
 	export default {
 		data() {
 			return {
-				
+				list: [],
+				loadMore: false,
 			};
+		},
+		onLoad() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.http.request({
+					url: '/level-one-server/app/TbCollageOrders/getList',
+					loading: 'false',
+					data: this.param,
+					success: res => {
+						this.list.push(...res.data.data);
+					}
+				});
+			},
+			peopleOrders(id) {
+				uni.navigateTo({ url: '/pages/market/one/cooperative/peopleOrders?collageOrdersId=' + id });
+			}
 		}
 	}
 </script>

pages/market/one/cooperative/peopleOrders.vue

@@ -0,0 +1,168 @@
+<template>
+	<view>
+		<view class="tab">
+			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
+		</view>
+		<view class="goodsList">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="title">{{ item.enterpriseName }}
+					<view class="state" v-if="item.peopleConfirmStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>未确认</text>
+					</view>
+					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.apply == 0">
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>已确认</text>
+					</view>
+					<view class="state" v-if="item.resaleStatus == 1">
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>已转售</text>
+					</view>
+					<view class="state" v-if="item.finishStatus == 3">
+						<text class="icon" style="color: #f44336">&#xe622;</text>
+						<text>已取消</text>
+					</view>
+				</view>
+
+				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
+				<view class="con">
+					<view class="productName omit">{{ item.goodsNames }}</view>
+					<view class="desc omit">
+						<text>重量 {{ item.totalWeight }}</text>
+						<text>{{ item.tradeAreaName }}</text>
+					</view>
+					<view class="price">¥ {{ item.totalPrice }}</view>
+				</view>
+				<view class="clear"></view>
+			</view>
+			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
+			<u-empty v-if="!loadMore && list.length == 0"></u-empty>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			tab: [
+				{
+					name: '全部',
+					peopleConfirmStatus: '',	//边民确认状态
+					apply: '',					//订单申报状态
+					finishStatus: '',			//订单完成状态
+					resaleStatus: ''			//订单转售状态
+				},
+				{
+					name: '待确认',
+					peopleConfirmStatus: 0,
+					apply: 0,
+					finishStatus: 0,
+					resaleStatus: 0
+				},
+				{
+					name: '申报中',
+					peopleConfirmStatus: 1,
+					apply: 0,
+					finishStatus: 0,
+					resaleStatus: 0
+				},
+				{
+					name: '已完成',
+					peopleConfirmStatus: 1,
+					apply: 1,
+					finishStatus: 1,
+					resaleStatus: 0
+				},
+				{
+					name: '已转售',
+					peopleConfirmStatus: 1,
+					apply: 1,
+					finishStatus: 1,
+					resaleStatus: 1
+				}/* ,
+				{
+					name: '已取消',
+					peopleConfirmStatus: '',
+					apply: '',
+					finishStatus: 3,
+					resaleStatus: ''
+				} */
+			],
+			param: {
+				pageNo: 1,
+				pageSize: 10
+			},
+			user:this.getUser(),
+			list: [],
+			loadMore: false,
+			collageOrdersId: ''
+		};
+	},
+	onLoad(e) {
+		if(e.collageOrdersId) {
+			this.collageOrdersId = e.collageOrdersId;
+			this.getData();
+		}
+		
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/getList',
+				loading: 'false',
+				data: {collageOrdersId : this.collageOrdersId},
+				success: res => {
+					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+					if (res.data.data) {
+						this.list.push(...res.data.data);
+					}
+				}
+			});
+		},
+		// 点击tab切换
+		click(e) {
+			console.log(e);
+			this.param.peopleConfirmStatus = e.appeopleConfirmStatusply;
+			this.param.apply = e.apply;
+			this.param.finishStatus = e.finishStatus;
+			this.param.resaleStatus = e.resaleStatus;
+			this.refresh();
+		},
+		detail(item) {
+			uni.navigateTo({url: '/pages/market/one/leader/detail?id=' + item.id});
+		},
+		// 刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNo = 1;
+			this.list = [];
+			this.getData();
+		},
+		
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.refresh();
+			uni.stopPullDownRefresh();
+		}, 1000);
+	},
+	//上拉加载
+	onReachBottom() {
+		if (this.loadMore) {
+			this.param.pageNo++;
+			this.getData();
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+.state{
+	margin-right: -70px;
+}
+</style>

pages/market/two/detail.vue

@@ -7,8 +7,8 @@
 				<view class="clear"></view>
 				<u-divider text="规格参数"></u-divider>
 				<view class="item">
-					<text class="desc">商品量：</text>
-					<text>{{ item.goodsQuantity }}</text>
+					<text class="desc">商品编号：</text>
+					<text>{{ item.goodsNo }}</text>
 					<view class="clear"></view>
 				</view>
 				<view class="item">
@@ -17,9 +17,8 @@
 					<view class="clear"></view>
 				</view>
 				<view class="item">
-					<text class="desc">商户：</text>
+					<text class="desc">发布商：</text>
 					<text>{{ item.createName }}</text>
-					<view class="clear"></view>
 				</view>
 				<view class="item">
 					<text class="desc">互市区：</text>
@@ -36,7 +35,7 @@
 		<view class="mfooter">
 			<view class="flex">
 				<view class="f">
-					<button class="btn" v-if="user.userType == 2" @click="pay()">立即接单</button>
+					<button class="btn" v-if="user.userType == 3" @click="pay()">立即购买</button>
 				</view>
 			</view>
 		</view>
@@ -52,18 +51,28 @@ export default {
 		};
 	},
 	onLoad(e) {
-		if (e.id) {
-			this.http.request({
-				url: '/level-two-server/app/TbGoodsDemand/getById?id=' + e.id,
-				success: res => {
-					this.item = res.data.data;
-				}
-			});
+		if (e.item) {
+			this.item = JSON.parse(e.item);
 		}
 	},
 	methods: {
 		pay() {
-			uni.navigateTo({ url: '/pages/market/two/leader/confirm?item=' + JSON.stringify(this.item) });
+			uni.showModal({
+				title: '提示',
+				content: '我已核对订单信息无误',
+				success: res => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/level-two-server/app/TbOrders/purchaserBuy',
+							method: 'POST',
+							data: { id: this.item.id},
+							success: res => {
+								uni.navigateTo({ url: '/pages/market/two/leader/success' });
+							}
+						});
+					}
+				}
+			});
 		}
 	}
 };

pages/market/two/leader/success.vue

@@ -1,9 +1,8 @@
 <template>
 	<view class="cmain">
 		<view class="icon">&#xe602;</view>
-		<view class="desc">接单成功，</view>
-		<view class="desc">等待收购商进行接单确认才会生成订单。</view>
-		<button class="btn" @click="go()">确定</button>
+		<view class="desc">购买成功。</view>
+		<button class="btn" @click="go()">返回订单列表</button>
 	</view>
 </template>
 
@@ -15,7 +14,7 @@ export default {
 	methods: {
 		go() {
 			uni.redirectTo({
-				url: '/pages/market/two/list'
+				url: '/pages/market/two/purchaser/order/list'
 			});
 		}
 	}

pages/market/two/list.vue

@@ -72,7 +72,7 @@ export default {
 		},
 		getData() {
 			this.http.request({
-				url: '/level-two-server/app/TbOrders/getList',
+				url: '/level-two-server/app/TbOrders/getLevelTwoList',
 				data: this.param,
 				loading: 'false',
 				success: res => {
@@ -86,7 +86,7 @@ export default {
 			uni.navigateTo({ url: '/pages/market/productType?current=' + this.param.current + '&now=' + this.param.now });
 		},
 		detail(item) {
-			uni.navigateTo({ url: '/pages/market/two/detail?id=' + item.id });
+			uni.navigateTo({ url: '/pages/market/two/detail?item=' + JSON.stringify(item) });
 		},
 		buy(item) {
 			uni.navigateTo({ url: '/pages/market/two/purchaser/buy/buy?item=' + JSON.stringify(item) });

pages/market/two/purchaser/buy/buy.vue

@@ -1,14 +1,6 @@
 <template>
 	<view>
 		<view class="cmain">
-			<view class="box" style="padding: 12px; margin-top: 0px">
-				<u-steps :current="0">
-					<u-steps-item title="接单确认"></u-steps-item>
-					<u-steps-item title="收购商确认"></u-steps-item>
-					<u-steps-item title="完成交易"></u-steps-item>
-				</u-steps>
-			</view>
-			<u-divider text="需求信息"></u-divider>
 			<view class="box order_detail">
 				<view class="item">
 					<text class="label">收购商品</text>
@@ -23,33 +15,23 @@
 					<text class="desc">{{ item.goodsUnit }}</text>
 				</view>
 				<view class="item">
-					<text class="label">商品数量</text>
-					<text class="desc">{{ item.goodsQuantity }}</text>
+					<text class="label">发布商</text>
+					<text class="desc">{{ item.createName }}</text>
 				</view>
 				<view class="item">
 					<text class="label">发布时间</text>
 					<text class="desc">{{ item.createTime }}</text>
 				</view>
 				<view class="item">
-					<text class="label">订单状态</text>
-					<text class="desc">待接单</text>
-				</view>
-				<view class="item">
 					<text class="label">接单人</text>
 					<text class="desc">{{ user.name }}</text>
 				</view>
-				<view class="item">
-					<text class="label">出价金额（必填）</text>
-					<text class="desc">
-						<input type="number" v-model="order.price" placeholder="请输入(元)" />
-					</text>
-				</view>
 			</view>
 		</view>
 		<view class="mfooter">
 			<view class="flex">
 				<view class="f">
-					<button class="btn" @click="pay()">确认接单</button>
+					<button class="btn" @click="pay()">立即购买</button>
 				</view>
 			</view>
 		</view>
@@ -61,33 +43,25 @@ export default {
 	data() {
 		return {
 			user: this.getUser(),
-			item: {},
-			order: {}
+			item: {}
 		};
 	},
 	onLoad(e) {
 		if (e.item) {
 			this.item = JSON.parse(e.item);
-			this.order.purchaserId = this.item.purchaserId;
-			this.order.goodsDemandId = this.item.id;
 		}
 	},
 	methods: {
 		pay() {
-			let rule = [{ name: 'price', checkType: 'notnull', errorMsg: '请输入报价' }];
-			if (!this.verify.check(this.order, rule)) {
-				uni.showModal({ content: this.verify.error, showCancel: false });
-				return false;
-			}
 			uni.showModal({
 				title: '提示',
-				content: '我已核对接单信息无误',
+				content: '我已核对订单信息无误',
 				success: res => {
 					if (res.confirm) {
 						this.http.request({
-							url: '/level-two-server/app/TbDemandQuotation/quotation',
+							url: '/level-two-server/app/TbOrders/purchaserBuy',
 							method: 'POST',
-							data: this.order,
+							data: { id: this.item.id},
 							success: res => {
 								uni.navigateTo({ url: '/pages/market/two/leader/success' });
 							}

pages/market/two/purchaser/order/list.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="title">广西京东自营店南宁分店</view>
+				<view class="title">{{ item.purchaserName }}</view>
 				<view class="state" v-if="item.isDelivery == 1">
 					<text class="icon" style="color: #13ce66">&#xe830;</text>
 					<text>已完成</text>
@@ -21,7 +21,7 @@
 						<text>{{ item.goodsQuantity }}  {{ item.goodsUnit }}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
-					<view class="price">报价 ¥ {{ item.quotation }}</view>
+					<view class="price">金额 ¥ {{ item.resalePrice }}</view>
 				</view>
 				<view class="clear"></view>
 				<view class="op">