Browse Source

底部按钮样式修改

seimin 3 years ago
parent
commit
9fc549bed0

+ 6 - 0
App.vue

@@ -117,4 +117,10 @@
117 117
   .uni-picker-action-confirm{
118 118
     color: #49b856!important;
119 119
   }
120
+  .footerPadding{
121
+    padding-bottom: 50rpx!important;
122
+  }
123
+  .footerOtherMargin{
124
+    margin-bottom: 174rpx!important;
125
+  }
120 126
 </style>

+ 2 - 2
pages/receipt_infopage/receipt_infopage.vue

@@ -1,7 +1,7 @@
1 1
 <template>
2 2
   <view class="Receipt_infopage" v-if="Object.keys(infoDATA).length > 0">
3 3
     <view class="title">工单信息</view>
4
-    <view class="page_item">
4
+    <view class="page_item footerOtherMargin">
5 5
       <view class="page_item_top">
6 6
         <view class="page_item_top_L">
7 7
           <text class="L_text">单号:{{ infoDATA.gdcode }}</text>
@@ -270,7 +270,7 @@
270 270
         </view>
271 271
       </view>
272 272
     </view>
273
-    <view class="foot_btn2">
273
+    <view class="foot_btn2 footerPadding">
274 274
       <view class="btn2" @click="showAlert" v-if="infoDATA.gdState.value == 2">接单</view>
275 275
       <!-- 如果不是静配,药配,标本配送,标本轮巡 -->
276 276
       <template

+ 2 - 2
pages/scanning/scanning.vue

@@ -1,6 +1,6 @@
1 1
 <template>
2 2
   <view class="Scanning">
3
-    <view class="Scanning_top">
3
+    <view class="Scanning_top footerOtherMargin">
4 4
       <view class="Scanning_top_icon">
5 5
         <text class="cubeic-ok icon_transport transport-duigou"></text>
6 6
       </view>
@@ -50,7 +50,7 @@
50 50
         </view>
51 51
       </view>
52 52
     </view>
53
-    <view class="foot_btn1">
53
+    <view class="foot_btn1 footerPadding">
54 54
       <view class="btn1" @click="Scanning_again()"> 继续配送 </view>
55 55
       <view
56 56
         class="btn2"

+ 3 - 4
pages/scanning_all/scanning_all.vue

@@ -74,7 +74,7 @@
74 74
           <view class="zwsj_txt">暂无工单</view>
75 75
         </view>
76 76
       </view>
77
-      <view class="page_items" v-if="workData && workData.length > 0">
77
+      <view class="page_items footerOtherMargin" v-if="workData && workData.length > 0">
78 78
         <view class="page_item" v-for="(infoDATA, i) of workData" :key="i">
79 79
           <view class="page_item_top">
80 80
             <view class="page_item_top_L">
@@ -249,12 +249,12 @@
249 249
         </view>
250 250
       </view>
251 251
 
252
-      <view class="foot_btn2" v-if="workData && workData.length > 0">
252
+      <view class="foot_btn2 footerPadding" v-if="workData && workData.length > 0">
253 253
         <view class="btn1" @click="allStart()" v-if="flag">一键操作</view>
254 254
         <view class="btn1" v-if="!flag">一键操作</view>
255 255
         <view class="btn2" @click="showAlert">知道了</view>
256 256
       </view>
257
-      <view class="foot_btn1" v-if="!workData">
257
+      <view class="foot_btn1 footerPadding" v-if="!workData">
258 258
         <view class="btn3" @click="showAlert">知道了</view>
259 259
       </view>
260 260
     </view>
