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.3.15: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')
 	};

common/style.scss

@@ -155,7 +155,7 @@
 	border-radius: 8px;
 	overflow: hidden;
 	.s_item {
-		padding: 10px;
+		padding: 2px 5px;
 		background-color: white;
 		color: $font-c;
 		overflow: hidden;

js_sdk/wa-permission/permission.js

@@ -0,0 +1,272 @@
+/**
+ * 本模块封装了Android、iOS的应用权限判断、打开应用权限设置界面、以及位置系统服务是否开启
+ */
+
+var isIos
+// #ifdef APP-PLUS
+isIos = (plus.os.name == "iOS")
+// #endif
+
+// 判断推送权限是否开启
+function judgeIosPermissionPush() {
+	var result = false;
+	var UIApplication = plus.ios.import("UIApplication");
+	var app = UIApplication.sharedApplication();
+	var enabledTypes = 0;
+	if (app.currentUserNotificationSettings) {
+		var settings = app.currentUserNotificationSettings();
+		enabledTypes = settings.plusGetAttribute("types");
+		console.log("enabledTypes1:" + enabledTypes);
+		if (enabledTypes == 0) {
+			console.log("推送权限没有开启");
+		} else {
+			result = true;
+			console.log("已经开启推送功能!")
+		}
+		plus.ios.deleteObject(settings);
+	} else {
+		enabledTypes = app.enabledRemoteNotificationTypes();
+		if (enabledTypes == 0) {
+			console.log("推送权限没有开启!");
+		} else {
+			result = true;
+			console.log("已经开启推送功能!")
+		}
+		console.log("enabledTypes2:" + enabledTypes);
+	}
+	plus.ios.deleteObject(app);
+	plus.ios.deleteObject(UIApplication);
+	return result;
+}
+
+// 判断定位权限是否开启
+function judgeIosPermissionLocation() {
+	var result = false;
+	var cllocationManger = plus.ios.import("CLLocationManager");
+	var status = cllocationManger.authorizationStatus();
+	result = (status != 2)
+	console.log("定位权限开启：" + result);
+	// 以下代码判断了手机设备的定位是否关闭，推荐另行使用方法 checkSystemEnableLocation
+	/* var enable = cllocationManger.locationServicesEnabled();
+	var status = cllocationManger.authorizationStatus();
+	console.log("enable:" + enable);
+	console.log("status:" + status);
+	if (enable && status != 2) {
+		result = true;
+		console.log("手机定位服务已开启且已授予定位权限");
+	} else {
+		console.log("手机系统的定位没有打开或未给予定位权限");
+	} */
+	plus.ios.deleteObject(cllocationManger);
+	return result;
+}
+
+// 判断麦克风权限是否开启
+function judgeIosPermissionRecord() {
+	var result = false;
+	var avaudiosession = plus.ios.import("AVAudioSession");
+	var avaudio = avaudiosession.sharedInstance();
+	var permissionStatus = avaudio.recordPermission();
+	console.log("permissionStatus:" + permissionStatus);
+	if (permissionStatus == 1684369017 || permissionStatus == 1970168948) {
+		console.log("麦克风权限没有开启");
+	} else {
+		result = true;
+		console.log("麦克风权限已经开启");
+	}
+	plus.ios.deleteObject(avaudiosession);
+	return result;
+}
+
+// 判断相机权限是否开启
+function judgeIosPermissionCamera() {
+	var result = false;
+	var AVCaptureDevice = plus.ios.import("AVCaptureDevice");
+	var authStatus = AVCaptureDevice.authorizationStatusForMediaType('vide');
+	console.log("authStatus:" + authStatus);
+	if (authStatus == 3) {
+		result = true;
+		console.log("相机权限已经开启");
+	} else {
+		console.log("相机权限没有开启");
+	}
+	plus.ios.deleteObject(AVCaptureDevice);
+	return result;
+}
+
+// 判断相册权限是否开启
+function judgeIosPermissionPhotoLibrary() {
+	var result = false;
+	var PHPhotoLibrary = plus.ios.import("PHPhotoLibrary");
+	var authStatus = PHPhotoLibrary.authorizationStatus();
+	console.log("authStatus:" + authStatus);
+	if (authStatus == 3) {
+		result = true;
+		console.log("相册权限已经开启");
+	} else {
+		console.log("相册权限没有开启");
+	}
+	plus.ios.deleteObject(PHPhotoLibrary);
+	return result;
+}
+
+// 判断通讯录权限是否开启
+function judgeIosPermissionContact() {
+	var result = false;
+	var CNContactStore = plus.ios.import("CNContactStore");
+	var cnAuthStatus = CNContactStore.authorizationStatusForEntityType(0);
+	if (cnAuthStatus == 3) {
+		result = true;
+		console.log("通讯录权限已经开启");
+	} else {
+		console.log("通讯录权限没有开启");
+	}
+	plus.ios.deleteObject(CNContactStore);
+	return result;
+}
+
+// 判断日历权限是否开启
+function judgeIosPermissionCalendar() {
+	var result = false;
+	var EKEventStore = plus.ios.import("EKEventStore");
+	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(0);
+	if (ekAuthStatus == 3) {
+		result = true;
+		console.log("日历权限已经开启");
+	} else {
+		console.log("日历权限没有开启");
+	}
+	plus.ios.deleteObject(EKEventStore);
+	return result;
+}
+
+// 判断备忘录权限是否开启
+function judgeIosPermissionMemo() {
+	var result = false;
+	var EKEventStore = plus.ios.import("EKEventStore");
+	var ekAuthStatus = EKEventStore.authorizationStatusForEntityType(1);
+	if (ekAuthStatus == 3) {
+		result = true;
+		console.log("备忘录权限已经开启");
+	} else {
+		console.log("备忘录权限没有开启");
+	}
+	plus.ios.deleteObject(EKEventStore);
+	return result;
+}
+
+// Android权限查询
+function requestAndroidPermission(permissionID) {
+	return new Promise((resolve, reject) => {
+		plus.android.requestPermissions(
+			[permissionID], // 理论上支持多个权限同时查询，但实际上本函数封装只处理了一个权限的情况。有需要的可自行扩展封装
+			function(resultObj) {
+				var result = 0;
+				for (var i = 0; i < resultObj.granted.length; i++) {
+					var grantedPermission = resultObj.granted[i];
+					console.log('已获取的权限：' + grantedPermission);
+					result = 1
+				}
+				for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+					var deniedPresentPermission = resultObj.deniedPresent[i];
+					console.log('拒绝本次申请的权限：' + deniedPresentPermission);
+					result = 0
+				}
+				for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+					var deniedAlwaysPermission = resultObj.deniedAlways[i];
+					console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
+					result = -1
+				}
+				resolve(result);
+				// 若所需权限被拒绝,则打开APP设置界面,可以在APP设置界面打开相应权限
+				// if (result != 1) {
+				// gotoAppPermissionSetting()
+				// }
+			},
+			function(error) {
+				console.log('申请权限错误：' + error.code + " = " + error.message);
+				resolve({
+					code: error.code,
+					message: error.message
+				});
+			}
+		);
+	});
+}
+
+// 使用一个方法，根据参数判断权限
+function judgeIosPermission(permissionID) {
+	if (permissionID == "location") {
+		return judgeIosPermissionLocation()
+	} else if (permissionID == "camera") {
+		return judgeIosPermissionCamera()
+	} else if (permissionID == "photoLibrary") {
+		return judgeIosPermissionPhotoLibrary()
+	} else if (permissionID == "record") {
+		return judgeIosPermissionRecord()
+	} else if (permissionID == "push") {
+		return judgeIosPermissionPush()
+	} else if (permissionID == "contact") {
+		return judgeIosPermissionContact()
+	} else if (permissionID == "calendar") {
+		return judgeIosPermissionCalendar()
+	} else if (permissionID == "memo") {
+		return judgeIosPermissionMemo()
+	}
+	return false;
+}
+
+// 跳转到**应用**的权限页面
+function gotoAppPermissionSetting() {
+	if (isIos) {
+		var UIApplication = plus.ios.import("UIApplication");
+		var application2 = UIApplication.sharedApplication();
+		var NSURL2 = plus.ios.import("NSURL");
+		// var setting2 = NSURL2.URLWithString("prefs:root=LOCATION_SERVICES");		
+		var setting2 = NSURL2.URLWithString("app-settings:");
+		application2.openURL(setting2);
+
+		plus.ios.deleteObject(setting2);
+		plus.ios.deleteObject(NSURL2);
+		plus.ios.deleteObject(application2);
+	} else {
+		// console.log(plus.device.vendor);
+		var Intent = plus.android.importClass("android.content.Intent");
+		var Settings = plus.android.importClass("android.provider.Settings");
+		var Uri = plus.android.importClass("android.net.Uri");
+		var mainActivity = plus.android.runtimeMainActivity();
+		var intent = new Intent();
+		intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+		var uri = Uri.fromParts("package", mainActivity.getPackageName(), null);
+		intent.setData(uri);
+		mainActivity.startActivity(intent);
+	}
+}
+
+// 检查系统的设备服务是否开启
+// var checkSystemEnableLocation = async function () {
+function checkSystemEnableLocation() {
+	if (isIos) {
+		var result = false;
+		var cllocationManger = plus.ios.import("CLLocationManager");
+		var result = cllocationManger.locationServicesEnabled();
+		console.log("系统定位开启:" + result);
+		plus.ios.deleteObject(cllocationManger);
+		return result;
+	} else {
+		var context = plus.android.importClass("android.content.Context");
+		var locationManager = plus.android.importClass("android.location.LocationManager");
+		var main = plus.android.runtimeMainActivity();
+		var mainSvr = main.getSystemService(context.LOCATION_SERVICE);
+		var result = mainSvr.isProviderEnabled(locationManager.GPS_PROVIDER);
+		console.log("系统定位开启:" + result);
+		return result
+	}
+}
+
+module.exports = {
+	judgeIosPermission: judgeIosPermission,
+	requestAndroidPermission: requestAndroidPermission,
+	checkSystemEnableLocation: checkSystemEnableLocation,
+	gotoAppPermissionSetting: gotoAppPermissionSetting
+}

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特有相关 */
@@ -20,7 +20,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Payment" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -61,8 +63,8 @@
             "sdkConfigs" : {
                 "payment" : {
                     "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "",
+                        "__platform__" : [ "android" ],
+                        "appid" : "wx0daaef365288a0db",
                         "UniversalLinks" : ""
                     }
                 },

pages.json

@@ -66,7 +66,7 @@
 		{
 			"path": "pages/authentication/index",
 			"style": {
-				"navigationBarTitleText": "实人认证",
+				"navigationBarTitleText": "认证",
 				"enablePullDownRefresh": false
 			}
 
@@ -105,7 +105,8 @@
 				"enablePullDownRefresh": true
 			}
 
