环境修改

.env.dev

 NODE_ENV=dev
-VUE_APP_BASE_URL1 = https://beta-yjservice.yiboshi.com
-VUE_APP_BASE_URL = https://yaoju-service.yiboshi.com
+VUE_APP_BASE_URL = https://beta-yjservice.yiboshi.com
+VUE_APP_BASE_URL1 = https://yaoju-service.yiboshi.com

.env.prod

 NODE_ENV=prod
 VUE_APP_PATH = https://ynfymds-service.yiboshi.com
-VUE_APP_BASE_URL1 = https://yaoju-service.yiboshi.com
-VUE_APP_BASE_URL = https://beta-yjservice.yiboshi.com
+VUE_APP_BASE_URL = https://yaoju-service.yiboshi.com
+VUE_APP_BASE_URL1 = https://beta-yjservice.yiboshi.com
 VUE_APP_BASE_URL1 = https://yyyaoju-service.yyjtzc.com

src/views/choiceContraceptives.vue

@@ -32,7 +32,7 @@
                         <div class="tradeInfo" style="flex-grow: 1">
                             <div class="tradeName">{{item.medicineName}}</div>
                             <div style="margin-top: 5px;">
-                                <label style="float: left;margin-bottom: 0px">数量：{{item.stockNum}}</label>
+                                <label style="float: left;margin-bottom: 0px">数量：{{item.unit}}</label>
                                 <label style="float: right;margin-right: 15px;margin-bottom: 0px">规格：{{item.specs}}</label>
                                 <div style="clear: both"></div>
                             </div>

src/views/medicalCollection/manualCollection.vue

@@ -58,7 +58,7 @@
                         </div>
                         <div class="item">
                             <label class="item-left">库存数量</label>
-                            <label class="item-right">{{item.stockNum || '0'}} {{item.receivedUnit}}</label>
+                            <label class="item-right">{{item.unit || '0'}} </label>
                         </div>
                         <div class="flex_center">
                         <div class="item">

src/views/myMap.vue

@@ -87,16 +87,16 @@
                 window.sessionStorage.setItem('mobileTokenIno', JSON.stringify(mobileTokenIno))
             },
             ScanCode() {
-                let info = JSON.parse(window.sessionStorage.getItem('mobileTokenIno'))
-                const {phone = '', userId = ''} = info
-                let par = {telephone: phone, residentId: userId}//居民id
-                getUserReceiveNum(par).then(({data}) => {
-                    if (data.data == true) {//true 该用户非首次领取需要填写随访
-                        this.$router.push(`/returnVisit`);
-                    } else {
+                // let info = JSON.parse(window.sessionStorage.getItem('mobileTokenIno'))
+                // const {phone = '', userId = ''} = info
+                // let par = {telephone: phone, residentId: userId}//居民id
+                // getUserReceiveNum(par).then(({data}) => {
+                //     if (data.data == true) {//true 该用户非首次领取需要填写随访
+                //         this.$router.push(`/returnVisit`);
+                //     } else {
                         callMobile("qrcode", {});
-                    }
-                })
+                //     }
+                // })
                // this.subscanQRCallBack(111)
             },
             subscanQRCallBack(val) {

src/views/siteDetails.vue

@@ -43,7 +43,7 @@
                     <div class="tradeInfo">
                         <div class="tradeName">{{item.medicineName}}</div>
                         <div style="margin-top: 5px"><label
-                                style="float: left;margin-bottom: 0">数量：{{item.stockNum}}</label><label
+                                style="float: left;margin-bottom: 0">数量：{{item.unit}}</label><label
                                 style="float: right;margin-right: 15px;margin-bottom: 0">规格：{{item.specs}}</label>
                             <div style="clear: both"></div>
                         </div>