代码提交

common/http.js

@@ -1,12 +1,13 @@
 
 // const ip = 'http://192.168.2.8:8080'; //线下
-const ip = 'http://hs-server.aseanbusiness.cn'; //线上
-
-//const ip = 'http://192.168.88.36:8080'; //线下
+//const ip = 'http://hs-server.aseanbusiness.cn'; //线上
+const ip = 'http://hs-server.tbgjhc.top:8018';
+const ngip = 'http://hs.tbgjhc.top:7010'
+//const ip = 'http:///127.0.0.1:8080'; //线下
 
 /**
  * 封装的http请求
- */ 
+ */
 const request = (opt) => {
 	opt = opt || {};
 	opt.url = ip + opt.url || '';
@@ -91,6 +92,7 @@ const request = (opt) => {
 	})
 }
 module.exports = {
+	ngip,
 	ip,
 	request
-};
+};

common/style.scss

@@ -654,9 +654,9 @@
 		}
 		.title {
 			margin-bottom: 9px;
-			float: left;
+			//float: left;
 			width: 80%;
-			font-size: 17px;
+			font-size: 18px;
 			font-weight: bold;
 		}
 		.goodsType {
@@ -669,7 +669,7 @@
 		}
 		.state {
 			float: right;
-			font-size: 14px;
+			font-size: 16px;
 			.icon {
 				color: #abacb0;
 				font-weight: bold;
@@ -691,6 +691,7 @@
 			padding-left: 10px;
 			color: $font-c;
 			.desc {
+				font-size: 16px;
 				padding-top: 7px;
 				color: #a0a2a6;
 				text {
@@ -699,7 +700,7 @@
 			}
 			.price {
 				padding-top: 7px;
-				font-size: 16px;
+				font-size: 17px;
 				color: #ff5722;
 				font-weight: bold;
 			}
@@ -756,7 +757,7 @@
 		}
 		.desc {
 			float: right;
-			width: 70%;
+			width: 66%;
 			text-align: right;
 		}
 		input {

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "边民互市",
+    "name" : "天保物流",
     "appid" : "__UNI__4E5B775",
     "description" : "",
     "versionName" : "1.0.0",
@@ -7,6 +7,9 @@
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
+        "compatible" : {
+            "ignoreVersion" : true
+        },
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
@@ -41,7 +44,14 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "permissionExternalStroage" : {
+                    "request" : "none"
+                },
+                "permissionPhoneStroage" : {
+                    "request" : "none"
+                }
             },
             /* ios打包配置 */
             "ios" : {

pages.json

@@ -588,6 +588,15 @@
             }
 
         }
+		,{
+            "path" : "pages/personal/commissionAgreement",
+            "style" :
+            {
+                "navigationBarTitleText": "互助委托协议",
+                "enablePullDownRefresh": false
+            }
+
+        }
     ],
 	"tabBar": {
 		"color": "#7A7E83",
@@ -616,7 +625,7 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "边民互市贸易",
+		"navigationBarTitleText": "天保物流",
 		"navigationBarBackgroundColor": "#4581fb"
 	}
 }

pages/index/index.vue

@@ -23,7 +23,7 @@
 				<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="width: 54px; height: 54px"></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>
@@ -57,7 +57,7 @@
 				</view>
 			</view>
 		</view>
-		<u-popup :show="show" @close="close()" round="15" mode="center" :closeOnClickOverlay="false"
+		<u-popup :show="show" @close="close()" round="15" mode="center" :closeable="true" :closeOnClickOverlay="false"
 			:customStyle="{ width: '90%' }">
 			<view class="ppopup">
 				<u-divider text="交易订单提醒" textSize="16"></u-divider>
@@ -105,14 +105,15 @@
 				keyword: '',
 				bannerList: [],
 				newsList: [],
