1

src/pages/Home.vue

@@ -1,33 +1,52 @@
 <template>
   <div class="layout">
     <Layout :style="{minHeight: '100vh'}">
-            <Sider collapsible :collapsed-width="78" v-model="isCollapsed"  :hide-trigger="true" >
+      <Sider collapsible
+             :collapsed-width="78"
+             v-model="isCollapsed"
+             :hide-trigger="true">
 
         <div style="margin: 40px 0 20px 10px;font-weight: bold;font-size: 30px;color: #ffffff;">
-                    <Poptip placement="bottom-start" width="200" :offset="-8">
+          <Poptip placement="bottom-start"
-                        <img src="../../static/img/avatar.png" style="width: 32px;vertical-align: middle;cursor: pointer"/>
+                  width="200"
+                  :offset="-8">
+            <img src="../../static/img/avatar.png"
+                 style="width: 32px;vertical-align: middle;cursor: pointer" />
             <div slot="content">
-                            <div style="cursor: pointer;" @click="logoutClick">
+              <div style="cursor: pointer;"
+                   @click="logoutClick">
                 <span class="logout-span">退出登录</span>
-                                <img class="logout-img" src="../../static/img/logout.png"/>
+                <img class="logout-img"
+                     src="../../static/img/logout.png" />
               </div>
             </div>
           </Poptip>
           <span class="project-title">优客后台管理</span>
         </div>
 
-                <Menu ref="menu" :active-name="selectedItemName" :open-names="openName" theme="dark" width="auto"
+        <Menu ref="menu"
-                      @on-select="onSelectLister" :accordion="true">
+              :active-name="selectedItemName"
-                    <MenuItem v-if="roleCode === 'GLY-ADMIN' || roleCode === 'DG-YUNYING' || roleCode === 'GL-YUNYING'" :name="0" to="/customer/view">
+              :open-names="openName"
+              theme="dark"
+              width="auto"
+              @on-select="onSelectLister"
+              :accordion="true">
+          <MenuItem v-if="roleCode === 'GLY-ADMIN' || roleCode === 'DG-YUNYING' || roleCode === 'GL-YUNYING'"
+                    :name="0"
+                    to="/customer/view">
           <Icon type="ios-paper" />
           <span style="margin-left: 7px">首页</span>
           </MenuItem>
-                    <Submenu :name="item.id" v-for="item in onePermissionList" :key="item.id">
+          <Submenu :name="item.id"
+                   v-for="item in onePermissionList"
+                   :key="item.id">
             <template slot="title">
               <Icon type="ios-paper" />
               {{item.name}}
             </template>
-                        <MenuItem :name="cItem.id" :to="cItem.resource" v-for="cItem in item.subMenuList"
+            <MenuItem :name="cItem.id"
+                      :to="cItem.resource"
+                      v-for="cItem in item.subMenuList"
                       :key="cItem.id">
             {{cItem.name}}
             </MenuItem>
@@ -38,7 +57,8 @@
         <!--        <Header :style="{background: '#fff', boxShadow: '0 2px 3px 2px rgba(0,0,0,.1)'}"></Header>-->
         <Content :style="{padding: '0 16px 16px'}">
           <Breadcrumb :style="{margin: '16px 0'}">
-                        <BreadcrumbItem><span style="cursor: pointer" @click="breadcrumbClick">{{selectedMenu}}</span></BreadcrumbItem>
+            <BreadcrumbItem><span style="cursor: pointer"
+                    @click="breadcrumbClick">{{selectedMenu}}</span></BreadcrumbItem>
             <BreadcrumbItem>{{selectedSubMenu}}</BreadcrumbItem>
           </Breadcrumb>
           <Card>
