Skip to content

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

xin

上级 efab0013 c74d152a
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 1165 行增加 和 542 行删除
App.vue
浏览文件 @ 6fbe79ee
......@@ -29,10 +29,10 @@
/*每个页面公共css */
@import "uview-ui/index.scss";
// page {
// width: 100vw;
// height: 100vh;
// }
page {
width: 100vw;
height: 100vh;
}
view {
box-sizing: border-box;
......
pages.json
浏览文件 @ 6fbe79ee
......@@ -648,8 +648,14 @@
"navigationBarTitleText": "赚钱指引",
"enablePullDownRefresh": false
}
},
{
"path": "switchIdentity/switchIdentity",
"style": {
"navigationBarTitleText": "身份切换",
"enablePullDownRefresh": false
}
}
]
}],
......
pages/basicInformation/basicInformation.vue
浏览文件 @ 6fbe79ee
......@@ -16,6 +16,12 @@
</view>
<view class="hexian"></view>
</view>
<view class="myInfo_items" @click="linktoSwitchIdentity">
切换身份
<view class="text"><text>点击切换为{{type==1?'"电客"':'"用电企业"'}}</text>
<image src="../../static/images/right.png" mode=""></image>
</view>
</view>
</view>
<view class="basic_information_btn">
<view @click="quit">退出登录</view>
......@@ -33,6 +39,7 @@
export default {
data() {
return {
type: null, // 用户类型
enterpriseId: '', //企业id
isAuthenticate: '',
earningsList: [],
......@@ -148,6 +155,7 @@
created() {
let that = this
let type = uni.getStorageSync('type')
that.type = uni.getStorageSync('type')
let user = uni.getStorageSync('user')
let statustext = ''
that.isAuthenticate = uni.getStorageSync('userStatus').isAuthenticate //认证状态
......@@ -263,6 +271,12 @@
url: url
})
},
// 切换身份
linktoSwitchIdentity(){
uni.navigateTo({
url:'/pagesA/switchIdentity/switchIdentity'
})
},
// 退出登录
quit() {
let user = uni.getStorageSync('user')
......@@ -344,10 +358,8 @@
.basic_information_btn {
position: absolute;
left: 0;
bottom: 0;
bottom: 32rpx;
width: 100%;
padding-top: 32rpx;
padding-bottom: 100rpx;
background-color: #fff;
view {
......
pages/group/GroupCompany.vue
浏览文件 @ 6fbe79ee
......@@ -26,7 +26,7 @@
</view>
<!-- 模式弹窗end -->
<!-- 没有数据时start -->
<view class="fail_dialog" v-if="companyList.length == 0">
<!-- <view class="fail_dialog" v-if="companyList.length == 0">
<view class="fail_dialog_box">
<view class="fail_dialog_box_hint">暂无企业,请去绑定企业</view>
<view class="fail_dialog_box_btn">
......@@ -34,13 +34,23 @@
<view @click="linkToBind">去绑定</view>
</view>
</view>
</view>
</view> -->
<!-- 没有数据时end -->
<!-- 选择企业start -->
<radio-group name="" class="radio_group" v-if="companyList.length > 0">
<view class="select_hint">
温馨提示：
<text>1，未完成企业认证的企业无法参与拼团套餐，请提醒企业认证</text>
<text>2，企业月竞分成比例超过套餐最高月竞分成比例的企业无法参与拼团</text>
</view>
<view class="select_tab">
<view :class="{'border_bottom':tabIndex == 1}" @click="tabClick(1)">已签订的企业</view>
<view :class="{'border_bottom':tabIndex == 2}" @click="tabClick(2)">委托拼团的企业</view>
</view>
<checkbox-group name="" class="radio_group" v-if="companyList.length > 0">
<label class="radio_label" v-for="(item, index) in companyList" :key="index"
@click="raidoCheck(item.enterpriseId, item.contractId, item.userType)">
<radio class="radio" :value="index" :checked="item.checked" color="#1989fa" />
<checkbox class="radio" :value="index" :checked="item.checked" color="#1989fa" />
<view class="groupCompany_item">
<view class="item_companyName">
{{item.certificationName}}
......@@ -52,6 +62,9 @@
<view class="item_electricity">
电量: {{item.tuserCertification.annualElectricityConsumption}}万kWh
</view>
<view class="" v-if="tabIndex == 1">
合同价差:5厘
</view>
<view class="item_ratio">
峰期比例: {{item.tuserCertification.peakElectricityScale}}%
平期比例: {{item.tuserCertification.peaceElectricityScale}}%
......@@ -59,7 +72,7 @@
</view>
</view>
</label>
</radio-group>
</checkbox-group>
<!-- 选择企业end -->
<!-- 参与拼包start -->
<view class="groupCompany_block">
......@@ -141,9 +154,11 @@
successDialog: false, // 拼包成功后弹窗
isshare: false, //拼包成功后邀请弹窗
contractId: null, // 普通会员--合同id
tabIndex: 1, // tab栏
}
},
methods: {
//分享
onShareAppMessage(res) {
let inviteCode = uni.getStorageSync('user').inviteCode
......@@ -164,6 +179,10 @@
}
}
},
// tab栏点击
tabClick(i) {
this.tabIndex = i
},
closeModel(e) {
if (e == 'closeModel') {
this.isshare = false
......@@ -438,6 +457,32 @@
}
}
// 温馨提示
.select_hint {
padding: 0 32rpx;
color: red;
font-size: 24rpx;
text {
display: block;
}
}
// 选择企业tab栏
.select_tab {
display: flex;
justify-content: space-around;
margin-top: 16rpx;
view {
height: 60rpx;
}
.border_bottom {
border-bottom: 2rpx solid #1989fa;
}
}
// 选择企业
.radio_group {
margin-bottom: 200rpx;
......
pages/group/group.vue
浏览文件 @ 6fbe79ee
......@@ -456,7 +456,7 @@
arr[index] = getDuration(arrTime[index])
that.remainder2 = arr
}
console.log('that.remainder',that.remainder2)
// console.log('that.remainder',that.remainder2)
})
that.$forceUpdate()
}, 1000)
......
pages/group/groupInfo.vue
浏览文件 @ 6fbe79ee
......@@ -100,6 +100,10 @@
{{groupDetails.ename}}
<image src="../../static/images/right.png"></image>
</view>
<view class="groupInfo_combo_item_company" @click="openWord">
拼团规则说明
<image src="../../static/images/right.png"></image>
</view>
<view>{{groupDetails.name}}</view>
<view>用电年份: {{groupDetails.year}}年</view>
<!-- 拼团类型 -->
......@@ -141,6 +145,10 @@
<view
v-if="groupDetails.intermediateProfitCeiling&&type==2&&(groupDetails.type==4||groupDetails.type==5)">
居间让利上限:{{groupDetails.intermediateProfitCeiling}}厘</view>
<view>拼团电量上限:50000万kWh</view>
<view>佣金<image style="margin-left: 10rpx;" src="../../static/images/icon_wenhao.png"
@click="settleShow = true"></image>
</view>
</view>
</view>
<!-- 套餐详情end -->
......@@ -246,6 +254,7 @@
{{remainder[0]==0?'拼团已结束':remainder[0]}}
</view>
<view class="btns">
<view class="shop" @click="linktoElectriCompanyDetail">进店看看</view>
<view class="invite" @click="invitation">邀请企业</view>
<view v-if="isParticipated==1&&remainder[0]!=0" class="take" @click="exitGroup(groupDetails.id)">已参与
</view>
......@@ -486,7 +495,7 @@
// let time='2021/02/08 12:00:00'
that.remainder.push(getDuration(new Date(time).getTime() - new Date().getTime()))
that.remaindering.push(new Date(time).getTime() - new Date().getTime())
that.setIntervaltimerindex=setInterval(function() {
that.setIntervaltimerindex = setInterval(function() {
if (that.remaindering[0] > 0) {
that.remaindering[0] -= 1000
that.remainder[0] = getDuration(that.remaindering[0])
......@@ -673,7 +682,7 @@
} else if (this.btnText == '参与新套餐') {
get(api.replacementPackage, {
mode: 0,
type: '1',
type: '1',
packageId: this.packageId,
userId: this.userId
}).then(res => {
......@@ -732,6 +741,16 @@
}
})
},
// 打开拼团规则
openWord() {
console.log('11111111')
},
// 进店看看
linktoElectriCompanyDetail(){
uni.navigateTo({
url:'/pagesA/electriCompany/electriCompanyDetail'
})
}
}
}
</script>
......@@ -981,7 +1000,7 @@
display: flex;
view {
width: 200rpx;
width: 170rpx;
height: 70rpx;
line-height: 70rpx;
text-align: center;
......@@ -990,9 +1009,13 @@
color: #fff;
}
.shop {
background: #1989fa;
border-radius: 16rpx 0rpx 0rpx 16rpx;
}
.invite {
background: #fda700;
border-radius: 16rpx 0rpx 0rpx 16rpx;
}
.take {
......
pagesA/electriCompany/electriCompanyDetail.vue
浏览文件 @ 6fbe79ee
......@@ -51,7 +51,7 @@
class="count">结束倒计时:{{remainder2[index]?remainder2[index]:''}}</text>
</text> -->
<text style="margin-bottom: 0;">2021
<text class="count">00:00:00</text>
<text class="count">结束倒计时:00:00:00</text>
</text>
</view>
</view>
......@@ -103,8 +103,8 @@
</view>
<!-- 售电公司套餐end -->
<!-- 售电公司简介start -->
<view class="electriCompanyDetail_info">
<view class="electriCompanyDetail_info_basic">
<view class="electriCompanyDetail_info" v-if="tabIndex == 2">
<view class="electriCompanyDetail_info_basic" style="margin-bottom: 16rpx">
<view class="electriCompanyDetail_info_title">
基本信息
</view>
......@@ -120,6 +120,9 @@
<view class="electriCompanyDetail_info_item">
营业执照<image src="../../static/images/index/group.png" mode=""></image>
</view>
<view class="electriCompanyDetail_info_item">
最近一次全月现货结算综合批发均价<text>46.09厘</text>
</view>
</view>
<view class="electriCompanyDetail_info_introduce">
<view class="electriCompanyDetail_info_title">
......@@ -131,6 +134,13 @@
</view>
</view>
<!-- 售电公司简介end -->
<!-- 独立询价按钮start -->
<view class="electriCompanyDetail_inquiry">
<view class="electriCompanyDetail_inquiry_btn" @click="linktoInquiry">
独立询价
</view>
</view>
<!-- 独立询价按钮end -->
</view>
</template>
......@@ -189,6 +199,12 @@
// icon: 'none'
// })
// }
},
// 独立询价
linktoInquiry(){
uni.navigateTo({
url:'/pagesA/enquiry/Demand'
})
}
}
}
......@@ -196,7 +212,10 @@
<style lang="scss">
.electriCompanyDetail {
position: relative;
padding: 0 32rpx;
width: 100%;
height: 100%;
// 售电公司头部
.electriCompanyDetail_top {
......@@ -217,10 +236,12 @@
}
}
}
// 售电公司tab栏
// 售电公司tab栏
.electriCompanyDetail_tab {
display: flex;
justify-content: space-around;
margin-bottom: 16rpx;
view {
height: 60rpx;
......@@ -231,7 +252,8 @@
border-bottom: 1rpx solid #666;
}
}
// 售电公司套餐
// 售电公司套餐
.group_list_scroll {
height: calc(100vh - 175rpx);
......@@ -240,7 +262,6 @@
margin-bottom: 120rpx;
.group_list_item {
padding: 0 32rpx;
padding-bottom: 16rpx;
margin-bottom: 16rpx;
background-color: #fff;
......@@ -356,9 +377,52 @@
}
}
}
// 售电公司简介
.electriCompanyDetail_info {
.electriCompanyDetail_info_title {
color: #000000;
font-size: 32rpx;
font-weight: 700;
}
.electriCompanyDetail_info_item {
display: flex;
justify-content: space-between;
// align-items: center;
margin: 22rpx 0;
font-size: 28rpx;
text {
color: #C0C0C0;
font-size: 24rpx;
}
image {
width: 98rpx;
height: 98rpx;
}
}
}
// 售电公司独立询价按钮
.electriCompanyDetail_inquiry {
position: absolute;
left: 0;
bottom: 64rpx;
width: 100%;
height: 100rpx;
.electriCompanyDetail_inquiry_btn {
margin-left: 32rpx;
width: 686rpx;
height: 100%;
line-height: 100rpx;
text-align: center;
color: #FFFFFF;
font-size: 32rpx;
background-color: #1989fa;
border-radius: 16rpx;
}
}
}
</style>
pagesA/switchIdentity/switchIdentity.vue 0 → 100644
浏览文件 @ 6fbe79ee
<template>
<!-- 切换身份 -->
<view class="switchIdentity">
<view class="switchIdentity_img">
<image src="../../static/images/index/banner.jpg" mode=""></image>
</view>
<view class="switchIdentity_hint">
你当前的身份是{{type==1?'"电客"':'"用电企业"'}}
</view>
<view class="switchIdentity_btns">
<view class="switch">切换为{{type==1?'"电客"':'"用电企业"'}}身份</view>
<view class="back" @click="linkBack">返回</view>
</view>
</view>
</template>
<script>
export default {
created() {
this.type = uni.getStorageSync('type')
},
data() {
return {
type: null, // 用户类型
}
},
methods: {
// 返回上一页
linkBack() {
uni.navigateBack({
delta: 1
})
}
}
}
</script>
<style lang="scss">
.switchIdentity {
position: relative;
padding: 32rpx;
width: 100%;
height: 100%;
.switchIdentity_img {
padding: 32rpx;
height: 368rpx;
}
.switchIdentity_hint {
margin-top: 60rpx;
text-align: center;
font-size: 34rpx;
color: #000000
}
.switchIdentity_btns {
position: absolute;
left: 0;
bottom: 32rpx;
width: 100%;
view {
margin-left: 32rpx;
margin-bottom: 32rpx;
width: 686rpx;
height: 80rpx;
line-height: 80rpx;
text-align: center;
color: #FFFFFF;
border-radius: 10rpx;
background-color: #ccc;
}
.switch {
background-color: #1989fa;
}
.back {
color: #000000;
}
}
}
</style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论