边民确认+进口确认

common/http.js

@@ -5,7 +5,7 @@
 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.1.4:8080'; //线下
 
 /**
  * 封装的http请求

pages.json

@@ -471,7 +471,7 @@
 		{
 			"path": "pages/market/two/leader/resale",
 			"style": {
-				"navigationBarTitleText": "转售确认",
+				"navigationBarTitleText": "上架确认",
 				"enablePullDownRefresh": false
 			}
 

pages/index/index.vue

@@ -123,14 +123,13 @@
 					<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>
@@ -260,7 +259,7 @@
 			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({
@@ -330,9 +329,7 @@
 			},
 			//点击轮播图
 			click(index) {
-				uni.navigateTo({
-					url: '/pages/news/detail?id=8'
-				});
+			
 			},
 			message() {
 				uni.switchTab({

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,106 @@
 						<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">{{ item2.declareType }}</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">总毛重</text>
+						<text class="desc">{{ item2.sumGrossWt }}</text>
+					</view>
+					<view class="item">
+						<text class="label">总净重</text>
+						<text class="desc">{{ item2.sumNetWt }}</text>
+					</view>
+					<view class="item">
+						<text class="label">币制</text>
+						<text class="desc">{{ item2.currCode }}</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">
+						<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>
+						<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 +193,118 @@
 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 => {
+		uni.$on('face',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 +317,7 @@ export default {
 page {
 	background-color: $pg;
 }
-.cmain {
+.cmain{
 	padding-bottom: 100px;
 }
 .expand {

pages/market/two/leader/resale.vue

@@ -30,23 +30,23 @@
 					<text class="label">订单金额</text>
 					<text class="desc">¥ {{ item.totalPrice }}</text>
 				</view>
-				<!-- <view class="item">
+				<view class="item">
 					<text class="label">上架金额(元)</text>
 					<text class="desc">
 						<input type="number" v-model="resalePrice" placeholder="请输入" />
 					</text>
-				</view> -->
+				</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 +62,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 +94,7 @@ export default {
 			this.item = JSON.parse(e.item);
 			this.price = this.item.totalPrice;
 			this.weight = this.item.totalWeight;
-			this.countPrice();
+			//this.countPrice();
 		}
 	},
 	methods: {