seimin vor 1 Jahr
Ursprung
Commit
8729c322aa

+ 9 - 3
components/bigScreen/bigScreen.vue

@@ -417,9 +417,15 @@
417 417
                         }
418 418
                       }
419 419
                     } else {
420
-                      uni.navigateTo({
421
-                        url: `../scanning_Result/scanning_Result?status=${res.status}&msg=${res.msg}&qrcode=${this.currentCode}`,
422
-                      });
420
+                      if(res.bigScanSpecialMsg){
421
+                        uni.navigateTo({
422
+                          url: `../scanning_Result/scanning_Result?status=${res.status}&msg=${res.msg}&qrcode=${this.currentCode}&bigScanSpecialMsg=${encodeURIComponent(JSON.stringify(res.bigScanSpecialMsg))}`,
423
+                        });
424
+                      }else{
425
+                        uni.navigateTo({
426
+                          url: `../scanning_Result/scanning_Result?status=${res.status}&msg=${res.msg}&qrcode=${this.currentCode}`,
427
+                        });
428
+                      }
423 429
                     }
424 430
                   });
425 431
               } else {

+ 2 - 0
pages/blood_list/blood_list.vue

@@ -90,6 +90,8 @@
90 90
     padding-top: 50rpx;
91 91
     height: 100%;
92 92
     box-sizing: border-box;
93
+    display: flex;
94
+    flex-direction: column;
93 95
 
94 96
     .pharmacyDetails_title {
95 97
       font-size: 46rpx;

+ 30 - 1
pages/scanning_Result/scanning_Result.vue

@@ -28,10 +28,14 @@
28 28
       <view class="Scanning_top_icon">
29 29
         <text class="cubeic-close icon_transport transport-shibai"></text>
30 30
       </view>
31
-      <view class="Scanning_top_text">
31
+      <view class="Scanning_top_text" v-if="!queryObj.bigScanSpecialMsg">
32 32
         <view class="text1"> 操作失败 </view>
33 33
         <view class="text1 f30" v-if="queryObj.qrcode !== undefined"> 扫描内容:{{queryObj.qrcode}} </view>
34 34
       </view>
35
+      <view class="Scanning_top_text" v-if="queryObj.bigScanSpecialMsg">
36
+        <view class="text1"> 签到失败 </view>
37
+        <view class="text1 f30" v-if="queryObj.qrcode !== undefined"> 扫描内容:{{queryObj.qrcode}} </view>
38
+      </view>
35 39
     </view>
36 40
 
37 41
     <view class="Scanning_cont" v-if="
@@ -126,6 +130,12 @@
126 130
     <view class="Scanning_cont" v-if="res.status != 200">
127 131
       <view class="Scanning_cont_center" v-if="res.status != 11111">
128 132
         {{ res.msg === "undefined" || !res.msg ? "" : res.msg }}
133
+        <view class="bigScanSpecialMsg" v-if="queryObj.bigScanSpecialMsg">
134
+          <view class="bigScanSpecialMsgList" v-for="item in queryObj.bigScanSpecialMsg" :key="item.id">
135
+            <view class="bigScanSpecialMsgListTitle">{{item.name}}</view>
136
+            <view class="bigScanSpecialMsgListDesc">{{item.desc}}</view>
137
+          </view>
138
+        </view>
129 139
       </view>
130 140
     </view>
131 141
     <view class="foot_btn_spe" v-if="
@@ -879,6 +889,9 @@
879 889
       }
880 890
       console.log(options, "result");
881 891
       this.queryObj = options;
892
+      if(this.queryObj.bigScanSpecialMsg){
893
+        this.queryObj.bigScanSpecialMsg = JSON.parse( this.queryObj.bigScanSpecialMsg);
894
+      }
882 895
       this.isKs = this.queryObj.isKs;
883 896
       if (options.infoData && options.infoData != "undefined") {
884 897
         this.infoDATA = JSON.parse(options.infoData);
@@ -924,6 +937,22 @@
924 937
 <style lang="less">
925 938
   .Scanning_Result {
926 939
     padding: 0 20rpx;
940
+    
941
+    .bigScanSpecialMsg{
942
+      text-align: left;
943
+      padding: 0 87rpx;
944
+      .bigScanSpecialMsgList{
945
+        margin-top: 50rpx;
946
+        font-size: 32rpx;
947
+        .bigScanSpecialMsgListTitle{
948
+          color: red;
949
+        }
950
+        .bigScanSpecialMsgListDesc{
951
+          line-height: 48rpx;
952
+          margin-top: 15rpx;
953
+        }
954
+      }
955
+    }
927 956
 
928 957
     .Scanning_top {
929 958
       .Scanning_top_icon {