bug修复

components/card/card.vue

@@ -1,7 +1,7 @@
 <!--证件照片上传（单张）-->
 <template>
 	<view class="sfz" @click="chooseImage()">
-		<image :src="ip + fileName" mode="widthFix" v-if="fileName"></image>
+		<image :src="fileName" mode="widthFix" v-if="fileName"></image>
 		<image :src="pic" mode="widthFix" v-else></image>
 	</view>
 </template>
@@ -33,6 +33,7 @@ export default {
 	},
 	methods: {
 		chooseImage() {
+		let url=	this.http.ip+'/sp-admin/upload/image'
 			//照片选择
 			uni.chooseImage({
 				count: 1, //默认9
@@ -41,15 +42,16 @@ export default {
 					res.tempFilePaths.forEach(path => {
 						uni.showLoading({ title: '正在上传图片', mask: true });
 						uni.uploadFile({
-							url: '/app/common/upload',
+							url: url,
 							filePath: path,
 							name: 'file',
 							header: { Authorization: this.getUser().token },
 							success: res => {
 								let data = JSON.parse(res.data);
+								console.log(data);
 								if (data.code == 200) {
-									this.fileName = data.fileName;
-									this.$emit('input', data.fileName);
+									this.fileName = data.data;
+									this.$emit('input', data.data);
 								} else {
 									uni.showModal({ content: data.msg, showCancel: false });
 								}

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "边民互市贸易系统",
+    "name" : "边民互市",
     "appid" : "__UNI__4E5B775",
     "description" : "",
     "versionName" : "1.0.0",
@@ -94,14 +94,14 @@
         "nativePlugins" : {
             "epii-camera" : {
                 "__plugin_info__" : {
-                    "name" : "摄像头组件 相机组件 内嵌的区域相机组件 自动聚焦 聚焦 缩放 变焦 闪光灯 - [试用版，仅用于自定义调试基座]",
+                    "name" : "摄像头组件 相机组件 内嵌的区域相机组件 自动聚焦 聚焦 缩放 变焦 闪光灯",
                     "description" : "摄像头组件,相机组件,内嵌的区域相机组件,可实现拍照，录制视频。支持自定义布局,点击聚焦,手势缩放 qq 543169072",
                     "platforms" : "Android,iOS",
                     "url" : "https://ext.dcloud.net.cn/plugin?id=3583",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
+                    "android_package_name" : "com.dsj.hs",
+                    "ios_bundle_id" : "com.dsj.hs",
                     "isCloud" : true,
-                    "bought" : 0,
+                    "bought" : 1,
                     "pid" : "3583",
                     "parameters" : {}
                 }

pages/authentication/purchaser/info.vue

@@ -36,13 +36,13 @@
 			<view class="lable re">企业地址</view>
 			<input type="text" placeholder="请输入" v-model="item.address" :disabled="item.judgeStatus==1?true:false" />
 		</view>
-		<view class="form_group">
+		<!-- <view class="form_group">
 			<view class="lable re">法人身份证</view>
 			<card v-model="item.pic" pic="../../../static/images/yyzz.png"></card>
-		</view>
+		</view> -->
 		<view class="form_group">
 			<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>
@@ -76,14 +76,14 @@ export default {
 			let rule = [
 				{ name: 'name', checkType: 'notnull', errorMsg: '请输入企业名称' },
 				{ name: 'dutyParagraph', checkType: 'notnull', errorMsg: '请输入税号' },
-				{ name: 'corporateName', checkType: 'notnull', errorMsg: '请法人姓名' }
+				{ name: 'corporateName', checkType: 'notnull', errorMsg: '请输入法人姓名' },
+				{ name: 'businessLicense', checkType: 'notnull', errorMsg: '请上传营业执照' }
 			];
 			if (!this.verify.check(this.item, rule)) {
 				uni.showModal({ content: this.verify.error, showCancel: false });
 				return false;
 			}
 			this.item.loginUserId = this.getUser().id
-			this.item.businessLicense = "1111"
 			this.http.request({
 				url: '/level-two-server/app/TbPurchaser/identification',
 				method: 'POST',

pages/index/index.vue

@@ -126,20 +126,20 @@
 			});
 		},
 		onShow() {
-			this.checkFace()
+			this.getOrderConfirm();
+			// this.checkFace()
 			this.keyword = '';
 			this.getRead();
-			this.getOrderConfirm();
 		},
 		methods: {
 			checkFace() {
 				let user = this.getUser();
-				console.log(user);
 				if ((user.userType == 1 || user.userType == 2) && user.face == 0) {
 					this.faceRegister = true;
 					return;
 				}
 				this.faceRegister=false;
+				this.getOrderConfirm();
 			},
 			go(url) {
 				uni.navigateTo({

pages/market/one/confirm/apply.vue

@@ -14,18 +14,18 @@
 					</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 }}</text>
+						<text>重量{{ item.totalWeight }}kg</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>
+					<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>
 					</template>

pages/market/one/confirm/cooperation.vue

@@ -26,7 +26,7 @@
 				</view>
 				<view class="clear"></view>
 				<view class="op">
-					<view class="date">{{ item.createTime }}</view>
+					<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>
 					</template>
@@ -46,9 +46,9 @@ export default {
 			param: {
 				pageNo: 1,
 				pageSize: 10,
-				peopleConfirmStatus: 1, //边民确认状态
-				//cooperEntrustStatus: 0,//互助委托申报确认状态
-				applyConfirmStatus: 0, //进口申报确认状态
+				// peopleConfirmStatus: 1, //边民确认状态
+				cooperEntrustStatus: 1,//互助委托申报确认状态
+				// applyConfirmStatus: 0, //进口申报确认状态
 				finishStatus: 0, //订单完成状态
 				resaleStatus: 0 //订单转售状态
 			},

pages/market/one/confirm/people.vue

@@ -14,18 +14,18 @@
 					</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 }}</text>
+						<text>重量 {{ item.totalWeight }}kg</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>
+					<view class="date">确认时间 {{ item.peopleConfirmTime }}</view>
 					<template v-if="item.peopleConfirmStatus == 0">
 						<view class="an" style="color: #f44336" @click.stop="confirmOrder(item.id)">边民确认</view>
 					</template>
@@ -46,8 +46,8 @@ export default {
 				pageNo: 1,
 				pageSize: 10,
 				//peopleConfirmStatus: 0, //边民确认状态
-				cooperEntrustStatus: 0, //互助委托申报确认状态
-				applyConfirmStatus: 0, //进口申报确认状态
+				// cooperEntrustStatus: 0, //互助委托申报确认状态
+				// applyConfirmStatus: 0, //进口申报确认状态
 				finishStatus: 0, //订单完成状态
 				resaleStatus: 0 //订单转售状态
 			},

pages/market/one/leader/detail.vue

@@ -25,27 +25,27 @@
 				</view>
 				<view class="item">
 					<text class="label">商品名称</text>
-					<text class="desc">¥ {{ item.goodsNames }}</text>
+					<text class="desc">{{ item.goodsNames }}</text>
 				</view>
 				<view class="item">
 					<text class="label">商品单位</text>
-					<text class="desc">¥ {{ item.goodsUnit }}</text>
+					<text class="desc">{{ item.goodsUnit }}</text>
 				</view>
 				<view class="item">
 					<text class="label">商铺名称</text>
-					<text class="desc">¥ {{ item.shopName }}</text>
+					<text class="desc">{{ item.shopName }}</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.netWeight }}</text>
+					<text class="label">净重(kg)</text>
+					<text class="desc">{{ item.netWt }}</text>
 				</view>
 				<view class="item">
-					<text class="label">毛重</text>
-					<text class="desc">¥ {{ item.grossWeight }}</text>
+					<text class="label">毛重(kg)</text>
+					<text class="desc">{{ item.grossWt }}</text>
 				</view>
 				<view class="item">
 					<text class="label">申报数量</text>
@@ -53,12 +53,12 @@
 				</view>
 				<view class="item">
 					<text class="label">交易地区名称</text>
-					<text class="desc">¥ {{ item.tradeAreaName }}</text>
+					<text class="desc">{{ item.tradeAreaName }}</text>
 				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">进出口预申报单号</text>
-					<text class="desc">¥ {{ item.preIeportNo }}</text>
-				</view>
+					<text class="desc">{{ item.preIeportNo }}</text>
+				</view> -->
 				<view class="item">
 					<text class="label">批次预录入号</text>
 					<text class="desc">{{ item.preNo }}</text>

pages/market/one/leader/detailThree.vue

@@ -3,30 +3,26 @@
 		<view class="cmain">
 			<view class="box order_detail" style="margin-top: 0px">
 				<u-divider text="订单信息"></u-divider>
-				<view class="item" style="padding-top: 0px">
+				<!-- <view class="item" style="padding-top: 0px">
 					<text class="label">业务编号</text>
 					<text class="desc omit">{{ item.platSeqNo }}</text>
-				</view>
+				</view> -->
 				<view class="item">
-					<text class="label">预录入编号</text>
+					<text class="label">申报编号</text>
 					<text class="desc">{{ item.preNo }}</text>
 				</view>
-				<view class="item">
-					<text class="label">关联进境申报单编号</text>
-					<text class="desc">{{ item.itrdclDeclareId }}</text>
-				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">申报人类型</text>
 					<text class="desc">{{ item.declareType }}</text>
-				</view>
+				</view> -->
 				<view class="item">
 					<text class="label">申报人姓名</text>
 					<text class="desc">{{ item.declareName }}</text>
 				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">申报人身份证号</text>
 					<text class="desc">{{ item.ciphertextIdno }}</text>
-				</view>
+				</view> -->
 				<view class="item" v-if="item.declareType == '2'">
 					<text class="label">商铺编码</text>
 					<text class="desc">{{ item.shopNo }}</text>
@@ -40,21 +36,21 @@
 					<text class="label">商品名称</text>
 					<text class="desc">{{ item.goodsNames }}</text>
 				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">商品额度</text>
 					<text class="desc">{{ item.gLimit }}</text>
-				</view>
+				</view> -->
 
 				<view class="item">
 					<text class="label">总金额</text>
-					<text class="desc">{{ item.sumAmt }}</text>
+					<text class="desc">¥{{ item.sumAmt }}</text>
 				</view>
 				<view class="item">
-					<text class="label">总毛重</text>
+					<text class="label">总毛重(kg)</text>
 					<text class="desc">{{ item.sumGrossWt }}</text>
 				</view>
 				<view class="item">
-					<text class="label">总净重</text>
+					<text class="label">总净重(kg)</text>
 					<text class="desc">{{ item.sumNetWt }}</text>
 				</view>
 				<view class="item">
@@ -73,36 +69,29 @@
 					<text class="label">运输方式</text>
 					<text class="desc">{{ item.trafMode }}</text>
 				</view>
-				<view class="item" v-if="item.declareType == '3' || item.declareType == '4'">
-					<text class="label" v-if="item.declareType == '3'">互助组备案编号</text>
-					<text class="label" v-if="item.declareType == '4'">合作社备案编号</text>
-					<text class="desc">¥ {{ item.orgPutrecNo }}</text>
-				</view>
+			
 				<view class="item" v-if="item.declareType == '3' || item.declareType == '4'">
 					<text class="label" v-if="item.declareType == '3'">互助组名称</text>
 					<text class="label" v-if="item.declareType == '4'">合作社名称</text>
-					<text class="desc">¥ {{ item.orgName }}</text>
-				</view>
-				<view class="item" v-if="item.declareType == '4'">
-					<text class="label">合作社信用代码</text>
-					<text class="desc">¥ {{ item.orgScc }}</text>
+					<text class="desc">{{ item.orgName }}</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.tradeCountry }}</text>
+					<text class="label">申报时间</text>
+					<text class="desc">{{ item.declTime }}</text>
 				</view>
-				<view class="item">
+				<!-- <view class="item">
 					<text class="label">企业编码</text>
 					<text class="desc">{{ item.entCode }}</text>
 				</view>
 				<view class="item">
 					<text class="label">企业名称</text>
 					<text class="desc">{{ item.entName }}</text>
-				</view>
+				</view> -->
+				<view style="height: 150rpx;"></view>
 			</view>
 		</view>
 	</view>

pages/market/one/leader/handle.vue

@@ -107,6 +107,11 @@ export default {
 		}
 		//人脸认证回调
 		uni.$on('face', res => {
+			this.confirmFn()
+		});
+	},
+	methods: {
+		confirmFn(){
 			this.http.request({
 				url: '/level-one-server/app/TbOrder/confirmOrder',
 				method: 'POST',
@@ -118,9 +123,7 @@ export default {
 					}, 1000);
 				}
 			});
-		});
-	},
-	methods: {
+		},
 		getData() {
 			this.http.request({
 				url: '/level-one-server/app/TbOrder/orderDetail',
@@ -136,6 +139,8 @@ export default {
 				content: '我已核对信息无误',
 				success: res => {
 					if (res.confirm) {
+						this.confirmFn();
+						return;
 						//跳转到人脸认证
 						uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
 					}

pages/market/one/leader/handleThree.vue

@@ -19,7 +19,7 @@
 				<view v-if="current == 2">
 					<view class="item ctt">进口申报确认</view>
 				</view>
-				<view class="expand" v-if="current == 0" :style="{height:expand?'auto':'300px'}">
+				<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>
@@ -45,15 +45,19 @@
 						<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">
@@ -64,18 +68,14 @@
 						<text class="label">商户名称</text>
 						<text class="desc">{{ item.enterpriseName }}</text>
 					</view>
-					<view class="item">
-						<text class="label">边民额度序号</text>
-						<text class="desc">{{ item.limitNo }}</text>
-					</view>
-					<view class="item">
+				<!-- 	<view class="item">
 						<text class="label">商品额度</text>
 						<text class="desc">{{ item.glimit }}</text>
-					</view>
-					<view class="item">
+					</view> -->
+				<!-- 	<view class="item">
 						<text class="label">商品序号</text>
 						<text class="desc">{{ item.gno }}</text>
-					</view>
+					</view> -->
 					<view class="item">
 						<text class="label">交易地区名称</text>
 						<text class="desc">{{ item.tradeAreaName }}</text>
@@ -242,6 +242,11 @@ export default {
 		
 		//人脸认证回调
 		uni.$on('face',res=>{
+			this.confirmFn()
+		})
+	},
+	methods: {
+		confirmFn(){
 			if (this.current == 0){
 				 this.http.request({
 					url: '/level-one-server/app/TbOrder/confirmOrder',
@@ -279,9 +284,7 @@ export default {
 				 	}
 				 });
 			}
-		})
-	},
-	methods: {
+		},
 		getData1() {
 			this.http.request({
 				url: '/level-one-server/app/TbOrder/orderDetail',
@@ -301,6 +304,7 @@ export default {
 			});
 		},
 		ok() {
+			
 			//根据不同的步骤提交不同的url或者状态参数
 			if (this.current == 0) {
 				uni.showModal({
@@ -308,6 +312,8 @@ export default {
 					content: '我已核对信息无误',
 					success: res => {
 						if (res.confirm) {
+							this.confirmFn();
+							return;
 							//跳转到人脸认证
 							uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
 						}
@@ -320,6 +326,8 @@ export default {
 					content: '我已核对信息无误',
 					success: res => {
 						if (res.confirm) {
+							this.confirmFn();
+							return;
 				          //跳转到人脸认证
 				          uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
 						}
@@ -332,6 +340,8 @@ export default {
 					content: '我已核对信息无误',
 					success: res => {
 						if (res.confirm) {
+							this.confirmFn();
+							return;
 							//跳转到人脸认证
 							uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
 						}

pages/market/one/leader/order.vue

@@ -12,11 +12,11 @@
 					</view>
 					<view class="state" v-if="item.peopleConfirmStatus == 1 && item.cooperEntrustStatus == 1 && item.applyConfirmStatus == 1 &&item.finishStatus == 0">
 						<text class="icon">&#xe830;</text>
-						<text>进口中</text>
+						<text>未进口</text>
 					</view>
 					<view class="state" v-if="item.finishStatus == 1&&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>
@@ -64,7 +64,7 @@ export default {
 					resaleStatus: ''			//订单转售状态
 				},
 				{
-					name: '进口中',
+					name: '未进口',
 					peopleConfirmStatus: 1,
 					cooperEntrustStatus: 1,
 					applyConfirmStatus: 1,
@@ -72,7 +72,7 @@ export default {
 					resaleStatus: 0
 				},
 				{
-					name: '已完成',
+					name: '已进口',
 					peopleConfirmStatus: 1,
 					cooperEntrustStatus: 1,
 					applyConfirmStatus: 1,

pages/market/two/leader/resale.vue

@@ -19,7 +19,11 @@
 					<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">
 						<input type="number" v-model="resalePrice" placeholder="请输入(元)" />
 					</text>
@@ -98,7 +102,7 @@ export default {
 				url: '/level-two-server/app/TbOrders/countPrice',
 				data: {id: this.item.id},
 				success: res => {
-					this.sumPrice = res.data.data
+					this.sumPrice = (res.data.data).toFixed(2)
 				}
 			});
 		},