diff --git a/pages/index.vue b/pages/index.vue
index 54afae5..407ec16 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -93,7 +93,7 @@
客流统计
-
+
@@ -210,6 +210,7 @@ export default {
orgId:'',
custNum:'',
},
+ showYJ:false,
canteenId:null
}
},
@@ -262,6 +263,15 @@ export default {
getUserInfo(){
getInfoNewAPI({'custId':uni.getStorageSync('custId'),"sourceType":7}).then(result => {
this.userInfo = result.data;
+ if(this.userInfo.orgFullName.indexOf("运检分公司食堂")>-1&&this.userInfo.orgFullName.indexOf("运检后勤食堂")==-1){
+ this.showYJ=true
+ }else if(this.userInfo.custId=="456367498472722432"||this.userInfo.custId=="456367759735918592"||this.userInfo.custId=="456367758817366016"||this.userInfo.custId=="456367392017092608"){
+ this.showYJ=true
+ }else if(this.userInfo.custNum&&this.userInfo.custNum.indexOf("!yjst_yj2")>-1){
+ this.showYJ=true
+ }else{
+ this.showYJ=false
+ }
this.$set(this.userInfo,'mobile',decryptWithSM4(this.userInfo.mobile))
this.$set(this.userInfo,'idCard',decryptWithSM4(this.userInfo.idCard))
this.$set(this.userInfo,'email',decryptWithSM4(this.userInfo.email))
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 44fe0e3..adabc46 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -232,7 +232,7 @@
.container {
height: 90vh;
background-color: #F9FBFF;
- padding-top: 3vh;
+ padding-top: 5vh;
}
.header {
diff --git a/pages/system.vue b/pages/system.vue
index 84ad0fa..9bd41e5 100644
--- a/pages/system.vue
+++ b/pages/system.vue
@@ -79,11 +79,14 @@ export default {
})
},
handleItem(index) {
- console.log(index)
if (index === 0) {
- console.log(this.userInfo.custNum.indexOf("!yjst_sbd"))
- if(this.userInfo.custNum.indexOf("!yjst_yj")>-1||(this.userInfo.orgId=='456365640698040320'&&this.userInfo.custNum.indexOf("!yjst_sbd")==-1)){
- uni.navigateTo({ url: '/pages/yjCanteen' });
+ //运检食堂的人或在sbd食堂但可以到运检食堂吃饭的人
+ if(this.userInfo.orgFullName.indexOf("运检分公司食堂")>-1&&this.userInfo.orgFullName.indexOf("运检后勤食堂")==-1){
+ uni.navigateTo({ url: '/pages/yjCanteen' });
+ }else if(this.userInfo.custId=="456367498472722432"||this.userInfo.custId=="456367759735918592"||this.userInfo.custId=="456367758817366016"||this.userInfo.custId=="456367392017092608"){
+ uni.navigateTo({ url: '/pages/yjCanteen' });
+ }else if(this.userInfo.custNum&&this.userInfo.custNum.indexOf("!yjst_yj2")>-1){
+ uni.navigateTo({ url: '/pages/yjCanteen' });
}else{
this.$router.push({ path: '/pages/index' })
}
@@ -94,14 +97,17 @@ export default {
}
},
jumpPage(index) {
- console.log(index)
- if (index === 0) {
- console.log(this.userInfo.custNum.indexOf("yjst_sbd"))
- if(this.userInfo.custNum.indexOf("!yjst_yj")>-1||(this.userInfo.orgId=='456365640698040320'&&this.userInfo.custNum.indexOf("!yjst_sbd")==-1)){
- uni.navigateTo({ url: '/pages/yjCanteen' });
+ if (index === 0) {
+ //运检食堂的人或在sbd食堂但可以到运检食堂吃饭的人
+ if(this.userInfo.orgFullName.indexOf("运检分公司食堂")>-1&&this.userInfo.orgFullName.indexOf("运检后勤食堂")==-1){
+ uni.navigateTo({ url: '/pages/yjCanteen' });
+ }else if(this.userInfo.custId=="456367498472722432"||this.userInfo.custId=="456367759735918592"||this.userInfo.custId=="456367758817366016"||this.userInfo.custId=="456367392017092608"){
+ uni.navigateTo({ url: '/pages/yjCanteen' });
+ }else if(this.userInfo.custNum&&this.userInfo.custNum.indexOf("!yjst_yj2")>-1){
+ uni.navigateTo({ url: '/pages/yjCanteen' });
}else{
this.$router.push({ path: '/pages/index' })
- }
+ }
} else if (index === 1) {
this.$router.push({ path: '/pages/post/index' })
} else if (index === 2) {
diff --git a/pages/work/details.vue b/pages/work/details.vue
index cb62713..2e0fea5 100644
--- a/pages/work/details.vue
+++ b/pages/work/details.vue
@@ -223,30 +223,38 @@ export default {
//退单
refundOrder() {
if(this.detailData.payState==3||this.detailData.payState==6){
- let param = {
- "macOrderId": this.detailData.macOrderId,
- "orderId": this.detailData.orderId,
- "remark": ""
+ let hours = new Date().getHours();//拿到当前小时
+ if(Number(hours)>13){
+ uni.showToast({
+ title: "14点以后无法退单！",
+ icon: 'none'
+ })
+ }else{
+ let param = {
+ "macOrderId": this.detailData.macOrderId,
+ "orderId": this.detailData.orderId,
+ "remark": ""
+ }
+ this.$modal.confirm('确定退单吗？').then(() => {
+ refundOrderApi(param).then((res) => {
+ console.log(res)
+ if(res.code==200){
+ uni.showToast({
+ title: "操作成功",
+ icon: 'none'
+ })
+ setTimeout(()=>{
+ this.getOrderDetail()
+ },500)
+ }else{
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ }
+ })
+ })
}
- this.$modal.confirm('确定退单吗？').then(() => {
- refundOrderApi(param).then((res) => {
- console.log(res)
- if(res.code==200){
- uni.showToast({
- title: "操作成功",
- icon: 'none'
- })
- setTimeout(()=>{
- this.getOrderDetail()
- },500)
- }else{
- uni.showToast({
- title: res.msg,
- icon: 'none'
- })
- }
- })
- })
}
},
//评价按钮
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 1397b4e..5e9505b 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -562,7 +562,7 @@ export default {
height: 95vh;
overflow-y: auto;
.top-wrapper {
- padding-top: 4vh;
+ padding-top: 5vh;
width: 100vw;
background: #f9fbff;
height: 94vh;
diff --git a/static/station/index.html b/static/station/index.html
index b2c8992..8dd2249 100644
--- a/static/station/index.html
+++ b/static/station/index.html
@@ -1,3 +1,3 @@
智慧后勤
\ No newline at end of file
+ })