Browse Source

Merge branch 'deploy_qbyc' of http://git.chelingzhu.com/chelingzhu-web/zyyc_channe_html into deploy_qbyc

chenrui 4 years ago
parent
commit
f31ff5c296

+ 2 - 2
src/permission.js

@@ -17,8 +17,8 @@ router.beforeEach((to, from, next) => {
   NProgress.start() // start progress bar
   to.meta && (typeof to.meta.title !== 'undefined' && setDocumentTitle(`${to.meta.title} - ${domTitle}`))
   let token = store.state.user.token || sessionStorage.getItem(ACCESS_TOKEN)
-  token = token != 'undefined' ? token : ''
-  // console.log(token)
+  token = token != 'null' && token != 'undefined' && token ? token : ''
+  // console.log(token,'token')
   // 已登录
   if (token) {
     /* has token */

+ 1 - 1
src/views/Service/PurchasedServiceDetail.vue

@@ -7,7 +7,7 @@
 				<detail-list-item term="下单时间">{{ orderBundle.orderDate ? orderBundle.orderDate : '--' }}</detail-list-item>
 				<detail-list-item term="订单状态">{{ palyStatus ? palyStatus :'--' }}</detail-list-item>
 				<detail-list-item term="客户信息">{{ custInfo ? custInfo : '--' }}</detail-list-item>
-				<detail-list-item term="应付金额">{{ orderBundle.totalAmount ? orderBundle.totalAmount :'--' }}</detail-list-item>
+				<detail-list-item term="应付金额">{{ orderBundle.totalAmount ? orderBundle.totalAmount :'--' }}</detail-list-item>
 				<detail-list-item term="支付时间" v-if="isPay">{{ payDate ? payDate : '--' }}</detail-list-item>
 				<detail-list-item term="支付金额" v-if="isPay">¥{{ orderBundle.payedAmount ? orderBundle.payedAmount : '--' }}</detail-list-item>
 			</detail-list>

+ 2 - 2
src/views/Service/yanQiModal.vue

@@ -86,8 +86,8 @@
 		methods:{
 			moment,
 			 // 不可选日期
-			disabledDate(current){
-				return current && current < moment().subtract(1, "days");
+			disabledDate(current) {
+				return current < moment().subtract(1, 'days') ||  current > moment('2038-01-01')
 			},
 			// 重置表单
 			resetForm(){