-				noticeList: ['边民互市贸易APP上线了', '关于边民互市贸易开通注意事项'],
+				noticeList: ['天保物流APP上线了', '关于天保物流边民互市贸易开通注意事项'],
 				roleMenu: [],
 				menuList: [],
 				count: 0,
 				show: false,
 				order: {},
 				user: {},
-				faceRegister: false
+				faceRegister: false,
+				cooper_entrust: 2
 			};
 		},
 		onLoad() {
@@ -127,11 +128,14 @@
 		},
 		onShow() {
 			this.getOrderConfirm();
-			// this.checkFace()
+			//this.checkFace()
 			this.keyword = '';
 			this.getRead();
 		},
 		methods: {
+			close() {
+				this.show = false;
+			},
 			checkFace() {
 				let user = this.getUser();
 				if ((user.userType == 1 || user.userType == 2) && user.face == 0) {
@@ -152,16 +156,27 @@
 				if (user.userType > 2) {
 					return;
 				}
+				// 是否校验互助委托书【1校验  2不校验】
 				this.http.request({
-					url: '/level-one-server/app/TbOrder/getNoConfirmOrder',
-					loading: 'false',
+					url: '/sp-admin/SpCfg/getCfg',
+					method: 'POST',
+					data: { cfgName: 'cooper_entrust_cfg' },
 					success: res => {
-						if (res.data.data) {
-							this.order = res.data.data;
-							this.show = true;
-						}
+						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},
+							loading: 'false',
+							success: res => {
+								if (res.data.data) {
+									this.order = res.data.data;
+									this.show = true;
+								}
+							}
+						});
 					}
-				});
+				})
 			},
 			confirm() {
 				if (this.order.declareType == '1') {
@@ -212,6 +227,7 @@
 						menu.map((item2, index1) => {
 							data.map((item1, index) => {
 								if (parseInt(item1.id) == parseInt(item2)) {
+									item1.icon = this.http.ngip + item1.icon
 									this.menuList.push(item1);
 								}
 							});
@@ -350,6 +366,7 @@
 	}
 
 	.ppopup {
+		padding: 50rpx 30rpx;
 		.item {
 			padding: 5px 0px 5px 0px;
 			color: $font-c;

pages/login/login.vue

@@ -3,7 +3,7 @@
 		<view class="app_top">
 			<view class="welcome animated bounceIn">
 				<view class="desc">您好,</view>
-				<view class="desc">欢迎来到边民互市贸易</view>
+				<view class="desc">欢迎来到天保物流</view>
 			</view>
 			<image src="../../static/images/my.png" mode="widthFix" class="img"></image>
 		</view>
@@ -36,7 +36,7 @@ export default {
 	data() {
 		return {
 			show: true,
-			item: {checked:[]}
+			item: {phone:'13658831034',password:'123456',checked:[]}
 		};
 	},
 	onLoad() {

pages/market/one/leader/handle.vue

@@ -140,7 +140,7 @@ export default {
 				success: res => {
 					if (res.confirm) {
 						this.confirmFn();
-						return;
+						//return;
 						//跳转到人脸认证
 						uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
 					}

pages/market/one/leader/handleThree.vue

@@ -68,14 +68,6 @@
 						<text class="label">商户名称</text>
 						<text class="desc">{{ item.enterpriseName }}</text>
 					</view>
-				<!-- 	<view class="item">
-						<text class="label">商品额度</text>
-						<text class="desc">{{ item.glimit }}</text>
-					</view> -->
-				<!-- 	<view class="item">
-						<text class="label">商品序号</text>
-						<text class="desc">{{ item.gno }}</text>
-					</view> -->
 					<view class="item">
 						<text class="label">交易地区名称</text>
 						<text class="desc">{{ item.tradeAreaName }}</text>
@@ -99,7 +91,7 @@
 						<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">
@@ -129,7 +121,7 @@
 					</view>
 					<view class="item">
 						<text class="label">商品额度</text>
-						<text class="desc">{{ item2.gLimit }}</text>
+						<text class="desc">{{ item2.glimit }}</text>
 					</view>
 
 					<view class="item">
@@ -190,6 +182,12 @@
 						<text class="label">企业名称</text>
 						<text class="desc">{{ item2.entName }}</text>
 					</view>
+					<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>
+						</view>
+					</view>
 				</view>
 				<view class="more" @click="expand = !expand">
 					<text class="icon">&#xe649;</text>
@@ -211,6 +209,8 @@
 export default {
 	data() {
 		return {
+			ip: this.http.ip,
+			imgList: [],
 			expand: false, //展开
 			current: 0,
 			item: {},
@@ -218,7 +218,8 @@ export default {
 			orderId: '',
 			peopleConfirmStatus: '',
 			cooperEntrustStatus: '',
-			applyConfirmStatus: ''
+			applyConfirmStatus: '',
+			cooper_entrust: 2
 		};
 	},
 	onLoad(e) {
@@ -256,26 +257,76 @@ export default {
 						uni.showToast({ title: '订单确认成功' });
 						this.current = 1;
 						uni.setNavigationBarTitle({ title: '互助委托确认' });
+						this.getData2();
 					}
 				});
 			}
 			if (this.current == 1){
-				 this.http.request({
-				 	url: '/level-one-server/app/TbOrder/cooperOrder',
-				 	method: 'POST',
-				 	data: { orderId: this.item.id },
-				 	success: res => {
-				 		uni.showToast({ title: '互助委托确认成功' });
-				 		this.current = 2;
-				 		uni.setNavigationBarTitle({ title: '进口申报确认' }); 
-				 	}
-				 });
+				// 是否校验互助委托书【1校验  2不校验】
+				this.http.request({
+					url: '/sp-admin/SpCfg/getCfg',
+					method: 'POST',
+					data: { cfgName: 'cooper_entrust_cfg' },
+					success: res => {
+						this.cooper_entrust = JSON.parse(res.data.data).cooper_entrust
+						
+						if(this.cooper_entrust == 1) {
+							console.log("---1---this.imgList.length="+this.imgList.length)
+							if(this.imgList.length == 0) {
+								console.log("---2---")
+								uni.showModal({
+									content: "请上传互助委托协议！",
+									success: res => {
+										if(res.confirm) {
+											uni.navigateTo({url: '/pages/personal/commissionAgreement?id='+this.item2.id})
+											return;
+										}
+									}
+								});
+								return false;
+							} else {
+								console.log("---3---"+this.item2.judgeStatus)
+								if(this.item2.judgeStatus == 0) {
+									console.log("---4---")
+									uni.showModal({
+										content: "当前订单的互助委托协议未审核！请联系后台管理员进行审核！"
+									});
+									return false;
+								}
+								if(this.item2.judgeStatus == 2) {
+									console.log("---5---")
+									uni.showModal({
+										content: "当前订单的互助委托协议审核未通过！请重新上传！",
+										success: res => {
+											if(res.confirm) {
+												uni.navigateTo({url: '/pages/personal/commissionAgreement?id='+this.item2.id})
+												return;
+											}
+										}
+									});
+									return false;
+								}
+							}
+						}
+					}
+				})
+				
+				this.http.request({
+					url: '/level-one-server/app/TbOrder/cooperOrder',
+					method: 'POST',
+					data: { orderId: this.orderId },
+					success: res => {
+						uni.showToast({ title: '互助委托确认成功' });
+						this.current = 2;
+						uni.setNavigationBarTitle({ title: '进口申报确认' }); 
+					}
+				});
 			}
 			if (this.current == 2){
 				 this.http.request({
 				 	url: '/level-one-server/app/TbOrder/applyOrder',
 				 	method: 'POST',
-				 	data: { orderId: this.item.id },
+				 	data: { orderId: this.orderId },
 				 	success: res => {
 				 		uni.showToast({ title: '进口申报确认成功' });
 				 		setTimeout(() => {
@@ -300,11 +351,12 @@ export default {
 				data: { orderId: this.orderId },
 				success: res => {
 					this.item2 = res.data.data;
+					JSON.parse(this.item2.cooperEntrustImg).map(item => this.imgList.push(item))
+					console.log("-----5-----"+this.imgList)
 				}
 			});
 		},
 		ok() {
-			
 			//根据不同的步骤提交不同的url或者状态参数
 			if (this.current == 0) {
 				uni.showModal({
@@ -313,7 +365,7 @@ export default {
 					success: res => {
 						if (res.confirm) {
 							this.confirmFn();
-							return;
+							//return;
 							//跳转到人脸认证
 							uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
 						}
@@ -327,7 +379,7 @@ export default {
 					success: res => {
 						if (res.confirm) {
 							this.confirmFn();
-							return;
+							//return;
 				          //跳转到人脸认证
 				          uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
 						}
@@ -341,7 +393,7 @@ export default {
 					success: res => {
 						if (res.confirm) {
 							this.confirmFn();
-							return;
+							//return;
 							//跳转到人脸认证
 							uni.navigateTo({url:'/pages/face/faceRegister?type=2'})
 						}

pages/market/one/leader/order.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.enterpriseName }}
+				<view class="title">铺主：{{ item.enterpriseName }}
 					<view class="state" v-if="(item.peopleConfirmStatus == 0 || item.cooperEntrustStatus == 0 || item.applyConfirmStatus == 0) && item.finishStatus == 0">
 						<text class="icon">&#xe830;</text>
 						<text>未确认</text>
@@ -14,7 +14,7 @@
 						<text class="icon">&#xe830;</text>
 						<text>未进口</text>
 					</view>
-					<view class="state" v-if="item.finishStatus == 1&&item.resaleStatus == 0">
+					<view class="state" v-if="item.finishStatus == 1 && item.resaleStatus == 0">
 						<text class="icon" style="color:#13ce66">&#xe830;</text>
 						<text>已进口</text>
 					</view>
@@ -28,7 +28,7 @@
 				<view class="con">
 					<view class="productName omit">{{ item.goodsNames }}</view>
 					<view class="desc omit">
-						<text>重量 {{ item.totalWeight }}</text>
+						<text>重量 {{ item.totalWeight }}{{ item.goodsUnit }}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
 					<view class="price">¥ {{ item.totalPrice }}</view>
@@ -37,11 +37,14 @@
 				<view class="op">
 					<view class="date">{{ item.createTime }}</view>
 					<template v-if="item.finishStatus == 1 && item.resaleStatus == 0">
-						<view class="an" style="color: #f44336"  @click.stop="resale(item)">订单转售</view>
+						<view class="an" style="color: blue;"  @click.stop="resale(item)">订单转售</view>
 					</template>
-					<template v-if="item.resaleStatus == 1 && item.beingOrder == 0">
-						<view class="an" style="color: #f44336"  @click.stop="updateResalePrice(item.id)">修改转售价格</view>
+					<template v-if="item.peopleConfirmStatus == 1 && item.Sxb010Status == 1 && item.finishStatus == 0 && item.refundStatus == 0">
+						<view class="an" style="color: #f44336"  @click.stop="orderRefund(item.id)">退款</view>
 					</template>
+					<!-- <template v-if="item.resaleStatus == 1 && item.beingOrder == 0">
+						<view class="an" style="color: #f44336"  @click.stop="updateResalePrice(item.id)">修改转售价格</view>
+					</template> -->
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
@@ -74,16 +77,12 @@ export default {
 				{
 					name: '已进口',
 					peopleConfirmStatus: 1,
-					cooperEntrustStatus: 1,
-					applyConfirmStatus: 1,
 					finishStatus: 1,
 					resaleStatus: 0
 				},
 				{
 					name: '已转售',
 					peopleConfirmStatus: 1,
-					cooperEntrustStatus: 1,
-					applyConfirmStatus: 1,
 					finishStatus: 1,
 					resaleStatus: 1
 				}
@@ -132,6 +131,8 @@ export default {
 					this.loadMore = parseInt(res.data.pageCount) > this.param.pageNo;
 					if (res.data.data) {
 						this.list.push(...res.data.data);
+						console.log("---1---="+this.list[0].finishStatus)
+						console.log("---2---="+this.list[0].resaleStatus)
 					}
 				}
 			});
@@ -152,6 +153,17 @@ export default {
 		resale(item) {
 			uni.navigateTo({url: '/pages/market/two/leader/resale?item=' + JSON.stringify(item)});
 		},
+		orderRefund(id) {
+			this.http.request({
+				url: '/level-one-server/app/TbOrder/orderRefund',
+				data: { id: id },
+				method: 'POST',
+				success: resp => {
+					uni.showToast({ title: '操作成功' });
+					this.refresh();
+				}
+			});
+		},
 		updateResalePrice(id) {
 			uni.navigateTo({url: '/pages/market/two/leader/updatePrice?id=' + id});
 		},

pages/market/two/detail.vue

@@ -7,13 +7,13 @@
 				<view class="clear"></view>
 				<u-divider text="规格参数"></u-divider>
 				<view class="item">
-					<text class="desc">商品编号：</text>
-					<text>{{ item.goodsNo }}</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>
+					<text class="desc">车牌号：</text>
+					<text>{{ item.veNo }}</text>
 					<view class="clear"></view>
 				</view>
 				<view class="item">

pages/market/two/leader/detail.vue

@@ -19,26 +19,26 @@
 					<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">
-					<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>
+			<!-- <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>

pages/market/two/leader/order.vue

@@ -6,14 +6,16 @@
 		<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: red" v-if="item.isPay == 0">待下单</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>
 				<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.goodsQuantity }}</text>
 						<text>{{ item.tradeAreaName }}</text>
 					</view>
 					<view class="price">¥ {{ item.resalePrice }}</view>
@@ -59,6 +61,7 @@ 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)
 				}
 			});
 		},

pages/market/two/leader/resale.vue

@@ -3,14 +3,14 @@
 		<view class="cmain" style="padding-bottom: 80px;">
 			<view class="box order_detail">
 				<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.tradeNo }}</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">{{ item.totalWeight }}</text>
 				</view>
@@ -22,37 +22,37 @@
 					<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">
-					<text class="label">总金额(系统计算)</text>
+					<text class="label">计算总金额</text>
 					<text class="desc">
-						<input type="number" v-model="sumPrice"  :disabled="true"/>
+						<input type="number" v-model="resalePrice"  :disabled="true"/>
 					</text>
 				</view>
 			</view>
 			<u-divider text="费项明细"></u-divider>
 			<view class="box">
-				<u-collapse v-for="(item,index) in feeItemLIst" :key="index">
+				<u-collapse v-for="(item,index) in newRuleList" :key="index">
 					<u-collapse-item :title="item.name" class="cell_title" >
 						<view class="itm">1、收费企业：{{ item.companyName }}</view>
 						<view class="itm" v-if="item.feeType ==1">2、收费类型：按交易额收取</view>
 						<view class="itm" v-if="item.feeType ==2">2、收费类型：按次收取</view>
 						<view class="itm" v-if="item.feeType ==3">2、收费类型：按吨收取</view>
-						<view class="itm" v-if="item.feeType ==1">3、收费%(按交易额)：<span style="color: coral;">{{ item.percent }} %</span></view>
-						<view class="itm" v-if="item.feeType ==1">4、当前订单收取金额：<span style="color: coral;">{{ (item.percent * resalePrice)/100}} 元</span></view>
+						<view class="itm" v-if="item.feeType ==1">3、收费%(按交易额收)：<span style="color: coral;">{{ item.percent }} %</span></view>
+						<view class="itm" v-if="item.feeType ==1">4、当前订单收取金额：<span style="color: coral;">{{ item.percent*price/100 }} 元</span></view>
 						<view class="itm" v-if="item.feeType ==2">3、收费金额(按次收)：<span style="color: coral;">{{ item.feeMoney }} 元</span></view>
 						<view class="itm" v-if="item.feeType ==2">4、当前订单收取金额：<span style="color: coral;">{{ item.feeMoney }} 元</span></view>
-						<view class="itm" v-if="item.feeType ==3">3、收费%(按吨)：<span style="color: coral;">{{ item.percent }} %</span></view>
-						<view class="itm" v-if="item.feeType ==3">4、当前订单收取金额：<span style="color: coral;">{{ (item.percent * resalePrice)/100}} 元</span></view>
+						<view class="itm" v-if="item.feeType ==3">3、收费%(按吨收)：<span style="color: coral;">{{ item.percent }} %</span></view>
+						<view class="itm" v-if="item.feeType ==3">4、当前订单收取金额：<span style="color: coral;">{{ item.percent*weight/100 }} 元</span></view>
 						</br>
 						<view class="itm">当前费项收取金额以最后结算时为准</view>
 					</u-collapse-item>
@@ -75,43 +75,33 @@ export default {
 		return {
 			item: {},
 			resalePrice: '',
-			feeItemLIst: [],
-			sumPrice: ''
+			weight: '',
+			price: '',
+			newRuleList: []
 		};
 	},
 	onLoad(e) {
 		if (e.item) {
 			this.item = JSON.parse(e.item);
+			this.price = this.item.totalPrice;
+			this.weight = this.item.totalWeight;
 			this.countPrice();
 		}
-		this.getFeeItem();
 	},
 	methods: {
-		//费项明细
-		getFeeItem(){
-			this.http.request({
-				url: '/level-two-server/app/TbItemRules/getAllList',
-				success: res => {
-					this.feeItemLIst = res.data.data
-				}
-			});
-		},
 		//费项合计
 		countPrice(){
 			this.http.request({
 				url: '/level-two-server/app/TbOrders/countPrice',
 				data: {id: this.item.id},
 				success: res => {
-					this.sumPrice = (res.data.data).toFixed(2)
+					this.resalePrice = (res.data.data.sumPrice + 50).toFixed(2)
+					this.newRuleList = res.data.data.newRuleList
 				}
 			});
 		},
 		ok() {
-			let rule = { name: 'resalePrice', checkType: 'notnull', errorMsg: '请输入转售金额' };
-			if (!this.verify.check(this.resalePrice, rule)) {
-				uni.showModal({ content: this.verify.error, showCancel: false });
-				return false;
-			}
+			console.log("----this.resalePrice-----=",this.resalePrice)
 			uni.showModal({
 				title: '提示',
 				content: '我已核对转售信息',

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

@@ -7,12 +7,16 @@
 					<text class="desc omit">{{ item.goodsName }}</text>
 				</view>
 				<view class="item">
-					<text class="label">商品编号</text>
-					<text class="desc">{{ item.goodsNo }}</text>
+					<text class="label">商品价格</text>
+					<text class="desc">{{ item.resalePrice }}</text>
 				</view>
 				<view class="item">
-					<text class="label">计价单位</text>
-					<text class="desc">{{ item.goodsUnit }}</text>
+					<text class="label">车牌号</text>
+					<text class="desc">{{ item.veNo }}</text>
+				</view>
+				<view class="item">
+					<text class="label">接单人</text>
+					<text class="desc">{{ user.name }}</text>
 				</view>
 				<view class="item">
 					<text class="label">发布商</text>
@@ -23,8 +27,8 @@
 					<text class="desc">{{ item.createTime }}</text>
 				</view>
 				<view class="item">
-					<text class="label">接单人</text>
-					<text class="desc">{{ user.name }}</text>
+					<text class="label">互市区</text>
+					<text class="desc">{{ item.tradeAreaName }}</text>
 				</view>
 			</view>
 		</view>

pages/personal/commissionAgreement.vue

@@ -0,0 +1,132 @@
+<template>
+	<view>
+		<view class="cmain" style="padding-bottom: 85px">
+			<view class="form_group">
+				<view class="lable re">互助委托协议上传</view>
+				<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple style="margin: 15px auto;"></u-upload>
+			</view>
+		</view>
+		<view class="mfooter">
+			<view class="flex">
+				<view class="f"><button class="btn" @click="save()">提交</button></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				fileList1: [],
+				imgList: [],
+				id: null,
+				importOrderList: {}
+			}
+		},
+		onLoad(e) {
+			this.fileList1 = []
+			imgList: []
+			if(e.id) {
+				this.id = e.id
+				this.http.request({
+					url: '/level-one-server/app/TbImportOrder/getById',
+					data: { id: this.id },
+					success: res => {//this.http.ip
+						this.importOrderList = res.data.data;
+						console.log(JSON.parse(this.importOrderList.cooperEntrustImg))
+						let data = JSON.parse(this.importOrderList.cooperEntrustImg)
+						data.forEach((item) => {
+							this.fileList1.push({url: this.http.ip+item});
+							this.imgList.push({item});
+						})
+					}
+				});
+			}
+		},
+		methods: {
+			save() {
+				/* let rule = [
+					{
+						name: 'cardFront',
+						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-one-server/app/TbImportOrder/update',
+					data: { id: this.id, cooperEntrustImg: JSON.stringify(this.imgList) },
+					method: 'POST',
+					success: res => {
+						uni.showToast({ title: '操作成功' });
+						setTimeout(() => {
+							uni.navigateBack();
+						}, 1500);
+					}
+				});
+			},
+			// 删除图片
+			deletePic(event) {
+				this[`fileList${event.name}`].splice(event.index, 1)
+				if(`fileList${event.name}` == 'fileList1'){
+					this.fileList1.splice(event.index,1)
+					this.imgList.splice(event.index,1)
+				}
+			},
+			// 新增图片
+			async afterRead(event) {
+				// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+				let lists = [].concat(event.file)
+				let fileListLen = this[`fileList${event.name}`].length
+				lists.map((item) => {
+					this[`fileList${event.name}`].push({
+						...item,
+						status: 'uploading',
+						message: '上传中'
+					})
+				})
+				for (let i = 0; i < lists.length; i++) {
+					const result = await this.uploadFilePromise(lists[i].url)
+					let item = this[`fileList${event.name}`][fileListLen]
+					this[`fileList${event.name}`].splice(fileListLen, 1, Object.assign(item, {
+						status: 'success',
+						message: '',
+						url: this.http.ip+result
+					}))
+					fileListLen++
+				}
+			},
+			uploadFilePromise(url) {
+				return new Promise((resolve, reject) => {
+					let a = uni.uploadFile({
+						url: this.http.ip+'/sp-admin/upload/image',
+						header:{
+							"Authorization": uni.getStorageSync('user').token ? uni.getStorageSync('user').token : ''
+						},
+						filePath: url,
+						name: 'file',
+						success: (res) => {
+							setTimeout(() => {
+								this.imgList.push(JSON.parse(res.data).data);
+								resolve(res.data.data)
+							}, 1000)
+						}
+					});
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/personal/personal.vue

@@ -162,6 +162,11 @@
 					<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>
+					<text class="icon arrow">&#xe8f2;</text>
+				</view>
 				<view class="s_item" @click="go('/pages/login/userAgreement?id=1')">
 					<text class="icon ic">&#xe662;</text>
 					<text class="title">用户协议</text>