@@ -939,7 +939,6 @@ export default {
939 939
 
940 940
         .page_item_cont {
941 941
           min-height: 180rpx;
942
-          max-height: 424rpx;
943 942
           padding: 0 16rpx;
944 943
           text-align: left;
945 944
           position: relative;

+ 11 - 12
pages/scanning_code/scanning_code.vue

@@ -64,7 +64,7 @@
64 64
         <text v-if="infoType == 'qt-dsd-1'">工单已完成。</text>
65 65
       </view>
66 66
     </view>
67
-    <view class="page_item">
67
+    <view class="page_item footerOtherMargin">
68 68
       <view class="page_item_top">
69 69
         <view class="page_item_top_L">
70 70
           <text class="L_text">单号:{{ infoDATA.gdcode }}</text>
@@ -265,17 +265,17 @@
265 265
       </view>
266 266
     </view>
267 267
 
268
-    <view class="foot_btn2" v-if="infoType == 'plan-spe-ddd-1' || infoType == 'spe-ddd-1'">
268
+    <view class="foot_btn2 footerPadding" v-if="infoType == 'plan-spe-ddd-1' || infoType == 'spe-ddd-1'">
269 269
       <view class="btn2" @click="Scanning_complete(dataId)">知道了</view>
270 270
     </view>
271
-    <view class="foot_btn1" v-if="
271
+    <view class="foot_btn1 footerPadding" v-if="
272 272
         (infoType == 'plan-spe-dsd-1' && infoDATA.gdState.value == '5') ||
273 273
         (infoType == 'spe-dsd-1' && infoDATA.gdState.value == '5')
274 274
       ">
275 275
       <view class="btn1" @click="Scanning_complete(dataId)">工单完成</view>
276 276
       <view class="btn2" @click="showAlert">继续配送</view>
277 277
     </view>
278
-    <view class="foot_btn1" v-if="
278
+    <view class="foot_btn1 footerPadding" v-if="
279 279
         (infoType == 'plan-spe-ddd-2' && infoDATA.gdState.value == '4') ||
280 280
         (infoType == 'spe-ddd-2' && infoDATA.gdState.value == '4')
281 281
       ">
@@ -288,7 +288,7 @@
288 288
           infoDATA.taskType.associationType.value == 'drugsBag'
289 289
         ">扫描药包</view>
290 290
     </view>
291
-    <view class="foot_btn1" v-if="
291
+    <view class="foot_btn1 footerPadding" v-if="
292 292
         (infoType == 'plan-spe-dsd-3' && infoDATA.gdState.value == '5') ||
293 293
         (infoType == 'spe-dsd-3' && infoDATA.gdState.value == '5')
294 294
       ">
@@ -302,7 +302,7 @@
302 302
         ">扫描药包</view>
303 303
       <view class="btn2" @click="Scanning_complete1(dataId)">完成工单</view>
304 304
     </view>
305
-    <view class="foot_btn2" v-if="
305
+    <view class="foot_btn2 footerPadding" v-if="
306 306
         infoType == 'plan-spe-ddd-2' ||
307 307
         infoType == 'plan-spe-dsd-2' ||
308 308
         (infoType == 'plan-spe-dsd-3' && infoDATA.gdState.value == '5') ||
@@ -312,7 +312,7 @@
312 312
       ">
313 313
       <view class="btn2" @click="Scanning_again(dataId)">继续扫描</view>
314 314
     </view>
315
-    <view class="foot_btn2" v-if="
315
+    <view class="foot_btn2 footerPadding" v-if="
316 316
         infoType == 'ins-dsd-1' ||
317 317
         infoType == 'ins-zxz-1' ||
318 318
         infoType == 'trans-dsd-1'
@@ -320,14 +320,14 @@
320 320
       <view class="btn3" @click="Scanning_again(dataId)">继续扫描患者腕带</view>
321 321
       <view class="btn3" @click="photograph(infoDATA, { DEPTCode, DEPT, infoType })">拍照</view>
322 322
     </view>
323
-    <view class="foot_btn2" v-if="
323
+    <view class="foot_btn2 footerPadding" v-if="
324 324
         infoType == 'plan-spe-ddd-1' ||
325 325
         infoType == 'spe-ddd-1' ||
326 326
         infoDATA.gdState.value == '6'
327 327
       ">
328 328
       <view class="btn2" @click="showAlert">知道了</view>
329 329
     </view>
330
-    <view class="foot_btn2" v-if="
330
+    <view class="foot_btn2 footerPadding" v-if="
331 331
         infoType == 'drug-ddd-2' ||
332 332
         infoType == 'drug-dsd-2' ||
333 333
         infoType == 'jp-ddd-2' ||
@@ -335,7 +335,7 @@
335 335
       ">
336 336
       <view class="btn2" @click="Scanning_again(dataId)">继续扫描</view>
337 337
     </view>
338
-    <view class="foot_btn2" v-if="
338
+    <view class="foot_btn2 footerPadding" v-if="
339 339
         infoType == 'drug-ddd-1' ||
340 340
         infoType == 'drug-dsd-1' ||
341 341
         infoType == 'jp-ddd-1' ||
@@ -343,7 +343,7 @@
343 343
       ">
344 344
       <view class="btn2" @click="showAlert">知道了</view>
345 345
     </view>
346
-    <view class="foot_btn2" v-if="infoType == 'qt-ddd-1' && infoDATA.gdState.value == '5'">
346
+    <view class="foot_btn2 footerPadding" v-if="infoType == 'qt-ddd-1' && infoDATA.gdState.value == '5'">
347 347
       <view class="btn2" @click="showAlert">知道了</view>
348 348
     </view>
349 349
     <!-- 弹窗 -->
@@ -913,7 +913,6 @@
913 913
 
914 914
       .page_item_cont {
915 915
         min-height: 180rpx;
916
-        max-height: 424rpx;
917 916
         padding: 0 16rpx;
918 917
         text-align: left;
919 918
         position: relative;

+ 2 - 2
pages/scanning_orderSign/scanning_orderSign.vue

@@ -8,7 +8,7 @@
8 8
         <view class="text1">工单完成</view>
9 9
       </view>
10 10
     </view>
11
-    <view class="page_item" v-for="(infoDATA, i) of infoDATAS" :key="i">
11
+    <view class="page_item footerOtherMargin" v-for="(infoDATA, i) of infoDATAS" :key="i">
12 12
       <view class="page_item_top">
13 13
         <view class="page_item_top_L">
14 14
           <text class="L_text">单号:{{ infoDATA.gdcode }}</text>
@@ -205,7 +205,7 @@
205 205
         </view>
206 206
       </view>
207 207
     </view>
208
-    <view class="foot_btn2">
208
+    <view class="foot_btn2 footerPadding">
209 209
       <view class="btn2" @click="Scanning_again()">知道了</view>
210 210
     </view>
211 211
   </view>