Commit 5c00bbda authored by Morson's avatar Morson
parents 3c8038f6 9f6da214
...@@ -2,10 +2,15 @@ ...@@ -2,10 +2,15 @@
// launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数 // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
"version": "0.0", "version": "0.0",
"configurations": [{ "configurations": [{
"type": "uniCloud", "default" :
"default": { {
"launchtype": "remote" "launchtype" : "remote"
} },
"mp-weixin" :
{
"launchtype" : "remote"
},
"type" : "uniCloud"
} }
] ]
} }
...@@ -2,10 +2,45 @@ export default [{ ...@@ -2,10 +2,45 @@ export default [{
"groupName": "女装", "groupName": "女装",
"item": [{ "item": [{
"required": true, "required": true,
"fieldsTitle": "A字裙", "fieldsTitle": "A字裙多个",
"fieldsName": "name", "fieldsName": "name",
"fieldsType": "multiInput",
"fieldsValue": "",
"inputOptions":[{
"fieldsTitle": "A字裙",
"fieldsName": "name1",
"fieldsType": "text",
},{
"fieldsTitle": "A字裙",
"fieldsName": "name2",
"fieldsType": "text",
},{
"fieldsTitle": "A字裙",
"fieldsName": "name3",
"fieldsType": "text",
},{
"fieldsTitle": "A字裙",
"fieldsName": "name3",
"fieldsType": "text",
},{
"fieldsTitle": "A字裙",
"fieldsName": "name4",
"fieldsType": "text", "fieldsType": "text",
},{
"fieldsTitle": "A字裙",
"fieldsName": "name5",
"fieldsType": "text",
},],
"key": "A字裙",
"icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
"cat": 10
},{
"required": true,
"fieldsTitle": "A字裙",
"fieldsName": "name",
"fieldsType": "input",
"fieldsValue": "", "fieldsValue": "",
"span":8,
"key": "A字裙", "key": "A字裙",
"icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg", "icon": "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
"cat": 10 "cat": 10
...@@ -73,7 +108,10 @@ export default [{ ...@@ -73,7 +108,10 @@ export default [{
"cat": 10 "cat": 10
}, },
{ {
"fieldsTitle": "牛仔裤", "fieldsTitle": "时间选择",
"fieldsName": "time",
"fieldsType": "time",
"required": true,
"key": "牛仔裤", "key": "牛仔裤",
"icon": "https://cdn.uviewui.com/uview/common/classify/1/9.jpg", "icon": "https://cdn.uviewui.com/uview/common/classify/1/9.jpg",
"cat": 10 "cat": 10
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<u-icon name="arrow-right" color="#666" size="28"></u-icon> <u-icon name="arrow-right" color="#666" size="28"></u-icon>
</view> </view>
<view class="pics u-flex u-flex-wrap"> <view class="pics u-flex u-flex-wrap">
<u-image class="pic" v-for="(item,index) in imgList" width="170rpx" height="170" :src="item.path"></u-image> <u-image class="pic" v-for="(item,index) in imgList" width="170rpx" height="170" :src="item.path" :key="index"></u-image>
<!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> --> <!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> -->
</view> </view>
<u-popup v-model="maskShow" mode="center" width="500"> <u-popup v-model="maskShow" mode="center" width="500">
......
<!-- ******************* 多个输入框 ******************* -->
<template>
<view class="u-flex u-flex-wrap">
<u-input class="input-item" v-for="(item,index) in inputOptions" v-model="item.value" @input="val=>{getValue(item)}" type="text" :key="index"/>
</view>
</template>
<script>
import objMixin from './objMixin'
export default {
name: 'XhMultiInput',
components: {},
mixins: [objMixin],
props: {},
data() {
return {}
},
computed: {
inputOptions() {
let options = this.item.inputOptions || []
let result = options.map(item => {
return {
...item,
value: ''
}
})
return result
}
},
watch: {},
mounted() {},
methods: {
getValue(item){
let currentValue = {}
currentValue[item.fieldsName] = item.value
// 以key,value的对象形式传递
this.valueChange(currentValue)
}
}
}
</script>
<style>
.input-item{
width:33.3%;
}
</style>
<!-- ******************* 输入框 ******************* --> <!-- ******************* 输入框 ******************* -->
<template> <template>
<view> <view class="picker-box">
<u-input v-model="dataValue" @input="valueChange" :type="type" /> <view class="u-flex u-row-between" @click="openPicker">
<view class="txt">{{item.fieldsTitle}}</view>
<view class="txt u-flex-1">{{dataValue}}</view>
<u-icon name="arrow-right" color="#666" size="28"></u-icon>
</view>
<u-picker :params="params" v-model="showPicker" mode="time" @confirm="pickerConfirm"></u-picker>
<!-- <u-picker v-model="showPicker" :rangeKey="rangeKey" @columnchange="columnchange" mode="multiSelector" @confirm="pickerConfirm" :default-selector='[0, 1]' :range="settings"></u-picker> -->
</view> </view>
</template> </template>
...@@ -13,7 +19,19 @@ ...@@ -13,7 +19,19 @@
mixins: [stringMixin], mixins: [stringMixin],
props: {}, props: {},
data() { data() {
return {} return {
showPicker: false,
params: {
year: true,
month: true,
day: true,
hour: true,
minute: true,
second: true,
// 选择时间的时间戳
timestamp: true,
}
}
}, },
computed: { computed: {
type() { type() {
...@@ -26,7 +44,20 @@ ...@@ -26,7 +44,20 @@
}, },
watch: {}, watch: {},
mounted() {}, mounted() {},
methods: {} methods: {
openPicker() {
this.showPicker = true
},
pickerConfirm(data) {
console.log(data, 'DATA')
let result = []
let dataValue = data.year + '-' + data.month + '-' + data.day + ' ' + data.hour + ':' + data.minute +
':' + data.second
console.log(dataValue, 'dataValue')
this.dataValue = dataValue
this.valueChange(dataValue)
},
}
} }
</script> </script>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
}, },
computed: { computed: {
url() { url() {
return qn_base_url + 'top' + this.index + '.png' return qn_base_url + 'topback' + this.index + '.png'
} }
} }
} }
...@@ -46,8 +46,5 @@ ...@@ -46,8 +46,5 @@
position: fixed; position: fixed;
bottom: 44rpx; bottom: 44rpx;
width: 100%; width: 100%;
display: flex;
align-items: center;
justify-content: center;
} }
</style> </style>
<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秒,在规定时间内答对题目的记分。
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<!-- <template v-if="isStart==true && currentItem"> --> <!-- <template v-if="isStart==true && currentItem"> -->
<view class="bottom-padding" v-if="currentItem"> <view class="bottom-padding" v-if="currentItem">
<view class="title-view"> <view class="title-view">
<view class="title-text"> <view :class="['title-text', {'radio': currentItem.question.answerType == 1}]">
<text>{{ titleText[Math.max(0, currentItem.question.answerType - 1)] }}</text> <text>{{ titleText[Math.max(0, currentItem.question.answerType - 1)] }}</text>
</view> </view>
<view class="title-right-view"> <view class="title-right-view">
...@@ -738,6 +738,9 @@ ...@@ -738,6 +738,9 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
&.radio {
background-color: #2272FF;
}
} }
.title-right-view { .title-right-view {
...@@ -757,7 +760,7 @@ ...@@ -757,7 +760,7 @@
} }
.time-count-down { .time-count-down {
width: 80rpx; width: 50rpx;
text-align: right; text-align: right;
} }
} }
......
...@@ -4,27 +4,44 @@ ...@@ -4,27 +4,44 @@
@scroll="handleScroll" refresher-enabled :refresher-triggered="triggered" @refresherrefresh="onRefresh" @scroll="handleScroll" refresher-enabled :refresher-triggered="triggered" @refresherrefresh="onRefresh"
scroll-anchoring @refresherrestore="onRestore" @refresherpulling="triggered = true" :show-scrollbar="false" scroll-anchoring @refresherrestore="onRestore" @refresherpulling="triggered = true" :show-scrollbar="false"
enable-back-to-top> --> enable-back-to-top> -->
<view style="width: 700rpx; height: 800rpx;"> <view style="width: 700rpx; height: 800rpx">
<!-- <view class="title-view">充电桩自营平台</view> --> <!-- <view class="title-view">充电桩自营平台</view> -->
<u-navbar :is-back="false" background="{background: transparent}" :border-bottom="false" <u-navbar
:is-fixed="false"> :is-back="false"
background="{background: transparent}"
:border-bottom="false"
:is-fixed="false"
>
<text class="title-view">充电桩自营平台</text> <text class="title-view">充电桩自营平台</text>
</u-navbar> </u-navbar>
<u-swiper :height="240" :list="list" :indicator-pos="indicatorPos" :mode="mode" :interval="3000" <u-swiper
@click="clickSwiper"> :height="240"
:list="list"
:indicator-pos="indicatorPos"
:mode="mode"
:interval="3000"
@click="clickSwiper"
>
</u-swiper> </u-swiper>
<view class="msg-view"> <view class="msg-view">
<view class="msg-title">最新消息</view> <view class="msg-title">最新消息</view>
<view class="msg-list-view"> <view class="msg-list-view">
<view class="msg-content" v-for="(item, index) in messageList" :key="index"> <view
class="msg-content"
v-for="(item, index) in messageList"
:key="index"
>
<view class="msg-content-view"> <view class="msg-content-view">
<view class="left-view"> <view class="left-view">
<image class="msg-icon"></image> <image class="msg-icon"></image>
<text>{{item.body}}</text> <text>{{ item.body }}</text>
</view> </view>
<image class="right-icon"></image> <image class="right-icon"></image>
</view> </view>
<view class="line-view" v-if="messageList.length > index + 1"></view> <view
class="line-view"
v-if="messageList.length > index + 1"
></view>
</view> </view>
</view> </view>
</view> </view>
...@@ -35,7 +52,6 @@ ...@@ -35,7 +52,6 @@
</view> </view>
</u-sticky> </u-sticky>
<view class="order-view"> <view class="order-view">
<!-- 入驻成功之后显示推荐订单列表 --> <!-- 入驻成功之后显示推荐订单列表 -->
<view class="order-list-view"> <view class="order-list-view">
<!-- 入驻前--> <!-- 入驻前-->
...@@ -43,19 +59,33 @@ ...@@ -43,19 +59,33 @@
<view class="tip-title">当前订单(笔)</view> <view class="tip-title">当前订单(笔)</view>
<view class="tip-count">{{ count }}</view> <view class="tip-count">{{ count }}</view>
<view class="tip-other">入驻通过后平台将向您推荐订单</view> <view class="tip-other">入驻通过后平台将向您推荐订单</view>
<u-button class="settle-button" type="primary" shape="circle" @click="immediatelyIn" <u-button
:custom-style="buttonStyle"> class="settle-button"
type="primary"
shape="circle"
@click="immediatelyIn"
:custom-style="buttonStyle"
>
立即入驻 立即入驻
</u-button> </u-button>
</view> </view>
<view v-else-if="!needSettled && orderList.length > 0" class="order-item-view"> <view
v-else-if="!needSettled && 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="!needSettled && orderList.length <= 0" class="no-order-view"> <view
v-else-if="!needSettled && orderList.length <= 0"
class="no-order-view"
>
暂无订单 暂无订单
</view> </view>
</view> </view>
...@@ -66,12 +96,12 @@ ...@@ -66,12 +96,12 @@
</template> </template>
<script> <script>
import util from "@/utils/util.js"; import util from "@/utils/util.js";
const app = getApp(); const app = getApp();
import OrderCell from "@/components/order/index.vue"; import OrderCell from "@/components/order/index.vue";
export default { export default {
components: { components: {
OrderCell, OrderCell,
}, },
...@@ -79,7 +109,8 @@ ...@@ -79,7 +109,8 @@
return { return {
status: 0, // 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交' status: 0, // 入驻状态:0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
triggered: false, triggered: false,
list: [{ list: [
{
image: "https://cdn.uviewui.com/uview/swiper/1.jpg", image: "https://cdn.uviewui.com/uview/swiper/1.jpg",
}, },
{ {
...@@ -101,31 +132,30 @@ ...@@ -101,31 +132,30 @@
currentLoadStatus: "loading", currentLoadStatus: "loading",
orderList: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}], orderList: [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}],
search: { search: {
token: app.globalData.token || '', token: app.globalData.token || "",
pageNumber: 0, pageNumber: 0,
pageSize: 10, pageSize: 10,
}, },
bottomLoading: false, bottomLoading: false,
}; };
}, },
watch: {}, watch: {},
computed: { computed: {
buttonStyle() { buttonStyle() {
return { return {
'width': '400rpx', width: "400rpx",
'height': '104rpx', height: "104rpx",
'font-size': '32rpx', "font-size": "32rpx",
'font-weight': 'bold' "font-weight": "bold",
}; };
}, },
msgStyle() { msgStyle() {
return { return {
'1': '', // 置顶 1: "", // 置顶
'2': '', // 通知 2: "", // 通知
'3': '' // 消息 3: "", // 消息
} };
} },
}, },
onLoad() { onLoad() {
this._freshing = false; this._freshing = false;
...@@ -138,54 +168,55 @@ ...@@ -138,54 +168,55 @@
this.initSettleInfo(); this.initSettleInfo();
} else { } else {
// 初始化订单数据 // 初始化订单数据
this.loadOrderList() this.loadOrderList();
} }
}, },
methods: { methods: {
async initSettleInfo() { async initSettleInfo() {
let self = this let self = this;
if (self.status == 7) return; if (self.status == 7) return;
const callBack = (vm, result) => { const callBack = (vm, result) => {
// 后台自动判断入驻流程是否完成,前台通过status确定状态 // 后台自动判断入驻流程是否完成,前台通过status确定状态
if (result && result.record) { if (result && result.record) {
vm.loaded = true; vm.loaded = true;
vm.needSettled = result.needSettled;
vm.status = Number(result.record.status); vm.status = Number(result.record.status);
vm.needSettled = result.needSettled // vm.status = 8
} }
}; };
await app.getBaseInfo(self, callBack); await app.getBaseInfo(self, callBack);
// 加载消息列表 // 加载消息列表
self.loadMessageList() self.loadMessageList();
self.loadOrderList() self.loadOrderList();
}, },
loadMessageList() { loadMessageList() {
let self = this let self = this;
self.$u.api.listByNotice().then(res => { self.$u.api.listByNotice().then((res) => {
if(res.code == 200) { if (res.code == 200) {
if(res.data && res.data.length > 3) { if (res.data && res.data.length > 3) {
self.messageList = res.data.slice(0, 3) self.messageList = res.data.slice(0, 3);
} else { } else {
self.messageList = res.data || [] self.messageList = res.data || [];
} }
} else { } else {
console.log(res.message, "初始化消息列表异常"); console.log(res.message, "初始化消息列表异常");
} }
}) });
}, },
loadOrderList() { loadOrderList() {
let self = this let self = this;
// 加载订单列表 // 加载订单列表
self.search.token = app.globalData.token self.search.token = app.globalData.token;
self.$u.api.listByRecommendOrder(self.search).then(res => { self.$u.api.listByRecommendOrder(self.search).then((res) => {
if(res.code == 200) { if (res.code == 200) {
if(res.data && res.data.length > 0) { if (res.data && res.data.length > 0) {
self.orderList.push().apply(res.data) self.orderList.push().apply(res.data);
} }
} else { } else {
console.log(res.message, "初始化订单列表异常"); console.log(res.message, "初始化订单列表异常");
} }
}) });
}, },
onRefresh() { onRefresh() {
if (this._freshing) return; if (this._freshing) return;
...@@ -220,10 +251,10 @@ ...@@ -220,10 +251,10 @@
this.orderList.push(...[{}, {}, {}, {}, {}, {}, {}, {}, {}, {}]); this.orderList.push(...[{}, {}, {}, {}, {}, {}, {}, {}, {}, {}]);
// 加载完成 // 加载完成
this.currentLoadStatus = false /*是否还有*/ ? this.currentLoadStatus = false /*是否还有*/
this.loadStatus[1] : ? this.loadStatus[1]
this.loadStatus[2]; : this.loadStatus[2];
this.$nextTick(function() { this.$nextTick(function () {
this.bottomLoading = false; this.bottomLoading = false;
}); });
}, 1000); }, 1000);
...@@ -233,9 +264,36 @@ ...@@ -233,9 +264,36 @@
console.log("-----scroll-------"); console.log("-----scroll-------");
}, },
immediatelyIn() { immediatelyIn() {
if (util.getToken() && this.needSettled) { if (util.getToken()) {
// 0=>'待提交',1=>'待审核',2=>'已通过',3=>'备选',4=>'已驳回',5=>'已签约',6=>'未支付保证金',7=>'已支付保证金',8=>'已通过考试',9=>'待提交'
var pageIndex = 1;
switch (this.status) {
case 1:
case 2:
case 3:
case 4:
pageIndex = 2;
break;
case 8:
pageIndex = 3;
break;
case 5:
case 6:
pageIndex = 4;
break;
case 7:
pageIndex = 5;
break;
default:
pageIndex = 1;
break;
}
uni.navigateTo({ uni.navigateTo({
url: !this.status ? "/pages/settle/index" : "/pages/settle/prompt", url:
this.status > 0
? "/pages/settle/prompt?pageIndex=" + pageIndex
: "/pages/settle/index",
}); });
} else { } else {
uni.navigateTo({ uni.navigateTo({
...@@ -244,13 +302,13 @@ ...@@ -244,13 +302,13 @@
} }
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content { .content {
height: 100vh; height: 100vh;
background-color: #F4F5F7; background-color: #f4f5f7;
padding: 0rpx 30rpx 0 30rpx; padding: 0rpx 30rpx 0 30rpx;
.scroll-view { .scroll-view {
...@@ -276,7 +334,7 @@ ...@@ -276,7 +334,7 @@
.msg-list-view { .msg-list-view {
border-radius: 12rpx; border-radius: 12rpx;
background-color: #FFFFFF; background-color: #ffffff;
padding: 6rpx 30rpx; padding: 6rpx 30rpx;
height: 268rpx; height: 268rpx;
} }
...@@ -306,45 +364,43 @@ ...@@ -306,45 +364,43 @@
width: 14rpx; width: 14rpx;
height: 24px; height: 24px;
} }
} }
.line-view { .line-view {
height: 2rpx; height: 2rpx;
background-color: #F4F5F7; background-color: #f4f5f7;
} }
} }
}
} }
}
.logo { .logo {
height: 200 rpx; height: 200 rpx;
width: 100%; width: 100%;
margin: 0 rpx auto 50 rpx auto; margin: 0 rpx auto 50 rpx auto;
} }
.text-area { .text-area {
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.title { .title {
font-size: 36 rpx; font-size: 36 rpx;
color: #8f8f94; color: #8f8f94;
} }
// .sticky-view { // .sticky-view {
// position: sticky; // position: sticky;
// position: -webkit-sticky; // position: -webkit-sticky;
// top: 0rpx; // top: 0rpx;
// width: 100%; // width: 100%;
// height: 200rpx; // height: 200rpx;
// background-color: black; // background-color: black;
// } // }
.sticky { .sticky {
background-color: #F4F5F7; background-color: #f4f5f7;
color: #fff; color: #fff;
padding: 24 rpx; padding: 24 rpx;
text-align: left; text-align: left;
...@@ -352,25 +408,25 @@ ...@@ -352,25 +408,25 @@
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
padding: 46rpx 0 28rpx 0; padding: 46rpx 0 28rpx 0;
} }
.order-view { .order-view {
text-align: center; text-align: center;
.order-list-view { .order-list-view {
background-color: #FFFFFF; background-color: #ffffff;
border-radius: 12rpx; border-radius: 12rpx;
min-height: 460rpx; min-height: 460rpx;
padding: 30rpx; padding: 30rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
.order-item-view {} .order-item-view {
}
.no-order-view {} .no-order-view {
}
.tip-view { .tip-view {
.tip-title { .tip-title {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
...@@ -379,7 +435,7 @@ ...@@ -379,7 +435,7 @@
} }
.tip-count { .tip-count {
color: #2272FF; color: #2272ff;
font-size: 70rpx; font-size: 70rpx;
font-weight: bold; font-weight: bold;
margin-top: 50rpx; margin-top: 50rpx;
...@@ -393,5 +449,5 @@ ...@@ -393,5 +449,5 @@
} }
} }
} }
} }
</style> </style>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
} }
}, },
tips1Image() { tips1Image() {
return qn_base_url + 'tips1@3x.png' return qn_base_url + 'tips1.png'
} }
}, },
onLoad() { onLoad() {
...@@ -238,7 +238,9 @@ ...@@ -238,7 +238,9 @@
} }
.tip-image { .tip-image {
width: 28rpx; width: 26rpx;
height: 32rpx;
flex-shrink: 0;
margin-right: 10rpx; margin-right: 10rpx;
margin-top: 2rpx; margin-top: 2rpx;
} }
...@@ -296,6 +298,7 @@ ...@@ -296,6 +298,7 @@
padding-right: 2rpx; padding-right: 2rpx;
text-align: center; text-align: center;
margin-right: 20rpx; margin-right: 20rpx;
line-height: 24rpx;
.item-st-text { .item-st-text {
color: #FFFFFF; color: #FFFFFF;
} }
......
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
<xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex" <xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex"
:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange"> :itemIndex="itemIndex" :item="item" @value-change="fieldValueChange">
</xh-input> </xh-input>
<xh-multi-input v-else-if="typeToComponentType(item.fieldsType)==='multiinput'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
@value-change="fieldValueChange">
</xh-multi-input>
<xh-radio v-else-if="typeToComponentType(item.fieldsType)==='radio'" <xh-radio v-else-if="typeToComponentType(item.fieldsType)==='radio'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
@value-change="fieldValueChange"> @value-change="fieldValueChange">
...@@ -60,6 +64,10 @@ ...@@ -60,6 +64,10 @@
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-picker> </xh-picker>
<xh-time v-else-if="typeToComponentType(item.fieldsType)==='time'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
@value-change="fieldValueChange">
</xh-time>
</template> </template>
</u-form-item> </u-form-item>
</view> </view>
...@@ -74,6 +82,7 @@ ...@@ -74,6 +82,7 @@
<script> <script>
import classifyData from '@/common/classify.data.js'; import classifyData from '@/common/classify.data.js';
import XhInput from '@/components/createCom/XhInput.vue' import XhInput from '@/components/createCom/XhInput.vue'
import XhMultiInput from '@/components/createCom/XhMultiInput.vue'
import XhRadio from '@/components/createCom/XhRadio.vue' import XhRadio from '@/components/createCom/XhRadio.vue'
import XhCheckbox from '@/components/createCom/XhCheckbox.vue' import XhCheckbox from '@/components/createCom/XhCheckbox.vue'
import XhSelect from '@/components/createCom/XhSelect.vue' import XhSelect from '@/components/createCom/XhSelect.vue'
...@@ -81,6 +90,8 @@ ...@@ -81,6 +90,8 @@
import XhLocation from '@/components/createCom/XhLocation.vue' import XhLocation from '@/components/createCom/XhLocation.vue'
import XhScan from '@/components/createCom/XhScan.vue' import XhScan from '@/components/createCom/XhScan.vue'
import XhPicker from '@/components/createCom/XhPicker.vue' import XhPicker from '@/components/createCom/XhPicker.vue'
import XhTime from '@/components/createCom/XhTime.vue'
// import XhRadio from '@/components/createCom/XhRadio.vue' // import XhRadio from '@/components/createCom/XhRadio.vue'
export default { export default {
data() { data() {
...@@ -130,14 +141,15 @@ ...@@ -130,14 +141,15 @@
}, },
components: { components: {
XhInput, XhInput,
XhMultiInput,
XhRadio, XhRadio,
XhCheckbox, XhCheckbox,
XhSelect, XhSelect,
XhFiles, XhFiles,
XhLocation, XhLocation,
XhScan, XhScan,
XhPicker XhPicker,
// formCom XhTime,
}, },
created() { created() {
// console.log(allComponents,'allComponents') // console.log(allComponents,'allComponents')
...@@ -163,8 +175,14 @@ ...@@ -163,8 +175,14 @@
if (groupItem.item) { if (groupItem.item) {
innerItem = groupItem.item[data.itemIndex] innerItem = groupItem.item[data.itemIndex]
} }
console.log(innerItem, 'innerItem') console.log(data.value,'data.value',innerItem, 'innerItem')
if(innerItem.fieldsType ==='multiInput'){
// 多个输入框的值触发
let key = Object.keys(data.value)[0]
this.form[key] = data.value[key]
}else{
this.form[innerItem.fieldsName] = data.value this.form[innerItem.fieldsName] = data.value
}
console.log(this.form, 'this.form') console.log(this.form, 'this.form')
}, },
nextStep(item) { nextStep(item) {
...@@ -175,6 +193,7 @@ ...@@ -175,6 +193,7 @@
// 将fieldType类型统一转换为公共组件判定类型 // 将fieldType类型统一转换为公共组件判定类型
let formType = '' let formType = ''
type = type.toLocaleLowerCase() type = type.toLocaleLowerCase()
console.log(type,'type')
switch (type) { switch (type) {
case 'text': case 'text':
case 'password': case 'password':
...@@ -182,6 +201,9 @@ ...@@ -182,6 +201,9 @@
case 'number': case 'number':
formType = 'input' formType = 'input'
break break
case 'multiinput':
formType = 'multiinput'
break;
case 'select': case 'select':
formType = 'select' formType = 'select'
break break
...@@ -201,10 +223,14 @@ ...@@ -201,10 +223,14 @@
case 'mutipicker': case 'mutipicker':
formType = 'picker' formType = 'picker'
break break
case 'time':
formType = 'time'
break
// case 'file': // case 'file':
// formType = 'XhFiles' // formType = 'XhFiles'
// break // break
} }
console.log(formType,'formType')
return formType return formType
}, },
// ------------------------- 以下方法为展示滚动切换 ------------------------- // ------------------------- 以下方法为展示滚动切换 -------------------------
......
<template> <template>
<view class="img-wrap rel"> <view class="img-wrap rel">
<view class="upload-box"> <view class="upload-box">
<view class="img-item pic" v-for="(file,index) in imgList" > <view class="img-item pic" v-for="(file,index) in imgList" :key="index" >
<!-- <view class="tip-sucess u-flex u-row-center" v-if="file && (file.status == status.QUEUED || file.status == status.UPLOADING)"> <!-- <view class="tip-sucess u-flex u-row-center" v-if="file && (file.status == status.QUEUED || file.status == status.UPLOADING)">
<span>正在上传中...{{file.percent}}%</span> <span>正在上传中...{{file.percent}}%</span>
</view> --> </view> -->
......
...@@ -227,18 +227,18 @@ ...@@ -227,18 +227,18 @@
margin-top: 20rpx; margin-top: 20rpx;
} }
.bottom_btn { // .bottom_btn {
width: 600rpx; // width: 600rpx;
height: 104rpx; // height: 104rpx;
line-height: 96rpx; // line-height: 96rpx;
display: flex; // display: flex;
align-items: center; // align-items: center;
justify-content: center; // justify-content: center;
.bottom_title { // .bottom_title {
color: #fff; // color: #fff;
} // }
} // }
.bottom_title { .bottom_title {
font-weight: bold; font-weight: bold;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<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">
......
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
}, },
goPage() { goPage() {
const url = this.info.url const url = this.info.url
if (this.status == 1 || this.status == 3 || this.status == 3) { if (this.status == 1 || this.status == 3 || this.status == 7) {
uni.reLaunch({ uni.reLaunch({
url, url,
}); });
...@@ -247,6 +247,7 @@ ...@@ -247,6 +247,7 @@
border-radius: 52rpx; border-radius: 52rpx;
background: #2272ff; background: #2272ff;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold;
color: #fff; color: #fff;
&:disabled { &:disabled {
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<view class="btn-wrap flex-xc"> <view class="btn-wrap flex-xc">
<u-button class="btn-submit" @click="$u.debounce(submitBaseInfo, 500)" :custom-style="buttonStyle" <u-button class="btn-submit" @click="$u.debounce(submitBaseInfo, 500)" :custom-style="buttonStyle"
type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'"> type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'">
我已确认信息,去签约{{count ? '('+count+')' : ''}} 我已确认信息,点击签约{{count ? '('+count+')' : ''}}
</u-button> </u-button>
</view> </view>
</template> </template>
......
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