Merge branch 'feature/asyncOrder' of http://git.aseanbusiness.cn/qzyReal/market-app-ui into feature/asyncOrder

# Conflicts:
#	common/http.js

common/http.js

@@ -1,8 +1,13 @@
+<<<<<<< .mine
 // const ip = 'http://192.168.88.12:8080'; //线下
 const ip = 'http://hs-server.aseanbusiness.cn'; //线上
+=======
+const ip = 'http://192.168.88.36:8080'; //线下
+//const ip = 'http://114.118.9.159:8080/prod-api'; //线上
+>>>>>>> .theirs
 /**
  * 封装的http请求
- */
+ */ 
 const request = (opt) => {
 	opt = opt || {};
 	opt.url = ip + opt.url || '';

components/cmd-circle/cmd-circle.vue

@@ -0,0 +1,318 @@
+<template>
+  <view class="cmd-circle">
+    <canvas :canvas-id="cid" :style="calCircleStyle"></canvas>
+  </view>
+</template>
+
+<script>
+  /**
+   * 进度圈组件  
+   * @description 用圈显示一个操作完成的百分比时，为用户显示该操作的当前进度和状态。  
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=259  
+   * @property {String} cid 画布编号 - 默认defaultCanvas  
+   * @property {String} type 进度圈类型 - 圆圈形：circle、仪表盘：dashboard，默认圆圈形：circle  
+   * @property {Number} percent 进度圈百分比值 - 显示范围0-100 ，可能数比较大就需要自己转成百分比的值  
+   * @property {Boolean} show-info 进度圈进度状态信息 - 显示进度数值或状态图标，默认true  
+   * @property {String} font-color 进度圈文字信息颜色  
+   * @property {String} font-size 进度圈文字信息大小 - 默认：14  
+   * @property {String} status 进度圈状态 - 正常：normal、完成：success、失败：exception，默认正常：normal  
+   * @property {Number} stroke-width 进度圈线条宽度 - 建议在条线的宽度范围：1-50，与进度条显示宽度有关，默认：6  
+   * @property {String} stroke-color 进度圈的颜色 - 设置后status状态无效  
+   * @property {String} stroke-background 进度圈的底圈颜色 - 默认：#eeeeee  
+   * @property {String} stroke-shape 进度圈两端的形状 - 圆：round、方直角：square，默认圆：round  
+   * @property {Number} width 进度圈布宽度 - 默认80  
+   * @property {String} gap-degree 进度圈形缺口角度 - 可取值 0 ~ 360，仅支持类型：circle  
+   * @property {String} gap-position 进度圈形缺口位置 - 可取值'top', 'bottom', 'left', 'right'，仅支持类型：circle  
+   * @example <cmd-circle id="circle1" type="circle" :percent="75"></cmd-circle>  
+   */
+  export default {
+    name: "cmd-circle",
+
+    props: {
+      // 画布编号 默认defaultCanvas
+      cid: {
+        type: String,
+        default: "defaultCanvas"
+      },
+      // 圈类型默认：circle，可选 circle dashboard
+      type: {
+        type: String,
+        validator: val => {
+          return ['circle', 'dashboard'].includes(val);
+        },
+        default: 'circle'
+      },
+      // 圈进度百分比值
+      percent: {
+        type: Number,
+        validator: val => {
+          return val >= 0 && val <= 100;
+        },
+        default: 0
+      },
+      // 圈是否显示进度数值或状态图标
+      showInfo: {
+        type: Boolean,
+        default: true
+      },
+      // 圈文字信息颜色
+      fontColor: {
+        type: String,
+        default: "#595959"
+      },
+      // 圈文字信息大小 默认14
+      fontSize: {
+        type: Number,
+        default: 14
+      },
+      // 圈进度状态，可选：normal success exception
+      status: {
+        type: String,
+        validator: val => {
+          return ['normal', 'success', 'exception'].includes(val);
+        },
+        default: 'normal'
+      },
+      // 圈线条宽度1-50，与width有关
+      strokeWidth: {
+        type: Number,
+        default: 6
+      },
+      // 圈的颜色，设置后status状态无效
+      strokeColor: {
+        type: String,
+        default: ''
+      },
+      // 圈的底圈颜色 默认：#eeeeee
+      strokeBackground: {
+        type: String,
+        default: '#eeeeee'
+      },
+      // 圈两端的形状 可选：'round', 'square'
+      strokeShape: {
+        type: String,
+        validator: val => {
+          return ['round', 'square'].includes(val);
+        },
+        default: 'round'
+      },
+      // 圈画布宽度
+      width: {
+        type: Number,
+        default: 80
+      },
+      // 圈缺口角度，可取值 0 ~ 360，仅支持类型：circle  
+      gapDegree: {
+        type: Number,
+        validator: val => {
+          return val >= 0 && val <= 360;
+        },
+        default: 360
+      },
+      // 圈缺口开始位置,可取值'top', 'bottom', 'left', 'right'，仅支持类型：circle  
+      gapPosition: {
+        type: String,
+        validator: val => {
+          return ['top', 'bottom', 'left', 'right'].includes(val);
+        },
+        default: 'top'
+      }
+    },
+
+    data() {
+      return {
+        // 画布实例
+        ctx: {},
+        // 圈半径
+        width2px: ""
+      }
+    },
+
+    computed: {
+      // 计算设置圈样式
+      calCircleStyle() {
+        return `width: ${this.width}px;
+				height: ${this.width}px;`
+      },
+      // 计算圈状态
+      calStatus() {
+        let status = {}
+        switch (this.status) {
+          case 'normal':
+            status = {
+              color: "#1890ff",
+              value: 1
+            };
+            break;
+          case 'success':
+            status = {
+              color: "#52c41a",
+              value: 2
+            };
+            break;
+          case 'exception':
+            status = {
+              color: "#f5222d",
+              value: 3
+            };
+            break;
+        }
+        return status
+      },
+      // 计算圈缺口角度
+      calGapDegree() {
+        return this.gapDegree <= 0 ? 360 : this.gapDegree
+      },
+      // 计算圈缺口位置
+      calGapPosition() {
+        let gapPosition = 0
+        switch (this.gapPosition) {
+          case 'bottom':
+            gapPosition = 90;
+            break;
+          case 'left':
+            gapPosition = 180;
+            break;
+          case 'top':
+            gapPosition = 270;
+            break;
+          case 'right':
+            gapPosition = 360;
+            break;
+        }
+        return gapPosition
+      },
+    },
+
+    watch: {
+      // 监听百分比值改变
+      percent(val) {
+        this.drawStroke(val);
+      }
+    },
+
+    mounted() {
+      // 创建画布实例
+      this.ctx = uni.createCanvasContext(this.cid, this)
+      // upx转px 圈半径大小
+      this.width2px = uni.upx2px(this.width)
+      // 绘制初始 
+      this.$nextTick(() => {
+        this.drawStroke(this.percent)
+      })
+    },
+
+    methods: {
+      // 绘制圈
+      drawStroke(percent) {
+        percent = percent >= 100 ? 100 : percent < 0 ? 0 : percent
+        // 圈条进度色
+        let color = this.strokeColor || this.calStatus.color
+        // 是否圈中心显示信息
+        if (this.showInfo) {
+          switch (this.calStatus.value) {
+            case 1:
+              if (percent >= 100) {
+                // 设置打勾
+                this.drawSuccess()
+                percent = 100
+                color = "#52c41a"
+              } else {
+                // 设置字体
+                this.drawText(percent)
+              }
+              break;
+            case 2:
+              // 设置打勾
+              this.drawSuccess()
+              percent = 100
+              color = "#52c41a"
+              break;
+            case 3:
+              // 设置打叉
+              this.drawException()
+              percent = 0
+              color = "#f5222d"
+              break;
+            default:
+              break;
+          }
+        }
+        // 缺口
+        let gapPosition = this.calGapPosition
+        let gapDegree = this.calGapDegree
+        // 仪表固定
+        if (this.type === "dashboard") {
+          gapPosition = 135
+          gapDegree = 270
+        }
+        // 圈型条宽
+        this.ctx.setLineCap(this.strokeShape)
+        this.ctx.setLineWidth(this.strokeWidth)
+        // 位置原点
+        this.ctx.translate(this.width2px, this.width2px)
+        // 缺口方向 
+        this.ctx.rotate(gapPosition * Math.PI / 180)
+        // 圈底 
+        this.ctx.beginPath()
+        this.ctx.arc(0, 0, this.width2px - this.strokeWidth, 0, gapDegree * Math.PI / 180)
+        this.ctx.setStrokeStyle(this.strokeBackground)
+        this.ctx.stroke()
+        // 圈进度 
+        this.ctx.beginPath()
+        this.ctx.arc(0, 0, this.width2px - this.strokeWidth, 0, percent * gapDegree * Math.PI / 18000)
+        this.ctx.setStrokeStyle(color)
+        this.ctx.stroke()
+        // 绘制
+        this.ctx.draw()
+      },
+      // 绘制文字格式
+      drawText(percent) {
+        this.ctx.beginPath()
+        this.ctx.setFontSize(this.fontSize)
+        this.ctx.setFillStyle(this.fontColor)
+        this.ctx.setTextAlign('center')
+        this.ctx.fillText(`${percent}%`, this.width2px, this.width2px + this.fontSize / 2)
+        this.ctx.stroke()
+      },
+      // 绘制成功打勾
+      drawSuccess() {
+        let x = this.width2px - this.fontSize / 2
+        let y = this.width2px + this.fontSize / 2
+        this.ctx.beginPath()
+        this.ctx.setLineCap('round')
+        this.ctx.setLineWidth(this.fontSize / 4)
+        this.ctx.moveTo(this.width2px, y)
+        this.ctx.lineTo(y, x)
+        this.ctx.moveTo(this.width2px, y)
+        this.ctx.lineTo(x, this.width2px)
+        this.ctx.setStrokeStyle("#52c41a")
+        this.ctx.stroke()
+      },
+      // 绘制异常打叉
+      drawException() {
+        let x = this.width2px - this.fontSize / 2
+        let y = this.width2px + this.fontSize / 2
+        this.ctx.beginPath()
+        this.ctx.setLineCap('round')
+        this.ctx.setLineWidth(this.fontSize / 4)
+        this.ctx.moveTo(x, x)
+        this.ctx.lineTo(y, y)
+        this.ctx.moveTo(y, x)
+        this.ctx.lineTo(x, y)
+        this.ctx.setStrokeStyle("#f5222d")
+        this.ctx.stroke()
+      }
+    }
+  };
+</script>
+
+<style>
+  .cmd-circle {
+    display: inline-block;
+    box-sizing: border-box;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+</style>

pages.json

@@ -432,6 +432,14 @@
 
 		},
 		{
+			"path": "pages/market/two/leader/feeDetail",
+			"style": {
+				"navigationBarTitleText": "缴税费",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
 			"path": "pages/market/two/purchaser/buy/buy",
 			"style": {
 				"navigationBarTitleText": "收购商购买",
@@ -462,7 +470,25 @@
 			}
 
 		}
-	],
+	    ,{
+            "path" : "pages/market/one/confirm/people",
+            "style" :
+            {
+                "navigationBarTitleText": "边民确认",
+                "enablePullDownRefresh": false
+            }
+
+        }
+        ,{
+            "path" : "pages/market/one/confirm/apply",
+            "style" :
+            {
+                "navigationBarTitleText": "申报确认",
+                "enablePullDownRefresh": false
+            }
+
+        }
+    ],
 	"tabBar": {
 		"color": "#7A7E83",
 		"selectedColor": "#4581fb",
@@ -493,4 +519,4 @@
 		"navigationBarTitleText": "边民互市贸易",
 		"navigationBarBackgroundColor": "#4581fb"
 	}
