tao

manifest.json

@@ -73,7 +73,7 @@
                 "provider" : "wxaf8f505686ddf66a"
             }
         },
-        "appid" : "wxb21370ac25ee51b0",
+        "appid" : "wx45bb68de16ddddb7",
         "setting" : {
             "urlCheck" : true,
             "es6" : true,

pages/authentication/CompanyAuthentication.vue

@@ -57,7 +57,7 @@
 				<!-- 邮箱 -->
 				<view class="item_common">
 					<view class="title">邮箱</view>
-					<input type="number" v-model="phone" placeholder="请输入" />
+					<input type="number" v-model="email" placeholder="请输入" />
 					<view class="border_bottom"></view>
 				</view>
 				<!-- 所属行业 -->
@@ -81,7 +81,7 @@
 				<!-- 委托人/法人姓名 -->
 				<view class="item_common" v-if="typeValue">
 					<view class="title"><text>*</text>{{typeValue == '法人认证' ? '法人': '授权委托人'}}姓名</view>
-					<input type="number" v-model="entrustName" placeholder="请输入" disabled />
+					<input type="number" v-model="entrustName" placeholder="请输入" />
 					<view class="border_bottom"></view>
 				</view>
 				<!-- 上传身份证照片 -->
@@ -176,11 +176,12 @@
 					<view class="border_bottom"></view>
 				</view>
 				<!-- 电费通知单 -->
-				<view class="img_common">
+				<view class="img_common_img">
 					<view class="title"><text>*</text>电费通知单</view>
-					<view class="uploadImg" @click="chooseImg(4)">
-						<image v-if="electricityBill" :src="electricityBill" mode=""></image>
-						<image v-else src="../../static/images/upload_bg.png" mode=""></image>
+					<view class="uploadImg_box" @click="chooseImg(4)">
+						<!-- <image v-if="electricityBill" :src="electricityBill" mode="" ></image> -->
+						<image v-for="(item,index) in imgList" :key="index" :src="item" mode=""></image>
+						<image v-if="!hide" src="../../static/images/upload_bg.png" mode=""></image>
 					</view>
 					<view class="border_bottom"></view>
 				</view>
@@ -348,7 +349,7 @@
 					<view class="border_bottom"></view>
 				</view>
 				<!-- 电费通知单 -->
-				<view class="img_common">
+				<view class="img_common_img">
 					<view class="title"><text>*</text>电费通知单</view>
 					<view class="uploadImg">
 						<image v-if="electricityBill" :src="electricityBill" mode=""></image>
@@ -420,6 +421,8 @@
 				imgUrlNegative: '', //反面照
 				isClick: true, //避免重复点击
 				isEdit: false, //是否编辑
+				imgList: [], // 电费通知单（最多六张）
+				hide: false, // 是否隐藏上传按钮
 			}
 
 		},
@@ -517,6 +520,10 @@
 								} else if (index == 3) {
 									that.businessLicense = url
 								} else {
+									that.imgList.push(url)
+									if (that.imgList.length > 5) {
+										that.hide = true
+									}
 									that.electricityBill = url
 								}
 							},
@@ -993,11 +1000,10 @@
 			}
 		}
 
-		// 上传照片公共样式
+		// 上传照片
 		.img_common {
 			display: flex;
 			justify-content: space-between;
-			position: relative;
 			padding: 32rpx;
 			background-color: #fff;
 			border-bottom: 1px solid #f4f5f7;
@@ -1018,6 +1024,36 @@
 			}
 		}
 
