订单详情修复，子账号权限修改

src/pages/index/setting/setting.vue

@@ -15,13 +15,13 @@
 					<image src="../../../static/images/moreicon.png" class="more"></image>
 				</view>
 			</view>
-			<view class="item-warp rolemenage">
+			<view class="item-warp rolemenage" v-if="!settingRole">
 				<view class="item cellme" @tap="topage('/pages/index/userinfo/rolemenage')">
 					<text class="name">角色管理</text>
 					<image src="../../../static/images/moreicon.png" class="more"></image>
 				</view>
 			</view>
-			<view class="item-warp usermenage">
+			<view class="item-warp usermenage" v-if="!settingRole">
 				<view class="item cellme" @tap="topage('/pages/index/userinfo/usermenage')">
 					<text class="name">用户管理</text>
 					<image src="../../../static/images/moreicon.png" class="more"></image>
@@ -52,10 +52,13 @@ export default {
 	},
 	data() {
 		return {
-			title: '设置'
+			title: '设置',
+			settingRole: null
 		};
 	},
-	onLoad() {},
+	onLoad() {
+		this.settingRole = uni.getStorageSync('scenicMessage').loginerId
+	},
 	methods: {
 		topage(url) {
 			this.$mRouter.push({ route: url });

src/pages/order/order.vue

@@ -39,15 +39,15 @@
       </view>
       <view class="header-bar">
         <view class="item" @tap="changeTab('pay', flagList[0])" :class="{ active: isactive === 'pay' }">
-          <view class="ordertype">已付款</view>
+          <view class="ordertype">支付订单</view>
           <view class="heng"></view>
         </view>
-        <view class="item" @tap="changeTab('refund', flagList[1])" :class="{ active: isactive === 'refund' }">
-          <view class="ordertype">已完成</view>
+        <view class="item" @tap="changeTab('rubbishOrder', flagList[1])" :class="{ active: isactive === 'rubbishOrder' }">
+          <view class="ordertype">垃圾订单</view>
           <view class="heng"></view>
         </view>
-        <view class="item" @tap="changeTab('rubbishOrder', flagList[2])" :class="{ active: isactive === 'rubbishOrder'}">
-          <view class="ordertype">退款</view>
+        <view class="item" @tap="changeTab('refund', flagList[2])" :class="{ active: isactive === 'refund'}">
+          <view class="ordertype">退款订单</view>
           <view class="heng"></view>
         </view>
         <view class="line"></view>
@@ -91,7 +91,7 @@
     </view>
     <view
       class="order-content"
-      v-if="isactive === 'refund'"
+      v-if="isactive === 'rubbishOrder'"
     >
       <view
         class="order-list"
@@ -127,7 +127,7 @@
     </view>
     <view
       class="order-content"
-      v-if="isactive === 'rubbishOrder'"
+      v-if="isactive === 'refund'"
     >
       <view
         class="order-list"
@@ -186,9 +186,9 @@ export default {
       index: 0,
       shopID: 0,
 
-      isactive: 'pay', // tab
+      isactive: '', // tab
 
-      flagList: ['pay', 'accomplish', 'refundorder'],
+      flagList: ['pay', 'rubbishOrder', 'refundorder'],
       direction: '',
 
       more: 'loading', // more  loading noMore
@@ -200,13 +200,13 @@ export default {
       enddate: '',
       sunday: 1,
 
-      orderFlag: 'pay', // pay accomplish refundorder
+      // orderFlag: 'pay', // pay accomplish refundorder
 
       soleStatus: 1, // 触底状态
 
       orderList: [],
       params: {
-        orderFlag: 'pay', // pay accomplish refundorder
+        orderFlag: '', // pay支付订单  rubbishOrder垃圾订单 refundorder退款订单
         pageNum: 1,
         pageSize: 10,
         ordersNo: '',
@@ -255,6 +255,13 @@ export default {
   onLoad () {
     this.typeNum = this.$mStore.state.roleIndex
     // 权限设置
+    this.roleList = this.$mStore.state.role
+    this.roleList.forEach( element =>{
+      if (element.code === 'order') {
+        this.isactive = element.children[0].code
+        this.params.orderFlag = element.children[0].code
+      }
+    })
 
     this.getShopList();
     this.getOrderList();

src/pages/order/orderdetail.vue

@@ -16,6 +16,10 @@
 				<view class="buynum titlebar">购买数量：<text class="txt">{{orderMessage.playManList.length}}</text></view>
 				<view class="palytime titlebar">游玩时间：<text class="txt">{{ orderMessage.palyTime ? orderMessage.palyTime : '' }} {{ orderMessage.timePart ?orderMessage.timePart : ''}}</text></view>
 				<view class="orderstatus titlebar">订单状态：<text class="txt">{{orderMessage.statusName}}</text> </view>
+				<view class="titlebar chechNum">核销次数：<text class="txt">{{ orderMessage.checkList.length }} / {{ orderMessage.checkNum}} </text></view>
+        <view class="titlebar checkedTime" v-for="(item,index) in orderMessage.checkList" :key="index">
+          核销时间：<text class="txt">{{ item.checkTime }}</text>
+        </view>
 				<view class="tourist">
 					<view class="title">游客信息</view>
 					<view v-for="(item,index) in orderMessage.playManList" :key="index">
@@ -118,13 +122,14 @@
 				}
 
 				.orderstatus {
-					height: 98upx;
-					line-height: 98upx;
+					padding-top: 22upx;
 					border-top: 1px solid #e1e1e1;
-					border-bottom: 1px solid #e1e1e1;
 				}
+				
 
 				.tourist {
+					margin-top: 22upx;
+					border-top: 1px solid #e1e1e1;
 					.title {
 						padding: 15upx 0;
 						font-size: 34upx;

src/pages/public/login.vue

@@ -146,6 +146,7 @@ export default {
           // 商家信息
           await this.$http.get('/getUserInfo').then(async (res) => {
             if (res.data) {
+              console.log(res);
               this.$mStore.commit('setScenic',res.data)
             }
           });