-}
+}

pages/authentication/face.vue

@@ -1,19 +1,41 @@
 <template>
-	<view>
-		
+	<view class="cmain">
+		<view class="face">
+			<cmd-circle stroke-color="#4581fb" :strokeWidth="13" type="circle" :percent="parseInt(progress.toFixed(0))" :width="200"></cmd-circle>
+			<view class="desc">请误遮挡眼睛</view>
+		</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
-		}
+export default {
+	data() {
+		return {
+			progress: 0
+		};
+	},
+	onLoad() {
+		let increment = 100 / 3; // 每秒递增的进度值
+		let countdown = setInterval(() => {
+			this.progress += increment;
+			if (this.progress >= 100) {
+				this.progress = 100;
+				clearInterval(countdown); // 达到100后清除定时器
+				uni.$emit('face');
+				uni.navigateBack();
+			}
+		}, 1000);
 	}
+};
 </script>
 
 <style lang="scss">
-
+.face {
+	text-align: center;
+	padding-top: 30px;
+	.desc {
+		margin-top: 15px;
+		color: #969696;
+	}
+}
 </style>

pages/market/one/confirm/apply.vue

@@ -0,0 +1,136 @@
+<template>
+	<view>
+		<view class="goodsList">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="title">{{ item.enterpriseName }}
+					<view class="state" v-if="item.peopleConfirmStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>未确认</text>
+					</view>
+					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.apply == 0">
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>已确认</text>
+					</view>
+					<view class="state" v-if="item.resaleStatus == 1">
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>已转售</text>
+					</view>
+					<view class="state" v-if="item.finishStatus == 3">
+						<text class="icon" style="color: #f44336">&#xe622;</text>
+						<text>已取消</text>
+					</view>
+				</view>
+
+				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
+				<view class="con">
+					<view class="productName omit">{{ item.goodsNames }}</view>
+					<view class="desc omit">
+						<text>重量 {{ item.totalWeight }}</text>
+						<text>{{ item.tradeAreaName }}</text>
+					</view>
+					<view class="price">¥ {{ item.totalPrice }}</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">{{ item.createTime }}</view>
+					<template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 0">
+						<view class="an" style="color: #f44336"  @click.stop="applyOrder(item.id)">进口申报确认</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>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			param: {
+				pageNo: 1,
+				pageSize: 10
+			},
+			user:this.getUser(),
+			list: [],
+			loadMore: true,
+			confirmType: 1,//边民确认类型[1=刷脸,2=指纹]
+			id: '',
+			flag: '',
+		};
+	},
+	onLoad() {
+		this.getData();
+		uni.$on('face', res => {
+			if(this.flag == 2) {
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/applyOrder',
+					data: { orderId: this.id },
+					success: resp => {
+						uni.showToast({ title: '进口申报确认成功' });
+						this.refresh();
+					}
+				});
+			}
+		})
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/getList',
+				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);
+					}
+				}
+			});
+		},
+		detail(item) {
+			uni.navigateTo({url: '/pages/market/one/leader/detail?id=' + item.id});
+		},
+		resale(item) {
+			uni.navigateTo({url: '/pages/market/two/leader/resale?item=' + JSON.stringify(item)});
+		},
+		// 刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNo = 1;
+			this.list = [];
+			this.getData();
+		},
+		//边民进口申报确认
+		applyOrder(id) {
+			this.id = id;
+			this.flag = 2;
+			uni.navigateTo({url: '/pages/authentication/face'});
+		},
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.refresh();
+			uni.stopPullDownRefresh();
+		}, 1000);
+	},
+	//上拉加载
+	onReachBottom() {
+		if (this.loadMore) {
+			this.param.pageNo++;
+			this.getData();
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+.state{
+	margin-right: -70px;
+}
+</style>

pages/market/one/confirm/people.vue

@@ -0,0 +1,136 @@
+<template>
+	<view>
+		<view class="goodsList">
+			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
+				<view class="title">{{ item.enterpriseName }}
+					<view class="state" v-if="item.peopleConfirmStatus == 0">
+						<text class="icon">&#xe830;</text>
+						<text>未确认</text>
+					</view>
+					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.apply == 0">
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>已确认</text>
+					</view>
+					<view class="state" v-if="item.resaleStatus == 1">
+						<text class="icon" style="color: #13ce66">&#xe830;</text>
+						<text>已转售</text>
+					</view>
+					<view class="state" v-if="item.finishStatus == 3">
+						<text class="icon" style="color: #f44336">&#xe622;</text>
+						<text>已取消</text>
+					</view>
+				</view>
+
+				<image src="../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
+				<view class="con">
+					<view class="productName omit">{{ item.goodsNames }}</view>
+					<view class="desc omit">
+						<text>重量 {{ item.totalWeight }}</text>
+						<text>{{ item.tradeAreaName }}</text>
+					</view>
+					<view class="price">¥ {{ item.totalPrice }}</view>
+				</view>
+				<view class="clear"></view>
+				<view class="op">
+					<view class="date">{{ item.createTime }}</view>
+					<template v-if="item.peopleConfirmStatus == 0">
+						<view class="an" style="color: #f44336"  @click.stop="confirmOrder(item.id)">边民确认</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>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			param: {
+				pageNo: 1,
+				pageSize: 10
+			},
+			user:this.getUser(),
+			list: [],
+			loadMore: true,
+			confirmType: 1,//边民确认类型[1=刷脸,2=指纹]
+			id: '',
+			flag: '',
+		};
+	},
+	onLoad() {
+		this.getData();
+		uni.$on('face', res => {
+			if(this.flag == 1) {
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/confirmOrder',
+					data: { orderId: this.id , confirmType: this.confirmType},
+					success: resp => {
+						uni.showToast({ title: '订单确认成功' });
+						this.refresh();
+					}
+				});
+			}
+		})
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/getList',
+				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);
+					}
+				}
+			});
+		},
+		detail(item) {
+			uni.navigateTo({url: '/pages/market/one/leader/detail?id=' + item.id});
+		},
+		resale(item) {
+			uni.navigateTo({url: '/pages/market/two/leader/resale?item=' + JSON.stringify(item)});
+		},
+		// 刷新数据
+		refresh() {
+			this.loadMore = true;
+			this.param.pageNo = 1;
+			this.list = [];
+			this.getData();
+		},
+		//边民确认订单
+		confirmOrder(id) {
+			this.id = id;
+			this.flag = 1;
+			uni.navigateTo({url: '/pages/authentication/face'});
+		},
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.refresh();
+			uni.stopPullDownRefresh();
+		}, 1000);
+	},
+	//上拉加载
+	onReachBottom() {
+		if (this.loadMore) {
+			this.param.pageNo++;
+			this.getData();
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+.state{
+	margin-right: -70px;
+}
+</style>

pages/market/one/leader/detail.vue

@@ -5,9 +5,9 @@
 				<u-divider text="订单信息"></u-divider>
 				<view class="item" style="padding-top: 0px">
 					<text class="label">订单编号</text>
-					<text class="desc">{{param.orderId}}</text>
+					<text class="desc">{{item.tradeNo}}</text>
 				</view>
-			<!-- 	<view class="item">
+				<!-- <view class="item">
 					<text class="label">申报单号</text>
 					<text class="desc">13454334567</text>
 				</view> -->
@@ -39,10 +39,10 @@
 					<text class="label">价格</text>
 					<text class="desc">{{item.totalPrice}}</text>
 				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">边民</text>
 					<text class="desc" style="color: blue;" @click="members(item.orderId)">查看</text>
-				</view>
+				</view> -->
 				<view class="item">
 					<text class="label">发布时间</text>
 					<text class="desc">{{item.goodsTransitCreateTime}}</text>
@@ -88,25 +88,15 @@ export default {
 		if (e.id) {
 			this.param.orderId = e.id
 			this.http.request({
-				url: '/level-one-server/app/TbOrder/getById?id=' + e.id,
-				success: res => {
-					// this.item = res.data.data;
-					console.log('asd:' + JSON.stringify(res));
-				}
-			});
-		}
-		this.orderDetail()
-	},
-	methods: {
-		orderDetail() {
-			this.http.request({
 				url: '/level-one-server/app/TbOrder/orderDetail',
 				data: this.param,
 				success: res => {
 					this.item = res.data.data;
 				}
 			});
-		},
+		}
+	},
+	methods: {
 		//查看边民
 		members(id) {
 			uni.navigateTo({

pages/market/one/leader/order.vue

@@ -39,7 +39,10 @@
 					<template v-if="item.peopleConfirmStatus == 0">
 						<view class="an" style="color: #f44336"  @click.stop="confirmOrder(item.id)">边民确认</view>
 					</template>
-					<template v-if="item.peopleConfirmStatus == 1 && item.apply == 1 && item.resaleStatus == 0">
+					<template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 0">
+						<view class="an" style="color: #f44336"  @click.stop="applyOrder(item.id)">进口申报确认</view>
+					</template>
+					<template v-if="item.peopleConfirmStatus == 1 && item.applyConfirmStatus == 1 && item.apply == 1 && item.resaleStatus == 0">
 						<view class="an" style="color: #f44336"  @click.stop="resale(item)">订单转售</view>
 					</template>
 					<!-- <template v-if="item.peopleConfirmStatus == 0">
@@ -64,13 +67,23 @@ export default {
 				{
 					name: '全部',
 					peopleConfirmStatus: '',	//边民确认状态
+					applyConfirmStatus: '',		//进口申报确认状态
 					apply: '',					//订单申报状态
 					finishStatus: '',			//订单完成状态
 					resaleStatus: ''			//订单转售状态
 				},
 				{
-					name: '待确认',
+					name: '边民确认',
 					peopleConfirmStatus: 0,
+					applyConfirmStatus: 0,
+					apply: 0,
+					finishStatus: 0,
+					resaleStatus: 0
+				},
+				{
+					name: '申报确认',
+					peopleConfirmStatus: 1,
+					applyConfirmStatus: 0,
 					apply: 0,
 					finishStatus: 0,
 					resaleStatus: 0
@@ -78,6 +91,7 @@ export default {
 				{
 					name: '申报中',
 					peopleConfirmStatus: 1,
+					applyConfirmStatus: 1,
 					apply: 0,
 					finishStatus: 0,
 					resaleStatus: 0
@@ -85,6 +99,7 @@ export default {
 				{
 					name: '已完成',
 					peopleConfirmStatus: 1,
+					applyConfirmStatus: 1,
 					apply: 1,
 					finishStatus: 1,
 					resaleStatus: 0
@@ -92,6 +107,7 @@ export default {
 				{
 					name: '已转售',
 					peopleConfirmStatus: 1,
+					applyConfirmStatus: 1,
 					apply: 1,
 					finishStatus: 1,
 					resaleStatus: 1
@@ -111,11 +127,34 @@ export default {
 			user:this.getUser(),
 			list: [],
 			loadMore: true,
-			user: this.getUser()
+			confirmType: 1,//边民确认类型[1=刷脸,2=指纹]
+			id: '',
+			flag: '',
 		};
 	},
 	onLoad() {
 		this.getData();
+		uni.$on('face', res => {
+			if(this.flag == 1) {
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/confirmOrder',
+					data: { orderId: this.id , confirmType: this.confirmType},
+					success: resp => {
+						uni.showToast({ title: '订单确认成功' });
+						this.refresh();
+					}
+				});
+			} else if(this.flag == 2) {
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/applyOrder',
+					data: { orderId: this.id },
+					success: resp => {
+						uni.showToast({ title: '进口申报确认成功' });
+						this.refresh();
+					}
+				});
+			}
+		})
 	},
 	methods: {
 		getData() {
@@ -139,7 +178,8 @@ export default {
 		// 点击tab切换
 		click(e) {
 			console.log(e);
-			this.param.peopleConfirmStatus = e.appeopleConfirmStatusply;
+			this.param.peopleConfirmStatus = e.peopleConfirmStatus;
+			this.param.applyConfirmStatus = e.applyConfirmStatus;
 			this.param.apply = e.apply;
 			this.param.finishStatus = e.finishStatus;
 			this.param.resaleStatus = e.resaleStatus;
@@ -160,14 +200,15 @@ export default {
 		},
 		//边民确认订单
 		confirmOrder(id) {
-			this.http.request({
-				url: '/level-one-server/app/TbPeople/confirmOrder',
-				data: { orderId: id },
-				success: resp => {
-					uni.showToast({ title: '操作成功' });
-					this.refresh();
-				}
-			});
+			this.id = id;
+			this.flag = 1;
+			uni.navigateTo({url: '/pages/authentication/face'});
+		},
+		//边民进口申报确认
+		applyOrder(id) {
+			this.id = id;
+			this.flag = 2;
+			uni.navigateTo({url: '/pages/authentication/face'});
 		},
 		// 取消订单
 		confirm(id) {

pages/market/one/merchant/order/detail.vue

@@ -2,68 +2,72 @@
 	<view>
 		<view class="cmain">
 			<view class="box order_detail" style="margin-top: 0px">
-				<u-divider text="订单信息"></u-divider>
-				<view class="item" style="padding-top: 0px">
-					<text class="label">订单编号</text>
-					<text class="desc">13454334567</text>
+					<u-divider text="订单信息"></u-divider>
+					<view class="item" style="padding-top: 0px">
+						<text class="label">订单编号</text>
+						<text class="desc">{{item.tradeNo}}</text>
+					</view>
+					<!-- <view class="item">
+						<text class="label">申报单号</text>
+						<text class="desc">13454334567</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.concat}}</text>
+					</view>
+					<view class="item">
+						<text class="label">商品名称</text>
+						<text class="desc">{{item.goodsTransitName}}</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.netWeight}}</text>
+					</view>
+					<view class="item">
+						<text class="label">毛重</text>
+						<text class="desc">{{item.grossWeight}}</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">{{item.goodsTransitCreateTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">下单时间</text>
+						<text class="desc">{{item.orderCreateTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">购买边民组</text>
+						<text class="desc">{{item.groupName}}</text>
+					</view>
+					<view class="item">
+						<text class="label">确认时间</text>
+						<text class="desc">{{item.enterpriseConfirmTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">进境时间</text>
+						<text class="desc">{{item.entrantTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">进口时间</text>
+						<text class="desc">{{item.importTime}}</text>
+					</view>
+					<view class="item">
+						<text class="label">出互市区时间</text>
+						<text class="desc">{{item.outFrontierTradeTime}}</text>
+					</view>
 				</view>
-				<view class="item">
-					<text class="label">申报单号</text>
-					<text class="desc">13454334567</text>
-				</view>
-				<view class="item">
-					<text class="label">商品名称</text>
-					<text class="desc">胡椒粉</text>
-				</view>
-				<view class="item">
-					<text class="label">计价单位</text>
-					<text class="desc">元/kg</text>
-				</view>
-				<view class="item">
-					<text class="label">净重</text>
-					<text class="desc">34吨</text>
-				</view>
-				<view class="item">
-					<text class="label">毛重</text>
-					<text class="desc">35吨</text>
-				</view>
-				<view class="item">
-					<text class="label">价格</text>
-					<text class="desc">400000元</text>
-				</view>
-				<view class="item">
-					<text class="label">来源国</text>
-					<text class="desc">越南</text>
-				</view>
-				<view class="item">
-					<text class="label">发布时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-				<view class="item">
-					<text class="label">下单时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-				<view class="item">
-					<text class="label">购买边民组</text>
-					<text class="desc">貔貅互助组</text>
-				</view>
-				<view class="item">
-					<text class="label">确认时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-				<view class="item">
-					<text class="label">进境时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-				<view class="item">
-					<text class="label">进口时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-				<view class="item">
-					<text class="label">出互市区时间</text>
-					<text class="desc">2023-07-20 11:38</text>
-				</view>
-			</view>
 		</view>
 	</view>
 </template>
@@ -72,17 +76,20 @@
 export default {
 	data() {
 		return {
-			item: {}
+			item: {},
+			param: {},
 		};
 	},
 	onLoad(e) {
 		if (e.id) {
-			/* 			this.http.request({
-				url: '/level-one-server/app/TbPortNews/getPortNewsDetails?id=' + e.id,
+			this.param.orderId = e.id
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/orderDetail',
+				data: this.param,
 				success: res => {
 					this.item = res.data.data;
 				}
-			}); */
+			});
 		}
 	},
 	methods: {}

pages/market/one/merchant/order/list.vue

@@ -6,22 +6,22 @@
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="title">{{item.enterpriseName}}</view>
-				<view class="state" v-if="item.enterpriseConfirm == 0">
+				<!-- <view class="state" v-if="item.enterpriseConfirm == 0">
 					<text class="icon">&#xe830;</text>
 					<text>待确认</text>
 				</view>
 				<view class="state" v-if="item.enterpriseConfirm == 1">
 					<text class="icon" style="color: #13ce66">&#xe830;</text>
 					<text>已确认</text>
-				</view>
-				<view class="state" v-if="item.enterpriseConfirm == 2">
+				</view> -->
+				<!-- <view class="state" v-if="item.enterpriseConfirm == 2">
 					<text class="icon" style="color: #f44336">&#xe622;</text>
 					<text>已拒绝</text>
 				</view>
 				<view class="state" v-if="item.enterpriseConfirm == 3">
 					<text class="icon" style="color: #00BFFF">&#xe622;</text>
 					<text>等待司机确认</text>
-				</view>
+				</view> -->
 				<image src="../../../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsNames }}</view>
@@ -33,8 +33,8 @@
 				</view>
 				<view class="clear"></view>
 				<view class="op">
-					<view class="date">2022-12-12:12:12</view>
-					<template v-if="item.enterpriseConfirm == 0">
+					<view class="date">{{ item.createTime }}</view>
+					<!-- <template v-if="item.enterpriseConfirm == 0">
 						<view class="an" style="color: #f44336"
 							@click.stop="confirm(item.id, item.goodsId, 2, '确认拒绝？')">拒绝订单</view>
 						<view class="an" style="color: #4581fb"
@@ -45,7 +45,7 @@
 					</template>
 					<template v-if="item.enterpriseConfirm == 4">
 						<view class="an" style="color: #4581fb">物流信息</view>
-					</template>
+					</template> -->
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
@@ -58,10 +58,10 @@
 	export default {
 		data() {
 			return {
-				tab: [{ name: '全部', enterpriseConfirm: '', isOrders: '' },
+				tab: [{ name: '全部', enterpriseConfirm: '', isOrders: '' }/* ,
 					  { name: '待确认', enterpriseConfirm: 0, isOrders: 1 },
 					  { name: '已确认', enterpriseConfirm: 1, isOrders: 1 },
-					  { name: '已拒绝', enterpriseConfirm: 2, isOrders: 0 }
+					  { name: '已拒绝', enterpriseConfirm: 2, isOrders: 0 } */
 				],
 				param: {
 					pageNo: 1,
@@ -76,7 +76,6 @@
 		onLoad() {
 			this.getData();
 			uni.$on("refreshPage", res => {
-				console.log("zzzzz");
 				this.refresh();
 			})
 		},

pages/market/two/leader/detail.vue

@@ -7,53 +7,38 @@
 					<text class="desc">{{ item.orderNo }}</text>
 				</view>
 				<view class="item">
-					<text class="label">收购商</text>
-					<text class="desc">{{ item.acquirerName }}</text>
-				</view>
-				<view class="item">
-					<text class="label">联系号码</text>
-					<text class="desc">{{ item.consigneePhone }}</text>
-				</view>
-				<view class="item">
 					<text class="label">商品名称</text>
-					<text class="desc omit">{{ item.goodsName }}</text>
+					<text class="desc">{{ item.goodsName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">计价单位</text>
-					<text class="desc omit">{{ item.goodsUnit }}</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">
-					<text class="label">来源国</text>
-					<text class="desc">{{ item.goodsFrom }}</text>
+					<text class="desc omit">{{ item.resalePrice}}元</text>
 				</view>
 				<view class="item">
-					<text class="label">状态</text>
-					<text class="desc" v-if="item.orderFinish == 0">已确认</text>
+					<text class="label">收购商</text>
+					<text class="desc">{{ item.purchaserName }}</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 order_detail">
-				<view class="item">
-					<text class="label">收件人</text>
-					<text class="desc omit">{{ item.consigneeName }}</text>
-				</view>
-				<view class="item">
-					<text class="label">联系电话</text>
-					<text class="desc">{{ item.consigneePhone }}</text>
-				</view>
-				<view class="item">
-					<text class="label">收件地址</text>
-					<text class="desc">{{ item.unloadingAddress }}</text>
+			<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>
 	</view>
 </template>
@@ -62,20 +47,34 @@
 export default {
 	data() {
 		return {
-			item: {}
+			item: {},
+			feeItemList: []
 		};
 	},
 	onLoad(e) {
 		if (e.id) {
 			this.http.request({
-				url: '/level-two-server/app/TbOrders/getDetailById?id=' + e.id,
+				url: '/level-two-server/app/TbOrders/getDetailById',
+				data: { ids: e.id },
 				success: res => {
-					this.item = res.data.data;
+					let data = res.data.data;
+					this.item = data[0];
 				}
 			});
 		}
+		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/feeDetail.vue

@@ -0,0 +1,86 @@
+<template>
+	<view>
+		<view class="cmain" v-for="(item,index) in feeItemList">
+			<view class="box order_detail">
+				<view class="item">
+					<text class="label">收费企业：</text>
+					<text class="desc">{{ item.companyName }}</text>
+				</view>
+				<view class="item">
+					<text class="label">收费类型：</text>
+					<text class="desc" v-if="item.feeType ==1">按交易额收取</text>
+					<text class="desc" v-if="item.feeType ==2">按次收取</text>
+				</view>
+				<view class="item" v-if="item.feeType ==1">
+					<text class="label">收费%(按交易额)：</text>
+					<text class="desc"><span style="color: coral;">{{ item.percent }} %</span></text>
+				</view>
+				<view class="item" v-if="item.feeType ==2">
+					<text class="label">收费金额(按次收)：</text>
+					<text class="desc"><span style="color: coral;">{{ item.feeMoney }} 元</span></text>
+				</view>
+				<view class="item">
+					<text class="label">当前订单收取金额：</text>
+					<text class="desc" v-if="item.feeType ==1"><span style="color: coral;">{{ (item.percent * resalePrice)/100}} 元</span></text>
+					<text class="desc" v-if="item.feeType ==2"><span style="color: coral;">{{ item.feeMoney }} 元</span></text>
+				</view>
+			</view>
+		</view>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="f">
+					<button class="btn" @click="pay()">立即缴费</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			resalePrice: '',// 金额
+			id: '',// 订单id
+			feeItemList: [],
+		};
+	},
+	onLoad(e) {
+		if (e.id && e.resalePrice) {
+			this.resalePrice = e.resalePrice;
+			this.id = e.id;
+			this.http.request({
+				url: '/level-two-server/app/TbFeeItem/getList',
+				success: res => {
+					this.feeItemList = res.data.data
+				}
+			});
+		}
+	},
+	methods: {
+		pay() {
+			uni.showModal({
+				title: '提示',
+				content: '确定缴费?',
+				success: res => {
+					if (res.confirm) {
+						this.http.request({
+							url: '/level-two-server/app/TbOrders/payTax?id=' + this.id,
+							success: res => {
+								uni.showToast({ title: '缴费成功' });
+								uni.navigateBack();
+							}
+						});
+					}
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: $pg;
+}
+</style>

pages/market/two/leader/order.vue

@@ -6,7 +6,9 @@
 		<view class="goodsList">
 			<view class="item" v-for="(item, index) in list" :key="index" @click="detail(item)">
 				<view class="title">{{ item.createName }}</view>
-				<view class="state" style="color: #4581fb" v-if="item.orderFinish == 0">已确认</view>
+				<view class="state" style="color: red" v-if="item.isPay == 0">待下单</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>
@@ -14,12 +16,12 @@
 						<text>数量：{{ item.goodsQuantity }}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
-					<view class="price">¥ {{ item.quotation }}</view>
+					<view class="price">¥ {{ item.resalePrice }}</view>
 				</view>
 				<view class="clear"></view>
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
-					<view class="an" style="color: #4581fb">查看物流</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>
@@ -33,9 +35,9 @@ export default {
 	data() {
 		return {
 			tab: [
-				{ name: '全部', goodsStatus: '' },
-				{ name: '已确认', goodsStatus: 0 },
-				{ name: '已完成', goodsStatus: 0 }
+				{ name: '全部', isPay: '', payTax: '', orderFinish: ''},
+				{ name: '已支付', isPay: 1, payTax: 0, orderFinish: 0},
+				{ name: '已完成', isPay: 1, payTax: 1, orderFinish: 1}
 			],
 			param: { pageNo: 1, pageSize: 10 },
 			list: [],
@@ -62,25 +64,13 @@ export default {
 		},
 		//点击tab切换
 		click(e) {
-			this.param.goodsStatus = e.goodsStatus;
+			this.param.isPay = e.isPay;
+			this.param.payTax = e.payTax;
+			this.param.orderFinish = e.orderFinish;
 			this.refresh();
 		},
-		del(id) {
-			uni.showModal({
-				title: '提示',
-				content: '确定删除?',
-				success: res => {
-					if (res.confirm) {
-						this.http.request({
-							url: '/level-one-server/app/TbGoodsTransit/deleteById?id=' + id,
-							success: res => {
-								uni.showToast({ title: '删除成功' });
-								this.refresh();
-							}
-						});
-					}
-				}
-			});
+		payTax(item) {
+			uni.navigateTo({ url: '/pages/market/two/leader/feeDetail?resalePrice=' + item.resalePrice +'&id=' + item.id});
 		},
 		detail(item) {
 			uni.navigateTo({ url: '/pages/market/two/leader/detail?id=' + item.id });

pages/market/two/leader/resale.vue

@@ -39,27 +39,13 @@
 						</br>
 						<view class="itm">当前费项收取金额以最后结算时为准</view>
 					</u-collapse-item>
-					<!-- <u-collapse-item title="会员有什么用?" class="cell_title">
-						<view class="itm">1、普能会员：只浏览平台信息，不可下载平台上的相关附件。</view>
-						<view class="itm">2、专业会员：上传展示产品与服务内容、上传相关附件，后台审核方可在平台展示。可下载其他专业会员上传的附件。</view>
-						<view class="itm">3、专家会员：只有专家会员才能接受评测邀请。</view>
-					</u-collapse-item>
-					<u-collapse-item title="积分如何使用?" class="cell_title"><text class="coll">获得的积分可以去线下店铺使用享受折扣哦</text></u-collapse-item>
-					<u-collapse-item title="如何申请高级会员?" class="cell_title">
-						<view class="itm">1、普能会员：只浏览平台信息，不可下载平台上的相关附件。</view>
-						<view class="itm">2、专业会员：上传展示产品与服务内容、上传相关附件，后台审核方可在平台展示。可下载其他专业会员上传的附件。</view>
-						<view class="itm">3、专家会员：只有专家会员才能接受评测邀请。</view>
-					</u-collapse-item>
-					<u-collapse-item title="如何购买产品?" class="cell_title">
-						<text class="coll">目前无法在线购买产品，如你想购买某款产品，可以去线下的店购买</text>
-					</u-collapse-item> -->
 				</u-collapse>
 			</view>
 		</view>
 		<view class="mfooter" v-if="item.resaleStatus != 1">
 			<view class="flex">
 				<view class="f">
-					<button class="btn" @click="ok()">提交</button>
+					<button class="btn" @click="ok()">确定</button>
 				</view>
 			</view>
 		</view>
@@ -94,7 +80,6 @@ export default {
 			this.order.tradeAreaId = this.item.tradeAreaId;
 			this.order.tradeAreaName = this.item.tradeAreaName;
 		}
-		console.log("this.item",this.item)
 		this.getFeeItem();
 	},
 	methods: {

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

@@ -43,7 +43,7 @@ export default {
 	data() {
 		return {
 			user: this.getUser(),
-			list: {},
+			list: [],
 			orderIds: ''
 		};
 	},
@@ -58,7 +58,7 @@ export default {
 					this.list = res.data.data;
 				}
 			});
-			
+
 		}
 	},
 	methods: {

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

@@ -76,9 +76,10 @@ export default {
 		if (e.id) {
 			this.http.request({
 				url: '/level-two-server/app/TbOrders/getDetailById',
-				data: {id: e.id},
+				data: { ids: e.id },
 				success: res => {
-					this.item = res.data.data;
+					let data = res.data.data;
+					this.item = data[0];
 				}
 			});
 		}

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

@@ -6,28 +6,28 @@
 		<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="state" v-if="item.isDelivery == 1">
+				<view class="state" v-if="item.isPay == 1 && item.payTax == 0">
+					<text class="icon" style="color: #4581fb">&#xe830;</text>
+					<text>已支付</text>
+				</view>
+				<view class="state" v-if="item.orderFinish == 1">
 					<text class="icon" style="color: #13ce66">&#xe830;</text>
 					<text>已完成</text>
 				</view>
-				<view class="state" v-else>
-					<text class="icon" style="color: #f44336">&#xe622;</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.goodsQuantity }} {{ item.goodsUnit }}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</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: #f44336" v-if="item.isDelivery == 0" @click.stop="toDelivery(item.id)">确认收货</view>
-					<view class="an" style="color: #4581fb">物流详情</view>
+					<view class="date">{{ item.createTime }}</view>
+					<!-- 					<view class="an" style="color: #f44336" v-if="item.isDelivery == 0" @click.stop="toDelivery(item.id)">确认收货</view>
+					<view class="an" style="color: #4581fb">物流详情</view> -->
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
@@ -41,9 +41,9 @@ export default {
 	data() {
 		return {
 			tab: [
-				{ name: '全部', 	 orderFinish: '' ,isDelivery: ''},
-				{ name: '待收货', orderFinish: 0 ,isDelivery: 0},
-				{ name: '已完成', orderFinish: 1 ,isDelivery: 1}
+				{ name: '全部', orderFinish: '', isDelivery: '' },
+				{ name: '待收货', orderFinish: 0, isDelivery: 0 },
+				{ name: '已完成', orderFinish: 1, isDelivery: 1 }
 			],
 			param: { pageNo: 1, pageSize: 10 },
 			list: [],
@@ -78,7 +78,7 @@ export default {
 			this.http.request({
 				url: '/level-two-server/app/TbOrders/toDelivery',
 				loading: 'false',
-				data: {id: id,orderFinish: 1,isDelivery: 1},
+				data: { id: id, orderFinish: 1, isDelivery: 1 },
 				success: res => {
 					this.refresh();
 				}

pages/personal/personal.vue

@@ -17,6 +17,11 @@
 				<text>你还未认证，请先认证</text>
 				<text class="icon" style="float: right">&#xe8f2;</text>
 			</view>
+			<view class="message _info" @click="go('/pages/authentication/face')" 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="user">
 				<image src="../../static/icon/user.png" mode="widthFix" class="head"></image>
@@ -33,7 +38,7 @@
 				<view class="clear"></view>
 			</view>
 			<!--边民菜单-->
-			<view class="menu" v-if="user.userType == 1">
+			<!-- <view class="menu" v-if="user.userType == 1">
 				<view class="msn" @click="go('/pages/market/one/leader/order')">
 					<view class="out">
 						<view class="int">
@@ -42,17 +47,17 @@
 						</view>
 					</view>
 				</view>
-			</view>
-			<!--组长菜单-->
-			<view class="menu" v-if="user.userType == 2">
-				<view class="msn" @click="go('/pages/market/one/leader/cart')">
+			</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> -->
 				<view class="msn" @click="go('/pages/market/one/leader/order')">
 					<view class="out">
 						<view class="int">
@@ -80,14 +85,14 @@
 						</view>
 					</view>
 				</view>
-				<view class="msn" @click="go('/pages/market/two/purchaser/buy/list')">
+				<!-- <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> -->
 				<view class="msn" @click="go('/pages/market/two/purchaser/address/list')">
 					<view class="out">
 						<view class="int">
@@ -180,13 +185,26 @@ export default {
 			user: {}
 		};
 	},
+	onLoad() {
+		//人脸认证界面成功的回调
+		uni.$on('face', res => {
+			this.http.request({
+				url: '/sp-admin/app/AppUser/face',
+				method: 'POST',
+				success: res => {
+					this.user.face = 1;
+				}
+			});
+		});
+	},
 	onShow() {
 		this.user = this.getUser();
 		if (!this.hasAuth()) {
 			this.http.request({
 				url: '/sp-admin/app/AppUser/getAuth',
 				success: res => {
-					this.user.auth = res.data.data;
+					this.user.auth = res.data.data.auth;
+					this.user.face=res.data.data.face;
 				}
 			});
 		}