Compare commits

..

No commits in common. "7d7827e4807c728fcbc55fc7376ff16a8cc12ac7" and "62de281c22450d1a14bd97b92e41874e24c037a8" have entirely different histories.

20 changed files with 26 additions and 42 deletions

View File

@ -1,4 +1,6 @@
ENV = 'test'
VUE_APP_BASE_API = ''
VUE_APP_BASE_API = 'http://lcny.sk797.cn/h5/'

View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title></title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel="stylesheet" href="/static/index.97465e7b.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.959091ef.js"></script><script src="/static/js/index.1458fb13.js"></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel="stylesheet" href="/static/index.97465e7b.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.959091ef.js"></script><script src="/static/js/index.0de2b65b.js"></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -510,9 +510,8 @@ export default {
}
uni.showToast({ title: data.message, icon: 'none' })
})
.catch(({data}) => {
.catch(() => {
hideLoading()
this.$u.toast(data.message)
})
} else {
delete params['id']
@ -528,9 +527,8 @@ export default {
uni.showToast({ title: data.message, icon: 'none' })
}
})
.catch(({data}) => {
.catch(() => {
hideLoading()
this.$u.toast(data.message)
})
}
},

View File

@ -454,11 +454,9 @@
}
uni.showToast({ title: data.message, icon: 'none' });
}).catch(()=>{
hideLoading();
})
.catch(({data}) => {
hideLoading()
this.$u.toast(data.message)
})
}else{
delete params['id'];
this.$http.post(`/api/rice-shrimp-industries`,params).then(({data})=>{
@ -470,11 +468,9 @@
}else{
uni.showToast({ title: data.message, icon: 'none' });
}
}).catch(()=>{
hideLoading();
})
.catch(({data}) => {
hideLoading()
this.$u.toast(data.message)
})
}
},

View File

@ -524,11 +524,9 @@
}
uni.showToast({ title: data.message, icon: 'none' });
}).catch(()=>{
hideLoading()
})
.catch(({data}) => {
hideLoading()
this.$u.toast(data.message)
})
}else{
delete params['id'];
this.$http.post(`/api/materiels`,params).then(({data})=>{
@ -540,11 +538,9 @@
}else{
uni.showToast({ title: data.message, icon: 'none' });
}
}).catch(()=>{
hideLoading()
})
.catch(({data}) => {
hideLoading()
this.$u.toast(data.message)
})
}
},

View File

@ -440,7 +440,6 @@ export default {
this.$http
.get('/api/rice-shrimp-prices', { params: params })
.then(({ data }) => {
console.log("===~~===");
console.log(data)
this.screenShow = false
if (refresh) {
@ -457,14 +456,11 @@ export default {
if (this.list.length >= data.meta.total) {
this.loading = 'nomore'
}
}else{
console.log(data);
}
})
.catch((e) => {
.catch(() => {
this.loading = 'loadmore'
this.screenShow = false
console.log(e);
})
},
//
@ -486,9 +482,8 @@ export default {
}
uni.showToast({ title: data.message, icon: 'none' })
})
.catch(({data}) => {
.catch(() => {
hideLoading()
this.$u.toast(data.message)
})
} else {
delete params['id']
@ -504,9 +499,8 @@ export default {
uni.showToast({ title: data.message, icon: 'none' })
}
})
.catch(({data}) => {
.catch(() => {
hideLoading()
this.$u.toast(data.message)
})
}
},

View File

@ -459,9 +459,8 @@ export default {
}
uni.showToast({ title: data.message, icon: 'none' })
})
.catch(({data}) => {
.catch(() => {
hideLoading()
this.$u.toast(data.message)
})
} else {
delete params['id']
@ -477,9 +476,8 @@ export default {
uni.showToast({ title: data.message, icon: 'none' })
}
})
.catch(({data}) => {
.catch(() => {
hideLoading()
this.$u.toast(data.message)
})
}
},

View File

@ -25,7 +25,7 @@
</view>
<view class="p-list clamp">
<view class="txt">{{userInfo.department?userInfo.department:'——'}}</view>
<view class="tit">部门</view>
<view class="tit">角色</view>
</view>
</view>
</view>