Merge branch 'jkwms' of http://47.97.1.152:5880/r/~whycq/wms-app into jkwms

whycq

2022-05-19 c86b4ccf132c985e86fb47110ed76ee2b155bbb3

 pages/basics/matSelect.vue

@@ -94,6 +94,15 @@
                  var res = result.data
                  if (res.code === 200 ) {
                     that.data = res.data
                  } else if (res.code == 403) {
                     uni.showToast({title: res.msg, icon: "none", position: 'top'})
                     setTimeout(() => {
                        uni.reLaunch({
                           url: '../login/login'
                        });
                     }, 1000);
                  } else {
                     uni.showToast({title: res.msg, icon: "none",position: 'top'})
                  }
               }
            });
@@ -101,6 +110,7 @@
         showTag(parentId) {
            let that = this
            uni.vibrateShort();
            uni.showLoading();
            uni.request({
               // url: "http://localhost:8081/jkwms/tag/list/pda/auth",
                url: that.baseHttp + that.baseIP + ':' +that.basePORT + that.baseUrl + '/tag/list/pda/auth',
@@ -113,6 +123,7 @@
                  'token':uni.getStorageSync('token'),
                },
               success(result) {
						
                  that.tag = null
                  that.data = null
                  var res = result.data
@@ -132,6 +143,7 @@
                  } else {
                     uni.showToast({title: res.msg, icon: "none",position: 'top'})
                  }
                  uni.hideLoading();
               }
            });
         },
@@ -156,7 +168,9 @@
                  var res = result.data
                  if (res.code === 200) {
                     if (res.data != null && res.data.length > 0) {
                        uni.showLoading();
                        that.data = res.data
                        uni.hideLoading();
                     } else {
                        // that.tagId = parentId
                     }
@@ -170,6 +184,7 @@
                  } else {
                     uni.showToast({title: res.msg, icon: "none",position: 'top'})
                  }
						
               }
            });
         },