| xqd
@@ -79,11 +79,11 @@ Page({
|
|
|
id: id,
|
|
|
userInfo: app.globalData.userInfo
|
|
|
})
|
|
|
- api.getByName(this, 'getUserInfo', 'userInfo', {}, function(res) {
|
|
|
+ api.getByName(this, 'getUserInfo', 'userInfo', {}, function (res) {
|
|
|
app.updateUserInfo(res);
|
|
|
});
|
|
|
var that = this;
|
|
|
- api.getByName(this, 'project-roles/getRoleAndRights', 'role', {id: id}, function() {
|
|
|
+ api.getByName(this, 'project-roles/getRoleAndRights', 'role', { id: id }, function () {
|
|
|
that.updateMenuItemShow()
|
|
|
});
|
|
|
wx.setStorageSync('sg-added-devices', [])
|
| xqd
@@ -92,7 +92,7 @@ Page({
|
|
|
requestAuth(e) {
|
|
|
wx.requestSubscribeMessage({
|
|
|
tmplIds: ['UxFg6zf47Gmha84hNzbdTJ3K0UHzcXNMPUbJQj-ivA8'],
|
|
|
- success (res) {
|
|
|
+ success(res) {
|
|
|
console.log(res)
|
|
|
}
|
|
|
})
|
| xqd
@@ -109,7 +109,7 @@ Page({
|
|
|
var role = this.data.role
|
|
|
var device_rent_menus = this.data.device_rent_menus
|
|
|
device_rent_menus[0].hidden = !(role && role.rights && role.rights.rentCreate)
|
|
|
- if(['sub', 'admin'].indexOf(role.key) != -1) {
|
|
|
+ if (['sub', 'admin'].indexOf(role.key) != -1) {
|
|
|
device_rent_menus[1].hidden = true;
|
|
|
device_rent_menus[2].hidden = true;
|
|
|
}
|
| xqd
@@ -121,13 +121,42 @@ Page({
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- navigate: function(e) {
|
|
|
+ navigate: function (e) {
|
|
|
var url = e.currentTarget.dataset.url
|
|
|
var id = this.data.id
|
|
|
- console.log(url)
|
|
|
- if(url == '/pages/device-inner/index?id=' + id) {
|
|
|
+ if (url == '/pages/device-inner/index?id=' + id) {
|
|
|
app.resetFilter();
|
|
|
}
|
|
|
+ // if (url == '/pages/order/index?type=check') {
|
|
|
+ // url = url + "&id=" + id
|
|
|
+ // }
|
|
|
+ // if (url == '/pages/order/index?index=4&type=abnormal') {
|
|
|
+ // url = url + "&id=" + id
|
|
|
+ // }
|
|
|
+ // if (url == '/pages/order-inner/index?type=check') {
|
|
|
+ // url = url + "&id=" + id
|
|
|
+ // }
|
|
|
+ // if (url == '/pages/order-inner/index?index=4&type=abnormal') {
|
|
|
+ // url = url + "&id=" + id
|
|
|
+ // }
|
|
|
+ console.log(url)
|
|
|
+ switch (url) {
|
|
|
+ case '/pages/order/index?type=check':
|
|
|
+ url = url + "&id=" + id
|
|
|
+ break;
|
|
|
+ case '/pages/order/index?index=4&type=abnormal':
|
|
|
+ url = url + "&id=" + id
|
|
|
+ break;
|
|
|
+ case '/pages/order-inner/index?type=check':
|
|
|
+ url = url + "&id=" + id
|
|
|
+ break;
|
|
|
+ case '/pages/order-inner/index?index=4&type=abnormal':
|
|
|
+ url = url + "&id=" + id
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ url = url + "?id=" + id
|
|
|
+ break;
|
|
|
+ }
|
|
|
wx.navigateTo({
|
|
|
url: url,
|
|
|
})
|
| xqd
@@ -140,8 +169,8 @@ Page({
|
|
|
data: {
|
|
|
id: this.data.id
|
|
|
},
|
|
|
- success: function(res) {
|
|
|
- if(res.code == 0) {
|
|
|
+ success: function (res) {
|
|
|
+ if (res.code == 0) {
|
|
|
that.setData({
|
|
|
project: res.data
|
|
|
})
|