部分功能优化

common/http.js

@@ -2,10 +2,10 @@
 // const ip = 'http://192.168.2.8:8080'; //线下
 //const ip = 'http://hs-server.aseanbusiness.cn'; //线上
 // const ngip = 'http://hs.tbgjhc.top:7010'
-// const ip = 'http://hs-server.tbgjhc.top:8018';
+const ip = 'http://hs-server.tbgjhc.top:8018';
 //静态图片地址前缀
 // const ngip = 'http://192.168.3.15:8080/sp-admin'
-const ip = 'http:///192.168.3.15:8080'; //线下
+// const ip = 'http://192.168.31.250:8080'; //线下
 
 /**
  * 封装的http请求
@@ -17,6 +17,7 @@ const request = (opt) => {
 	opt.method = opt.method || 'GET';
 	opt.contentType = opt.contentType || 'application/x-www-form-urlencoded'
 	opt.header = opt.header || {
+		'app-version':uni.getAppBaseInfo().appVersion,
 		"Content-Type": opt.contentType,
 		"satoken": uni.getStorageSync('token')
 	};

manifest.json

@@ -2,7 +2,7 @@
     "name" : "天保物流",
     "appid" : "__UNI__4E5B775",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "1.1.2",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */

pages.json

@@ -435,14 +435,32 @@
 				}
 			}
 
