Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

App.vue

@@ -75,12 +75,12 @@
 			},
 			//获取当前按钮权限
 			getRoles: function(role) {
-				let  _haveRoles = false;
+				let _haveRoles = false;
 				let _roles = uni.getStorageSync('rolesList')
 				for (let i = 0; i < _roles.length; i++) {
 					if (_roles[i] == role) {
-						 _haveRoles = true
-					} 
+						_haveRoles = true
+					}
 				}
 				return _haveRoles
 			}
@@ -904,4 +904,20 @@
 	.align-item-center {
 		align-items: center;
 	}
+
+	.container {
+		/* margin: 20rpx !important; */
+		background: #F2F6FA;
+	}
+
+	.pages-sale-information {
+		background: #F2F6FA !important;
+	}
+
+	/deep/uni-page-body {
+		background: #F2F6FA;
+	}
+	body {
+		background: #F2F6FA!important;
+	}
 </style>

components/swiperup.vue

@@ -78,18 +78,23 @@
 
 <style scoped>
 	.wrap{
-		height: 78rpx;
+		height: 92rpx;
 		margin-bottom: 20rpx;
 		background: #fff;
-		line-height: 78rpx;
+		line-height: 92rpx;
 		position: relative;
-		width:90%;
+		width:100%;
 		margin:0 auto;
 		margin-top:12px;
-		box-shadow: 2px 2px 4px rgba(0,0,0,0.07);
+		/* box-shadow: 2px 2px 4px rgba(0,0,0,0.07); */
+		/* background:url('./bert-suggest/icons/bg@2x%20(1).png'); */
+		background-size: cover;
+		/* border-radius: 20rpx; */
+		background: white;
+		border-radius: 20rpx;
 	}
 	.wrap::before{
-		content: "";
+/* 		content: "";
 		position: absolute;
 		background: #fff;
 		display: block;
@@ -98,10 +103,10 @@
 		left: -15px;
 		z-index: 1;
 		-webkit-border-radius: 30%;
-		border-radius: 30%;
+		border-radius: 30%; */
 	}
 	.wrap::after{
-		content: "";
+/* 		content: "";
 		position: absolute;
 		background: #fff;
 		display: block;
@@ -110,13 +115,13 @@
 		right: -15px;
 		z-index: 1;
 		-webkit-border-radius: 30%;
-		border-radius: 30%;
+		border-radius: 30%; */
 	}
 	.gb{
-		width:27px;
-		height:21px;
+		width:60rpx;
+		height:40rpx;
 		vertical-align: middle;
-		margin-right: 10px;
+		margin:0 24rpx 0 33rpx;
 		
 	}
 	.horn{

pageB/info/info_list.vue

@@ -75,7 +75,8 @@
 		text-align: center;
 	}
 	.factory{
-		font-size:26rpx;
+		font-size:28rpx;
+		font-weight: 500;
 	}
 	.positive{
 		color:#E63113;
@@ -98,7 +99,7 @@
 		flex-direction:row;
 	}
 	.factoryItem{
-		padding: 20rpx 0;
+		padding: 20rpx 47rpx;
 	}
 	/* #ifdef MP */
 	.mp-search-box {
@@ -333,12 +334,12 @@
 	/* 销售信息 */
 	.introduce-section {
 		background: #fff;
-		padding: 20upx 30upx;
+		margin: 20upx 0;
 		padding-bottom: 100upx;
 		.guess-item {
 			padding-top: 10upx;
 			padding-bottom: 10upx;
-			border-bottom: 1px solid #EEEEEE;
+			// border-bottom: 1px solid #EEEEEE;
 		}
 		.title {
 			font-size: 28upx;
@@ -393,4 +394,10 @@
 			}
 		}
 	}
+	.article {
+		border-bottom: 1px solid #EEEEEE;
+	}
+	.cu-item{
+		padding:25rpx 47rpx 45rpx 47rpx;
+	}
 </style>

pages.json

@@ -45,8 +45,8 @@
 			"path": "pages/sale/information",
 			"style": {
 				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "易粮易运"
+				// "navigationStyle": "custom"
 			}
 		},{
 			"path": "pages/index/index",
@@ -579,9 +579,9 @@
 		}, {
 			"path": "pages/business/business",
 			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "交易",
+				"enablePullDownRefresh": true
+				// "navigationStyle": "custom"
 			}
 
 		}, {

pages/business/business.vue

@@ -448,10 +448,11 @@
 		padding: 5px;
 		position: relative;
 		font-size: 17px;
+		margin-right: 10rpx;
 	}
 
 	.line.active {
-		font-size: 19px;
+		font-size: 38rpx;
 		font-weight: 900;
 	}
 
@@ -490,7 +491,7 @@
 
 	.tag1 {
 		background: #F5F6F9;
-		padding: 2px;
+		padding: 2px 10rpx;
 		color: #333333;
 		display: inline-flex;
 		font-size: 22rpx;

pages/erpbusiness/index.vue

@@ -2,28 +2,33 @@
 	<view>
 		<view class="wrap">
 			<view class='title'>收购业务管理</view>
-			<view  class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
-				<view class="cu-item" v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)" v-if="index<gridCol*2">
+			<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
+				<view class="cu-item" v-for="(item,index) in gridList" :key="index" @click="gridClick(item, index)"
+					v-if="index<gridCol*2">
 					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
 						<image :src="item.src" class="sign"></image>
 					</view>
-					
+
 					<text>{{item.name}}</text>
 				</view>
 			</view>
 		</view>
-		<view class="wrap" >
+		<view class="wrap">
 			<view class='title'>出库管理</view>
-			<view  class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
-				<view class="cu-item" v-for="(item,index) in gridList1" :key="index" @click="gridClick(item, index)" v-if="index<gridCol*2">
+			<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
+				<view class="cu-item" v-for="(item,index) in gridList1" :key="index" @click="gridClick(item, index)"
+					v-if="index<gridCol*2">
 					<view :class="['cuIcon-' + item.cuIcon,'text-' + item.color]">
 						<image :src="item.src" class="sign"></image>
 					</view>
