tao

pages/index/index.vue

@@ -269,7 +269,7 @@
 					{
 						name: '独立询价',
 						imgUrl: '../../static/images/index/icon_03.png',
-						path: '/pagesA/enquiry/Enquiry',
+						path: '/pagesA/enquiry/Demand',
 						limit: 'inquiry'
 					},
 					// {

pages/myInfo/myInfo.vue

@@ -66,7 +66,7 @@
 			<!-- 合同区域 -->
 			<view class="myInfo_block">
 				<view class="myInfo_block_title" @click="linktocontract(0)">我的合同</view>
-				<view class="right_icon" @click="linktocontract(0)"><text v-if="contractNum!=''">{{contractNum}}份合同待处理</text>
+				<view class="right_icon" @click="linktocontract(0)"><text class="contracttext" v-if="contractNum==''">无合同待处理</text><text v-if="contractNum!=''">{{contractNum}}份合同待处理</text>
 					<image src="https://fire.huoshitou.net/profile/icon/right.png" mode="widthFix"></image>
 				</view>
 				<view class="contract_box mycontract_box">
@@ -892,7 +892,7 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.mypage,page{
 		background: #F5F5F5;
 		// padding-bottom: 100rpx;
@@ -1048,6 +1048,9 @@
 					display: block;
 					padding-left: 10rpx;
 				}
+				.contracttext{
+					color: #999;
+				}
 			}
 			.mycontract_box{
 				justify-content: space-around;
@@ -1069,7 +1072,7 @@
 						padding-bottom: 12rpx;
 					}
 					text{
-						font-size: 24rpx;
+						font-size: 28rpx;
 						color: #666;
 					}
 				}
