gjy 3 роки тому
батько
коміт
d97adfbb01

+ 2 - 2
config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.120:8090/',
+	baseUrlNew: 'http://192.168.1.120:8090/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 26 - 0
pages.json

@@ -324,6 +324,32 @@
 				"navigationBarTitleText": "身份认证"
 			}
 		},
+		{
+			"path": "pages/bill/index",
+			"style": {
+				"navigationBarTitleText": "我的票据"
+			}
+		},
+		{
+			"path": "pages/erpbusiness/index",
+			"style": {
+				"navigationBarTitleText": "ERP业务"
+			}
+		},
+		{
+			"path": "pages/erpbusiness/quality_testing",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/erpbusiness/check_the_weight",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/attestation/indexTwo",
 			"style": {

+ 158 - 0
pages/bill/index.vue

@@ -0,0 +1,158 @@
+<template>
+	<view>
+		<view v-for='item in dataInfo'>
+			<view>
+			买方{{item.compName}}
+			</view>
+			<view>
+			卖方{{item.customerName}}
+			</view>
+			<view>{{item.paymentNo}}</view>
+			<view>
+				<view>{{item.goodsName}}{{item.netWeight}}</view>
+				<view>单价{{item.tidalGrainPrice}}</view>
+			</view>
+			<view>
+				<view>应付{{item.amountIngPayable}}</view>
+				<view>单价{{item.amountEdPayable}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "business",
+		data() {
+			return {
+				pageSize:10,
+				currentPage:1,
+				isLoadMore:false,
+				searchKeyWord:'',
+				searchType:'',
+				dataInfo:[]
+			}
+		},
+		onShow() {
+		},
+		onLoad(options) {
+			this.loadData();
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		// onPageScroll(e) {
+		// 	this.scrollTop = e.scrollTop;
+		// },
+		//下拉刷新
+		onPullDownRefresh() {
+			this.currentPage = 1
+			this.isLoadMore = false
+			this.loadStatus = 'loading'
+			this.loadData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断,上锁,防止重复请求
+				this.isLoadMore = true
+				this.currentPage += 1
+				this.getIndexBuyData()
+			}
+		},
+		methods: {
+			top() { //回到顶部  
+			    uni.pageScrollTo({ 
+			      scrollTop: 0, duration: 300 
+			    }); 
+			},
+			naviageToPage(page) {
+				page = page + this.TabCur
+				uni.navigateTo({
+					url: page,
+					fail() {
+						uni.switchTab({
+							url: page
+						})
+					}
+				})
+			},
+			locationChange(e) {
+				console.log(e)
+				this.location = this.locationType[e[0]]
+				this.receivePrivate = this.locationType[e[0]]
+				this.currentPage = 1
+				this.loadData()
+			},
+			tabSelect(e) {
+				this.TabCur = e.currentTarget.dataset.id;
+				this.category = this.TabCur
+				this.currentPage = 1
+				this.loadData()
+			},
+			//加载商品 ,带下拉刷新和上滑加载
+			async loadData(type = 'add', loading) {
+				if(!this.hasLogin){
+					ni.showModal({
+						title: '登录提示',
+						content: '您尚未登录,是否立即登录?',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}else{
+					const that = this
+				uni.showLoading({
+					title: '正在加载'
+				})
+				var param1 = ''
+				this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
+						pageSize: this.pageSize,
+						currentPage: this.currentPage,
+						searchKeyWord: this.searchKeyWord,
+						searchType: this.searchType,
+						managementType:1,
+						customerPhone:this.userInfo.phone,
+						pcFlag:1
+						// warehouseName:'',
+					}).then(res => {
+						uni.hideLoading()
+						this.dataInfo = res.data.data.records
+					})
+					.catch(res => {
+						uni.hideLoading()
+						if (res.errmsg) {
+							uni.showToast({
+								title: res.errmsg,
+								icon: 'none',
+								duration: 2000
+							})
+						} else {
+							uni.showToast({
+								title: "系统异常,请联系管理员",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
+				}
+				
+			},
+		}
+	}
+</script>
+
+<style>
+</style>

+ 8 - 0
pages/erpbusiness/check_the_weight.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 872 - 0
pages/erpbusiness/index.vue

@@ -0,0 +1,872 @@
+<template>
+	<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="['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='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="['cuIcon-' + item.cuIcon,'text-' + item.color]">
+						<image :src="item.src" class="sign"></image>
+					</view>
+					
+					<text>{{item.name}}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import dragButton from "@/components/drag-button/drag-button.vue";
+	import {
+		mapState
+	} from 'vuex';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			dragButton
+		},
+		data() {
+			return {
+				inputShow: false,
+				modalName: '',
+				mycarStyle: '',
+				feild: undefined,
+				inputContent: '',
+				coverTransform: 'translateY(0px)',
+				coverTransition: '0s',
+				moving: false,
+				footprintList: [],
+				isVip: false,
+				userInfoTmp: [],
+				inputStatus: 'none',
+				carInfo: [],
+				gridCol: 4,
+				gridBorder: false,
+				headUrl:"../../static/img/myimg/YongHu@3x.png",
+				userphone:"",
+				username:"请更改昵称",
+				gridList: [
+					{
+						num: 0,
+						name: '邀请用户',
+						// icon: 'cuIcon-apps',
+						src:'../../static/img/erp/yaoqingyonghu@3x.png',
+						tips: 0,
+						url: '/pages/attestation/index',
+						show: true
+					},
+					{
+						num: 1,
+						name: '收购质检',
+						// icon: 'cuIcon-calendar',
+						src:'../../static/img/erp/shougouzhijian@3x.png',
+						tips: 0,
+						url: '/pages/erpbusiness/quality_testing?managementType=1',
+						show: true
+					},
+					{
+						num: 2,
+						name: '收购检斤',
+						// icon: 'cuIcon-copy',
+						src:'../../static/img/erp/shougoujianjin@3x.png',
+						tips: 0,
+						url: '/pages/task/my_task',
+						show: true
+					}
+					// {
+					// 	num: 5,
+					// 	name: '设置',
+					// 	// icon: 'cuIcon-edit',
+					// 	src:'../../static/img/sign/shezhi@2x.png',
+					// 	tips: 0,
+					// 	url: `/pages/user/setUp`,
+					// 	show: true
+					// }
+				],
+				gridList1: [
+					{
+						num: 0,
+						name: '出库检斤',
+						// icon: 'cuIcon-apps',
+						src:'../../static/img/erp/chukujianjin@3x.png',
+						tips: 0,
+						url: '/pages/attestation/index?',
+						show: true
+					},
+					{
+						num: 1,
+						name: '出库质检',
+						// icon: 'cuIcon-calendar',
+						src:'../../static/img/erp/chukuzhijian@3x.png',
+						tips: 0,
+						url: '/pages/erpbusiness/quality_testing?managementType=3',
+						show: true
+					}
+					// {
+					// 	num: 5,
+					// 	name: '设置',
+					// 	// icon: 'cuIcon-edit',
+					// 	src:'../../static/img/sign/shezhi@2x.png',
+					// 	tips: 0,
+					// 	url: `/pages/user/setUp`,
+					// 	show: true
+					// }
+				],
+				showTran: true,
+				companyId: 1,
+				current: 4
+			}
+		},
+		
+		onLoad() {
+			
+		},
+		// #ifndef MP
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.navTo('/pages/set/set');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '/pages/notice/notice'
+				})
+			}
+		},
+		// #endif
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+			// 手机号中间4位加*
+			starUserphone(){
+				let reg = /^(\d{3})\d{4}(\d{4})$/;
+				if(this.userphone){
+					return this.userphone.replace(reg, "$1****$2");
+				}
+			}
+		},
+		onShow() {
+			
+			uni.hideKeyboard()
+			uni.showTabBar()
+			this.loadData()
+			console.log("hasLogin",this.hasLogin )
+			if(this.userInfo){
+				if(!this.userInfo.avatarUrl){
+					this.headUrl = "../../static/img/myimg/YongHu@3x.png"
+				}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)
+					if (res.data.data) {
+						let name = 'myTip';
+						let value = res.data.data.task;
+						that.$store.commit('$uStore', {
+							name,
+							value
+						});
+						if(value != 0&&value){
+							uni.setTabBarBadge({
+								index:4,
+								text:value+""
+							})
+						}
+						name = 'taskTip';
+						value = res.data.data.task;
+						that.$store.commit('$uStore', {
+							name,
+							value
+						});
+						// name = 'contractTip';
+						// value = res.data.data.contractTip;
+						// that.$store.commit('$uStore', {
+						// 	name,
+						// 	value
+						// });
+					}
+				})
+			}else{
+				this.headUrl = "../../static/img/myimg/YongHu@3x.png"
+				this.username = "立即登录"
+			}
+			console.log("this.userInfo",this.userInfo)
+		},
+		methods: {
+			fankui(){
+				uni.navigateTo({
+					url: `/pages/user/fankui`
+				})
+			},
+			zhibo() {
+				uni.navigateTo({
+					url: `/pageB/video/broadcast`
+				})
+			},
+			look() {
+				uni.navigateTo({
+					url: `/pageB/video/look`
+				})
+			},
+			contactUs() {
+				const that = this
+				uni.makePhoneCall({
+					// 手机号
+					phoneNumber: '18241771147',
+					// 成功回调
+					success: (res) => {},
+					// 失败回调
+					fail: (res) => {}
+				});
+			},
+			loadData() {
+				// const that = this
+				// if(uni.getStorageSync("PageCur")){
+				// 	that.PageCur = uni.getStorageSync("PageCur");
+				// }
+				// that.userInfoTmp = uni.getStorageSync("userInfo")
+				// uni.showLoading({
+				// 	title: '正在加载',
+				// 	mask:true
+				// })
+				// that.$api.request('integral', 'getIndexData', failres => {
+				// 	that.$api.msg(failres.errmsg)
+				// 	uni.hideLoading()
+				// }).then(res => {
+				// 	let data = res.data
+				// 	uni.setStorageSync("message", data.message);
+				// 	uni.setStorageSync("task", data.task);
+				// 	uni.setStorageSync("contract", data.contract);
+				// 	uni.setStorageSync('showTran', data.showTran);
+				// 	that.showTran = data.showTran
+				// 	that.gridList[4].tips = data.task
+				// 	that.gridList[2].tips = data.contract
+				// 	that.companyId = data.companyId
+				// 	uni.hideLoading()
+				// })
+			},
+			gridClick(item, index) {
+				var that = this
+				if (item.name == "退出登录") {
+					this.logout()
+					return;
+				} else if (item.name == "联系我们") {
+					//#ifdef MP
+					this.inputShow = true
+					this.inputStatus = 'inline'
+					this.feild = "nickname"
+					this.inputContent = ''
+					//#endif
+					//#ifdef APP-PLUS
+					this.contactUs()
+					//#endif
+					return;
+				} else if (item.name == '我的车辆') {
+					const that = this
+					uni.showLoading({
+						title: '正在加载',
+						mask: true
+					})
+					that.$api.request('tran', 'getMyCarList', failres => {
+						that.$api.msg(failres.errmsg)
+						uni.hideLoading()
+					}).then(res => {
+						that.carInfo = res.data
+						if (that.carInfo.length == 0) {
+							that.$api.msg('暂无车辆信息')
+						} else {
+							var height = that.carInfo.length * 100
+							var width = 500
+							that.mycarStyle = "height:" + height + "rpx;width:" + width + "rpx"
+							that.modalName = 'MycarModal'
+						}
+						uni.hideLoading()
+					})
+
+					return;
+				}
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录,是否立即登录?',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}else {
+					if (item.url) {
+						uni.navigateTo({
+							url: item.url 
+						})
+					}
+				}
+			},
+			setting(){
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录,是否立即登录?',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}else {
+						uni.navigateTo({
+							url:'/pages/user/setUp'
+						})
+				}
+			},
+			toLogin() {
+				console.log("userInfo",this.userInfo)
+				if (!this.hasLogin || !this.userInfo || this.username == "立即登录") {
+					uni.navigateTo({
+						url: '/pages/public/login_account_number'
+					})
+				}
+				else{
+					uni.navigateTo({
+						url: '/pages/user/setUp'
+					})
+				}
+				// else if(!this.userInfo.nickname){
+				// 	this.inputShow = true
+				// 	this.inputStatus = 'inline'
+				// 	this.feild = "nickname"
+				// 	this.inputContent = ''
+				// }
+			},
+			confirm() {
+				const that = this
+				if (!that.inputContent) {
+					that.$api.msg('输入不能为空')
+					return
+				}
+				let obj = {}
+				obj[that.feild] = that.inputContent
+				that.$api.request('user', 'syncUserInfo', obj).then(res => {
+					that.userInfo.nickname = that.inputContent
+					that.inputContent = ''
+					that.$store.commit('login', that.userInfo)
+				})
+			},
+			cancel() {
+				this.inputShow = false
+				this.inputStatus = 'none'
+				this.genderShow = false
+			},
+			myAccount() {
+				uni.navigateTo({
+					url: `/pageA/pages/contract`
+				})
+			},
+			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`
+							})
+						}
+					}
+				})
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画,所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			mycarClick(carNo) {
+				this.modalName = null
+				uni.navigateTo({
+					url: `/pageB/car/mycar_detail?carNo=${carNo}`
+				})
+			},
+			qrClick(userInfo) {
+				this.modalName = null
+				uni.navigateTo({
+					url: `/pages/user/qr`
+				})
+			},
+			scanCode() {
+				uni.scanCode({
+					success: function(res) {
+						uni.navigateTo({
+							url: res.result
+						})
+					}
+				})
+			},
+			hideModal(e) {
+				this.modalName = null
+			},
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page{
+		background:#F5F6FA;
+	}
+	.container {
+		padding-top: 85px;
+		padding-top: 35px;
+		background-color: #F5F6FA;
+		position: relative;
+		width: 100vw;
+		height: 100vh;
+		overflow: hidden;
+		background: url('~@/static/img/login/bg_slices/bg@3x.png');
+		background-size: 100% 100%;
+		margin: 0 auto;
+	}
+
+	.cu-tag.badge {
+		right: 26rpx;
+	}
+
+	.path {
+		color: #007aff;
+		display: inline-block;
+		text-align: center;
+	}
+
+	.icon {
+		margin-right: 10rpx;
+	}
+
+	.portrait-box {
+		margin-top: 20rpx;
+	}
+
+	.qr-wrap {
+		margin-top: 20upx;
+		color: #fff;
+		font-size: 32rpx;
+	}
+
+	.cu-list {
+		/* height: 483rpx;
+		overflow-y: scroll; */
+		background:transparent;
+	}
+	.cu-list.grid.no-border{
+		padding:0;
+	}
+	.badge_user {
+		color: #fff;
+		background-color: #dc3545;
+		display: inline-block;
+		padding: .25em .4em;
+		font-size: 75%;
+		font-weight: 700;
+		line-height: 1;
+		text-align: center;
+		white-space: nowrap;
+		vertical-align: top;
+		border-radius: 50%;
+		transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+	}
+
+	@keyframes move_wave {
+		0% {
+			transform: translateX(0) translateZ(0) scaleY(1)
+		}
+
+		50% {
+			transform: translateX(-25%) translateZ(0) scaleY(0.55)
+		}
+
+		100% {
+			transform: translateX(-50%) translateZ(0) scaleY(1)
+		}
+	}
+
+	.bg {
+		position: relative;
+		height: 300rpx;
+		/* background: linear-gradient(to bottom, #56ccf2, #2f80ed); */
+		/*background: linear-gradient(to bottom, #0be9fe, #4bb0fe); */
+		background: linear-gradient(to bottom, #d5f8ff, #56ccf2);
+
+	}
+
+	.bg_ware {
+		position: absolute;
+		left: 0;
+		bottom: -2rpx;
+		width: 100%;
+		mix-blend-mode: screen;
+		height: 224rpx;
+	}
+
+	%flex-center {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	%section {
+		display: flex;
+		justify-content: space-around;
+		align-content: center;
+		background: #fff;
+		border-radius: 10upx;
+	}
+
+	.grid-item-box {
+		flex: 1;
+		/* position: relative;
+ */
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 15px 0;
+	}
+
+	.image {
+		width: 80rpx;
+		height: 80rpx;
+	}
+
+	.text {
+		font-size: 26rpx;
+		margin-top: 10rpx;
+	}
+
+	.user-section {
+		height: 520upx;
+		padding: 100upx 30upx 0;
+		position: relative;
+
+		.bg {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			filter: blur(1px);
+			box-shadow: 0px 1px 8px #ccc;
+			/* background:linear-gradient(#0eb0c9,#126bae); */
+			/* opacity: .7; */
+		}
+	}
+
+	.user-info-box {
+		height: 180upx;
+		/* display:flex; */
+		/* align-items:center; */
+		text-align: center;
+		position: relative;
+		z-index: 1;
+
+		.portrait {
+			width: 130upx;
+			height: 130upx;
+			border: 5upx solid #fff;
+			border-radius: 50%;
+		}
+
+		.username {
+			font-size: $font-lg + 3upx;
+			color: #fff;
+			margin-top: 20upx;
+		}
+	}
+
+	.vip-card-box {
+		display: flex;
+		flex-direction: column;
+		color: #f7d680;
+		height: 240upx;
+		background: linear-gradient(left, rgba(0, 0, 0, .7), rgba(0, 0, 0, .8));
+		border-radius: 16upx 16upx 0 0;
+		overflow: hidden;
+		position: relative;
+		padding: 20upx 24upx;
+
+		.card-bg {
+			position: absolute;
+			top: 20upx;
+			right: 0;
+			width: 380upx;
+			height: 260upx;
+		}
+
+		.b-btn {
+			position: absolute;
+			right: 20upx;
+			top: 16upx;
+			width: 132upx;
+			height: 40upx;
+			text-align: center;
+			line-height: 40upx;
+			font-size: 22upx;
+			color: #36343c;
+			border-radius: 20px;
+			background: linear-gradient(left, #f9e6af, #ffd465);
+			z-index: 1;
+		}
+
+		.tit {
+			font-size: $font-base+2upx;
+			color: #f7d680;
+			margin-bottom: 28upx;
+
+			.yticon {
+				color: #f6e5a3;
+				margin-right: 16upx;
+			}
+		}
+
+		.e-b {
+			font-size: $font-sm;
+			color: #d8cba9;
+			margin-top: 10upx;
+		}
+	}
+
+	.cover-container {
+		padding: 1px 10px ;
+		padding-bottom: 200upx;
+		
+	   /* background-color: #F5F6FA; */
+	/* 	border-radius: 20px; */
+		margin-top: 60upx;
+
+		.arc {
+			position: absolute;
+			left: 0;
+			top: -34upx;
+			width: 100%;
+			height: 36upx;
+		}
+	}
+
+	.tj-sction {
+		@extend %section;
+
+		.tj-item {
+			@extend %flex-center;
+			flex-direction: column;
+			height: 140upx;
+			font-size: $font-sm;
+			color: #75787d;
+		}
+
+		.num {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 8upx;
+		}
+	}
+
+	.order-section {
+		@extend %section;
+		padding: 28upx 0;
+		margin-top: 20upx;
+
+		.order-item {
+			@extend %flex-center;
+			width: 120upx;
+			height: 120upx;
+			border-radius: 10upx;
+			font-size: $font-sm;
+			color: $font-color-dark;
+		}
+
+		.yticon {
+			font-size: 48upx;
+			margin-bottom: 18upx;
+			color: #fa436a;
+		}
+
+		.icon-shouhoutuikuan {
+			font-size: 44upx;
+		}
+	}
+
+	.history-section {
+		padding: 30upx 0 0;
+		margin-top: 20upx;
+		background: #fff;
+		border-radius: 10upx;
+
+		.sec-header {
+			display: flex;
+			align-items: center;
+			font-size: $font-base;
+			color: $font-color-dark;
+			line-height: 40upx;
+			margin-left: 30upx;
+
+			.yticon {
+				font-size: 44upx;
+				color: #5eba8f;
+				margin-right: 16upx;
+				line-height: 40upx;
+			}
+		}
+
+		.h-list {
+			white-space: nowrap;
+			padding: 30upx 30upx 0;
+
+			image {
+				display: inline-block;
+				width: 160upx;
+				height: 160upx;
+				margin-right: 20upx;
+				border-radius: 10upx;
+			}
+		}
+	}
+
+	.grid {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+
+		/* border-top: 2upx solid rgba(172,172,172,.2); */
+		.grid-item-3 {
+			box-sizing: border-box;
+			width: calc(100% / 3);
+			border-bottom: 2upx solid rgba(172, 172, 172, .2);
+			border-right: 2upx solid rgba(172, 172, 172, .2);
+			text-align: center;
+			padding: 40upx 0;
+			position: relative;
+
+			/* view{
+				font-size: $font-sm;
+				margin-top: 16upx;
+				color: $font-color-dark;
+			} */
+			.grid_icon {
+				font-size: 48upx;
+				margin-bottom: 18upx;
+				color: #fa436a;
+			}
+
+			.tip_text {
+				display: block;
+				padding: 4upx 8upx;
+				text-align: center;
+				border-radius: 36upx;
+				font-size: 24upx;
+				background-color: #fa436a;
+				color: rgba(255, 255, 255, 1);
+				position: absolute;
+				right: 6upx;
+				top: 6upx;
+			}
+		}
+
+		.grid-item-3:nth-child(3n + 3),
+		.grid-item-4:nth-child(4n + 4) {
+			border-right: none;
+		}
+	}
+
+	.headPortrait {
+		width: 75px;
+		height: 75px;
+		border-radius: 40px;
+		border: 2px solid #ffffff;
+	}
+
+	.personal {
+		margin-top: 10px;
+		margin-left: 20px;
+	}
+
+	.information {
+		font-size: 15px;
+		font-weight: 600;
+		height: 36px;
+	}
+	.indexlow{
+		/* margin-top: 30px; */
+		border-radius: 10px;
+	}
+	.cu-list>.cu-item:after{
+		border:none;
+	}
+	.sign{
+		width: 40px;
+		height: 40px;
+		top: 4px;
+		margin-right: 6px;
+	}
+	.indexUp{
+		padding:0 20px;
+		align-items: center;
+	}
+	.wrap{
+		background:#fff;
+		margin:10px;
+		border-radius:10px;
+		padding:10px;
+		.title{
+			font-size:16px;
+		}
+	}
+</style>

+ 821 - 0
pages/erpbusiness/quality_testing.vue

@@ -0,0 +1,821 @@
+<template>
+	<view>
+		11111
+	</view>
+</template>
+<script>
+	import dragButton from "@/components/drag-button/drag-button.vue";
+	import {
+		mapState
+	} from 'vuex';
+	let startY = 0,
+		moveY = 0,
+		pageAtTop = true;
+	export default {
+		components: {
+			dragButton
+		},
+		data() {
+			return {
+				inputShow: false,
+				modalName: '',
+				mycarStyle: '',
+				feild: undefined,
+				inputContent: '',
+				coverTransform: 'translateY(0px)',
+				coverTransition: '0s',
+				moving: false,
+				footprintList: [],
+				isVip: false,
+				userInfoTmp: [],
+				inputStatus: 'none',
+				carInfo: [],
+				gridCol: 4,
+				pageSize:10,
+				currentPage:1,
+				gridBorder: false,
+				headUrl:"../../static/img/myimg/YongHu@3x.png",
+				userphone:"",
+				username:"请更改昵称",
+				gridList: [
+					{
+						num: 0,
+						name: '邀请用户',
+						// icon: 'cuIcon-apps',
+						src:'../../static/img/erp/yaoqingyonghu@3x.png',
+						tips: 0,
+						url: '/pages/attestation/index',
+						show: true
+					},
+					{
+						num: 1,
+						name: '收购质检',
+						// icon: 'cuIcon-calendar',
+						src:'../../static/img/erp/shougouzhijian@3x.png',
+						tips: 0,
+						url: '/pages/erpbusiness/quality_testing?managementType=1',
+						show: true
+					},
+					{
+						num: 2,
+						name: '收购检斤',
+						// icon: 'cuIcon-copy',
+						src:'../../static/img/erp/shougoujianjin@3x.png',
+						tips: 0,
+						url: '/pages/task/my_task',
+						show: true
+					}
+					// {
+					// 	num: 5,
+					// 	name: '设置',
+					// 	// icon: 'cuIcon-edit',
+					// 	src:'../../static/img/sign/shezhi@2x.png',
+					// 	tips: 0,
+					// 	url: `/pages/user/setUp`,
+					// 	show: true
+					// }
+				],
+				gridList1: [
+					{
+						num: 0,
+						name: '出库检斤',
+						// icon: 'cuIcon-apps',
+						src:'../../static/img/erp/chukujianjin@3x.png',
+						tips: 0,
+						url: '/pages/attestation/index?',
+						show: true
+					},
+					{
+						num: 1,
+						name: '出库质检',
+						// icon: 'cuIcon-calendar',
+						src:'../../static/img/erp/chukuzhijian@3x.png',
+						tips: 0,
+						url: '/pages/erpbusiness/quality_testing?managementType=3',
+						show: true
+					}
+					// {
+					// 	num: 5,
+					// 	name: '设置',
+					// 	// icon: 'cuIcon-edit',
+					// 	src:'../../static/img/sign/shezhi@2x.png',
+					// 	tips: 0,
+					// 	url: `/pages/user/setUp`,
+					// 	show: true
+					// }
+				],
+				managementType:'',
+				showTran: true,
+				companyId: 1,
+				current: 4
+			}
+		},
+		
+		onLoad() {
+			
+		},
+		// #ifndef MP
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.navTo('/pages/set/set');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '/pages/notice/notice'
+				})
+			}
+		},
+		// #endif
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+			// 手机号中间4位加*
+			starUserphone(){
+				let reg = /^(\d{3})\d{4}(\d{4})$/;
+				if(this.userphone){
+					return this.userphone.replace(reg, "$1****$2");
+				}
+			}
+		},
+		onLoad(options){
+			console.log(options)
+			this.managementType=options.managementType
+		},
+		onShow() {
+			var that = this
+				this.$api.doRequest('get', 'qualityInspectionManagement/selectQualityInspection',{
+					pageSize: this.pageSize,
+					currentPage: this.currentPage,
+					searchKeyWord: this.searchKeyWord,
+					searchType: this.searchType,
+					managementType:this.managementType,
+					// compId:uni.getStorageSync('pcUserInfo').compId,
+					pcFlag:1
+				}).then(res => {
+					
+				})
+		},
+		methods: {
+			fankui(){
+				uni.navigateTo({
+					url: `/pages/user/fankui`
+				})
+			},
+			zhibo() {
+				uni.navigateTo({
+					url: `/pageB/video/broadcast`
+				})
+			},
+			look() {
+				uni.navigateTo({
+					url: `/pageB/video/look`
+				})
+			},
+			contactUs() {
+				const that = this
+				uni.makePhoneCall({
+					// 手机号
+					phoneNumber: '18241771147',
+					// 成功回调
+					success: (res) => {},
+					// 失败回调
+					fail: (res) => {}
+				});
+			},
+			loadData() {
+				// const that = this
+				// if(uni.getStorageSync("PageCur")){
+				// 	that.PageCur = uni.getStorageSync("PageCur");
+				// }
+				// that.userInfoTmp = uni.getStorageSync("userInfo")
+				// uni.showLoading({
+				// 	title: '正在加载',
+				// 	mask:true
+				// })
+				// that.$api.request('integral', 'getIndexData', failres => {
+				// 	that.$api.msg(failres.errmsg)
+				// 	uni.hideLoading()
+				// }).then(res => {
+				// 	let data = res.data
+				// 	uni.setStorageSync("message", data.message);
+				// 	uni.setStorageSync("task", data.task);
+				// 	uni.setStorageSync("contract", data.contract);
+				// 	uni.setStorageSync('showTran', data.showTran);
+				// 	that.showTran = data.showTran
+				// 	that.gridList[4].tips = data.task
+				// 	that.gridList[2].tips = data.contract
+				// 	that.companyId = data.companyId
+				// 	uni.hideLoading()
+				// })
+			},
+			gridClick(item, index) {
+				var that = this
+				if (item.name == "退出登录") {
+					this.logout()
+					return;
+				} else if (item.name == "联系我们") {
+					//#ifdef MP
+					this.inputShow = true
+					this.inputStatus = 'inline'
+					this.feild = "nickname"
+					this.inputContent = ''
+					//#endif
+					//#ifdef APP-PLUS
+					this.contactUs()
+					//#endif
+					return;
+				} else if (item.name == '我的车辆') {
+					const that = this
+					uni.showLoading({
+						title: '正在加载',
+						mask: true
+					})
+					that.$api.request('tran', 'getMyCarList', failres => {
+						that.$api.msg(failres.errmsg)
+						uni.hideLoading()
+					}).then(res => {
+						that.carInfo = res.data
+						if (that.carInfo.length == 0) {
+							that.$api.msg('暂无车辆信息')
+						} else {
+							var height = that.carInfo.length * 100
+							var width = 500
+							that.mycarStyle = "height:" + height + "rpx;width:" + width + "rpx"
+							that.modalName = 'MycarModal'
+						}
+						uni.hideLoading()
+					})
+
+					return;
+				}
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录,是否立即登录?',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}else {
+					if (item.url) {
+						uni.navigateTo({
+							url: item.url + `?companyId=${that.companyId}`
+						})
+					}
+				}
+			},
+			setting(){
+				if (!this.hasLogin) {
+					uni.showModal({
+						title: '登录提示',
+						content: '您尚未登录,是否立即登录?',
+						showCancel: true,
+						confirmText: '登录',
+						success: (e) => {
+							if (e.confirm) {
+								uni.navigateTo({
+									url: '/pages/public/login'
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {}
+					})
+				}else {
+						uni.navigateTo({
+							url:'/pages/user/setUp'
+						})
+				}
+			},
+			toLogin() {
+				console.log("userInfo",this.userInfo)
+				if (!this.hasLogin || !this.userInfo || this.username == "立即登录") {
+					uni.navigateTo({
+						url: '/pages/public/login_account_number'
+					})
+				}
+				else{
+					uni.navigateTo({
+						url: '/pages/user/setUp'
+					})
+				}
+				// else if(!this.userInfo.nickname){
+				// 	this.inputShow = true
+				// 	this.inputStatus = 'inline'
+				// 	this.feild = "nickname"
+				// 	this.inputContent = ''
+				// }
+			},
+			confirm() {
+				const that = this
+				if (!that.inputContent) {
+					that.$api.msg('输入不能为空')
+					return
+				}
+				let obj = {}
+				obj[that.feild] = that.inputContent
+				that.$api.request('user', 'syncUserInfo', obj).then(res => {
+					that.userInfo.nickname = that.inputContent
+					that.inputContent = ''
+					that.$store.commit('login', that.userInfo)
+				})
+			},
+			cancel() {
+				this.inputShow = false
+				this.inputStatus = 'none'
+				this.genderShow = false
+			},
+			myAccount() {
+				uni.navigateTo({
+					url: `/pageA/pages/contract`
+				})
+			},
+			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`
+							})
+						}
+					}
+				})
+			},
+			/**
+			 * 统一跳转接口,拦截未登录路由
+			 * navigator标签现在默认没有转场动画,所以用view
+			 */
+			navTo(url) {
+				if (!this.hasLogin) {
+					url = '/pages/public/login';
+				}
+				uni.navigateTo({
+					url
+				})
+			},
+			mycarClick(carNo) {
+				this.modalName = null
+				uni.navigateTo({
+					url: `/pageB/car/mycar_detail?carNo=${carNo}`
+				})
+			},
+			qrClick(userInfo) {
+				this.modalName = null
+				uni.navigateTo({
+					url: `/pages/user/qr`
+				})
+			},
+			scanCode() {
+				uni.scanCode({
+					success: function(res) {
+						uni.navigateTo({
+							url: res.result
+						})
+					}
+				})
+			},
+			hideModal(e) {
+				this.modalName = null
+			},
+		}
+	}
+</script>
+<style lang='scss' scoped>
+	page{
+		background:#F5F6FA;
+	}
+	.container {
+		padding-top: 85px;
+		padding-top: 35px;
+		background-color: #F5F6FA;
+		position: relative;
+		width: 100vw;
+		height: 100vh;
+		overflow: hidden;
+		background: url('~@/static/img/login/bg_slices/bg@3x.png');
+		background-size: 100% 100%;
+		margin: 0 auto;
+	}
+
+	.cu-tag.badge {
+		right: 26rpx;
+	}
+
+	.path {
+		color: #007aff;
+		display: inline-block;
+		text-align: center;
+	}
+
+	.icon {
+		margin-right: 10rpx;
+	}
+
+	.portrait-box {
+		margin-top: 20rpx;
+	}
+
+	.qr-wrap {
+		margin-top: 20upx;
+		color: #fff;
+		font-size: 32rpx;
+	}
+
+	.cu-list {
+		/* height: 483rpx;
+		overflow-y: scroll; */
+		background:transparent;
+	}
+	.cu-list.grid.no-border{
+		padding:0;
+	}
+	.badge_user {
+		color: #fff;
+		background-color: #dc3545;
+		display: inline-block;
+		padding: .25em .4em;
+		font-size: 75%;
+		font-weight: 700;
+		line-height: 1;
+		text-align: center;
+		white-space: nowrap;
+		vertical-align: top;
+		border-radius: 50%;
+		transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
+	}
+
+	@keyframes move_wave {
+		0% {
+			transform: translateX(0) translateZ(0) scaleY(1)
+		}
+
+		50% {
+			transform: translateX(-25%) translateZ(0) scaleY(0.55)
+		}
+
+		100% {
+			transform: translateX(-50%) translateZ(0) scaleY(1)
+		}
+	}
+
+	.bg {
+		position: relative;
+		height: 300rpx;
+		/* background: linear-gradient(to bottom, #56ccf2, #2f80ed); */
+		/*background: linear-gradient(to bottom, #0be9fe, #4bb0fe); */
+		background: linear-gradient(to bottom, #d5f8ff, #56ccf2);
+
+	}
+
+	.bg_ware {
+		position: absolute;
+		left: 0;
+		bottom: -2rpx;
+		width: 100%;
+		mix-blend-mode: screen;
+		height: 224rpx;
+	}
+
+	%flex-center {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	%section {
+		display: flex;
+		justify-content: space-around;
+		align-content: center;
+		background: #fff;
+		border-radius: 10upx;
+	}
+
+	.grid-item-box {
+		flex: 1;
+		/* position: relative;
+ */
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		padding: 15px 0;
+	}
+
+	.image {
+		width: 80rpx;
+		height: 80rpx;
+	}
+
+	.text {
+		font-size: 26rpx;
+		margin-top: 10rpx;
+	}
+
+	.user-section {
+		height: 520upx;
+		padding: 100upx 30upx 0;
+		position: relative;
+
+		.bg {
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			filter: blur(1px);
+			box-shadow: 0px 1px 8px #ccc;
+			/* background:linear-gradient(#0eb0c9,#126bae); */
+			/* opacity: .7; */
+		}
+	}
+
+	.user-info-box {
+		height: 180upx;
+		/* display:flex; */
+		/* align-items:center; */
+		text-align: center;
+		position: relative;
+		z-index: 1;
+
+		.portrait {
+			width: 130upx;
+			height: 130upx;
+			border: 5upx solid #fff;
+			border-radius: 50%;
+		}
+
+		.username {
+			font-size: $font-lg + 3upx;
+			color: #fff;
+			margin-top: 20upx;
+		}
+	}
+
+	.vip-card-box {
+		display: flex;
+		flex-direction: column;
+		color: #f7d680;
+		height: 240upx;
+		background: linear-gradient(left, rgba(0, 0, 0, .7), rgba(0, 0, 0, .8));
+		border-radius: 16upx 16upx 0 0;
+		overflow: hidden;
+		position: relative;
+		padding: 20upx 24upx;
+
+		.card-bg {
+			position: absolute;
+			top: 20upx;
+			right: 0;
+			width: 380upx;
+			height: 260upx;
+		}
+
+		.b-btn {
+			position: absolute;
+			right: 20upx;
+			top: 16upx;
+			width: 132upx;
+			height: 40upx;
+			text-align: center;
+			line-height: 40upx;
+			font-size: 22upx;
+			color: #36343c;
+			border-radius: 20px;
+			background: linear-gradient(left, #f9e6af, #ffd465);
+			z-index: 1;
+		}
+
+		.tit {
+			font-size: $font-base+2upx;
+			color: #f7d680;
+			margin-bottom: 28upx;
+
+			.yticon {
+				color: #f6e5a3;
+				margin-right: 16upx;
+			}
+		}
+
+		.e-b {
+			font-size: $font-sm;
+			color: #d8cba9;
+			margin-top: 10upx;
+		}
+	}
+
+	.cover-container {
+		padding: 1px 10px ;
+		padding-bottom: 200upx;
+		
+	   /* background-color: #F5F6FA; */
+	/* 	border-radius: 20px; */
+		margin-top: 60upx;
+
+		.arc {
+			position: absolute;
+			left: 0;
+			top: -34upx;
+			width: 100%;
+			height: 36upx;
+		}
+	}
+
+	.tj-sction {
+		@extend %section;
+
+		.tj-item {
+			@extend %flex-center;
+			flex-direction: column;
+			height: 140upx;
+			font-size: $font-sm;
+			color: #75787d;
+		}
+
+		.num {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 8upx;
+		}
+	}
+
+	.order-section {
+		@extend %section;
+		padding: 28upx 0;
+		margin-top: 20upx;
+
+		.order-item {
+			@extend %flex-center;
+			width: 120upx;
+			height: 120upx;
+			border-radius: 10upx;
+			font-size: $font-sm;
+			color: $font-color-dark;
+		}
+
+		.yticon {
+			font-size: 48upx;
+			margin-bottom: 18upx;
+			color: #fa436a;
+		}
+
+		.icon-shouhoutuikuan {
+			font-size: 44upx;
+		}
+	}
+
+	.history-section {
+		padding: 30upx 0 0;
+		margin-top: 20upx;
+		background: #fff;
+		border-radius: 10upx;
+
+		.sec-header {
+			display: flex;
+			align-items: center;
+			font-size: $font-base;
+			color: $font-color-dark;
+			line-height: 40upx;
+			margin-left: 30upx;
+
+			.yticon {
+				font-size: 44upx;
+				color: #5eba8f;
+				margin-right: 16upx;
+				line-height: 40upx;
+			}
+		}
+
+		.h-list {
+			white-space: nowrap;
+			padding: 30upx 30upx 0;
+
+			image {
+				display: inline-block;
+				width: 160upx;
+				height: 160upx;
+				margin-right: 20upx;
+				border-radius: 10upx;
+			}
+		}
+	}
+
+	.grid {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap;
+
+		/* border-top: 2upx solid rgba(172,172,172,.2); */
+		.grid-item-3 {
+			box-sizing: border-box;
+			width: calc(100% / 3);
+			border-bottom: 2upx solid rgba(172, 172, 172, .2);
+			border-right: 2upx solid rgba(172, 172, 172, .2);
+			text-align: center;
+			padding: 40upx 0;
+			position: relative;
+
+			/* view{
+				font-size: $font-sm;
+				margin-top: 16upx;
+				color: $font-color-dark;
+			} */
+			.grid_icon {
+				font-size: 48upx;
+				margin-bottom: 18upx;
+				color: #fa436a;
+			}
+
+			.tip_text {
+				display: block;
+				padding: 4upx 8upx;
+				text-align: center;
+				border-radius: 36upx;
+				font-size: 24upx;
+				background-color: #fa436a;
+				color: rgba(255, 255, 255, 1);
+				position: absolute;
+				right: 6upx;
+				top: 6upx;
+			}
+		}
+
+		.grid-item-3:nth-child(3n + 3),
+		.grid-item-4:nth-child(4n + 4) {
+			border-right: none;
+		}
+	}
+
+	.headPortrait {
+		width: 75px;
+		height: 75px;
+		border-radius: 40px;
+		border: 2px solid #ffffff;
+	}
+
+	.personal {
+		margin-top: 10px;
+		margin-left: 20px;
+	}
+
+	.information {
+		font-size: 15px;
+		font-weight: 600;
+		height: 36px;
+	}
+	.indexlow{
+		/* margin-top: 30px; */
+		border-radius: 10px;
+	}
+	.cu-list>.cu-item:after{
+		border:none;
+	}
+	.sign{
+		width: 40px;
+		height: 40px;
+		top: 4px;
+		margin-right: 6px;
+	}
+	.indexUp{
+		padding:0 20px;
+		align-items: center;
+	}
+	.wrap{
+		background:#fff;
+		margin:10px;
+		border-radius:10px;
+		padding:10px;
+		.title{
+			font-size:16px;
+		}
+	}
+</style>
+

+ 111 - 60
pages/user/user.vue

@@ -29,24 +29,30 @@
 			</view>
 
 		</view>
-		<view class="cover-container">
-
-			<view class="cu-list menu text-left  ">
-
-				<view class="cu-item" v-for="(item, index) in gridList" v-if="item.show" :key="index"
-					@click="gridClick(item, index)" hover-class="common-hover" :hover-stay-time="50">
-					<view>
-					<!-- 	<text :class="item.icon" class="grid_icon icon text-grey"></text> -->
-						<image :src="item.src" class="sign"></image>
-						<text >{{item.name}}</text>
-					</view>
-					<view>
-						<text v-if='item.num==2&&taskTip' class='badge_user'>{{taskTip}}</text>
-						<text v-if='item.num==1&&contractTip' class='badge_user'>{{contractTip}}</text>
-						<text class='tip_text cuIcon-right'></text>
+		<view style='background:transparent;margin-bottom:0;padding:0;' 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]">
+								<text v-if='item.num==1&&taskTip' class='badge_user'>{{taskTip}}</text>
+								<image :src="item.src" class="sign"></image>
+							</view>
+							
+							<text>{{item.name}}</text>
+						</view>
 					</view>
-					<!-- <image src="../../static/img/sign/authentication@3x.png" mode=""></image> -->
+		<view class="cover-container">
+			<view class='cover-container-item'>
+				<view style='font-size:16px;padding-left:14px;'>我的功能</view>
+				<view class="cu-list grid" :class="['col-' + gridCol,gridBorder?'':'no-border']">
+				<view class="cu-item" style='text-align:center;' 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="sign1"></image>
+					</view>		
+					<text>{{item.name}}</text>
 				</view>
+			</view>
+			</view>
+			
+		
 				<!-- <view class='cu-item' @click='scanCode'>
 							<view>
 								<text class="cuIcon-scan icon text-grey"></text>
@@ -55,14 +61,14 @@
 							<view class = 'tip_text cuIcon-right' ></view>
 						</view> -->
 			</view>
-			<view style='text-align:center;'>
+			<!-- <view style='text-align:center;'>
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/userAgreement.html"
 					class="path" hover-class="navigator-hover">《服务协议》</navigator>
 				<navigator
 					url="/pages/sale/webview?can_share=false&url=https://liangxin.zthymaoyi.com/screctAgreement.html"
 					class="path" hover-class="navigator-hover">《隐私政策》</navigator>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -95,61 +101,92 @@
 				carInfo: [],
 				headUrl:"../../static/img/myimg/YongHu@3x.png",
 				userphone:"",
+				gridCol: 4,
+				gridBorder: false,
 				username:"请更改昵称",
 				gridList: [
 					{
 						num: 0,
-						name: '身份认证',
+						name: '认证',
 						// icon: 'cuIcon-apps',
-						src:'../../static/img/sign/authentication@2x.png',
+						src:'../../static/img/myimg/renzheng@3x.png',
 						tips: 0,
 						url: '/pages/attestation/index',
 						show: true
 					},
 					{
 						num: 1,
-						name: '我的合同',
-						// icon: 'cuIcon-calendar',
-						src:'../../static/img/sign/myContract@2x.png',
+						name: '粮脉',
+						// icon: 'cuIcon-apps',
+						src:'../../static/img/myimg/liangmai@3x.png',
 						tips: 0,
-						url: '/pageB/contract/contract',
+						url: '/pages/grain_pulse/my_grain_pulse',
 						show: true
 					},
 					{
 						num: 2,
-						name: '我的任务',
-						// icon: 'cuIcon-copy',
-						src:'../../static/img/sign/myTask@2x.png',
+						name: '发布',
+						// icon: 'cuIcon-news',
+						src:'../../static/img/myimg/fabu@3x.png',
 						tips: 0,
-						url: '/pages/task/my_task',
+						url: `/pages/release/release`,
 						show: true
 					},
 					{
 						num: 3,
-						name: '我的粮脉',
-						// icon: 'cuIcon-apps',
-						src:'../../static/img/sign/liangmai.png',
+						name: 'ERP业务',
+						// icon: 'cuIcon-copy',
+						src:'../../static/img/myimg/erp.png',
 						tips: 0,
-						url: '/pages/grain_pulse/my_grain_pulse',
+						url: `/pages/erpbusiness/index`,
+						show: true
+					},
+					// {
+					// 	num: 5,
+					// 	name: '设置',
+					// 	// icon: 'cuIcon-edit',
+					// 	src:'../../static/img/sign/shezhi@2x.png',
+					// 	tips: 0,
+					// 	url: `/pages/user/setUp`,
+					// 	show: true
+					// }
+				],
+				gridList1: [
+
+					{
+						num: 0,
+						name: '我的合同',
+						// icon: 'cuIcon-calendar',
+						src:'../../static/img/sign/myContract@2x.png',
+						tips: 0,
+						url: '/pageB/contract/contract',
 						show: true
 					},
 					{
-						num: 4,
-						name: '我的发布',
-						// icon: 'cuIcon-news',
-						src:'../../static/img/sign/myRelease@2x.png',
+						num: 1,
+						name: '我的任务',
+						// icon: 'cuIcon-copy',
+						src:'../../static/img/sign/myTask@2x.png',
 						tips: 0,
-						url: `/pages/release/release`,
+						url: '/pages/task/my_task',
 						show: true
 					},
 					{
-						num: 5,
+						num: 2,
 						name: '货运收发',
 						// icon: 'cuIcon-copy',
 						src:'../../static/img/sign/receiveGoods@2x.png',
 						tips: 0,
 						url: `/pageA/freightTransport/index`,
 						show: true
+					},{
+						num: 3,
+						name: '我的票据',
+						// icon: 'cuIcon-news',
+						src:'../../static/img/sign/piaoju@3x.png',
+						tips: 0,
+						url: `/pages/bill/index`,
+						show: true
 					},
 					// {
 					// 	num: 5,
@@ -496,7 +533,7 @@
 </script>
 <style lang='scss' scoped>
 	page{
-		background:#F5F6FA;
+		background:#F8F9FC;
 	}
 	.container {
 		padding-top: 85px;
@@ -504,7 +541,6 @@
 		background-color: #F5F6FA;
 		position: relative;
 		width: 100vw;
-		height: 100vh;
 		overflow: hidden;
 		background: url('~@/static/img/login/bg_slices/bg@3x.png');
 		background-size: 100% 100%;
@@ -539,21 +575,24 @@
 		/* height: 483rpx;
 		overflow-y: scroll; */
 		margin-top: 16rpx;
-		background:#fff;
-		margin-top: 22rpx;
 		margin-bottom: 80rpx;
 	}
-	.badge_user {
+	.cu-list.grid>.cu-item .badge_user {
 		color: #fff;
-		background-color: #dc3545;
+		border:1px solid #fff;
+		background-color: #FF6600;
 		display: inline-block;
-		padding: .25em .4em;
-		font-size: 75%;
+		padding: .25em .25em;
+		position:absolute;
+		font-size: 9px;
 		font-weight: 700;
 		line-height: 1;
 		text-align: center;
 		white-space: nowrap;
 		vertical-align: top;
+		right:26px;
+		top:-10px;
+		z-index:2;
 		border-radius: 50%;
 		transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
 	}
@@ -617,17 +656,6 @@
 		justify-content: center;
 		padding: 15px 0;
 	}
-
-	.image {
-		width: 80rpx;
-		height: 80rpx;
-	}
-
-	.text {
-		font-size: 26rpx;
-		margin-top: 10rpx;
-	}
-
 	.user-section {
 		height: 520upx;
 		padding: 100upx 30upx 0;
@@ -726,7 +754,7 @@
 		
 	   /* background-color: #F5F6FA; */
 	/* 	border-radius: 20px; */
-		margin-top: 60upx;
+		margin-top: 12upx;
 
 		.arc {
 			position: absolute;
@@ -887,8 +915,14 @@
 		border:none;
 	}
 	.sign{
-		width: 18px;
-		height: 18px;
+		width:35px;
+		height:35px;
+		top: 4px;
+		margin-right: 6px;
+	}
+	.sign1{
+		width:26px;
+		height:26px;
 		top: 4px;
 		margin-right: 6px;
 	}
@@ -896,4 +930,21 @@
 		padding:0 20px;
 		align-items: center;
 	}
+	.cu-list.grid>.cu-item .cu-tag.badge{
+		color:#fff;
+		background:#FF6600;
+		font-size:9px;
+		line-height:5px;padding:5px;
+	}
+	.cover-container-item{
+		background:#fff;
+		border-radius:10px;
+		padding: 10px 0;
+	}
+	.cover-container-item .cu-list{
+		margin:0;
+	}
+	.cover-container-item .cu-list.grid>.cu-item [class*=cuIcon]{
+		margin:0;
+	}
 </style>

BIN
static/img/erp/chukujianjin@3x.png


BIN
static/img/erp/chukuzhijian@3x.png


BIN
static/img/erp/shougoujianjin@3x.png


BIN
static/img/erp/shougouzhijian@3x.png


BIN
static/img/erp/yaoqingyonghu@3x.png


BIN
static/img/login/bg_slices/bg@3x.png


BIN
static/img/myimg/erp.png


BIN
static/img/myimg/fabu@3x.png


BIN
static/img/myimg/liangmai@3x.png


BIN
static/img/myimg/renzheng@3x.png


BIN
static/img/sign/piaoju@3x.png