diff --git a/.env.prod b/.env.prod index d9ab7d57de6c66da18d99955f6861f1c361cbb9c..e1ffbafd06228d4a44a0a35f0ba3c957fc2fd9b9 100644 --- a/.env.prod +++ b/.env.prod @@ -1,4 +1,4 @@ NODE_ENV=prod VUE_APP_PATH = https://ynfymds-service.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://yaoju-service.yiboshi.com +VUE_APP_BASE_URL = https://beta-yjservice.yiboshi.com diff --git a/public/index.html b/public/index.html index 92aa4fe1b7c90005316d8a0a13675d09c70b1a34..4d5392c198e7cbbda826c7a1b4120df8fb3cac28 100644 --- a/public/index.html +++ b/public/index.html @@ -14,7 +14,7 @@ src="https://webapi.amap.com/maps?v=1.4.15&key=e8a56e9582dbac15d801174310ea43d7"></script> <script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script> <link rel="stylesheet" href="path/to/font-awesome/css/font-awesome.min.css"> -<!-- <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>--> + <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script> <title>云南省免费提供避孕药具服务平台</title> <!-- <script>--> <!-- //声明_czc对象:--> @@ -30,7 +30,7 @@ <script type="text/javascript">document.write(unescape("%3Cspan id='cnzz_stat_icon_1280549113'%3E%3C/span%3E%3Cscript src='https://v1.cnzz.com/z_stat.php%3Fid%3D1280549113%26show%3Dpic1' type='text/javascript'%3E%3C/script%3E"));</script> </body> <script> - // var vConsole =new VConsole(); - // console.log('Hello world'); + var vConsole =new VConsole(); + console.log('Hello world'); </script> </html> diff --git a/src/views/manualDistribution/manualDistribution.vue b/src/views/manualDistribution/manualDistribution.vue index 4d22e7030a3cf86045ac688e04e6139dd1c214f6..82077118dfac536011cfd55710474ec20df63c62 100644 --- a/src/views/manualDistribution/manualDistribution.vue +++ b/src/views/manualDistribution/manualDistribution.vue @@ -73,7 +73,7 @@ mounted() { let vm = this this.$nextTick(() => { - vm.$uweb.setCustomVar('', '人数', 0) + vm.$uweb.setCustomVar('微信扫码', '人数', 0) }) }, methods: { diff --git a/src/views/medicalCollection/manualCollection.vue b/src/views/medicalCollection/manualCollection.vue index 8af92e92e807dbcf4361f44beb9973b8026f57e0..e059ec64dfb7cdd1274c41921376d6b1741ebbca 100644 --- a/src/views/medicalCollection/manualCollection.vue +++ b/src/views/medicalCollection/manualCollection.vue @@ -56,6 +56,10 @@ <label class="item-left">规格</label> <label class="item-right">{{item.specs || '--'}}</label> </div> + <div class="item"> + <label class="item-left">库存数量</label> + <label class="item-right">{{item.stockNum || '0'}} {{item.receivedUnit}}</label> + </div> <div class="flex_center"> <div class="item"> <label class="item-left">已申领</label> diff --git a/src/views/myMap.vue b/src/views/myMap.vue index 8b970f570450049c8619144728412af67b17a6a2..304aee1864d5f50076b3723e424bb480fde5e9e9 100644 --- a/src/views/myMap.vue +++ b/src/views/myMap.vue @@ -65,10 +65,11 @@ let vm = this window['qrcodeContent'] = (result) => { vm.subscanQRCallBack(result) + this.$nextTick(() => { + vm.$uweb.setCustomVar('医站到家扫码', '人数', 0) + }) } - this.$nextTick(() => { - vm.$uweb.setCustomVar('医站到家', '人数', 0) - }) + }, methods: { // 接收url后的数据