seimin 2 years ago
parent
commit
5b76fe5295
3 changed files with 4 additions and 6 deletions
  1. 1 1
      package-lock.json
  2. 1 1
      package.json
  3. 2 4
      pages/receipt_infopage/receipt_infopage.vue

+ 1 - 1
package-lock.json

@@ -11,7 +11,7 @@
11
       "dependencies": {
11
       "dependencies": {
12
         "crypto-js": "^4.1.1",
12
         "crypto-js": "^4.1.1",
13
         "spinkit": "^2.0.1",
13
         "spinkit": "^2.0.1",
14
-        "vconsole": "^3.12.1",
14
+        "vconsole": "^3.14.7",
15
         "weixin-jsapi": "^1.1.0"
15
         "weixin-jsapi": "^1.1.0"
16
       },
16
       },
17
       "devDependencies": {
17
       "devDependencies": {

+ 1 - 1
package.json

@@ -16,7 +16,7 @@
16
   "dependencies": {
16
   "dependencies": {
17
     "crypto-js": "^4.1.1",
17
     "crypto-js": "^4.1.1",
18
     "spinkit": "^2.0.1",
18
     "spinkit": "^2.0.1",
19
-    "vconsole": "^3.12.1",
19
+    "vconsole": "^3.14.7",
20
     "weixin-jsapi": "^1.1.0"
20
     "weixin-jsapi": "^1.1.0"
21
   },
21
   },
22
   "devDependencies": {
22
   "devDependencies": {

+ 2 - 4
pages/receipt_infopage/receipt_infopage.vue

@@ -210,11 +210,11 @@
210
           <text class="text"
210
           <text class="text"
211
             v-if="infoDATA.gdState.value == 5 || infoDATA.gdState.value == 6 || infoDATA.gdState.value == 7">
211
             v-if="infoDATA.gdState.value == 5 || infoDATA.gdState.value == 6 || infoDATA.gdState.value == 7">
212
             扫描接收
212
             扫描接收
213
-            <text class="page_item_info_txt">{{scanReception}}</text>
213
+            <text class="page_item_info_txt">{{infoDATA.actualReceiveNum || 0}}</text>
214
           </text>
214
           </text>
215
           <text class="text" v-if="infoDATA.gdState.value == 6 || infoDATA.gdState.value == 7">
215
           <text class="text" v-if="infoDATA.gdState.value == 6 || infoDATA.gdState.value == 7">
216
             实际送达
216
             实际送达
217
-            <text class="page_item_info_txt">{{actualDelivery}}</text>
217
+            <text class="page_item_info_txt">{{actualDelivery || 0}}</text>
218
           </text>
218
           </text>
219
         </view>
219
         </view>
220
         <view v-for="spe in infoDATA.specimenSet" :key="spe.id" class="spe_list">
220
         <view v-for="spe in infoDATA.specimenSet" :key="spe.id" class="spe_list">
@@ -363,7 +363,6 @@
363
   export default {
363
   export default {
364
     data() {
364
     data() {
365
       return {
365
       return {
366
-        scanReception: 0,
367
         actualDelivery: 0,
366
         actualDelivery: 0,
368
         currentUserId: 0,
367
         currentUserId: 0,
369
         // 弹窗model
368
         // 弹窗model
@@ -635,7 +634,6 @@
635
           uni.hideLoading();
634
           uni.hideLoading();
636
           if (res.state == 200) {
635
           if (res.state == 200) {
637
             this.actualDelivery = res.actualDelivery;
636
             this.actualDelivery = res.actualDelivery;
638
-            this.scanReception = res.scanReception;
639
             this.infoDATA = res.data;
637
             this.infoDATA = res.data;
640
             // 计算高度
638
             // 计算高度
641
             setTimeout(() => {
639
             setTimeout(() => {