Commit 37caa8cc authored by 李超鹏's avatar 李超鹏

update:add、update

scope:self-support
body:完工页面交互调试
parent 02d04def
...@@ -73,6 +73,21 @@ let orderApiFun = function(vm){ ...@@ -73,6 +73,21 @@ let orderApiFun = function(vm){
*/ */
let getWatermark= async (params = {}) => await vm.$u.get('wxh-worker-rest/rest/'+ vm.vuex_token+'/photo/watermark', params); let getWatermark= async (params = {}) => await vm.$u.get('wxh-worker-rest/rest/'+ vm.vuex_token+'/photo/watermark', params);
/**
* 获取订单的完工项目(配置+数据)
*/
let getCompleteConfigAndData= async (orderId) => await vm.$u.get('wxh-worker-rest/rest/'+ vm.vuex_token+'/order/'+ orderId +'/maintain/info');
/**
* 查询措施
*/
let getMeasure= async (params = {}) => await vm.$u.get('wxh-worker-rest/rest/service/'+ vm.vuex_token+'/measure/queryMeasureItems', params);
/**
* 保存售后记录
*/
let saveCompleteData = async (params = {},orderId) => await vm.$u.post('wxh-worker-rest/rest/'+ vm.vuex_token+'/order/'+ orderId +'/maintain/saveMaintainInfoV2', params);
const orderApi = { const orderApi = {
listByRecommendOrder, listByRecommendOrder,
listOrderCount, listOrderCount,
...@@ -84,13 +99,15 @@ let orderApiFun = function(vm){ ...@@ -84,13 +99,15 @@ let orderApiFun = function(vm){
listOrderRecord, listOrderRecord,
orderAccept, orderAccept,
orderGan, orderGan,
maintainWorkerCheckin,
feedbackConfig, feedbackConfig,
traceAndAppointment, traceAndAppointment,
rejectOrder, rejectOrder,
orderStandard, orderStandard,
saveImage, saveImage,
getWatermark getWatermark,
getCompleteConfigAndData,
getMeasure,
saveCompleteData
} }
return orderApi return orderApi
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<template> <template>
<view class="list"> <view class="list">
<view v-for="(item,index) in settings" :key="index" <view v-for="(item,index) in settings" :key="index"
:class="{'txt':true,'active':checkStatus(item)}" @click="setValue(item)">{{item}} :class="{'txt':true,'active':checkStatus(item.key)}" @click="setValue(item.key)">{{item.label}}
</view> </view>
</view> </view>
</template> </template>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
}, },
computed: { computed: {
settings() { settings() {
return this.item.settings || [] return this.item.fieldsOptions || []
} }
}, },
watch: {}, watch: {},
...@@ -51,22 +51,22 @@ ...@@ -51,22 +51,22 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.list { .list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.txt{ .txt{
color:#666; color:#666;
padding:10rpx 30rpx; padding:10rpx 30rpx;
margin: 5rpx; margin: 5rpx;
background: #F4F5F7; background: #F4F5F7;
border-radius: 10rpx; border-radius: 10rpx;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
line-height: 50rpx; line-height: 50rpx;
max-width: 48%; max-width: 48%;
&.active{ &.active{
background-color: #2272FF; background-color: #2272FF;
color:#fff; color:#fff;
} }
} }
} }
</style> </style>
...@@ -5,48 +5,48 @@ ...@@ -5,48 +5,48 @@
<view class="txt u-flex-1">{{item.fieldsTitle}}</view> <view class="txt u-flex-1">{{item.fieldsTitle}}</view>
<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">
<view class="img-list" v-for="(item,index) in imgList" :key="index"> <view class="img-list" v-for="(item,index) in imgList" :key="index">
<u-image class="pic" width="170" height="170" :src="item.path" @click.stop="prviewImage(item.path,index)"></u-image> <u-image class="pic" width="170" height="170" :src="item.path" @click.stop="prviewImage(item.path,index)"></u-image>
<view class="icon-del-box" @click.stop="delFile(index)"> <view class="icon-del-box" @click.stop="delFile(index)">
<view class="icon-del"></view> <view class="icon-del"></view>
<view class="icon-del rotate"></view> <view class="icon-del rotate"></view>
</view> </view>
</view> </view>
<view class="img-list" @click="choose"> <view class="img-list">
<u-image class="pic" width="170rpx" height="170" @click="selectUpload" src="https://gitee.com/xuqu/uView/blob/master/static/uview/example/min_button.png"></u-image> <u-image class="pic" width="170rpx" height="170" @click="selectUpload" src="https://gitee.com/xuqu/uView/blob/master/static/uview/example/min_button.png"></u-image>
</view> </view>
<!-- <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-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet> <u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet>
</view> </view>
</template> </template>
<script> <script>
import objMixin from './objMixin' import arrMixin from './arrMixin'
import baseFile from '@/components/upload/index'; import baseFile from '@/components/upload/index';
export default { export default {
name: 'XhFiles', name: 'XhFiles',
components: {}, components: {},
mixins: [objMixin,baseFile], mixins: [arrMixin,baseFile],
props: { props: {
files: { files: {
type: Array, type: Array,
} }
}, },
filters:{}, filters:{},
data() { data() {
return { return {
maskShow:false, maskShow:false,
list: [ list: [
{ {
text: '相册' text: '相册'
}, },
{ {
text: '拍照' text: '拍照'
} }
], ],
takeStatus: false, takeStatus: false,
} }
}, },
computed: { computed: {
...@@ -54,34 +54,54 @@ ...@@ -54,34 +54,54 @@
return this.item.settings || [] return this.item.settings || []
} }
}, },
watch: { watch: {
'takeStatus': function(val, oldVal){ 'takeStatus': function(val, oldVal){
this.$emit('getTakeStatus', {status: val, index: this.itemIndex}) this.$emit('getTakeStatus', {status: val, index: this.itemIndex})
}, },
'files': { // 处理相机拍照返回的图片 'files': { // 处理相机拍照返回的图片
handler (val) { handler (val) {
this.imgList = val.map(v => { if(val && val.length > 0){
v.path = v.src val.forEach((item,index,array)=>{
return v item.path = item.src
}) this.imgList.push(item)
this.setValue() })
}, // this.imgList = val.map(v => {
deep:true, // v.path = v.src
immediate: true, // return v
} // })
this.setValue()
}
},
deep:true,
immediate: true,
},
// 'value'(val, oldVal){
// if(val){
// this.imgList = val.map(img =>{
// return {path:img}
// })
// }
// }
},
mounted() {
if(this.value){
this.imgList = this.value.map(img =>{
return {path: img}
})
}
this.setValue()
}, },
mounted() {},
methods: { methods: {
selectUpload(){ selectUpload(){
// 弹窗展示 // 弹窗展示
this.maskShow = true this.maskShow = true
}, },
uploadSelect(index) { uploadSelect(index) {
if (index === 0) { if (index === 0) {
this.uploadFile('photo') this.uploadFile('photo')
} else { } else {
this.uploadFile() this.uploadFile()
} }
}, },
async uploadFile(type){ async uploadFile(type){
const self = this const self = this
...@@ -89,8 +109,8 @@ ...@@ -89,8 +109,8 @@
// 直接打开相册 // 直接打开相册
let config = { let config = {
options:{ options:{
sourceType:['album'],//['album', 'camera'] sourceType:['album'],//['album', 'camera']
count: 5, count: 10,
sizeType: ['compressed'] sizeType: ['compressed']
} }
} }
...@@ -104,67 +124,67 @@ ...@@ -104,67 +124,67 @@
setValue() { setValue() {
const dataValue = [] const dataValue = []
this.imgList.map(item=>{ this.imgList.map(item=>{
dataValue.push(item.key) dataValue.push(item.src)
}) })
console.log(this.imgList)
this.valueChange(dataValue) this.valueChange(dataValue)
}, },
prviewImage(url, index) { prviewImage(url, index) {
uni.previewImage({ uni.previewImage({
urls: [url], urls: [url],
current: index current: index
}); });
}, },
delFile(index) { delFile(index) {
this.imgList.splice(index, 1) this.imgList.splice(index, 1)
this.setValue()
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.pic{ .pic{
margin-right: 15rpx; // margin-right: 15rpx;
margin-bottom: 15rpx; // margin-bottom: 15rpx;
&:nth-child(3n){ &:nth-child(3n){
margin-right: 0; margin-right: 0;
} }
} }
.img-list { .img-list {
position: relative; position: relative;
margin: 8rpx; margin: 8rpx;
border: 1px solid #eee; border: 1px solid #eee;
width: 170rpx; width: 170rpx;
height: 170rpx; height: 170rpx;
.icon-del-box { .icon-del-box {
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
display: flex; display: flex;
/* #endif */ /* #endif */
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: absolute; position: absolute;
top: 10rpx; top: 10rpx;
right: 10rpx; right: 10rpx;
height: 40rpx; height: 40rpx;
width: 40rpx; width: 40rpx;
border-radius: 50%; border-radius: 50%;
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
z-index: 2; z-index: 2;
transform: rotate(-45deg); transform: rotate(-45deg);
} }
.icon-del { .icon-del {
width: 30rpx; width: 30rpx;
height: 4rpx; height: 4rpx;
background-color: #fff; background-color: #fff;
border-radius: 2px; border-radius: 2px;
} }
.rotate { .rotate {
position: absolute; position: absolute;
transform: rotate(90deg); transform: rotate(90deg);
} }
} }
// .list { // .list {
// display: flex; // display: flex;
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
return {} return {}
}, },
computed: { computed: {
type() { type() {
console.log(this.item)
if (this.item && this.item.fieldsType == 'password' || this.item.fieldsType == 'textarea') { if (this.item && this.item.fieldsType == 'password' || this.item.fieldsType == 'textarea') {
return this.item.fieldsType return this.item.fieldsType
} else { } else {
...@@ -32,7 +31,7 @@ ...@@ -32,7 +31,7 @@
</script> </script>
<style scoped> <style scoped>
.input-item{ .input-item{
background: #F4F5F7; background: #F4F5F7;
} }
</style> </style>
<!-- ******************* 定位 ******************* --> <!-- ******************* 定位 ******************* -->
<template> <template>
<view> <view>
<view class="list u-flex u-row-between"> <view class="list u-flex u-row-between">
<image class="item-image" :src="mixingImage" v-if="item.required"></image> <image class="item-image" :src="mixingImage" v-if="item.required"></image>
<view class="u-m-r-20">{{item.fieldsTitle}}</view> <view class="u-m-r-20">{{item.fieldsTitle}}</view>
<!-- <u-button type="primary" size="mini" @click="$u.debounce(getLocation,1000)">自动定位</u-button> --> <view class="u-flex-1 location-name">
<view class="u-flex-1 location-name"> <u-icon name="map" color="#2979ff" size="30"></u-icon>自动定位
<u-icon name="map" color="#2979ff" size="30"></u-icon>自动定位 </view>
</view> </view>
</view> <view class="u-flex-1 location">{{valueTxt || '正在获取中...'}}</view>
<view class="u-flex-1 location">{{valueTxt || '正在获取中...'}}</view>
</view> </view>
</template> </template>
<script> <script>
import objMixin from './objMixin' import arrMixin from './arrMixin'
export default { export default {
name: 'XhLocation', name: 'XhLocation',
components: {}, components: {},
mixins: [objMixin], mixins: [arrMixin],
props: {}, props: {},
filters:{}, filters:{},
data() { data() {
...@@ -28,18 +27,18 @@ ...@@ -28,18 +27,18 @@
valueTxt() { valueTxt() {
let str = '' let str = ''
const dataValue = this.dataValue const dataValue = this.dataValue
if(dataValue && dataValue.length>1){ if(dataValue && dataValue.length>1){
str = '经度:'+dataValue[0].toFixed(4)+','+'纬度:'+dataValue[1].toFixed(4) str = '经度:'+dataValue[0].toFixed(4)+','+'纬度:'+dataValue[1].toFixed(4)
} }
return str return str
}, },
mixingImage() { mixingImage() {
return process.uniEnv.qn_base_url + 'mixing.png' return process.uniEnv.qn_base_url + 'mixing.png'
} }
}, },
watch: {}, watch: {},
created() { created() {
this.getLocation() this.getLocation()
}, },
methods: { methods: {
getLocation() { getLocation() {
...@@ -69,18 +68,18 @@ ...@@ -69,18 +68,18 @@
font-size: 28rpx; font-size: 28rpx;
line-height: 40rpx; line-height: 40rpx;
color: #fa3534; color: #fa3534;
} }
.item-image { .item-image {
width: 24rpx; width: 24rpx;
height: 24rpx; height: 24rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
.location-name { .location-name {
color: #2272FF; color: #2272FF;
text-align: right; text-align: right;
} }
.location { .location {
background: #F4F5F7; background: #F4F5F7;
padding: 10rpx; padding: 10rpx;
} }
</style> </style>
<!-- ******************* 单级/多级 选择 ******************* --> <!-- ******************* 服务措施 ******************* -->
<template> <template>
<view class="picker-box"> <view class="picker-box">
<view class="u-flex u-row-between" @click="openPicker"> <view class="u-flex u-row-between" @click="openPicker">
......
<!-- ******************* 单选框 ******************* --> <!-- ******************* 单选框 ******************* -->
<template> <template>
<view class="list"> <view class="list">
<view v-for="(item,index) in settings" :key="index" :class="{'txt':true,'active':item===dataValue}" <view v-for="(item,index) in settings" :key="index" :class="{'txt':true,'active':item.key===dataValue}"
@click="setValue(item)">{{item}}</view> @click="setValue(item.key)">{{item.label}}</view>
</view> </view>
</template> </template>
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
return {} return {}
}, },
computed: { computed: {
settings(){ settings(){
return this.item.settings || [] return this.item.fieldsOptions || []
} }
}, },
watch: {}, watch: {},
...@@ -33,23 +33,23 @@ ...@@ -33,23 +33,23 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.list{ .list{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.txt{ .txt{
color:#666; color:#666;
padding:10rpx 30rpx; padding:10rpx 30rpx;
margin: 5rpx; margin: 5rpx;
background: #F4F5F7; background: #F4F5F7;
border-radius: 10rpx; border-radius: 10rpx;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
line-height: 50rpx; line-height: 50rpx;
text-align: center; text-align: center;
max-width: 48%; max-width: 48%;
&.active{ &.active{
background-color: #2272FF; background-color: #2272FF;
color:#fff; color:#fff;
} }
} }
} }
</style> </style>
<!-- ******************* 单个下拉选择 ******************* --> <!-- ******************* 单个下拉选择 ******************* -->
<template> <template>
<view> <view>
<u-input v-model="dataValue" readOnly @click="show=true" type="select" /> <u-input :value="text" readOnly @click="show=true" type="select" />
<u-action-sheet :list="settings" v-model="show" @click="actionSheetCallback"></u-action-sheet> <u-action-sheet :list="settings" v-model="show" @click="actionSheetCallback"></u-action-sheet>
</view> </view>
</template> </template>
...@@ -28,22 +28,27 @@ ...@@ -28,22 +28,27 @@
}, },
settings() { settings() {
let result = [] let result = []
let settings = this.item.settings || [] let settings = this.item.fieldsOptions || []
result = settings.map(item => { result = settings.map(item => {
return { return {
text: item text: item.label,
id: item.key
} }
}) })
return result return result
},
text(){
let option = this.item.fieldsOptions.find(a=>{return a.key === this.dataValue})
return option?option.label:''
} }
}, },
watch: {}, watch: {},
mounted() {}, mounted() {},
methods: { methods: {
actionSheetCallback(index) { actionSheetCallback(index) {
let txt = this.settings[index].text; let id = this.settings[index].id;
this.dataValue = txt this.dataValue = id
this.valueChange(txt) this.valueChange(id)
} }
} }
} }
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<template> <template>
<view class="picker-box"> <view class="picker-box">
<view class="u-flex u-row-between" @click="openPicker"> <view class="u-flex u-row-between" @click="openPicker">
<view class="txt">{{item.fieldsTitle}}</view> <!-- <view class="txt">{{item.fieldsTitle}}</view> -->
<view class="txt u-flex-1">{{dataValue}}</view> <view class="txt u-flex-1">{{dataValue||'请选择时间'}}</view>
<u-icon name="arrow-right" color="#666" size="28"></u-icon> <u-icon name="arrow-right" color="#666" size="28"></u-icon>
</view> </view>
<u-picker :params="params" v-model="showPicker" mode="time" @confirm="pickerConfirm"></u-picker> <u-picker :params="params" v-model="showPicker" mode="time" @confirm="pickerConfirm"></u-picker>
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
year: true, year: true,
month: true, month: true,
day: true, day: true,
hour: true, hour: false,
minute: true, minute: false,
second: true, second: false,
// 选择时间的时间戳
timestamp: true, timestamp: true,
} }
} }
...@@ -49,11 +48,8 @@ ...@@ -49,11 +48,8 @@
this.showPicker = true this.showPicker = true
}, },
pickerConfirm(data) { pickerConfirm(data) {
console.log(data, 'DATA')
let result = [] let result = []
let dataValue = data.year + '-' + data.month + '-' + data.day + ' ' + data.hour + ':' + data.minute + let dataValue = data.year + '-' + data.month + '-' + data.day
':' + data.second
console.log(dataValue, 'dataValue')
this.dataValue = dataValue this.dataValue = dataValue
this.valueChange(dataValue) this.valueChange(dataValue)
}, },
......
<template> <template>
<view> <view>
<view class="u-wrap" v-if="!takeStatus"> <view class="u-wrap" v-if="!takeStatus">
<u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar> <u-navbar :background="{background: '#2272FF'}" back-icon-color="#fff" :title-size="26" title-color="#fff" :border-bottom="false" title="完工信息"></u-navbar>
<u-tabs-swiper ref="tabs" :current="tabIndex" :list="list" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="120"></u-tabs-swiper> <u-tabs-swiper ref="tabs" :current="tabIndex" name="panelName" :list="list" @change="tabsChange" :is-scroll="false" bg-color="#2272FF" inactive-color="#a6c6ff" active-color="#fff" height="120"></u-tabs-swiper>
<view class="u-menu-wrap"> <view class="u-menu-wrap">
<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" <scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop" :scroll-into-view="itemId" v-if="list[tabIndex].items.length > 1">
:scroll-into-view="itemId"> <view v-for="(item,index) in list[tabIndex].items" :key="index" class="u-tab-item"
<view v-for="(item,index) in groupList" :key="index" class="u-tab-item" :class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)">
:class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)"> <text class="u-line-1">{{item.name}}</text>
<text class="u-line-1">{{item.groupName}}</text> </view>
</view> </scroll-view>
</scroll-view> <scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll">
<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" <u-form :model="form" ref="uForm">
@scroll="rightScroll"> <template v-for="(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])">
<view class="class-item" :key="groupIndex">
<u-form :model="form" ref="uForm"> <view class="title">{{groupItem.name}}</view>
<template v-for="(groupItem,groupIndex) in groupList"> <view class="class-bd">
<view class="class-item" :key="groupIndex"> <u-form-item v-for="(item,itemIndex) in groupItem.items" :key="itemIndex"
<view class="title">{{groupItem.groupName}}</view> label-position="top" :prop="item.fieldsName" :border-bottom="false">
<view class="class-bd"> <view class="label" v-if="typeToComponentType(item.fieldsType)!=='location'">
<u-form-item v-for="(item,itemIndex) in groupItem.item" :key="itemIndex" <image class="item-image" :src="mixingImage" v-if="item.required"></image>
label-position="top" :prop="item.fieldsName" :border-bottom="false"> {{item.fieldsTitle}}
<view class="label" v-if="item.fieldsType!=='location'"> </view>
<!-- <text class="required" v-if="item.required">*</text> --> <template v-if="item.fieldsType">
<image class="item-image" :src="mixingImage" v-if="item.required"></image> <xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex"
{{item.fieldsTitle}} :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' @value-change="fieldValueChange">
</view> </xh-input>
<template v-if="item.fieldsType"> <xh-multi-input v-else-if="typeToComponentType(item.fieldsType)==='multiinput'"
<xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
:itemIndex="itemIndex" :item="item" @value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-input> </xh-multi-input>
<xh-multi-input v-else-if="typeToComponentType(item.fieldsType)==='multiinput'" <xh-radio v-else-if="typeToComponentType(item.fieldsType)==='radio'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-multi-input> </xh-radio>
<xh-radio v-else-if="typeToComponentType(item.fieldsType)==='radio'" <xh-checkbox v-else-if="typeToComponentType(item.fieldsType)==='checkbox'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-radio> </xh-checkbox>
<xh-checkbox v-else-if="typeToComponentType(item.fieldsType)==='checkbox'" <xh-select v-else-if="typeToComponentType(item.fieldsType)==='select'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-checkbox> </xh-select>
<xh-select v-else-if="typeToComponentType(item.fieldsType)==='select'" <xh-files v-else-if="typeToComponentType(item.fieldsType)==='file'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || []'
@value-change="fieldValueChange">
</xh-select>
<xh-files v-else-if="typeToComponentType(item.fieldsType)==='file'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item"
:files="files[itemIndex.toString()]" :files="files[itemIndex.toString()]"
@value-change="fieldValueChange" @getTakeStatus="getTakeStatus"> @value-change="fieldValueChange" @getTakeStatus="getTakeStatus">
</xh-files> </xh-files>
<xh-location v-else-if="typeToComponentType(item.fieldsType)==='location'" <xh-location v-else-if="typeToComponentType(item.fieldsType)==='location'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-location> </xh-location>
<xh-scan v-else-if="typeToComponentType(item.fieldsType)==='scan'" <xh-scan v-else-if="typeToComponentType(item.fieldsType)==='scan'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-scan> </xh-scan>
<xh-picker v-else-if="typeToComponentType(item.fieldsType)==='picker'" <xh-picker v-else-if="typeToComponentType(item.fieldsType)==='picker'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-picker> </xh-picker>
<xh-time v-else-if="typeToComponentType(item.fieldsType)==='time'" <xh-service-measure v-else-if="typeToComponentType(item.fieldsType)==='servicemeasure'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :orderId="orderId" :categoryId="categoryId"
@value-change="fieldValueChange"> :orderServiceType="orderServiceType" :specificationId="form['specificationId'] || 0" :value="form[item.fieldsName]"
</xh-time> @value-change="fieldValueChange">
</template> </xh-service-measure>
</u-form-item> <xh-time v-else-if="typeToComponentType(item.fieldsType)==='time'"
</view> :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
</view> @value-change="fieldValueChange">
</template> </xh-time>
</u-form> </template>
</scroll-view> </u-form-item>
</view> </view>
<view class="btn-wrap flex-xc"> </view>
<u-button class="btn-submit" @click="$u.debounce(nextStep, 500)" :custom-style="buttonStyle" </template>
type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'"> </u-form>
下一步 </scroll-view>
</u-button> </view>
</view> <view class="btn-wrap flex-xc">
</view> <u-button class="btn-submit" @click="nextStep" :custom-style="buttonStyle"
<take-photo v-else @close="closeTake"></take-photo> type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'">
</view> 下一步
</u-button>
</view>
</view>
<take-photo v-else @close="closeTake"></take-photo>
</view>
</template> </template>
<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 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'
import XhFiles from '@/components/createCom/XhFiles.vue' import XhFiles from '@/components/createCom/XhFiles.vue'
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 XhTime from '@/components/createCom/XhTime.vue'
import takePhoto from '@/components/take/index.vue' import takePhoto from '@/components/take/index.vue'
import XhServiceMeasure from '@/components/createCom/XhServiceMeasure.vue'
// import XhRadio from '@/components/createCom/XhRadio.vue' // import XhRadio from '@/components/createCom/XhRadio.vue'
export default { export default {
data() { data() {
return { return {
list: [ orderId:0,
{ categoryId:0,
name: '基础信息' orderServiceType:'',
}, list: [],
{ tabIndex: 0,
name: '勘察信息' scrollTop: 0, //tab标题的滚动条位置
}, oldScrollTop: 0,
{ current: 0, // 预设当前项的值
name: '安装信息' menuHeight: 0, // 左边菜单的高度
} menuItemHeight: 0, // 左边菜单item的高度
], itemId: '', // 栏目右边scroll-view用于滚动的id
tabIndex: 1, groupList: classifyData, // 基本信息、安装 、勘察(其中一项表单数据)
scrollTop: 0, //tab标题的滚动条位置 menuItemPos: [],
oldScrollTop: 0, arr: [],
current: 0, // 预设当前项的值 scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
menuHeight: 0, // 左边菜单的高度 timer: null, // 定时器
menuItemHeight: 0, // 左边菜单item的高度 form: { // 一维表单
itemId: '', // 栏目右边scroll-view用于滚动的id },
groupList: classifyData, // 基本信息、安装 、勘察(其中一项表单数据) rules: {
menuItemPos: [], name: [{
arr: [], required: true,
scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度 min: 10,
timer: null, // 定时器 message: '姓名不能为空',
form: { // 一维表单 // 可以单个或者同时写两个触发验证方式
name: 'name', trigger: ['change', 'blur'],
radio: '' }],
}, mobile: [{
rules: { required: true,
name: [{ min: 10,
required: true, message: '姓名不能为空',
min: 10, // 可以单个或者同时写两个触发验证方式
message: '姓名不能为空', trigger: ['change', 'blur'],
// 可以单个或者同时写两个触发验证方式 }, {
trigger: ['change', 'blur'], // 自定义验证函数,见上说明
}], validator: (rule, value, callback) => {
mobile: [{ // 上面有说,返回true表示校验通过,返回false表示不通过
required: true, // this.$u.test.mobile()就是返回true或者false的
min: 10, return this.$u.test.mobile(value);
message: '姓名不能为空', },
// 可以单个或者同时写两个触发验证方式 message: '手机号码不正确',
trigger: ['change', 'blur'], // 触发器可以同时用blur和change
}, { trigger: ['change', 'blur'],
// 自定义验证函数,见上说明 }]
validator: (rule, value, callback) => { },
// 上面有说,返回true表示校验通过,返回false表示不通过 submitBtnStatus: false,
// this.$u.test.mobile()就是返回true或者false的 takeStatus: false,
return this.$u.test.mobile(value); fileIndex: null,
}, files: []
message: '手机号码不正确', }
// 触发器可以同时用blur和change },
trigger: ['change', 'blur'], components: {
}] XhInput,
}, XhMultiInput,
submitBtnStatus: false, XhRadio,
takeStatus: false, XhCheckbox,
fileIndex: null, XhSelect,
files: [] XhFiles,
} XhLocation,
}, XhScan,
components: { XhPicker,
XhInput, XhTime,
XhMultiInput, XhServiceMeasure,
XhRadio, 'take-photo': takePhoto
XhCheckbox, },
XhSelect, created() {
XhFiles, // console.log(allComponents,'allComponents')
XhLocation, },
XhScan, onLoad(option) {
XhPicker, console.log(option)
XhTime, if (option) {
'take-photo': takePhoto this.orderId = option.orderId
}, this.categoryId = option.categoryId
created() { this.orderServiceType = option.orderServiceType
// console.log(allComponents,'allComponents') } else {
}, this.orderId = 9708719
onLoad() { this.categoryId = 88
this.orderServiceType = '安装'
}, }
onReady() { },
this.$refs.uForm.setRules(this.rules); onReady() {
// 导航栏滚动切换 this.$refs.uForm.setRules(this.rules);
this.getMenuItemTop() // 导航栏滚动切换
}, this.getMenuItemTop()
updated() { },
//console.log(this.form.name, 'form.name') updated() {
}, //console.log(this.form.name, 'form.name')
computed: { },
mixingImage() { computed: {
return process.uniEnv.qn_base_url + 'mixing.png' getCompleteData() {
}, let self = this
buttonStyle() { if(self.orderId){
return this.submitBtnStatus ? { self.$u.api.getCompleteConfigAndData(self.orderId).then((res) => {
'color': '#FFFFFF', if (res.code == 200) {
'background-color': '#2272FF;', self.list = res.data.config
'width': '600rpx', } else {
'height': '104rpx', console.log(res.message, "获取订单详情失败!");
'font-size': '32rpx', }
'font-weight': 'bold' });
} : { }
'color': '#FFFFFF', },
'background-color': '#D1D4D4;', mixingImage() {
'width': '600rpx', return process.uniEnv.qn_base_url + 'mixing.png'
'height': '104rpx', },
'font-size': '32rpx', buttonStyle() {
'font-weight': 'bold' return this.submitBtnStatus ? {
} 'color': '#FFFFFF',
} 'background-color': '#2272FF;',
}, 'width': '600rpx',
methods: { 'height': '104rpx',
getTakeStatus(event) { 'font-size': '32rpx',
this.takeStatus = event.status 'font-weight': 'bold'
this.fileIndex = event.index.toString() } : {
if(!this.files[event.index] || this.files[event.index].length < 1) this.files[event.index] = [] 'color': '#FFFFFF',
}, 'background-color': '#D1D4D4;',
closeTake(images) { 'width': '600rpx',
this.takeStatus = false 'height': '104rpx',
//const newFile = this.files[this.fileIndex].concat(images) 'font-size': '32rpx',
this.$set(this.files, this.fileIndex, images) 'font-weight': 'bold'
}, }
// 字段的值更新 }
fieldValueChange(data) { },
// data.groupIndex data.itemIndex值下标 data.value //值 methods: {
console.log(data, 'data') getTakeStatus(event) {
const groupItem = this.groupList[data.groupIndex] this.takeStatus = event.status
let innerItem this.fileIndex = event.index.toString()
if (groupItem.item) { if(!this.files[event.index] || this.files[event.index].length < 1) this.files[event.index] = []
innerItem = groupItem.item[data.itemIndex] },
} tabsChange(index){
console.log(data.value,'data.value',innerItem, 'innerItem') this.tabIndex = index
if(innerItem.fieldsType ==='multiInput'){ this.arr = []
// 多个输入框的值触发 this.scrollRightTop = 0;
let key = Object.keys(data.value)[0] this.current = 0;
this.form[key] = data.value[key] this.leftMenuStatus(0)
}else{
this.form[innerItem.fieldsName] = data.value
}
console.log(this.form, 'this.form')
},
nextStep(item) {
if (this.tabIndex < 3) this.tabIndex++
},
typeToComponentType(type) {
// 将fieldType类型统一转换为公共组件判定类型
let formType = ''
type = type.toLocaleLowerCase()
switch (type) {
case 'text':
case 'password':
case 'textarea':
case 'number':
formType = 'input'
break
case 'multiinput':
formType = 'multiinput'
break;
case 'select':
formType = 'select'
break
case 'radio':
formType = 'radio'
break
case 'checkbox':
formType = 'checkbox'
break
case 'file':
formType = 'file'
break
case 'location':
formType = 'location'
break
case 'scan':
formType = 'scan'
break
case 'picker':
case 'mutipicker':
formType = 'picker'
break
case 'time':
formType = 'time'
break
}
//console.log(formType,'formType')
return formType
},
// ------------------------- 以下方法为展示滚动切换 -------------------------
// 点击左边的栏目切换
async swichMenu(index) {
if (this.arr.length == 0) {
await this.getMenuItemTop();
}
if (index == this.current) return;
this.scrollRightTop = this.oldScrollTop;
this.$nextTick(function() { this.$nextTick(function() {
this.scrollRightTop = this.arr[index]; this.getMenuItemTop()
this.current = index;
this.leftMenuStatus(index);
})
},
// 获取一个目标元素的高度
getElRect(elClass, dataVal) {
new Promise((resolve, reject) => {
const query = uni.createSelectorQuery().in(this);
query.select('.' + elClass).fields({
size: true
}, res => {
// 如果节点尚未生成,res值为null,循环调用执行
if (!res) {
setTimeout(() => {
this.getElRect(elClass);
}, 10);
return;
}
this[dataVal] = res.height;
resolve();
}).exec();
})
},
// 观测元素相交状态
async observer() {
this.tabbar.map((val, index) => {
let observer = uni.createIntersectionObserver(this);
// 检测右边scroll-view的id为itemxx的元素与right-box的相交状态
// 如果跟.right-box底部相交,就动态设置左边栏目的活动状态
observer.relativeTo('.right-box', {
top: 0
}).observe('#item' + index, res => {
if (res.intersectionRatio > 0) {
let id = res.id.substring(4);
this.leftMenuStatus(id);
}
})
}) })
}, },
// 设置左边菜单的滚动状态 closeTake(images) {
async leftMenuStatus(index) { this.takeStatus = false
this.current = index; //const newFile = this.files[this.fileIndex].concat(images)
// 如果为0,意味着尚未初始化 this.$set(this.files, this.fileIndex, images)
if (this.menuHeight == 0 || this.menuItemHeight == 0) { },
await this.getElRect('menu-scroll-view', 'menuHeight'); // 字段的值更新
await this.getElRect('u-tab-item', 'menuItemHeight'); fieldValueChange(data) {
} const groupItem = this.list[this.tabIndex].items[data.groupIndex]
// 将菜单活动item垂直居中 let innerItem
this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2; if (groupItem.items) {
}, innerItem = groupItem.items[data.itemIndex]
// 获取右边菜单每个item到顶部的距离 }
getMenuItemTop() { if(innerItem.fieldsType ==='multiInput'){
new Promise(resolve => { // 多个输入框的值触发
let selectorQuery = uni.createSelectorQuery(); let key = Object.keys(data.value)[0]
selectorQuery.selectAll('.class-item').boundingClientRect((rects) => { this.form[key] = data.value[key]
// 如果节点尚未生成,rects值为[](因为用selectAll,所以返回的是数组),循环调用执行 }else{
if (!rects.length) { this.$set(this.form,innerItem.fieldsName,data.value)
setTimeout(() => { }
this.getMenuItemTop(); console.log(this.form, 'this.form')
}, 10); },
return; nextStep() {
} if (this.tabIndex < this.list.length) {
rects.forEach((rect) => { this.tabIndex++
// 这里减去rects[0].top,是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况) this.arr = []
this.arr.push(rect.top - rects[0].top); this.$nextTick(function() {
resolve(); this.getMenuItemTop()
}) })
}).exec() }
}) },
}, typeToComponentType(type) {
// 将fieldType类型统一转换为公共组件判定类型
let formType = ''
type = type.toLocaleLowerCase()
switch (type) {
case 'text':
case 'password':
case 'textarea':
case 'number':
case 'decimal':
case 'double':
formType = 'input'
break
case 'multiinput':
formType = 'multiinput'
break;
case 'select':
case 'specifications':
formType = 'select'
break
case 'radio':
formType = 'radio'
break
case 'checkbox':
formType = 'checkbox'
break
case 'file':
case 'photos':
formType = 'file'
break
case 'location':
formType = 'location'
break
case 'scan':
formType = 'scan'
break
case 'picker':
case 'mutipicker':
formType = 'picker'
break
case 'service_measures':
formType = 'servicemeasure'
break
case 'time':
case 'date':
formType = 'time'
break
}
return formType
},
// ------------------------- 以下方法为展示滚动切换 -------------------------
// 点击左边的栏目切换
async swichMenu(index) {
if (this.arr.length == 0) {
await this.getMenuItemTop();
}
if (index == this.current) return;
this.scrollRightTop = this.oldScrollTop;
this.$nextTick(function() {
this.scrollRightTop = this.arr[index];
this.current = index;
this.leftMenuStatus(index);
})
},
// 获取一个目标元素的高度
getElRect(elClass, dataVal) {
new Promise((resolve, reject) => {
const query = uni.createSelectorQuery().in(this);
query.select('.' + elClass).fields({
size: true
}, res => {
// 如果节点尚未生成,res值为null,循环调用执行
if (!res) {
setTimeout(() => {
this.getElRect(elClass);
}, 10);
return;
}
this[dataVal] = res.height;
resolve();
}).exec();
})
},
// 观测元素相交状态
async observer() {
this.tabbar.map((val, index) => {
let observer = uni.createIntersectionObserver(this);
// 检测右边scroll-view的id为itemxx的元素与right-box的相交状态
// 如果跟.right-box底部相交,就动态设置左边栏目的活动状态
observer.relativeTo('.right-box', {
top: 0
}).observe('#item' + index, res => {
if (res.intersectionRatio > 0) {
let id = res.id.substring(4);
this.leftMenuStatus(id);
}
})
})
},
// 设置左边菜单的滚动状态
async leftMenuStatus(index) {
this.current = index;
// 如果为0,意味着尚未初始化
if (this.menuHeight == 0 || this.menuItemHeight == 0) {
await this.getElRect('menu-scroll-view', 'menuHeight');
await this.getElRect('u-tab-item', 'menuItemHeight');
}
// 将菜单活动item垂直居中
this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
},
// 获取右边菜单每个item到顶部的距离
getMenuItemTop() {
new Promise(resolve => {
let selectorQuery = uni.createSelectorQuery();
selectorQuery.selectAll('.class-item').boundingClientRect((rects) => {
// 如果节点尚未生成,rects值为[](因为用selectAll,所以返回的是数组),循环调用执行
if (!rects.length) {
setTimeout(() => {
this.getMenuItemTop();
}, 10);
return;
}
rects.forEach((rect) => {
// 这里减去rects[0].top,是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
this.arr.push(rect.top - rects[0].top);
resolve();
})
}).exec()
})
},
// 右边菜单滚动 // 右边菜单滚动
async rightScroll(e) { async rightScroll(e) {
this.oldScrollTop = e.detail.scrollTop; this.oldScrollTop = e.detail.scrollTop;
if (this.arr.length == 0) { if (this.arr.length == 0) {
await this.getMenuItemTop(); await this.getMenuItemTop();
} }
if (this.timer) return; if (this.timer) return;
if (!this.menuHeight) { if (!this.menuHeight) {
await this.getElRect('menu-scroll-view', 'menuHeight'); await this.getElRect('menu-scroll-view', 'menuHeight');
} }
this.timer = setTimeout(() => { // 节流 this.timer = setTimeout(() => { // 节流
this.timer = null; this.timer = null;
// scrollHeight为右边菜单垂直中点位置 // scrollHeight为右边菜单垂直中点位置
let scrollHeight = e.detail.scrollTop + this.menuHeight / 2; let scrollHeight = e.detail.scrollTop + this.menuHeight / 2;
for (let i = 0; i < this.arr.length; i++) { for (let i = 0; i < this.arr.length; i++) {
let height1 = this.arr[i]; let height1 = this.arr[i];
let height2 = this.arr[i + 1]; let height2 = this.arr[i + 1];
// 如果不存在height2,意味着数据循环已经到了最后一个,设置左边菜单为最后一项即可 // 如果不存在height2,意味着数据循环已经到了最后一个,设置左边菜单为最后一项即可
if (!height2 || scrollHeight >= height1 && scrollHeight < height2) { if (!height2 || scrollHeight >= height1 && scrollHeight < height2) {
this.leftMenuStatus(i); this.leftMenuStatus(i);
return; return;
} }
} }
}, 10) }, 10)
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// ---------------------------- 表单样式begin ---------------------------- // ---------------------------- 表单样式begin ----------------------------
/deep/ .u-form-item { /deep/ .u-form-item {
.u-form-item__message { .u-form-item__message {
padding-left: 0 !important; padding-left: 0 !important;
} }
.u-form-item--left__content--required {
vertical-align: top;
}
}
.class-item {
padding: 50rpx;
.title {
font-weight: bold;
font-size: 32rpx;
line-height: 32rpx;
color: #333;
}
.label {
color: #333;
font-size: 28rpx;
line-height: 40rpx;
}
.u-form-item--left__content--required { .required {
vertical-align: top; padding-right: 10rpx;
} font-size: 28rpx;
} line-height: 40rpx;
color: #fa3534;
}
.class-item { .item-image {
padding: 50rpx; width: 24rpx;
.title { height: 24rpx;
font-weight: bold; margin-right: 10rpx;
font-size: 32rpx; }
line-height: 32rpx; }
color: #333;
}
.label {
color: #333;
font-size: 28rpx;
line-height: 40rpx;
}
.required { // ---------------------------- 表单样式end ----------------------------
padding-right: 10rpx;
font-size: 28rpx;
line-height: 40rpx;
color: #fa3534;
}
.item-image {
width: 24rpx;
height: 24rpx;
margin-right: 10rpx;
}
}
// ---------------------------- 表单样式end ----------------------------
.u-wrap {
height: calc(100vh);
/* #ifdef H5 */
height: calc(100vh - var(--window-top));
/* #endif */
display: flex;
flex-direction: column;
}
.u-wrap { .u-search-box {
height: calc(100vh); padding: 18rpx 30rpx;
/* #ifdef H5 */ }
height: calc(100vh - var(--window-top));
/* #endif */
display: flex;
flex-direction: column;
}
.u-search-box { .u-menu-wrap {
padding: 18rpx 30rpx; flex: 1;
} display: flex;
overflow: hidden;
}
.u-menu-wrap { .u-search-inner {
flex: 1; background-color: rgb(234, 234, 234);
display: flex; border-radius: 100rpx;
overflow: hidden; display: flex;
} align-items: center;
padding: 10rpx 16rpx;
}
.u-search-inner { .u-search-text {
background-color: rgb(234, 234, 234); font-size: 26rpx;
border-radius: 100rpx; color: $u-tips-color;
display: flex; margin-left: 10rpx;
align-items: center; }
padding: 10rpx 16rpx;
}
.u-search-text { .u-tab-view {
font-size: 26rpx; width: 200rpx;
color: $u-tips-color; height: 100%;
margin-left: 10rpx; }
}
.u-tab-view { .u-tab-item {
width: 200rpx; height: 110rpx;
height: 100%; background: #f6f6f6;
} box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
font-size: 26rpx;
color: #444;
font-weight: 400;
line-height: 1;
}
.u-tab-item { .u-tab-item-active {
height: 110rpx; position: relative;
background: #f6f6f6; color: #2272FF;
box-sizing: border-box; font-size: 30rpx;
display: flex; font-weight: 600;
align-items: center; background: #fff;
justify-content: center; }
font-size: 26rpx;
color: #444;
font-weight: 400;
line-height: 1;
}
.u-tab-item-active { // .u-tab-item-active::before {
position: relative; // content: "";
color: #2272FF; // position: absolute;
font-size: 30rpx; // border-left: 4px solid $u-type-primary;
font-weight: 600; // height: 32rpx;
background: #fff; // left: 0;
} // top: 39rpx;
// }
// .u-tab-item-active::before { .u-tab-view {
// content: ""; height: 100%;
// position: absolute; }
// border-left: 4px solid $u-type-primary;
// height: 32rpx;
// left: 0;
// top: 39rpx;
// }
.u-tab-view { .right-box {
height: 100%; background-color: rgb(250, 250, 250);
} }
.right-box { .page-view {
background-color: rgb(250, 250, 250); padding: 16rpx;
} }
.page-view { .class-item {
padding: 16rpx; margin-bottom: 30rpx;
} background-color: #fff;
padding: 16rpx;
border-radius: 8rpx;
}
.class-item { .class-item:last-child {
margin-bottom: 30rpx; min-height: 100vh;
background-color: #fff; }
padding: 16rpx;
border-radius: 8rpx;
}
.class-item:last-child { .item-title {
min-height: 100vh; font-size: 26rpx;
} color: $u-main-color;
font-weight: bold;
}
.item-title { .item-menu-name {
font-size: 26rpx; font-weight: normal;
color: $u-main-color; font-size: 24rpx;
font-weight: bold; color: $u-main-color;
} }
.item-menu-name { .item-container {
font-weight: normal; display: flex;
font-size: 24rpx; flex-wrap: wrap;
color: $u-main-color; }
}
.item-container { .thumb-box {
display: flex; width: 33.333333%;
flex-wrap: wrap; display: flex;
} align-items: center;
justify-content: center;
flex-direction: column;
margin-top: 20rpx;
}
.thumb-box { .item-menu-image {
width: 33.333333%; width: 120rpx;
display: flex; height: 120rpx;
align-items: center; }
justify-content: center;
flex-direction: column;
margin-top: 20rpx;
}
.item-menu-image { /*提交按钮*/
width: 120rpx; .btn-wrap {
height: 120rpx; width: 100%;
} padding: 20rpx 0 40rpx 0;
}
/*提交按钮*/
.btn-wrap {
width: 100%;
padding: 20rpx 0 40rpx 0;
}
</style> </style>
...@@ -377,7 +377,9 @@ ...@@ -377,7 +377,9 @@
filish(){ filish(){
// 去完工 // 去完工
uni.navigateTo({ uni.navigateTo({
url: 'pages/order/complete?orderId='+this.order.orderId url: 'pages/order/complete?orderId='+this.order.orderId
+ "&categoryId=" + this.order.categoryId
+ "&orderServiceType=" + this.order.orderServiceType
}) })
}, },
/** /**
......
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