suojin
/
transport_integrated_app
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui调整

Browse Source
main
张群 2 years ago
parent 8e1497d81f
commit 2402e62426
8 changed files with 43 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      pages/highWay/runData/form.vue
  2. 4
      pages/highWay/runData/list.vue
  3. 6
      pages/highWay/runStatusData/form.vue
  4. 4
      pages/highWay/runStatusData/list.vue
  5. 6
      pages/login/login.vue
  6. 18
      pages/railway/railwayRunData/list.vue
  7. 4
      pages/railway/runStatus/list.vue
  8. 5
      util/request.js

22
pages/highWay/runData/form.vue
Unescape View File

@ -79,11 +79,19 @@
</view> </view>
<!-- 用户权限收费站 --> <!-- 用户权限收费站 -->
<view class="station_box"> <view class="station_box">
<view :style="(index+1)%2 == 0 ? 'margin-right:20rpx;margin-left:20rpx;' : ''" @click="changeStationIndex(index)" class="station_item" :class="[item.isFinish ? 'active' : '',index == stationIndex ? 'choosed' : '']" v-for="(item, index) in highwaySubDataList" :key="item.id"> <view v-if="index < 9" :style="(index+1)%3 == 0 ? 'margin-right:0;':''" @click="changeStationIndex(index)" class="station_item" :class="[item.isFinish ? 'active' : '',index == stationIndex ? 'choosed' : '']" v-for="(item, index) in highwaySubDataList" :key="item.id">
<view v-if='item.isFinish' class="tag"><uni-icons type="checkmarkempty" color="#fff" size="12"></uni-icons></view>
{{item.stationName}}
</view>
<view v-if="index >= 9" :style="(index+1)%3 == 0 ? 'margin-right:0;':''" @click="changeStationIndex(index)" class="station_item" :class="[item.isFinish ? 'active' : '',index == stationIndex ? 'choosed' : '']" v-for="(item, index) in highwaySubDataList" :key="item.id">
<view v-if='item.isFinish' class="tag"><uni-icons type="checkmarkempty" color="#fff" size="12"></uni-icons></view> <view v-if='item.isFinish' class="tag"><uni-icons type="checkmarkempty" color="#fff" size="12"></uni-icons></view>
{{item.stationName}} {{item.stationName}}
</view> </view>
</view> </view>
<view v-if="highwaySubDataList.length > 9" class="station_act" @click="showStaion = !showStaion">
<uni-icons v-if="!showStaion" type="bottom" size="14" color="#2D8CF0" style="margin-right:10rpx;"></uni-icons>
<uni-icons v-if="showStaion" type="top" size="14" color="#2D8CF0" style="margin-right:10rpx;"></uni-icons>
{{showStaion?'收起':'展开'}}</view>
<view class="form_item_box"> <view class="form_item_box">
<view class="form_item"> <view class="form_item">
<view class="form_item_label">收费站名称：</view> <view class="form_item_label">收费站名称：</view>
@ -197,6 +205,7 @@
index: 2, //时段选择,默认0-24 index: 2, //时段选择,默认0-24
userInfo: {}, userInfo: {},
yoyMom: {},//同比环比 yoyMom: {},//同比环比
showStaion: false,//展开收起
} }
}, },
onLoad(options) { onLoad(options) {
@ -547,6 +556,12 @@
} }
//收费站 //收费站
.station_act{
color: #2D8CF0;
font-size: 24rpx;
text-align: center;
margin-bottom: 30rpx;
}
.station_box { .station_box {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -568,6 +583,7 @@
border: 1rpx solid #C1C1C1; border: 1rpx solid #C1C1C1;
text-align: center; text-align: center;
margin-bottom: 30rpx; margin-bottom: 30rpx;
margin-right: 16rpx;
&.active { &.active {
position: relative; position: relative;
@ -588,8 +604,8 @@
text-align: center; text-align: center;
} }
} }
&.choose{ &.choosed{
border-color: #2D8CF0; border-color: #2D8CF0 !important;
} }
} }
} }

