Skip to content

G
GangShi-un2
提交 f4106e9a authored 作者: 黄旭新's avatar 黄旭新
浏览文件
操作

xin

上级 442ec827 3c44ce34
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 407 行增加 和 277 行删除
pages/MyBusiness/MyBusiness.vue
浏览文件 @ f4106e9a
......@@ -127,10 +127,11 @@
created() {
this.electricId = uni.getStorageSync('user').electricId
this.getMyEnterpriseList(this.electricId, '')
// 获取企业数量和企业总用电量
get(api.myEnterpriseStatistics, {
electricId: this.electricId
}).then(res => {
console.log(res)
// console.log(res)
if (res.code == 200) {
this.EnterpriseNumber = res.data.enterprise_count
this.ContractQuantity = res.data.contract_electricity
......
pages/authentication/CompanyAuthentication.vue
浏览文件 @ f4106e9a
......@@ -351,9 +351,10 @@
<!-- 电费通知单 -->
<view class="img_common_img">
<view class="title"><text>*</text>电费通知单</view>
<view class="uploadImg">
<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>
......@@ -524,7 +525,7 @@
if (that.imgList.length > 5) {
that.hide = true
}
that.electricityBill = url
// that.electricityBill = url
}
},
fail: res => {
......@@ -608,7 +609,7 @@
this.peakElectricity = res.data.peakElectricity
this.peaceElectricity = res.data.peaceElectricity
this.valleyElectricity = res.data.valleyElectricity
this.electricityBill = res.data.electricityBill
this.imgList = res.data.electricityBill.split(',')
})
},
// 编辑之后再提交
......@@ -762,7 +763,7 @@
return false
}
// 电费通知单
if (this.electricityBill == '') {
if (this.imgList.length == '') {
uni.showToast({
title: '请电费通知单',
icon: 'none'
......@@ -792,7 +793,7 @@
peakElectricity: this.peakElectricity,
peaceElectricity: this.peaceElectricity,
valleyElectricity: this.valleyElectricity,
electricityBill: this.electricityBill,
electricityBill: this.imgList.join(','),
mailbox: this.email,
legalPersonName: this.entrustName,
detailedAddress: this.address
......@@ -1037,7 +1038,7 @@
background-color: #fff;
border-bottom: 1px solid #f4f5f7;
.title {
.title {
margin-bottom: 32rpx;
font-size: 34rpx;
font-weight: 400;
......
pages/group/GroupCompany.vue
浏览文件 @ f4106e9a
......@@ -187,10 +187,10 @@
data() {
return {
electricId: null, //电客id
BasicCreditScore: false,
dialogShow: false, // 拼包模式弹窗
BasicCreditScore: false, // 信用分
dialogShow: false, // 电客收益模式弹窗
radioChecked: false, // 是否选择拼包模式
mode: '', //电客收益类型：1-自负盈亏，2-无风险模式
mode: '', //电客收益模式：1-自负盈亏，2-无风险模式(价差类型拼团没有收益模式)
packageId: '', //拼团id
packageType: '', // 拼团类型：1=月竞分成现货拼团，2=固定价差现货拼团，3=普通现货分成拼团, 4=固定价差拼团, 5=分时价差拼团
userId: '', //企业id
......@@ -276,7 +276,7 @@
// 没有企业选择时 -- 去完开具合同绑定企业
linkToBind() {
uni.redirectTo({
url: '/pagesA/Contracts/EnterpriseContract/EnterpriseContract'
url: '/pagesA/Contracts/EnterpriseContract/EnterpriseContract?tabIndex=2'
})
},
// 选择企业
......
pages/group/group.vue
浏览文件 @ f4106e9a
......@@ -38,13 +38,15 @@
<view class="item_content">
<view class="item_content_top" @click="linkToGroupInfo(item.id)">
<view class="img">
<text class="text_red" v-if="tabIndex == 2">
{{item.type == 4 ?'固定价差':'分时价差'}}
</text>
<image src="https://fire.huoshitou.net/profile/icon/tcicon.png" mode=""></image>
</view>
<view class="top_text">
<text class="text_one">
<text class="text_red" v-if="tabIndex == 2">
{{item.type == 4 ?'固定价差':'分时价差'}}
</text>{{item.name}}
<text v-if="item.commissionRate" class="text_one_brokerage">佣金</text>
{{item.name}}
</text>
<text v-if="item.type == 1">
最高月竞分成比例:<text class="text_item">{{item.maxShareRatio}}%</text>
......@@ -56,7 +58,8 @@
<text v-if="item.intermediateProfitCeiling&&rangli&&(item.type==4||item.type==5)">
居间让利上限: <text class="text_item">{{item.intermediateProfitCeiling}}厘</text>
</text>
<view v-if="!item.intermediateProfitCeiling&&rangli&&(item.type==4||item.type==5)" style="height: 38rpx;"></view>
<view v-if="!item.intermediateProfitCeiling&&rangli&&(item.type==4||item.type==5)"
style="height: 38rpx;"></view>
<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>
......@@ -563,9 +566,21 @@
padding: 24rpx 0;
.img {
position: relative;
width: 110rpx;
height: 110rpx;
margin-right: 32rpx;
.text_red {
position: absolute;
left: 0;
top: 4rpx;
padding: 0 4rpx;
color: #ec6045;
font-size: 20rpx;
border: 2rpx solid #ec6045;
border-radius: 10rpx;
}
}
.top_text {
......@@ -578,14 +593,15 @@
font-weight: 500;
color: #333;
.text_red {
padding: 0 4rpx;
margin-right: 16rpx;
display: inline;
border: 2rpx solid #ec6045;
border-radius: 8rpx;
.text_one_brokerage {
display: inline-block;
padding: 0 8rpx;
margin-right: 10rpx;
color: #ec6045;
border: 2rpx solid #ec6045;
border-radius: 10rpx;
}
}
text {
......
pages/group/groupInfo.vue
浏览文件 @ f4106e9a
......@@ -146,8 +146,9 @@
v-if="groupDetails.intermediateProfitCeiling&&type==2&&(groupDetails.type==4||groupDetails.type==5)">
居间让利上限:{{groupDetails.intermediateProfitCeiling}}厘</view>
<view>拼团电量上限:{{groupDetails.powerLimit}}万kWh</view>
<view>佣金<image style="margin-left: 10rpx;" src="../../static/images/icon_wenhao.png"
@click="settleShow = true"></image>
<view v-if="groupDetails.commissionRate">佣金:{{groupDetails.commissionRate}}%
<image @click="settleShow = true" style="margin-left: 10rpx;"
src="../../static/images/icon_wenhao.png"></image>
</view>
</view>
</view>
......@@ -556,7 +557,7 @@
// 参与拼包
// 高级会员在点击参与拼包按钮时需要校验是否满足拼包
// 电客点击参与拼包按钮时跳转到选择企业列表, 判断企业是否满足拼包
linktoGroupCompany(packageId,packageType) {
linktoGroupCompany(packageId, packageType) {
let that = this
let user = uni.getStorageSync('user')
let type = uni.getStorageSync('type')
......@@ -642,7 +643,8 @@
this.btnText = '去认证'
} else {
uni.navigateTo({
url: '/pages/group/GroupCompany?packageId=' + this.packageId + '&packageType=' + packageType
url: '/pages/group/GroupCompany?packageId=' + this.packageId + '&packageType=' +
packageType
})
}
......@@ -743,33 +745,50 @@
},
// 打开拼团规则
openWord(url) {
let ruleUrl = url.replace(/http/g,'https')
console.log(ruleUrl)
uni.downloadFile({
url: ruleUrl,
success: (result) => {
// console.log(result)
if (result.statusCode == 200) {
uni.openDocument({
filePath: result.tempFilePath,
success: function() {
console.log('打开文档成功');
},
let ruleUrl = url.replace(/http/g, 'https')
// console.log(ruleUrl)
if (ruleUrl.lastIndexOf('.pdf') > -1 || ruleUrl.lastIndexOf('.doc') > -1) {
uni.downloadFile({
url: ruleUrl,
success: (result) => {
console.log(result)
if (result.statusCode == 200) {
uni.openDocument({
filePath: result.tempFilePath,
success: function() {
console.log('打开文档成功');
},
})
}
},
fail: (err) => {
uni.showToast({
title: '打开文档失败，请联系管理员',
icon: 'none'
})
}
},
fail: (err) => {
uni.showToast({
title: '打开文档失败，请联系管理员',
icon: 'none'
})
}
})
})
} else {
let urlArr = []
urlArr.push(ruleUrl)
uni.previewImage({
urls: urlArr,
longPressActions: {
itemList: ['发送给朋友', '保存图片', '收藏'],
success: function(data) {
console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
},
fail: function(err) {
console.log(err.errMsg);
}
}
})
}
},
// 进店看看
linktoElectriCompanyDetail(){
linktoElectriCompanyDetail() {
uni.navigateTo({
url:'/pagesA/electriCompany/electriCompanyDetail'
url: '/pagesA/electriCompany/electriCompanyDetail'
})
}
}
......
pages/login/login.vue
浏览文件 @ f4106e9a
......@@ -140,7 +140,7 @@
uni.getUserProfile({
desc: '用于完善会员资料',
success:(resData)=>{
console.log(resData)
// console.log(resData)
uni.setStorageSync('userInfo', resData.userInfo)
// 登录
uni.showLoading({
......
pagesA/Contracts/EnterpriseContract/EnterpriseContract.vue
浏览文件 @ f4106e9a
......@@ -251,12 +251,6 @@
post
} from '../../../static/util/fun.js'
export default {
onShow() {
// 获取合同列表
this.getElectricContractList()
// 获取认证信息
this.getUserMessage()
},
created() {
this.electricId = uni.getStorageSync('user').electricId
wx.showShareMenu({
......@@ -269,6 +263,17 @@
// 获取认证信息
this.getUserMessage()
},
onLoad(options) {
if (options.tabIndex) {
this.ContractType = options.tabIndex
}
},
onShow() {
// 获取合同列表
this.getElectricContractList()
// 获取认证信息
this.getUserMessage()
},
data() {
return {
isAuthenticate: null, // 电客认证是否完成(0：未认证；1：认证失败；2：已认证；3：待审核）
......@@ -542,7 +547,7 @@
if (res.code == 200) {
this.inviteCode = res.data.inviteCode // 电客邀请码
this.isAuthenticate = res.data.isAuthenticate
console.log('this.isAuthenticate===',this.isAuthenticate)
console.log('this.isAuthenticate===', this.isAuthenticate)
this.wxName = res.data.certificationName
//isAuthenticate 认证状态（0：未认证；1：认证失败；2：已认证；3：待审核）
}
......
pagesA/Contracts/LssueContracts/LssueContracts.vue
浏览文件 @ f4106e9a
......@@ -49,7 +49,7 @@
<view class="LssueContracts_accessory_title">合同附件(请上传照片或者PDF文件)</view>
<view class="LssueContracts_accessory_imgs">
<image v-for="(item,index) in imgList" :src="item" :key="index"></image>
<view class="pdf_box" v-if="pdFurl" >上传成功</view>
<view class="pdf_box" v-if="pdFurl">上传成功</view>
<image v-if="onUpload" src="../../../static/images/upload_bg.png" @click="slectImage"></image>
</view>
</view>
......@@ -71,33 +71,17 @@
post
} from '@/static/util/fun.js'
export default {
created() {
this.electricId = uni.getStorageSync('user').electricId
// 售电公司列表
this.getElectricitySalesCompaniesList()
},
onLoad(options) {
let that = this
that.contractId = options.id
if (options.template) {
this.onTemplate = false
that.onTemplate = false
}
// 售电公司列表
get(api.electricitySalesCompaniesList).then(res => {
if (res.code == 200) {
console.log('获取售电公司列表')
that.companys = res.data
that.companyOptions = res.data.map(item => item.eName)
console.log(that.companys)
if (that.contractId) {
that.datashow()
}
}
})
},
created() {
this.electricId = uni.getStorageSync('user').electricId
get(api.electricitySalesCompaniesList).then(res => {
if (res.code == 200) {
this.companys = res.data
this.companyOptions = res.data.map(item => item.eName)
}
})
},
data() {
return {
......@@ -143,6 +127,21 @@
},
methods: {
// 获取所有售电公司
getElectricitySalesCompaniesList() {
let that = this
get(api.electricitySalesCompaniesList).then(res => {
if (res.code == 200) {
console.log('获取售电公司列表')
that.companys = res.data
that.companyOptions = res.data.map(item => item.eName)
// console.log(that.companys)
if (that.contractId) {
that.datashow()
}
}
})
},
//数据回显
datashow() {
let that = this
......@@ -151,7 +150,7 @@
contractId: that.contractId
}).then(res => {
console.log('获取合同信息')
console.log(res.data)
// console.log(res.data)
if (res.code == 200) {
that.contractA = res.data.contractA
that.companyValue = res.data.ename
......
pagesA/switchIdentity/switchIdentity.vue
浏览文件 @ f4106e9a
......@@ -15,19 +15,41 @@
</template>
<script>
import {
get,
post
} from '@/static/util/fun.js'
import api from '@/static/util/api.js'
export default {
created() {
this.type = uni.getStorageSync('type')
if (this.type == 1) {
this.userId = uni.getStorageSync('user').enterpriseId
} else {
this.userId = uni.getStorageSync('user').electricId
}
},
data() {
return {
type: null, // 用户类型
userId: null, // 用户id
}
},
methods: {
// 切换身份
switchIdentity(){
switchIdentity() {
let params = {
type: this.type,
userId: this.userId
}
get(api.switchIdentit, params).then(res => {
console.log(res)
if (res.code == 200) {
}
})
},
// 返回上一页
linkBack() {
......
static/util/api.js
浏览文件 @ f4106e9a
const erp = erp || {}; //wxb21370ac25ee51b0,//wx45bb68de16ddddb7
// const DOMAIN = 'http://192.168.1.107:9099/'; // 峰煜
const DOMAIN = 'https://dev.diaosaas.com/diaoyun/' //测试
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.197:9099/' // 志就
// const DOMAIN = 'https://fire.huoshitou.net/diaoyun/' // 正式
......@@ -150,4 +150,5 @@ erp.electricitySalesCompanies = HOST + 'common/electricitySalesCompanies' // 入
erp.companyProfile = HOST + 'common/companyProfile' // 入驻公司公司简介
erp.companyPackageList = HOST + 'common/companyPackageList' // 售电公司详情---拼团套餐
erp.verifiedBefore = HOST + 'enterprise/verifiedBefore' // 企业认证提交前校验接口
erp.switchIdentit = HOST + 'common/switchIdentit' // 身份切换
export default erp;
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论