+		// 电费通知单
+		.img_common_img {
+			padding: 32rpx;
+			background-color: #fff;
+			border-bottom: 1px solid #f4f5f7;
+
+			.title { 
+				margin-bottom: 32rpx;
+				font-size: 34rpx;
+				font-weight: 400;
+				color: #333;
+
+				text {
+					color: #ec6045;
+				}
+			}
+
+			.uploadImg_box {
+				display: flex;
+				flex-wrap: wrap;
+
+				image {
+					width: 180rpx;
+					height: 180rpx;
+					margin-right: 10rpx;
+					margin-bottom: 10rpx;
+				}
+			}
+		}
+
 		// 下横线样式
 		.border_bottom {
 			position: absolute;

pagesA/Contracts/LssueContracts/LssueContracts.vue

@@ -57,7 +57,7 @@
 
 		<view :class="['LssueContracts_btn',{'active_btn': onSubmint},{'btn_marginTop': !onTemplate}]">
 			<view v-if="onSubmint">保存合同中</view>
-			<view v-if="!onTemplate" @click="openContract">下载合同</view>
+			<view v-if="!onTemplate" @click="openContract">预览并下载</view>
 			<view v-else @click="submit">保存</view>
 		</view>
 
@@ -147,34 +147,34 @@
 			datashow() {
 				let that = this
 				// 编辑合同的数据回显
-				get(api.issueContract, {
-					id: that.contractId
+				get(api.contractDetail, {
+					contractId: that.contractId
 				}).then(res => {
 					console.log('获取合同信息')
 					console.log(res.data)
-					if (res.code == 200) {
-						that.contractA = res.data.contractA
-						that.companyValue = res.data.ename
-						// console.log(that.companys)
-						for (let i = 0; i < that.companys.length; i++) {
-							if (that.companys[i].eName == that.companyValue) {
-								console.log(that.companys[i].userId)
-								that.userId = that.companys[i].userId
-							}
-						}
-						console.log(that.userId)
-						that.electricity = res.data.electricity
-						that.contractStartTime = res.data.contractStartTime.replace(new RegExp('-', 'g'), '/')
-						that.contractEndTime = res.data.contractEndTime.replace(new RegExp('-', 'g'), '/')
-						that.contractType = res.data.contractType
-						if (that.contractType == 1) {
-							that.typeValue = '固定价差'
-							that.fixedSpread = res.data.fixedSpread
-						} else {
-							that.typeValue = '月竞分成'
-							that.shareRatio = res.data.shareRatio
-						}
-					}
+					// if (res.code == 200) {
+					// 	that.contractA = res.data.contractA
+					// 	that.companyValue = res.data.ename
+					// 	// console.log(that.companys)
+					// 	for (let i = 0; i < that.companys.length; i++) {
+					// 		if (that.companys[i].eName == that.companyValue) {
+					// 			console.log(that.companys[i].userId)
+					// 			that.userId = that.companys[i].userId
+					// 		}
+					// 	}
+					// 	console.log(that.userId)
+					// 	that.electricity = res.data.electricity
+					// 	that.contractStartTime = res.data.contractStartTime.replace(new RegExp('-', 'g'), '/')
+					// 	that.contractEndTime = res.data.contractEndTime.replace(new RegExp('-', 'g'), '/')
+					// 	that.contractType = res.data.contractType
+					// 	if (that.contractType == 1) {
+					// 		that.typeValue = '固定价差'
+					// 		that.fixedSpread = res.data.fixedSpread
+					// 	} else {
+					// 		that.typeValue = '月竞分成'
+					// 		that.shareRatio = res.data.shareRatio
+					// 	}
+					// }
 				})
 			},
 			//选择合同类型
@@ -206,8 +206,7 @@
 			//选择合同开始时间
 			bindStartDateChange(e) {
 				let str = e.detail.value
-				str = str.replace('-', '/')
-				this.contractStartTime = str + '/01'
+				this.contractStartTime = str + '-01'
 			},
 			//选择合同结束时间
 			bindEndDateChange(e) {
@@ -217,12 +216,55 @@
 						icon: 'none'
 					})
 				} else {
-					this.contractEndTime = e.detail.value + '/12/31'
+					this.contractEndTime = e.detail.value + '-12-31'
 				}
 			},
 			// 下载合同
-			openContract(){
+			openContract() {
 				console.log('下载合同')
+				let title = this.checkout()
+				if (!title) {
+					let params = {
+						contractType: this.contractType,
+						contractA: this.contractA,
+						userId: this.userId,
+						electricity: this.electricity,
+						fixedSpread: this.fixedSpread,
+						shareRatio: this.shareRatio,
+						contractStartTime: this.contractStartTime,
+						contractEndTime: this.contractEndTime,
+						electricId: this.electricId
+					}
+					get(api.previewContract, params).then(res => {
+						console.log(res)
+						if (res.code == 200) {
+							let url = res.msg.replace('http', 'https')
+							uni.downloadFile({
+								url: res.msg,
+								filePath: wx.env.USER_DATA_PATH + '/huoshitou.docx',
+								success: (result) => {
+									console.log(result)
+									if (result.statusCode == 200) {
+										uni.openDocument({
+											filePath: result.filePath,
+											// fileType: "pdf",
+											showMenu: true,
+											success: function() {
+												console.log('打开文档成功');
+											},
+										})
+									}
+								}
+							})
+						}
+					})
+				} else {
+					uni.showToast({
+						title: title,
+						icon: 'none'
+					})
+				}
+
 			},
 			// 上传合同附件
 			slectImage() {
@@ -263,98 +305,54 @@
 					}
 				});
 			},
