diff --git a/BagStation/orderDetail/orderDetail.vue b/BagStation/orderDetail/orderDetail.vue index 9625806..6049f7d 100644 --- a/BagStation/orderDetail/orderDetail.vue +++ b/BagStation/orderDetail/orderDetail.vue @@ -161,7 +161,7 @@ @@ -154,4 +120,8 @@ left: 0.2rem; min-width: 100%; } + + .pb30 { + padding-bottom: 30rpx; + } diff --git a/BagStation/pages/components/tki-qrcode/qrcode.js b/components/tki-qrcode/qrcode.js similarity index 100% rename from BagStation/pages/components/tki-qrcode/qrcode.js rename to components/tki-qrcode/qrcode.js diff --git a/BagStation/pages/components/tki-qrcode/tki-qrcode.vue b/components/tki-qrcode/tki-qrcode.vue similarity index 99% rename from BagStation/pages/components/tki-qrcode/tki-qrcode.vue rename to components/tki-qrcode/tki-qrcode.vue index b8e5c5a..1cf3e23 100644 --- a/BagStation/pages/components/tki-qrcode/tki-qrcode.vue +++ b/components/tki-qrcode/tki-qrcode.vue @@ -91,7 +91,6 @@ }, methods: { _makeCode() { - let that = this if (!this._empty(this.val)) { qrcode = new QRCode({ diff --git a/utils/request.js b/utils/request.js index dd7714e..96a27f2 100644 --- a/utils/request.js +++ b/utils/request.js @@ -5,10 +5,10 @@ import utils from '@/utils/encode' // const env = 'test' const env = 'production' // 45 -const testUrl = 'http://192.168.1.132:38080' -const productUrl = 'https://www.xingoil.com/adminapi' +const testUrl = 'http://192.168.1.83:38080' +// const productUrl = 'https://www.xingoil.com/adminapi' -// const productUrl = 'http://uat.xingoil.com/adminapi' +const productUrl = 'http://uat.xingoil.com/adminapi' // const productUrl = 'http://192.168.0.191:38080' // const productUrl = 'http://121.196.213.68/adminapi' const service = axios.create({