Skip to content

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

xin

上级 5c022b96 e75b1d6b
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 741 行增加 和 519 行删除
pages.json
浏览文件 @ d1f19aa6
......@@ -185,7 +185,7 @@
}, {
"path": "pages/Benefits/Benefits",
"style": {
"navigationBarTitleText": "收益说明",
"navigationBarTitleText": "拼团活动指南",
"enablePullDownRefresh": false
}
......
pages/MyBusiness/MyBusiness.vue
浏览文件 @ d1f19aa6
......@@ -158,11 +158,11 @@
cashRatio: '', // 现货分成比例
isshare: false,
isAuthenticate: null, // 电客认证状态，
ContractType:'1',//合同类型
ContractType: '1', //合同类型
}
},
methods: {
//邀请企业
inviteclick() {
let that = this
......@@ -209,7 +209,7 @@
},
//切换合同类型
tabContract(index) {
this.ContractType=index
this.ContractType = index
this.getMyEnterpriseList(this.electricId, this.enterpriseName)
},
//搜索
......@@ -263,13 +263,11 @@
get(api.myEnterpriseList, {
'electricId': electricId,
'enterpriseName': companyName,
'type':this.ContractType,
'type': this.ContractType,
}).then(res => {
console.log(res)
if (res.code == 200) {
if (res.data.length > 0) {
this.Businessdata = res.data
}
this.Businessdata = res.data
}
})
},
......@@ -311,7 +309,7 @@
.Business_data {
width: 100%;
height: calc(100vh - 540rpx);
height: calc(100vh - 600rpx);
padding-top: 32rpx;
background-color: #f4f5f7;
......@@ -403,7 +401,7 @@
}
}
}
.ContractTab {
width: 100%;
background-color: #fff;
......@@ -411,7 +409,7 @@
position: relative;
display: flex;
flex-direction: row;
.ContractTab_child {
flex: 1;
height: 100%;
......@@ -419,18 +417,18 @@
font-size: 22rpx;
color: #999;
line-height: 95rpx;
text {
padding: 16rpx;
border-radius: 16rpx;
}
.active {
background-color: #1989FA;
color: #fff;
}
}
.hexian {
width: 100%;
height: 1px;
......@@ -512,7 +510,7 @@
left: 0;
bottom: 0;
width: 100%;
height: 200rpx;
height: 168rpx;
background: #fff;
button {
......@@ -542,7 +540,7 @@
.lable_block {
width: 337rpx;
height: 146rpx;
height: 118rpx;
margin-left: 11rpx;
background: #f2f7ff;
border-radius: 16rpx;
......
pages/authentication/CompanyAuthentication.vue
浏览文件 @ d1f19aa6
......@@ -574,6 +574,7 @@
this.contactPerson = res.data.tuserCertification.contactPerson
this.phone = res.data.tuserCertification.phone
// this.industry = res.data.industry
this.email = res.data.tuserCertification.mailbox
// console.log(this.industry)
this.industryValue = res.data.industryName
let arr = this.industrys.map(item => {
......@@ -596,8 +597,10 @@
this.cardFront = res.data.cardFront
this.cardNegative = res.data.cardNegative
}
this.entrustName = res.data.tuserCertification.legalPersonName
this.powerOfAttorney = res.data.powerOfAttorney
this.region = res.data.tuserCertification.region
this.address = res.data.tuserCertification.detailedAddress
this.businessLicense = res.data.businessLicense
this.powerConsumption = res.data.powerConsumption
this.natureValue = this.natureList[res.data.powerConsumption - 1]
......
pages/group/group.vue
浏览文件 @ d1f19aa6
......@@ -53,14 +53,14 @@
最高保底价差: <text class="text_item">{{item.maxGuaranteedSpread}}厘</text>
</text>
<view v-if="item.type == 3" style="height: 38rpx;"></view>
<text v-if="rangli&&(item.type==4||item.type==5)">
<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="!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 v-else class="count">结束倒计时:{{remainder2[index]?remainder2[index]:''}}</text>
</text>
</view>
</view>
......@@ -440,12 +440,11 @@
}
let arr = []
let arrTime = []
that.remainder2=[]
that.remainder2 = []
res.data.map(item => {
let time = item.packageEndTime.replace('T', ' ').replace('.000+0800', '')
.replace(/-/g, '/')
// let time = '2021/02/03 10:00:00'
console.log(time)
arr.push(getDuration(new Date(time).getTime() - new Date().getTime()))
arrTime.push(new Date(time).getTime() - new Date().getTime())
})
......@@ -476,7 +475,7 @@
that.setmealList = res.data
let arr = []
let arrTime = []
that.remainder2=[]
that.remainder2 = []
res.data.map(item => {
let time = item.packageEndTime.replace('T', ' ').replace('.000+0800',
'')
......@@ -533,12 +532,10 @@
}
.group_list_scroll {
height: calc(100vh - 175rpx);
height: calc(100vh - 300rpx);
// 拼团列表
.group_list {
margin-bottom: 120rpx;
.group_list_item {
padding: 0 32rpx;
padding-bottom: 16rpx;
......
pages/group/groupInfo.vue
浏览文件 @ d1f19aa6
......@@ -100,7 +100,7 @@
{{groupDetails.ename}}
<image src="../../static/images/right.png"></image>
</view>
<view class="groupInfo_combo_item_company" @click="openWord">
<view class="groupInfo_combo_item_company" @click="openWord(groupDetails.rulesDescription)">
拼团规则说明
<image src="../../static/images/right.png"></image>
</view>
......@@ -145,7 +145,7 @@
<view
v-if="groupDetails.intermediateProfitCeiling&&type==2&&(groupDetails.type==4||groupDetails.type==5)">
居间让利上限:{{groupDetails.intermediateProfitCeiling}}厘</view>
<view>拼团电量上限:50000万kWh</view>
<view>拼团电量上限:{{groupDetails.powerLimit}}万kWh</view>
<view>佣金<image style="margin-left: 10rpx;" src="../../static/images/icon_wenhao.png"
@click="settleShow = true"></image>
</view>
......@@ -742,8 +742,29 @@
})
},
// 打开拼团规则
openWord() {
console.log('11111111')
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('打开文档成功');
},
})
}
},
fail: (err) => {
uni.showToast({
title: '打开文档失败，请联系管理员',
icon: 'none'
})
}
})
},
// 进店看看
linktoElectriCompanyDetail(){
......
pages/order/order.vue
浏览文件 @ d1f19aa6
......@@ -11,7 +11,6 @@
</view>
<view class="hexian"></view>
</view>
<!-- 下拉选择 -->
<pickerAddress @change="areachange" v-if="tabIndex == 1">
<view class="order_select">
......@@ -47,7 +46,7 @@
<!-- 待接单企业end -->
<!-- 委托服务单start -->
<view class="order_content order_content2" v-if="tabIndex == 2">
<scroll-view scroll-y="true" style="max-height:75vh;">
<scroll-view scroll-y="true" style="max-height:72vh;">
<view class="order_list" v-for="(i,index) in entrustServeOrders" :key="index">
<view class="content_item2">
<view class="content_item2_box">
......@@ -315,7 +314,6 @@
width: 100%;
min-height: 100%;
background: #f4f5f7;
padding-bottom: 150rpx;
button::after {
display: none;
......@@ -395,7 +393,6 @@
.tab {
width: 100%;
background-color: #fff;
padding-top: 32rpx;
display: flex;
flex-direction: row;
color: #999;
......@@ -458,7 +455,7 @@
}
.order_content {
max-height: 75vh;
max-height: 72vh;
padding: 0 32rpx;
background-color: #fff;
......
pagesA/Contracts/LssueContracts/LssueContracts.vue
浏览文件 @ d1f19aa6
......@@ -286,7 +286,7 @@
let url = res.msg.replace(/http/g, 'https')
uni.downloadFile({
url: url,
filePath: wx.env.USER_DATA_PATH + '/huoshitou.docx',
filePath: wx.env.USER_DATA_PATH + '/购售电交易合同.docx',
success: (result) => {
console.log(result)
if (result.statusCode == 200) {
......
pagesA/Contracts/MyContractType/MyContractType.vue
浏览文件 @ d1f19aa6
......@@ -67,7 +67,7 @@
</view>
</view>
<view class="info_btns" v-if="status == 1">
<view class="download" @click="downloadContract(item.id)">下载合同模板</view>
<view class="download" @click="downloadContract(item.id,item.contractType)">下载合同模板</view>
<view class="refuse" @click="refuseContract(item.id)">拒绝合同</view>
<view v-if="item.saved" class="affirm" @click="confrimCotract(item.id, index)">确认合同</view>
<view v-else class="gray">合同确认中</view>
......@@ -77,7 +77,7 @@
电子盖章</view>
<view v-if="item.isElectronicSeal == 0 || item.isElectronicSeal == 2"
@click="linktoExpressSingle(item.id)">上传快递单</view>
<view @click="downloadContract(item.id)">下载合同模板</view>
<view @click="downloadContract(item.id,item.contractType)">下载合同模板</view>
</view>
<view class="info_btns" v-else-if="status == 7 && item.isElectronicSeal == 2">
<view @click="linktoLogisticsInfo(item.id)">查看物流</view>
......@@ -227,13 +227,13 @@
})
},
onLoad(options) {
let that=this
let that = this
if (options.type == 'signSuccessCb') {
uni.showToast({
title: '签署成功！',
})
}
if(options.typenum){
if (options.typenum) {
that.checkType(options.typenum)
}
},
......@@ -326,7 +326,13 @@
})
},
// 下载合同模板
downloadContract(id) {
downloadContract(id, type) {
let contractName = ''
if (type == 1 || type == 2 || type == 3 || type == 4 || type == 9) {
contractName = '/购售电交易合同.pdf'
} else {
contractName = '/业务说明书.pdf'
}
get(api.downloadContractTemplate, {
contractId: id
}).then(res => {
......@@ -336,36 +342,25 @@
// console.log(path)
uni.downloadFile({
url: path,
filePath: wx.env.USER_DATA_PATH + contractName,
success: (result) => {
console.log(result)
// console.log(result)
if (result.statusCode == 200) {
uni.saveFile({
tempFilePath: result.tempFilePath,
success: function(ele) {
console.log(ele)
uni.showToast({
icon: 'none',
mask: true,
title: '下载成功：' + ele
.savedFilePath, //保存路径
duration: 3000,
});
let savedFilePath = ele.savedFilePath;
uni.openDocument({
filePath: savedFilePath,
success: function() {
console.log('打开文档成功');
}
})
uni.openDocument({
filePath: result.filePath,
// fileType: "pdf",
showMenu: true,
success: function() {
console.log('打开文档成功');
},
fail: function(a) {
uni.showToast({
title: "下载失败",
icon: "none"
});
}
});
})
}
},
fail: (err) => {
uni.showToast({
title: '打开文档失败，请联系管理员',
icon: 'none'
})
}
})
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论