-		}, {
+		},
+		{
 			"path": "pages/news/detail",
 			"style": {
 				"navigationBarTitleText": "资讯详情",
@@ -114,6 +115,14 @@
 
 		},
 		{
+			"path": "pages/personal/group",
+			"style": {
+				"navigationBarTitleText": "申请入组",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
 			"path": "pages/market/two/purchaser/buy/list",
 			"style": {
 				"navigationBarTitleText": "采购需求管理",
@@ -138,7 +147,7 @@
 		}, {
 			"path": "pages/market/two/purchaser/buy/detail",
 			"style": {
-				"navigationBarTitleText": "收购详情",
+				"navigationBarTitleText": "详情",
 				"enablePullDownRefresh": false
 			}
 
@@ -181,21 +190,21 @@
 		}, {
 			"path": "pages/market/two/leader/confirm",
 			"style": {
-				"navigationBarTitleText": "接单确认",
+				"navigationBarTitleText": "订单确认",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
 			"path": "pages/market/two/leader/success",
 			"style": {
-				"navigationBarTitleText": "接单成功",
+				"navigationBarTitleText": "购买成功",
 				"enablePullDownRefresh": false
 			}
 
 		}, {
 			"path": "pages/market/one/leader/success",
 			"style": {
-				"navigationBarTitleText": "接单成功",
+				"navigationBarTitleText": "购买成功",
 				"enablePullDownRefresh": false
 			}
 
@@ -379,14 +388,14 @@
 				"enablePullDownRefresh": false
 			}
 
-		}, 
+		},
 		{
 			"path": "pages/market/one/enterprise/Order",
 			"style": {
 				"navigationBarTitleText": "销售订单",
 				"enablePullDownRefresh": false
 			}
-		
+
 		},
 		{
 			"path": "pages/market/one/enterprise/detail",
@@ -394,16 +403,16 @@
 				"navigationBarTitleText": "订单详情",
 				"enablePullDownRefresh": false
 			}
-		
-		}, 
+
+		},
 		{
 			"path": "pages/market/one/enterprise/person-list",
 			"style": {
 				"navigationBarTitleText": "购买边民列表",
 				"enablePullDownRefresh": false
 			}
-		
-		}, 
+
+		},
 		{
 			"path": "pages/market/one/merchant/order/vehice",
 			"style": {
@@ -426,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": "设置",
@@ -463,7 +490,15 @@
 		{
 			"path": "pages/market/one/cooperative/order",
 			"style": {
-				"navigationBarTitleText": "合作社订单列表",
+				"navigationBarTitleText": "结算单",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/market/one/cooperative/peopleOrders",
+			"style": {
+				"navigationBarTitleText": "边民订单",
 				"enablePullDownRefresh": false
 			}
 
@@ -471,7 +506,7 @@
 		{
 			"path": "pages/market/two/leader/resale",
 			"style": {
-				"navigationBarTitleText": "转售确认",
+				"navigationBarTitleText": "上架确认",
 				"enablePullDownRefresh": false
 			}
 
@@ -501,6 +536,14 @@
 
 		},
 		{
+			"path": "pages/market/two/purchaser/buy/buyWhole",
+			"style": {
+				"navigationBarTitleText": "整车购买",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
 			"path": "pages/market/one/cooperative/peopleOrders",
 			"style": {
 				"navigationBarTitleText": "合作社边民订单",
@@ -605,14 +648,31 @@
 		        "navigationBarTitleText": "商品上架",
 		        "enablePullDownRefresh": false
 		    }
-		
+
+		},
+		{
+			"path": "pages/market/one/leader/noPayOrder",
+			"style": {
+				"navigationBarTitleText": "边民交易订单",
+				"enablePullDownRefresh": true
+			}
+
+		},
+		{
+			"path": "pages/market/one/leader/noUpOrder",
+			"style": {
+				"navigationBarTitleText": "边民上架订单",
+				"enablePullDownRefresh": true
+			}
+
+
 		},
 		{
 		    "path" : "pages/wallet/wallet",
 		    "style" :{
 		        "navigationBarTitleText": "服务点数",
 		        "enablePullDownRefresh": true
-		    }		
+		    }
 		},
 		{
 			"path": "pages/wallet/topup/edit",
@@ -649,7 +709,7 @@
 				"enablePullDownRefresh": false
 			}
 		}
-    ],
+	],
 	"tabBar": {
 		"color": "#7A7E83",
 		"selectedColor": "#4581fb",

pages/authentication/index.vue

@@ -21,7 +21,7 @@
 		</view>
 		<view v-else>
 			<view class="icon">&#xe64e;</view>
-			<view class="title">你还未实名认证</view>
+			<view class="title">您还未进行认证</view>
 			<button class="btn" @click="go()">去认证</button>
 		</view>
 	</view>
@@ -43,7 +43,7 @@ export default {
 	methods: {
 		getData() {
 			this.http.request({
-				url: '/level-one-server/app/TbEnterprise/getInfo',
+				url: '/level-two-server/app/TbPurchaser/info',
 				success: res => {
 					if (res.data.data) {
 						this.item = res.data.data;

pages/authentication/info.vue

@@ -1,19 +1,23 @@
 <template>
 	<view class="cmain">
 		<view class="form_group">
-			<view class="lable re">企业名称</view>
-			<input type="text" placeholder="请输入" v-model="item.name" />
+			<view class="lable re">认证类型</view>
+			<u-radio-group v-model="item.type" style="margin-top: 15px;">
+				<u-radio :name=1 label="企业收购商"></u-radio>
+				<u-radio :name=2 label="个人收购商" style="margin-left: 20px;"></u-radio>
+			</u-radio-group>
+
 		</view>
 		<view class="form_group">
-			<view class="lable re">税号</view>
-			<input type="text" placeholder="请输入" v-model="item.dutyParagraph" />
+			<view class="lable re">（企业）名称</view>
+			<input type="text" placeholder="请输入" v-model="item.name" />
 		</view>
 		<view class="form_group">
-			<view class="lable re">法人姓名</view>
+			<view class="lable re">（法人）姓名</view>
 			<input type="text" placeholder="请输入" v-model="item.legalPerson" />
 		</view>
 		<view class="form_group">
-			<view class="lable re">法人身份证</view>
+			<view class="lable re">身份证</view>
 			<input type="text" placeholder="请输入" v-model="item.idCard" />
 		</view>
 		<view class="form_group">
@@ -21,71 +25,106 @@
 			<input type="text" placeholder="请输入" v-model="item.contact" />
 		</view>
 		<view class="form_group">
-			<view class="lable re">开户行</view>
-			<input type="text" placeholder="请输入" v-model="item.bankName" />
-		</view>
-		<view class="form_group">
 			<view class="lable re">银行账号</view>
 			<input type="text" placeholder="请输入" v-model="item.bankAccount" />
 		</view>
-		<view class="form_group">
+		<view class="form_group" v-if="item.type==1">
 			<view class="lable re">营业执照</view>
-			<card v-model="item.pic" pic="../../static/images/yyzz.png"></card>
+			<card v-model="item.businessLicense" pic="../../static/images/yyzz.png"></card>
 		</view>
 		<button class="btn" @click="save()" v-if="item.judgeStatus != 1">提交审核</button>
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			item: {}
-		};
-	},
-	onLoad(e) {
-		this.http.request({
-			url: '/level-one-server/app/TbEnterprise/getInfo',
-			success: res => {
-				if (res.data.data) {
-					this.item = res.data.data;
-					uni.setNavigationBarTitle({ title: '我的认证资料' });
-				} else {
-					uni.setNavigationBarTitle({ title: '填写认证资料' });
-				}
-			}
-		});
-	},
-	methods: {
-		save() {
-			let rule = [
-				{ name: 'name', checkType: 'notnull', errorMsg: '请输入企业名称' },
-				{ name: 'dutyParagraph', checkType: 'notnull', errorMsg: '请输入税号' },
-				{ name: 'legalPerson', checkType: 'notnull', errorMsg: '请法人姓名' }
-			];
-			if (!this.verify.check(this.item, rule)) {
-				uni.showModal({ content: this.verify.error, showCancel: false });
-				return false;
-			}
+	export default {
+		data() {
+			return {
+				item: {}
+			};
+		},
+		onLoad(e) {
 			this.http.request({
-				url: '/level-one-server/app/TbEnterprise/identification',
-				method: 'POST',
-				data: this.item,
+				url: '/level-two-server/app/TbPurchaser/info',
 				success: res => {
-					uni.showToast({ title: '提交成功' });
-					setTimeout(() => {
-						uni.$emit('authentication');
-						uni.navigateBack();
-					}, 1000);
+					if (res.data.data) {
+						this.item = res.data.data;
+						uni.setNavigationBarTitle({
+							title: '我的认证资料'
+						});
+					} else {
+						this.item.type = 1
+						uni.setNavigationBarTitle({
+							title: '填写认证资料'
+						});
+					}
 				}
 			});
+		},
+		methods: {
+			save() {
+				let rule = [{
+						name: 'name',
+						checkType: 'notnull',
+						errorMsg: '请填写(企业)名称'
+					},
+					{
+						name: 'legalPerson',
+						checkType: 'notnull',
+						errorMsg: '请填写(法人)姓名'
+					},
+					{
+						name: 'idCard',
+						checkType: 'notnull',
+						errorMsg: '请填写身份证'
+					},
+					{
+						name: 'contact',
+						checkType: 'notnull',
+						errorMsg: '请填写联系号码'
+					},
+					{
+						name: 'bankAccount',
+						checkType: 'notnull',
+						errorMsg: '请填写银行账号'
+					},
+
+				];
+				if (this.item.type == 1) {
+					rule.push({
+						name: 'businessLicense',
+						checkType: 'notnull',
+						errorMsg: '请上传营业执照'
+					} )
+				}
+				if (!this.verify.check(this.item, rule)) {
+					uni.showModal({
+						content: this.verify.error,
+						showCancel: false
+					});
+					return false;
+				}
+				this.http.request({
+					url: '/level-two-server/app/TbPurchaser/identification',
+					method: 'POST',
+					data: this.item,
+					success: res => {
+						uni.showToast({
+							title: '提交成功'
+						});
+						setTimeout(() => {
+							uni.$emit('authentication');
+							uni.navigateBack();
+						}, 1000);
+					}
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.btn {
-	margin-top: 25px;
-}
-</style>
+	.btn {
+		margin-top: 25px;
+	}
+</style>

pages/authentication/purchaser/info.vue

@@ -4,43 +4,35 @@
 			<view class="lable re">企业名称</view>
 			<input type="text" placeholder="请输入" v-model="item.name" :disabled="item.judgeStatus==1?true:false" />
 		</view>
-		<view class="form_group">
+	<!-- 	<view class="form_group">
 			<view class="lable re">税号</view>
 			<input type="text" placeholder="请输入" v-model="item.dutyParagraph" :disabled="item.judgeStatus==1?true:false"/>
-		</view>
+		</view> -->
 		<view class="form_group">
-			<view class="lable re">法人姓名</view>
-			<input type="text" placeholder="请输入" v-model="item.corporateName" :disabled="item.judgeStatus==1?true:false" />
+			<view class="lable re">姓名</view>
+			<input type="text" placeholder="请输入" v-model="item.legalPerson" :disabled="item.judgeStatus==1?true:false" />
 		</view>
 		<view class="form_group">
-			<view class="lable re">法人身份证号</view>
-			<input type="text" maxlength="18" placeholder="请输入" v-model="item.corporateIdCard" :disabled="item.judgeStatus==1?true:false" />
+			<view class="lable re">身份证号</view>
+			<input type="text" maxlength="18" placeholder="请输入" v-model="item.idCard" :disabled="item.judgeStatus==1?true:false" />
 		</view>
 		<view class="form_group">
 			<view class="lable re">联系号码</view>
-			<input type="text" maxlength="11" placeholder="请输入" v-model="item.linkPhone" :disabled="item.judgeStatus==1?true:false" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">银行编号</view>
-			<input type="text" placeholder="请输入" v-model="item.bankNo" :disabled="item.judgeStatus==1?true:false" />
-		</view>
-		<view class="form_group">
-			<view class="lable re">开户行</view>
-			<input type="text" placeholder="请输入" v-model="item.bankName" :disabled="item.judgeStatus==1?true:false" />
+			<input type="text" maxlength="11" placeholder="请输入" v-model="item.contact" :disabled="item.judgeStatus==1?true:false" />
 		</view>
 		<view class="form_group">
 			<view class="lable re">银行账号</view>
 			<input type="text" maxlength="16" placeholder="请输入" v-model="item.bankAccount" :disabled="item.judgeStatus==1?true:false" />
 		</view>
-		<view class="form_group">
-			<view class="lable re">企业地址</view>
+	<!-- 	<view class="form_group">
+			<view class="lable re">地址</view>
 			<input type="text" placeholder="请输入" v-model="item.address" :disabled="item.judgeStatus==1?true:false" />
-		</view>
+		</view> -->
 		<!-- <view class="form_group">
 			<view class="lable re">法人身份证</view>
 			<card v-model="item.pic" pic="../../../static/images/yyzz.png"></card>
 		</view> -->
-		<view class="form_group">
+		<view class="form_group" v-if="item.type==1">
 			<view class="lable re">营业执照</view>
 			<card v-model="item.businessLicense" pic="../../../static/images/yyzz.png"></card>
 		</view>
@@ -59,7 +51,7 @@ export default {
 	onLoad(e) {
 		this.param.appUserId = this.getUser().id
 		this.http.request({
-			url: '/level-two-server/app/TbPurchaser/auditStatus',
+			url: '/level-two-server/app/TbPurchaser/info',
 			data: this.param,
 			success: res => {
 				if (res.data.data) {

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

@@ -16,99 +16,22 @@
 			<!--通知公告-->
 			<view class="notice">
 				<u-notice-bar color="#848484" :text="noticeList" :step="true" direction="column" mode="link"
-					bgColor="white" speed="300" url="/pages/notice/index"></u-notice-bar>
+					bgColor="white" speed="300" url="/pages/news/list"></u-notice-bar>
 			</view>
 			<!--菜单-->
 			<view class="menu">
 				<view class="msn" v-for="(item, index) in menuList" :key="index" @click="navTo(item.path)">
 					<view class="out">
 						<view class="int">
-							<image :src="item.icon" mode="widthFix" style="max-width: 54px; max-height: 52px; object-fit: contain;"></image>
+							<image :src="item.icon" mode="widthFix"
+								style="max-width: 54px; max-height: 52px; object-fit: contain;"></image>
 							<view class="tit">{{ item.menuName }}</view>
 						</view>
 					</view>
 				</view>
 				<view class="clear"></view>
 			</view>
-			<view class="menu">
-				<!--边民菜单与组长菜单-->
-				<view class="menu" v-if="user.userType == 1 || user.userType == 2">
-					<view class="msn" @click="go('/pages/market/one/leader/order')">
-						<view class="out">
-							<view class="int">
-								<view class="icon ioc" style="background-color: #00aaff; color: #ffffff">&#xe6e9;</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: #00aaff; color: #ffffff">&#xe606;</view>
-								<view class="tit">二级市场交易</view>
-							</view>
-						</view>
-					</view>
-					<view class="msn" @click="go('/pages/market/order/order')">
-						<view class="out">
-							<view class="int">
-								<view class="icon ioc" style="background-color: #00aaff; color: #aaffff">&#xe612;</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/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 == 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>
-			
+
 			<!--最新资讯-->
 			<view class="news">
 				<view class="vlabel">
@@ -123,20 +46,19 @@
 					<view class="news_item" v-for="(item, index) in newsList" :key="index"
 						@click="go('/pages/news/detail?id=' + item.id)">
 						<image :src="item.cover" mode="aspectFill" class="img" v-if="item.cover"></image>
-						<image src="../../static/tp.jpg" mode="aspectFill" class="img" v-else></image>
 						<view class="con">
 							<view class="title ellip">{{ item.title }}</view>
 							<view class="source omit">
 								<text class="icon">&#xe639;</text>
 								<text>{{ item.readCount }}</text>
 							</view>
-							<view class="releaseTime">{{ util.forDate(item.releaseTime,'yyyy-MM-dd HH:mm') }}</view>
+							<view class="releaseTime">{{item.releaseTime}}</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		<u-popup :show="show" @close="close()" round="15" mode="center" :closeable="true" :closeOnClickOverlay="false"
+		<u-popup :show="show" @close="close()" round="15" mode="center" :closeable="false" :closeOnClickOverlay="false"
 			:customStyle="{ width: '90%' }">
 			<view class="ppopup">
 				<u-divider text="交易订单提醒" textSize="16"></u-divider>
@@ -157,8 +79,8 @@
 				<button class="btn" @click="confirm()">去处理</button>
 			</view>
 		</u-popup>
-		<u-popup :show="faceRegister" @close="close()" round="15" mode="center" :closeOnClickOverlay="false"
-			:customStyle="{ width: '90%' }">
+		<u-popup :show="faceRegister" @close="close()" round="15" mode="center" :closeable="false"
+			:closeOnClickOverlay="false" :customStyle="{ width: '90%' }">
 			<view class="reflush" @click="checkFace">刷新</view>
 			<view class="ppopup">
 				<u-divider text="人脸录入" textSize="16"></u-divider>
@@ -169,11 +91,41 @@
 					</view>
 
 					<view style="text-indent: 2rem;line-height: 60rpx;">
-						根据相关规定，边民进行互市贸易需要确保为本人实际操作，为了确保后续交易的合规合法话，需要您先录入人脸！</view>
+						根据相关规定，边民进行互市贸易需要确保为本人实际操作，为了确保后续交易的合规合法化，需要您先录入人脸！</view>
 				</view>
 				<button class="btn" @click="go('/pages/face/faceRegister')">马上录入</button>
 			</view>
 		</u-popup>
+		<u-popup :show="purchaser" round="15" mode="center" :closeable="false" :closeOnClickOverlay="false"
+			:customStyle="{ width: '90%' }">
+			<view class="reflush" @click="getTbPurchaserAuth()">刷新</view>
+			<view class="ppopup">
+				<u-divider text="提醒" textSize="16"></u-divider>
+				<view class="contents">
+					<view style="text-indent: 2rem;line-height: 60rpx;">
+						您的资料不完善或正在审核中，请前往补充或者等待管理员审核！</view>
+				</view>
+				<button class="btn" @click="go('/pages/authentication/index')">前往查看</button>
+			</view>
+		</u-popup>
+		<u-popup :show="update.visible" round="15" mode="center" :closeable="false" :closeOnClickOverlay="false"
+			:customStyle="{ width: '90%' }">
+			<view class="ppopup">
+				<u-divider text="有新版本更新!" textSize="16"></u-divider>
+				<view class="contents">
+					<view style="text-indent: 2rem;line-height: 60rpx;">
+						更新内容：{{update.content}}
+					</view>
+					<view style="text-indent: 2rem;line-height: 60rpx;">
+						当前版本号：{{update.currentVersion}}
+					</view>
+					<view style="text-indent: 2rem;line-height: 60rpx;">
+						新版本号：{{update.version}}
+					</view>
+				</view>
+				<button class="btn" @click="updateApk">立即更新</button>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -184,7 +136,7 @@
 				keyword: '',
 				bannerList: [],
 				newsList: [],
-				noticeList: ['天保物流APP上线了', '关于天保物流边民互市贸易开通注意事项'],
+				noticeList: [],
 				roleMenu: [],
 				menuList: [],
 				count: 0,
@@ -192,12 +144,19 @@
 				order: {},
 				user: {},
 				faceRegister: false,
-				cooper_entrust: 2
+				cooper_entrust: 2,
+				purchaser: false,
+				update: {
+					visible: false,
+					currentVersion: '',
+					version: '',
+					content: '',
+					url: ''
+				}
 			};
 		},
 		onLoad() {
-			let user = this.getUser();
-			this.user = user;
+			uni.hideLoading()
 			this.getBannerList();
 			this.getNewsList();
 			this.getMenu();
@@ -206,29 +165,95 @@
 			});
 		},
 		onShow() {
-			this.getOrderConfirm();
-			this.checkFace()
 			this.keyword = '';
+			let user = uni.getStorageSync('info');
+			this.user = user;
+			this.checkFace()
 			this.getRead();
+			this.getUpdateInfo();
 		},
 		methods: {
+			getUpdateInfo() {
+				let currentVersion = uni.getAppBaseInfo().appVersion;
+				this.update.visible=false;
+				this.http.request({
+					url: '/sp-admin/app/updateInfo',
+					loading: 'false',
+					success: resp => {
+						if(resp.data.data){
+							let version = resp.data.data.version;
+							this.update = {
+								visible: currentVersion != version,
+								currentVersion: currentVersion,
+								content: resp.data.data.content,
+								version: version,
+								url: resp.data.data.url
+							};
+						}
+					}
+				})
+			},
+			updateApk() {
+				plus.runtime.openURL(this.update.url)
+				return;
+				var dtask = plus.downloader.createDownload(
+					this.update.url, {
+						force: true
+					}, (d, status) => {
+						if (status == 200) {
+							console.log("下载成功安装: " + d.filename);
+							plus.runtime.install(d.filename)
+						} else {
+							plus.nativeUI.alert("安装失败，请稍候重试: " + status)
+						}
+					});
+				dtask.start();
+
+			},
 			close() {
 				this.show = false;
 			},
 			checkFace() {
-				let user = this.getUser();  
-				if ((user.userType == 1 || user.userType == 2) && user.face == 0) {
-					this.faceRegister = true;
+				let user = this.user;
+				this.faceRegister = false;
+				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()
 				}
-				this.faceRegister=false;
-				this.getOrderConfirm();
 			},
 			go(url) {
 				uni.navigateTo({
 					url: url
 				});
 			},
+			getTbPurchaserAuth() {
+				this.purchaser = false;
+				this.http.request({
+					url: '/level-two-server/app/TbPurchaser/info',
+					loading: 'false',
+					success: res => {
+						let resp = res.data;
+						if (!resp.data || resp.data.judgeStatus == 2) {
+							this.purchaser = true;
+							return;
+						}
+					}
+				})
+			},
 			//获取待处理的订单弹出
 			getOrderConfirm() {
 				let user = this.getUser();
@@ -239,13 +264,17 @@
 				this.http.request({
 					url: '/sp-admin/SpCfg/cooper',
 					method: 'POST',
-					data: { cfgName: 'cooper_entrust_cfg' },
+					data: {
+						cfgName: 'cooper_entrust_cfg'
+					},
 					success: res => {
 						this.cooper_entrust = JSON.parse(res.data.data).cooper_entrust
-						
+
 						this.http.request({
 							url: '/level-one-server/app/TbOrder/getNoConfirmOrder',
-							data: {cooper_entrust: this.cooper_entrust},
+							data: {
+								cooper_entrust: this.cooper_entrust
+							},
 							loading: 'false',
 							success: res => {
 								if (res.data.data) {
@@ -260,7 +289,8 @@
 			confirm() {
 				if (this.order.declareType == '1') {
 					uni.navigateTo({
-						url: '/pages/market/one/leader/handle?orderId=' + this.order.id
+						url: '/pages/market/one/leader/handle?orderId=' + this.order.id + '&peopleConfirmStatus=' +
+							this.order.peopleConfirmStatus + '&applyConfirmStatus=' + this.order.applyConfirmStatus
 					});
 				} else {
 					uni.navigateTo({
@@ -301,14 +331,16 @@
 				let menu = uni.getStorageSync('menu');
 				this.http.request({
 					url: '/sp-admin/app/AppMenu/getList',
-					data:{pageNo:1,pageSize:50},
+					data: {
+						pageNo: 1,
+						pageSize: 50
+					},
 					success: res => {
 						let data = res.data.data;
-						console.log(data);
 						menu.map((item2, index1) => {
 							data.map((item1, index) => {
 								if (parseInt(item1.id) == parseInt(item2)) {
-									item1.icon =item1.icon
+									item1.icon = item1.icon
 									this.menuList.push(item1);
 								}
 							});
@@ -324,7 +356,9 @@
 						limit: 3
 					},
 					success: res => {
+						let list = res.data.data;
 						this.newsList = res.data.data;
+						this.noticeList = list?list.map(obj => obj.title):[];
 					}
 				});
 			},
@@ -342,9 +376,16 @@
 			},
 			//点击轮播图
 			click(index) {
-				uni.navigateTo({
-					url: '/pages/news/detail?id=8'
-				});
+				let item = this.bannerList[index];
+				let url = item.url;
+				if (url) {
+					// #ifdef APP-PLUS
+					plus.runtime.openURL(url) //这里默认使用外部浏览器打开而不是内部web-view组件打开
+					// #endif
+					// #ifdef H5
+					window.open(url)
+					// #endif
+				}
 			},
 			message() {
 				uni.switchTab({
@@ -364,10 +405,10 @@
 					});
 					return;
 				}
+				console.log(url);
 				uni.navigateTo({
 					url: url,
 					fail: res => {
-						console.log('zx:' + JSON.stringify(res));
 						uni.showModal({
 							content: '功能还在开发中',
 							showCancel: false
@@ -460,6 +501,7 @@
 
 	.ppopup {
 		padding: 50rpx 30rpx;
+
 		.item {
 			padding: 5px 0px 5px 0px;
 			color: $font-c;
@@ -473,4 +515,4 @@
 			}
 		}
 	}
-</style>
+</style>

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,6 +69,7 @@ export default {
 			this.common.to('/pages/login/faceLogin');
 		},
 		submit() {
+			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/confirm/apply.vue

@@ -28,7 +28,7 @@
 				<view class="op">
 					<view class="date">确认时间 {{ item.applyConfirmTime }}</view>
 					<template v-if="item.peopleConfirmStatus == 1 && item.cooperEntrustStatus == 1 && item.applyConfirmStatus == 0">
-						<view class="an" style="color: #f44336"  @click.stop="applyOrder(item.id)">进口申报确认</view>
+						<!-- <view class="an" style="color: #f44336"  @click.stop="applyOrder(item.id)">进口申报确认</view> -->
 					</template>
 				</view>
 			</view>
@@ -49,8 +49,8 @@ export default {
 				peopleConfirmStatus: 1, //边民确认状态
 				cooperEntrustStatus: 1,//互助委托申报确认状态
 				//applyConfirmStatus: 0, //进口申报确认状态
-				finishStatus: 0, //订单完成状态
-				resaleStatus: 0, //订单转售状态
+				// finishStatus: 0, //订单完成状态
+				// resaleStatus: 0, //订单转售状态
 				confirmType: 'apply_confirm_time'
 			},
 			list: [],

pages/market/one/confirm/cooperation.vue

@@ -27,7 +27,7 @@
 				<view class="op">
 					<view class="date">{{ item.cooperEntrustTime }}</view>
 					<template v-if="item.peopleConfirmStatus == 1 && item.cooperEntrustStatus == 0">
-						<view class="an" style="color: #f44336" @click.stop="cooperOrder(item.id)">确认委托</view>
+						<!-- <view class="an" style="color: #f44336" @click.stop="cooperOrder(item.id)">确认委托</view> -->
 					</template>
 				</view>
 			</view>
@@ -48,8 +48,8 @@ export default {
 				// peopleConfirmStatus: 1, //边民确认状态
 				cooperEntrustStatus: 1,//互助委托申报确认状态
 				// applyConfirmStatus: 0, //进口申报确认状态
-				finishStatus: 0, //订单完成状态
-				resaleStatus: 0, //订单转售状态
+				// finishStatus: 0, //订单完成状态
+				// resaleStatus: 0, //订单转售状态
 				confirmType: 'cooper_entrust_time'
 			},
 			list: [],

pages/market/one/confirm/people.vue

@@ -28,7 +28,7 @@
 				<view class="op">
 					<view class="date">确认时间 {{ item.peopleConfirmTime }}</view>
 					<template v-if="item.peopleConfirmStatus == 0">
-						<view class="an" style="color: #f44336" @click.stop="confirmOrder(item.id)">边民确认</view>
+					<!-- 	<view class="an" style="color: #f44336" @click.stop="confirmOrder(item.id)">边民确认</view> -->
 					</template>
 				</view>
 			</view>
@@ -49,8 +49,8 @@ export default {
 				//peopleConfirmStatus: 0, //边民确认状态
 				// cooperEntrustStatus: 0, //互助委托申报确认状态
 				// applyConfirmStatus: 0, //进口申报确认状态
-				finishStatus: 0, //订单完成状态
-				resaleStatus: 0, //订单转售状态
+				// finishStatus: 0, //订单完成状态
+				// resaleStatus: 0, //订单转售状态
 				confirmType: 'people_confirm_time'
 			},
 			list: [],

pages/market/one/cooperative/order.vue

@@ -1,32 +1,56 @@
 <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 class="tab" style="height: 110px;">
+			<u-tabs :list="tab" @click="click" :lineHeight="5"></u-tabs>
+			<view style="display: flex;margin-top: 10px;z-index: 999;">
+				<view class="searchDate" @click="show=!show">{{param.declTime}}</view>
+				<!-- <u--input placeholder="选择日期" border="surround"   v-model="param.declTime" clearable readonly @click="show=!show"> -->
+				</u--input>
+				<view class="reset_btn" @click="cleanDate">重置</view>
+			</view>
+			<u-calendar :show="show" minDate="2024-08-15" :insert="false" title="选择日期" @confirm="confirm"></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 v-else>
+						<view class="state" v-if="item.finishStatus == 1">
+							<text class="icon">&#xe830;</text>
+							<text>已结算</text>
 						</view>
-						<view class="f">
-							<view class="tag">总金额</view>
-							<view class="v omit" style="color: coral;">￥{{ item.totalPrice }}</view>
+						<view class="state" v-else>
+							<text class="icon">&#xe830;</text>
+							<text>未结算</text>
 						</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 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 +62,157 @@
 	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() {
+				let params = JSON.parse(JSON.stringify(this.param));
+				if (params.declTime == '选择日期') {
+					params.declTime = '';
+				}
 				this.http.request({
-					url: '/level-one-server/app/TbCollageOrders/getList',
+					url: '/level-one-server/app/HtTradeSettlement/getList',
 					loading: 'false',
-					data: this.param,
+					data: params,
 					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;
+	}
+
+	.state {
+		margin-right: -70px;
+	}
+
+	.goodsList {
+		.item {
+			.con {
+				width: 90%;
+
+				.desc {
+					uni-text {
+						padding-right: 5px;
+					}
+				}
+			}
+		}
+	}
+
+	.tab {
+		.searchDate {
+			width: 60%;
+			font-size: 15px;
+			border-radius: 5px;
+			padding: 10px;
+			color: #545555;
+			background-color: #f6f6f6;
+			margin-left: 10px;
+		}
 
-</style>
+		.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

@@ -1,11 +1,20 @@
 <template>
 	<view>
 		<view class="cmain">
+			<view class="box order_detail" style="padding: 13px">
+				<u-steps :current="current">
+					<u-steps-item title="订单确认"></u-steps-item>
+					<u-steps-item title="进口申报确认"></u-steps-item>
+				</u-steps>
+			</view>
 			<view class="box order_detail">
-				<view>
+				<view v-if="current == 0">
 					<view class="item ctt">订单确认</view>
 				</view>
-				<view class="expand" :style="{ height: expand ? 'auto' : '300px' }">
+				<view v-if="current == 1">
+					<view class="item ctt">进口申报确认</view>
+				</view>
+				<view class="expand" v-if="current == 0" :style="{height:expand?'auto':'340px'}">
 					<view class="item">
 						<text class="label">订单编号</text>
 						<text class="desc omit">{{ item.tradeNo }}</text>
@@ -31,22 +40,29 @@
 						<text class="desc">{{ item.goodsNames }}</text>
 					</view>
 					<view class="item">
+						<text class="label">申报时间</text>
+						<text class="desc">{{ item.applyTime }}</text>
+					</view>
+					<view class="item">
 						<text class="label">申报金额</text>
 						<text class="desc">¥ {{ item.totalPrice }}</text>
 					</view>
 					<view class="item">
-						<text class="label">净重</text>
+						<text class="label">净重(kg)</text>
 						<text class="desc">{{ item.netWt }}</text>
 					</view>
 					<view class="item">
-						<text class="label">毛重</text>
+						<text class="label">毛重(kg)</text>
 						<text class="desc">{{ item.grossWt }}</text>
 					</view>
 					<view class="item">
 						<text class="label">申报数量</text>
 						<text class="desc">{{ item.buyQty }}</text>
 					</view>
-
+					<view class="item">
+						<text class="label">商户名称</text>
+						<text class="desc">{{ item.enterpriseName }}</text>
+					</view>
 					<view class="item">
 						<text class="label">交易地区名称</text>
 						<text class="desc">{{ item.tradeAreaName }}</text>
@@ -60,9 +76,103 @@
 						<text class="desc">{{ item.preNo }}</text>
 					</view>
 				</view>
+				<view class="expand" v-else :style="{height:expand?'auto':'300px'}">
+					<view class="item">
+						<text class="label">业务编号</text>
+						<text class="desc omit">{{ item2.platSeqNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">预录入编号</text>
+						<text class="desc">{{ item2.preNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">进境申报单编号</text>
+						<text class="desc">{{ item2.itrdclDeclareId }}</text>
+					</view>
+					<view class="item">
+						<text class="label">申报类型</text>
+						<text class="desc">
+							<text v-if=" item2.declareType==1">个人申报</text>
+							<text v-if=" item2.declareType==2">商铺或代理人</text>
+							<text v-if=" item2.declareType==3">合作社</text>
+							<text v-if=" item2.declareType==4">互助组</text>
+						</text>
+					</view>
+					<view class="item">
+						<text class="label">申报人姓名</text>
+						<text class="desc">{{ item2.declareName }}</text>
+					</view>
+					<view class="item">
+						<text class="label">申报人身份证号</text>
+						<text class="desc">{{ item2.ciphertextIdno }}</text>
+					</view>
+					<view class="item" v-if="item2.declareType == '2'">
+						<text class="label">商铺编码</text>
+						<text class="desc">{{ item2.shopNo }}</text>
+					</view>
+					<view class="item" v-if="item2.declareType == '2'">
+						<text class="label">商铺名称</text>
+						<text class="desc">{{ item2.shopName }}</text>
+					</view>
+
+					<view class="item">
+						<text class="label">商品名称</text>
+						<text class="desc">{{ item2.goodsNames }}</text>
+					</view>
+					<view class="item">
+						<text class="label">总金额</text>
+						<text class="desc">{{ item2.sumAmt }}</text>
+					</view>
+					<view class="item">
+						<text class="label">总毛重({{item.goodsUnit }})</text>
+						<text class="desc">{{ item2.sumGrossWt }}</text>
+					</view>
+					<view class="item">
+						<text class="label">总净重({{item.goodsUnit }})</text>
+						<text class="desc">{{ item2.sumNetWt }}</text>
+					</view>
+					<view class="item">
+						<text class="label">件数</text>
+						<text class="desc">{{ item2.packNo }}</text>
+					</view>
+					<view class="item">
+						<text class="label">车牌号</text>
+						<text class="desc">{{ item2.veNo }}</text>
+					</view>
+					<view class="item" v-if="item2.declareType == '3' || item2.declareType == '4'">
+						<text class="label" v-if="item2.declareType == '3'">互助组备案编号</text>
+						<text class="label" v-if="item2.declareType == '4'">合作社备案编号</text>
+						<text class="desc">¥ {{ item2.orgPutrecNo }}</text>
+					</view>
+					<view class="item" v-if="item2.declareType == '3' || item2.declareType == '4'">
+						<text class="label" v-if="item2.declareType == '3'">互助组名称</text>
+						<text class="label" v-if="item2.declareType == '4'">合作社名称</text>
+						<text class="desc">¥ {{ item2.orgName }}</text>
+					</view>
+					<view class="item" v-if="item2.declareType == '4'">
+						<text class="label">合作社信用代码</text>
+						<text class="desc">¥ {{ item2.orgScc }}</text>
+					</view>
+					<view class="item">
+						<text class="label">监管场所</text>
+						<text class="desc">{{ item2.fieldName }}</text>
+					</view>
+					<view class="item">
+						<text class="label">贸易国别</text>
+						<text class="desc">{{ item2.tradeCountry }}</text>
+					</view>
+					<view class="item">
+						<text class="label">企业编码</text>
+						<text class="desc">{{ item2.entCode }}</text>
+					</view>
+					<view class="item">
+						<text class="label">企业名称</text>
+						<text class="desc">{{ item2.entName }}</text>
+					</view>
+				</view>
 				<view class="more" @click="expand = !expand">
 					<text class="icon">&#xe649;</text>
-					<text>{{ expand ? '收起' : '更多信息' }}</text>
+					<text>{{expand?'收起':'更多信息'}}</text>
 				</view>
 			</view>
 		</view>
@@ -80,57 +190,120 @@
 export default {
 	data() {
 		return {
+			ip: this.http.ip,
+			imgList: [],
 			expand: false, //展开
+			current: 0,
 			item: {},
-			orderId: ''
+			item2: {},
+			orderId: '',
+			peopleConfirmStatus: '',
+			cooperEntrustStatus: '',
+			applyConfirmStatus: '',
+			cooper_entrust: 2
 		};
 	},
 	onLoad(e) {
-		if (e.orderId) {
+		if (e.orderId && e.peopleConfirmStatus && e.applyConfirmStatus) {
 			this.orderId = e.orderId;
-			this.getData();
+			this.peopleConfirmStatus = e.peopleConfirmStatus;
+			this.cooperEntrustStatus = e.cooperEntrustStatus;
+			this.applyConfirmStatus = e.applyConfirmStatus;
+			if(this.peopleConfirmStatus == 0) {
+				this.current = 0;
+				this.getData1();
+			} else if(this.peopleConfirmStatus == 1  && this.applyConfirmStatus == 0) {
+				this.current = 1;
+				this.getData2();
+			}
 		}
+
 		//人脸认证回调
-		uni.$on('face', res => {
-			this.confirmFn()
-		});
+		uni.$on('face',res=>{
+			if(res){
+				this.confirmFn()
+			}
+		})
 	},
 	methods: {
 		confirmFn(){
+			if (this.current == 0){
+				 this.http.request({
+					url: '/level-one-server/app/TbOrder/confirmOrder',
+					method: 'POST',
+					data: { orderId: this.item.id },
+					success: res => {
+						uni.showToast({ title: '订单确认成功' });
+						this.current = 1;
+						uni.setNavigationBarTitle({ title: '互助委托确认' });
+						this.getData2();
+					}
+				});
+			}
+			if (this.current == 1){
+				 this.http.request({
+				 	url: '/level-one-server/app/TbOrder/applyOrder',
+				 	method: 'POST',
+				 	data: { orderId: this.orderId },
+				 	success: res => {
+				 		uni.showToast({ title: '进口申报确认成功' });
+				 		setTimeout(() => {
+				 			uni.switchTab({ url: '/pages/index/index' });
+				 		}, 1000);
+				 	}
+				 });
+			}
+		},
+		getData1() {
 			this.http.request({
-				url: '/level-one-server/app/TbOrder/confirmOrder',
-				method: 'POST',
-				data: { orderId: this.item.id },
+				url: '/level-one-server/app/TbOrder/orderDetail',
+				data: { orderId: this.orderId },
 				success: res => {
-					uni.showToast({ title: '订单确认成功' });
-					setTimeout(() => {
-						uni.switchTab({ url: '/pages/index/index' });
-					}, 1000);
+					this.item = res.data.data;
 				}
 			});
 		},
-		getData() {
+		getData2() {
 			this.http.request({
-				url: '/level-one-server/app/TbOrder/orderDetail',
+				url: '/level-one-server/app/TbImportOrder/importOrderDetail',
 				data: { orderId: this.orderId },
 				success: res => {
-					this.item = res.data.data;
+					this.item2 = res.data.data;
+					JSON.parse(this.item2.cooperEntrustImg).map(item => this.imgList.push(item))
+					console.log("-----5-----"+this.imgList)
 				}
 			});
 		},
 		ok() {
-			uni.showModal({
-				title: '提示',
-				content: '我已核对信息无误',
-				success: res => {
-					if (res.confirm) {
-						this.confirmFn();
-						//return;
-						//跳转到人脸认证
-						uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
+			//根据不同的步骤提交不同的url或者状态参数
+			if (this.current == 0) {
+				uni.showModal({
+					title: '提示',
+					content: '我已核对信息无误',
+					success: res => {
+						if (res.confirm) {
+							//return;
+							//跳转到人脸认证
+							uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
+						}
 					}
-				}
-			});
+				});
+			}
+			if (this.current == 1) {
+				//进口确认不用刷脸
+				uni.showModal({
+					title: '提示',
+					content: '我已核对信息无误',
+					success: res => {
+						if (res.confirm) {
+							//return;
+							//跳转到人脸认证
+							this.confirmFn();
+							//uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
+						}
+					}
+				});
+			}
 		}
 	},
 	destroyed() {
@@ -143,7 +316,7 @@ export default {
 page {
 	background-color: $pg;
 }
-.cmain {
+.cmain{
 	padding-bottom: 100px;
 }
 .expand {

pages/market/one/leader/handleThree.vue

@@ -53,11 +53,12 @@
 						<text class="desc">¥ {{ item.totalPrice }}</text>
 					</view>
 					<view class="item">
-						<text class="label">净重(kg)</text>
+						<text class="label">净重({{item.goodsUnit }})</text>
 						<text class="desc">{{ item.netWt }}</text>
 					</view>
+				
 					<view class="item">
-						<text class="label">毛重(kg)</text>
+						<text class="label">毛重({{item.goodsUnit }})</text>
 						<text class="desc">{{ item.grossWt }}</text>
 					</view>
 					<view class="item">
@@ -91,12 +92,17 @@
 						<text class="desc">{{ item2.preNo }}</text>
 					</view>
 					<view class="item">
-						<text class="label">进境申报单编号</text>
+						<text class="label">报单编号</text>
 						<text class="desc">{{ item2.itrdclDeclareId }}</text>
 					</view>
 					<view class="item">
-						<text class="label">申报人类型</text>
-						<text class="desc">{{ item2.declareType }}</text>
+						<text class="label">申报类型</text>
+						<text class="desc">
+							<text v-if=" item2.declareType==1">个人申报</text>
+							<text v-if=" item2.declareType==2">商铺或代理人</text>
+							<text v-if=" item2.declareType==3">合作社</text>
+							<text v-if=" item2.declareType==4">互助组</text>
+						</text>
 					</view>
 					<view class="item">
 						<text class="label">申报人姓名</text>
@@ -129,11 +135,11 @@
 						<text class="desc">{{ item2.sumAmt }}</text>
 					</view>
 					<view class="item">
-						<text class="label">总毛重</text>
+						<text class="label">总毛重({{item.goodsUnit }})</text>
 						<text class="desc">{{ item2.sumGrossWt }}</text>
 					</view>
 					<view class="item">
-						<text class="label">总净重</text>
+						<text class="label">总净重({{item.goodsUnit }})</text>
 						<text class="desc">{{ item2.sumNetWt }}</text>
 					</view>
 					<view class="item">
@@ -148,10 +154,6 @@
 						<text class="label">车牌号</text>
 						<text class="desc">{{ item2.veNo }}</text>
 					</view>
-					<view class="item">
-						<text class="label">运输方式</text>
-						<text class="desc">{{ item2.trafMode }}</text>
-					</view>
 					<view class="item" v-if="item2.declareType == '3' || item2.declareType == '4'">
 						<text class="label" v-if="item2.declareType == '3'">互助组备案编号</text>
 						<text class="label" v-if="item2.declareType == '4'">合作社备案编号</text>
@@ -171,10 +173,6 @@
 						<text class="desc">{{ item2.fieldName }}</text>
 					</view>
 					<view class="item">
-						<text class="label">贸易国别</text>
-						<text class="desc">{{ item2.tradeCountry }}</text>
-					</view>
-					<view class="item">
 						<text class="label">企业编码</text>
 						<text class="desc">{{ item2.entCode }}</text>
 					</view>
@@ -185,7 +183,7 @@
 					<view class="item">
 						<view class="lable">互助委托协议</view>
 						<view v-for="(url,index) in imgList">
-							<image :src="ip + url" style="margin-top: 20px; width: 200px;"></image>
+							<image :src="url" style="margin-top: 20px; width: 200px;"></image>
 						</view>
 					</view>
 				</view>
@@ -244,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

@@ -0,0 +1,226 @@
+<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">
+				<view class="title">{{ item.buyUserName }}
+					<view class="state" v-if="item.finishStatus == 0 && item.peopleConfirmStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>未支付</text>
+					</view>
+					<view class="state" v-else-if="item.finishStatus == 0 && item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>未申报</text>
+					</view>
+					<!-- <view class="state" v-else-if="item.finishStatus == 0 && item.Sxb010Status == 1">
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>扣款成功</text>
+					</view> -->
+					<view class="state" v-else-if="item.finishStatus == 0 && item.Sxb010Status == 2">
+						<text class="icon">&#xe830;</text>
+						<text>扣款失败</text>
+					</view>
+				</view>
+				<view class="title">{{ item.phone }}</view>
+				<view>
+					<view style="font-size: 15px;color: #a0a2a6;">
+						订单 {{ item.tradeNo }}
+					</view>
+					<view style="padding-top: 4px;font-size: 15px;color: #a0a2a6;">
+						{{ item.goodsNames }} {{ item.totalWeight }}{{ item.goodsUnit }}
+					</view>
+					<view style="padding-top: 6px;font-size: 17px;color: #ff5722;font-weight: bold;">¥ {{ item.totalPrice }}</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">{{ item.createTime }}</view>
+					<template v-if="item.phone && item.Sxb010Status != 1">
+						<!-- <view class="state" style="color: #3c9cff;" @click="callNumber(item.phone)">拨打电话</view> -->
+						<a :href="'tel:'+item.phone" class="an down_btn">拨打电话</a>
+					</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>
+		</view>
+	</view>
+</template>
+
+<script>
+	import permision from "@/js_sdk/wa-permission/permission.js"
+	export default {
+		data() {
+			return {
+				user: {},
+				tab: [
+					// {
+					// 	name: '全部',
+					// 	peopleConfirmStatus: '', //边民确认状态
+					// 	cooperEntrustStatus: '', //互助委托申报确认状态
+					// 	applyConfirmStatus: '',  //进口申报确认状态
+					// 	finishStatus: 0, //订单完成状态
+					// 	upStatus: '', 	  //订单上架状态
+					// 	resaleStatus: '', //订单转售状态
+					// 	Sxb010Status: '', //扣款回执状态
+					// },
+					{
+						name: '未支付',
+						peopleConfirmStatus: 0,
+						finishStatus: 0,
+					},
+					{
+						name: '未申报',
+						peopleConfirmStatus: 1,
+						applyConfirmStatus: 0,
+						finishStatus: 0,
+					},
+					{
+						name: '扣款失败',
+						Sxb010Status: 2,
+						finishStatus: 0,
+					},
+					{
+						name: '扣款成功',
+						Sxb010Status: 1,
+						finishStatus: 0,
+					},
+				],
+				param: {
+					pageNo: 1,
+					pageSize: 10,
+					finishStatus: 0,
+					peopleConfirmStatus: 0,
+				},
+				list: [],
+				loadMore: true,
+				id: '',
+				flag: '',
+			};
+		},
+		onShow() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/getPeopleOrderList',
+					loading: 'false',
+					data: this.param,
+					success: res => {
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						if (res.data.data) {
+							this.list = res.data.data;
+						}
+					}
+				});
+			},
+			// 点击tab切换
+			click(e) {
+				console.log(e);
+				this.param.peopleConfirmStatus = e.peopleConfirmStatus;
+				this.param.cooperEntrustStatus = e.cooperEntrustStatus;
+				this.param.applyConfirmStatus = e.applyConfirmStatus;
+				this.param.finishStatus = e.finishStatus;
+				this.param.resaleStatus = e.resaleStatus;
+				this.param.upStatus = e.upStatus;
+				this.param.Sxb010Status = e.Sxb010Status;
+				this.refresh();
+			},
+			// 刷新数据
+			refresh() {
+				this.loadMore = true;
+				this.param.pageNo = 1;
+				this.list = [];
+				this.getData();
+			},
+			callNumber(phone) {
+				permision.gotoAppPermissionSetting();
+				uni.makePhoneCall({
+					phoneNumber: phone,
+					success: function(ress) {
+						console.log("拨打电话成功！",JSON.stringify(ress))
+					},
+					fail: function() {
+						console.log("拨打电话失败！")
+					}
+				})
+				/* plus.android.requestPermissions(
+					["android.permission.CALL_PHONE"],
+					function(resultObj) {
+						var result = 0;
+						for (var i = 0; i < resultObj.granted.length; i++) {
+							var grantedPermission = resultObj.granted[i];
+							console.log('已获取的权限：' + grantedPermission);
+							result = 1
+						}
+						for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+							var deniedPresentPermission = resultObj.deniedPresent[i];
+							console.log('拒绝本次申请的权限：' + deniedPresentPermission);
+							result = 0
+						}
+						for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+							var deniedAlwaysPermission = resultObj.deniedAlways[i];
+							console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
+							result = -1
+						}
+						console.log(result);
+						if(result == 1){
+							uni.makePhoneCall({
+								 phoneNumber: "10086",//电话号码
+								success(ress) {
+									console.log("拨打电话成功",JSON.stringify(ress))
+								},
+								fail(err) {
+									console.log("拨打电话失败",'err')
+								}
+							});
+						}else{
+							uni.showToast({
+								title:"请开启拨号权限",
+								icon:"error",
+							})
+						}
+					},
+					function(error) {
+						console.log('申请权限错误：' + error.code + " = " + error.message);
+					}
+				); */
+			},
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			setTimeout(() => {
+				this.refresh();
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉加载
+		onReachBottom() {
+			if (this.loadMore) {
+				this.param.pageNo++;
+				this.getData();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: $pg;
+	}
+	.down_btn {
+		color: #f0f4f7;
+		width: 66px;
+		background-color: #3c9cff;
+		text-align: center;
+		border-radius: 10px;
+		font-size: 13px;
+		padding: 2px 4px;
+		text-decoration: none;
+	}
+	.state {
+		margin-right: -70px;
+	}
+</style>

pages/market/one/leader/noUpOrder.vue

@@ -0,0 +1,217 @@
+<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">
+				<view class="title">{{ item.buyUserName }}
+					<view class="state" v-if="item.finishStatus == 1 && item.upStatus == 1">
+						<text class="icon">&#xe830;</text>
+						<text>未上架</text>
+					</view>
+					<view class="state" v-else-if="item.finishStatus == 1 && item.upStatus == 3">
+						<text class="icon">&#xe830;</text>
+						<text>已下架</text>
+					</view>
+					<view class="state" v-else-if="item.finishStatus == 1 && item.upStatus == 2 && item.resaleStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>未转售</text>
+					</view>
+					<view class="state" v-else>
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>已完成</text>
+					</view>
+				</view>
+				<view class="title">{{ item.phone }}</view>
+				<view>
+					<view style="font-size: 15px;color: #a0a2a6;">
+						订单 {{ item.tradeNo }}
+					</view>
+					<view style="padding-top: 4px;font-size: 15px;color: #a0a2a6;">
+						{{ item.goodsNames }} {{ item.totalWeight }}{{ item.goodsUnit }}
+					</view>
+					<view style="padding-top: 6px;font-size: 17px;color: #ff5722;font-weight: bold;">¥ {{ item.totalPrice }}</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">{{ item.createTime }}</view>
+					<template v-if="item.phone">
+						<!-- <view class="state" style="color: #3c9cff;" @click="callNumber(item.phone)">拨打电话</view> -->
+						<a :href="'tel:'+item.phone" class="an down_btn">拨打电话</a>
+					</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>
+		</view>
+	</view>
+</template>
+
+<script>
+	import permision from "@/js_sdk/wa-permission/permission.js"
+	export default {
+		data() {
+			return {
+				tab: [
+					{
+						name: '全部',
+						finishStatus: '', //订单完成状态
+						upStatus: '', 	  //订单上架状态(1=未上架，2=上架,3=已下架）
+						resaleStatus: '', //订单转售状态
+					},
+					{
+						name: '未上架',
+						finishStatus: 1,
+						upStatus: 1,
+					},
+					{
+						name: '已下架',
+						finishStatus: 1,
+						upStatus: 3,
+					},
+					{
+						name: '未转售',
+						finishStatus: 1,
+						upStatus: 2,
+						resaleStatus: 0
+					}
+				],
+				param: {
+					pageNo: 1,
+					pageSize: 10,
+					finishStatus: 1,
+					upStatus: 1,
+				},
+				list: [],
+				loadMore: true,
+				id: '',
+				flag: '',
+			};
+		},
+		onShow() {
+			this.getData();
+		},
+		methods: {
+			getData() {
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/getPeopleOrderList',
+					loading: 'false',
+					data: this.param,
+					success: res => {
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						if (res.data.data) {
+							this.list = res.data.data;
+						}
+					}
+				});
+			},
+			// 点击tab切换
+			click(e) {
+				console.log(e);
+				this.param.peopleConfirmStatus = e.peopleConfirmStatus;
+				this.param.cooperEntrustStatus = e.cooperEntrustStatus;
+				this.param.applyConfirmStatus = e.applyConfirmStatus;
+				this.param.finishStatus = e.finishStatus;
+				this.param.resaleStatus = e.resaleStatus;
+				this.param.upStatus = e.upStatus;
+				this.param.Sxb010Status = e.Sxb010Status;
+				this.refresh();
+			},
+			// 刷新数据
+			refresh() {
+				this.loadMore = true;
+				this.param.pageNo = 1;
+				this.list = [];
+				this.getData();
+			},
+			callNumber(phone) {
+				permision.gotoAppPermissionSetting();
+				uni.makePhoneCall({
+					phoneNumber: phone,
+					success: function(ress) {
+						console.log("拨打电话成功！",JSON.stringify(ress))
+					},
+					fail: function() {
+						console.log("拨打电话失败！")
+					}
+				})
+				/* plus.android.requestPermissions(
+					["android.permission.CALL_PHONE"],
+					function(resultObj) {
+						var result = 0;
+						for (var i = 0; i < resultObj.granted.length; i++) {
+							var grantedPermission = resultObj.granted[i];
+							console.log('已获取的权限：' + grantedPermission);
+							result = 1
+						}
+						for (var i = 0; i < resultObj.deniedPresent.length; i++) {
+							var deniedPresentPermission = resultObj.deniedPresent[i];
+							console.log('拒绝本次申请的权限：' + deniedPresentPermission);
+							result = 0
+						}
+						for (var i = 0; i < resultObj.deniedAlways.length; i++) {
+							var deniedAlwaysPermission = resultObj.deniedAlways[i];
+							console.log('永久拒绝申请的权限：' + deniedAlwaysPermission);
+							result = -1
+						}
+						console.log(result);
+						if(result == 1){
+							uni.makePhoneCall({
+								 phoneNumber: "10086",//电话号码
+								success(ress) {
+									console.log("拨打电话成功",JSON.stringify(ress))
+								},
+								fail(err) {
+									console.log("拨打电话失败",'err')
+								}
+							});
+						}else{
+							uni.showToast({
+								title:"请开启拨号权限",
+								icon:"error",
+							})
+						}
+					},
+					function(error) {
+						console.log('申请权限错误：' + error.code + " = " + error.message);
+					}
+				); */
+			},
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			setTimeout(() => {
+				this.refresh();
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉加载
+		onReachBottom() {
+			if (this.loadMore) {
+				this.param.pageNo++;
+				this.getData();
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: $pg;
+	}
+	.down_btn {
+		color: #f0f4f7;
+		width: 66px;
+		background-color: #3c9cff;
+		text-align: center;
+		border-radius: 10px;
+		font-size: 14px;
+		padding: 3px 5px;
+		text-decoration: none;
+	}
+	.state {
+		margin-right: -70px;
+	}
+</style>

pages/market/one/leader/order.vue

@@ -30,14 +30,14 @@
 					</view> -->
 				</view>
 
-				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
+				<!-- <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 }}{{ item.goodsUnit }}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
-					<view class="price">¥ {{ item.totalPrice }}</view>
+					<view class="price">申报金额 ¥ {{ item.totalPrice }}</view>
 				</view>
 				<view class="clear"></view>
 				<view class="op">

pages/market/order/order.vue

@@ -27,7 +27,10 @@
 						<text>重量 {{ item.totalWeight }}{{ item.goodsUnit }}</text>
 						<text>{{ item.veNo }}</text>
 					</view>
-					<view class="price">¥ {{ item.totalPrice }}</view>
+					<view class="price">
+						<span>申报金额 ¥ {{ item.totalPrice }}</span>
+						<span v-if="item.upPrice&&item.upStatus==2" style="margin-left: 16px;">上架金额 ¥ {{ item.upPrice }}</span>
+					</view>
 				</view>
 				<view class="clear"></view>
 				<view class="op">
@@ -234,7 +237,9 @@
 	page {
 		background-color: $pg;
 	}
-
+.goodsList .item .con {
+    width: 97%;
+}
 	.state {
 		margin-right: -70px;
 	}

pages/market/two/detail.vue

@@ -1,30 +1,50 @@
 <template>
 	<view>
 		<view class="product_detail">
-			<image src="../../../static/news.jpg" mode="widthFix" class="pic"></image>
+			<!-- <image src="../../../static/news.jpg" mode="widthFix" class="pic"></image> -->
 			<view class="box">
 				<view class="title">{{ item.goodsName }}</view>
 				<view class="clear"></view>
 				<u-divider text="规格参数"></u-divider>
 				<view class="item">
-					<text class="desc">商品价格：</text>
-					<text>{{ item.resalePrice }}</text>
+					<text class="desc">上架金额：</text>
+					<text>￥ {{ item.resalePrice }}</text>
 					<view class="clear"></view>
 				</view>
 				<view class="item">
+					<text class="desc">计价单位：</text>
+					<text>{{ item.goodsUnit }}</text>
+				</view>
+				<view class="item">
+					<text class="desc">商品重量：</text>
+					<text>{{ item.netWet }}</text>
+				</view>
+				<view class="item">
+					<text class="desc">单价：</text>
+					<text>{{ item.singlePrice }}</text>
+				</view>
+				<view class="item">
 					<text class="desc">车牌号：</text>
 					<text>{{ item.veNo }}</text>
 					<view class="clear"></view>
 				</view>
 				<view class="item">
 					<text class="desc">发布商：</text>
-					<text>{{ item.createName }}</text>
+					<text>{{ item.leaderName }}</text>
+				</view>
+				<view class="item">
+					<text class="desc">联系号码：</text>
+					<text>{{item.leaderPhone}}</text>
 				</view>
 				<view class="item">
 					<text class="desc">互市区：</text>
 					<text>{{ item.tradeAreaName }}</text>
 					<view class="clear"></view>
 				</view>
+				<view class="item" style="padding-top: 0px">
+					<text class="desc">订单编号：</text>
+					<text>{{ item.orderNo }}</text>
+				</view>
 				<view class="item">
 					<text class="desc">发布时间：</text>
 					<text>{{ item.createTime }}</text>

pages/market/two/leader/detail.vue

@@ -11,34 +11,34 @@
 					<text class="desc">{{ item.goodsName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">价格</text>
+					<text class="label">上架金额</text>
 					<text class="desc omit">{{ item.resalePrice}}元</text>
 				</view>
 				<view class="item">
+					<text class="label">单价</text>
+					<text class="desc">{{ item.singlePrice }}</text>
+				</view>
+				<view class="item">
+					<text class="label">计价单位</text>
+					<text class="desc">{{ item.goodsUnit }}</text>
+				</view>
+				<view class="item">
+					<text class="label">商品重量</text>
+					<text class="desc">{{ item.netWet }}</text>
+				</view>
+				<view class="item" v-if="item.purchaserName">
 					<text class="label">收购商</text>
 					<text class="desc">{{ item.purchaserName }}</text>
 				</view>
+				<view class="item">
+					<text class="label">车牌</text>
+					<text class="desc">{{ item.veNo }}</text>
+				</view>
 				<view class="item" v-if="item.createTime">
-					<text class="label">转售时间</text>
+					<text class="label">上架时间</text>
 					<text class="desc">{{ item.createTime }}</text>
 				</view>
 			</view>
-			<!-- <u-divider text="费项明细"></u-divider>
-			<view class="box">
-				<u-collapse v-for="(fee,index) in feeItemList" :key="index">
-					<u-collapse-item :title="fee.name" class="cell_title" >
-						<view class="itm">1、收费企业：{{ fee.companyName }}</view>
-						<view class="itm" v-if="fee.feeType ==1">2、收费类型：按交易额收取</view>
-						<view class="itm" v-if="fee.feeType ==2">2、收费类型：按次收取</view>
-						<view class="itm" v-if="fee.feeType ==1">3、收费%(按交易额)：<span style="color: coral;">{{ fee.percent }} %</span></view>
-						<view class="itm" v-if="fee.feeType ==1">4、当前订单收取金额：<span style="color: coral;">{{ (fee.percent * item.resalePrice)/100}} 元</span></view>
-						<view class="itm" v-if="fee.feeType ==2">3、收费金额(按次收)：<span style="color: coral;">{{ fee.feeMoney }} 元</span></view>
-						<view class="itm" v-if="fee.feeType ==2">4、当前订单收取金额：<span style="color: coral;">{{ fee.feeMoney }} 元</span></view>
-						</br>
-						<view class="itm">当前费项收取金额以最后结算时为准</view>
-					</u-collapse-item>
-				</u-collapse>
-			</view> -->
 		</view>
 	</view>
 </template>
@@ -48,7 +48,6 @@ export default {
 	data() {
 		return {
 			item: {},
-			feeItemList: []
 		};
 	},
 	onLoad(e) {
@@ -62,19 +61,9 @@ export default {
 				}
 			});
 		}
-		this.getFeeItem();
 	},
 	methods: {
-		//费项明细
-		getFeeItem(){
-			this.http.request({
-				url: '/level-two-server/app/TbFeeItem/getList',
-				success: res => {
-					this.feeItemList = res.data.data
-					console.log("feeItemList",this.feeItemList)
-				}
-			});
-		},
+		
 	}
 };
 </script>

pages/market/two/leader/order.vue

@@ -5,25 +5,25 @@
 		</view>
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="title">{{ item.createName }}</view>
-				<view>
-					<view class="state" style="color: red" v-if="item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined">待下单</view>
-					<view class="state" style="color: red" v-else>已下单</view>
+				<view class="title" style="width: 97%;font-size: 17px;">
+					<span v-if="item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined">车牌号 {{ item.veNo }}</span>
+					<span v-else>采购商 {{ item.purchaserName }}</span>
+					<span>
+						<view class="state" v-if="item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined"><text class="icon">&#xe830;</text>待下单</view>
+						<view class="state" v-else><text class="icon" style="color: #13ce66">&#xe830;</text>已下单</view>
+					</span>
 				</view>
-				<view class="state" style="color: #4581fb" v-if="item.isPay == 1 && item.payTax == 0">已支付</view>
-				<view class="state" style="color: #13ce66" v-if="item.payTax == 1 && item.orderFinish == 1">已完成</view>
-				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
 					<view class="desc omit">
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
-					<view class="price">¥ {{ item.resalePrice }}</view>
+					<view class="price">上架金额 ¥ {{ item.resalePrice }}</view>
 				</view>
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<view class="an" style="color: #4581fb" @click.stop="payTax(item)" v-if="item.isPay == 1 && item.payTax == 0">去缴费税</view>
+					<!-- <view class="an" style="color: #4581fb" @click.stop="payTax(item)" v-if="item.isPay == 1 && item.payTax == 0">去缴费税</view> -->
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
@@ -37,12 +37,14 @@ export default {
 	data() {
 		return {
 			tab: [
-				{ name: '全部', isPay: '', payTax: '', orderFinish: ''},
-				{ name: '已支付', isPay: 1, payTax: 0, orderFinish: 0},
-				{ name: '已完成', isPay: 1, payTax: 1, orderFinish: 1}
+				{ name: '全部'},
+				{ name: '待下单'},
+				{ name: '已下单'},
 			],
 			param: { pageNo: 1, pageSize: 10 },
 			list: [],
+			isOrderList: [],
+			noOrderList: [],
 			loadMore: true
 		};
 	},
@@ -53,7 +55,7 @@ export default {
 		});
 	},
 	methods: {
-		getData() {
+		getData(e) {
 			this.http.request({
 				url: '/level-two-server/app/TbOrders/getLeaderOrderList',
 				loading: 'false',
@@ -61,16 +63,21 @@ export default {
 				success: res => {
 					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
 					this.list.push(...res.data.data);
-					console.log("purchaserId="+this.list[0].purchaserId)
+					this.noOrderList = this.list.filter(item => item.purchaserId === null || item.purchaserId === '' || item.purchaserId === undefined);
+					this.isOrderList = this.list.filter(item => !this.noOrderList.includes(item));
+
+					if(e != undefined && e.name == '待下单') {
+						this.list = this.noOrderList;
+					}
+					if(e != undefined && e.name == '已下单') {
+						this.list = this.isOrderList;
+					}
 				}
 			});
 		},
 		//点击tab切换
 		click(e) {
-			this.param.isPay = e.isPay;
-			this.param.payTax = e.payTax;
-			this.param.orderFinish = e.orderFinish;
-			this.refresh();
+			this.refresh(e);
 		},
 		payTax(item) {
 			uni.navigateTo({ url: '/pages/market/two/leader/feeDetail?resalePrice=' + item.resalePrice +'&id=' + item.id});
@@ -79,11 +86,13 @@ export default {
 			uni.navigateTo({ url: '/pages/market/two/leader/detail?id=' + item.id });
 		},
 		//刷新数据
-		refresh() {
+		refresh(e) {
 			this.loadMore = true;
 			this.param.pageNo = 1;
 			this.list = [];
-			this.getData();
+			this.noOrderList = [];
+			this.isOrderList = [];
+			this.getData(e);
 		}
 	},
 	//下拉刷新

pages/market/two/leader/resale.vue

@@ -27,26 +27,24 @@
 					<text class="desc">{{ item.goodsUnit }}</text>
 				</view>
 				<view class="item">
-					<text class="label">订单金额</text>
+					<text class="label">申报金额</text>
+					<text class="desc">¥ {{ item.totalPrice }}</text>
+				</view>
+				<view class="item">
+					<text class="label">预上架金额</text>
 					<text class="desc">¥ {{ item.totalPrice }}</text>
 				</view>
-				<!-- <view class="item">
-					<text class="label">上架金额(元)</text>
-					<text class="desc">
-						<input type="number" v-model="resalePrice" placeholder="请输入" />
-					</text>
-				</view> -->
 				<!-- <view class="item">
 					<text class="label">利润</text>
 					<text class="desc">50元</text>
 				</view> -->
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">上架金额</text>
 					<text class="desc">¥ {{ resalePrice }}</text>
-				</view>
-				<view style="font-size: 12px;padding: 5px">注：上架金额=订单金额+服务费用</view>
+				</view> -->
+				<view  style="font-size: 12px;padding: 5px;height: 30px;line-height: 30px;">注：本次上架需扣除服务1点数</view>
 			</view>
-			<u-divider text="服务费明细"></u-divider>
+		<!-- 	<u-divider text="服务费明细"></u-divider>
 			<view v-if="fee.totalFee>0">{{fee.title}}：{{fee.totalFee}}<span style="color: coral;margin-left: 5px;font-size: 16px;">元</span></view>
 			<view class="box">
 				<u-collapse v-for="(item,index) in fee.feeList" :key="index" :value="['1']">
@@ -62,12 +60,12 @@
 
 					</u-collapse-item>
 				</u-collapse>
-			</view>
+			</view> -->
 		</view>
 		<view class="mfooter" v-if="item.upStatus != 2">
 			<view class="flex">
 				<view class="f">
-					<button class="btn" @click="ok()">上架</button>
+					<button class="btn" @click="ok()">确定上架</button>
 				</view>
 			</view>
 		</view>
@@ -94,7 +92,7 @@ export default {
 			this.item = JSON.parse(e.item);
 			this.price = this.item.totalPrice;
 			this.weight = this.item.totalWeight;
-			this.countPrice();
+			//this.countPrice();
 		}
 	},
 	methods: {
@@ -138,7 +136,7 @@ export default {
 					if (res.confirm) {
 						this.http.request({
 							url: '/level-one-server/app/TbOrder/up',
-							data: {id: this.item.id, upPrice: this.resalePrice},
+							data: {id: this.item.id, upPrice: this.item.totalPrice},
 							success: res => {
 								uni.showToast({title: '提交成功'});
 								uni.navigateBack();

pages/market/two/leader/success.vue

@@ -2,39 +2,48 @@
 	<view class="cmain">
 		<view class="icon">&#xe602;</view>
 		<view class="desc">购买成功。</view>
-		<button class="btn" @click="go()">返回订单列表</button>
+		<button class="btn" @click="goBuy()" type="warn">继续购买</button>
+		<button class="btn" @click="go()" style="margin-top: 20px;">订单列表</button>
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {};
-	},
-	methods: {
-		go() {
-			uni.redirectTo({
-				url: '/pages/market/two/purchaser/order/list'
-			});
+	export default {
+		data() {
+			return {};
+		},
+		methods: {
+			go() {
+				uni.redirectTo({
+					url: '/pages/market/two/purchaser/order/list'
+				});
+			},
+			goBuy() {
+				uni.redirectTo({
+					url: '/pages/market/two/list'
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.cmain {
-	text-align: center;
-	padding: 40px;
-	color: $font-c;
-	.icon {
-		font-size: 150px;
-		color: $main-color;
-	}
-	.desc {
-		margin-top: 7px;
-	}
-	.btn {
-		margin-top: 50px;
+	.cmain {
+		text-align: center;
+		padding: 40px;
+		color: $font-c;
+
+		.icon {
+			font-size: 150px;
+			color: $main-color;
+		}
+
+		.desc {
+			margin-top: 7px;
+		}
+
+		.btn {
+			margin-top: 50px;
+		}
 	}
-}
-</style>
+</style>

pages/market/two/list.vue

@@ -1,45 +1,70 @@
 <template>
 	<view>
-		<view class="search">
-			<u-search placeholder="搜索商品或车牌号" v-model="param.goodsName" bgColor="white" @search="refresh()" :animation="true" actionText="取消" @clear="refresh()"></u-search>
-			<view class="clear"></view>
-		</view>
-		<view class="goodsList">
-			<view class="sort-list">
-				<view class="sort-item" :class="{ active: item.check }" v-for="(item, index) in sort" :key="index" @click="select(item, index)">
-					<text>{{ item.name }}</text>
-					<text v-if="index > 0 && item.isAsc == 'desc'" class="icon">&#xeb0a;</text>
-					<text v-if="index > 0 && item.isAsc == 'asc'" class="icon">&#xeb0b;</text>
+		<view style="position: relative;z-index: 999;height:150px;">
+			<view style="position: fixed;width: 100%;background-color: white;">
+				<u-tabs :list="tab" @click="clickSearchType" :lineHeight="5"></u-tabs>
+				<view class="search">
+					<u-search placeholder="搜索商品名或车牌号" v-model="param.goodsName" bgColor="#e2e2e2" @search="refresh()"
+						:animation="true" actionText="取消" @clear="refresh()"></u-search>
+					<view class="clear"></view>
 				</view>
-				<view class="type" @click="go()">
-					<text>{{ param.goodsType || '分类' }}</text>
-					<text class="icon">&#xe8f2;</text>
+				<view class="sort-list">
+					<view class="sort-item" :class="{ active: item.check }" v-for="(item, index) in sort" :key="index"
+						@click="select(item, index)">
+						<text>{{ item.name }}</text>
+						<text v-if="index > 0 && item.isAsc == 'desc'" class="icon">&#xeb0a;</text>
+						<text v-if="index > 0 && item.isAsc == 'asc'" class="icon">&#xeb0b;</text>
+					</view>
+					<!-- <view class="type" @click="go()">
+						<text>{{ param.goodsType || '分类' }}</text>
+						<text class="icon">&#xe8f2;</text>
+					</view> -->
 				</view>
 			</view>
+		</view>
+		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
-				<view class="title">{{ item.LeaderName }}</view>
+				<view class="title">
+					<text v-if="currentOrderType==2">{{ item.leaderName }}</text>
+					<text v-if="currentOrderType==1">{{ item.shopName }}</text>
+				</view>
 				<view class="check" @click.stop="selected(item)" v-if="user.userType == 3">
 					<text class="check icon" v-if="item.check" style="color: #4581fb">&#xe631;</text>
 					<text class="check icon" v-else>&#xe60c;</text>
 				</view>
-				<image src="../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
-					<view class="productName omit">{{ item.goodsName }}</view>
-					<view class="price">¥ {{ item.resalePrice }}</view>
-					<view class="desc">车牌号：{{ item.veNo }}</view>
-					<view class="icon btn" v-if="user.userType == 3" @click.stop="addCar(item)">&#xe600;</view>
-					<view class="btn" v-if="user.userType == 3" @click.stop="buy(item)">购买</view>
+					<view class="productName omit">
+						<text v-if="currentOrderType==2">{{ item.goodsName }}</text>
+						<text v-if="currentOrderType==1">{{ item.goodsNames }}</text>
+					</view>
+					<view class="desc">车牌号 <text style="font-weight: bold;margin-left: 5px;"> {{ item.veNo }}</text>
+					</view>
+					<view class="desc omit">
+						<text v-if="currentOrderType==2">重量 {{ item.totalWeight }}{{ item.goodsUnit }}</text>
+						<text v-if="currentOrderType==1">重量 {{ item.sumNetWt }} kg</text>
+						<text>{{ item.tradeAreaName }}</text>
+					</view>
+					<view class="price" v-if="currentOrderType==2"> ¥ {{ item.resalePrice }}</view>
+					<view class="price" v-if="currentOrderType==1"> ¥ {{ item.sumUpPrice }}</view>
+					<view class="op">
+						<view class="date">{{ item.createTime }}</view>
+						<template>
+							<view class="icon btn" v-if="user.userType == 3&&currentOrderType==2"
+								@click.stop="addCar(item)">&#xe600;</view>
+							<view class="btn" v-if="user.userType == 3" @click.stop="buy(item)">购买</view>
+						</template>
+					</view>
 				</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>
 		<productType v-model="show"></productType>
-		<button class="addBtn" @click="goCar()" v-if="user.userType == 3">
+		<button class="addBtn" @click="goCar()" v-if="user.userType == 3&&currentOrderType==2">
 			<text class="icon">&#xe600;</text>
 			<view class="bag animated" :class="{ bounce: add }" v-if="cars > 0">{{ cars }}</view>
 		</button>
-		<view class="mfooter" v-if="selects.length > 0&&user.userType == 3">
+		<view class="mfooter" v-if="selects.length > 0">
 			<view class="flex">
 				<view class="f">
 					<button class="btn" @click="buy({})">立即购买（{{ selects.length }}）</button>
@@ -50,152 +75,237 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			user: this.getUser(),
-			show: false,
-			isAsc: 'desc',
-			cars: 0,
-			add: false,
-			sort: [
-				{ name: '综合', sortName: 'id', isAsc: 'desc', check: false },
-				{ name: '日期', sortName: 'create_time', isAsc: 'desc', check: false },
-				{ name: '数量', sortName: 'goods_quantity', isAsc: 'desc', check: false }
-			],
-			list: [],
-			param: { pageNo: 1, pageSize: 10 },
-			loadMore: true,
-			selects: []
-		};
-	},
-	/* onShow(){
-		this.refresh();
-	}, */
-	onLoad(e) {
-		this.getData();
-		//选择商品分类
-		uni.$on('productType', res => {
-			this.param.typeCode = res.no;
-			this.param.goodsType = res.name;
-			this.refresh();
-		});
-	},
-	methods: {
-		select(item, index) {
-			this.sort.forEach(it => (it.check = false));
-			item.check = true;
-			if (index > 0) {
-				this.isAsc = this.isAsc == 'desc' ? 'asc' : 'desc';
-				item.isAsc = this.isAsc;
-			}
-			this.param.orderBy = item.sortName + ' ' + this.isAsc;
-			this.refresh();
+	export default {
+		data() {
+			return {
+				tab: [{
+						name: '整车',
+						orderType: 1
+					},
+					{
+						name: '非整车',
+						orderType: 2
+					},
+				],
+				currentOrderType: 1,
+				user: this.getUser(),
+				show: false,
+				isAsc: 'desc',
+				cars: 0,
+				add: false,
+				sort: [{
+						name: '综合',
+						sortName: 'id',
+						isAsc: 'desc',
+						check: false
+					},
+					{
+						name: '日期',
+						sortName: 'create_time',
+						isAsc: 'desc',
+						check: false
+					},
+					{
+						name: '金额',
+						sortName: 'resale_price',
+						isAsc: 'desc',
+						check: false
+					}
+				],
+				list: [],
+				param: {
+					pageNo: 1,
+					pageSize: 10
+				},
+				loadMore: true,
+				selects: []
+			};
 		},
-		getData() {
-			this.http.request({
-				url: '/level-two-server/app/TbOrders/getLevelTwoList',
-				data: this.param,
-				loading: 'false',
-				success: res => {
-					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
-					this.list.push(...res.data.data);
-				}
+		onLoad(e) {
+
+			//选择商品分类
+			uni.$on('productType', res => {
+				this.param.typeCode = res.no;
+				this.param.goodsType = res.name;
+				this.refresh();
 			});
 		},
-		//多选购买
-		selected(item) {
-			item.check = !item.check;
-			this.$forceUpdate();
-			this.selects = this.list.filter(item => item.check);
-		},
-		//选择分类
-		go() {
-			uni.navigateTo({ url: '/pages/market/productType?current=' + this.param.current + '&now=' + this.param.now });
-		},
-		detail(item) {
-			uni.navigateTo({ url: '/pages/market/two/detail?orderId=' + item.id });
+		onShow() {
+			this.init();
+			this.query();
 		},
-		addCar(item) {
-			this.add = true;
-			this.http.request({
-				url: '/level-two-server/app/TbOrdersCart/add',
-				method: 'POST',
-				data: { orderId: item.id },
-				success: res => {
-					this.cars++;
-					setTimeout(() => {
-						this.add = false;
-					}, 500);
-					uni.showToast({ title: '添加成功' });
+		methods: {
+			clickSearchType(e) {
+				let orderType = e.orderType;
+				if (this.currentOrderType == orderType) {
+					return;
 				}
-			});
-		},
-		goCar() {
-			uni.navigateTo({ url: '/pages/market/two/purchaser/order/cart' });
-		},
-		buy(item) {
-			if (item.id) {
+				this.currentOrderType = orderType;
+				this.init();
+				this.query();
+			},
+			init() {
+				this.list = [];
+				this.param = {
+					pageNo: 1,
+					pageSize: 10
+				}
+			},
+			query() {
+				if (this.currentOrderType == 2) {
+					this.getData();
+				} else {
+					this.getWholeData();
+				}
+			},
+			select(item, index) {
+				this.sort.forEach(it => (it.check = false));
+				item.check = true;
+				if (index > 0) {
+					this.isAsc = this.isAsc == 'desc' ? 'asc' : 'desc';
+					item.isAsc = this.isAsc;
+				}
+				item.sortName=item.sortName=='resale_price'&&this.currentOrderType==1?item.sortName='sumUpPrice':item.sortName;
+				this.param.orderBy = item.sortName + ' ' + this.isAsc;
+				this.refresh();
+			},
+			getWholeData() {
+				this.http.request({
+					url: '/level-one-server/app/HtTradeSettlement/getOnSaleList',
+					data: this.param,
+					loading: 'false',
+					success: res => {
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						this.list.push(...res.data.data);
+					}
+				});
+			},
+			getData() {
+				this.http.request({
+					url: '/level-two-server/app/TbOrders/getLevelTwoList',
+					data: this.param,
+					loading: 'false',
+					success: res => {
+						this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
+						this.list.push(...res.data.data);
+					}
+				});
+			},
+			//多选购买
+			selected(item) {
+				item.check = !item.check;
+				this.$forceUpdate();
+				this.selects = this.list.filter(item => item.check);
+			},
+			//选择分类
+			go() {
+				uni.navigateTo({
+					url: '/pages/market/productType?current=' + this.param.current + '&now=' + this.param.now
+				});
+			},
+			detail(item) {
 				uni.navigateTo({
-					url: '/pages/market/two/purchaser/buy/buy?orderId=' + item.id
+					url: '/pages/market/two/purchaser/buy/detail?id=' + item.id + '&type=' + this.currentOrderType
+				});
+			},
+			addCar(item) {
+				this.add = true;
+				this.http.request({
+					url: '/level-two-server/app/TbOrdersCart/add',
+					method: 'POST',
+					data: {
+						orderId: item.id
+					},
+					success: res => {
+						this.cars++;
+						setTimeout(() => {
+							this.add = false;
+						}, 500);
+						uni.showToast({
+							title: '添加成功'
+						});
+					}
 				});
-			} else {
+			},
+			goCar() {
+				uni.navigateTo({
+					url: '/pages/market/two/purchaser/order/cart'
+				});
+			},
+			buy(item) {
+				let ids = undefined;
+				if (item.id) {
+					ids = item.id;
+				} else {
+					ids = this.selects.map(item => item.id)
+				}
+				if (this.currentOrderType == 2) {
+					uni.navigateTo({
+						url: '/pages/market/two/purchaser/buy/buy?orderId=' + ids
+					});
+					return;
+				}
 				uni.navigateTo({
-					url: '/pages/market/two/purchaser/buy/buy?orderId=' + this.selects.map(item => item.id)
+					url: '/pages/market/two/purchaser/buy/buyWhole?ids=' + ids
 				});
+			},
+			//刷新数据
+			refresh() {
+				this.loadMore = true;
+				this.param.pageNo = 1;
+				this.list = [];
+				this.selects = [];
+				this.query();
 			}
 		},
-		//刷新数据
-		refresh() {
-			this.loadMore = true;
-			this.param.pageNum = 1;
-			this.list = [];
-			this.selects=[];
-			this.getData();
-		}
-	},
-	//下拉刷新
-	onPullDownRefresh() {
-		setTimeout(() => {
-			this.refresh();
-			uni.stopPullDownRefresh();
-		}, 1000);
-	},
-	//上拉加载
-	onReachBottom() {
-		if (this.loadMore) {
-			this.param.pageNum++;
-			this.getData();
+		//下拉刷新
+		onPullDownRefresh() {
+			setTimeout(() => {
+				this.refresh();
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		//上拉加载
+		onReachBottom() {
+			if (this.loadMore) {
+				this.param.pageNo++;
+				this.query();
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	background-color: $pg;
-}
-.con {
-	.btn {
-		float: right;
-		background-color: $main-color;
-		color: #000;
-		height: 20px;
-		position: relative;
-		color: white;
-		padding: 5px 20px;
-		margin-left: 10px;
+	page {
+		background-color: $pg;
 	}
-	.icon {
-		line-height: 30px;
-		line-height: 20px;
+
+	.goodsList .item .con {
+		width: 98%;
 	}
-}
-.mfooter {
-	background-color: #ffffff00;
-	border: 0px;
-	.btn{
-		background-color: #F44336;
+
+	.con {
+		.btn {
+			float: right;
+			background-color: $main-color;
+			height: 20px;
+			position: relative;
+			color: white;
+			padding: 5px 20px;
+			margin-left: 10px;
+		}
+
+		.icon {
+			line-height: 20px;
+		}
+	}
+
+	.mfooter {
+		background-color: #ffffff00;
+		border: 0px;
+
+		.btn {
+			background-color: #F44336;
+		}
 	}
-}
-</style>
+</style>

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

@@ -8,19 +8,19 @@
 				</view>
 				<view class="item">
 					<text class="label">商品价格</text>
-					<text class="desc">{{ item.resalePrice }}</text>
+					<text class="desc">¥ {{ item.resalePrice }}</text>
 				</view>
 				<view class="item">
 					<text class="label">车牌号</text>
 					<text class="desc">{{ item.veNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">接单人</text>
-					<text class="desc">{{ user.name }}</text>
+					<text class="label">发布商</text>
+					<text class="desc">{{ item.leaderName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">发布商</text>
-					<text class="desc">{{ item.createName }}</text>
+					<text class="label">采购商</text>
+					<text class="desc">{{ user.name }}</text>
 				</view>
 				<view class="item">
 					<text class="label">发布时间</text>

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

@@ -0,0 +1,125 @@
+<template>
+	<view>
+		<view class="cmain" v-for="(item,index) in list">
+			<view class="box order_detail">
+				<view class="item">
+					<text class="label">车牌号</text>
+					<text class="desc">{{ item.veNo }}</text>
+				</view>
+				<view class="item">
+					<text class="label">商品</text>
+					<text class="desc omit">{{ item.goodsNames }}</text>
+				</view>
+				<view class="item">
+					<text class="label">数量</text>
+					<text class="desc omit">{{ item.packNo }}</text>
+				</view>
+
+				<view class="item">
+					<text class="label">店主</text>
+					<text class="desc">{{ item.shopName }}</text>
+				</view>
+				<view class="item">
+					<text class="label">互市区</text>
+					<text class="desc">{{ item.fieldName }}</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 price">¥ {{ item.sumUpPrice }}</text>
+				</view>
+			</view>
+		</view>
+		<view style="height: 80px;"></view>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="total-price price">¥{{totalPrice}}</view>
+				<view class="f">
+					<button class="btn" @click="pay()">立即购买</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				user: this.getUser(),
+				list: [],
+				ids: ''
+			};
+		},
+		onLoad(e) {
+			if (e.ids) {
+				this.ids = e.ids;
+				this.http.request({
+					url: '/level-one-server/app/HtTradeSettlement/getByIds',
+					method: 'POST',
+					data: {
+						ids: this.ids
+					},
+					success: res => {
+						this.list = res.data.data;
+					}
+				});
+
+			}
+		},
+		computed: {
+			totalPrice() {
+				let list = this.list;
+				let total = 0;
+				list.map(item => total = Number(item.sumUpPrice) + Number(total));
+				return Math.round(total * 100) / 100;
+			}
+		},
+		methods: {
+			pay() {
+				uni.showModal({
+					title: '提示',
+					content: '我已核对订单信息无误',
+					success: res => {
+						if (res.confirm) {
+							this.http.request({
+								url: '/level-two-server/app/TbOrders/purchaserBuyWhole',
+								method: 'POST',
+								data: {
+									ids: this.ids
+								},
+								success: res => {
+									console.log(res);
+									return;
+									uni.redirectTo({
+										url: '/pages/market/two/leader/success'
+									});
+								}
+							});
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: $pg;
+	}
+
+	.price {
+		color: red;
+		font-weight: bold;
+	}
+
+	.total-price {
+		line-height: 66px;
+		padding: 0 0 0 10px;
+		font-size: 18px;
+	}
+</style>

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

@@ -1,151 +1,165 @@
 <template>
 	<view>
-		<view class="cmain">
-			<view class="box order_detail">
+		<view class="product_detail">
+			<!-- <image src="../../../static/news.jpg" mode="widthFix" class="pic"></image> -->
+			<view class="box">
+				<view class="title">{{ item.goodsName }}</view>
+				<view class="clear"></view>
+				<u-divider text="详情"></u-divider>
 				<view class="item">
-					<text class="label">收购商品</text>
-					<text class="desc omit">{{ item.goodsName }}</text>
+					<text class="desc">车牌号：</text>
+					<text>{{ item.veNo }}</text>
+					<view class="clear"></view>
 				</view>
 				<view class="item">
-					<text class="label">商品编号</text>
-					<text class="desc">{{ item.goodsNo }}</text>
+					<text class="desc">商品重量：</text>
+					<text v-if="type==1">{{ item.goodsNames }} </text>
+					<text v-if="type==2">{{ item.goodsName }} </text>
 				</view>
 				<view class="item">
-					<text class="label">计价单位</text>
-					<text class="desc">{{ item.goodsUnit }}</text>
+					<text class="desc">商品名称：</text>
+					<text v-if="type==1">{{ item.sumNetWt }} kg</text>
+					<text v-if="type==2">{{ item.netWet }} kg</text>
 				</view>
 				<view class="item">
-					<text class="label">数量</text>
-					<text class="desc">{{ item.goodsQuantity }}</text>
+					<text class="desc">货主：</text>
+					<text v-if="type==1">{{ item.shopName }}</text>
+					<text v-if="type==2">{{ item.leaderName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">到货日期</text>
-					<text class="desc">{{ item.arrivalTime }}</text>
+					<text class="desc">互市区：</text>
+					<text v-if="type==2">{{ item.tradeAreaName }}</text>
+					<text v-if="type==1">{{ item.fieldName }}</text>
+					<view class="clear"></view>
 				</view>
+
 				<view class="item">
-					<text class="label">创建时间</text>
-					<text class="desc">{{ item.goodsDemandTime }}</text>
+					<text class="desc">发布时间：</text>
+					<text>{{ item.createTime }}</text>
+					<view class="clear"></view>
 				</view>
 				<view class="item">
-					<text class="label">状态</text>
-					<text class="desc" v-if="item.isRelease == 0">未发布</text>
-					<text class="desc" v-if="item.isRelease == 1 && item.isOrders == 0">未接单</text>
-					<text class="desc" v-if="item.isOrders == 1 && item.isConfirm == 0">已接单</text>
-					<text class="desc" v-if="item.isConfirm == 1">已确认</text>
-				</view>
-				<view class="item" v-if="item.createName">
-					<text class="label">接单人</text>
-					<text class="desc">{{ item.createName }}</text>
-				</view>
-				<view class="item" v-if="item.quotation">
-					<text class="label">出价金额</text>
-					<text class="desc" style="color: #f44336; font-weight: bold">¥ {{ item.quotation }}</text>
-				</view>
-				<view class="item" v-if="item.createTime">
-					<text class="label">接单时间</text>
-					<text class="desc">{{ item.createTime }}</text>
+					<text class="desc">总金额：</text>
+					<text v-if="type==2" class="price">￥ {{ item.resalePrice }}</text>
+					<text v-if="type==1" class="price">￥ {{ item.sumUpPrice }}</text>
+					<view class="clear"></view>
 				</view>
 			</view>
-			<u-divider text="收货地址"></u-divider>
-			<view class="box order_detail">
-				<view class="item">
-					<text class="label">收件人</text>
-					<text class="desc omit">{{ item.name }}</text>
-				</view>
-				<view class="item">
-					<text class="label">联系电话</text>
-					<text class="desc">{{ item.phone }}</text>
-				</view>
-				<view class="item">
-					<text class="label">收件地址</text>
-					<text class="desc">{{ item.addressName }}</text>
+		</view>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="f">
+					<button class="btn" v-if="user.userType == 3" @click="pay()">立即购买</button>
 				</view>
 			</view>
-			<button class="btn" @click.stop="confirm()" v-if="item.isRelease == 1 && item.isOrders == 1 && item.isConfirm == 0">同意接单并支付</button>
-			<button class="btn" @click.stop="refuse()" style="background-color: #f44336" v-if="item.isRelease == 1 && item.isOrders == 1 && item.isConfirm == 0">拒绝接单</button>
 		</view>
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			item: {}
-		};
-	},
-	onLoad(e) {
-		if (e.id) {
-			this.http.request({
-				url: '/level-two-server/app/TbGoodsDemand/goodsDemandDetail?id=' + e.id,
-				success: res => {
-					this.item = res.data.data;
+	export default {
+		data() {
+			return {
+				user: this.getUser(),
+				item: {},
+				id: '',
+				type: 1
+			};
+		},
+		onLoad(e) {
+			if (e.id) {
+				this.id = e.id;
+				this.type = e.type
+				this.getDetail()
+			}
+		},
+		methods: {
+			getDetail() {
+				if (this.type == 1) {
+					this.getWholeDetails();
+				} else {
+					this.getOrdersDetails()
 				}
-			});
-		}
-	},
-	methods: {
-		confirm() {
-			uni.showModal({
-				title: '提示',
-				content: '确定同意接单并支付?',
-				success: res => {
-					if (res.confirm) {
-						this.http.request({
-							url: '/level-two-server/app/TbOrders/add',
-							data: this.item,
-							success: res => {
-								console.log('asd:');
-								uni.showModal({
-									title: '提示',
-									content: '处理成功,等待组长发货',
-									showCancel: false,
-									success: res => {
-										uni.navigateBack();
-										uni.$emit('purchaser_buy_list');
-									}
-								});
-							}
+			},
+			getOrdersDetails() {
+				this.http.request({
+					url: '/level-two-server/app/TbOrders/getDetailById',
+					method: 'POST',
+					data: {
+						ids: this.id
+					},
+					success: res => {
+						let data = res.data.data;
+						this.item = data[0];
+					}
+				});
+			},
+			getWholeDetails() {
+				this.http.request({
+					url: '/level-one-server/app/HtTradeSettlement/getByIds',
+					method: 'POST',
+					data: {
+						ids: this.id
+					},
+					success: res => {
+						this.item = res.data.data[0];
+					}
+				});
+			},
+			buyOrder() {
+				this.http.request({
+					url: '/level-two-server/app/TbOrders/purchaserBuy',
+					method: 'POST',
+					data: {
+						ids: this.id
+					},
+					success: res => {
+						uni.navigateTo({
+							url: '/pages/market/two/leader/success'
 						});
 					}
-				}
-			});
-		},
-		refuse() {
-			uni.showModal({
-				title: '提示',
-				content: '确定取消该接单?',
-				success: res => {
-					if (res.confirm) {
-						this.http.request({
-							url: '/level-two-server/app/TbGoodsDemand/refuse',
-							data: { id: this.item.goodsDemandId, goodsName: this.item.goodsName },
-							success: res => {
-								uni.showModal({
-									title: '提示',
-									content: '取消成功',
-									showCancel: false,
-									success: res => {
-										uni.navigateBack();
-										uni.$emit('purchaser_buy_list');
-									}
-								});
-							}
+				});
+			},
+			buyWhole() {
+				this.http.request({
+					url: '/level-two-server/app/TbOrders/purchaserBuyWhole',
+					method: 'POST',
+					data: {
+						ids: this.id
+					},
+					success: res => {
+						uni.navigateTo({
+							url: '/pages/market/two/leader/success'
 						});
 					}
-				}
-			});
+				});
+			},
+			pay() {
+				uni.showModal({
+					title: '提示',
+					content: '确定下单购买？',
+					success: res => {
+						if (res.confirm) {
+							if (this.type == 1) {
+								this.buyWhole()
+							} else {
+								this.buyOrder()
+							}
+						}
+					}
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-page {
-	background-color: $pg;
-}
-.btn {
-	margin-top: 20px;
-	width: 70%;
-}
-</style>
+	page {
+		.price {
+			color: red;
+			font-weight: bold;
+		}
+
+		background-color: $pg;
+	}
+</style>

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

@@ -5,12 +5,12 @@
 				<view class="title" @click.stop="selected(item)">
 					<text class="icon" v-if="item.check" style="color: #4581fb">&#xe631;</text>
 					<text class="icon" v-else>&#xe60c;</text>
-					<text>{{ item.createName }}</text>
+					<text>{{ item.goodsName }}</text>
 				</view>
 				<view class="state" @click.stop="del(item)"><text class="icon del">&#xe852;</text></view>
-				<image src="../../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
+
 				<view class="con">
-					<view class="productName omit">{{ item.goodsName }}</view>
+					<!--<view class="productName omit">{{ item.goodsName }}</view>-->
 					<view class="desc omit">
 						<text>{{ item.tradeAreaName }}</text>
 					</view>

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="cmain">
-			<view class="box order_detail" style="margin-top: 0px">
+		<!-- 	<view class="box order_detail" style="margin-top: 0px">
 				<view class="item">
 					<text class="label">订单状态</text>
 					<text class="desc" v-if="item.isDelivery == 1">
@@ -13,7 +13,7 @@
 						<text>待收货</text>
 					</text>
 				</view>
-			</view>
+			</view> -->
 			<view class="box order_detail">
 				<u-divider text="订单信息"></u-divider>
 				<view class="item" style="padding-top: 0px">
@@ -21,16 +21,20 @@
 					<text class="desc">{{ item.orderNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">申报单号</text>
-					<text class="desc">{{ item.declarationNumber }}</text>
+					<text class="label">口岸</text>
+					<text class="desc">{{ item.tradeAreaName }}</text>
+				</view>
+				<view class="item">
+					<text class="label">车牌</text>
+					<text class="desc">{{ item.veNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">卖家</text>
-					<text class="desc">{{ item.quotationPerson }}(组长)</text>
+					<text class="label">店主</text>
+					<text class="desc">{{ item.leaderName }}</text>
 				</view>
 				<view class="item">
 					<text class="label">联系号码</text>
-					<text class="desc"></text>
+					<text class="desc">{{item.leaderPhone}}</text>
 				</view>
 				<view class="item">
 					<text class="label">商品名称</text>
@@ -41,25 +45,38 @@
 					<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.netWet }}</text>
 				</view>
 				<view class="item">
-					<text class="label">价格</text>
-					<text class="desc">{{ item.quotation }}</text>
+					<text class="label">单价</text>
+					<text class="desc">{{ item.singlePrice }}</text>
 				</view>
 				<view class="item">
-					<text class="label">来源国</text>
-					<text class="desc">{{ item.goodsFrom }}</text>
+					<text class="label">总价</text>
+					<text class="desc">{{ item.resalePrice }}</text>
 				</view>
+
+
 				<view class="item">
-					<text class="label">发布时间</text>
-					<text class="desc">{{ item.goodsDemandTime }}</text>
+					<text class="label">支付状态</text>
+					<text class="desc">
+						<text v-if="item.isPay==0">未支付</text>
+						<text v-else-if="item.isPay==1">已支付</text>
+						<text v-else-if="item.isPay==2">支付失败</text>
+						<text v-else-if="item.isPay==3">支付中</text>
+						<text v-else>支付中</text>
+					</text>
+				</view>
+				<view class="item" v-if="item.payTime">
+					<text class="label">采购时间</text>
+					<text class="desc">{{ item.payTime }}</text>
 				</view>
 				<view class="item">
-					<text class="label">下单时间</text>
+					<text class="label">创建时间</text>
 					<text class="desc">{{ item.createTime }}</text>
 				</view>
+				<view style="height: 50px;"></view>
 			</view>
 		</view>
 	</view>

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">{{ item.purchaserName }}</view>
+				<view class="title">{{ item.leaderName }}</view>
 				<view class="state" v-if="item.isPay == 1 && item.payTax == 0">
 					<text class="icon" style="color: #4581fb">&#xe830;</text>
 					<text>已支付</text>
@@ -14,11 +14,10 @@
 					<text class="icon" style="color: #13ce66">&#xe830;</text>
 					<text>已完成</text>
 				</view>
-				<image src="../../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
 					<view class="desc omit">
-						<text>{{ item.goodsQuantity }} {{ item.goodsUnit }}</text>
+						<text>{{ item.netWet }} {{ item.goodsUnit }}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
 					<view class="price">金额 ¥ {{ item.resalePrice }}</view>

pages/news/detail.vue

@@ -2,64 +2,83 @@
 	<view class="cmain">
 		<view class="title">{{ item.title }}</view>
 		<view class="desc">
-			<text class="source">{{ item.source }}</text>
-			<text>{{ item.createTime }}</text>
-			<view class="read">
+			<view>{{ item.source }}<text  class="source" style="margin-left: 10px;" v-if="item.url" @click="toSource(item.url)">原文连接</text></view>
+			<view>{{ item.createTime.substring(0,16) }}</view>
+			<!-- <view class="read">
 				<text class="icon">&#xe639;</text>
 				<text>{{ item.readCount }}</text>
-			</view>
+			</view> -->
 		</view>
 		<u-divider :dot="true"></u-divider>
-		<u-parse :content="item.content"></u-parse>
+		<view v-html="item.content"></view>
+		<!-- <u-parse :content="item.content"></u-parse> -->
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			item: {}
-		};
-	},
-	onLoad(e) {
-		if (e.id) {
-			this.http.request({
-				url: '/level-one-server/app/TbPortNews/getById?id=' + e.id,
-				success: res => {
-					this.item = res.data.data;
-					this.item.content = this.item.content.replace(/\<img/gi, '<img style="border-radius: 5px;"');
-				}
-			});
+	export default {
+		data() {
+			return {
+				item: {createTime:''}
+			};
+		},
+		onLoad(e) {
+			if (e.id) {
+				this.http.request({
+					url: '/level-one-server/app/TbPortNews/getById?id=' + e.id,
+					success: res => {
+						this.item = res.data.data;
+						this.item.content = this.item.content.replace(/\<img/gi,
+							'<img style="border-radius: 5px;"');
+					}
+				});
+			}
+		},
+		methods: {
+			toSource(url) {
+				// #ifdef APP-PLUS
+				plus.runtime.openURL(url) //这里默认使用外部浏览器打开而不是内部web-view组件打开
+				// #endif
+				// #ifdef H5
+				window.open(url)
+				// #endif
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-	.cmain{
+	.cmain {
 		padding: 20px 16px 15px 16px;
+
 		.title {
 			font-weight: bold;
 			color: #192b20;
 			line-height: 32px;
 			font-size: 22px;
 		}
+
 		.desc {
 			margin-top: 10px;
 			overflow: hidden;
 			color: #a0a2a6;
+
 			text {
-				float: left;
+				// float: left;
 			}
+
 			.source {
 				color: #0081ff;
 				margin-right: 10px;
 			}
+
 			margin-right: 10px;
+
 			.read {
 				float: right;
 				margin-top: -2px;
-				.icon{
+
+				.icon {
 					padding-right: 3px;
 					float: left;
 					margin-top: 2px;
@@ -67,4 +86,4 @@ export default {
 			}
 		}
 	}
-</style>
+</style>

pages/personal/bankInfo.vue

@@ -2,14 +2,15 @@
 	<view class="cmain">
 		<view class="form_group">
 			<view class="lable re">开户行</view>
-			<input type="text" placeholder="请输入开户行" v-model="item.bankName" />
+			<input type="text" placeholder="请输入开户行" v-model="item.bankName" readonly disabled />
 		</view>
 		<view class="form_group">
 			<view class="lable re">银行账号</view>
 			<input type="text" placeholder="请输入银行账号" v-model="item.bankAccount" />
 		</view>
 		</br></br></br>
-		<button class="btn" @click="save()">提交</button>
+		<!-- <button class="btn" @click="save()">提交</button> -->
+		<button class="btn back" @click="back()">返回</button>
 	</view>
 </template>
 
@@ -17,34 +18,52 @@
 	export default {
 		data() {
 			return {
-				item: {bankName:'',bankAccount:''},
+				item: {
+					bankName: '',
+					bankAccount: ''
+				},
 			}
 		},
 		onLoad() {
 			this.http.request({
 				url: '/sp-admin/app/AppUser/getBankInfo',
 				success: res => {
-					console.log("res",res)
-					this.item.bankName = res.data.data.bankName;
+					console.log("res", res)
+					this.item.bankName = '云南麻栗坡农村商业银行股份有限公司';
 					this.item.bankAccount = res.data.data.bankAccount;
 				}
 			})
 		},
 		methods: {
+			back() {
+				uni.navigateBack()
+			},
 			save() {
-				let rule = [
-					{ name: 'bankAccount', checkType: 'bank', errorMsg: '银行账号格式不正确' }
-				];
+				let rule = [{
+					name: 'bankAccount',
+					checkType: 'bank',
+					errorMsg: '银行账号格式不正确'
+				}];
 				if (!this.verify.check(this.item, rule)) {
-					uni.showModal({ content: this.verify.error, showCancel: false });
+					uni.showModal({
+						content: this.verify.error,
+						showCancel: false
+					});
 					return false;
 				}
 				this.http.request({
 					url: '/sp-admin/app/AppUser/saveBankInfo',
-					data: { bankName:this.item.bankName, bankAccount:this.item.bankAccount },
+					data: {
+						bankName: this.item.bankName,
+						bankAccount: this.item.bankAccount
+					},
 					success: res => {
-						uni.showToast({title:"提交成功"})
-						uni.switchTab({ url: '/pages/personal/personal' });
+						uni.showToast({
+							title: "提交成功"
+						})
+						uni.switchTab({
+							url: '/pages/personal/personal'
+						});
 					}
 				})
 			}
@@ -53,5 +72,8 @@
 </script>
 
 <style>
-
-</style>
+	.back {
+		background: cadetblue;
+		margin-top: 15px;
+	}
+</style>

pages/personal/group.vue

@@ -0,0 +1,162 @@
+<template>
+	<view class="">
+		<view style="padding: 10px 20px;">
+			<u-divider text="互助组信息"></u-divider>
+			<u-radio-group v-model="groupId" placement="column" :size="20" iconPlacement="right"
+				style="margin-top: 25px;">
+				<view v-for="(item,index) in groupList">
+					<u-radio style="font-size: 14px;"
+						:label="(index+1)+'.'+item.orgName+'('+(item.leaderName?item.leaderName:'未分配组长')+')'"
+						:name="item.id" :customStyle="{marginBottom: '18px'}" :labelSize="19"></u-radio>
+					<u-divider></u-divider>
+				</view>
+			</u-radio-group>
+		</view>
+		<view style="height: 50px;"></view>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="f">
+					<button class="btn" @click="apply()">申请加入</button>
+				</view>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				groupId: undefined,
+				groupList: [],
+			};
+		},
+		onLoad() {
+
+		},
+		onShow() {
+			this.checkGroup()
+		},
+		methods: {
+			getGroupList() {
+				this.http.request({
+					url: '/level-one-server/app/TbGroup/getList',
+					data: {
+						pageNo: 1,
+						pageSize: 200
+					},
+					success: res => {
+						this.groupList = 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;
+	}
+
+	.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;
+	}
+</style>

pages/personal/my.vue

@@ -34,9 +34,9 @@
 				<input class="r" v-model="person.address" :disabled="enable" />
 			</view>
 		</view>
-		<view>
+		<!-- <view>
 			<button class="btn" @click="edit">编辑资料</button>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -104,7 +104,7 @@
 	page {
 		background-color: $pg;
 	}
-	
+
 	.con{
 		background-color: #fff;
 		margin: 20px;

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

@@ -7,168 +7,55 @@
 		</view>
 		<view class="list animated fadeInDown">
 			<!--只有外籍商户和收购商才需要手动认证-->
-			<view class="message _error" @click="go('/pages/authentication/index')" v-if="user.userType == 5 && user.auth == 0">
+			<view class="message _error" @click="go('/pages/authentication/index')"
+				v-if="user.userType == 5 && user.auth == 0">
 				<text class="icon">&#xe64e;</text>
 				<text>你还未认证，请先认证</text>
 				<text class="icon" style="float: right">&#xe8f2;</text>
 			</view>
-			<view class="message _error" @click="go('/pages/authentication/purchaser/index')" v-if="user.userType == 3 && user.auth == 0">
+			<view class="message _error" @click="go('/pages/authentication/purchaser/index')"
+				v-if="user.userType == 3 && user.auth == 0">
 				<text class="icon">&#xe64e;</text>
 				<text>你还未认证，请先认证</text>
 				<text class="icon" style="float: right">&#xe8f2;</text>
 			</view>
-			<view class="message _info" @click="go('/pages/face/faceRegister')" v-if="(user.userType == 1 || user.userType == 2) && user.face == 0">
+			<view class="message _info" @click="go('/pages/face/faceRegister')"
+				v-if="(user.userType == 1 || user.userType == 2) && user.face == 0">
 				<text class="icon">&#xe78d;</text>
 				<text>你还未人脸认证，请先人脸认证</text>
 				<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">&#xe643;</text>
+				<text>人脸已认证<text style="color: blue;margin-left: 5px;"></text></text>
 			</view>
 			<!--用户信息-->
-			<view class="user">
+			<view class="user" style="display: flex;">
 				<image src="../../static/icon/user.png" mode="widthFix" class="head"></image>
 				<view class="con">
-					<view class="nickName omit">{{ 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="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 == 4">司机</view>
 					<view class="tag" v-if="user.userType == 5">商户</view>
 					<view class="tag" v-if="user.userType == 6">合作社</view>
-					<view class="tag" style="margin-left: 0.5rem;" v-if="user.userType == 1" @click="go('/pages/wallet/wallet')">服务点数: {{ user.wallet }}</view>
+					<view class="tag" style="margin-left: 0.5rem;" v-if="user.userType == 1||user.userType == 2"
+						@click="go('/pages/wallet/wallet')">服务点数: {{ user.wallet }}</view>
 				</view>
-				<text class="icon edit" @click="go('/pages/personal/my')">&#xe645;</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>
@@ -189,162 +76,264 @@
 					<text class="title">修改密码</text>
 					<text class="icon arrow">&#xe8f2;</text>
 				</view>
+				<view class="s_item " @click="go('/pages/personal/group')" v-if="user.userType==1&&!user.groupName">
+					<text class="icon ic">&#xe686;</text>
+					<text class="title" style="color: firebrick;;font-weight: bold;">加入互助组</text>
+					<text class="icon arrow">&#xe8f2;</text>
+				</view>
+				<view class="s_item ">
+					<text class="icon ic">&#xe622;</text>
+					<text class="title">APP版本 {{version}}</text>
+				</view>
 			</view>
 			<button class="btn exit" @click="exitLogin()">退出登录</button>
+			<button class="btn exit" @click="cancelAccount()">注销账号</button>
+		</view>
+		<view class="version">
+			<view>
+				<view>Copyright@2024-2030</view>
+				<view>天保国际物流投资有限公司版权所有</view>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			user: {}
-		};
-	},
-	onLoad() {
-		
-	},
-	onShow() {
-		this.user = this.getUser();
-		if (!this.hasAuth()) {
+	export default {
+		data() {
+			return {
+				user: {},
+				version: uni.getAppBaseInfo().appVersion
+			};
+		},
+		onLoad() {
+
+		},
+		onShow() {
+			this.user = this.getUser();
 			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;
-					uni.setStorageSync('info', this.user);
-				}
-			});
-		};
-		if(this.user.userType===1){
-			this.http.request({
-				url: '/level-one-server/app/TbPeople/getById',
-				data: { id: this.user.fkId },
-				success: res => {
-					this.user.wallet = res.data.data.wallet;
+					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);
 				}
 			});
-		}
-	},
-	methods: {
-		order() {
-			if (!this.hasAuth()) {
-				uni.navigateTo({ url: '/pages/authentication/index' });
-				return;
-			}
-			//组长
-			if (this.user.userType == 2) {
-				uni.navigateTo({ url: 'user' });
-			}
-			//外籍商户
-			if (this.user.userType == 5) {
-				uni.navigateTo({ url: '/pages/market/one/merchant/order/list' });
-			}
-			//收购商
-			if (this.user.userType == 3) {
-				uni.navigateTo({ url: '/pages/market/two/purchaser/order/list' });
-			}
-		},
-		wallet() {
-			if (!this.hasAuth() && this.user.userType == 1) {
-				uni.navigateTo({ url: '/pages/wallet/wallet' });
-				return;
-			}
-		},
-		go(url) {
-			if (!this.hasAuth() && this.user.userType == 5) {
-				uni.navigateTo({ url: '/pages/authentication/index' });
-				return;
-			}
-			if (!this.hasAuth() && this.user.userType == 3) {
-				uni.navigateTo({ url: '/pages/authentication/purchaser/index' });
-				return;
+			if (this.user.userType === 1) {
+				this.http.request({
+					url: '/level-one-server/app/TbPeople/getById',
+					data: {
+						id: this.user.fkId
+					},
+					success: res => {
+						this.user.wallet = res.data.data.wallet;
+						uni.setStorageSync('info', this.user);
+					}
+				});
 			}
-			uni.navigateTo({ url: url });
 		},
-		exitLogin() {
-			let param = {
-				appUserId: this.getUser().id
-			};
-			uni.showModal({
-				title: '提示',
-				content: '确定注销登录?',
-				success: res => {
-					if (res.confirm) {
-						uni.removeStorageSync('token');
-						uni.removeStorageSync('info');
-						uni.removeStorageSync('menu');
-						uni.redirectTo({ url: '/pages/login/login' });
-						this.http.request({
-							url: '/sp-admin/app/AppUser/logout',
-							data: param,
-							success: res => {
+		methods: {
+			makePhoneCall(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				});
+			},
+			order() {
+				if (!this.hasAuth()) {
+					uni.navigateTo({
+						url: '/pages/authentication/index'
+					});
+					return;
+				}
+				//组长
+				if (this.user.userType == 2) {
+					uni.navigateTo({
+						url: 'user'
+					});
+				}
+				//外籍商户
+				if (this.user.userType == 5) {
+					uni.navigateTo({
+						url: '/pages/market/one/merchant/order/list'
+					});
+				}
+				//收购商
+				if (this.user.userType == 3) {
+					uni.navigateTo({
+						url: '/pages/market/two/purchaser/order/list'
+					});
+				}
+			},
+			
+			wallet() {
+				if (!this.hasAuth() && this.user.userType == 1) {
+					uni.navigateTo({
+						url: '/pages/wallet/wallet'
+					});
+					return;
+				}
+			},
+			go(url) {
+				if (!this.hasAuth() && this.user.userType == 5) {
+					uni.navigateTo({
+						url: '/pages/authentication/index'
+					});
+					return;
+				}
+				if (!this.hasAuth() && this.user.userType == 3) {
+					uni.navigateTo({
+						url: '/pages/authentication/purchaser/index'
+					});
+					return;
+				}
+				uni.navigateTo({
+					url: url
+				});
+			},
+			exitLogin() {
+				let param = {
+					appUserId: this.getUser().id
+				};
+				uni.showModal({
+					title: '提示',
+					content: '确定注销登录?',
+					success: res => {
+						if (res.confirm) {
+							uni.removeStorageSync('token');
+							uni.removeStorageSync('info');
+							uni.removeStorageSync('menu');
+							uni.redirectTo({
+								url: '/pages/login/login'
+							});
+							this.http.request({
+								url: '/sp-admin/app/AppUser/logout',
+								data: param,
+								success: res => {
 
-							}
-						});
+								}
+							});
+						}
 					}
-				}
-			});
-		}
-	}
-};
+				});
+			},
+			cancelAccount() {
+				let param = {
+					id: this.getUser().id
+				};
+				uni.showModal({
+					title: '提示',
+					content: '确定注销账号?',
+					success: res => {
+						if (res.confirm) {
+							uni.removeStorageSync('token');
+							uni.removeStorageSync('info');
+							uni.removeStorageSync('menu');
+							uni.redirectTo({
+								url: '/pages/login/login'
+							});
+							this.http.request({
+								url: '/sp-admin/app/AppUser/delete',
+								data: param,
+								success: res => {}
+							});
+						}
+					}
+				});
+			}
+	},
+	};
 </script>
 
 <style lang="scss">
-page {
-	background-color: #f5f5f5;
-}
-.my_top {
-	position: relative;
-	overflow: hidden;
-	image {
-		width: 100%;
+	page {
+		background-color: #f5f5f5;
 	}
-}
-.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;
+
+	.my_top {
+		position: relative;
+		overflow: hidden;
+
+		image {
+			width: 100%;
 		}
-		.con {
-			float: left;
-			padding-left: 15px;
-			width: 60%;
-			.nickName {
-				font-size: 17px;
-				font-weight: bold;
+	}
+
+	.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;
 			}
-			.tag {
-				background-color: #6799ad;
-				color: white;
+
+			.con {
 				float: left;
-				font-size: 13px;
-				padding: 2px 6px;
-				border-radius: 5px;
-				margin-top: 6px;
+				padding-left: 15px;
+				width: 80%;
+
+				.nickName {
+					font-size: 16px;
+					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;
 			}
 		}
-		.edit {
-			float: right;
-			font-size: 20px;
-			margin-top: 17px;
-		}
 	}
-}
-.exit {
-	margin-top: 20px;
-	background-color: white;
-	color: #f44336;
-}
-</style>
+
+	.exit {
+		margin-top: 20px;
+		background-color: white;
+		color: #f44336;
+	}
+
+	.version {
+		margin-left: 15%;
+		position: fixed;
+		bottom: 25px;
+		color: #888484;
+		text-align: center;
+	}
+</style>