diff --git a/src/pages/index.wpy b/src/pages/index.wpy index 69831cc397948469112701c17aec27b4dcdd77b1..bb2520a1fc6fc51260e9d64d55655ea368f43594 100644 --- a/src/pages/index.wpy +++ b/src/pages/index.wpy @@ -138,7 +138,8 @@ wepy.page({ platformOptions: [], activeTab: 0, activeTitle: '', - platform: '' + platform: '', + requestTask: null }, computed: {}, methods: { @@ -211,12 +212,12 @@ wepy.page({ wx.getStorage({ key: 'user_info', success: (res) => { - this.userInfo = JSON.parse(res.data); - wx.showLoading({ - title: '加载中' - }); + this.userInfo = JSON.parse(res.data); + wx.showLoading({ + title: '加载中' + }); const requestURL = wx.getStorageSync('requestURL') - wx.request({ + this.requestTask = wx.request({ url: `${requestURL}/approveOpera/listUnApprove`, method: 'post', header: { @@ -266,7 +267,7 @@ wepy.page({ title: '加载中' }); const requestURL = wx.getStorageSync('requestURL') - wx.request({ + this.requestTask = wx.request({ url: `${requestURL}/approveOpera/listUnApproveAnm`, method: 'post', header: { @@ -309,6 +310,9 @@ wepy.page({ onChange(event) { this.activeTitle = event.$wx.detail.title this.orderList = [] + if (this.requestTask) { + this.requestTask.abort() + } if (event.$wx.detail.title === '试剂耗材') { this.getList() } else if (event.$wx.detail.title === '实验动物') { diff --git a/src/pages/sydwApprovePreview.wpy b/src/pages/sydwApprovePreview.wpy index 4c6d96e9e817a4e746a71ee46f08d574d2c7d1c6..bdfbf78a50d50cda69fd89694731a3bf45395de0 100644 --- a/src/pages/sydwApprovePreview.wpy +++ b/src/pages/sydwApprovePreview.wpy @@ -116,8 +116,8 @@
商品名称:{{ item.name }}
单价:{{ item.price }}元
-
{{ '品牌: '+ item.brand +';货号:'+ item.goodsNo +';品种:' + item.spec2 }}
-
{{ '规格: '+ item.spec +';等级:'+ item.grade +';年龄:' + item.old }}
+
{{ '品牌: '+ item.brand +';货号:'+ item.goodsNo +';品种:' + item.spec }}
+
{{ '规格: '+ item.spec2 +';等级:'+ item.grade +';年龄:' + item.old }}
{{ '体重: '+ item.weight +';性别:'+ item.sex }}