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

common/directive.js

@@ -12,7 +12,6 @@ const permission = (el, binding) => {
 	  }
 }
 const getRoles = ()=>{
-	debugger
 	let _roles = uni.getStorageSync('jurisdiction');
 	let list = uni.getStorageSync('rolesList');
 	if(list&&list.length > 0){

components/linzq-citySelect/linzq-citySelect.vue

@@ -15,7 +15,7 @@
 					</view>
 					<view class="dingwei_citytop">
 						<view class="" style="margin-bottom: 0;" @click="back_city(position)">
-							{{position}}
+							{{position.cityName}}
 						</view>
 						<view class="dingweis_div" @click="getWarpweft">
 							<text>{{po_tips}}</text>
@@ -96,7 +96,7 @@
 				showMask: false,
 				disdingwei: true,
 				Visit: [], //最近访问
-				position: '营口',
+				position: '',
 				longitude: '', //经度
 				latitude: '', //纬度
 				seconds: 3,
@@ -108,12 +108,19 @@
 		created() {
 			//获取存储的最近访问
 			var that = this
+			let _k = false
 			uni.getStorage({
 				key: 'Visit_key',
 				success: function(res) {
 					that.Visit = res.data
+					_k = true
 				}
 			});
+			if(!_k){
+				that.Visit = [{
+					cityName:'全国'
+				}]
+			}
 			//获取定位 经度纬度
 			that.getWarpweft()
 			//获取city.js 的程序字母
@@ -239,7 +246,9 @@
 							that.positionObj = res;
 							that.longitude = res.longitude
 							that.latitude = res.latitude
-							// that.position = res.address.city
+							  //#ifdef APP-PLUS
+							 that.position ={cityName:res.address.city} 
+							  //#endif
 						}
 					});
 					if (that.seconds <= 0) {

config/index.js

@@ -1,6 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.117:8090/',
 	// baseUrlNew: 'http://192.168.1.119:9100/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',

pageD/identity/companyIdentityEdit.vue

@@ -143,18 +143,6 @@
 						<input placeholder="请填写开户行" name="input" v-model="deptList.bankDeposit"></input>
 					</view>
 				</view>
-				<view class="c-row b-b">
-					<text class="tit">开户支行</text>
-					<view class="con-list">
-						<input placeholder="请填写开户支行" name="input" v-model="deptList.bankDepositBranch"></input>
-					</view>
-				</view>
-				<view class="c-row b-b">
-					<text class="tit">供应商姓名</text>
-					<view class="con-list">
-						<input placeholder="请填写供应商姓名" name="input" v-model="deptList.supplier"></input>
-					</view>
-				</view>
 				<view class="c-row">
 					<text class="tit">供应商电话</text>
 					<view class="con-list">
@@ -167,13 +155,24 @@
 						<input  type='number' placeholder="请填写手机号" @input='phoneinput' v-model="deptList.customerPhone"></input>
 					</view>
 				</view>
-				<view class="c-row ">
+				<view class="c-row b-b">
 					<text class="tit">联系地址</text>
 					<view class="con-list">
 						<input placeholder="请填写联系地址" name="input" v-model="deptList.compAddress"></input>
 					</view>
 				</view>
-
+				<view class="c-row b-b">
+					<text class="tit">开户支行</text>
+					<view class="con-list">
+						<input placeholder="请填写开户支行" name="input" v-model="deptList.bankDepositBranch"></input>
+					</view>
+				</view>
+				<view class="c-row b-b">
+					<text class="tit">供应商姓名</text>
+					<view class="con-list">
+						<input placeholder="请填写供应商姓名" name="input" v-model="deptList.supplier"></input>
+					</view>
+				</view>
 			</view>
 		</view>
 		<button class="btn btns" @click="commitEdit">修改</button>

pageD/identity/companyIdentityLook.vue

@@ -79,18 +79,6 @@
 					{{deptList.bankDepositBranch}}
 				</view>
 			</view>
-			<view class="c-row b-b">
-				<text class="tit">供应商姓名</text>
-				<view class="con-list">
-					{{deptList.supplier}}
-				</view>
-			</view>
-			<view class="c-row b-b">
-				<text class="tit">供应商电话</text>
-				<view class="con-list">
-						{{deptList.supplierPhone}}
-				</view>
-			</view>
 			<view class="c-row b-b">
 				<text class="tit">手机号</text>
 				<view class="con-list">
@@ -103,12 +91,24 @@
 					{{deptList.compAddress}}
 				</view>
 			</view>
-			<view class="c-row" v-if="deptList.customerTypeFlag == 1">
+			<view class="c-row b-b" v-if="deptList.customerTypeFlag == 1">
 				<text class="tit">联系地址</text>
 				<view class="con-list">
 					{{deptList.compAddress}}
 				</view>
 			</view>
+			<view class="c-row b-b">
+				<text class="tit">供应商姓名</text>
+				<view class="con-list">
+					{{deptList.supplier}}
+				</view>
+			</view>
+			<view class="c-row ">
+				<text class="tit">供应商电话</text>
+				<view class="con-list">
+						{{deptList.supplierPhone}}
+				</view>
+			</view>
 			</view>
 	</view>
 </template>

pages/erpbusiness/acquisitionInformation.vue

@@ -123,17 +123,20 @@
 		methods: {
 			init() {
 				let _obj = {
-					commonId: this.sgId
+					commonId: this.sgId,
+					warehouseName:uni.getStorageSync("depotAcquisition_warehouseName")
 				}
 				this.$api.doRequest('get', '/acquisitionInfo/getInfo', _obj).then(res => {
 					if (res.data.code == 200) {
 						if (res.data.data) {
 							this.isEdit = true
 							this.value = res.data.data.checkFlag == '0' ? false : true
+							console.log(this.value)
 							this.warehouseName = res.data.data.warehouseName
 							this.textareaValue = res.data.data.acquisitionInformation
 							this.id = res.data.data.id
 						} else {
+							this.textareaValue = ''
 							this.isEdit = false
 							this.value = false
 						}
@@ -173,6 +176,8 @@
 				this.warehouseName = this.warehouseList[e[0]].warehouseName
 				this.warehouseId = this.warehouseList[e[0]].id
 				uni.setStorageSync("depotAcquisition_warehouseName", this.warehouseName)
+				this.init()
+				
 			},
 			/**
 			 * 统一跳转接口,拦截未登录路由
@@ -197,6 +202,7 @@
 					mask: true
 				})
 				let _flag = ''
+				console.log(this.value)
 				if (this.value) {
 					_flag = 1
 				} else {
@@ -225,13 +231,13 @@
 				this.isShowAlert = false
 			},
 			checkBoxChange(e) {
-				// console.log("e-----", e)
-				this.value = !this.value
+				this.value = e
+				// this.alertBtn1()
 				// console.log("value----", this.value)
 			},
 			submit() {
 				this.isShowAlert1 = true
-
+				
 				// this.$api.msg('提交成功')
 				// this.$api.msg('提交失败')
 			}

pages/erpbusiness/customer.vue

@@ -32,10 +32,10 @@
 			<view style='padding-left:20px;color:#AFB3BF;font-size:14px;' v-if='show==false'>登记客户</view>
 
 			<view v-for='item in registeredCustomer'>
-				<view class="dj-customer" @click="registeredCustomerClick(item)">
-					<view class="left">{{item.carNo}}</view>
+				<view class="dj-customer" @click="registeredCustomerClick(item)" v-for="(item1,index) in item.carList">
+					<view class="left">{{item1}}</view>
 					<view class="right">
-						<view class="">{{item.shipperName}}（货）</view>
+						<view class="span1">{{item.shipperName}}（货）</view>
 						<view class="">{{item.supplier}}（商）</view>
 					</view>
 
@@ -153,7 +153,9 @@
 							//判断是记录是否失效
 							_startTime = new Date((res.data.data[i].validityDate + ' 00:00:00')).getTime();
 							if (_endTime - _startTime <= 0) {
-								this.registeredCustomer.push(_carList[k])
+								let _ecarList = _carList[k].carNo.split(',')
+									_carList[k].carList = _ecarList
+									this.registeredCustomer.push(_carList[k])
 							}
 						}
 					}
@@ -1019,7 +1021,7 @@
 	.dj-customer {
 		background: #F5F6F9;
 		display: flex;
-		width: 60%;
+		width: 75%;
 		justify-content: space-between;
 		align-items: center;
 		margin: 20rpx;
@@ -1028,6 +1030,9 @@
 
 		.right {
 			display: flex;
+			.span1{
+				margin-right: 20rpx;
+			}
 		}
 
 		;

pages/sale/information.vue

@@ -31,8 +31,8 @@
 				<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>
@@ -48,6 +48,17 @@
 							<text v-if='item.comparePrice<0' class='yesterday down'>{{-item.comparePrice}}</text>
 							<text v-if='item.comparePrice==0' class='yesterday'>-</text>
 						</view>
+						<view style='color:#B2B3BB;' class='flex'>
+							<view class="port-number-style ">
+								<image style='width:11px;height:11px;' src='../../static/img/homepage/water@3x.png'>
+								</image>
+								<={{item.waterContent}} </view>
+									<view class="port-number-style">
+										<image style='width:11px;height:11px;'
+											src='../../static/img/homepage/unitweight@3x.png'></image>
+										>={{item.bulkDensity}}
+									</view>
+							</view>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -1117,6 +1128,7 @@
 	.currectprice-text {
 		font-size: 24rpx;
 	}
+
 	.container {
 		margin: 20rpx !important;
 	}

pages/sale/plant.vue

@@ -14,7 +14,21 @@
 						<view class='factory Medium'>{{item.factory}}</view>
 						<view class='wrap Regular'>{{item.city}} {{item.factoryType}}</view>
 					</view>
+					<view class="flex-item">
 					<view class='price NumberBold guess-item-item'>{{item.price}}</view>
+					<view class='wrap Regular'>
+						<text style='margin-right:5px;'>
+							<image style='width:11px;height:11px;'
+								src='../../static/img/homepage/water@3x.png'>
+							</image>
+							<={{item.waterContent}}</text>
+								<text>
+									<image style='width:11px;height:11px;'
+										src='../../static/img/homepage/unitweight@3x.png'></image>
+									>={{item.bulkDensity}}
+								</text>
+					</view>
+					</view>
 					<view class='positive NumberBold guess-item-item' v-if='item.comparePrice>0'>
 						<image class='up' src='../../static/img/homepage/shangsheng.png'>{{item.comparePrice}}
 						</image>
@@ -534,4 +548,7 @@
 		}
 
 	}
+	.flex-item{
+		text-align: center;
+	}
 </style>

pages/user/depotAcquisition/depotAcquisition.vue

@@ -19,7 +19,10 @@
 				<view class='follow' @click="followClick(item)">{{item.followFlag=='0'?'+关注':'已关注'}}</view>
 			</view>
 			<view class="row2">
-				<view class="time">{{item.createDate}}</view>
+				<view class='position'>
+					<image class='location' src="../../../static/img/liangmai/icon_ditu.png" mode=""></image>
+					{{item.warehousePrivate}}{{item.warehouseCity}}{{item.warehouseArea}}{{item.detailedAddress}}
+				</view>
 			</view>
 			<view class="row3">
 				<view class="row3-item">
@@ -32,13 +35,11 @@
 				</view>
 			</view>
 			<view class="row4">
-				<view class='position'>
-					<image class='location' src="../../../static/img/liangmai/icon_ditu.png" mode=""></image>
-					{{item.warehousePrivate}}{{item.warehouseCity}}{{item.warehouseArea}}{{item.detailedAddress}}
-				</view>
-				<u-button class="btn" @click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration?itemValue="+JSON.stringify(item))'>
+				<view class="time">{{item.createDate}}</view>
+				<view class="btn"
+					@click='naviageToPage("/pages/user/depotAcquisition/grainDeliveryRegistration?itemValue="+JSON.stringify(item))'>
 					我要送粮
-				</u-button>
+				</view>
 			</view>
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
@@ -131,7 +132,9 @@
 					city: this.currentCityName,
 					compId: uni.getStorageSync('pcUserInfo').compId,
 					pageSize: this.pageSize,
-					currentPage: this.currentPage
+					currentPage: this.currentPage,
+					loginPhone:uni.getStorageSync("userInfo").phone,
+					
 				}).then(res => {
 					if (res.data.code == "200") {
 						if (this.currentCityName == '') this.currentCityName = '全国'
@@ -142,8 +145,15 @@
 				})
 			},
 			followClick(val) {
-				this.$api.doRequest('post', '/acquisitionInfo/api/editFollowFlag', {
-					id: val.id
+				let _url = ''
+				if(val.followFlag==1){
+					_url = '/acquisitionInfo/api/followNot'
+				}else{
+					_url = '/acquisitionInfo/api/follow'
+				}
+				this.$api.doRequest('post', _url, {
+					id: val.id,
+					commonId: uni.getStorageSync("userInfo").id,
 				}).then(res => {
 					if (res.data.code == "200") {
 						if (res.data.data == '1') {
@@ -156,6 +166,24 @@
 						this.$forceUpdate()
 					}
 				})
+				
+				
+				
+				// this.$api.doRequest('post', '/acquisitionInfo/api/editFollowFlag', {
+				// 	id: val.id,
+				// 	commonId: uni.getStorageSync("userInfo").id,
+				// }).then(res => {
+				// 	if (res.data.code == "200") {
+				// 		if (res.data.data == '1') {
+				// 			val.followFlag = '1'
+				// 			this.$api.msg('关注成功')
+				// 		} else {
+				// 			val.followFlag = '0'
+				// 			this.$api.msg('取消关注成功')
+				// 		}
+				// 		this.$forceUpdate()
+				// 	}
+				// })
 
 			},
 			open(e) {
@@ -186,6 +214,7 @@
 			},
 			searchChange(e) {
 				console.log(e)
+				this.getListData()
 			}
 		}
 	}
@@ -259,23 +288,19 @@
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		.btn{
+
+		.btn {
 			background: #22C572;
 			border-radius: 40rpx;
 			font-size: 28rpx;
 			font-weight: 400;
 			color: #FFFFFF;
-			margin: 0;
+			padding: 10rpx 30rpx;
 		}
-		.position {
-			font-size: 12px;
-			color: #676E80;
-			background: #F5F6FA;
-			padding: 0rpx 20rpx;
-			height: 50rpx;
-			display: flex;
-			align-items: center;
-			border-radius: 50rpx;
+
+		.time {
+			color: #878C9C;
+			margin: 20rpx 0;
 		}
 	}
 
@@ -306,11 +331,17 @@
 		}
 
 		.row2 {
-			.time {
-				color: #878C9C;
+			.position {
 				margin: 20rpx 0;
+				font-size: 12px;
+				color: #676E80;
+				background: #F5F6FA;
+				padding: 0rpx 20rpx;
+				height: 50rpx;
+				display: flex;
+				align-items: center;
+				border-radius: 50rpx;
 			}
-
 		}
 	}
 </style>

pages/user/depotAcquisition/grainDeliveryRecord.vue

@@ -22,7 +22,7 @@
 					</view>
 				</view>
 				<view class="del-row">
-					<button class="del" @click='del(item)'>删除</button>
+					<view class="del" @click='del(item)'>删除</view>
 				</view>
 			</view>
 			<u-modal v-model="isShowAlert1" :title-style="{fontSize: '18px',fontWeight:'500'}"
@@ -242,7 +242,7 @@
 			.car-list {
 				.number {
 					display: inline-block;
-					width: 23%;
+					width: 25%;
 					background: #FFFFFF;
 					border-radius: 23px;
 					font-size: 24rpx;
@@ -269,7 +269,7 @@
 				font-size: 28rpx;
 				color: #333333;
 				margin: 0;
-				padding: 0 30rpx;
+				padding: 10rpx 30rpx;
 				height: 100%;
 			}
 

pages/user/depotAcquisition/grainDeliveryRegistration.vue

@@ -151,10 +151,12 @@
 					res => {
 						if (res.data.code == 200) {
 							this.nameList = res.data.data
-							this.dataList.shippingInformationList[0].identityId = res.data.data[0].id
-							this.dataList.shippingInformationList[0].shipperName = res.data.data[0].customerName
-							this.dataList.shippingInformationList[0].supplier = res.data.data[0].supplier ? res.data
-								.data[0].supplier : '无'
+							if(res.data.data.length>0){
+								this.dataList.shippingInformationList[0].identityId = res.data.data[0].id
+								this.dataList.shippingInformationList[0].shipperName = res.data.data[0].customerName
+								this.dataList.shippingInformationList[0].supplier = res.data.data[0].supplier ? res.data
+									.data[0].supplier : '无'
+							}
 						}
 					})
 			},
@@ -259,7 +261,7 @@
 			},
 			addGoodPeople() {
 				// 判断是否还有剩余的货主
-				if (this.nameListCopy.length != 0) {
+				if (this.nameList.length != this.dataList.shippingInformationList.length) {
 					this.dataList.shippingInformationList.push({
 						shipperName: '',
 						supplier: '无',

pages/user/setUp.vue

@@ -23,12 +23,18 @@
 					<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
 				</view>
 			</view>
-			<view class='cu-item' @click='fankui'>
+			<view class='cu-item' style='margin-bottom:10px;' @click='fankui'>
 				<view>
 					<text>意见反馈</text>
 				</view>
 				<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
 			</view>
+			<view class='cu-item' @click='clearStorage'>
+				<view>
+					<text>清除缓存</text>
+				</view>
+				<image src="../../static/img/myimg/gengduo1@3x.png" class="arrow"></image>
+			</view>
 		</view>
 		<view class='exitloginwrap'>
 			<button @click='logout()' class='exitlogin'>退出登录</button>
@@ -69,6 +75,15 @@
 		},
 		onLoad() {},
 		methods: {
+			clearStorage(){
+			let that = this
+				uni.clearStorage({
+				    success: function (res) {
+				        console.log('success');
+						that.goOpenService()
+				    }
+				})
+			},
 			cancelClick() {
 				this.isShowAlert = false
 			},

pages/user/user.vue

@@ -10,7 +10,7 @@
 				<image v-bind:src="headUrl" class="headPortrait"></image>
 				<view class="personal">
 					<view @click="toLogin" class="information">{{hasLogin? username : '立即登录' }}</view>
-					<view style='font-size:13px;color:#8F97AB;' class="information">{{starUserphone}}</view>
+					<view style='font-size:13px;color:#8F97AB;' class="information">{{hasLogin?starUserphone:''}}</view>
 					<view v-if="haveCompany">
 						<view v-if='hasLogin' @click='show=true' class="company">
 							<image class='icon' style='width:19px;height:19px;' src="../../static/img/icon_qiye@3x.png"