Commit 755ce1c7993d411798bcb85d2939480bb042d8c1
1 parent
a438ef27
修改
Showing
6 changed files
with
151 additions
and
72 deletions
components/TabBar/TabBar.vue
| 1 | 1 | <template> |
| 2 | 2 | <view class="page-total"> |
| 3 | 3 | <view class="tab-list"> |
| 4 | + <!-- 普通用户 --> | |
| 4 | 5 | <view class="list" v-for="(item,index) in TabBarList" v-if="qxshow" |
| 5 | 6 | @click="onTabBar(item,item.index)" |
| 6 | 7 | :key="index"> |
| ... | ... | @@ -8,8 +9,16 @@ |
| 8 | 9 | <image :src="item.img" mode="widthFix" v-show="tabBarShow != item.index"></image> |
| 9 | 10 | <text :class="{'action':tabBarShow===item.index}">{{item.name}}</text> |
| 10 | 11 | </view> |
| 11 | - | |
| 12 | - <view class="list" v-for="(item,index) in TabBarList1" v-if="!qxshow" | |
| 12 | + <!-- 司机收敛工 --> | |
| 13 | + <view class="list" v-for="(item,index) in TabBarList1" v-if="sjshow" | |
| 14 | + @click="onTabBar(item,item.index)" | |
| 15 | + :key="index"> | |
| 16 | + <image :src="item.acImg" mode="widthFix" v-show="tabBarShow === item.index"></image> | |
| 17 | + <image :src="item.img" mode="widthFix" v-show="tabBarShow != item.index"></image> | |
| 18 | + <text :class="{'action':tabBarShow===item.index}">{{item.name}}</text> | |
| 19 | + </view> | |
| 20 | + <!-- 登记底部 --> | |
| 21 | + <view class="list" v-for="(item,index) in TabBarList2" v-if="ddshow" | |
| 13 | 22 | @click="onTabBar(item,item.index)" |
| 14 | 23 | :key="index"> |
| 15 | 24 | <image :src="item.acImg" mode="widthFix" v-show="tabBarShow === item.index"></image> |
| ... | ... | @@ -46,10 +55,26 @@ |
| 46 | 55 | acImg: '/static/tabBar/tab_08.png' |
| 47 | 56 | } |
| 48 | 57 | ], |
| 58 | + TabBarList2:[ | |
| 59 | + // { | |
| 60 | + // index: 3, | |
| 61 | + // name: '我的', | |
| 62 | + // img: '/static/tabBar/tab_07.png', | |
| 63 | + // acImg: '/static/tabBar/tab_08.png' | |
| 64 | + // }, | |
| 65 | + { | |
| 66 | + index: 4, | |
| 67 | + name: '报丧登记', | |
| 68 | + img: '/static/tabBar/tab_07.png', | |
| 69 | + acImg: '/static/tabBar/tab_08.png' | |
| 70 | + } | |
| 71 | + ], | |
| 49 | 72 | codeheight: 0, |
| 50 | 73 | isOverall: 0, |
| 51 | 74 | phoneModel: '', |
| 52 | 75 | qxshow:true, |
| 76 | + ddshow:false, | |
| 77 | + sjshow:false | |
| 53 | 78 | }; |
| 54 | 79 | }, |
| 55 | 80 | props:{ |
| ... | ... | @@ -61,11 +86,20 @@ |
| 61 | 86 | mounted() { |
| 62 | 87 | try { |
| 63 | 88 | console.log("角色",uni.getStorageSync('userjs')); |
| 64 | - if(uni.getStorageSync('userjs') != '普通用户'){ | |
| 65 | - this.qxshow = false | |
| 89 | + if(uni.getStorageSync('userjs') != '普通用户' && uni.getStorageSync('userjs') != '调度员'){ | |
| 90 | + this.sjshow = true | |
| 91 | + }else{ | |
| 92 | + this.sjshow = false | |
| 66 | 93 | } |
| 67 | 94 | if(uni.getStorageSync('userjs') == '普通用户'){ |
| 68 | 95 | this.qxshow = true |
| 96 | + }else{ | |
| 97 | + this.qxshow = false | |
| 98 | + } | |
| 99 | + if(uni.getStorageSync('userjs') == '调度员'){ | |
| 100 | + this.ddshow = true | |
| 101 | + }else{ | |
| 102 | + this.ddshow = false | |
| 69 | 103 | } |
| 70 | 104 | const res = uni.getSystemInfoSync(); |
| 71 | 105 | let that = this; |
| ... | ... | @@ -118,6 +152,14 @@ |
| 118 | 152 | url:'/pages/my/my' |
| 119 | 153 | }) |
| 120 | 154 | break; |
| 155 | + case 4: | |
| 156 | + uni.navigateTo({ | |
| 157 | + url:'/pages/funeralreport/funeralreport' | |
| 158 | + }) | |
| 159 | + // wx.switchTab({ | |
| 160 | + // url:'/pages/funeralreport/funeralreport' | |
| 161 | + // }) | |
| 162 | + break; | |
| 121 | 163 | } |
| 122 | 164 | } |
| 123 | 165 | } | ... | ... |
pages/hcxx/hcxx.scss
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | } |
| 5 | 5 | .content { |
| 6 | 6 | width: 100%; |
| 7 | + position: relative; | |
| 7 | 8 | } |
| 8 | 9 | /* 订单列表 */ |
| 9 | 10 | .order-list{ |
| ... | ... | @@ -14,7 +15,11 @@ |
| 14 | 15 | min-height: 400rpx; |
| 15 | 16 | background-color: #FFFFFF; |
| 16 | 17 | border-radius: 20rpx; |
| 18 | + // border-top-left-radius: 20rpx; | |
| 19 | + // border-top-right-radius: 20rpx; | |
| 17 | 20 | margin: 25rpx; |
| 21 | + border: 1px solid #d4d5d8; | |
| 22 | + // padding-bottom: 10rpx; | |
| 18 | 23 | .title-status{ |
| 19 | 24 | display: flex; |
| 20 | 25 | align-items: center; |
| ... | ... | @@ -24,6 +29,8 @@ |
| 24 | 29 | .title{ |
| 25 | 30 | display: flex; |
| 26 | 31 | align-items: center; |
| 32 | + width: 800rpx; | |
| 33 | + // border: 1px solid red; | |
| 27 | 34 | text{ |
| 28 | 35 | font-size: 26rpx; |
| 29 | 36 | color: #A7A7A7; |
| ... | ... | @@ -61,7 +68,7 @@ |
| 61 | 68 | font-size: 26rpx; |
| 62 | 69 | color: #A7A7A7; |
| 63 | 70 | .goods-name-title { |
| 64 | - font-size: 30rpx; | |
| 71 | + font-size: 27rpx; | |
| 65 | 72 | color: #3d3d3d; |
| 66 | 73 | font-weight: bold; |
| 67 | 74 | margin-bottom: 40rpx; | ... | ... |
pages/hcxx/hcxx.vue
| 1 | 1 | <template> |
| 2 | - <view class="page"> | |
| 3 | - <pyh-nv ref="nv" :config="nvConfig"></pyh-nv> | |
| 2 | + <view class="page" style="position: relative;"> | |
| 3 | + <!-- <pyh-nv ref="nv" :config="nvConfig"></pyh-nv> --> | |
| 4 | 4 | <view class="listBox" :style="{'padding-top':(pageTop+'px')}"> |
| 5 | 5 | <view class="content"> |
| 6 | - <view class="order-tab"> | |
| 7 | - <view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)"> | |
| 8 | - <text>接运中</text> | |
| 9 | - <text class="line"></text> | |
| 10 | - </view> | |
| 11 | - <view class="tab" :class="{'action':OrderType==1}" @click="onOrderTab(1)"> | |
| 12 | - <text>已完成</text> | |
| 13 | - <text class="line"></text> | |
| 14 | - </view> | |
| 15 | - </view> | |
| 16 | - <!-- 订单列表 --> | |
| 17 | - <view class="order-list" style="margin-top: 110rpx;"> | |
| 18 | - <view class="list" v-for="(item,index) in list" @click="onOrderList" :key="index"> | |
| 19 | - <view class="title-status"> | |
| 20 | - <view class="title"> | |
| 21 | - <text>逝者编号：{{item.funeralCallWebDeathInfoPo.orderNumber}}</text> | |
| 22 | - <image src="../../static/right1.png"></image> | |
| 23 | - </view> | |
| 6 | + <view class="order-tab"> | |
| 7 | + <view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)"> | |
| 8 | + <text>接运中</text> | |
| 9 | + <text class="line"></text> | |
| 10 | + </view> | |
| 11 | + <view class="tab" :class="{'action':OrderType==1}" @click="onOrderTab(1)"> | |
| 12 | + <text>已完成</text> | |
| 13 | + <text class="line"></text> | |
| 24 | 14 | </view> |
| 25 | - <view class="goods-list"> | |
| 26 | - <view class="goods"> | |
| 27 | - <view class="item"> | |
| 28 | - <view class="goods-name"> | |
| 29 | - <view class="goods-name-title">逝者姓名：{{item.funeralCallWebDeathInfoPo.deceasedName}}</view> | |
| 30 | - <view class="goods-name-title">联系电话：{{item.funeralCallWebDeathInfoPo.contactPhone}}</view> | |
| 31 | - <view class="goods-name-title">逝者地址：{{item.funeralCallWebDeathInfoPo.accessLocation}}</view> | |
| 32 | - <view>报丧时间：{{item.funeralCallWebDeathInfoPo.createdTime}}</view> | |
| 15 | + </view> | |
| 16 | + <!-- 订单列表 --> | |
| 17 | + <view class="order-list" style="margin-top: -50rpx;max-height: 59vh;overflow: scroll;"> | |
| 18 | + <view class="list" v-for="(item,index) in list" @click="onOrderList" :key="index"> | |
| 19 | + <view class="title-status"> | |
| 20 | + <view class="title"> | |
| 21 | + <text>报丧编号：{{item.funeralCallWebDeathInfoPo.orderNumber}}</text> | |
| 22 | + <image src="../../static/right1.png"></image> | |
| 23 | + </view> | |
| 24 | + <view class="status-btn" v-if="OrderType == 1"> | |
| 25 | + <view><text class="red"></text><text class="red big"></text></view> | |
| 26 | + <view class="btn"> | |
| 27 | + <image src="../../static/btn.png" mode="widthFix"></image> | |
| 28 | + <text>已回车</text> | |
| 33 | 29 | </view> |
| 34 | 30 | </view> |
| 35 | 31 | </view> |
| 36 | - </view> | |
| 37 | - <view class="status-btn" v-if="OrderType == 0"> | |
| 38 | - <view><text class="red"></text><text class="red big"></text></view> | |
| 39 | - <view class="btn" @click="tz(item)"> | |
| 40 | - <image src="../../static/btn.png" mode="widthFix"></image> | |
| 41 | - <text>查看详情</text> | |
| 32 | + <view class="goods-list"> | |
| 33 | + <view class="goods"> | |
| 34 | + <view class="item"> | |
| 35 | + <view class="goods-name"> | |
| 36 | + <view class="goods-name-title">逝者姓名：{{item.funeralCallWebDeathInfoPo.deceasedName}}</view> | |
| 37 | + <view class="goods-name-title">联系电话：{{item.funeralCallWebDeathInfoPo.contactPhone}}</view> | |
| 38 | + <view class="goods-name-title">逝者地址：{{item.funeralCallWebDeathInfoPo.accessLocation}}</view> | |
| 39 | + <view>报丧时间：{{item.funeralCallWebDeathInfoPo.createdTime}}</view> | |
| 40 | + </view> | |
| 41 | + </view> | |
| 42 | + </view> | |
| 42 | 43 | </view> |
| 43 | - </view> | |
| 44 | - <view class="status-btn" v-if="OrderType == 1"> | |
| 45 | - <view><text class="red"></text><text class="red big"></text></view> | |
| 46 | - <view class="btn"> | |
| 47 | - <image src="../../static/btn.png" mode="widthFix"></image> | |
| 48 | - <text>已回车</text> | |
| 44 | + <view class="status-btn" v-if="OrderType == 0"> | |
| 45 | + <view><text class="red"></text><text class="red big"></text></view> | |
| 46 | + <view class="btn" @click="tz(item)"> | |
| 47 | + <image src="../../static/btn.png" mode="widthFix"></image> | |
| 48 | + <text>查看详情</text> | |
| 49 | + </view> | |
| 49 | 50 | </view> |
| 51 | + | |
| 50 | 52 | </view> |
| 51 | 53 | </view> |
| 52 | - </view> | |
| 53 | - </view> | |
| 54 | + </view> | |
| 54 | 55 | </view> |
| 55 | 56 | </view> |
| 56 | 57 | </template> |
| ... | ... | @@ -79,6 +80,10 @@ |
| 79 | 80 | this.OrderType = 0; |
| 80 | 81 | this.carddxx(); |
| 81 | 82 | }, |
| 83 | + mounted() { | |
| 84 | + this.OrderType = 0; | |
| 85 | + this.carddxx(); | |
| 86 | + }, | |
| 82 | 87 | methods:{ |
| 83 | 88 | // 获取调度信息 |
| 84 | 89 | carddxx(){ |
| ... | ... | @@ -155,16 +160,19 @@ |
| 155 | 160 | /* 订单tab */ |
| 156 | 161 | .order-tab{ |
| 157 | 162 | position: fixed; |
| 163 | + position: absolute; | |
| 158 | 164 | left: 0; |
| 159 | - top: 88rpx; | |
| 165 | + top: 0; | |
| 166 | + margin-top: -7vh; | |
| 160 | 167 | /* #ifdef MP-WEIXIN */ |
| 161 | - top: calc(100rpx + var(--status-bar-height)); | |
| 168 | + // top: calc(100rpx + var(--status-bar-height)); | |
| 162 | 169 | /* #endif */ |
| 163 | 170 | z-index: 10; |
| 164 | 171 | display: flex; |
| 165 | 172 | align-items: center; |
| 166 | 173 | width: 100%; |
| 167 | 174 | height: 100rpx; |
| 175 | + // border: 1px solid red; | |
| 168 | 176 | background-color: #FFFFFF; |
| 169 | 177 | .tab{ |
| 170 | 178 | position: relative; | ... | ... |
pages/my/my.vue
| ... | ... | @@ -19,13 +19,20 @@ |
| 19 | 19 | <view class="rank"> |
| 20 | 20 | <image src="../../static/id.png"></image> |
| 21 | 21 | <text>{{user.userId}}</text> |
| 22 | - <!-- <image class="rank-img" src="../../static/copy.png"></image> --> | |
| 23 | 22 | </view> |
| 24 | 23 | </view> |
| 25 | 24 | </view> |
| 26 | 25 | </view> |
| 27 | 26 | <view class="message-list"> |
| 28 | - <view class="titleall-box"> | |
| 27 | + <!-- 司机列表 --> | |
| 28 | + <view class="" v-if="sjshow"> | |
| 29 | + <hcxx v-if="sjshow"></hcxx> | |
| 30 | + </view> | |
| 31 | + <!-- 收敛工列表 --> | |
| 32 | + <view class="" v-if="slgshow"> | |
| 33 | + <slgxx v-if="slgshow"></slgxx> | |
| 34 | + </view> | |
| 35 | + <view class="titleall-box" v-if="!sjshow && !slgshow"> | |
| 29 | 36 | <view class="titleall-left"><view class="titleall-left-line"></view>我的服务</view> |
| 30 | 37 | </view> |
| 31 | 38 | <view class="list" @click="mydeath" v-if="ptyhshow || ddyshow"> |
| ... | ... | @@ -73,7 +80,7 @@ |
| 73 | 80 | <text class="iconfont icon-more"></text> |
| 74 | 81 | </view> |
| 75 | 82 | </view> |
| 76 | - <view class="list" @click="hcxx" v-if="sjshow"> | |
| 83 | + <!-- <view class="list" @click="hcxx" v-if="sjshow"> | |
| 77 | 84 | <view class="icon-data"> |
| 78 | 85 | <view class="icon"> |
| 79 | 86 | <image src="/static/my-icon6.png" mode=""></image> |
| ... | ... | @@ -87,8 +94,9 @@ |
| 87 | 94 | <view class="more"> |
| 88 | 95 | <text class="iconfont icon-more"></text> |
| 89 | 96 | </view> |
| 90 | - </view> | |
| 91 | - <view class="list" @click="slgxx" v-if="slgshow"> | |
| 97 | + </view> --> | |
| 98 | + | |
| 99 | + <!-- <view class="list" @click="slgxx" v-if="slgshow"> | |
| 92 | 100 | <view class="icon-data"> |
| 93 | 101 | <view class="icon"> |
| 94 | 102 | <image src="/static/my-icon6.png" mode=""></image> |
| ... | ... | @@ -102,8 +110,8 @@ |
| 102 | 110 | <view class="more"> |
| 103 | 111 | <text class="iconfont icon-more"></text> |
| 104 | 112 | </view> |
| 105 | - </view> | |
| 106 | - <view class="list" @click="dhbs" v-if="ddyshow"> | |
| 113 | + </view> --> | |
| 114 | + <!-- <view class="list" @click="dhbs" v-if="ddyshow"> | |
| 107 | 115 | <view class="icon-data"> |
| 108 | 116 | <view class="icon"> |
| 109 | 117 | <image src="/static/my-icon6.png" mode=""></image> |
| ... | ... | @@ -117,7 +125,7 @@ |
| 117 | 125 | <view class="more"> |
| 118 | 126 | <text class="iconfont icon-more"></text> |
| 119 | 127 | </view> |
| 120 | - </view> | |
| 128 | + </view> --> | |
| 121 | 129 | </view> |
| 122 | 130 | </view> |
| 123 | 131 | </view> |
| ... | ... | @@ -128,9 +136,14 @@ |
| 128 | 136 | |
| 129 | 137 | <script> |
| 130 | 138 | import TabBar from '../../components/TabBar/TabBar.vue'; |
| 139 | + import hcxx from '../hcxx/hcxx.vue' | |
| 140 | + // url: '/pages/slgxx/slgxx' | |
| 141 | + import slgxx from '../slgxx/slgxx.vue' | |
| 131 | 142 | export default { |
| 132 | 143 | components: { |
| 133 | - TabBar | |
| 144 | + TabBar, | |
| 145 | + hcxx, | |
| 146 | + slgxx | |
| 134 | 147 | }, |
| 135 | 148 | data() { |
| 136 | 149 | return { | ... | ... |
pages/slgxx/slgxx.scss
| ... | ... | @@ -15,6 +15,7 @@ |
| 15 | 15 | background-color: #FFFFFF; |
| 16 | 16 | border-radius: 20rpx; |
| 17 | 17 | margin: 25rpx; |
| 18 | + border: 1px solid #d4d5d8; | |
| 18 | 19 | .title-status{ |
| 19 | 20 | display: flex; |
| 20 | 21 | align-items: center; |
| ... | ... | @@ -24,6 +25,7 @@ |
| 24 | 25 | .title{ |
| 25 | 26 | display: flex; |
| 26 | 27 | align-items: center; |
| 28 | + width: 800rpx; | |
| 27 | 29 | text{ |
| 28 | 30 | font-size: 26rpx; |
| 29 | 31 | color: #A7A7A7; |
| ... | ... | @@ -61,7 +63,7 @@ |
| 61 | 63 | font-size: 26rpx; |
| 62 | 64 | color: #A7A7A7; |
| 63 | 65 | .goods-name-title { |
| 64 | - font-size: 30rpx; | |
| 66 | + font-size: 27rpx; | |
| 65 | 67 | color: #3d3d3d; |
| 66 | 68 | font-weight: bold; |
| 67 | 69 | margin-bottom: 40rpx; | ... | ... |
pages/slgxx/slgxx.vue
| 1 | 1 | <template> |
| 2 | - <view class="page"> | |
| 3 | - <pyh-nv ref="nv" :config="nvConfig"></pyh-nv> | |
| 2 | + <view class="page" style="position: relative;"> | |
| 3 | + <!-- <pyh-nv ref="nv" :config="nvConfig"></pyh-nv> --> | |
| 4 | 4 | <view class="listBox" :style="{'padding-top':(pageTop+'px')}"> |
| 5 | 5 | <view class="content"> |
| 6 | 6 | <view class="order-tab"> |
| 7 | 7 | <view class="tab" :class="{'action':OrderType==0}" @click="onOrderTab(0)"> |
| 8 | - <text>派遣中</text> | |
| 8 | + <text>待确认</text> | |
| 9 | 9 | <text class="line"></text> |
| 10 | 10 | </view> |
| 11 | 11 | <view class="tab" :class="{'action':OrderType==1}" @click="onOrderTab(1)"> |
| 12 | - <text>已完成</text> | |
| 12 | + <text>已确认</text> | |
| 13 | 13 | <text class="line"></text> |
| 14 | 14 | </view> |
| 15 | 15 | </view> |
| 16 | 16 | <!-- 订单列表 --> |
| 17 | - <view class="order-list" style="margin-top: 110rpx;"> | |
| 17 | + <view class="order-list" style="margin-top: -50rpx;max-height: 59vh;overflow: scroll;"> | |
| 18 | 18 | <view class="list" v-for="(item,index) in list" @click="onOrderList" :key="index"> |
| 19 | 19 | <view class="title-status"> |
| 20 | 20 | <view class="title"> |
| 21 | 21 | <text>逝者编号：{{item.funeralCallWebDeathInfoPo.orderNumber}}</text> |
| 22 | 22 | <image src="../../static/right1.png"></image> |
| 23 | 23 | </view> |
| 24 | + <view class="status-btn" v-if="OrderType == 1"> | |
| 25 | + <view><text class="red"></text><text class="red big"></text></view> | |
| 26 | + <view class="btn"> | |
| 27 | + <image src="../../static/btn.png" mode="widthFix"></image> | |
| 28 | + <text>已确认</text> | |
| 29 | + </view> | |
| 30 | + </view> | |
| 24 | 31 | </view> |
| 25 | 32 | <view class="goods-list"> |
| 26 | 33 | <view class="goods"> |
| ... | ... | @@ -41,13 +48,7 @@ |
| 41 | 48 | <text>查看详情</text> |
| 42 | 49 | </view> |
| 43 | 50 | </view> |
| 44 | - <view class="status-btn" v-if="OrderType == 1"> | |
| 45 | - <view><text class="red"></text><text class="red big"></text></view> | |
| 46 | - <view class="btn"> | |
| 47 | - <image src="../../static/btn.png" mode="widthFix"></image> | |
| 48 | - <text>已确认</text> | |
| 49 | - </view> | |
| 50 | - </view> | |
| 51 | + | |
| 51 | 52 | </view> |
| 52 | 53 | </view> |
| 53 | 54 | </view> |
| ... | ... | @@ -79,6 +80,10 @@ |
| 79 | 80 | this.OrderType = 0; |
| 80 | 81 | this.pqslgdd(); |
| 81 | 82 | }, |
| 83 | + mounted() { | |
| 84 | + this.OrderType = 0; | |
| 85 | + this.pqslgdd(); | |
| 86 | + }, | |
| 82 | 87 | methods:{ |
| 83 | 88 | // 获取调度信息 |
| 84 | 89 | pqslgdd(){ |
| ... | ... | @@ -155,8 +160,10 @@ |
| 155 | 160 | /* 订单tab */ |
| 156 | 161 | .order-tab{ |
| 157 | 162 | position: fixed; |
| 163 | + position: absolute; | |
| 158 | 164 | left: 0; |
| 159 | - top: 88rpx; | |
| 165 | + top: 0; | |
| 166 | + margin-top: -7vh; | |
| 160 | 167 | /* #ifdef MP-WEIXIN */ |
| 161 | 168 | top: calc(100rpx + var(--status-bar-height)); |
| 162 | 169 | /* #endif */ | ... | ... |