From 4f9c002c8963f93376e10e58f9023ab7839e4ebc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 24 五月 2024 18:15:49 +0800
Subject: [PATCH] ‘’
---
h5/pages.json | 6 -
h5/pages/staff/vehicle/shiwai.vue | 161 ++++++++++++++++++++++++++++++++++-------------------
h5/pages/userinfo/userinfo.vue | 3 +
h5/pages/answer/answer.vue | 4 +
4 files changed, 112 insertions(+), 62 deletions(-)
diff --git a/h5/pages.json b/h5/pages.json
index efe08e6..51f2613 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -37,16 +37,14 @@
"path": "pages/userinfo/userinfo",
"style": {
"navigationBarTitleText": "涓汉淇℃伅",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
+ "enablePullDownRefresh": false
}
},
{
"path": "pages/visitorApplication/visitorApplication",
"style": {
"navigationBarTitleText": "璁垮鐢宠",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
+ "enablePullDownRefresh": false
}
},
{
diff --git a/h5/pages/answer/answer.vue b/h5/pages/answer/answer.vue
index 6673199..9b2c532 100644
--- a/h5/pages/answer/answer.vue
+++ b/h5/pages/answer/answer.vue
@@ -191,6 +191,10 @@
},
// 涓嬩竴棰�
next() {
+ uni.navigateTo({
+ url: `/pages/userinfo/userinfo?userAnswerId=${1}`
+ })
+ return
if (this.list[this.i].type === 0 || this.list[this.i].type === 1) {
if (!String(this.problemIndex)) return
if (this.list[this.i].answer === this.list[this.i].options[this.problemIndex].code) {
diff --git a/h5/pages/staff/vehicle/shiwai.vue b/h5/pages/staff/vehicle/shiwai.vue
index 82ac57d..aab042f 100644
--- a/h5/pages/staff/vehicle/shiwai.vue
+++ b/h5/pages/staff/vehicle/shiwai.vue
@@ -27,11 +27,26 @@
<view class="tit">鎮ㄧ敵璇风殑鐢ㄨ溅鏃舵宸叉湁杞﹁締棰勭害</view>
<view class="content">
<view class="card">鐨朅1212</view>
- <view class="line"><text>鐢ㄨ溅鏃舵</text><text>111111</text></view>
- <view class="line"><text>鐩殑鍦�</text><text>111111</text></view>
- <view class="line"><text>涔樿溅浜烘暟</text><text>111111</text></view>
- <view class="line"><text>鐢ㄨ溅浜嬬敱</text><text>111111</text></view>
- <view class="line"><text>鐢宠浜�</text><text>111111</text></view>
+ <view class="line">
+ <text>鐢ㄨ溅鏃舵</text>
+ <text>111111</text>
+ </view>
+ <view class="line">
+ <text>鐩殑鍦�</text>
+ <text>111111</text>
+ </view>
+ <view class="line">
+ <text>涔樿溅浜烘暟</text>
+ <text>111111</text>
+ </view>
+ <view class="line">
+ <text>鐢ㄨ溅浜嬬敱</text>
+ <text>111111</text>
+ </view>
+ <view class="line">
+ <text>鐢宠浜�</text>
+ <text>111111</text>
+ </view>
</view>
</view>
<view class="main_footer">
@@ -41,56 +56,88 @@
</view>
<!-- -->
<!-- 閫夋嫨杞﹁締 -->
- <u-picker keyName="name" :show="isShowCar" @close="isShowCar = false" :closeOnClickOverlay="true" :columns="carList" @confirm="seletedCar" @cancel="isShowCar = false"></u-picker>
- <u-picker keyName="name" :show="isShowDate" @close="isShowDate = false" :closeOnClickOverlay="true" :columns="datetimeOp" @confirm="seletedDate" @cancel="isShowDate = false"></u-picker>
+ <u-picker
+ keyName="name"
+ :show="isShowCar"
+ @close="isShowCar = false"
+ :closeOnClickOverlay="true"
+ :columns="carList"
+ @confirm="seletedCar"
+ @cancel="isShowCar = false"
+ ></u-picker>
+ <u-datetime-picker
+ mode="datetime"
+ keyName="name"
+ :show="isShowDate"
+ :filter="timeFilter"
+ @close="isShowDate = false"
+ :closeOnClickOverlay="true"
+ @confirm="seletedDate"
+ @cancel="isShowDate = false"
+ />
+ <uni-datetime-picker
+ v-model="datetimerange"
+ type="datetimerange"
+ start="2021-3-20 12:00:00"
+ end="2021-6-20 20:00:00"
+ rangeSeparator="鑷�"
+ />
</view>
</template>
<script>
- export default {
- data() {
- return {
- param: {},
- isShowCar: false,
- isShowDate: false,
- carList: [],
- datetimeOp: [],
- };
+export default {
+ data() {
+ return {
+ param: {},
+ isShowCar: false,
+ isShowDate: false,
+ carList: [],
+ datetimeOp: []
+ };
+ },
+ methods: {
+ seletedCar() {},
+ seletedDate() {
+ this.isShowDate = false;
},
- methods: {
- seletedCar() {},
- seletedDate() {},
+ timeFilter(mode, options) {
+ if (mode === 'minute') {
+ return options.filter(option => option === '00' || option === '30');
+ }
+ return options;
}
}
+};
</script>
<style lang="scss">
-.have_info{
- .tit{
- color: #ED4545;
+.have_info {
+ .tit {
+ color: #ed4545;
margin: 40rpx 0 24rpx;
}
- .content{
- background: #F7F7F7;
+ .content {
+ background: #f7f7f7;
border-radius: 16rpx;
padding: 30rpx 30rpx 10rpx;
- .card{
+ .card {
margin-bottom: 30rpx;
font-weight: 500;
font-size: 32rpx;
color: #222222;
- background: #F7F7F7;
+ background: #f7f7f7;
padding: 0;
}
- .line{
+ .line {
display: flex;
margin-bottom: 20rpx;
- text{
- &:nth-of-type(1){
+ text {
+ &:nth-of-type(1) {
width: 150rpx;
color: #888888;
}
- &:nth-of-type(2){
+ &:nth-of-type(2) {
flex: 1;
}
}
@@ -145,7 +192,7 @@
margin-top: 24rpx;
width: 120rpx;
height: 120rpx;
- border: 2rpx solid #E5E5E5;
+ border: 2rpx solid #e5e5e5;
background: #f7f7f7;
color: #666666;
font-size: 22rpx;
@@ -160,32 +207,30 @@
}
}
}
-.main_footer{
- position: absolute;
- width: 100%;
- left: 0;
- bottom: 0;
- padding: 20rpx 30rpx 84rpx;
- box-shadow: 0rpx -3rpx 6rpx 0rpx #EEEEEE;
- display: flex;
- align-items: center;
- justify-content: space-between;
- .btn{
- width: 184rpx;
- height: 72rpx;
- line-height: 72rpx;
- text-align: center;
- background: #279BAA;
- box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
- border-radius: 36rpx;
- font-size: 30rpx;
- color: #FFFFFF;
- }
- .sel{
- color: #279BAA;
- flex: 1;
- }
-
-
+.main_footer {
+ position: absolute;
+ width: 100%;
+ left: 0;
+ bottom: 0;
+ padding: 20rpx 30rpx 84rpx;
+ box-shadow: 0rpx -3rpx 6rpx 0rpx #eeeeee;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .btn {
+ width: 184rpx;
+ height: 72rpx;
+ line-height: 72rpx;
+ text-align: center;
+ background: #279baa;
+ box-shadow: 0rpx -1rpx 0rpx 0rpx #eeeeee;
+ border-radius: 36rpx;
+ font-size: 30rpx;
+ color: #ffffff;
}
+ .sel {
+ color: #279baa;
+ flex: 1;
+ }
+}
</style>
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index ea96237..b6b9a95 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/h5/pages/userinfo/userinfo.vue
@@ -138,6 +138,9 @@
methods: {
submit() {
+ uni.navigateTo({
+ url: `/pages/visitorApplication/visitorApplication?data=${JSON.stringify(this.visitorData)}`
+ });
if (!this.visitorData.name) return uni.showToast({
title: '濮撳悕涓嶈兘涓虹┖',
icon: 'none'
--
Gitblit v1.9.3