-		}, {
+		}, 
+		{
 			"path": "pages/personal/my",
 			"style": {
 				"navigationBarTitleText": "个人信息",
 				"enablePullDownRefresh": false
 			}
 
-		}, {
+		},
+		{
+			"path": "pages/personal/myGroup",
+			"style": {
+				"navigationBarTitleText": "互助组信息",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		{
+			"path": "pages/market/group/gourpIndex",
+			"style": {
+				"navigationBarTitleText": "组内边民",
+				"enablePullDownRefresh": false
+			}
+		
+		},
+		{
 			"path": "pages/personal/setting",
 			"style": {
 				"navigationBarTitleText": "设置",
@@ -472,7 +490,15 @@
 		{
 			"path": "pages/market/one/cooperative/order",
 			"style": {
-				"navigationBarTitleText": "合作社订单列表",
+				"navigationBarTitleText": "结算单",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/market/one/cooperative/peopleOrders",
+			"style": {
+				"navigationBarTitleText": "边民订单",
 				"enablePullDownRefresh": false
 			}
 

pages/face/faceRegister.nvue

@@ -31,15 +31,15 @@
 			this.release();
 		},
 		mounted() {
-			console.log(this.$refs.camera)
+			//console.log(this.$refs.camera)
 			//this.common.hidingLoading();
 		},
 		methods: {
 			takePicture(e) {
 				const that = this;
 				that.$refs.camera.takePicture({
-					base64: false,
-					quailty: 100,
+					base64: true,
+					quailty: 55,
 				}, function(data) {
 					let img = data.img;
 					that.registerFace(img);
@@ -51,19 +51,23 @@
 					return;
 				}
 				const that = this;
-				uni.uploadFile({
-					url: http.ip + '/sp-admin/app/AppUser/face',
-					filePath: 'file://' + img,
-					name: 'file',
-					formData: {
-						id: that.userId,
-						type:that.type
-					},
-					header: {
-						satoken: uni.getStorageSync('token')
-					},
+				let data = {
+					id: that.userId,
+					img: img,
+					type: that.type
+				};
+				let header = {
+					satoken: uni.getStorageSync('token'),
+					'Content-Type':'application/x-www-form-urlencoded'
+				};
+				uni.request({
+					url: http.ip + '/sp-admin/app/AppUser/faceImg',
+					data: data,
+					method: 'POST',
+					header: header,
+					dataType:'json',
 					success(resp) {
-						let res = JSON.parse(resp.data);
+						let res =resp.data;
 						if (res.code == 200) {
 							that.release();
 							uni.showToast({
@@ -101,7 +105,7 @@
 					}, function(data) {
 						setTimeout(function() {
 							that.takePicture();
-						}, 1000);
+						}, 3000);
 					});
 				} else {
 					//android 系统需要考虑 组件的宽高 和摄像头的宽高比例，如果不一致会导致拉伸

pages/index/index.vue

@@ -156,8 +156,6 @@
 			};
 		},
 		onLoad() {
-			let user = this.getUser();
-			this.user = user;
 			this.getBannerList();
 			this.getNewsList();
 			this.getMenu();
@@ -166,9 +164,10 @@
 			});
 		},
 		onShow() {
-			this.getOrderConfirm();
-			this.checkFace()
 			this.keyword = '';
+			let user = uni.getStorageSync('info');
+			this.user = user;
+			this.checkFace()
 			this.getRead();
 			this.getUpdateInfo();
 		},
@@ -214,11 +213,22 @@
 				this.show = false;
 			},
 			checkFace() {
-				let user = this.getUser();
-				console.log(user)
+				let user = this.user;
 				this.faceRegister = false;
-				if ((user.userType == 1 || user.userType == 2) && user.face == 0) {
-					this.faceRegister = true;
+				if ((user.userType == 1 || user.userType == 2)) {
+					this.http.request({
+						url:'/sp-admin/app/AppUser/getAuth',
+						success:resp=>{
+							let res=resp.data.data;
+							this.user.name=res.name;
+							this.user.phone=res.phone;
+							this.user.face=res.face;
+							this.faceRegister=res.face==0;
+							if(res.face==1){
+								this.getOrderConfirm();
+							}
+						}
+					})
 					return;
 				} else if (user.userType == 3) {
 					this.getTbPurchaserAuth()
@@ -230,6 +240,7 @@
 				});
 			},
 			getTbPurchaserAuth() {
+				this.purchaser = false;
 				this.http.request({
 					url: '/level-two-server/app/TbPurchaser/info',
 					loading: 'false',
@@ -346,7 +357,7 @@
 					success: res => {
 						let list = res.data.data;
 						this.newsList = res.data.data;
-						this.noticeList = list.map(obj => obj.title);
+						this.noticeList = list?list.map(obj => obj.title):[];
 					}
 				});
 			},

pages/login/login.vue

@@ -26,7 +26,7 @@
 				<text class="a" @click="go('/pages/login/userAgreement?id=2')">《隐私政策》</text>
 			</view>
 			<button class="btn" @click="submit()">登录</button>
-			<button class="btn register" @click="go('/pages/login/chooseRole')">注册</button>
+			<!-- <button class="btn register" @click="go('/pages/login/chooseRole')">注册</button> -->
 		</view>
 	</view>
 </template>
@@ -69,7 +69,7 @@ export default {
 			this.common.to('/pages/login/faceLogin');
 		},
 		submit() {
-			uni.clearStorage();
+			uni.clearStorageSync();
 			let rule = [
 				{ name: 'phone', checkType: 'notnull', errorMsg: '手机号不能为空' },
 				{ name: 'phone', checkType: 'phoneno', errorMsg: '请输入正确的手机号' },

pages/market/group/gourpIndex.vue

@@ -0,0 +1,181 @@
+<template>
+	<view class="">
+		<view class="tab" style="height: 60px;">
+			<view style="display: flex;margin-top: 10px;">
+				<u--input placeholder="输入名字" border="surround" v-model="param.name" @clear="param.name='';list=[];getData()"
+					clearable>
+				</u--input>
+				<view class="reset_btn" @click="param.pageNo=1;list=[];getData()">搜索</view>
+			</view>
+		</view>
+		<view style="padding: 10px 20px;">
+			<u-divider :text="'总数：'+param.dataCount+'人'"></u-divider>
+			<view v-for="(item,index) in list">
+				<u-divider></u-divider>
+				<u-row customStyle="margin-bottom: 10px">
+					<u-col span="11">
+						<view style="font-size: 18px;">{{item.name}} ({{item.phone}})</view>
+					</u-col>
+					<u-col span="1" justify="end">
+						<view class="demo-layout bg-purple-light" style="float: right;" @click="makePhoneCall(item.phone)">
+							<u-icon name="phone-fill" size="23" style="margin-left: 5px;cursor: pointer;"
+								color="#07c5ff"></u-icon>
+						</view>
+					</u-col>
+				</u-row>
+
+			</view>
+
+		</view>
+		<view style="height: 60px;"></view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				param: {
+					pageNo: 1,
+					pageSize: 15,
+					name: '',
+					dataCount:0
+				},
+				list: [],
+				loadMore: false,
+			};
+		},
+		onLoad() {
+
+		},
+		onShow() {
+			this.getData()
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.param.pageNo = 1;
+			this.param.name = '';
+			setTimeout(() => {
+				this.getData();
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉加载
+		onReachBottom() {
+			if (this.loadMore) {
+				this.param.pageNo++;
+				this.getData();
+			}
+		},
+		methods: {
+			makePhoneCall(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				});
+			},
+			back() {
+				uni.navigateBack()
+			},
+			getData() {
+				this.http.request({
+					url: '/level-one-server/app/TbPeople/getGroupPeople',
+					data: this.param,
+					success: res => {
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						this.param.dataCount=res.data.dataCount;
+						if (res.data.data) {
+							this.list.push(...res.data.data);
+						}
+						if (this.param.pageNo == 1 && res.data.data && res.data.data.length == 0) {
+							this.list = []
+						}
+					}
+				});
+			},
+		},
+	}
+</script>
+<style lang="scss">
+	page {
+		background-color: #f5f5f5;
+	}
+
+	.tab {
+		.reset_btn {
+			line-height: 35px;
+			padding: 0 15px;
+			border: 1px solid #e2e2e2;
+			border-radius: 8px;
+			margin-left: 10px;
+			background: #e2e2e2
+		}
+	}
+
+	.my_top {
+		position: relative;
+		overflow: hidden;
+
+		image {
+			width: 100%;
+		}
+	}
+
+	.list {
+		position: relative;
+		padding: 0px 20px 10px 20px;
+		margin-top: -196px;
+
+		.user {
+			background-color: white;
+			padding: 20px;
+			border-radius: 8px;
+			color: $font-c;
+
+			.head {
+				float: left;
+				width: 55px;
+				height: 55px;
+			}
+
+			.con {
+				float: left;
+				padding-left: 15px;
+				width: 60%;
+
+				.nickName {
+					font-size: 17px;
+					font-weight: bold;
+				}
+
+				.tag {
+					background-color: #6799ad;
+					color: white;
+					float: left;
+					font-size: 13px;
+					padding: 2px 6px;
+					border-radius: 5px;
+					margin-top: 6px;
+				}
+			}
+
+			.edit {
+				float: right;
+				font-size: 20px;
+				margin-top: 17px;
+			}
+		}
+	}
+
+	.exit {
+		margin-top: 20px;
+		background-color: white;
+		color: #f44336;
+	}
+
+	.back {
+		position: fixed;
+		width: 100%;
+		bottom: 00px;
+	}
+</style>

pages/market/one/cooperative/order.vue

@@ -1,32 +1,57 @@
 <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 class="tab" style="height: 110px;">
+			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
+			<view style="display: flex;margin-top: 10px;">
+				<u--input placeholder="选择日期" border="surround"   v-model="param.declTime" clearable readonly>
+					<text  @click="show=!show" slot="suffix">选择</text>
+				</u--input>
+				<view class="reset_btn" @click="cleanDate">重置</view>
+			</view>
+			<u-calendar :show="show" minDate="2024-01-01" maxDate="2099-12-30" title="选择日期" @confirm="confirm"
+				@close="show=false"></u-calendar>
+		</view>
+		<view class="goodsList" >
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="title">{{ item.shopName }}
+				<view v-if="item.hzsConfirmStatus==0">
+					<view class="state">
+						<text class="icon">&#xe830;</text>
+						<text>未确认</text>
+					</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 v-else>
+					<view class="state" v-if="item.finishStatus == 1">
+						<text class="icon">&#xe830;</text>
+						<text>已结算</text>
+					</view>
+					<view class="state" v-else>
+						<text class="icon">&#xe830;</text>
+						<text>未结算</text>
 					</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 class="con">
+					<view class="productName omit" style="font-size: 16px;">{{ item.goodsNames }}</view>
+					<view class="desc omit">
+						<text>
+							{{ item.fieldName }}</text>
 					</view>
+					<view class="desc">
+						<text>重量 {{ item.sumGrossWt }}</text>
+						<text>| 车辆 {{ item.veNo }}</text>
+						<text v-if="item.orderCount"> | 订单 {{ item.orderCount }}</text>
+					</view>
+					
+					<view class="price"> ¥ {{ item.sumAmt }}</view>
 				</view>
 				<view class="clear"></view>
+				<view class="op">
+					<view class="date">申报时间 {{ item.declTime.substr(0,16) }}</view>
+					<template>
+						<view class="an detail_btn" @click.stop="detail(item)">边民订单</view>
+					</template>
+				</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>
@@ -38,31 +63,139 @@
 	export default {
 		data() {
 			return {
+				tab: [{
+						name: '全部',
+						finishStatus: '', //订单完成状态
+						resaleStatus: '' //订单转售状态
+					},
+					{
+						name: '未确认',
+						finishStatus: 0,
+						hzsConfirmStatus:0
+					},
+					{
+						name: '未结算',
+						finishStatus: 0,
+						hzsConfirmStatus:1
+					},
+					{
+						name: '已结算',
+						finishStatus: 1,
+						hzsConfirmStatus:1
+
+					},
+				],
+				show: false,
+				param: {
+					pageNo: 1,
+					pageSize: 10,
+					declTime: '',
+					sortType:25
+				},
 				list: [],
-				loadMore: false,
+				loadMore: true,
+				id: '',
+				flag: '',
 			};
 		},
 		onLoad() {
-			this.getData();
+			this.getData()
 		},
+		onShow() {},
 		methods: {
+			cleanDate() {
+				this.param.declTime = '';
+				this.param.pageNo = 1;
+				this.getData()
+			},
+			confirm(days) {
+				this.param.declTime = days[0];
+				this.show = false;
+				this.getData()
+			},
 			getData() {
 				this.http.request({
-					url: '/level-one-server/app/TbCollageOrders/getList',
+					url: '/level-one-server/app/HtTradeSettlement/getList',
 					loading: 'false',
 					data: this.param,
 					success: res => {
-						this.list.push(...res.data.data);
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						if (res.data.data) {
+							this.list.push(...res.data.data);
+						}
+						if (this.param.pageNo == 1 && res.data.data&&res.data.data.length==0) {
+							this.list = []
+						}
 					}
 				});
 			},
-			peopleOrders(id) {
-				uni.navigateTo({ url: '/pages/market/one/cooperative/peopleOrders?collageOrdersId=' + id });
+			// 点击tab切换
+			click(e) {
+				this.param.finishStatus = e.finishStatus;
+				this.getData();
+			},
+			detail(item) {
+				uni.navigateTo({
+					url: '/pages/market/one/cooperative/peopleOrders?mainId=' + item.id+'&goodsName='+item.goodsNames+'&veNo='+item.veNo+'&declTime='+item.declTime+'&sumGrossWt='+item.sumGrossWt
+				});
+			},
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.param.pageNo=1;
+			this.param.declTime='';
+			setTimeout(() => {
+				this.getData();
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉加载
+		onReachBottom() {
+			if (this.loadMore) {
+				this.param.pageNo++;
+				this.getData();
 			}
 		}
-	}
+	};
 </script>
 
 <style lang="scss">
+	page {
+		background-color: $pg;
+	}
 
-</style>
+	.state {
+		margin-right: -70px;
+	}
+	.goodsList{
+		.item{
+			.con{
+				width: 90%;
+				.desc{
+					uni-text{
+						padding-right: 5px;
+					}
+				}
+			}
+		}
+	}
+
+	.tab {
+		.reset_btn {
+			line-height: 35px;
+			padding: 0 15px;
+			border: 1px solid #e2e2e2;
+			border-radius: 8px;
+			margin-left: 10px;
+			background: #e2e2e2
+		}
+	}
+
+	.detail_btn {
+		border: 1px solid;
+		padding: 4px 7px;
+		border-radius: 6px;
+		background: #2f64c3;
+		color: #ffff;
+	}
+</style>

pages/market/one/cooperative/peopleOrders.vue

@@ -1,35 +1,69 @@
 <template>
 	<view>
-		<view class="tab">
+		<view class="tab" style="height: 180px;">
 			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
+			<view style="display: flex;margin-top: 10px;">
+				<u--input placeholder="输入名字" border="surround" v-model="param.buyUserName"
+					@clear="param.buyUserName='';getData()" clearable>
+				</u--input>
+				<view class="reset_btn" @click="getData">搜索</view>
+			</view>
+			<view style="border-radius: 10px;padding: 10px 20px;">
+				<view style="margin-top: 10px;">
+					<u-row customStyle="margin-bottom: 10px">
+						<u-col span="6">
+							<view>商品 {{settle.goodsName}}</view>
+						</u-col>
+						<u-col span="6">
+							<view class="demo-layout bg-purple">车牌号 {{settle.veNo}}</view>
+						</u-col>
+					</u-row>
+					<u-row customStyle="margin-bottom: 10px">
+						<u-col span="4">
+							<view>重量 {{settle.sumGrossWt}}</view>
+						</u-col>
+						<u-col span="8">
+							<view class="demo-layout bg-purple">申报时间 {{settle.declTime.substr(0,16)}}</view>
+						</u-col>
+					</u-row>
+				</view>
+			</view>
 		</view>
-		<view class="goodsList">
+
+		<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">
+				<view class="title">{{ item.buyUserName }}
+					<view class="state" v-if="item.peopleConfirmStatus == 0&&item.upStatus==1&&item.resaleStatus==0">
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>
 					</view>
-					<view class="state" v-if="item.peopleConfirmStatus == 1">
+					<view class="state" v-if="item.peopleConfirmStatus == 1&&item.upStatus==1&&item.resaleStatus==0">
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>已确认未上架</text>
+					</view>
+					<view class="state" v-if="item.peopleConfirmStatus == 1&&item.upStatus==2&&item.resaleStatus==0">
 						<text class="icon" style="color: #13ce66">&#xe830;</text>
-						<text>已确认</text>
+						<text>已上架未转售</text>
 					</view>
 					<view class="state" v-if="item.resaleStatus == 1">
 						<text class="icon" style="color: #13ce66">&#xe830;</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>
+						<text>重量 {{ item.totalWeight }} | 数量 {{item.buyQty}} </text>
+					</view>
+					<view class="desc omit">
+						<text>申报额度 ¥{{ item.buyAmount }}</text>
 					</view>
-					<view class="price">¥ {{ item.totalPrice }}</view>
+					<view class="price" v-if="item.upPrice">上架 ¥{{ item.upPrice }}</view>
+				</view>
+				<view class="op">
+					<template>
+						<a :href="'tel:'+item.phone" class="an down_btn">拨打电话</a>
+					</template>
 				</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>
@@ -38,114 +72,169 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			tab: [
-				{
-					name: '全部',
-					peopleConfirmStatus: '',	//边民确认状态
-					finishStatus: '',			//订单完成状态
-					resaleStatus: ''			//订单转售状态
-				},
-				{
-					name: '待确认',
-					peopleConfirmStatus: 0,
-					finishStatus: 0,
-					resaleStatus: 0
-				},
-				{
-					name: '申报中',
-					peopleConfirmStatus: 1,
-					finishStatus: 0,
-					resaleStatus: 0
-				},
-				{
-					name: '已完成',
-					peopleConfirmStatus: 1,
-					finishStatus: 1,
-					resaleStatus: 0
-				},
-				{
-					name: '已转售',
-					peopleConfirmStatus: 1,
-					finishStatus: 1,
-					resaleStatus: 1
-				}
-			],
-			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);
+	export default {
+		data() {
+			return {
+				tab: [{
+						name: '全部',
+						peopleConfirmStatus: '', //边民确认状态
+						upStatus: '', //订单完成状态
+						resaleStatus: '' //订单转售状态
+					},
+					{
+						name: '未确认',
+						peopleConfirmStatus: 0,
+						upStatus: 1,
+						resaleStatus: 0
+					},
+					{
+						name: '未上架',
+						peopleConfirmStatus: 1,
+						upStatus: 1,
+						resaleStatus: 0
+					},
+					{
+						name: '已上架',
+						peopleConfirmStatus: 1,
+						upStatus: 2,
+						resaleStatus: 0
+					},
+					{
+						name: '已转售',
+						peopleConfirmStatus: 1,
+						upStatus: 2,
+						resaleStatus: 1
 					}
-				}
-			});
+				],
+				param: {
+					pageNo: 1,
+					pageSize: 10,
+					buyUserName: '',
+					saleMainId: ''
+				},
+				settle: {},
+				user: this.getUser(),
+				list: [],
+				loadMore: false,
+			};
 		},
-		// 点击tab切换
-		click(e) {
-			console.log(e);
-			this.param.peopleConfirmStatus = e.appeopleConfirmStatusply;
-			this.param.finishStatus = e.finishStatus;
-			this.param.resaleStatus = e.resaleStatus;
-			this.refresh();
+		onLoad(e) {
+			if (e.mainId) {
+				this.param.saleMainId = e.mainId;
+				this.settle = e;
+				this.getData();
+			}
+
 		},
-		detail(item) {
-			uni.navigateTo({url: '/pages/market/one/leader/detail?id=' + item.id});
+		methods: {
+			makePhoneCall(item) {
+				uni.makePhoneCall({
+					phoneNumber: item.phone
+				});
+			},
+			getData() {
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/getListBySaleMainId',
+					loading: 'false',
+					data: this.param,
+					success: res => {
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						if (res.data.data) {
+							this.list.push(...res.data.data);
+						}
+						if (this.param.pageNo == 1 &&res.data.data&& res.data.data.length==0) {
+							this.list = []
+						}
+					}
+				});
+			},
+			// 点击tab切换
+			click(e) {
+				this.param.peopleConfirmStatus = e.peopleConfirmStatus;
+				this.param.upStatus = e.upStatus;
+				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();
+			},
+
 		},
-		// 刷新数据
-		refresh() {
-			this.loadMore = true;
+		//下拉刷新
+		onPullDownRefresh() {
 			this.param.pageNo = 1;
-			this.list = [];
-			this.getData();
+			this.param.buyUserName = '';
+			setTimeout(() => {
+				this.getData();
+				uni.stopPullDownRefresh();
+			}, 1000);
 		},
-
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		setTimeout(() => {
-			this.refresh();
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	//上拉加载
-	onReachBottom() {
-		if (this.loadMore) {
-			this.param.pageNo++;
-			this.getData();
+		//上拉加载
+		onReachBottom() {
+			if (this.loadMore) {
+				this.param.pageNo++;
+				this.getData();
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	background-color: $pg;
-}
-.state{
-	margin-right: -70px;
-}
-</style>
+	page {
+		background-color: $pg;
+	}
+
+	.state {
+		margin-right: -70px;
+	}
+
+	.tab {
+		.reset_btn {
+			line-height: 35px;
+			padding: 0 15px;
+			border: 1px solid #e2e2e2;
+			border-radius: 8px;
+			margin-left: 10px;
+			background: #e2e2e2
+		}
+	}
+
+	.goodsList {
+		.item {
+			.con {
+				width: 60%;
+
+				.desc {
+					uni-text {
+						padding-right: 5px;
+					}
+				}
+			}
+		}
+	}
+	.down_btn {
+		color: #f0f4f7;
+		width: 66px;
+		background-color: #3c9cff;
+		text-align: center;
+		border-radius: 10px;
+		font-size: 13px;
+		padding: 2px 4px;
+		text-decoration: none;
+	}
+	.call_phone {
+		position: relative;
+		right: 20px;
+		top: 5px;
+		display: flex;
+	}
+</style>

pages/market/one/leader/handle.vue

@@ -220,7 +220,9 @@ export default {
 
 		//人脸认证回调
 		uni.$on('face',res=>{
-			this.confirmFn()
+			if(res){
+				this.confirmFn()
+			}
 		})
 	},
 	methods: {

pages/market/one/leader/handleThree.vue

@@ -242,8 +242,9 @@ export default {
 
 		//人脸认证回调
 		uni.$on('face',res=>{
-			console.log('current:=====',+this.current)
-			this.confirmFn()
+			if(res){
+				this.confirmFn()
+			}
 		})
 	},
 	methods: {

pages/market/one/leader/noPayOrder.vue

@@ -55,16 +55,16 @@
 			return {
 				user: {},
 				tab: [
-					/* {
-						name: '全部',
-						peopleConfirmStatus: '', //边民确认状态
-						cooperEntrustStatus: '', //互助委托申报确认状态
-						applyConfirmStatus: '',  //进口申报确认状态
-						finishStatus: 0, //订单完成状态
-						upStatus: '', 	  //订单上架状态
-						resaleStatus: '', //订单转售状态
-						Sxb010Status: '', //扣款回执状态
-					}, */
+					// {
+					// 	name: '全部',
+					// 	peopleConfirmStatus: '', //边民确认状态
+					// 	cooperEntrustStatus: '', //互助委托申报确认状态
+					// 	applyConfirmStatus: '',  //进口申报确认状态
+					// 	finishStatus: 0, //订单完成状态
+					// 	upStatus: '', 	  //订单上架状态
+					// 	resaleStatus: '', //订单转售状态
+					// 	Sxb010Status: '', //扣款回执状态
+					// },
 					{
 						name: '未支付',
 						peopleConfirmStatus: 0,

pages/market/one/leader/noUpOrder.vue

@@ -55,16 +55,12 @@
 		data() {
 			return {
 				tab: [
-					/* {
+					{
 						name: '全部',
-						peopleConfirmStatus: '', //边民确认状态
-						cooperEntrustStatus: '', //互助委托申报确认状态
-						applyConfirmStatus: '',  //进口申报确认状态
-						finishStatus: 1, //订单完成状态
+						finishStatus: '', //订单完成状态
 						upStatus: '', 	  //订单上架状态(1=未上架，2=上架,3=已下架）
 						resaleStatus: '', //订单转售状态
-						Sxb010Status: '', //扣款回执状态
-					}, */
+					},
 					{
 						name: '未上架',
 						finishStatus: 1,

pages/market/two/list.vue

@@ -153,7 +153,7 @@ export default {
 		//刷新数据
 		refresh() {
 			this.loadMore = true;
-			this.param.pageNum = 1;
+			this.param.pageNo = 1;
 			this.list = [];
 			this.selects=[];
 			this.getData();
@@ -169,7 +169,7 @@ export default {
 	//上拉加载
 	onReachBottom() {
 		if (this.loadMore) {
-			this.param.pageNum++;
+			this.param.pageNo++;
 			this.getData();
 		}
 	}

pages/personal/group.vue

@@ -11,8 +11,8 @@
 					<u-divider></u-divider>
 				</view>
 			</u-radio-group>
-
 		</view>
+		<view style="height: 50px;"></view>
 		<view class="mfooter">
 			<view class="flex">
 				<view class="f">

pages/personal/myGroup.vue

@@ -0,0 +1,126 @@
+<template>
+	<view class="">
+		<view style="padding: 10px 20px;">
+			<u-divider text="互助组信息"></u-divider>
+			<view class="info" v-if="info">
+				<view>场所：{{info.tradeAreaName}}</view>
+				<view>名称：{{info.orgName}}</view>
+				<view>组长：{{info.leaderName}}</view>
+				<view style="display: flex;">
+					<view>
+						联系号码：{{info.leaderPhone}}
+					</view>
+					<u-icon @click.stop="makePhoneCall(info.leaderPhone)" v-if="info.leaderPhone" name="phone-fill"
+						size="25" style="margin-left:10px;cursor: pointer;" color="#07c5ff"></u-icon>
+				</view>
+			</view>
+			<view v-else style="display: flex;text-align: center;">
+				<view>
+					未查询到互助组信息(
+				</view>
+				<view style="color: blue;" text="" @click="joinGroup">加入互助组</view>)
+			</view>
+			<button class="btn back" @click="back()">返回</button>
+		</view>
+		<view style="height: 50px;"></view>
+
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				info: null,
+
+			};
+		},
+		onLoad() {
+
+		},
+		onShow() {
+			this.checkGroup()
+		},
+		methods: {
+			joinGroup() {
+				uni.navigateTo({
+					url:'/pages/personal/group'
+				})
+			},
+			back() {
+				uni.navigateBack()
+			},
+			makePhoneCall(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				});
+			},
+			getGroupList() {
+				this.http.request({
+					url: '/level-one-server/app/TbPeople/getGroupInfo',
+					success: res => {
+						this.info = res.data.data;
+					}
+				});
+			},
+			checkGroup() {
+				this.http.request({
+					url: '/sp-admin/app/AppUser/getAuth',
+					success: res => {
+						this.groupId = res.data.data.groupId;
+						this.getGroupList()
+					}
+				});
+			},
+			apply() {
+				let groupId = this.groupId;
+				if (!groupId) {
+					uni.showModal({
+						content: '请选择互助组',
+						showCancel: false
+					});
+					return;
+				}
+				let groupName = this.groupList.filter(obj => obj.id == groupId)[0].orgName;
+				let that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否申请加入【' + groupName + '】',
+					success(resp) {
+						if (resp.confirm) {
+							that.http.request({
+								url: '/level-one-server/app/TbPeople/joinGroup',
+								data: {
+									groupId,
+									groupId,
+									groupName: groupName
+								},
+								success: res => {
+									uni.showToast({
+										title: '提交成功'
+									})
+								}
+							});
+						}
+
+					}
+				})
+			}
+		},
+	}
+</script>
+<style lang="scss">
+	page {
+		background-color: #f5f5f5;
+	}
+
+	.info {
+		font-size: 18px;
+		line-height: 30px;
+	}
+
+	.back {
+		margin-top: 50px;
+	}
+</style>

pages/personal/personal.vue

@@ -26,8 +26,8 @@
 				<text class="icon" style="float: right">&#xe8f2;</text>
 			</view>
 			<view class="message _info" v-if="(user.userType == 1 || user.userType == 2) && user.face == 1">
-				<text class="icon">&#xe78d;</text>
-				<text>人脸认证成功</text>
+				<text class="icon">&#xe643;</text>
+				<text>人脸已认证<text style="color: blue;margin-left: 5px;"></text></text>
 			</view>
 			<!--用户信息-->
 			<view class="user">
@@ -36,148 +36,24 @@
 					<view class="nickName omit">{{user.name}}({{ user.phone }})</view>
 					<view class="tag" v-if="user.userType == 1">边民</view>
 					<view class="tag" v-if="user.userType == 2">组长</view>
-					<view class="tag" v-if="user.userType == 3">采购商</view>
+					<view class="tag" v-if="user.userType == 3">收购商</view>
 					<view class="tag" v-if="user.userType == 4">司机</view>
 					<view class="tag" v-if="user.userType == 5">商户</view>
 					<view class="tag" v-if="user.userType == 6">合作社</view>
-					<view class="tag" v-if="user.groupName" style="margin-left: 10px;">
-						{{user.groupName}}
-					</view>
-
 				</view>
-				<text class="icon edit" @click="go('/pages/personal/my')">&#xe8b7;</text>
 				<view class="clear"></view>
 			</view>
-			<!--边民菜单-->
-			<!-- <view class="menu" v-if="user.userType == 1">
-				<view class="msn" @click="go('/pages/market/one/leader/order')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
-							<view class="tit">我的订单</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
-			<!--边民菜单与组长菜单-->
-			<!-- <view class="menu" v-if="user.userType == 1 || user.userType == 2">
-				<view class="msn" @click="go('/pages/market/one/leader/cart')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe604;</view>
-							<view class="tit">购物车</view>
-						</view>
-					</view>
-				</view>
-				<view class="msn" @click="go('/pages/market/one/leader/order')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
-							<view class="tit">一级订单</view>
-						</view>
-					</view>
-				</view>
-				<view class="msn" @click="go('/pages/market/two/leader/order')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
-							<view class="tit">二级订单</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
-			<!--收购商-->
-			<!-- <view class="menu" v-if="user.userType == 3">
-				<view class="msn" @click="go('/pages/market/two/purchaser/order/cart')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe604;</view>
-							<view class="tit">购物车</view>
-						</view>
-					</view>
-				</view>
-				<view class="msn" @click="go('/pages/market/two/purchaser/buy/list')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
-							<view class="tit">采购需求</view>
-						</view>
-					</view>
-				</view>
-				<view class="msn" @click="go('/pages/market/two/purchaser/address/list')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe623;</view>
-							<view class="tit">地址管理</view>
-						</view>
-					</view>
-				</view>
-				<view class="msn" @click="go('/pages/market/two/purchaser/order/list')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
-							<view class="tit">我的订单</view>
-						</view>
-					</view>
-				</view>
-				<view class="msn" @click="go('/pages/authentication/purchaser/info')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #e0ffff; color: #00bfff">&#xe660;</view>
-							<view class="tit">我的认证</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
-			<!--外籍商户-->
-			<!-- <view class="menu" v-if="user.userType == 5">
-				<view class="msn" @click="go('/pages/market/one/merchant/goods/list')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
-							<view class="tit">商品管理</view>
-						</view>
-					</view>
-				</view>
-				<view class="msn" @click="go('/pages/market/one/merchant/order/list')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
-							<view class="tit">交易订单</view>
-						</view>
-					</view>
-				</view>
-				<view class="msn" @click="go('/pages/authentication/index')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #e0ffff; color: #00bfff">&#xe660;</view>
-							<view class="tit">我的认证</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
-			<!--合作社-->
-			<!-- <view class="menu" v-if="user.userType == 6">
-				<view class="msn" @click="go('/pages/market/one/cooperative/order')">
-					<view class="out">
-						<view class="int">
-							<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
-							<view class="tit">结算单</view>
-						</view>
-					</view>
-				</view>
-			</view> -->
 			<view class="cmd">
 				<view class="s_item" @click="go('/pages/personal/bankInfo')">
-					<text class="icon ic">&#xe662;</text>
+					<text class="icon ic">&#xe69a;</text>
 					<text class="title">银行卡</text>
 					<text class="icon arrow">&#xe8f2;</text>
 				</view>
-				<!-- <view class="s_item" @click="go('/pages/personal/commissionAgreement')">
-					<text class="icon ic">&#xe662;</text>
-					<text class="title">互助委托协议</text>
+				<view v-if="user.userType==1" class="s_item" @click="go('/pages/personal/myGroup')">
+					<text class="icon ic">&#xe686;</text>
+					<text class="title">我的互助组</text>
 					<text class="icon arrow">&#xe8f2;</text>
-				</view> -->
+				</view>
 				<view class="s_item" @click="go('/pages/login/userAgreement?id=1')">
 					<text class="icon ic">&#xe662;</text>
 					<text class="title">用户协议</text>
@@ -206,6 +82,7 @@
 			</view>
 			<button class="btn exit" @click="exitLogin()">退出登录</button>
 		</view>
+		<view class="version">版本号:{{version}}</view>
 	</view>
 </template>
 
@@ -213,7 +90,8 @@
 	export default {
 		data() {
 			return {
-				user: {}
+				user: {},
+				version: uni.getAppBaseInfo().appVersion
 			};
 		},
 		onLoad() {
@@ -221,35 +99,40 @@
 		},
 		onShow() {
 			this.user = this.getUser();
-			if (!this.hasAuth()) {
-				this.http.request({
-					url: '/sp-admin/app/AppUser/getAuth',
-					success: res => {
-						this.user.auth = res.data.data.auth;
-						this.user.face = res.data.data.face;
-						if (this.user.userType == 1) {
-							this.user.groupName = res.data.data.groupName;
-							this.user.groupId = res.data.data.groupId;
-							if (!this.user.groupName) {
-								this.$refs.uNotify.show({
-									top: 10,
-									type: 'error',
-									color: '#ffffff',
-									bgColor: '#ff5500',
-									message: '未加入互助组，请先加入互助组',
-									duration: 1000 * 20,
-									fontSize: 20,
-									safeAreaInsetTop: true
-								})
-								return;
-							}
+			this.http.request({
+				url: '/sp-admin/app/AppUser/getAuth',
+				success: res => {
+					this.user.auth = res.data.data.auth;
+					this.user.face = res.data.data.face;
+					if (this.user.userType == 1) {
+						this.user.groupName = res.data.data.groupName;
+						this.user.groupId = res.data.data.groupId;
+						this.user.leaderName = res.data.data.leaderName;
+						this.user.leaderPhone = res.data.data.leaderPhone;
+						if (!this.user.groupName) {
+							this.$refs.uNotify.show({
+								top: 10,
+								type: 'error',
+								color: '#ffffff',
+								bgColor: '#ff5500',
+								message: '未加入互助组，请先加入互助组',
+								duration: 1000 * 20,
+								fontSize: 20,
+								safeAreaInsetTop: true
+							})
+							return;
 						}
-						uni.setStorageSync('info', this.user);
 					}
-				});
-			}
+					uni.setStorageSync('info', this.user);
+				}
+			});
 		},
 		methods: {
+			makePhoneCall(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				});
+			},
 			order() {
 				if (!this.hasAuth()) {
 					uni.navigateTo({
@@ -357,7 +240,7 @@
 			.con {
 				float: left;
 				padding-left: 15px;
-				width: 60%;
+				width: 80%;
 
 				.nickName {
 					font-size: 16px;
@@ -388,4 +271,11 @@
 		background-color: white;
 		color: #f44336;
 	}
-</style>
+
+	.version {
+		margin-left: 35%;
+		position: fixed;
+		bottom: 70px;
+		color: #888484;
+	}
+</style>