@@ -296,8 +316,15 @@
     },
     //手动设置面包屑
     setMenuName: function (menu1, menu2) {
+      console.log("setMenu", arguments)
       this.selectedMenu = menu1;
       this.selectedSubMenu = menu2;
+      let parentId;
+      let subId;
+      this.onePermissionList.forEach(item => {
+        if (item.name == menu1) parentId = item.id
+      })
+      this.$forceUpdate()
     },
     //面包屑点击跳转
     breadcrumbClick: function () {
@@ -318,7 +345,6 @@
 }
 </script>
 <style scoped>
-
 .layout-con {
   height: 100%;
   width: 100%;

src/pages/activity/useTable.vue

@@ -1,46 +1,50 @@
 <template>
   <div class="use_box">
-    <Modal
+    <Modal :scrollable="false"
-      :scrollable="false"
            v-model="showUse"
            title="使用活动"
            @on-cancel="cancel"
            :loading="true"
            width="70%"
-      @on-visible-change="visibleChange"
+           @on-visible-change="visibleChange">
-    >
+      <Steps style="padding: 40px;"
-      <Steps style="padding: 40px;" :current="currentStep">
+             :current="currentStep">
         <Step title="基本信息"></Step>
-        <Step :title="isModify ? '修改零售公司' : '选择零售公司'" content></Step>
+        <Step :title="isModify ? '修改零售公司' : '选择零售公司'"
-        <Step :title="isModify ? '修改店铺' : '选择店铺'" content></Step>
+              content></Step>
-        <Step title="确认信息" content></Step>
+        <Step :title="isModify ? '修改店铺' : '选择店铺'"
+              content></Step>
+        <Step title="确认信息"
+              content></Step>
       </Steps>
-      <useActivityStepOne :schedule="schedule" :isModify="isModify" v-if="currentStep == 0 && show"></useActivityStepOne>
+      <useActivityStepOne :schedule="schedule"
-      <useActivityStepTwo :schedule="schedule" :isModify="isModify" v-if="currentStep == 1"></useActivityStepTwo>
+                          :isModify="isModify"
-      <useActivityStepThree :schedule="schedule" :isModify="isModify" v-if="currentStep == 2"></useActivityStepThree>
+                          v-if="currentStep == 0 && show"></useActivityStepOne>
-      <useActivityStepFoure :schedule="schedule" :isModify="isModify" v-if="currentStep == 3"></useActivityStepFoure>
+      <useActivityStepTwo :schedule="schedule"
+                          :isModify="isModify"
+                          v-if="currentStep == 1"></useActivityStepTwo>
+      <useActivityStepThree :schedule="schedule"
+                            :isModify="isModify"
+                            v-if="currentStep == 2"></useActivityStepThree>
+      <useActivityStepFoure :schedule="schedule"
+                            :isModify="isModify"
+                            v-if="currentStep == 3"></useActivityStepFoure>
       <div slot="footer">
-        <Button
+        <Button v-if="currentStep !== 0"
-          v-if="currentStep !== 0"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="back"
+                @click="back">上一步</Button>
-        >上一步</Button>
+        <Button v-if="currentStep !== 3"
-        <Button
-          v-if="currentStep !== 3"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="next"
+                @click="next">下一步</Button>
-        >下一步</Button>
+        <Button v-if="currentStep == 3"
-        <Button
-          v-if="currentStep == 3"
                 type="primary"
                 shape="circle"
                 :loading="modal_loading"
-          @click="finish"
+                @click="finish">完成</Button>
-        >完成</Button>
       </div>
     </Modal>
   </div>
@@ -91,7 +95,6 @@ export default {
     }
   },
   created () {
-    this.setMenuName("活动管理", "活动计划");
   },
   mounted () { },
   methods: {
@@ -157,6 +160,7 @@ export default {
       ActivityManager.saveActivityData(store.getters.useData, function (data) {
         store.commit("RSET_useData");
         that.$emit("doShow", false);
+        that.setMenuName("活动管理", "活动计划");
         that.$router.push("/activity/plan");
         that.currentStep = 0;
         that.modal_loading = false;