代码更新（驿站，运检）

pages/index.vue

@@ -93,7 +93,7 @@
 			  <view class="box-title">客流统计</view> 
 			</view>
 			
-			<view class="handle-box-item2" @click="goToYj" style="background: #F4FFFF;" v-if="userInfo.orgId=='456365640698040320'||userInfo.custNum.indexOf('!yjst')>-1">
+			<view class="handle-box-item2" @click="goToYj" style="background: #F4FFFF;" v-if="showYJ">
 			  <view class="image-box">
 				<image src="/static/images/index/yjCanteen.png" style="width: 40px;height: 40px;" mode="aspectFit"></image>
 			  </view>
@@ -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))

pages/mine/index.vue

@@ -232,7 +232,7 @@
 	.container {
 		height: 90vh;
 		background-color: #F9FBFF;
-		padding-top: 3vh;
+		padding-top: 5vh;
 	}
 
 	.header {

pages/system.vue

@@ -79,10 +79,13 @@ 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)){
+			//运检食堂的人或在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,10 +97,13 @@ 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)){
+			//运检食堂的人或在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' }) 

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": ""
-				}
-				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'
-							}) 
-						}
+				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'
+								}) 
+							}
+						}) 
+					})
+				}
 			}
 		},
 		//评价按钮

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;

static/station/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>智慧后勤</title><script src=https://res.wx.qq.com/open/js/jweixin-1.1.0.js></script><script>document.addEventListener('DOMContentLoaded', function() {
 				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
-			})</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.6b868f1e.js></script><script src=./static/js/index.b10997f5.js></script></body></html>
+			})</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.6b868f1e.js></script><script src=./static/js/index.6bbd0a49.js></script></body></html>

static/station/static/js/pages-laundry-suggestion.caa7e7f4.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-laundry-suggestion"],{"1c38":function(t,e,n){var i=n("a1e3");i.__esModule&&(i=i.default),"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var a=n("4f06").default;a("6a50acdd",i,!0,{sourceMap:!1,shadowMode:!1})},"432d":function(t,e,n){"use strict";n("7a82");var i=n("4ea4").default;Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,n("498a");var a=i(n("75f4")),o=n("e93b"),c=n("1126"),u={name:"suggestion",components:{"nav-bar":a.default},data:function(){return{activeIndex:-1,content:"",mobile:"12321",tags:[{name:"下单"},{name:"送衣"},{name:"取衣"},{name:"洗衣"},{name:"支付"},{name:"其他"}]}},mounted:function(){this.windowHeight=document.documentElement.clientHeight-145},methods:{sub:function(){var t=this;if(-1!=this.activeIndex)if(""!=this.content.trim())if(""!=this.mobile.trim()){var e={method:o.suggestion,suggestionType:this.tags[this.activeIndex].name,suggestionContent:this.content,currentUserId:uni.getStorageSync("userId"),mobile:this.mobile};(0,c.callbackRequest)(e).then((function(e){t.activeIndex=-1,t.content="",t.mobile="",1==e.returnCode?(uni.showToast({title:"提交成功",icon:"none"}),setTimeout((function(){uni.navigateBack()}),2e3)):uni.showToast({title:"提交失败",icon:"none",duration:2e3})}))}else uni.showToast({title:"请填写联系方式",icon:"none",duration:2e3});else uni.showToast({title:"请填写意见",icon:"none",duration:2e3});else uni.showToast({title:"请选择问题标签",icon:"none",duration:2e3})}}};e.default=u},4871:function(t,e,n){"use strict";n.r(e);var i=n("6eea"),a=n("c814");for(var o in a)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(o);n("e915");var c=n("f0c5"),u=Object(c["a"])(a["default"],i["b"],i["c"],!1,null,"2f3d2042",null,!1,i["a"],void 0);e["default"]=u.exports},"6eea":function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){}));var i=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",{staticClass:"content"},[n("nav-bar",{attrs:{title:"意见反馈"}}),n("v-uni-view",{staticStyle:{"background-color":"white",width:"100%",padding:"20px","box-sizing":"border-box","overflow-x":"hidden"}},[n("v-uni-view",{staticStyle:{"text-align":"center"}},[n("v-uni-view",{staticStyle:{padding:"40px 0 10px 0",color:"black","font-size":"18px"}},[t._v("请选择您需要反馈的原因")]),n("v-uni-view",{staticStyle:{padding:"10px 0",color:"#d3d4d6","font-size":"14px"}},[t._v("您的每一个意见或者建议我们都会认真对待的")])],1),n("v-uni-view",{staticStyle:{height:"20px"}}),n("v-uni-view",{staticStyle:{display:"flex","flex-wrap":"wrap"}},t._l(t.tags,(function(e,i){return n("v-uni-view",{key:i,staticStyle:{width:"25%",padding:"4px"}},[n("v-uni-view",{staticClass:"tag",class:{green:t.activeIndex===i},on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.activeIndex=i}}},[t._v(t._s(e.name))])],1)})),1),n("v-uni-view",{staticClass:"top",staticStyle:{background:"#ffffff",width:"98%!important"}},[n("v-uni-view",{staticStyle:{width:"100%"}},[n("v-uni-textarea",{staticStyle:{"font-size":"28upx",width:"100%","margin-top":"10px",padding:"10px","background-color":"#f2f2f2",border:"none"},attrs:{rows:"7",maxlength:"500",placeholder:"请输入您的建议..."},model:{value:t.content,callback:function(e){t.content=e},expression:"content"}})],1)],1),n("v-uni-view",[n("v-uni-view",{staticStyle:{padding:"30px 0"}},[n("v-uni-view",{staticStyle:{"font-size":"28upx",display:"flex","text-align":"left",height:"40px","line-height":"40px"}},[t._v("联系方式："),n("v-uni-input",{staticStyle:{outline:"none",height:"40px","line-height":"40px",border:"none"},attrs:{type:"text"},model:{value:t.mobile,callback:function(e){t.mobile=e},expression:"mobile"}})],1),n("v-uni-view")],1)],1),n("v-uni-button",{staticStyle:{"font-size":"28upx",width:"60%","background-color":"#409eff",color:"#fff","line-height":"40px"},on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.sub.apply(void 0,arguments)}}},[t._v("提交")])],1)],1)},a=[]},a1e3:function(t,e,n){var i=n("24fb");e=i(!1),e.push([t.i,'.tag[data-v-2f3d2042]{font-size:%?28?%;height:40px;line-height:40px;text-align:center;border-radius:4px;border:1px solid #dcdcdc}.green[data-v-2f3d2042]{background-color:#8ed258;color:#fff}uni-input[type="text"][data-v-2f3d2042],\n\tuni-textarea[data-v-2f3d2042]{-webkit-user-select:auto;-moz-user-select:auto;user-select:text}uni-textarea[data-v-2f3d2042]::-webkit-input-placeholder{color:#d3d4d6!important}uni-textarea[data-v-2f3d2042]::placeholder{color:#d3d4d6!important}.content[data-v-2f3d2042]{padding-top:%?88?%}',""]),t.exports=e},c814:function(t,e,n){"use strict";n.r(e);var i=n("432d"),a=n.n(i);for(var o in i)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(o);e["default"]=a.a},e915:function(t,e,n){"use strict";var i=n("1c38"),a=n.n(i);a.a}}]);