Skip to content

S
self-support
Commit fafdd87f authored by 李超鹏's avatar 李超鹏
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 2ec0da18 04f81d4d
Show whitespace changes
Inline Side-by-side
Showing with 95 additions and 34 deletions
src/components/createCom/XhFiles.vue
View file @ fafdd87f
...@@ -7,14 +7,14 @@ ...@@ -7,14 +7,14 @@
</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" :border-radius="10" @click.stop="prviewImage(item.path,index)"></u-image> <u-image class="pic" width="160" height="160" :src="item.path" :border-radius="10" @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"> <view class="img-list">
<u-image class="pic" width="170rpx" height="170rpx" :border-radius="10" @click="selectUpload" :src="uploadImage"></u-image> <u-image class="pic" width="160rpx" height="160rpx" :border-radius="10" @click="selectUpload" :src="uploadImage"></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>
...@@ -143,8 +143,8 @@ ...@@ -143,8 +143,8 @@
.img-list { .img-list {
position: relative; position: relative;
margin: 8rpx; margin: 8rpx;
width: 170rpx; width: 160rpx;
height: 170rpx; height: 160rpx;
.pic{ .pic{
// margin-right: 15rpx; // margin-right: 15rpx;
......
src/components/createCom/XhInput.vue
View file @ fafdd87f
<!-- ******************* 输入框 ******************* --> <!-- ******************* 输入框 ******************* -->
<template> <template>
<view> <view>
<u-input :type="type" class="input-item" v-model="dataValue" @input="valueChange" :placeholder="placeholder" placeholder-style="placeholderStyle" <u-input :type="type" class="input-item" v-model="dataValue" @input="valueChange" :placeholder="placeholder" :placeholder-style="placeholderStyle"
custom-style="customStyle"/> :custom-style="customStyle" :clearable="false"/>
</view> </view>
</template> </template>
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
placeholder: { placeholder: {
type: String, type: String,
default: '请输入' default: '请输入'
},
width: { // 例如：454rpx
type: String,
default: '100%'
} }
}, },
data() { data() {
...@@ -30,13 +34,16 @@ ...@@ -30,13 +34,16 @@
} }
}, },
placeholderStyle() { placeholderStyle() {
return 'color:#FFFFFF;font-size:26rpx' return 'color:#999999;font-size:26rpx'
}, },
customStyle() { customStyle() {
return { return {
'background-color': '#F4F5F7', 'background-color': '#F4F5F7',
'border-radius': '12rpx', 'border-radius': '12rpx',
'color': '#ff0000' 'color': '#333333',
'padding-left': '20rpx',
'width': this.width,
'font-size':'26rpx'
} }
} }
}, },
......
src/components/createCom/XhLocation.vue
View file @ fafdd87f
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
} }
.location { .location {
background: #F4F5F7; background: #F4F5F7;
padding: 10rpx; padding: 10rpx 20rpx;
border-radius: 12rpx;
} }
</style> </style>
src/components/createCom/XhSelect.vue
View file @ fafdd87f
<!-- ******************* 单个下拉选择 ******************* --> <!-- ******************* 单个下拉选择 ******************* -->
<template> <template>
<view> <view class="xh-select">
<u-input :value="text" readOnly @click="show=true" type="select" /> <u-input :value="text" readOnly @click="show=true" :placeholder="placeholder" :placeholder-style="placeholderStyle"
<u-action-sheet :list="settings" v-model="show" @click="actionSheetCallback"></u-action-sheet> :custom-style="customStyle" :clearable="false"></u-input>
<u-action-sheet :list="settings" v-model="show" @click="actionSheetCallback" safe-area-inset-bottom></u-action-sheet>
<u-icon class="input-icon" :name="show ? 'arrow-up' : 'arrow-down'"></u-icon>
</view> </view>
</template> </template>
...@@ -12,7 +15,16 @@ ...@@ -12,7 +15,16 @@
name: 'XhSelect', name: 'XhSelect',
components: {}, components: {},
mixins: [stringMixin], mixins: [stringMixin],
props: {}, props: {
placeholder: {
type: String,
default: '请选择'
},
width: { // 例如：454rpx
type: String,
default: '100%'
}
},
data() { data() {
return { return {
show: false show: false
...@@ -32,7 +44,9 @@ ...@@ -32,7 +44,9 @@
result = settings.map(item => { result = settings.map(item => {
return { return {
text: item.label, text: item.label,
id: item.key id: item.key,
color: '#333333',
fontSize: 26
} }
}) })
return result return result
...@@ -40,6 +54,20 @@ ...@@ -40,6 +54,20 @@
text(){ text(){
let option = this.item.fieldsOptions.find(a=>{return a.key === this.dataValue}) let option = this.item.fieldsOptions.find(a=>{return a.key === this.dataValue})
return option?option.label:'' return option?option.label:''
},
placeholderStyle() {
return 'color:#999999;font-size:26rpx'
},
customStyle() {
return {
'background-color': '#F4F5F7',
'border-radius': '12rpx',
'color': '#333333',
'padding-left': '20rpx',
'padding-right': '60rpx',
'width': this.width,
'font-size':'26rpx'
}
} }
}, },
watch: {}, watch: {},
...@@ -54,5 +82,15 @@ ...@@ -54,5 +82,15 @@
} }
</script> </script>
<style> <style lang="scss" scoped>
.xh-select {
position: relative;
.input-icon {
position: absolute;
right: 20rpx;
top: 20rpx;
color: #2272FF;
}
}
</style> </style>
src/pages/order/complete.vue
View file @ fafdd87f
...@@ -76,14 +76,14 @@ ...@@ -76,14 +76,14 @@
</u-form> </u-form>
</scroll-view> </scroll-view>
</view> </view>
<view class="btn-wrap flex-xc"> <view class="btn-wrap flex-xc btn-bottom">
<u-button class="btn-submit" @click="saveComplete" <u-button class="btn-submit" @click="saveComplete"
type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'"> type="primary" shape="circle" :custom-style="customStyle" :hover-class="submitStatus ? '' : 'none'">
暂存 暂存
</u-button> </u-button>
<u-button class="btn-submit" @click="orderFinish" v-if="tabIndex===list.length - 1" <u-button class="btn-submit" @click="orderFinish" v-if="tabIndex===list.length - 1"
type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'"> type="primary" shape="circle" :custom-style="buttonStyle" :hover-class="submitStatus ? '' : 'none'">
交付 完工
</u-button> </u-button>
<u-button class="btn-submit" @click="nextStep" :custom-style="buttonStyle" v-else <u-button class="btn-submit" @click="nextStep" :custom-style="buttonStyle" v-else
type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'"> type="primary" shape="circle" :hover-class="submitStatus ? '' : 'none'">
...@@ -212,20 +212,34 @@ ...@@ -212,20 +212,34 @@
return this.submitBtnStatus ? { return this.submitBtnStatus ? {
'color': '#FFFFFF', 'color': '#FFFFFF',
'background-color': '#2272FF;', 'background-color': '#2272FF;',
'width': '600rpx', 'width': '300rpx',
'height': '104rpx', 'height': '104rpx',
'font-size': '32rpx', 'font-size': '32rpx',
'font-weight': 'bold' 'font-weight': 'bold',
'margin-left': '50rpx'
} : { } : {
'color': '#FFFFFF', 'color': '#FFFFFF',
'background-color': '#D1D4D4;', 'background-color': '#D1D4D4;',
'width': '600rpx', 'width': '300rpx',
'height': '104rpx', 'height': '104rpx',
'font-size': '32rpx', 'font-size': '32rpx',
'font-weight': 'bold' 'font-weight': 'bold',
'margin-left': '50rpx'
} }
},
customStyle() {
return {
'background-color': '#D1D4D4',
'width': '300rpx',
'height': '104rpx',
'background-color': 'transparent',
'border': '1px solid #2272FF',
'color': '#2272FF',
'font-weight': 'bold',
'font-size': '32rpx',
} }
}, },
},
methods: { methods: {
getCompleteData() {//获取工单配置的完工项目 getCompleteData() {//获取工单配置的完工项目
let self = this let self = this
...@@ -501,10 +515,8 @@ ...@@ -501,10 +515,8 @@
} }
.class-item { .class-item {
padding: 50rpx;
margin-bottom: 30rpx;
background-color: #fff; background-color: #fff;
padding: 30rpx; padding: 28rpx;
border-radius: 8rpx; border-radius: 8rpx;
.title { .title {
font-weight: bold; font-weight: bold;
...@@ -576,17 +588,18 @@ ...@@ -576,17 +588,18 @@
.u-tab-view { .u-tab-view {
width: 200rpx; width: 200rpx;
height: 100%; height: 100%;
border: 4rpx solid #F4F5F7;
} }
.u-tab-item { .u-tab-item {
height: 110rpx; height: 110rpx;
background: #f6f6f6; background: #fff;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 26rpx; font-size: 26rpx;
color: #444; color: #333333;
font-weight: 400; font-weight: 400;
line-height: 1; line-height: 1;
} }
...@@ -594,8 +607,6 @@ ...@@ -594,8 +607,6 @@
.u-tab-item-active { .u-tab-item-active {
position: relative; position: relative;
color: #2272FF; color: #2272FF;
font-size: 30rpx;
font-weight: 600;
background: #fff; background: #fff;
} }
...@@ -656,9 +667,13 @@ ...@@ -656,9 +667,13 @@
} }
/*提交按钮*/ /*提交按钮*/
.btn-bottom {
border: 2rpx solid #F4F5F7;
}
.btn-wrap { .btn-wrap {
width: 100%; width: 100%;
padding: 20rpx 0 40rpx 0; padding: 20rpx 0 44rpx 0;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
......
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