Commit bffc60d8 authored by Morson's avatar Morson

Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

parents 9afc06b1 6f9ee5b1
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
return array return array
}, },
placeholderImage() { placeholderImage() {
return process.uniEnv.qn_base_url + 'logo.png' return process.uniEnv.qn_base_url + 'morentupian.png'
}, },
customStyle() { customStyle() {
return { return {
......
<template>
<!-- 申请配件按钮 -->
<view class="apply-button" @click="handleClick">
<u-button :custom-style="customStyle" shape="circle" @click.stop="handleOperate" type="primary">
<u-icon class="apply-icon" name="plus"></u-icon>
<text class="apply-text" v-if="showText">申请配件</text>
</u-button>
</view>
</template>
<script>
export default {
props: {
type: { // 按钮宽'collapse': '80rpx', 'expand': '220rpx'
type: String,
default: 'expand'
}
},
computed: {
typeWidth() {
return {
'collapse': '80rpx',
'expand': '220rpx'
}
},
showText() {
return this.type == 'expand'
},
customStyle() {
return {
'height': '80rpx',
'width': this.typeWidth[this.type],
}
}
},
methods: {
handleClick() {
this.$emit('click')
},
}
}
</script>
<style lang="scss" scoped>
.apply-button {
.apply-icon {
font-size: 36rpx;
}
.apply-text {
font-size: 32rpx;
padding-left: 10rpx;
}
}
</style>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
return this.item.images ? process.uniEnv.systemUrl.apiUrl + this.item.images.split(',').shift() : this.placeholderImage return this.item.images ? process.uniEnv.systemUrl.apiUrl + this.item.images.split(',').shift() : this.placeholderImage
}, },
placeholderImage() { placeholderImage() {
return process.uniEnv.qn_base_url + 'logo.png' return process.uniEnv.qn_base_url + 'morentupian.png'
}, },
}, },
methods: { methods: {
......
...@@ -254,6 +254,15 @@ ...@@ -254,6 +254,15 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path": "setting/index",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "设置",
"enablePullDownRefresh": false,
"disableScroll": true
}
},
{ {
"path": "warehouse/index", "path": "warehouse/index",
"style": { "style": {
......
...@@ -6,23 +6,31 @@ ...@@ -6,23 +6,31 @@
</u-navbar> </u-navbar>
<view class="mine-content"> <view class="mine-content">
<view class="header-view"> <view class="header-view">
<view class="header-left-view">
<view class="head-image"> <view class="head-image">
<image :style="headImageStyle" :src="headImageUrl"></image> <image :style="headImageStyle" :src="headImageUrl"></image>
</view> </view>
<view class="header-content"> <view class="header-content">
<view class="name-view" @click="handleClickName">{{name || "点击登录"}}</view> <view class="name-view" @click="handleClickName">{{name || "点击登录"}}</view>
<view :class="['tel-view', {'active': mobile}]" @click="handleClickTel"> <view :class="['tel-view', {'active': mobile}]" @click="$u.throttle(handleClickTel, 500)">
<text>{{telTip}}</text> <text>{{telTip}}</text>
<u-icon class="tel-arrow-icon" name="arrow-up-fill"></u-icon> <u-icon class="tel-arrow-icon" name="arrow-up-fill"></u-icon>
</view> </view>
</view> </view>
<view v-if="showSuperButton" class="super-button"><u-button@click="handleSuperButton">切换用户</u-button></view> <view v-if="showSuperButton" class="super-button"><u-button@click="$u.throttle(handleSuperButton, 500)">切换用户</u-button></view>
</view>
<view class="header-right-view" @click="$u.throttle(handleClickSetting, 500)">
<image :src="shezhiImage" class="right-image-view"></image>
<text>设置</text>
</view>
</view> </view>
<view class="ware-house-view"> <view class="ware-house-view">
<view class="ware-house-title">我的仓库</view> <view class="ware-house-title">仓配功能</view>
<view class="ware-house-content"> <view class="ware-house-content">
<view v-for="(item, index) in warehouseItems" :key="index" class="ware-house-content-item" @click="handleClick(item.pathName)"> <view v-for="(item, index) in warehouseItems" :key="index" class="ware-house-content-item" @click="handleClick(item.pathName)">
<image :src="item.icon" class="ware-house-image"></image> <view class="ware-house-image">
<image :src="item.icon" :style="item.imageStyle"></image>
</view>
<view>{{item.title}}</view> <view>{{item.title}}</view>
</view> </view>
</view> </view>
...@@ -133,25 +141,29 @@ ...@@ -133,25 +141,29 @@
pathName: 'warehouse/index', pathName: 'warehouse/index',
title: '我的配件', title: '我的配件',
value: '', value: '',
icon: process.uniEnv.qn_base_url + 'cangku.png', icon: process.uniEnv.qn_base_url + 'wodepeijian.png',
imageStyle: 'width:60rpx;height:54rpx'
}, },
{ {
pathName: 'warehouse/spare', pathName: 'warehouse/spare',
title: '我的备件', title: '我的备件',
value: '', value: '',
icon: process.uniEnv.qn_base_url + 'cangku.png', icon: process.uniEnv.qn_base_url + 'wodebeijian.png',
imageStyle: 'width:60rpx;height:54rpx'
}, },
{ {
pathName: 'warehouse/return', pathName: 'warehouse/return',
title: '返件信息', title: '返件信息',
value: '', value: '',
icon: process.uniEnv.qn_base_url + 'cangku.png', icon: process.uniEnv.qn_base_url + 'fanjianxinxi.png',
imageStyle: 'width:56rpx;height:54rpx'
}, },
{ {
pathName: 'warehouse/records', pathName: 'warehouse/records',
title: '出入库记录', title: '出入库记录',
value: '', value: '',
icon: process.uniEnv.qn_base_url + 'cangku.png', icon: process.uniEnv.qn_base_url + 'churuku.png',
imageStyle: 'width:50rpx;height:54rpx'
}, },
] ]
}, },
...@@ -162,10 +174,13 @@ ...@@ -162,10 +174,13 @@
return this.avatar || this.placeholderImage return this.avatar || this.placeholderImage
}, },
headImageStyle() { headImageStyle() {
return this.avatar ? 'width:136rpx; height:136rpx;border-radius:68rpx' : 'width:144rpx; height:144rpx;border-radius:72rpx' return this.avatar ? 'width:112rpx; height:112rpx;border-radius:56rpx' : 'width:120rpx; height:120rpx;border-radius:60rpx'
}, },
headSize() { headSize() {
return this.avatar ? 136 : 144 return this.avatar ? 112 : 120
},
shezhiImage() {
return process.uniEnv.qn_base_url + 'shezhi.png'
} }
}, },
async onLoad() { async onLoad() {
...@@ -179,7 +194,7 @@ ...@@ -179,7 +194,7 @@
this.getData() this.getData()
} }
} }
this.wodebeijingImage = this.qnFile('wodebeijing.png') this.wodebeijingImage = this.qnFile('wodebeijing-jb.png')
this.placeholderImage = this.qnFile('touxiang.png') this.placeholderImage = this.qnFile('touxiang.png')
}, },
methods: { methods: {
...@@ -199,6 +214,9 @@ ...@@ -199,6 +214,9 @@
this.$u.route({url: "pages/login/index"}) this.$u.route({url: "pages/login/index"})
} }
}, },
handleClickSetting() {
this.$u.route({url: 'pages/mine/setting/index'})
},
handleClickName() { handleClickName() {
if(this.vuex_token && this.settled) { if(this.vuex_token && this.settled) {
return false return false
...@@ -252,16 +270,20 @@ ...@@ -252,16 +270,20 @@
.mine-content { .mine-content {
position: relative; position: relative;
padding: 30rpx; padding: 26rpx 30rpx 30rpx 20rpx;
.header-view { .header-view {
display: flex; display: flex;
align-items: center; align-items: flex-start;
justify-content: space-between;
margin-bottom: 60rpx; margin-bottom: 60rpx;
.header-left-view {
display: flex;
align-items: center;
.head-image { .head-image {
width: 144rpx; width: 120rpx;
height: 144rpx; height: 120rpx;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 72rpx; border-radius: 60rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -273,10 +295,10 @@ ...@@ -273,10 +295,10 @@
margin-left: 24rpx; margin-left: 24rpx;
.name-view { .name-view {
font-size: 44rpx; font-size: 40rpx;
font-weight: bold; font-weight: bold;
margin-bottom: 14rpx; margin-bottom: 6rpx;
margin-top: 6rpx; margin-top: -4rpx;
} }
.tel-view { .tel-view {
...@@ -306,16 +328,31 @@ ...@@ -306,16 +328,31 @@
margin-left: 20rpx; margin-left: 20rpx;
} }
} }
.header-right-view {
display: flex;
justify-content: flex-end;
align-items: center;
color: #FFFFFF;
margin-right: 4rpx;
font-size: 26rpx;
margin-top: -24rpx;
.right-image-view {
width: 34rpx;
height: 32rpx;
margin-right: 10rpx;
}
}
}
.ware-house-view { .ware-house-view {
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 12rpx; border-radius: 12rpx;
padding: 30rpx; padding: 30rpx 30rpx 40rpx 30rpx;
height: 240rpx; height: 240rpx;
.ware-house-title { .ware-house-title {
color: #333333; color: #333333;
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
margin-bottom: 12rpx; margin-bottom: 30rpx;
} }
.ware-house-content { .ware-house-content {
display: flex; display: flex;
...@@ -324,11 +361,17 @@ ...@@ -324,11 +361,17 @@
.ware-house-content-item { .ware-house-content-item {
color: #333333; color: #333333;
font-size: 26rpx; font-size: 26rpx;
text-align: center; display: flex;
justify-content: center;
flex-direction: column;
align-items: center;
.ware-house-image { .ware-house-image {
width: 60rpx; width: 60rpx;
height: 60rpx; height: 60rpx;
margin-bottom: 12rpx; margin-bottom: 14rpx;
display: flex;
justify-content: center;
align-items: center;
} }
} }
......
<template>
<!-- 设置 -->
<view class="setting-view">
<u-navbar back-icon-color="#333333" background="#FFFFFF" title="设置" titleColor="#333333"
:border-bottom="false" title-bold></u-navbar>
<view class="list-view">
<u-cell-group :border="false">
<view v-for="(item, index) in items" :key="index">
<u-cell-item :value="item.value" :border-bottom="false" @click="handleClick(item.pathName)">
<image slot="icon" :src="item.icon" :style="item.imageStyle"></image>
<view slot="title" class="item-title">{{item.title}}</view>
<view slot="value" class="item-value">{{value}}</view>
</u-cell-item>
</view>
</u-cell-group>
</view>
</view>
</template>
<script>
export default {
data() {
return {
};
},
computed: {
items() {
return [
{
pathName: 'about',
title: '当前版本',
value: process.uniEnv.version,
icon: process.uniEnv.qn_base_url + 'version.png',
imageStyle: 'width:32rpx;height:32rpx'
}
]
}
},
onLoad() {
getApp().trackPage('设置')
},
methods: {
handleClick(path) {
if(this.vuex_token) {
if (path === 'about') {
getApp().updateApp(1)
return
}
this.$u.route({
url: 'pages/mine/' + path + '/index'
})
} else {
this.$u.route({url: "pages/login/index"})
}
},
}
};
</script>
<style lang="scss" scoped>
.setting-view {
padding-bottom: 44px;
height: 100vh;
display: flex;
flex-direction: column;
background-color: #F4F5F7;
.list-view {
height: 100%;
margin-top: 30rpx;
.item-title {
font-size: 32rpx;
color: #333333;
margin-left: 16rpx;
line-height: 32rpx;
}
.item-value {
font-size: 26rpx;
color: #999999;
}
.line-view {
height: 2rpx;
background-color: #F4F5F7;
margin: 30rpx;
}
}
}
</style>
...@@ -3,22 +3,10 @@ ...@@ -3,22 +3,10 @@
<view class="ware-house"> <view class="ware-house">
<u-navbar back-icon-color="#333333" background="#FFFFFF" title="我的配件" titleColor="#333333" <u-navbar back-icon-color="#333333" background="#FFFFFF" title="我的配件" titleColor="#333333"
:border-bottom="false" title-bold></u-navbar> :border-bottom="false" title-bold></u-navbar>
<!-- <view class="tools-box">
<view class="search-sub">
<u-subsection :current="curNow" :list="subList" active-color="white" bg-color="white"
inactive-color="#666" button-color="#2272FF" bparts-radius="36" @change="sectionChange" height="72"
bold>
</u-subsection>
</view>
<u-button class="right-btn" @click="handleClickRecords" :custom-style="buttonStyle" type="primary"
shape="circle">操作记录</u-button>
</view> -->
<view class="search-view"> <view class="search-view">
<view class="search-btn" @click="handleClickSearch"> <u-search :clearabled="false" @focus="handleClickSearch" @custom="handleClickSearch" placeholder="请输入关键字" :action-style="actionStyle" placeholder-color="#999999"
<image class="search-image" mode="widthFix" :src="sousuoImage"></image> color="#333333" bg-color="#FFFFFF" height="72" search-icon-color="#999999">
<text class="search-btn-placeholder">请输入关键字</text> </u-search>
</view>
<text class="search-btn-text">搜索</text>
</view> </view>
<view class="u-tabs-box"> <view class="u-tabs-box">
<u-tabs height="66" activeColor="#2272FF" bg-color="none" inactive-color="#999" bar-height="4" <u-tabs height="66" activeColor="#2272FF" bg-color="none" inactive-color="#999" bar-height="4"
...@@ -27,13 +15,13 @@ ...@@ -27,13 +15,13 @@
</view> </view>
<view class="tab-view"> <view class="tab-view">
<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring <scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring
refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" @scroll="scroll"
:scroll-top="scrollTop" refresher-background="#F4F5F7" @refresherpulling="triggered = true" :scroll-top="scrollTop" refresher-background="#F4F5F7" @refresherpulling="triggered = true"
@refresherrefresh="onRefresh" @refresherrestore="onRestore" enable-back-to-top> @refresherrefresh="onRefresh" @refresherrestore="onRestore" enable-back-to-top>
<view class="loading-view" v-if="!loaded"> <view class="loading-view" v-if="!loaded">
<u-loading mode="flower"></u-loading> <u-loading mode="flower"></u-loading>
</view> </view>
<NoOrder v-else-if="noParts" imageName="zwdd.png" text="当前暂无配件信息" :customStyle="noPartsCustomStyle" /> <NoOrder v-else-if="noParts" imageName="wupeijianxinxi.png" text="当前暂无配件信息" :customStyle="noPartsCustomStyle" />
<template v-else> <template v-else>
<view v-for="(item, index) in partsList" :key="item.id"> <view v-for="(item, index) in partsList" :key="item.id">
<AppliedCell @operate="handleOperate" :info="item" @action="handleClickCell"></AppliedCell> <AppliedCell @operate="handleOperate" :info="item" @action="handleClickCell"></AppliedCell>
...@@ -45,28 +33,21 @@ ...@@ -45,28 +33,21 @@
</template> </template>
</scroll-view> </scroll-view>
</view> </view>
<!-- <view class="bottom-view" v-if="isReserve"> <view class="fixed-button">
<view class="selected-all-view" @click="radioChange"> <ApplyButton :type="buttonType" @click="handleClickApply"/>
<u-icon class="selected-all-icon" name="checkbox-mark" :color="radioColor"></u-icon>
<text>全选</text>
</view> </view>
<view class="right-view">
<u-button class="scd-btn" @click="handleClickRecords" :custom-style="buttonStyle" type="primary"
shape="circle">{{buttonText}}</u-button>
</view>
</view> -->
</view> </view>
</template> </template>
<script> <script>
import AppliedCell from "@/components/parts/appliedPartsCell.vue" import AppliedCell from "@/components/parts/appliedPartsCell.vue"
import NoOrder from "@/components/order/noOrder.vue" import NoOrder from "@/components/order/noOrder.vue"
import ApplyButton from "@/components/parts/applyButton.vue"
export default { export default {
components: { components: {
AppliedCell, AppliedCell,
NoOrder NoOrder,
ApplyButton
}, },
data() { data() {
return { return {
...@@ -79,6 +60,7 @@ ...@@ -79,6 +60,7 @@
triggered: false, triggered: false,
_freshing: false, _freshing: false,
selectedAll: false, selectedAll: false,
buttonType: 'expand' // 申请按钮宽 collapse': '80rpx', 'expand': '220rpx''
}; };
}, },
computed: { computed: {
...@@ -127,18 +109,13 @@ ...@@ -127,18 +109,13 @@
'width': '200rpx' 'width': '200rpx'
} }
}, },
// radioColor() { actionStyle() {
// return this.selectedAll ? '#2272FF' : 'transparent' return {
// }, 'font-size': '32rpx',
// buttonTexts() { 'color': '#2272FF',
// return [['签收', '', '取消申请', '', ''], ['退件', '']] 'margin-left': '20rpx'
// }, }
// buttonText() { },
// return this.buttonTexts[this.curNow][this.currentIndex]
// },
// isReserve() { // 选中备件仓
// return this.curNow == 1 && this.currentIndex == 0
// }
}, },
onLoad(e) { onLoad(e) {
getApp().trackPage('我的配件页') getApp().trackPage('我的配件页')
...@@ -146,10 +123,6 @@ ...@@ -146,10 +123,6 @@
this._freshing = false; this._freshing = false;
}, },
methods: { methods: {
// sectionChange(index) {
// this.curNow = index;
// this.reloadPartsList()
// },
// tab栏切换 // tab栏切换
change(index) { change(index) {
this.currentIndex = index; this.currentIndex = index;
...@@ -186,51 +159,6 @@ ...@@ -186,51 +159,6 @@
this.loaded = true this.loaded = true
}); });
}, },
// getReturnedParts(status) { // 返件列表
// this.pageNumber += 1
// this.loaded = false
// var param = {
// 'pageSize': 20,
// 'pageNumbr': 1,
// 'items': true,
// 'type': 'new'
// }
// this.$u.api.returnedParts(param).then((res) => {
// if (res.code == 200) {
// if (res.data.type != this.partsType) return
// this.triggered = false;
// this._freshing = false;
// if (this.pageNumber == 1) {
// this.partsList = []
// }
// if (res.data) {
// this.partsList.push(...res.data)
// this.loadStatus = res.data.length < this.pageSize ? 'nomore' : 'loadmore'
// }
// } else {
// console.log(res.message)
// }
// this.loaded = true
// });
// },
// getReserveList() { // 备件列表
// this.pageNumber += 1
// this.loaded = false
// this.$u.api.reserveList().then((res) => {
// if (res.code == 200) {
// if (res.data.type != this.partsType) return
// this.triggered = false
// this._freshing = false
// this.partsList = res.data || []
// this.loadStatus = 'nomore'
// } else {
// console.log(res.message);
// }
// this.loaded = true
// });
// },
handleOperate(info) { handleOperate(info) {
// 调接口 // 调接口
// 修改info的status // 修改info的status
...@@ -246,11 +174,11 @@ ...@@ -246,11 +174,11 @@
url: 'pages/mine/warehouse/partsDetail' url: 'pages/mine/warehouse/partsDetail'
}) })
}, },
// handleClickRecords() { handleClickApply() {
// uni.navigateTo({ uni.navigateTo({
// url: 'pages/mine/warehouse/records' url: 'pages/parts/application'
// }) })
// }, },
handleClickSearch() { handleClickSearch() {
uni.navigateTo({ uni.navigateTo({
url: 'pages/mine/warehouse/searchParts' url: 'pages/mine/warehouse/searchParts'
...@@ -277,10 +205,12 @@ ...@@ -277,10 +205,12 @@
this.loadStatus == 'loading' this.loadStatus == 'loading'
this.getUnstockedList(this.currentTab.status) this.getUnstockedList(this.currentTab.status)
}, },
scroll() {
this.buttonType = 'collapse'
},
} }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.ware-house { .ware-house {
padding: 0 30rpx; padding: 0 30rpx;
...@@ -288,39 +218,16 @@ ...@@ -288,39 +218,16 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.search-view { .search-view {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20rpx; margin-bottom: 20rpx;
.search-btn { margin-top: 10rpx;
height: 72rpx; /deep/ .u-search .u-content {
background-color: #ffffff;
border-radius: 36rpx;
color: #999999;
display: flex;
align-items: center;
width: 100%;
padding-left: 40rpx; padding-left: 40rpx;
.search-image {
width: 36rpx;
height: 32rpx;
flex-shrink: 0;
margin-right: 24rpx;
} }
.search-btn-placeholder { /deep/ .u-search .u-input {
line-height: 36rpx; margin: 0 20rpx;
font-weight: 400;
font-size: 26rpx;
}
} }
.search-btn-text { /deep/ .u-search .u-icon--right .u-iconfont {
line-height: 36rpx; font-size: 36rpx !important;
font-weight: 400;
font-size: 32rpx;
color: #2272FF;
width: 110rpx;
text-align: right;
} }
} }
.u-tabs-box { .u-tabs-box {
...@@ -343,36 +250,10 @@ ...@@ -343,36 +250,10 @@
} }
} }
// .tools-box { .fixed-button {
// display: flex; position: fixed;
// flex-direction: row; right: 20rpx;
// justify-content: space-between; bottom: 140rpx;
// padding-bottom: 20rpx;
// .search-sub {
// height: 72rpx;
// width: 320rpx;
// }
// }
.bottom-view {
display: flex;
justify-content: space-around;
align-items: center;
.selected-all-view {
.selected-all-icon {
border: 2rpx solid #666666;
}
}
.right-view {
display: flex;
align-items: center;
.fst-btn {
}
.scd-btn {
}
}
} }
} }
......
...@@ -6,11 +6,10 @@ ...@@ -6,11 +6,10 @@
<view class="search-view"> <view class="search-view">
<u-search v-model="keyword" :action-text="searchButtonText" @search="handleClickSearch" @clear="handleClear" <u-search v-model="keyword" :action-text="searchButtonText" @search="handleClickSearch" @clear="handleClear"
@custom="handleClickButton" placeholder="请输入关键字" :action-style="actionStyle" placeholder-color="#999999" @custom="handleClickButton" placeholder="请输入关键字" :action-style="actionStyle" placeholder-color="#999999"
color="#333333" bg-color="#FFFFFF" height="72"> color="#333333" bg-color="#FFFFFF" height="72" search-icon-color="#999999">
</u-search> </u-search>
</view> </view>
<NoOrder v-if="noParts" imageName="zwdd.png" text="当前暂无返件信息" :customStyle="noPartsCustomStyle" /> <NoOrder v-if="noParts" imageName="wupeijianxinxi.png" text="当前暂无返件信息" :customStyle="noPartsCustomStyle" />
<view v-else class="tab-view"> <view v-else class="tab-view">
<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring <scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom" scroll-anchoring
refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100"
...@@ -163,6 +162,16 @@ ...@@ -163,6 +162,16 @@
flex-direction: column; flex-direction: column;
.search-view { .search-view {
margin-bottom: 30rpx; margin-bottom: 30rpx;
margin-top: 10rpx;
/deep/ .u-search .u-content {
padding-left: 40rpx;
}
/deep/ .u-search .u-input {
margin: 0 20rpx;
}
/deep/ .u-search .u-icon--right .u-iconfont {
font-size: 36rpx !important;
}
} }
.tab-view { .tab-view {
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
} else { } else {
console.log(res.message) console.log(res.message)
} }
self.loaded = true this.loaded = true
}); });
}, },
handleOperate(type) { handleOperate(type) {
...@@ -149,7 +149,6 @@ ...@@ -149,7 +149,6 @@
padding: 10rpx 30rpx 20rpx 30rpx; padding: 10rpx 30rpx 20rpx 30rpx;
.empty-result { .empty-result {
padding-top: 354rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
<view class="search-view"> <view class="search-view">
<u-search v-model="keyword" :action-text="searchButtonText" @search="handleClickSearch" @clear="handleClear" <u-search v-model="keyword" :action-text="searchButtonText" @search="handleClickSearch" @clear="handleClear"
@custom="handleClickButton" placeholder="请输入关键字" :action-style="actionStyle" placeholder-color="#999999" @custom="handleClickButton" placeholder="请输入关键字" :action-style="actionStyle" placeholder-color="#999999"
color="#333333" bg-color="#FFFFFF" height="72"> color="#333333" bg-color="#FFFFFF" height="72" search-icon-color="#999999">
</u-search> </u-search>
</view> </view>
<NoOrder v-if="noParts" imageName="zwdd.png" text="当前暂无备件信息" :customStyle="noPartsCustomStyle" /> <NoOrder v-if="noParts" imageName="wupeijianxinxi.png" text="当前暂无备件信息" :customStyle="noPartsCustomStyle" />
<template v-else> <template v-else>
<view class="title-view"> <view class="title-view">
<view>备件列表</view> <view>备件列表</view>
...@@ -233,6 +233,16 @@ ...@@ -233,6 +233,16 @@
.search-view { .search-view {
margin-bottom: 30rpx; margin-bottom: 30rpx;
margin-top: 10rpx;
/deep/ .u-search .u-content {
padding-left: 40rpx;
}
/deep/ .u-search .u-input {
margin: 0 20rpx;
}
/deep/ .u-search .u-icon--right .u-iconfont {
font-size: 36rpx !important;
}
} }
.title-view { .title-view {
......
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