-					
+
 					<text>{{item.name}}</text>
 				</view>
 			</view>
 		</view>
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='温馨提示'
+			showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 <script>
@@ -40,7 +45,9 @@
 		},
 		data() {
 			return {
-				a:false,
+				isShowAlert: false,
+				content: '您确定要退出吗?',
+				a: false,
 				inputShow: false,
 				modalName: '',
 				mycarStyle: '',
@@ -56,15 +63,14 @@
 				carInfo: [],
 				gridCol: 4,
 				gridBorder: false,
-				headUrl:"../../static/img/myimg/YongHu@3x.png",
-				userphone:"",
-				username:"请更改昵称",
-				gridList: [
-					{
+				headUrl: "../../static/img/myimg/YongHu@3x.png",
+				userphone: "",
+				username: "请更改昵称",
+				gridList: [{
 						num: 0,
 						name: '邀请用户',
 						// icon: 'cuIcon-apps',
-						src:'../../static/img/erp/yaoqingyonghu@3x.png',
+						src: '../../static/img/erp/yaoqingyonghu@3x.png',
 						tips: 0,
 						url: '/pages/erpbusiness/QRCode/QRCode',
 						show: true
@@ -73,7 +79,7 @@
 						num: 1,
 						name: '收购质检',
 						// icon: 'cuIcon-calendar',
-						src:'../../static/img/erp/shougouzhijian@3x.png',
+						src: '../../static/img/erp/shougouzhijian@3x.png',
 						tips: 0,
 						url: '/pages/erpbusiness/quality_testing?managementType=1',
 						show: true
@@ -113,7 +119,7 @@
 						num: 1,
 						name: '出库质检',
 						// icon: 'cuIcon-calendar',
-						src:'../../static/img/erp/chukuzhijian@3x.png',
+						src: '../../static/img/erp/chukuzhijian@3x.png',
 						tips: 0,
 						url: '/pages/erpbusiness/quality_testing?managementType=3',
 						show: true
@@ -133,9 +139,9 @@
 				current: 4
 			}
 		},
-		
+
 		onLoad() {
-			
+
 		},
 		// #ifndef MP
 		onNavigationBarButtonTap(e) {
@@ -160,9 +166,9 @@
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
 			// 手机号中间4位加*
-			starUserphone(){
+			starUserphone() {
 				let reg = /^(\d{3})\d{4}(\d{4})$/;
-				if(this.userphone){
+				if (this.userphone) {
 					return this.userphone.replace(reg, "$1****$2");
 				}
 			}
@@ -173,7 +179,7 @@
 			uni.showTabBar()
 			this.loadData()
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
-				console.log("checkSession",res)
+				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {
 					uni.showModal({
 						title: '登录提示',
@@ -192,18 +198,18 @@
 					})
 				}
 			})
-			console.log("hasLogin",this.hasLogin )
-			if(this.userInfo){
-				if(!this.userInfo.avatarUrl){
+			console.log("hasLogin", this.hasLogin)
+			if (this.userInfo) {
+				if (!this.userInfo.avatarUrl) {
 					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
-				}else{
+				} else {
 					this.headUrl = this.userInfo.avatarUrl
 				}
 				this.username = this.userInfo.userName
 				this.userphone = this.userInfo.phone
 				var that = this
 				this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
-					console.log("noticeNumber",res)
+					console.log("noticeNumber", res)
 					if (res.data.data) {
 						let name = 'myTip';
 						let value = res.data.data.task;
@@ -211,10 +217,10 @@
 							name,
 							value
 						});
-						if(value != 0&&value){
+						if (value != 0 && value) {
 							uni.setTabBarBadge({
-								index:4,
-								text:value+""
+								index: 4,
+								text: value + ""
 							})
 						}
 						name = 'taskTip';
@@ -231,39 +237,53 @@
 						// });
 					}
 				})
-			}else{
+			} else {
 				this.headUrl = "../../static/img/myimg/YongHu@3x.png"
 				this.username = "立即登录"
 			}
-			console.log("this.userInfo",this.userInfo)
+			console.log("this.userInfo", this.userInfo)
 		},
 		methods: {
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			goOpenService() {
+				uni.hideTabBarRedDot({
+					index: 3
+				})
+				uni.clearStorageSync();
+				this.$store.commit('logout')
+				this.$api.logout()
+				uni.navigateTo({
+					url: `/pages/public/login`
+				})
+			},
 			getRoles: function(role) {
 				let _roles = uni.getStorageSync('rolesList')
 				for (let i = 0; i < _roles.length; i++) {
 					if (_roles[i] == role) {
-						 return true
-					} 
+						return true
+					}
 				}
 				return false
 			},
-			isShow(){
-				for(let i = 0;i<this.gridList.length;i++){
-					if(i==1){
+			isShow() {
+				for (let i = 0; i < this.gridList.length; i++) {
+					if (i == 1) {
 						this.gridList[i].show = this.getRoles('acquisitionQuality.view')
-					}else if (i==2){
+					} else if (i == 2) {
 						this.gridList[i].show = this.getRoles('acquisitionWeight.view')
 					}
 				}
-				for(let k = 0;k<this.gridList1.length;k++){
-					if(k==0){
+				for (let k = 0; k < this.gridList1.length; k++) {
+					if (k == 0) {
 						this.gridList[k].show = this.getRoles('acquisitionWeightOut.view')
-					}else if (k==1){
+					} else if (k == 1) {
 						this.gridList[k].show = this.getRoles('acquisitionQualityOut.view')
 					}
 				}
 			},
-			fankui(){
+			fankui() {
 				uni.navigateTo({
 					url: `/pages/user/fankui`
 				})
@@ -371,15 +391,15 @@
 						fail: () => {},
 						complete: () => {}
 					})
-				}else {
+				} else {
 					if (item.url) {
 						uni.navigateTo({
-							url: item.url 
+							url: item.url
 						})
 					}
 				}
 			},
-			setting(){
+			setting() {
 				if (!this.hasLogin) {
 					uni.showModal({
 						title: '登录提示',
@@ -396,20 +416,19 @@
 						fail: () => {},
 						complete: () => {}
 					})
-				}else {
-						uni.navigateTo({
-							url:'/pages/user/setUp'
-						})
+				} else {
+					uni.navigateTo({
+						url: '/pages/user/setUp'
+					})
 				}
 			},
 			toLogin() {
-				console.log("userInfo",this.userInfo)
+				console.log("userInfo", this.userInfo)
 				if (!this.hasLogin || !this.userInfo || this.username == "立即登录") {
 					uni.navigateTo({
 						url: '/pages/public/login_account_number'
 					})
-				}
-				else{
+				} else {
 					uni.navigateTo({
 						url: '/pages/user/setUp'
 					})
@@ -446,26 +465,27 @@
 				})
 			},
 			logout() {
-				const that = this
-				uni.showModal({
-					title: '询问',
-					content: '您确定要退出吗？',
-					cancelText: '取消',
-					confirmText: '确定',
-					success: (e) => {
-						if (e.confirm) {
-							uni.hideTabBarRedDot({
-								index:3
-							})
-							uni.clearStorageSync();
-							that.$store.commit('logout')
-							that.$api.logout()
-							uni.navigateTo({
-								url: `/pages/public/login`
-							})
-						}
-					}
-				})
+				// const that = this
+				this.isShowAlert = true
+				// uni.showModal({
+				// 	title: '询问',
+				// 	content: '您确定要退出吗？',
+				// 	cancelText: '取消',
+				// 	confirmText: '确定',
+				// 	success: (e) => {
+				// 		if (e.confirm) {
+				// 			uni.hideTabBarRedDot({
+				// 				index:3
+				// 			})
+				// 			uni.clearStorageSync();
+				// 			that.$store.commit('logout')
+				// 			that.$api.logout()
+				// 			uni.navigateTo({
+				// 				url: `/pages/public/login`
+				// 			})
+				// 		}
+				// 	}
+				// })
 			},
 			/**
 			 * 统一跳转接口,拦截未登录路由
@@ -507,9 +527,10 @@
 	}
 </script>
 <style lang='scss' scoped>
-	page{
-		background:#F5F6FA;
+	page {
+		background: #F5F6FA;
 	}
+
 	.container {
 		padding-top: 85px;
 		padding-top: 35px;
@@ -550,11 +571,13 @@
 	.cu-list {
 		/* height: 483rpx;
 		overflow-y: scroll; */
-		background:transparent;
+		background: transparent;
 	}
-	.cu-list.grid.no-border{
-		padding:0;
+
+	.cu-list.grid.no-border {
+		padding: 0;
 	}
+
 	.badge_user {
 		color: #fff;
 		background-color: #dc3545;
@@ -733,11 +756,11 @@
 	}
 
 	.cover-container {
-		padding: 1px 10px ;
+		padding: 1px 10px;
 		padding-bottom: 200upx;
-		
-	   /* background-color: #F5F6FA; */
-	/* 	border-radius: 20px; */
+
+		/* background-color: #F5F6FA; */
+		/* 	border-radius: 20px; */
 		margin-top: 60upx;
 
 		.arc {
@@ -891,30 +914,36 @@
 		font-weight: 600;
 		height: 36px;
 	}
-	.indexlow{
+
+	.indexlow {
 		/* margin-top: 30px; */
 		border-radius: 10px;
 	}
-	.cu-list>.cu-item:after{
-		border:none;
+
+	.cu-list>.cu-item:after {
+		border: none;
 	}
-	.sign{
+
+	.sign {
 		width: 40px;
 		height: 40px;
 		top: 4px;
 		margin-right: 6px;
 	}
-	.indexUp{
-		padding:0 20px;
+
+	.indexUp {
+		padding: 0 20px;
 		align-items: center;
 	}
-	.wrap{
-		background:#fff;
-		margin:10px;
-		border-radius:10px;
-		padding:10px;
-		.title{
-			font-size:16px;
+
+	.wrap {
+		background: #fff;
+		margin: 10px;
+		border-radius: 10px;
+		padding: 10px;
+
+		.title {
+			font-size: 16px;
 		}
 	}
 </style>

pages/public/login.vue

@@ -10,7 +10,7 @@
 				<view style='width:85%;'><input style='padding-left:10px;' class="NumberMedium" v-model='phone' @input='changephone' placeholder="请输入手机号码" type="number" maxlength="11"></view>
 				<image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image>
 			</view>
-			<button @click='gocode' :class='codestatus?"active":""' class='Regular verificationCode'>获取验证码</button>
+			<button @click='gocode' :class='codestatus?"active":""' class='verificationCode'>获取验证码</button>
 			<view @click='gonumber' class="Regular use-password" style='text-align:center;color:#6A6A6A;'>使用账号密码登录</view>
 			
 			<button v-if='tabbar' @click='goregister' class='Regular register active'>手机号一键注册</button>
@@ -873,7 +873,7 @@
 		right:30px;
 	}
 	.container {
-		padding-top: 85px;
+		padding-top: 223rpx;
 		position: relative;
 		width: 100vw;
 		height: 100vh;
@@ -920,6 +920,7 @@
 		border-radius:43rpx;
 		border: 1px solid #444444;
 		font-size: 28rpx;
+		padding: 0rpx 49rpx;
 		
 	}
 	.register:after{

pages/public/register.vue

@@ -6,13 +6,13 @@
 			<h2 class="Semibold">手机号注册</h2>
 			<view style='width:100%;margin-top:50px;border-bottom:1px solid #E8E9ED;padding:10px;position:relative;' class="flex">
 				<view class="NumberMedium" style='width:15%;border-right:1px solid #E8E9ED;'>+86</view>
-				<view style='width:85%;'><input maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;' placeholder="请输入手机号码" type="number" class="Regular"></view>
-			<image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image>
+				<view style='width:85%;'><u-input maxlength="11" v-model='phone' @input='phoneinput' style='padding-left:10px;' placeholder="请输入手机号码" type="number" class="Regular"/></view>
+			<!-- <image v-if='phone!=""' @click='phone=""' class='close' src='../../static/img/login/guanbi@2x.png'></image> -->
 			</view>
 			<view style='width:100%;border-bottom:1px solid #E8E9ED;position:relative;padding:10px;' class="flex">
 				<view style='width:70%;position:relative;'>
-					<input  v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number">
-					<image v-if='verifyCode!=""' @click='verifyCode=""' class='close1' src='../../static/img/login/guanbi@2x.png'></image>
+					<u-input  v-model='verifyCode' class="Regular" placeholder="请输入验证码" type="number"/>
+					<!-- <image v-if='verifyCode' @click='verifyCode=""' class='close1' src='../../static/img/login/guanbi@2x.png'></image> -->
 					</view>
 				<button :class='codestatus&&!sendDisabled?"active":""' @click='getcode' class='getcode Regular'>{{sendText}}</button>
 			</view>
@@ -71,7 +71,6 @@
 				sendDisabled: false,
 				system:'',
 				platform:'',
-				userData:undefined,
 				canIUseProfile:false
 			}
 		},
@@ -1106,4 +1105,11 @@
 		background:#22C572;
 		color:#fff;
 	}
+	.NumberMedium{
+		display: flex;
+		align-items: center;
+	}
+	.flex{
+		align-items: center;
+	}
 </style>

pages/sale/information.vue

@@ -31,15 +31,15 @@
 				<view class='title Medium'>工厂价格</view>
 				<view class='Regular' style='color:#B2B3BB;' @click='more("/pages/sale/plant")'>更多</view>
 			</view>
-			<swiper class="screen-swiper header-swiper" :autoplay="true" interval="6000" duration="500" :circular="true"
-				:acceleration="true" style="min-height: 700rpx;">
+			<swiper class="screen-swiper header-swiper" :autoplay="true" interval="6000" duration="500"
+				:circular="true" :acceleration="true" style="min-height: 700rpx;">
 				<swiper-item class="" v-for="(item1,index) in factoryPriceData.list" :key="index">
 					<view class=' guess-section-wrap-item clearfix' v-for='(item,index1) in item1' :key="index1">
 						<view class='factory'>{{item.factory}}</view>
 						<view class='wrap'>{{item.city}} {{item.factoryType}}</view>
 						<view class='price'>
-							<text class='currectprice '>{{item.price}}</text>
-							较昨日
+							<text class='currectprice'>{{item.price}}</text>
+							<text class='currectprice-text'>较昨日</text>
 							<image v-if='item.comparePrice>0' style="width:7.5px;height:9px;"
 								src='../../static/img/homepage/shangsheng.png'></image>
 							<image v-if='item.comparePrice<0' style="width:7.5px;height:9px;"
@@ -58,7 +58,7 @@
 				<view class='Regular' style='color:#B2B3BB;' @click='more("/pages/sale/portprice")'>更多</view>
 			</view>
 			<!-- <uni-notice-bar scrollable="true" single="true" background-color="white" :portList="portList" ></uni-notice-bar> -->
-			<swiper class="screen-swiper header-swiper-port" :autoplay="true" interval="0" duration="60000"
+			<swiper class="screen-swiper header-swiper-port" :autoplay="true" interval="0" duration="10000"
 				:circular="true" :acceleration="true">
 				<swiper-item class="" v-for="(item,index) in portList" :key="index">
 					<view class='guess-section-wrap-item clearfix'>
@@ -170,7 +170,7 @@
 			};
 		},
 		onShow() {
-			
+
 			uni.hideKeyboard()
 			uni.showTabBar()
 			this.pages = 1
@@ -179,9 +179,9 @@
 			this.loadData()
 			var userInfo = uni.getStorageSync("userInfo")
 			var that = this
-			
+
 			this.$api.doRequest('get', '/notice/query/noticeNumber').then(res => {
-				console.log("noticeNumber",res)
+				console.log("noticeNumber", res)
 				if (res.data.data) {
 					let name = 'myTip';
 					let value = res.data.data.task;
@@ -189,10 +189,10 @@
 						name,
 						value
 					});
-					if(value != 0&&value){
+					if (value != 0 && value) {
 						uni.setTabBarBadge({
-							index:4,
-							text:value+""
+							index: 4,
+							text: value + ""
 						})
 					}
 					name = 'taskTip';
@@ -212,21 +212,20 @@
 		},
 		onLoad(options) {
 			const value = uni.getStorageSync('launchFlag');
-			if (value) {
-			} else {
+			if (value) {} else {
 				uni.navigateTo({
 					url: '/pages/index/index'
 				});
 			}
 			var that = this
-			
+
 			uni.getSystemInfo({
 				success: function(res) {
 					console.log("statusBarHeight", res.statusBarHeight)
 					that.statusBarHeight += res.statusBarHeight + "px"; //这就是状态栏的高度
 				},
 			});
-			
+
 			var infoList = [];
 			uni.request({
 				url: "https://hq.sinajs.cn/list=C0,C2109,C2111,C2201,C2203,C2205,C2207,A0,A2109,A2111,A2201,A2203,A2205,A2207",
@@ -268,7 +267,7 @@
 			this.loadStatus = 'more'
 			this.loadData()
 			var userInfo = uni.getStorageSync("userInfo")
-			
+
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop;
@@ -320,7 +319,6 @@
 				let _newArray = []
 				if (_rowCount == null || _rowCount == "") {
 					if (size == 8) {
-
 						this.factoryPriceData.totalPage = 0;
 					} else {
 						this.portPriceData.totalPage = 0;
@@ -446,9 +444,9 @@
 					uni.hideLoading()
 				}).then(res => {
 					let data = res.data
-					for(var k =0;k<data.length;k++){
-						if(data[k].title.length > 20){
-							data[k].title = data[k].title.substring(0,20) + "..."
+					for (var k = 0; k < data.length; k++) {
+						if (data[k].title.length > 20) {
+							data[k].title = data[k].title.substring(0, 20) + "..."
 						}
 						let _date = new Date(data[k].gmtUpdate)
 						data[k].gmtUpdate = this.$u.timeFormat(_date.getTime(), 'mm-dd hh:MM');
@@ -538,38 +536,41 @@
 			},
 			getMoreData() {
 				const that = this
-				var pages=that.pages
-				var limit=that.limit
-							   
+				var pages = that.pages
+				var limit = that.limit
+
 				// uni.showLoading({
 				// 	title: '正在加载'
 				// })
 				that.$api.request('news', 'getNewsInfo', {
-					category:2,
+					category: 2,
 					page: pages,
-					limit:limit
-				},failres => {
+					limit: limit
+				}, failres => {
 					that.$api.msg(failres.errmsg)
-					that.isLoadMore=false
+					that.isLoadMore = false
 					that.loadStatus = 'nomore'
-					if(that.pages>1){that.pages-=1}
+					if (that.pages > 1) {
+						that.pages -= 1
+					}
 					uni.hideLoading()
 				}).then(res => {
 					let data = res.data
-					if(data.length > 0){
-						for(var k =0;k<data.length;k++){
-							if(data[k].title.length > 20){
-								data[k].title = data[k].title.substring(0,20) + "..."
+					if (data.length > 0) {
+						for (var k = 0; k < data.length; k++) {
+							if (data[k].title.length > 20) {
+								data[k].title = data[k].title.substring(0, 20) + "..."
 							}
 							let _date = new Date(data[k].gmtUpdate)
 							data[k].gmtUpdate = this.$u.timeFormat(_date.getTime(), 'mm-dd hh:MM');
 						}
 						that.newsInfo = that.newsInfo.concat(data)
-						that.isLoadMore=false
-					}
-					else{
-						if(that.pages>1){that.pages-=1}						
-						that.isLoadMore=true
+						that.isLoadMore = false
+					} else {
+						if (that.pages > 1) {
+							that.pages -= 1
+						}
+						that.isLoadMore = true
 						that.loadStatus = 'nomore'
 					}
 					uni.hideLoading()
@@ -631,6 +632,7 @@
 	.cu-tag.radius[class*="line"]::after {
 		border-radius: 66rpx;
 	}
+
 	.flex {
 		display: flex;
 	}
@@ -692,7 +694,7 @@
 	}
 
 	.wrap {
-		font-size: 20rpx;
+		font-size: 24rpx;
 		color: rgba(0, 0, 0, 0.5);
 	}
 
@@ -788,19 +790,19 @@
 	}
 
 	.swiper-item {
-		border-radius: 5%;
+		// border-radius: 5%;
 	}
 
 	.guess-section-wrap {
-		padding: 15px;
-		margin: 10px 5px;
-		border-radius: 5px;
+		padding: 28rpx 28rpx 0 28rpx;
+		margin: 10px 0px;
+		border-radius: 20rpx;
 		background: #fff;
 		overflow: hidden;
 	}
 
 	.guess-section-wrap1 {
-		margin: 10px 5px;
+		margin: 10px 0;
 		border-radius: 5px;
 		background: #fff;
 		overflow: hidden;
@@ -818,15 +820,18 @@
 
 	.guess-section-wrap-item {
 		float: left;
-		width: 38vw;
+		width: 42vw;
 		background: #F9F9FA;
-		padding: 7px;
-
-		margin: 20rpx;
+		padding: 14rpx;
+		margin: 10rpx 0;
 		border-radius: 3px;
 		// width:50%;
 	}
 
+	.guess-section-wrap-item:nth-child(2n) {
+		float: right;
+	}
+
 	.guess-section-wrap-item:first-child {
 		// margin-left:2px;
 	}
@@ -841,6 +846,7 @@
 		color: #B2B3BB;
 		display: flex;
 		align-items: center;
+		margin-top: 10rpx;
 	}
 
 	page {
@@ -852,7 +858,9 @@
 	}
 
 	.header-swiper {
-		min-height: 300rpx;
+		min-height: 270rpx;
+		height: 270rpx;
+		border-radius: 20rpx;
 	}
 
 	/* 头部 轮播图 */
@@ -901,7 +909,7 @@
 
 		.carousel-item {
 			width: 100%;
-			height: 100%;
+			height: 270rpx;
 			// padding: 0 28upx;
 			overflow: hidden;
 		}
@@ -1099,4 +1107,15 @@
 		align-items: center;
 		margin-right: 14rpx;
 	}
+
+	/deep/.uni-swiper-wrapper {
+		border-radius: 20rpx;
+	}
+
+	.currectprice-text {
+		font-size: 24rpx;
+	}
+	.container {
+		margin: 20rpx !important;
+	}
 </style>

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -120,7 +120,7 @@
 							<view class="right">{{OutList.goodsName}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">数量</view>
+							<view class="left">重量(吨)</view>
 							<view class="right">{{OutList.weight}}</view>
 						</view>
 						<view class='row'>
@@ -133,7 +133,7 @@
 						</view>
 						<view class='row'>
 							<view class="left">发货人</view>
-							<view class="right">{{OutList.publisher}}</view>
+							<view class="right">{{OutList.agent}}</view>
 						</view>
 					</view>
 

pages/task/audit/purchasecontract.vue

@@ -138,7 +138,8 @@
 				<view style='border-bottom:1px solid #eee;padding:10px;display:flex;justify-content:space-between;'>{{title}}
 				<u-icon name="close"></u-icon></view>
 				<view style='padding:10px;'>
-					<input v-model='auditMind' placeholder="请输入原因" type="text" value="" />
+					<input v-model='auditMind'  v-if="this.title=='审核意见'" placeholder="请输入审核意见,不超过100字" type="text" value="" />
+					<input v-model='auditMind'  v-if="this.title=='驳回原因'" placeholder="请输入原因" type="text" value="" />
 				</view>
 				<view  @click='close()' class="cancel">取消</view>
 				<view  @click='passSubmit()' class="confirm">确定</view>
@@ -207,15 +208,17 @@
 					uni.hideLoading()
 					that.$api.msg('驳回成功')
 					that.show=false
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
 				})
 			},
 			close(){
 				this.show=false
 			},
 			pass(){
-				console.log(1111)
 				this.show=true
-				this.title='通过原因'
+				this.title='审核意见'
 			},
 			reject() {
 				this.show=true
@@ -237,6 +240,9 @@
 						uni.hideLoading()
 						that.$api.msg('通过成功')
 						that.show=false
+						setTimeout(function() {
+							uni.navigateBack()
+						}, 1000);
 					})
 				}
 				

pages/task/audit/salecontract.vue

@@ -1,398 +1,411 @@
-<template>
-	<view class="container">
-		<u-form ref="uForm">
-			<u-form-item label-width='260' label="合同编号">
-				{{list.contractNo}}
-			</u-form-item>
-			<u-form-item label-width='260' label="运输方式">
-				{{list.shippingType}}
-			</u-form-item>
-			<u-form-item label-width='260' label="买方">
-				{{list.buyer}}
-			</u-form-item>
-			<u-form-item label-width='260' label="结算方式">
-				{{ list.settlementMethod }}
-			</u-form-item>
-			<u-form-item label-width='260' label="卖方">
-				{{list.seller}}
-			</u-form-item>
-			<u-form-item label-width='260' label="交货方式">
-				{{list.deliverType1}}
-			</u-form-item>
-			<u-form-item label-width='260' label="买方电话">
-				{{list.buyerPhone}}
-			</u-form-item>
-			<u-form-item label-width='260' label="包装方式">
-				{{list.packingMethod}}
-			</u-form-item>
-			<u-form-item label-width='260' label="卖方电话">
-				{{list.sellerPhone}}
-			</u-form-item>
-			<u-form-item label-width='260' label="验收方式">
-				{{list.acceptanceMethod}}
-			</u-form-item>
-			<u-form-item label-width='260' label="重量（吨）">
-				{{list.weight}}
-			</u-form-item>
-			<u-form-item label-width='260' label="交货日期（起）">
-				{{list.deliveryDateStart}}
-			</u-form-item>
-			<u-form-item label-width='260' label="溢短装（%）">
-				{{list.overShort}}
-			</u-form-item>
-			<u-form-item label-width='260' label="交货日期（止）">
-				{{list.deliveryDateEnd}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="合同单价（元/吨）">
-				{{list.unitContractPrice}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="合同总价（元）">
-				{{list.totalContractPrice}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="货源所在地区">
-				{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="货源详细地址">
-				{{list.sourceGoods}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="交货地所在地区">
-				{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="交货地详细地址">
-				{{list.placeDelivery}}
-			</u-form-item>
-			<u-form-item label-width='260' label="签订日期">
-				{{list.signingDate}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="最终实际交易量 (吨)">
-				{{list.finalTradingVolume}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="货名">
-				{{list.contractGoodsInfo.goodsName}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="水分（%）<=">
-				{{list.contractGoodsInfo.waterContent}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="品级">
-				{{list.contractGoodsInfo.grade}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="杂质（%）<=">
-				{{list.contractGoodsInfo.impurity}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="容重(克/升)>=">
-				{{list.contractGoodsInfo.bulkDensity}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="霉变粒（%）<=">
-				{{list.contractGoodsInfo.mildewGrain}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="热损伤（%）<=">
-				{{list.contractGoodsInfo.jiaorenli}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="不完善粒（%）<=">
-				{{list.contractGoodsInfo.imperfectGrain}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="合同收入（元）">
-				{{list.contractProcessInfo.goodsNameKey}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="已开发票（元）">
-				{{list.contractProcessInfo.goodsName}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="费用支出（元）">
-				{{list.contractProcessInfo.waterContent}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="未开发票（元）">
-				{{list.contractProcessInfo.impurity}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="未回款（元）">
-				{{list.contractProcessInfo.mildewGrain}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="双章原件回收情况">
-				{{list.contractProcessInfo.grade}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="备注信息">
-				{{list.remarks}}
-			</u-form-item>
-			<u-form-item  label-width='260' label="附件">
-				<!-- {{list.contractProcessInfo.grade}} -->
-				<view v-for='item in imglist'>
-					<image style='width:100px;height:100px;' :src="item" mode=""></image>
-				</view>
-				
-			</u-form-item>
-		</u-form>
-		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button v-if='list.approveStatus'  @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button v-if='list.approveStatus'  @click='pass' type="success" class="btn2">通过</u-button>
-		</view>
-		<view v-if='show' class="shade">
-			<view class="wrap">
-				<view style='border-bottom:1px solid #eee;padding:10px;display:flex;justify-content:space-between;'>{{title}}
-				<u-icon name="close"></u-icon></view>
-				<view style='padding:10px;'>
-					<input v-model='auditMind' placeholder="请输入审核意见,不超过100字" type="text" value="" />
-				</view>
-				<view  @click='passSubmit()' class="cancel">取消</view>
-				<view  @click='passSubmit()' class="confirm">确定</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				id: "",
-				currentPage: 1,
-				pageSize: 10,
-				list: [
-					{
-						status:"",
-					}
-				],
-				imglist:[],
-				auditMind:'',
-				show:false,
-				title:'',
-				contractNo: "",
-			}
-		},
-		onLoad(options) {
-			this.id = options.id
-			this.getList()
-		},
-		methods: {
-			getList(id) {
-				var that = this
-				this.$api.doRequest('get', '/contractManagementInfo/getInfo', {
-					id: this.id
-				}).then(res => {
-					if(res.data.code==200){
-						this.list=res.data.data
-						if (this.list.deliverType == 1) {
-							this.list.deliverType1 = '我方送货'
-						} else if (this.list.deliverType == 2) {
-							this.list.deliverType1 = '对方自提'
-						}
-						this.$api.doRequest('get', '/appendix/query/getFileList', {
-							appendixIds:that.list.addressUrl
-						}).then(res1 => {
-							for(var i=0;i<res1.data.data.length;i++){
-								that.imglist.push(res1.data.data[i].appendixPath)
-							}
-							
-					   })
-					}
-				})
-			},
-			//驳回
-			rejectSubmit() {
-				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
-					taskId: that.list.taskId,
-					approved: false,
-					auditMind: this.auditMind,
-					needReapply: true,
-				}).then(res => {
-					that.$api.msg('驳回成功')
-					that.show=false
-				})
-			},
-			pass(){
-				console.log(1111)
-				this.show=true
-				this.title='审核意见'
-			},
-			reject() {
-				this.show=true
-				this.title='驳回原因'
-			},
-			//通过
-			passSubmit() {
-				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
-					taskId: that.list.taskId,
-					approved: true,
-					auditMind: this.auditMind,
-					needReapply: true,
-				}).then(res => {
-					that.$api.msg('通过成功')
-					that.show=false
-				})
-			},
-			//审核方法
-			audit(item, index, status, status2, reason) {
-				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
-						taskId: item.taskId,
-						approved: status,
-						auditMind: reason != undefined ? '已驳回' : '34',
-						needReapply: status2 != undefined ? true : false,
-					}).then(res => {
-						this.audit(this.list[index + 1], index + 1, status)
-					})
-				} else {
-					if (status == true) {
-						that.$api.msg('通过成功')
-						this.getList()
-					} else if (status == false) {
-						that.$api.msg('驳回成功')
-						this.getList()
-					}
-				}
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.container {
-		padding: 20rpx 20rpx 250rpx 20rpx;
-	}
-	.u-form{
-		background:#fff;
-		border-radius:10px;
-		padding:0 10px;
-		.u-form-item{
-			line-height:30px;
-			padding:5px 0;
-		}
-	}
-	.content {
-		margin-top: 30rpx;
-		.top {
-			display: flex;
-			justify-content: space-between;
-		}
-
-		.content-item {
-			border-radius: 20rpx;
-			background: white;
-			padding: 40rpx 20rpx;
-			margin-bottom: 30rpx;
-		}
-
-		.title {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333333;
-			text-align: left;
-			margin: 20rpx 0;
-		}
-		.car-container{
-			border-bottom: 2rpx solid #EEEEEE;
-		}
-
-		.car-type-item {
-			font-size: 28rpx;
-			margin: 20rpx 0;
-			color: #878C9C;
-		}
-
-		.weightInfoCss {
-			font-size: 28rpx;
-			color: #333333;
-			font-weight: 500;
-		}
-		.row {
-			display: flex;
-			justify-content: space-between;
-			// .right,
-			// input {
-			// 	font-size: 28rpx;
-			// 	// color: #333333;
-			// }
-		}
-
-		.money {
-			font-size: 32rpx;
-			font-weight: 500;
-			margin-bottom: 30rpx ;
-		}
-
-		.moneyInfo {
-			color: #22C572;
-			font-size: 32rpx;
-		}
-	}
-.bottom-btn {
-		width: 100%;
-		position: fixed;
-		bottom:0;
-		display: flex;
-		z-index: 2;
-		left: 0;
-		background-color: #f8f8f8;
-		flex-direction: column;
-		.btn1,.btn2{
-			width: 100%;
-			margin-bottom: 26rpx;
-			border-radius: 90rpx;
-		}
-		.btn1{
-			background: white;
-			color: #00C265;
-		}
-		}
-		.topInfo {
-			height: 210rpx;
-			background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
-			padding: 30rpx;
-		
-			.topInfo-item {
-				height: 150rpx;
-				background-color: #FFFFFF;
-				border-radius: 20rpx;
-				padding: 40rpx;
-		
-				.logo {
-					width: 40rpx;
-					height: 40rpx;
-					margin-top: 8rpx;
-				}
-		
-				.infoText {
-					font-size: 36rpx;
-					font-weight: 600;
-					margin-left: 20rpx;
-				}
-		
-				.infoData {
-					color: #878C9C;
-					font-size: 26rpx;
-					margin-top: 10rpx;
-				}
-			}
-		}
-		.shade{
-			position:fixed;
-			top:0;
-			left:0;
-			height:100%;width:100%;
-			background:rgba(0,0,0,0.1);
-			z-index:3;
-			.wrap{
-				position:absolute;
-				left:0;top:0;right:0;bottom:0;margin:auto;
-				background:#fff;
-				width:80%;
-				height:30%;
-			}
-		}
-		.cancel,.confirm{
-			position:absolute;
-			display:inline-block;
-			width:50%;
-			text-align:center;
-			bottom:0;
-			padding:10px;
-			border-top:1px solid #eee;
-		}
-		.cancel{
-			left:0;
-			border-right:1px solid #eee;
-		}
-		.confirm{
-			right:0;
-		}
-</style>
+<template>
+	<view class="container">
+		<u-form ref="uForm">
+			<u-form-item label-width='260' label="合同编号">
+				{{list.contractNo}}
+			</u-form-item>
+			<u-form-item label-width='260' label="运输方式">
+				{{list.shippingType}}
+			</u-form-item>
+			<u-form-item label-width='260' label="买方">
+				{{list.buyer}}
+			</u-form-item>
+			<u-form-item label-width='260' label="结算方式">
+				{{ list.settlementMethod }}
+			</u-form-item>
+			<u-form-item label-width='260' label="卖方">
+				{{list.seller}}
+			</u-form-item>
+			<u-form-item label-width='260' label="交货方式">
+				{{list.deliverType1}}
+			</u-form-item>
+			<u-form-item label-width='260' label="买方电话">
+				{{list.buyerPhone}}
+			</u-form-item>
+			<u-form-item label-width='260' label="包装方式">
+				{{list.packingMethod}}
+			</u-form-item>
+			<u-form-item label-width='260' label="卖方电话">
+				{{list.sellerPhone}}
+			</u-form-item>
+			<u-form-item label-width='260' label="验收方式">
+				{{list.acceptanceMethod}}
+			</u-form-item>
+			<u-form-item label-width='260' label="重量（吨）">
+				{{list.weight}}
+			</u-form-item>
+			<u-form-item label-width='260' label="交货日期（起）">
+				{{list.deliveryDateStart}}
+			</u-form-item>
+			<u-form-item label-width='260' label="溢短装（%）">
+				{{list.overShort}}
+			</u-form-item>
+			<u-form-item label-width='260' label="交货日期（止）">
+				{{list.deliveryDateEnd}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="合同单价（元/吨）">
+				{{list.unitContractPrice}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="合同总价（元）">
+				{{list.totalContractPrice}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="货源所在地区">
+				{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="货源详细地址">
+				{{list.sourceGoods}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="交货地所在地区">
+				{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="交货地详细地址">
+				{{list.placeDelivery}}
+			</u-form-item>
+			<u-form-item label-width='260' label="签订日期">
+				{{list.signingDate}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="最终实际交易量 (吨)">
+				{{list.finalTradingVolume}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="货名">
+				{{list.contractGoodsInfo.goodsName}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="水分（%）<=">
+				{{list.contractGoodsInfo.waterContent}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="品级">
+				{{list.contractGoodsInfo.grade}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="杂质（%）<=">
+				{{list.contractGoodsInfo.impurity}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="容重(克/升)>=">
+				{{list.contractGoodsInfo.bulkDensity}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="霉变粒（%）<=">
+				{{list.contractGoodsInfo.mildewGrain}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="热损伤（%）<=">
+				{{list.contractGoodsInfo.jiaorenli}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="不完善粒（%）<=">
+				{{list.contractGoodsInfo.imperfectGrain}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="合同收入（元）">
+				{{list.contractProcessInfo.goodsNameKey}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="已开发票（元）">
+				{{list.contractProcessInfo.goodsName}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="费用支出（元）">
+				{{list.contractProcessInfo.waterContent}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="未开发票（元）">
+				{{list.contractProcessInfo.impurity}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="未回款（元）">
+				{{list.contractProcessInfo.mildewGrain}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="双章原件回收情况">
+				{{list.contractProcessInfo.grade}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="备注信息">
+				{{list.remarks}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="附件">
+				<!-- {{list.contractProcessInfo.grade}} -->
+				<view v-for='item in imglist'>
+					<image style='width:100px;height:100px;' :src="item" mode=""></image>
+				</view>
+				
+			</u-form-item>
+		</u-form>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button v-if='list.approveStatus'  @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button v-if='list.approveStatus'  @click='pass' type="success" class="btn2">通过</u-button>
+		</view>
+		<view v-if='show' class="shade">
+			<view class="wrap">
+				<view style='border-bottom:1px solid #eee;padding:10px;display:flex;justify-content:space-between;'>{{title}}
+				<u-icon name="close"></u-icon></view>
+				<view style='padding:10px;'>
+					<input v-model='auditMind'  v-if="this.title=='审核意见'" placeholder="请输入审核意见,不超过100字" type="text" value="" />
					<input v-model='auditMind'  v-if="this.title=='驳回原因'" placeholder="请输入原因" type="text" value="" />
+				</view>
+				<view  @click='close()' class="cancel">取消</view>
+				<view  @click='passSubmit()' class="confirm">确定</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: "",
+				currentPage: 1,
+				pageSize: 10,
+				list: [
+					{
+						status:"",
+					}
+				],
+				imglist:[],
+				auditMind:'',
+				show:false,
+				title:'',
+				contractNo: "",
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+			this.getList()
+		},
+		methods: {
+			getList(id) {
+				var that = this
+				this.$api.doRequest('get', '/contractManagementInfo/getInfo', {
+					id: this.id
+				}).then(res => {
+					if(res.data.code==200){
+						this.list=res.data.data
+						if (this.list.deliverType == 1) {
+							this.list.deliverType1 = '我方送货'
+						} else if (this.list.deliverType == 2) {
+							this.list.deliverType1 = '对方自提'
+						}
+						this.$api.doRequest('get', '/appendix/query/getFileList', {
+							appendixIds:that.list.addressUrl
+						}).then(res1 => {
+							for(var i=0;i<res1.data.data.length;i++){
+								that.imglist.push(res1.data.data[i].appendixPath)
+							}
+							
+					   })
+					}
+				})
+			},
+			//驳回
+			rejectSubmit() {
+				var that = this
+				that.$api.doRequest('post', '/workflow/api/handle', {
+					taskId: that.list.taskId,
+					approved: false,
+					auditMind: this.auditMind,
+					needReapply: true,
+				}).then(res => {
+					that.$api.msg('驳回成功')
+					that.show=false
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
+				})
+			},
+			close(){
+				this.show=false
+			},
+			pass(){
+				console.log(1111)
+				this.show=true
+				this.title='审核意见'
+			},
+			reject() {
+				this.show=true
+				this.title='驳回原因'
+			},
+			//通过
+			passSubmit() {
+				var that = this
+				if(this.title=='驳回原因'){
+					this.rejectSubmit()
+				}else{
+				that.$api.doRequest('post', '/workflow/api/handle', {
+					taskId: that.list.taskId,
+					approved: true,
+					auditMind: this.auditMind,
+					needReapply: true,
+				}).then(res => {
+					that.$api.msg('通过成功')
+					that.show=false
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
+				})
+				}
+			},
+			//审核方法
+			audit(item, index, status, status2, reason) {
+				if (index < this.list.length) {
+					this.$api.doRequest('post', '/workflow/api/handle', {
+						taskId: item.taskId,
+						approved: status,
+						auditMind: reason != undefined ? '已驳回' : '34',
+						needReapply: status2 != undefined ? true : false,
+					}).then(res => {
+						this.audit(this.list[index + 1], index + 1, status)
+					})
+				} else {
+					if (status == true) {
+						that.$api.msg('通过成功')
+						this.getList()
+					} else if (status == false) {
+						that.$api.msg('驳回成功')
+						this.getList()
+					}
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.container {
+		padding: 20rpx 20rpx 250rpx 20rpx;
+	}
+	.u-form{
+		background:#fff;
+		border-radius:10px;
+		padding:0 10px;
+		.u-form-item{
+			line-height:30px;
+			padding:5px 0;
+		}
+	}
+	.content {
+		margin-top: 30rpx;
+		.top {
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.content-item {
+			border-radius: 20rpx;
+			background: white;
+			padding: 40rpx 20rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.title {
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+			margin: 20rpx 0;
+		}
+		.car-container{
+			border-bottom: 2rpx solid #EEEEEE;
+		}
+
+		.car-type-item {
+			font-size: 28rpx;
+			margin: 20rpx 0;
+			color: #878C9C;
+		}
+
+		.weightInfoCss {
+			font-size: 28rpx;
+			color: #333333;
+			font-weight: 500;
+		}
+		.row {
+			display: flex;
+			justify-content: space-between;
+			// .right,
+			// input {
+			// 	font-size: 28rpx;
+			// 	// color: #333333;
+			// }
+		}
+
+		.money {
+			font-size: 32rpx;
+			font-weight: 500;
+			margin-bottom: 30rpx ;
+		}
+
+		.moneyInfo {
+			color: #22C572;
+			font-size: 32rpx;
+		}
+	}
+.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom:0;
+		display: flex;
+		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
+		}
+		.topInfo {
+			height: 210rpx;
+			background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+			padding: 30rpx;
+		
+			.topInfo-item {
+				height: 150rpx;
+				background-color: #FFFFFF;
+				border-radius: 20rpx;
+				padding: 40rpx;
+		
+				.logo {
+					width: 40rpx;
+					height: 40rpx;
+					margin-top: 8rpx;
+				}
+		
+				.infoText {
+					font-size: 36rpx;
+					font-weight: 600;
+					margin-left: 20rpx;
+				}
+		
+				.infoData {
+					color: #878C9C;
+					font-size: 26rpx;
+					margin-top: 10rpx;
+				}
+			}
+		}
+		.shade{
+			position:fixed;
+			top:0;
+			left:0;
+			height:100%;width:100%;
+			background:rgba(0,0,0,0.1);
+			z-index:3;
+			.wrap{
+				position:absolute;
+				left:0;top:0;right:0;bottom:0;margin:auto;
+				background:#fff;
+				width:80%;
+				height:30%;
+			}
+		}
+		.cancel,.confirm{
+			position:absolute;
+			display:inline-block;
+			width:50%;
+			text-align:center;
+			bottom:0;
+			padding:10px;
+			border-top:1px solid #eee;
+		}
+		.cancel{
+			left:0;
+			border-right:1px solid #eee;
+		}
+		.confirm{
+			right:0;
+		}
+</style>

pages/user/setUp.vue

@@ -9,10 +9,10 @@
 					<view class="pictures">
 						<image :src="headUrl" class="picture"></image>
 					</view>
-					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow" ></image>
+					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
 			</view>
-			<view class='cu-item' style='margin-bottom:10px;'  @click="nickname(username)">
+			<view class='cu-item' style='margin-bottom:10px;' @click="nickname(username)">
 				<view>
 					<text>昵称</text>
 				</view>
@@ -20,20 +20,22 @@
 					<view class="username">
 						{{username}}
 					</view>
-					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow" ></image>
+					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
 			</view>
 			<view class='cu-item' @click='fankui'>
 				<view>
 					<text>意见反馈</text>
 				</view>
-				<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow" ></image>
+				<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
 			</view>
 		</view>
 		<view class='exitloginwrap'>
 			<button @click='logout()' class='exitlogin'>退出登录</button>
 		</view>
-		
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='温馨提示'
+			showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 
@@ -44,19 +46,19 @@
 	export default {
 		data() {
 			return {
-				headUrl:"../../static/img/myimg/YongHu@3x.png",
-				username:"",
-				gridList: [
-					{
-						num:0,
-						name: '退出登录',
-						// icon:'cuIcon-exit',
-						src:'../../static/img/sign/return@3x.png',
-						tips: 0,
-						url:'',
-						show:true
-					},
-				],
+				isShowAlert: false,
+				content: '您确定要退出吗?',
+				headUrl: "../../static/img/myimg/YongHu@3x.png",
+				username: "",
+				gridList: [{
+					num: 0,
+					name: '退出登录',
+					// icon:'cuIcon-exit',
+					src: '../../static/img/sign/return@3x.png',
+					tips: 0,
+					url: '',
+					show: true
+				}, ],
 			}
 		},
 		computed: {
@@ -65,65 +67,80 @@
 		onShow() {
 			this.getList()
 		},
-		onLoad() {
-		},
-		methods:{
-			getList(){
-				this.userInfo= uni.getStorageSync('userInfo')
-					this.headUrl = this.userInfo.avatarUrl
-				if(this.headUrl == null || this.headUrl == ""){
-					this.headUrl="../../static/img/myimg/YongHu@3x.png"
+		onLoad() {},
+		methods: {
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			goOpenService() {
+				uni.hideTabBarRedDot({
+					index: 3
+				})
+				uni.clearStorageSync();
+				this.$store.commit('logout')
+				this.$api.logout()
+				uni.navigateTo({
+					url: `/pages/public/login`
+				})
+			},
+			getList() {
+				this.userInfo = uni.getStorageSync('userInfo')
+				this.headUrl = this.userInfo.avatarUrl
+				if (this.headUrl == null || this.headUrl == "") {
+					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
 				}
 				this.username = this.userInfo.userName
 			},
-			switchPicture(){	
+			switchPicture() {
 				uni.navigateTo({
 					url: `/pages/user/set_picture`
 				})
 			},
-			nickname(username){
+			nickname(username) {
 				uni.navigateTo({
 					url: `/pages/user/set_nickname?nickname=${username}`
 				})
 			},
-			exitlogin(){
-				
+			exitlogin() {
+
 			},
-			fankui(){
+			fankui() {
 				uni.navigateTo({
 					url: `/pages/user/fankui`
 				})
 			},
 			logout() {
-				const that = this
-				uni.showModal({
-					title: '询问',
-					content: '您确定要退出吗？',
-					cancelText: '取消',
-					confirmText: '确定',
-					success: (e) => {
-						if (e.confirm) {
-							uni.hideTabBarRedDot({
-								index:3
-							})
-							uni.clearStorageSync();
-							that.$store.commit('logout')
-							that.$api.logout()
-							uni.navigateTo({
-								url: `/pages/public/login`
-							})
-						}
-					}
-				})
+				// const that = this
+				this.isShowAlert = true
+				// uni.showModal({
+				// 	title: '询问',
+				// 	content: '您确定要退出吗？',
+				// 	cancelText: '取消',
+				// 	confirmText: '确定',
+				// 	success: (e) => {
+				// 		if (e.confirm) {
+				// 			uni.hideTabBarRedDot({
+				// 				index: 3
+				// 			})
+				// 			uni.clearStorageSync();
+				// 			that.$store.commit('logout')
+				// 			that.$api.logout()
+				// 			uni.navigateTo({
+				// 				url: `/pages/public/login`
+				// 			})
+				// 		}
+				// 	}
+				// })
 			},
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	page{
+	page {
 		background-color: #F5F6FA;
 	}
+
 	.container {
 		padding: 10px 0 0px;
 	}
@@ -156,6 +173,7 @@
 		width: 35px;
 		height: 35px;
 	}
+
 	.arrow {
 		margin-left: 15px;
 		width: 8px;
@@ -163,34 +181,40 @@
 		// justify-content: flex-end
 
 	}
-	.username{
+
+	.username {
 		line-height: 50px;
 		color: #6D6D72;
 	}
-	.sign{
+
+	.sign {
 		width: 18px;
 		height: 18px;
 		top: 4px;
 		margin-right: 6px;
 	}
-	.cu-list>.cu-item:after{
-		border:none;
+
+	.cu-list>.cu-item:after {
+		border: none;
 	}
-	.exitloginwrap{
-		position:fixed;
-		bottom:0;
-		left:0;
-		width:100%;
-		padding-bottom:20px;
+
+	.exitloginwrap {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		padding-bottom: 20px;
 	}
-	.exitlogin{
-		width:90%;
-		background:#fff;
-		border-radius:30px;
-		color:#FB1E1E;
-		font-size:17px;
+
+	.exitlogin {
+		width: 90%;
+		background: #fff;
+		border-radius: 30px;
+		color: #FB1E1E;
+		font-size: 17px;
 	}
-	.exitlogin:after{
-		border:none;
+
+	.exitlogin:after {
+		border: none;
 	}
 </style>

pages/user/user.vue

@@ -45,6 +45,10 @@
 				</view>
 			</view>
 		</view>
+		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
+			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='温馨提示'
+			showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
+		</view>
 		<!-- <view style="margin-top: 10rpx;">
 			<web-view src="https://datav.aliyuncs.com/share/01de6913a5761ab4d3171b1f0b3e0704"></web-view>
 		</view> -->
@@ -94,6 +98,8 @@
 		},
 		data() {
 			return {
+				isShowAlert: false,
+				content: '您确定要退出吗?',
 				haveCompany:false,
 				scrollTop: 0,
 				inputShow: false,
@@ -340,6 +346,20 @@
 			console.log("this.userInfo", this.userInfo)
 		},
 		methods: {
+			cancelClick() {
+				this.isShowAlert = false
+			},
+			goOpenService() {
+				uni.hideTabBarRedDot({
+					index: 3
+				})
+				uni.clearStorageSync();
+				this.$store.commit('logout')
+				this.$api.logout()
+				uni.navigateTo({
+					url: `/pages/public/login`
+				})
+			},
 			compconfirm(e){
 				
 				var that = this
@@ -615,26 +635,27 @@
 				})
 			},
 			logout() {
-				const that = this
-				uni.showModal({
-					title: '询问',
-					content: '您确定要退出吗？',
-					cancelText: '取消',
-					confirmText: '确定',
-					success: (e) => {
-						if (e.confirm) {
-							uni.hideTabBarRedDot({
-								index: 3
-							})
-							uni.clearStorageSync();
-							that.$store.commit('logout')
-							that.$api.logout()
-							uni.navigateTo({
-								url: `/pages/public/login`
-							})
-						}
-					}
-				})
+				// const that = this
+				this.isShowAlert = true
+				// uni.showModal({
+				// 	title: '询问',
+				// 	content: '您确定要退出吗？',
+				// 	cancelText: '取消',
+				// 	confirmText: '确定',
+				// 	success: (e) => {
+				// 		if (e.confirm) {
+				// 			uni.hideTabBarRedDot({
+				// 				index: 3
+				// 			})
+				// 			uni.clearStorageSync();
+				// 			that.$store.commit('logout')
+				// 			that.$api.logout()
+				// 			uni.navigateTo({
+				// 				url: `/pages/public/login`
+				// 			})
+				// 		}
+				// 	}
+				// })
 			},
 			/**
 			 * 统一跳转接口,拦截未登录路由