-			// 保存合同
+			// 上传合同
 			submit() {
-				let {
-					contractType, //合同类型 1-固定价差, 3-月竞分成
-					contractA, //合同甲方
-					userId, //售电公司id
-					electricity, //合同电量
-					fixedSpread, //固定价差(厘) contractType为 1 必传
-					shareRatio, //分成比例(%)  contractType为 2 必传
-					contractStartTime, //合同开始时间
-					contractEndTime, //合同结束时间
-					electricId, //电客id
-				} = this.$data
-				let title = this.checkout(contractType, contractA, userId, electricity, contractStartTime, contractEndTime)
+				console.log('上传合同')
+				let title = this.checkout()
 				if (!title) {
-					if (contractType == 1) {
-						if (fixedSpread == '') {
+					let contractAnnex = null
+					if (this.pdFurl) {
+						contractAnnex = this.pdFurl
+					} else {
+						contractAnnex = this.imgList
+					}
+					this.onSubmint = true
+					post(api.uploadContract, {
+						id: this.contractId,
+						contractType: this.contractType,
+						contractA: this.contractA,
+						userId: this.userId,
+						electricity: this.electricity,
+						fixedSpread: this.fixedSpread,
+						shareRatio: this.shareRatio,
+						contractStartTime: this.contractStartTime,
+						contractEndTime: this.contractEndTime,
+
+						electricId: this.electricId,
+						contractAnnex: JSON.stringify(contractAnnex)
+					}).then(res => {
+						if (res.code == 200) {
 							uni.showToast({
-								title: '请输入固定的价差',
-								icon: 'none'
+								title: '保存成功'
 							})
-							return
-						}
-					} else if (contractType == 3) {
-						if (shareRatio == '') {
+							setTimeout(() => {
+								uni.navigateBack({
+									delta: 1
+								})
+							}, 500)
+						} else {
 							uni.showToast({
-								title: '请输入分成的比例',
+								title: res.msg,
 								icon: 'none'
 							})
-							return
+							setTimeout(() => {
+								this.onSubmint = false
+							}, 1000)
 						}
-					}
-					this.onSubmint = true
-					if (this.contractId) {
-						// 如果有合同id就是编辑合同
-						get(api.exitContract, {
-							id: this.contractId,
-							contractType,
-							contractA,
-							userId,
-							electricity,
-							fixedSpread,
-							shareRatio,
-							contractStartTime,
-							contractEndTime,
-							electricId,
-						}).then(res => {
-							if (res.code == 200) {
-								uni.showToast({
-									title: '保存成功'
-								})
-								setTimeout(() => {
-									uni.navigateBack({
-										delta: 1
-									})
-								}, 500)
-							}
-						})
-					} else {
-						// 没有就是开具新合同
-						get(api.issueContract, {
-							contractType,
-							contractA,
-							userId,
-							electricity,
-							fixedSpread,
-							shareRatio,
-							contractStartTime,
-							contractEndTime,
-							electricId,
-						}).then(res => {
-							if (res.code == 200) {
-								uni.showToast({
-									title: '保存成功'
-								})
-								setTimeout(() => {
-									uni.navigateBack({
-										delta: 1
-									});
-								}, 500)
-							} else {
-								uni.showToast({
-									title: res.msg,
-									icon: 'none'
-								})
-								this.flag = true
-							}
-						})
-					}
+					})
 				} else {
 					uni.showToast({
-						title,
+						title: title,
 						icon: 'none'
 					})
 				}
@@ -362,19 +360,24 @@
 
 			//校验信息
 			checkout() {
-				let arr = arguments
-				if (arr[0] == '') {
+				if (this.contractType == '') {
 					return '请选择合同类型'
-				} else if (arr[1] == '') {
+				} else if (this.contractA == '') {
 					return '请输入合同的甲方'
-				} else if (arr[2] == '') {
+				} else if (this.userId == null) {
 					return '请选择合同的乙方'
-				} else if (arr[3] == '' || isNaN(arr[3])) {
+				} else if (this.electricity == '' || isNaN(this.electricity)) {
 					return '请输入合同的电量'
-				} else if (arr[4] == '') {
+				} else if (this.contractType == 1 && this.fixedSpread == '') {
+					return '请输入固定的价差'
+				} else if (this.contractType == 3 && this.shareRatio == '') {
+					return '请输入分成的比例'
+				} else if (this.contractStartTime == '') {
 					return '请选择合同的开始时间'
-				} else if (arr[5] == '') {
+				} else if (this.contractEndTime == '') {
 					return '请选择合同的结束时间'
+				} else if (this.pdFurl == '' && this.imgList.length == 0) {
+					return '请上传合同附件'
 				} else {
 					return false
 				}

pagesA/electriCompany/electriCompany.vue

 <template>
 	<!-- 售电公司 -->
 	<view class="electriCompany">
-		<view class="electriCompany_item" v-for="(item, index) in electriCompanyList" :key="index" @click="linktoElectriCompanyDetail">
+		<view class="electriCompany_item" v-for="(item, index) in electriCompanyList" :key="index" @click="linktoElectriCompanyDetail(item.userId,item.eName,item.enterpriseCount)">
 			<view class="electriCompany_item_info">
-				<text class="electriCompany_item_info_companyName">{{item.companyName}}</text>
-				<text class="electriCompany_item_info_relevantEnterprise">已与{{item.relevantEnterprise}}家企业签订合同</text>
-				<text class="electriCompany_item_info_activityNum">{{item.activityNum}}个套餐进行中</text>
+				<text class="electriCompany_item_info_companyName">{{item.eName}}</text>
+				<text class="electriCompany_item_info_relevantEnterprise">已与{{item.enterpriseCount}}家企业签订合同</text>
+				<view class="electriCompany_item_info_activityNum">
+					<image src="https://fire.huoshitou.net/profile/icon/san.png"></image>
+					<text>{{item.packageCount}}个套餐进行中</text>
+				</view>
 			</view>
 			<view class="electriCompany_item_img">
-				<image :src="item.img" mode=""></image>
+				<image src="https://fire.huoshitou.net/profile/icon/dw.png" mode=""></image>
 			</view>
 			<view class="border_botton"></view>
 		</view>
@@ -16,40 +19,34 @@
 </template>
 
 <script>
+	import {
+		post,
+		get
+	} from '@/static/util/fun.js'
+	import api from '@/static/util/api.js'
 	export default {
 		data() {
 			return {
-				electriCompanyList: [{
-						companyName: '广东售电公司',
-						relevantEnterprise: 200,
-						activityNum: 12,
-						img: '../../static/images/index/group.png'
-					},
-					{
-						companyName: '广东售电公司',
-						relevantEnterprise: 200,
-						activityNum: 12,
-						img: '../../static/images/index/group.png'
-					},
-					{
-						companyName: '广东售电公司',
-						relevantEnterprise: 200,
-						activityNum: 12,
-						img: '../../static/images/index/group.png'
-					},
-					{
-						companyName: '广东售电公司',
-						relevantEnterprise: 200,
-						activityNum: 12,
-						img: '../../static/images/index/group.png'
-					},
-				]
+				electriCompanyList: []
 			}
 		},
+		created() {
+			let that=this
+			get(api.electricitySalesCompanies).then(res=>{
+				if(res.code==200){
+					that.electriCompanyList=res.data
+				}else{
+					uni.showToast({
+						title:res.msg,
+						icon:'none'
+					})
+				}
+			})
+		},
 		methods:{
-			linktoElectriCompanyDetail(){
+			linktoElectriCompanyDetail(userId,eName,Count){
 				uni.navigateTo({
-					url: '/pagesA/electriCompany/electriCompanyDetail'
+					url: '/pagesA/electriCompany/electriCompanyDetail?userId='+userId+'&eName='+eName+'&Count='+Count
 				})
 			}
 		}
@@ -96,6 +93,15 @@
 					line-height: 24rpx;
 					color: #F63939;
 					opacity: 1;
+					display: flex;
+					flex-direction: row;
+					align-items: flex-start;
+					image{
+						width: 30rpx;
+						height: 31rpx;
+						margin-right: 16rpx;
+						display: block;
+					}
 				}
 			}
 
@@ -109,8 +115,9 @@
 				left: 0;
 				bottom: 0rpx;
 				width: 686rpx;
-				height: 2rpx;
-				border: 1rpx solid #000000;
+				height: 1rpx;
+				background-color: #000;
+				transform: scaleY(.5);
 				opacity: 0.2;
 			}
 

pagesA/electriCompany/electriCompanyDetail.vue

@@ -4,11 +4,11 @@
 		<!-- 售电公司详情标题start -->
 		<view class="electriCompanyDetail_top">
 			<view class="electriCompanyDetail_top_img">
-				<image src="../../static/images/index/group.png" mode=""></image>
+				<image src="https://fire.huoshitou.net/profile/icon/dw.png" mode=""></image>
 			</view>
 			<view class="electriCompanyDetail_top_info">
-				<text>广东火电新能源建设有限公司</text>
-				<text style="font-size: 24rpx; color: #666;">已有两百家企业签订合同</text>
+				<text>{{eName}}</text>
+				<text style="font-size: 24rpx; color: #666;">已有{{Count}}家企业签订合同</text>
 			</view>
 		</view>
 		<!-- 售电公司详情标题end -->
@@ -31,9 +31,9 @@
 								<view class="top_text">
 									<text class="text_one">{{item.name}}</text>
 									<text>
-										最高月竞分成比例:<text class="text_item">20%</text>
+										最高月竞分成比例:<text class="text_item">{{item.maxShareRatio}}</text>
 									</text>
-									<!-- 		<text v-if="item.type == 1">
+											<text v-if="item.type == 1">
 											最高月竞分成比例:<text class="text_item">{{item.maxShareRatio}}%</text>
 										</text>
 										<text v-if="item.type == 2">
@@ -43,16 +43,16 @@
 										<text v-if="rangli&&(item.type==4||item.type==5)">
 											居间让利上限: <text class="text_item">{{item.intermediateProfitCeiling}}厘</text>
 										</text>
-										<view v-if="!rangli&&(item.type==4||item.type==5)" style="height: 38rpx;"></view> -->
-									<!-- <text style="margin-bottom: 0;">{{item.year}}
+										<view v-if="!rangli&&(item.type==4||item.type==5)" style="height: 38rpx;"></view>
+									<text style="margin-bottom: 0;">{{item.year}}
 											<text v-if="!remainder2[index]||remainder2[index] == 0"
 												class="count">拼团已结束</text>
 											<text v-else
 												class="count">结束倒计时:{{remainder2[index]?remainder2[index]:''}}</text>
-										</text> -->
-									<text style="margin-bottom: 0;">2021
+										</text>
+									<!-- <text style="margin-bottom: 0;">{{item.year}}
 										<text class="count">结束倒计时:00:00:00</text>
-									</text>
+									</text> -->
 								</view>
 							</view>
 							<view
@@ -109,16 +109,16 @@
 					基本信息
 				</view>
 				<view class="electriCompanyDetail_info_item">
-					公司名称<text>光烁新能源</text>
+					公司名称<text>{{eName}}</text>
 				</view>
 				<view class="electriCompanyDetail_info_item">
-					所在区域<text>广东省广州市天河区</text>
+					所在区域<text>{{companydata.eRegion}}</text>
 				</view>
 				<view class="electriCompanyDetail_info_item">
-					售电资质代码<text>SD335</text>
+					售电资质代码<text>{{companydata.eCode}}</text>
 				</view>
 				<view class="electriCompanyDetail_info_item">
-					营业执照<image src="../../static/images/index/group.png" mode=""></image>
+					营业执照<image :src="companydata.eBusinessLicense" mode=""></image>
 				</view>
 				<view class="electriCompanyDetail_info_item">
 					最近一次全月现货结算综合批发均价<text>46.09厘</text>
@@ -129,7 +129,7 @@
 					公司介绍
 				</view>
 				<view class="electriCompanyDetail_info_introduce_richText">
-					<rich-text nodes=""></rich-text>
+					<rich-text :nodes="companydata.briefIntroduction"></rich-text>
 				</view>
 			</view>
 		</view>
@@ -145,39 +145,73 @@
 </template>
 
 <script>
+	import {
+		post,
+		get
+	} from '@/static/util/fun.js'
+	import api from '@/static/util/api.js'
 	export default {
 		data() {
 			return {
+				companydata:'',
+				userId:'',//公司id
+				eName:'',//公司名字
+				Count:'',//签订合同数量
 				tabIndex: 1, // tab栏索引
 				moreIndex: null, // 展开索引
 				moreShow: false, // 显示更多
-				setmealList: [{
-					id: 1,
-					userId: 2,
-					ename: '电量拼包大优惠',
-					type: 4,
-					name: '电量拼包大优惠',
-					intermediateProfitCeiling: 20,
-					packageSettingsList: [{
-							electricityFull: '100000',
-							reduce: 10
-						},
-						{
-							electricityFull: '200000',
-							reduce: 20
-						},
-						{
-							electricityFull: '300000',
-							reduce: 30
-						},
-					]
-				}]
+				setmealList: []
+			}
+		},
+		onLoad(options) {
+			let that=this
+			if(options){
+				that.eName=options.eName
+				that.Count=options.Count
+				that.userId=options.userId
+				that.companyPackageList(that.userId)
 			}
 		},
 		methods: {
 			// tab栏切换
 			tabClick(i) {
+				let that=this
 				this.tabIndex = i
+				if(i==2){
+					that.companyProfile()
+				}
+			},
+			//查询售电公司拼团套餐
+			companyPackageList(userId){
+				let that=this
+				get(api.companyPackageList,{
+					userId:userId
+				}).then(res=>{
+					if(res.code==200){
+						that.setmealList=res.data
+					}else{
+						uni.showToast({
+							title:res.msg,
+							icon:'none'
+						})
+					}
+				})
+			},
+			//查询公司简介
+			companyProfile(){
+				let that=this
+				get(api.companyProfile,{
+					userId:this.userId
+				}).then(res=>{
+					if(res.code==200){
+						that.companydata=res.data
+					}else{
+						uni.showToast({
+							title:res.msg,
+							icon:'none'
+						})
+					}
+				})
 			},
 			// 图标旋转
 			getMore(i) {
@@ -203,7 +237,7 @@
 			// 独立询价
 			linktoInquiry(){
 				uni.navigateTo({
-					url:'/pagesA/enquiry/Demand'
+					url:'/pagesA/enquiry/Demand?userId='+this.userId
 				})
 			}
 		}
@@ -216,6 +250,10 @@
 		padding: 0 32rpx;
 		width: 100%;
 		height: 100%;
+		
+		.electriCompanyDetail_info{
+			padding-bottom: 200rpx;
+		}
 
 		//  售电公司头部
 		.electriCompanyDetail_top {
@@ -407,15 +445,19 @@
 
 		// 售电公司独立询价按钮
 		.electriCompanyDetail_inquiry {
-			position: absolute;
+			position: fixed;
 			left: 0;
-			bottom: 64rpx;
+			bottom: 0;
 			width: 100%;
-			height: 100rpx;
+			height: 180rpx;
+			background-color: #fff;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
 			.electriCompanyDetail_inquiry_btn {
-				margin-left: 32rpx;
 				width: 686rpx;
-				height: 100%;
+				height: 100rpx;
 				line-height: 100rpx;
 				text-align: center;
 				color: #FFFFFF;

pagesA/enquiry/Demand.vue

@@ -97,6 +97,12 @@
 				userType:'0',//企业类型
 			}
 		},
+		onLoad(options) {
+			//从售电公司详情进来的
+			if(options.userId){
+				
+			}
+		},
 		created() {
 			let that = this
 			that.yearlist=getyearlist()

static/util/api.js

 const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
-// const DOMAIN = 'http://192.168.1.163:9099/'; // 峰煜
+// const DOMAIN = 'http://192.168.1.107: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' // 登录
@@ -52,23 +52,25 @@ erp.getEnterpriseContractDetail = HOST + 'electric/getEnterpriseContractDetail'
 erp.bonusAndWithdraw = HOST + 'promotionCenter/bonusAndWithdraw' //推广中心
 erp.withdraw = HOST + 'promotionCenter/withdraw' //提现
 erp.viewRewardDetails = HOST + 'promotionCenter/viewRewardDetails' //奖励明细
-erp.myContract = HOST + 'common/myContract' // 合同管理-我的合同列表
-erp.refuseContract = HOST + 'common/refuseContract' //合同管理-我的合同-拒绝合同
-erp.confirmContract = HOST + 'common/confirmContract' //合同管理-我的合同-确认合同
-erp.downloadContractTemplate = HOST + 'electronicSeal/downloadContractTemplate' //合同管理-我的合同-下载合同模板
-erp.contractShippingAddress = HOST + 'common/contractShippingAddress' //合同管理-快递寄送地址
+// 我的合同
+erp.myContract = HOST + 'common/myContract' // 我的合同列表
+erp.refuseContract = HOST + 'common/refuseContract' //我的合同-拒绝合同
+erp.confirmContract = HOST + 'common/confirmContract' //我的合同-确认合同
+erp.downloadContractTemplate = HOST + 'electronicSeal/downloadContractTemplate' //我的合同-下载合同模板
+erp.contractShippingAddress = HOST + 'common/contractShippingAddress' //快递寄送地址
 erp.uploadCourier = HOST + 'common/uploadCourier' //上传快递单
-erp.issueEntrustedService = HOST + 'orderCenter/issueEntrustedService' // 发布委托服务单 接口
 erp.getLogistics = HOST + 'common/getLogistics' //查看物流信息
-erp.exitContract = HOST + 'electric/exitContract' //合同管理-企业购售电合同-编辑线下合同
-erp.issueContract = HOST + 'electric/issueContract' //合同管理-企业购售电合同-开具线下合同
-erp.offlineContract = HOST + 'electric/offlineContract' //合同管理-企业购售电合同-线下合同列表(未生效/已生效)
-erp.offlineCheckPassContract = HOST + 'electric/offlineCheckPassContract' //合同管理-企业购售电合同-线下合同审核通过列表
+// 企业合同
+erp.contractDetail = HOST + 'electric/contractDetail' //企业合同-合同数据回显
+erp.uploadContract = HOST + 'electric/uploadContract' //企业合同-上传合同
+erp.previewContract = HOST + 'electric/previewContract' // 企业合同-预览并下载合同
+erp.electricContractList = HOST + 'electric/electricContractList' // 企业合同列表
+
+
 erp.uploadStampContract = HOST + 'electric/uploadStampContract' //合同管理-企业购售电合同-线下合同上传盖章合同
 erp.submitReview = HOST + 'electric/submitReview' //合同管理-企业购售电合同-线下合同(未生效)-提交审核
-erp.platformContract = HOST + 'electric/platformContract' //合同管理-企业购售电合同-平台合同
-erp.stockContract = HOST + 'electric/stockContract' //合同管理-企业购售电合同-存量合同
 erp.chooseABusiness = HOST + 'orderCenter/chooseABusiness' // 我的服务单---发布委托服务单---选择企业
+erp.issueEntrustedService = HOST + 'orderCenter/issueEntrustedService' // 发布委托服务单 接口
 erp.myPostedEntrustedServiceList = HOST + 'orderCenter/myPostedEntrustedServiceList' // 我的---我的服务单---我发布的 接口
 erp.entrustedServiceDetails = HOST + 'orderCenter/entrustedServiceDetails' // 我的---我的服务单---查看详情 接口
 erp.entrustedServiceChangeStatus = HOST + 'orderCenter/entrustedServiceChangeStatus' // 我的---我的服务单---撤销委托 接口
@@ -139,5 +141,8 @@ erp.isParticipate = HOST + 'common/isParticipate' // 是否参与拼包套餐
 erp.quitPackage = HOST + 'common/quitPackage' // 退出拼团
 erp.getRetailSettlementContactForm = HOST + 'common/getRetailSettlementContactForm' // 零售结算联系单
 erp.uploadCourierDetail = HOST + 'common/uploadCourierDetail' // 查看上传快递单数据
+erp.electricitySalesCompanies = HOST + 'common/electricitySalesCompanies' // 入驻公司列表
+erp.companyProfile = HOST + 'common/companyProfile' // 入驻公司公司简介
+erp.companyPackageList = HOST + 'common/companyPackageList' // 售电公司详情---拼团套餐
 erp.verifiedBefore = HOST + 'enterprise/verifiedBefore' // 企业认证提交前校验接口
 export default erp;