4
pages/highWay/runData/list.vue
Unescape View File

@ -35,7 +35,7 @@
<view class="picker_select"> <view class="picker_select">
<picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel"> <picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel">
<text class="unselect_txt" <text class="unselect_txt"
:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text> :style="index?'color:#333;':''">{{index?array[index].dictLabel:'请选择时段'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons> <uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
</picker> </picker>
</view> </view>
@ -119,7 +119,7 @@
statDateEnd: '', statDateEnd: '',
statPeriod: '' statPeriod: ''
}; };
this.index = -1; this.index = '';
}, },
//查询 //查询
showSearch() { showSearch() {

6
pages/highWay/runStatusData/form.vue
Unescape View File

@ -397,9 +397,9 @@
"yhdw": "", "yhdw": "",
"zyds": 0 "zyds": 0
}] }]
// this.$request(getApp().globalData.baseUrl + '/api/biz/roadInfo/all?page=0&pageSize=-1&_t=' + Date.parse(new Date()), {}, 'GET').then(res => { this.$request(getApp().globalData.baseUrl + '/api/biz/roadInfo/all?page=0&pageSize=-1&_t=' + Date.parse(new Date()), {}, 'GET').then(res => {
// this.highwayDataList = res.data.list; this.highwayDataList = res.data.list;
// }) })
}, },
//高速公路切换选择 //高速公路切换选择
changeHighway(e, key, index) { changeHighway(e, key, index) {

4
pages/highWay/runStatusData/list.vue
Unescape View File

@ -36,7 +36,7 @@
<view class="picker_select"> <view class="picker_select">
<picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel"> <picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel">
<text class="unselect_txt" <text class="unselect_txt"
:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text> :style="index?'color:#333;':''">{{index?array[index].dictLabel:'请选择时段'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons> <uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
</picker> </picker>
</view> </view>
@ -120,7 +120,7 @@
statDateEnd: '', statDateEnd: '',
statPeriod: '' statPeriod: ''
}; };
this.index = -1; this.index = '';
}, },
//查询 //查询
showSearch() { showSearch() {

6
pages/login/login.vue
Unescape View File

@ -13,7 +13,7 @@
<uni-easyinput placeholderStyle="color:#c8c8c8;font-size:24rpx;" v-model="form.verCode" placeholder="请输入图形验证码" maxlength="20"></uni-easyinput> <uni-easyinput placeholderStyle="color:#c8c8c8;font-size:24rpx;" v-model="form.verCode" placeholder="请输入图形验证码" maxlength="20"></uni-easyinput>
<image :src="codeImg" @click="getVerCode" style="width: 180rpx; height:59rpx;"></image> <image :src="codeImg" @click="getVerCode" style="width: 180rpx; height:59rpx;"></image>
</view> </view>
<button type="primary" class="page-body-button" @click="doLogin">登录</button> <view type="primary" class="login_btn" @click="doLogin">登录</view>
</view> </view>
</view> </view>
</template> </template>
@ -46,6 +46,7 @@
}, },
//登录 //登录
doLogin() { doLogin() {
console.log('login',this.form)
if(this.form.username == '' || this.form.password == '') { if(this.form.username == '' || this.form.password == '') {
uni.showToast({ uni.showToast({
title: '用户名密码不能为空', title: '用户名密码不能为空',
@ -161,13 +162,14 @@
} }
} }
} }
button { .login_btn {
background-color: #2D8CF0; background-color: #2D8CF0;
color: #ffffff; color: #ffffff;
font-size: 28rpx; font-size: 28rpx;
line-height: 90rpx; line-height: 90rpx;
font-family: PingFang SC-Regular, PingFang SC; font-family: PingFang SC-Regular, PingFang SC;
border-radius: 100rpx; border-radius: 100rpx;
text-align: center;
margin: 70rpx auto 107rpx; margin: 70rpx auto 107rpx;
} }
</style> </style>

18
pages/railway/railwayRunData/list.vue
Unescape View File

@ -11,8 +11,8 @@
:contentText="contentText"></uni-load-more> :contentText="contentText"></uni-load-more>
<!-- 筛选 --> <!-- 筛选 -->
<view class="foot_btn_box"> <view class="foot_btn_box">
<view @click="goPage('/pages/railway/railwayRunData/form?type=add')" class="act_btn"><uni-icons type="plusempty" <!-- <view @click="goPage('/pages/railway/railwayRunData/form?type=add')" class="act_btn"><uni-icons type="plusempty"
size="18" color="#fff" style="margin-right: 9rpx;"></uni-icons>新建</view> size="18" color="#fff" style="margin-right: 9rpx;"></uni-icons>新建</view> -->
<view @click="showSearch" class="act_btn btn1"><uni-icons type="search" size="18" color="#2D8CF0" <view @click="showSearch" class="act_btn btn1"><uni-icons type="search" size="18" color="#2D8CF0"
style="margin-right: 9rpx;"></uni-icons>查询 style="margin-right: 9rpx;"></uni-icons>查询
</view> </view>
@ -33,10 +33,10 @@
</view> </view>
<view class="cont_tit picker"> <view class="cont_tit picker">
<view>统计时段</view> <view>统计时段</view>
<view class="picker_select"> <view>
<picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel"> <picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel">
<text class="unselect_txt" <text class="picker_select"
:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text> :style="index?'color:#333;':''">{{index?array[index].dictLabel:'请选择时段'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons> <uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
</picker> </picker>
</view> </view>
@ -120,7 +120,7 @@
statDateEnd: '', statDateEnd: '',
statPeriod: '' statPeriod: ''
}; };
this.index = -1; this.index = '';
}, },
//查询 //查询
showSearch() { showSearch() {
@ -308,13 +308,11 @@
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
display: flex;
justify-content: space-around;
background-color: #F8F8F8; background-color: #F8F8F8;
padding-bottom: 20px; padding: 20px 30rpx;
.act_btn { .act_btn {
width: 329rpx; width: 690rpx;
height: 90rpx; height: 90rpx;
line-height: 88rpx; line-height: 88rpx;
display: flex; display: flex;

4
pages/railway/runStatus/list.vue
Unescape View File

@ -36,7 +36,7 @@
<view class="picker_select"> <view class="picker_select">
<picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel"> <picker @change="bindPickerChange" :value="index" :range="array" range-key="dictLabel">
<text class="unselect_txt" <text class="unselect_txt"
:style="index>-1?'color:#333;':''">{{index>-1?array[index].dictLabel:'请选择时段'}}</text> :style="index?'color:#333;':''">{{index?array[index].dictLabel:'请选择时段'}}</text>
<uni-icons type="right" size="16" color="#D4D4D4"></uni-icons> <uni-icons type="right" size="16" color="#D4D4D4"></uni-icons>
</picker> </picker>
</view> </view>
@ -120,7 +120,7 @@
statDateEnd: '', statDateEnd: '',
statPeriod: '' statPeriod: ''
}; };
this.index = -1; this.index = '';
}, },
//查询 //查询
showSearch() { showSearch() {

5
util/request.js
Unescape View File

@ -18,7 +18,7 @@ const request = (url, data, method = 'GET') => {
if (res.statusCode == 200) { if (res.statusCode == 200) {
if (res.data.code == 200 || res.data.code == "" || res.data.status == 200) { if (res.data.code == 200 || res.data.code == "" || res.data.status == 200) {
resolve(res.data) resolve(res.data)
} else if (res.data.code == 401) { } else if (res.data.code == 20011) {
uni.removeStorageSync("satoken") uni.removeStorageSync("satoken")
uni.navigateTo({ uni.navigateTo({
url: '/pages/login/login' url: '/pages/login/login'
@ -27,7 +27,8 @@ const request = (url, data, method = 'GET') => {
resolve(res.data) resolve(res.data)
uni.showToast({ uni.showToast({
title: res.data.msg, title: res.data.msg,
icon: "none" icon: "none",
duration: 2000
}) })
} }
} else { } else {

Write Preview
Loading…
Cancel
Save