1005

src/layout/components/userbar.vue

@@ -1,5 +1,13 @@
 <template>
 	<div class="user-bar">
+		<el-tooltip class="box-item" effect="dark" :content="userInfo.vip_at==0?'到期时间：永久':'到期时间：'+$TOOL.getTime(userInfo.vip_at,'YYYY年MM月DD日')" placement="bottom" v-if="userInfo.agent_id>0">
+			<div class="screen panel-item hidden-sm-and-down">
+					<el-icon><el-icon-timer /></el-icon> <span>{{userInfo.vip_at==0?'永久':''+$TOOL.getTime(userInfo.vip_at,'YYYY年MM月DD日')}}</span>
+			</div>
+		</el-tooltip>
+		<div class="screen panel-item hidden-sm-and-down" v-if="userInfo.agent_id>0">
+			<el-icon><el-icon-user /></el-icon> <span>{{userInfo.shop}}</span>
+		</div>
 		<div class="screen panel-item hidden-sm-and-down" @click="screen">
 			<el-icon><el-icon-full-screen /></el-icon> <span>全屏</span>
 		</div>
@@ -50,7 +58,8 @@ export default {
 			tasksVisible: false,
 			msg: false,
 			msgList: [],
-			baseData: {}
+			baseData: {},
+			userInfo:{}
 		}
 	},
 	created() {
@@ -59,6 +68,7 @@ export default {
 		this.userNameF = this.userName.substring(0, 1);
 		var baseData = this.$TOOL.data.get("SERVICE");
 		this.baseData = baseData;
+		this.userInfo = userInfo;
 	},
 	methods: {
 		//个人信息

src/layout/index.vue

@@ -68,7 +68,7 @@
 					<div class="ml10">
 						<el-tag v-if="userInfo.type==1">管理后台</el-tag>
 						<el-tooltip class="box-item" effect="dark" :content="userInfo.vip_at==0?'到期时间：永久':'到期时间：'+$TOOL.getTime(userInfo.vip_at,'YYYY年MM月DD日')" placement="right" v-else>
-							<el-tag v-if="userInfo.type==2">代理-旗舰版</el-tag>
+							<el-tag v-if="userInfo.type==2">管理后台</el-tag>
 							<el-tag v-if="userInfo.type==3">门店-旗舰版</el-tag>
 							<el-tag v-if="userInfo.type==4">工厂-旗舰版</el-tag>
 						</el-tooltip>

src/views/manage/setting/menu/index.vue

@@ -9,7 +9,7 @@
                     <div class="tabs">
                         <el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick">
                             <el-tab-pane label="总管理" :name="1"></el-tab-pane>
-                            <el-tab-pane label="代理" :name="2"></el-tab-pane>
+                            <el-tab-pane label="门店" :name="2"></el-tab-pane>
                         </el-tabs>
                     </div>
 					<el-tree ref="menu" class="menu" node-key="id" :data="menuList" :props="menuProps" draggable highlight-current :expand-on-click-node="false" check-strictly :filter-node-method="menuFilterNode" @node-click="menuClick" @node-drop="nodeDrop">

src/views/manage/shop/index/components/form.vue

@@ -95,7 +95,7 @@
                             <div class="el-form-item-msg">如果类型为金额比例，比例设置10，则表示抽取每单金额的10%为系统佣金，最多不超过100</div>
                         </el-form-item>
                     </fieldset>
-                    <fieldset v-if="mode=='add'">
+                    <!-- <fieldset v-if="mode=='add'">
                         <legend><el-tag>账号权限</el-tag></legend>
                         <el-row :gutter="15">
                             <el-col :span="24">
@@ -117,7 +117,7 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
-                    </fieldset>
+                    </fieldset> -->
                 </el-form>
             </el-main>
             <el-footer style="text-align: right;">

src/views/merchant/dashboard/index.vue

@@ -164,7 +164,7 @@ export default {
     created(){
         var baseData = this.$TOOL.data.get("SERVICE");
         this.baseData = baseData;
-        this.getData()
+        // this.getData()
     },
     methods: {
         async getData(){