From 6778b96b6da648f6694ed3276b27ee99f93aca7f Mon Sep 17 00:00:00 2001
From: LegnaYet <1023868505@qq.com>
Date: Fri, 24 Apr 2020 22:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=8F=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Home.vue                      |  2 +-
 src/pages/Login.vue                     |  2 ++
 src/pages/shop/IncreaseManager.vue      |  2 +-
 src/pages/shop/IncreaseStaffManager.vue | 34 ++++++++++++-------------
 src/pages/shop/IncreaseStoreManager.vue |  9 ++++---
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index c1583a3..8fefa45 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="layout">
         <Layout :style="{minHeight: '100vh'}">
-            <Sider collapsible :collapsed-width="78" v-model="isCollapsed">
+            <Sider collapsible :collapsed-width="78" v-model="isCollapsed"  hide-trigger="true" >
 
                 <div style="margin: 40px 0 20px 20px;font-weight: bold;font-size: 30px;color: #ffffff;">
                     <Poptip placement="bottom-start" width="200" :offset="-8">
diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index dd3b932..006cfd6 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -109,6 +109,8 @@
                         that.$Message.info("账号不存在");
                     }else if(code === '0003'){
                         that.$Message.info("密码错误");
+                    }else if(code === '0006'){
+                        that.$Message.info("该角色没有登录权限");
                     }else if(code === '1007'){
                         that.$Message.info("没有权限");
                     }else {
diff --git a/src/pages/shop/IncreaseManager.vue b/src/pages/shop/IncreaseManager.vue
index 22f7623..c069c20 100644
--- a/src/pages/shop/IncreaseManager.vue
+++ b/src/pages/shop/IncreaseManager.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Menu ref="menu" mode="horizontal" :active-name="selectedItemName"  v-model="this.threeLevel[0].id">
+        <Menu v-show="false" ref="menu" mode="horizontal" :active-name="selectedItemName"  v-model="this.threeLevel[0].id">
             <MenuItem :name="cItem.id" :to="cItem.resource" v-for="cItem in threeLevel"
                       :key="cItem.id">
                 {{cItem.name}}
diff --git a/src/pages/shop/IncreaseStaffManager.vue b/src/pages/shop/IncreaseStaffManager.vue
index e4dedb2..69a5cb8 100644
--- a/src/pages/shop/IncreaseStaffManager.vue
+++ b/src/pages/shop/IncreaseStaffManager.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <Row style="margin-top: 20px;width: 100%;background-color: #F7F8FA;">
+        <Row style="margin-top: -10px;width: 100%;background-color: #FFF;">
             <i-col span="24" style="text-align: left;padding-left: 10px;">
                 <Row class="row-style">
                     <i-col span="24" style="text-align: right;padding-right: 20px;">
@@ -10,8 +10,8 @@
             </i-col>
         </Row>
 
-        <Table :columns="columns1" :data="data1"  style="margin-top: 20px;">
-                <template slot-scope="row" slot="qrCodeAction">
+        <Table :columns="columns1" :data="data1"  style="margin-top: 0px;">
+                <template slot-scope="{row}" slot="qrCodeAction">
                     <img :src="require('../../../static/img/qrCode-init.png')"  @click="show(row)"  style="margin-left: 5px;margin-top: 5px;width:30px;height:30px;"/>
                 </template>
             <template slot-scope="{ row, index }" slot="state">
@@ -21,21 +21,24 @@
                 </i-switch>
             </template>
 
-            <template slot-scope="row" slot="action">
-                <Button ghost type="primary" size="small" style="margin-right: 5px" @click="open(2, row)">修改</Button>
-                <Button ghost type="error" size="small" @click="remove(row)">删除</Button>
+            <template slot-scope="{row}" slot="action">
+                <Button ghost type="primary" size="small" style="margin-right: 5px;border: 0px;color:#2074E2" @click="open(2, row)">修改</Button>
+                <Button ghost type="error" size="small" style="border: 0px" @click="remove(row)">删除</Button>
             </template>
         </Table>
 
         <!-- 预览二维码 -->
         <Modal
                 v-model="isShow"
-                :title="showStoreName"
                 :footer-hide="true"
                 width="230"
                 class-name="vertical-center-modal"
         >
-            <div slot="header">{{this.showStoreName}}</div>
+            <div slot="header">
+                <p>  </p>
+            </div>
+            <p>{{this.showStoreCode}}</p>
+            <p>{{this.showStoreName}}</p>
             <img :src="qrCodeImage" style="width:200px;height:200px;"/>
             <div  style="text-align: center;">
                 <Button ghost type="primary" @click="download(rowData)">下载</Button>
@@ -101,7 +104,7 @@
         </Modal>
 
                 <Page :total="total" :current="pageNum" :page-size="pageSize" show-elevator show-total
-                      placement="top" @on-change="handlePage" style="margin: 20px 50px 0 0;right:0px;position: absolute;"></Page>
+                      placement="top" @on-change="handlePage" style="margin: 20px 50px 0 0;right:0px;position: absolute;bottom: 50px"></Page>
     </div>
 </template>
 
@@ -124,6 +127,7 @@
                 isShow: false,
                 isShowAdd: false,
                 showStoreName: '',
+                showStoreCode: '',
                 qrCodeImage: '',
                 loading:true,
                 spuLoading:false,
@@ -163,7 +167,7 @@
                     {
                         title: '店铺',
                         key: 'storeName',
-                        width: 100
+                        width: 500
                     },
                     {
                         title: '角色',
@@ -224,15 +228,8 @@
         mounted() {
             this.setMenuName("门店推广","推广管理","门店导购管理");
             this.listOfLogistics();
-            this.downRegionData();
-            this.downShopData();
-            this.downRoleData()
         },
         methods: {
-            changePage (page) {
-                this.pageNum = page;
-                this.listOfLogistics();
-            },
             cancel: function(){
 
             },
@@ -355,7 +352,8 @@
             // 预览二维码
             show: function (index) {
                 this.isShow = true;
-                this.showStoreName = index.storeName;
+                this.showStoreName ="姓名:"+index.name;
+                this.showStoreCode = "工号:"+ index.staffCode;
                 this.qrCodeImage = index.epWechatQrCode;
                 this.rowData = index;
             },
diff --git a/src/pages/shop/IncreaseStoreManager.vue b/src/pages/shop/IncreaseStoreManager.vue
index cbd6f20..e2b917c 100644
--- a/src/pages/shop/IncreaseStoreManager.vue
+++ b/src/pages/shop/IncreaseStoreManager.vue
@@ -59,7 +59,10 @@
                 width="230"
                 class-name="vertical-center-modal"
                 @on-ok="ok">
-            <div slot="header">{{this.showStoreName}}</div>
+            <div slot="header">
+                <p>  </p>
+            </div>
+            <p>{{this.showStoreName}}</p>
             <img :src="qrCodeImage" style="width:200px;height:200px;"/>
             <div style="text-align: center;">
                 <Button ghost type="primary" @click="download(rowData)">下载</Button>
@@ -218,7 +221,8 @@
                     },
                     {
                         title: '店铺名称',
-                        key: 'name'
+                        key: 'name',
+                        width: 500
                     },
                     {
                         title: '店铺编码',
@@ -474,7 +478,6 @@
                 return value;
             },
             show: function (index) {
-                debugger
                 this.isShow = true;
                 this.showStoreName = index.name;
                 this.qrCodeImage = index.qrCodeAction;