@@ -1104,10 +1107,11 @@
 		}
 		
 		.myInfo_block_title{
-			color: #2FA1F7;
-			font-size: 32rpx;
+			color: #333;
+			font-size: 34rpx;
 			text-indent: 16rpx;
 			margin-bottom: 18rpx;
+			font-weight: bold;
 		}
 		
 		.myInfo_poster {
@@ -1156,7 +1160,7 @@
 
 		.myInfo_items {
 			width: 33%;
-			color: #333;
+			color: #666;
 			font-size: 28rpx;
 			font-weight: 500;
 			display: flex;

pagesA/enquiry/Demand.vue

@@ -25,13 +25,23 @@
 				<view v-if="selectyear==''" class="placeholder">请选择</view>
 				<view class="jiantou_icon"><image src="../../static/images/right.png"></image></view>
 			</picker>
+			<picker class="list" :range="companyOptions" @change="bindCompanyChange">
+				<text class="lable">售电公司</text>
+			    <view class="title">{{selectcompany}}</view>
+				<view v-if="selectcompany==''" class="placeholder">请选择</view>
+				<view class="jiantou_icon"><image src="../../static/images/right.png"></image></view>
+			</picker>
 			<view class="inform">
 				<view class="xing">
 					<text style="color: red; font-size: 30rpx;">*</text>电费通知单
 				</view>
-				<view class="upload" @click="chooseImg">
-					<image class="upload_bg" :src="informImg" mode=""></image>
-					<image src="../../static/images/upload_bg.png" mode="scaleToFill"></image>
+				<view class="upload">
+					<view @click="chooseImg(index)" v-for="(i,index) in informImglist" :key="index" class="upload_bg" >
+						<image :src="i" mode=""></image>
+					</view>
+					<view @click="chooseImg(-1)" v-if="informImglist.length<6" class="upload_img">
+						<image src="../../static/images/upload_bg.png"></image>
+					</view>
 				</view>
 			</view>
 			<view class="tishi">
@@ -66,13 +76,18 @@
 	export default {
 		data(){
 			return {
+				companys:[],//存放查询出来售电公司的全部数据
+				companyid:'',//售电公司id
+				selectcompany:'',//售电公司
+				companyOptions:[],//售电公司列表
 				YjProportion:'',//月竞分成字段
 				enquirytype:'',
 				enquiryValue:'',
 				typelist: ['固定价差', '月竞分成'], //询价类型
 				YxDifference:'',//意向差价
 				JuDifference:'',//居间差价
-				informImg: '', //上传图片地址
+				informImg: '', //上传图片地址string
+				informImglist:[],//上传图片地址列表
 				selectyear:'',//选择的年份
 				yearlist:'',
 				remarks:'',//备注
@@ -94,6 +109,13 @@
 				that.userType = user.userType
 				console.log('userType:' + that.userType)
 			}
+			//查询售电公司列表
+			get(api.electricitySalesCompaniesList).then(res => {
+				if (res.code == 200) {
+					this.companys = res.data
+					this.companyOptions = res.data.map(item => item.eName)
+				}
+			})
 		},
 		methods:{
 			//询价类型
@@ -107,8 +129,20 @@
 			bindyear(e){
 				this.selectyear = this.yearlist[e.target.value]
 			},
+			//选择售电公司
+			bindCompanyChange(event) {
+				let i = event.detail.value
+				this.selectcompany = this.companyOptions[i]
+				let arr = this.companys.filter(item => {
+					if (item.eName == this.selectcompany) {
+						return item.userId
+					}
+				})
+				this.companyid = arr[0].userId
+				console.log('this.companyid',this.companyid)
+			},
 			// 选择图片
-			chooseImg() {
+			chooseImg(index) {
 					let that = this
 					uni.chooseImage({
 						count: 1,
@@ -121,7 +155,13 @@
 								filePath: tempFilePaths[0],
 								name: 'file',
 								success: res => {
-									that.informImg=JSON.parse(res.data).url
+									let url=JSON.parse(res.data).url
+									if(index==-1){
+										that.informImglist.push(url)
+									}else{
+										that.informImglist[index]=url
+										that.$forceUpdate()
+									}
 								}
 							});
 						}
@@ -155,12 +195,20 @@
 						title:'请选择年份',
 						icon:'none'
 					})
-				}else if(that.informImg==''){
+				}else if(that.selectcompany==''){
+					uni.showToast({
+						title:'请选择售电公司',
+						icon:'none'
+					})
+				}else if(that.informImglist==''){
 					uni.showToast({
 						title:'请上传电费通知单',
 						icon:'none'
 					})
 				}else{
+					that.informImg=JSON.stringify(that.informImglist)
+					console.log(typeof(that.informImg))
+					console.log(that.informImg)
 					that.ReleaseRequirements()
 				}
 			},
@@ -168,14 +216,17 @@
 			ReleaseRequirements(){
 				let that=this
 				post(api.independentInquiryRelease,{
-					userType:that.type,
-					enterpriseId:that.enterpriseId,
-					electricId:that.electricId,
-					intentionSpread:that.YxDifference,
-					intermediateSpread:that.JuDifference,
-					year:that.selectyear,
-					enterpriseElectricityNoticeBill:that.informImg,
-					remark:that.remarks
+					type:that.enquirytype+1,//询价类型（1：固定价差；2：月竞分成）
+					userType:that.type,//用户类型
+					enterpriseId:that.enterpriseId,//企业id
+					electricId:that.electricId,//用户id
+					company:that.companyid,//售电公司id
+					contractSpread:that.YxDifference,//意向价差
+					intermediateSpread:that.JuDifference,//居间价差
+					shareRatio:that.YjProportion,//月竞分成比例
+					year:that.selectyear,//年份
+					enterpriseElectricityNoticeBill:that.informImg,//电费通知单
+					remark:that.remarks,//备注
 				}).then(res=>{
 					if(res.code==200){
 						uni.showToast({
@@ -324,12 +375,29 @@
 			.upload {
 				position: relative;
 				margin: 16rpx 0;
-				width: 160rpx;
-				height: 160rpx;
+				width: 100%;
+				display: flex;
+				flex-direction: row;
+				flex-wrap: wrap;
+				.upload_img{
+					width: 160rpx;
+					height: 160rpx;
+					image{
+						width: 160rpx;
+						height: 160rpx;
+					}
+				}
 				.upload_bg {
-					position: absolute;
-					left: 0;
-					top: 0;
+					height: 160rpx;
+					width: 160rpx;
+					margin-right: 10rpx;
+					margin-bottom: 10rpx;
+					overflow: hidden;
+					display: flex;
+					align-items: center;
+					image{
+						width: 100%;
+					}
 				}
 			}
 			text {

pagesA/enquiry/Enquiry.vue

@@ -21,9 +21,9 @@
 				<view class="padding_box">
 					<view class="item_company">售电公司: <text v-if="i.ename==''||i.ename==null">无</text><text
 							v-else>{{i.ename}}</text></view>
-					<view class="item_conclude_price">意向差价: <text v-if="i.intentionSpread==''">无</text><text
-							v-else>{{i.intentionSpread}}厘</text></view>
-					<view class="item_between_price" v-if="type==2">意向分成比例（%）: <text
+					<view class="item_conclude_price" v-if="i.contractSpread!=''||i.contractSpread!=null">意向差价: <text v-if="i.contractSpread==''">无</text><text
+							v-else>{{i.contractSpread}}厘</text></view>
+					<view class="item_between_price" v-if="i.shareRatio!=''||i.shareRatio!=null">意向分成比例（%）: <text
 							v-if="i.intermediateSpread==''">无</text><text v-else>{{i.intermediateSpread}}%</text></view>
 					<view class="item_between_price" v-if="type==2">居间差价: <text
 							v-if="i.intermediateSpread==''">无</text><text v-else>{{i.intermediateSpread}}厘</text></view>

static/util/api.js

 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
 // const DOMAIN = 'http://192.168.1.163:9099/'; // 峰煜
 // const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
-// const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 
+const DOMAIN = 'http://192.168.1.178:9099/' // 国禄 
 // const DOMAIN = 'http://192.168.1.197:9099/' // 志就
-const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
+// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
 const HOST = DOMAIN + 'api/'
 
 erp.login = HOST + 'loginAndRegister/login' // 登录