Commit cd17f274 authored by 李俊赕's avatar 李俊赕
parents e52f0e8e 3fb9889a
...@@ -255,8 +255,8 @@ ...@@ -255,8 +255,8 @@
"query": "" //启动参数,在页面的onLoad函数里面得到 "query": "" //启动参数,在页面的onLoad函数里面得到
}, },
{ {
"name": "缴纳保证金", //模式名称 "name": "订单列表", //模式名称
"path": "pages/settle/pay-ensure", //启动页面,必选 "path": "pages/order/index", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到 "query": "" //启动参数,在页面的onLoad函数里面得到
}, },
{ {
......
<template> <template>
<view class="backView"> <view class="backView">
<Settle :index="2"> <Settle :index="3">
<!-- <template v-if="isStart==false"> <!-- <template v-if="isStart==false">
<view class="noticeView"> <view class="noticeView">
<text class="noticeText">规则:系统随机出现20道考试题目,每道题5分,每题答题时间100秒,在规定时间内答对题目的记分。 <text class="noticeText">规则:系统随机出现20道考试题目,每道题5分,每题答题时间100秒,在规定时间内答对题目的记分。
......
<template> <template>
<view class="content"> <view class="content">
<scroll-view scroll-y style="height: 100%; width: 100%" @scrolltolower="reachBottom" @scroll="handleScroll" <!-- <scroll-view class="scroll-view" scroll-y style="height: 100%; width: 100%" @scrolltolower="reachBottom"
refresher-enabled :refresher-triggered="triggered" @refresherrefresh="onRefresh" scroll-anchoring @scroll="handleScroll" refresher-enabled :refresher-triggered="triggered" @refresherrefresh="onRefresh"
@refresherrestore="onRestore" @refresherpulling="triggered = true"> scroll-anchoring @refresherrestore="onRestore" @refresherpulling="triggered = true" :show-scrollbar="false"
<u-swiper :height="250" :list="list" :indicator-pos="indicatorPos" :mode="mode" :interval="3000" enable-back-to-top> -->
<view style="width: 700rpx; height: 800rpx;">
<!-- <view class="title-view">充电桩自营平台</view> -->
<u-navbar :is-back="false" background="{background: transparent}" :border-bottom="false"
:is-fixed="false">
<text class="title-view">充电桩自营平台</text>
</u-navbar>
<u-swiper :height="240" :list="list" :indicator-pos="indicatorPos" :mode="mode" :interval="3000"
@click="clickSwiper"> @click="clickSwiper">
</u-swiper> </u-swiper>
<view class="msg-view"> <view class="msg-view">
<text class="msg-title">最新消息</text> <view class="msg-title">最新消息</view>
<u-cell-group> <view class="msg-list-view">
<u-cell-item class="msg-content" v-for="(item, index) in messageList" :key="index" <view class="msg-content" v-for="(item, index) in messageList" :key="index">
:title="item.message"> <view class="msg-content-view">
<image class="msg-icon" slot="icon"></image> <view class="left-view">
</u-cell-item> <image class="msg-icon"></image>
</u-cell-group> <text>{{item.body}}</text>
</view>
<image class="right-icon"></image>
</view>
<view class="line-view" v-if="messageList.length > index + 1"></view>
</view>
</view>
</view> </view>
<view class="order-view">
<!-- 订单推荐吸顶 --> <!-- 订单推荐吸顶 -->
<u-sticky> <u-sticky>
<view class="sticky"> <view class="sticky">
<text>订单推荐</text> <text>订单推荐</text>
</view> </view>
</u-sticky> </u-sticky>
<view class="order-view">
<!-- 入驻成功之后显示推荐订单列表 --> <!-- 入驻成功之后显示推荐订单列表 -->
<view v-if="status == 7 && orderList.length > 0"> <view class="order-list-view">
<view v-if="status == 7 && orderList.length > 0" class="order-item-view">
<view v-for="(item, index) in orderList" :key="index"> <view v-for="(item, index) in orderList" :key="index">
<OrderCell :orderData="item"> </OrderCell> <OrderCell :orderData="item"> </OrderCell>
</view> </view>
<u-loadmore :status="currentLoadStatus" bgColor="#f2f2f2"></u-loadmore> <u-loadmore :status="currentLoadStatus" bgColor="#f2f2f2"></u-loadmore>
</view> </view>
<!-- 入驻成功之后无推荐订单 --> <!-- 入驻成功之后无推荐订单 -->
<view v-else-if="status == 7 && orderList.length <= 0"> <view v-else-if="status == 7 && orderList.length <= 0" class="no-order-view">
暂无订单 暂无订单
</view> </view>
<!-- 入驻前--> <!-- 入驻前-->
<view v-else-if="loaded"> <view v-else-if="loaded" class="tip-view">
<text class="title">当前订单{{ count }}笔\n入驻通过后,平台将向您推荐订单</text> <view class="tip-title">当前订单(笔)</view>
<view class="tip-count">{{ count }}</view>
<view class="tip-other">入驻通过后平台将向您推荐订单</view>
<u-button class="settle-button" type="primary" shape="circle" @click="immediatelyIn" <u-button class="settle-button" type="primary" shape="circle" @click="immediatelyIn"
:custom-style="buttonStyle"> :custom-style="buttonStyle">
立即入驻 立即入驻
</u-button> </u-button>
</view> </view>
</view> </view>
</scroll-view> </view>
</view>
<!-- </scroll-view> -->
</view> </view>
</template> </template>
...@@ -110,7 +129,10 @@ ...@@ -110,7 +129,10 @@
computed: { computed: {
buttonStyle() { buttonStyle() {
return { return {
width: "300rpx", 'width': '400rpx',
'height': '104rpx',
'font-size': '32rpx',
'font-weight': 'bold'
}; };
}, },
msgStyle() { msgStyle() {
...@@ -191,8 +213,28 @@ ...@@ -191,8 +213,28 @@
}, },
immediatelyIn() { immediatelyIn() {
if (util.getToken()) { if (util.getToken()) {
// 0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
var pageIndex = 1
switch(this.status) {
case 1,2,3,4:
pageIndex = 2
break
case 8:
pageIndex = 3
break
case 5,6:
pageIndex = 4
break
case 7:
pageIndex = 5
break
default:
pageIndex = 1
break
}
uni.navigateTo({ uni.navigateTo({
url: this.status > 0 ? "/pages/settle/prompt" : "/pages/settle/index", url: this.status > 0 ? "/pages/settle/prompt?pageIndex" + pageIndex : "/pages/settle/index",
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
...@@ -206,20 +248,69 @@ ...@@ -206,20 +248,69 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.content { .content {
height: 100%; height: 100vh;
padding: 30rpx; background-color: #F4F5F7;
padding: 0rpx 30rpx 0 30rpx;
.scroll-view {
::-webkit-scrollbar {
/*隐藏滚轮*/
display: none;
}
}
.title-view {
color: #333333;
font-weight: bold;
font-size: 40rpx;
}
.msg-view { .msg-view {
.msg-title { .msg-title {
color: #333333; color: #333333;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
padding: 50rpx 0rpx 30rpx 0rpx;
}
.msg-list-view {
border-radius: 12rpx;
background-color: #FFFFFF;
padding: 6rpx 30rpx;
} }
.msg-content { .msg-content {
color: #333333; color: #333333;
font-size: 26rpx; font-size: 26rpx;
.mas-icon {}
.msg-content-view {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 20rpx;
margin-bottom: 20rpx;
.left-view {
display: flex;
align-items: center;
.msg-icon {
width: 80rpx;
height: 36rpx;
}
}
.right-icon {
width: 14rpx;
height: 24px;
}
}
.line-view {
height: 2rpx;
background-color: #F4F5F7;
}
} }
} }
...@@ -241,15 +332,64 @@ ...@@ -241,15 +332,64 @@
color: #8f8f94; color: #8f8f94;
} }
// .sticky-view {
// position: sticky;
// position: -webkit-sticky;
// top: 0rpx;
// width: 100%;
// height: 200rpx;
// background-color: black;
// }
.sticky { .sticky {
height: 120 rpx; background-color: #F4F5F7;
background-color: #2979ff;
color: #fff; color: #fff;
padding: 24 rpx; padding: 24 rpx;
text-align: left; text-align: left;
font-size: 32rpx;
font-weight: bold;
color: #333333;
padding: 46rpx 0 28rpx 0;
} }
.order-view { .order-view {
text-align: center; text-align: center;
.order-list-view {
background-color: #FFFFFF;
border-radius: 12rpx;
min-height: 460rpx;
padding: 30rpx;
margin-bottom: 30rpx;
.order-item-view {}
.no-order-view {}
.tip-view {
.tip-title {
font-size: 32rpx;
font-weight: bold;
color: #333333;
margin-top: 30rpx;
}
.tip-count {
color: #2272FF;
font-size: 70rpx;
font-weight: bold;
margin-top: 50rpx;
margin-bottom: 20rpx;
}
.tip-other {
font-size: 28rpx;
color: #333333;
margin-bottom: 56rpx;
}
}
}
} }
</style> </style>
This diff is collapsed.
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<view class="content"> <view class="content">
<Settle :index="5"> <Settle :index="5">
<view class="base-list"> <view class="base-list">
<view class="title">充电桩安装需缴纳设备押金</view> <view class="title">充电桩安装需缴纳配件押金</view>
<view class="price"><text>¥ </text>{{settledInfo.record.deposit}}</view> <view class="price"><text>¥ </text>{{settledInfo.record.deposit}}</view>
<view class="list"> <view class="list">
<view class="item u-flex u-row-between"> <view class="item u-flex u-row-between">
<view class="txt">您已缴纳金额</view> <view class="txt">已缴纳金额</view>
<view class="txt-value">¥ 0.00</view> <view class="txt-value">¥ 0.00</view>
</view> </view>
<view class="line-view"></view> <view class="line-view"></view>
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
} }
let settledInfo = await app.getBaseInfo(this, callBack) let settledInfo = await app.getBaseInfo(this, callBack)
this.settledInfo = settledInfo this.settledInfo = settledInfo
this.settledInfo.record.status = 8
this.status = settledInfo.record.status this.status = settledInfo.record.status
uni.hideLoading() uni.hideLoading()
this.initInfo(settledInfo.record) this.initInfo(settledInfo.record)
......
...@@ -56,9 +56,10 @@ ...@@ -56,9 +56,10 @@
</view> </view>
<template v-slot:bottom> <template v-slot:bottom>
<view class="btn-wrap flex-xc"> <view class="btn-wrap flex-xc">
<button class="btn-submit" :disabled="!submitStatus" @click="$u.debounce(submitBaseInfo, 500)"> <u-button class="btn-submit" @click="$u.debounce(submitBaseInfo, 500)" :custom-style="buttonStyle"
我已阅读协议,点击签约{{count ? '('+count+')' : ''}} type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'">
</button> 我已确认信息,去签约{{count ? '('+count+')' : ''}}
</u-button>
</view> </view>
</template> </template>
</Settle> </Settle>
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
return { return {
token: app.globalData.token, token: app.globalData.token,
baseInfo: { baseInfo: {
name: "郭小清", name: "",
id_card_no: "43072219800123456", id_card_no: "43072219800123456",
id: "", id: "",
bank_no: '', // 银行卡号 bank_no: '', // 银行卡号
...@@ -133,6 +134,23 @@ ...@@ -133,6 +134,23 @@
}, },
tips3Image() { tips3Image() {
return qn_base_url + 'tips3.png' return qn_base_url + 'tips3.png'
},
buttonStyle() {
return this.submitStatus ? {
'color': '#FFFFFF',
'background-color': '#2272FF;',
'width': '600rpx',
'height': '104rpx',
'font-size': '32rpx',
'font-weight': 'bold'
} : {
'color': '#FFFFFF',
'background-color': '#D1D4D4;',
'width': '600rpx',
'height': '104rpx',
'font-size': '32rpx',
'font-weight': 'bold'
}
} }
}, },
components: { components: {
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
* @property {Boolean} bold 激活选项的字体是否加粗(默认true) * @property {Boolean} bold 激活选项的字体是否加粗(默认true)
* @property {String} bg-color 组件背景颜色,mode为button时有效(默认#eeeeef) * @property {String} bg-color 组件背景颜色,mode为button时有效(默认#eeeeef)
* @property {String} button-color 按钮背景颜色,mode为button时有效(默认#ffffff) * @property {String} button-color 按钮背景颜色,mode为button时有效(默认#ffffff)
* @property {String Number} border-radius 圆角值,单位rpx(默认5)
* @event {Function} change 分段器选项发生改变时触发 * @event {Function} change 分段器选项发生改变时触发
* @example <u-subsection active-color="#ff9900"></u-subsection> * @example <u-subsection active-color="#ff9900"></u-subsection>
*/ */
...@@ -91,7 +92,12 @@ ...@@ -91,7 +92,12 @@
vibrateShort: { vibrateShort: {
type: Boolean, type: Boolean,
default: false default: false
} },
// 圆角值
borderRadius: {
type: [Number, String],
default: 5
},
}, },
data() { data() {
return { return {
...@@ -105,7 +111,7 @@ ...@@ -105,7 +111,7 @@
}, },
currentIndex: this.current, currentIndex: this.current,
buttonPadding: 3, // mode = button 时,组件的内边距 buttonPadding: 3, // mode = button 时,组件的内边距
borderRadius: 5, // 圆角值 // borderRadius: 5, // 圆角值
firstTimeVibrateShort: true // 组件初始化时,会触发current变化,此时不应震动 firstTimeVibrateShort: true // 组件初始化时,会触发current变化,此时不应震动
}; };
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment