bug修复

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.1.4:8080'; //线下
+// const ip = 'http:///192.168.31.251:8080'; //线下
 
 /**
  * 封装的http请求

pages.json

@@ -66,7 +66,7 @@
 		{
 			"path": "pages/authentication/index",
 			"style": {
-				"navigationBarTitleText": "实人认证",
+				"navigationBarTitleText": "认证",
 				"enablePullDownRefresh": false
 			}
 

pages/authentication/index.vue

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

pages/authentication/info.vue

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

pages/authentication/purchaser/info.vue

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

pages/index/index.vue

@@ -16,99 +16,22 @@
 			<!--通知公告-->
 			<view class="notice">
 				<u-notice-bar color="#848484" :text="noticeList" :step="true" direction="column" mode="link"
-					bgColor="white" speed="300" url="/pages/notice/index"></u-notice-bar>
+					bgColor="white" speed="300" url="/pages/news/list"></u-notice-bar>
 			</view>
 			<!--菜单-->
 			<view class="menu">
 				<view class="msn" v-for="(item, index) in menuList" :key="index" @click="navTo(item.path)">
 					<view class="out">
 						<view class="int">
-							<image :src="item.icon" mode="widthFix" style="max-width: 54px; max-height: 52px; object-fit: contain;"></image>
+							<image :src="item.icon" mode="widthFix"
+								style="max-width: 54px; max-height: 52px; object-fit: contain;"></image>
 							<view class="tit">{{ item.menuName }}</view>
 						</view>
 					</view>
 				</view>
 				<view class="clear"></view>
 			</view>
-			<view class="menu">
-				<!--边民菜单与组长菜单-->
-				<view class="menu" v-if="user.userType == 1 || user.userType == 2">
-					<view class="msn" @click="go('/pages/market/one/leader/order')">
-						<view class="out">
-							<view class="int">
-								<view class="icon ioc" style="background-color: #00aaff; color: #ffffff">&#xe6e9;</view>
-								<view class="tit">一级市场交易</view>
-							</view>
-						</view>
-					</view>
-					<view class="msn" @click="go('/pages/market/two/leader/order')">
-						<view class="out">
-							<view class="int">
-								<view class="icon ioc" style="background-color: #00aaff; color: #ffffff">&#xe606;</view>
-								<view class="tit">二级市场交易</view>
-							</view>
-						</view>
-					</view>
-					<view class="msn" @click="go('/pages/market/order/order')">
-						<view class="out">
-							<view class="int">
-								<view class="icon ioc" style="background-color: #00aaff; color: #aaffff">&#xe612;</view>
-								<view class="tit">商品上架</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				
-				<!--收购商-->
-				<view class="menu" v-if="user.userType == 3">
-					<view class="msn" @click="go('/pages/market/two/purchaser/order/cart')">
-						<view class="out">
-							<view class="int">
-								<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe604;</view>
-								<view class="tit">购物车</view>
-							</view>
-						</view>
-					</view>
-					
-					<view class="msn" @click="go('/pages/market/two/purchaser/address/list')">
-						<view class="out">
-							<view class="int">
-								<view class="icon ioc" style="background-color: #fff6e0; color: #f1ba41">&#xe623;</view>
-								<view class="tit">地址管理</view>
-							</view>
-						</view>
-					</view>
-					<view class="msn" @click="go('/pages/market/two/purchaser/order/list')">
-						<view class="out">
-							<view class="int">
-								<view class="icon ioc" style="background-color: #f0dcfc; color: #b064d8">&#xe628;</view>
-								<view class="tit">我的订单</view>
-							</view>
-						</view>
-					</view>
-					<view class="msn" @click="go('/pages/authentication/purchaser/info')">
-						<view class="out">
-							<view class="int">
-								<view class="icon ioc" style="background-color: #e0ffff; color: #00bfff">&#xe660;</view>
-								<view class="tit">我的认证</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				
-				<!--合作社-->
-				<view class="menu" v-if="user.userType == 6">
-					<view class="msn" @click="go('/pages/market/one/cooperative/order')">
-						<view class="out">
-							<view class="int">
-								<view class="icon ioc" style="background-color: #e1f6e9; color: #47cf74">&#xe634;</view>
-								<view class="tit">结算单</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			
+
 			<!--最新资讯-->
 			<view class="news">
 				<view class="vlabel">
@@ -135,7 +58,7 @@
 				</view>
 			</view>
 		</view>
-		<u-popup :show="show" @close="close()" round="15" mode="center" :closeable="true" :closeOnClickOverlay="false"
+		<u-popup :show="show" @close="close()" round="15" mode="center" :closeable="false" :closeOnClickOverlay="false"
 			:customStyle="{ width: '90%' }">
 			<view class="ppopup">
 				<u-divider text="交易订单提醒" textSize="16"></u-divider>
@@ -156,8 +79,8 @@
 				<button class="btn" @click="confirm()">去处理</button>
 			</view>
 		</u-popup>
-		<u-popup :show="faceRegister" @close="close()" round="15" mode="center" :closeOnClickOverlay="false"
-			:customStyle="{ width: '90%' }">
+		<u-popup :show="faceRegister" @close="close()" round="15" mode="center" :closeable="false"
+			:closeOnClickOverlay="false" :customStyle="{ width: '90%' }">
 			<view class="reflush" @click="checkFace">刷新</view>
 			<view class="ppopup">
 				<u-divider text="人脸录入" textSize="16"></u-divider>
@@ -173,6 +96,36 @@
 				<button class="btn" @click="go('/pages/face/faceRegister')">马上录入</button>
 			</view>
 		</u-popup>
+		<u-popup :show="purchaser" round="15" mode="center" :closeable="false" :closeOnClickOverlay="false"
+			:customStyle="{ width: '90%' }">
+			<view class="reflush" @click="getTbPurchaserAuth()">刷新</view>
+			<view class="ppopup">
+				<u-divider text="提醒" textSize="16"></u-divider>
+				<view class="contents">
+					<view style="text-indent: 2rem;line-height: 60rpx;">
+						您的资料不完善或正在审核中，请前往补充或者等待管理员审核！</view>
+				</view>
+				<button class="btn" @click="go('/pages/authentication/index')">前往查看</button>
+			</view>
+		</u-popup>
+		<u-popup :show="update.visible" round="15" mode="center" :closeable="false" :closeOnClickOverlay="false"
+			:customStyle="{ width: '90%' }">
+			<view class="ppopup">
+				<u-divider text="有新版本更新!" textSize="16"></u-divider>
+				<view class="contents">
+					<view style="text-indent: 2rem;line-height: 60rpx;">
+						更新内容：{{update.content}}
+					</view>
+					<view style="text-indent: 2rem;line-height: 60rpx;">
+						当前版本号：{{update.currentVersion}}
+					</view>
+					<view style="text-indent: 2rem;line-height: 60rpx;">
+						新版本号：{{update.version}}
+					</view>
+				</view>
+				<button class="btn" @click="updateApk">立即更新</button>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -183,7 +136,7 @@
 				keyword: '',
 				bannerList: [],
 				newsList: [],
-				noticeList: ['天保物流APP上线了', '关于天保物流边民互市贸易开通注意事项'],
+				noticeList: [],
 				roleMenu: [],
 				menuList: [],
 				count: 0,
@@ -191,7 +144,15 @@
 				order: {},
 				user: {},
 				faceRegister: false,
-				cooper_entrust: 2
+				cooper_entrust: 2,
+				purchaser: false,
+				update: {
+					visible: false,
+					currentVersion: '',
+					version: '',
+					content: '',
+					url: ''
+				}
 			};
 		},
 		onLoad() {
@@ -209,25 +170,76 @@
 			this.checkFace()
 			this.keyword = '';
 			this.getRead();
+			this.getUpdateInfo();
 		},
 		methods: {
+			getUpdateInfo() {
+				let currentVersion = uni.getAppBaseInfo().appVersion;
+				this.http.request({
+					url: '/sp-admin/app/updateInfo',
+					loading: 'false',
+					success: resp => {
+						let version = resp.data.data.version;
+						this.update = {
+							visible: currentVersion != version,
+							currentVersion: currentVersion,
+							content: resp.data.data.content,
+							version: version,
+							url: resp.data.data.url
+						};
+						console.log(this.update)
+					}
+				})
+			},
+			updateApk() {
+				plus.runtime.openURL(this.update.url)
+				return;
+				var dtask = plus.downloader.createDownload(
+					this.update.url, {
+						force: true
+					}, (d, status) => {
+						if (status == 200) {
+							console.log("下载成功安装: " + d.filename);
+							plus.runtime.install(d.filename)
+						} else {
+							plus.nativeUI.alert("安装失败，请稍候重试: " + status)
+						}
+					});
+				dtask.start();
+
+			},
 			close() {
 				this.show = false;
 			},
 			checkFace() {
-				let user = this.getUser();  
+				let user = this.getUser();
+				this.faceRegister = false;
 				if ((user.userType == 1 || user.userType == 2) && user.face == 0) {
 					this.faceRegister = true;
 					return;
+				} else if (user.userType == 3) {
+					this.getTbPurchaserAuth()
 				}
-				this.faceRegister=false;
-				this.getOrderConfirm();
 			},
 			go(url) {
 				uni.navigateTo({
 					url: url
 				});
 			},
+			getTbPurchaserAuth() {
+				this.http.request({
+					url: '/level-two-server/app/TbPurchaser/info',
+					loading: 'false',
+					success: res => {
+						let resp = res.data;
+						if (!resp.data || resp.data.judgeStatus == 2) {
+							this.purchaser = true;
+							return;
+						}
+						console.log(resp);
+					}
+				})
+			},
 			//获取待处理的订单弹出
 			getOrderConfirm() {
 				let user = this.getUser();
@@ -238,13 +250,17 @@
 				this.http.request({
 					url: '/sp-admin/SpCfg/cooper',
 					method: 'POST',
-					data: { cfgName: 'cooper_entrust_cfg' },
+					data: {
+						cfgName: 'cooper_entrust_cfg'
+					},
 					success: res => {
 						this.cooper_entrust = JSON.parse(res.data.data).cooper_entrust
-						
+
 						this.http.request({
 							url: '/level-one-server/app/TbOrder/getNoConfirmOrder',
-							data: {cooper_entrust: this.cooper_entrust},
+							data: {
+								cooper_entrust: this.cooper_entrust
+							},
 							loading: 'false',
 							success: res => {
 								if (res.data.data) {
@@ -259,7 +275,8 @@
 			confirm() {
 				if (this.order.declareType == '1') {
 					uni.navigateTo({
-						url: '/pages/market/one/leader/handle?orderId=' + this.order.id+'&peopleConfirmStatus=' + this.order.peopleConfirmStatus +'&applyConfirmStatus=' + this.order.applyConfirmStatus
+						url: '/pages/market/one/leader/handle?orderId=' + this.order.id + '&peopleConfirmStatus=' +
+							this.order.peopleConfirmStatus + '&applyConfirmStatus=' + this.order.applyConfirmStatus
 					});
 				} else {
 					uni.navigateTo({
@@ -300,14 +317,16 @@
 				let menu = uni.getStorageSync('menu');
 				this.http.request({
 					url: '/sp-admin/app/AppMenu/getList',
-					data:{pageNo:1,pageSize:50},
+					data: {
+						pageNo: 1,
+						pageSize: 50
+					},
 					success: res => {
 						let data = res.data.data;
-						console.log(data);
 						menu.map((item2, index1) => {
 							data.map((item1, index) => {
 								if (parseInt(item1.id) == parseInt(item2)) {
-									item1.icon =item1.icon
+									item1.icon = item1.icon
 									this.menuList.push(item1);
 								}
 							});
@@ -323,13 +342,24 @@
 						limit: 3
 					},
 					success: res => {
+						let list = res.data.data;
 						this.newsList = res.data.data;
+						this.noticeList = list.map(obj => obj.title);
 					}
 				});
 			},
 			//点击轮播图
 			click(index) {
-			
+				let item = this.bannerList[index];
+				let url = item.url;
+				if (url) {
+					// #ifdef APP-PLUS
+					plus.runtime.openURL(url) //这里默认使用外部浏览器打开而不是内部web-view组件打开
+					// #endif
+					// #ifdef H5
+					window.open(url)
+					// #endif
+				}
 			},
 			message() {
 				uni.switchTab({
@@ -352,7 +382,6 @@
 				uni.navigateTo({
 					url: url,
 					fail: res => {
-						console.log('zx:' + JSON.stringify(res));
 						uni.showModal({
 							content: '功能还在开发中',
 							showCancel: false
@@ -445,6 +474,7 @@
 
 	.ppopup {
 		padding: 50rpx 30rpx;
+
 		.item {
 			padding: 5px 0px 5px 0px;
 			color: $font-c;

pages/market/one/confirm/apply.vue

@@ -28,7 +28,7 @@
 				<view class="op">
 					<view class="date">确认时间 {{ item.applyConfirmTime }}</view>
 					<template v-if="item.peopleConfirmStatus == 1 && item.cooperEntrustStatus == 1 && item.applyConfirmStatus == 0">
-						<view class="an" style="color: #f44336"  @click.stop="applyOrder(item.id)">进口申报确认</view>
+						<!-- <view class="an" style="color: #f44336"  @click.stop="applyOrder(item.id)">进口申报确认</view> -->
 					</template>
 				</view>
 			</view>

pages/market/one/confirm/cooperation.vue

@@ -27,7 +27,7 @@
 				<view class="op">
 					<view class="date">{{ item.cooperEntrustTime }}</view>
 					<template v-if="item.peopleConfirmStatus == 1 && item.cooperEntrustStatus == 0">
-						<view class="an" style="color: #f44336" @click.stop="cooperOrder(item.id)">确认委托</view>
+						<!-- <view class="an" style="color: #f44336" @click.stop="cooperOrder(item.id)">确认委托</view> -->
 					</template>
 				</view>
 			</view>

pages/market/one/confirm/people.vue

@@ -28,7 +28,7 @@
 				<view class="op">
 					<view class="date">确认时间 {{ item.peopleConfirmTime }}</view>
 					<template v-if="item.peopleConfirmStatus == 0">
-						<view class="an" style="color: #f44336" @click.stop="confirmOrder(item.id)">边民确认</view>
+					<!-- 	<view class="an" style="color: #f44336" @click.stop="confirmOrder(item.id)">边民确认</view> -->
 					</template>
 				</view>
 			</view>

pages/market/two/list.vue

@@ -22,7 +22,6 @@
 					<text class="check icon" v-if="item.check" style="color: #4581fb">&#xe631;</text>
 					<text class="check icon" v-else>&#xe60c;</text>
 				</view>
-				<image src="../../../static/news.jpg" mode="aspectFill" class="pic"></image>
 				<view class="con">
 					<view class="productName omit">{{ item.goodsName }}</view>
 					<view class="price">¥ {{ item.resalePrice }}</view>

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

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

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

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

pages/news/detail.vue

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