Merge remote-tracking branch 'remotes/origin/feature/20200514_version' into 0605

# Conflicts:
#	src/pages/Home.vue
#	src/pages/activity/useTable.vue

src/pages/Home.vue

@@ -1,52 +1,33 @@
 <template>
     <div class="layout">
         <Layout :style="{minHeight: '100vh'}">
-      <Sider collapsible
+            <Sider collapsible :collapsed-width="78" v-model="isCollapsed"  :hide-trigger="true" >
-             :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"
+                    <Poptip placement="bottom-start" width="200" :offset="-8">
-                  width="200"
+                        <img src="../../static/img/avatar.png" style="width: 32px;vertical-align: middle;cursor: pointer"/>
-                  :offset="-8">
-            <img src="../../static/img/avatar.png"
-                 style="width: 32px;vertical-align: middle;cursor: pointer" />
                         <div slot="content">
-              <div style="cursor: pointer;"
+                            <div style="cursor: pointer;" @click="logoutClick">
-                   @click="logoutClick">
                                 <span class="logout-span">退出登录</span>
-                <img class="logout-img"
+                                <img class="logout-img" src="../../static/img/logout.png"/>
-                     src="../../static/img/logout.png" />
                             </div>
                         </div>
                     </Poptip>
                     <span class="project-title">优客后台管理</span>
                 </div>
 
-        <Menu ref="menu"
+                <Menu ref="menu" :active-name="selectedItemName" :open-names="openName" theme="dark" width="auto"
-              :active-name="selectedItemName"
+                      @on-select="onSelectLister" :accordion="true">
-              :open-names="openName"
+                    <MenuItem v-if="roleCode === 'GLY-ADMIN' || roleCode === 'DG-YUNYING' || roleCode === 'GL-YUNYING'" :name="0" to="/customer/view">
-              theme="dark"
+                        <Icon type="ios-paper"/>
-              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"
+                    <Submenu :name="item.id" v-for="item in onePermissionList" :key="item.id">
-                   v-for="item in onePermissionList"
-                   :key="item.id">
                         <template slot="title">
-              <Icon type="ios-paper" />
+                            <Icon type="ios-paper"/>
                             {{item.name}}
                         </template>
-            <MenuItem :name="cItem.id"
+                        <MenuItem :name="cItem.id" :to="cItem.resource" v-for="cItem in item.subMenuList"
-                      :to="cItem.resource"
-                      v-for="cItem in item.subMenuList"
                                   :key="cItem.id">
                             {{cItem.name}}
                         </MenuItem>
@@ -57,13 +38,12 @@
                 <!--        <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"
+                        <BreadcrumbItem><span style="cursor: pointer" @click="breadcrumbClick">{{selectedMenu}}</span></BreadcrumbItem>
-                    @click="breadcrumbClick">{{selectedMenu}}</span></BreadcrumbItem>
                         <BreadcrumbItem>{{selectedSubMenu}}</BreadcrumbItem>
                     </Breadcrumb>
                     <Card>
                         <div :style="{'min-height':mHeight + 'px'}">
-              <router-view />
+                            <router-view/>
                         </div>
                     </Card>
                 </Content>
@@ -72,16 +52,16 @@
     </div>
 </template>
 <script>
-import homeRequest from "../services/home/homeRequest";
+    import homeRequest from "../services/home/homeRequest";
 
-export default {
+    export default {
-  provide () {
+        provide() {
             return {
                 checkParamBlank: this.checkParamBlank,
                 setMenuName: this.setMenuName,
             };
         },
-  data () {
+        data() {
             return {
                 roleCode: JSON.parse(sessionStorage.getItem("loginInfo")).roleCode,
                 mainUrl: "/customer/view",
@@ -105,7 +85,7 @@ export default {
                 breadcrumbUrl: "",
             }
         },
-  mounted () {
+        mounted() {
             let that = this;
             this.bus.$on('callBack', function (item) {
                 that.callBack(item);
@@ -114,7 +94,7 @@ export default {
             //     that.setHeader(data);
             // })
         },
-  created () {
+        created() {
             // this.mHeight = window.screen.availHeight - 22;
 
             //获取导航栏权限
@@ -135,20 +115,20 @@ export default {
 
         },
         methods: {
-    onSelectLister (val) {
+            onSelectLister(val) {
                 let i;
                 this.onePermissionList.forEach(function (data) {
                     data.subMenuList.forEach(function (dta) {
-          if (dta.id === val) {
+                        if(dta.id === val){
                             i = dta;
                         }
                     })
                 });
-      if (i) {
+                if(i){
-        sessionStorage.setItem("threeLevel", JSON.stringify(i.subMenuList));
+                    sessionStorage.setItem("threeLevel",JSON.stringify(i.subMenuList));
                 }
                 //首页
-      if (val === 0) {
+                if(val === 0){
                     this.selectedMenu = "首页";
                     this.selectedSubMenu = "";
                     this.breadcrumbUrl = this.mainUrl;
@@ -182,7 +162,7 @@ export default {
                 }
             },
             //获取导航栏一级权限
-    listOnePermission (level) {
+            listOnePermission(level) {
                 let that = this;
                 let userId = JSON.parse(sessionStorage.getItem("loginInfo")).userId;
                 let request = {
@@ -208,7 +188,7 @@ export default {
                 })
             },
             //获取二级权限
-    listTwoPermission (level) {
+            listTwoPermission(level) {
                 let userId = JSON.parse(sessionStorage.getItem("loginInfo")).userId;
                 let that = this;
                 that.twoPermissionList = [];
@@ -235,7 +215,7 @@ export default {
                 })
             },
             //获取三级权限
-    listThreePermission (level) {
+            listThreePermission(level) {
                 let userId = JSON.parse(sessionStorage.getItem("loginInfo")).userId;
                 let that = this;
                 that.threePermissionList = [];
@@ -278,36 +258,53 @@ export default {
             //导航栏初始化
             menuInit: function () {
                 let that = this;
-      if (this.roleCode === 'GLY-ADMIN' || this.roleCode === 'DG-YUNYING' || this.roleCode === 'GL-YUNYING') {
+                if(this.roleCode === 'GLY-ADMIN' || this.roleCode === 'DG-YUNYING' || this.roleCode === 'GL-YUNYING'){
                     //默认首页
                     that.selectedItemName = 0;
-        this.$router.push({ path: that.mainUrl });
+                    this.$router.push({path: that.mainUrl});
                     this.selectedMenu = "首页";
                     this.breadcrumbUrl = this.mainUrl;
-      } else {
+                }else{
                     that.selectedItemName = that.onePermissionList[0].subMenuList[0].id;
                     that.openName = [that.onePermissionList[0].id];
 
                     this.selectedMenu = this.onePermissionList[0].name;
                     this.selectedSubMenu = this.onePermissionList[0].subMenuList[0].name;
-        sessionStorage.setItem("threeLevel", JSON.stringify(this.onePermissionList[0].subMenuList[0].subMenuList));
+                    sessionStorage.setItem("threeLevel",JSON.stringify(this.onePermissionList[0].subMenuList[0].subMenuList));
                     // this.$nextTick(() => {
                     //     this.$refs.menu.updateOpened();
                     //     this.$refs.menu.updateActiveName();
                     // });
-        this.$router.push({ path: that.onePermissionList[0].subMenuList[0].resource });
+                    this.$router.push({path: that.onePermissionList[0].subMenuList[0].resource});
                 }
 
             },
             //账户管理页面回调方法
-    callBack (item) {
+            callBack(val) {
-      let that = this;
+                this.selectedMenu = val.selectedMenu;
-      this.selectedMenu = "设置管理";
+                this.selectedSubMenu = val.selectedSubMenu;
-      this.selectedSubMenu = "账户管理";
+
-      this.selectedItemName = this.onePermissionList[2].subMenuList[0].id;
+                let url = "";
-      this.$router.push({ path: '/account/manager', query: item });
+                for (let i = 0; i < this.onePermissionList.length; i++) {
+                    let item = this.onePermissionList[i];
+                    for (let k = 0; k < item.subMenuList.length; k++) {
+                        let cItem = item.subMenuList[k];
+                        if(cItem.name === val.selectedSubMenu){
+                            this.selectedItemName = cItem.id;
+                            url = cItem.resource;
+
+                        }
+                    }
+                }
+
+                if(val.type === 1){
+                    this.$router.push({path: url,query:val.data});
+                }else{
+                    this.$router.push(url);
+                }
+
             },
-    setHeader (data) {
+            setHeader(data){
                 let that = this;
                 this.selectedSubMenu = data.header;
                 this.$nextTick(() => {
@@ -316,19 +313,12 @@ export default {
             },
             //手动设置面包屑
             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 () {
-      if (this.selectedMenu === "首页") {
+                if(this.selectedMenu === "首页"){
                     this.selectedSubMenu = "";
                 }
                 this.$router.push(this.breadcrumbUrl);
@@ -342,26 +332,27 @@ export default {
                 this.$Message.info("登出成功");
             }
         },
-}
+    }
 </script>
 <style scoped>
-.layout-con {
+
+    .layout-con {
         height: 100%;
         width: 100%;
-}
+    }
-/*项目标题*/
+    /*项目标题*/
-.project-title {
+    .project-title{
         font-size: 22px;
         margin-left: 15px;
-}
+    }
-/*退出登入*/
+    /*退出登入*/
-.logout-span {
+    .logout-span{
         font-size: 15px;
         vertical-align: middle;
         color: #535353;
-}
+    }
-.logout-img {
+    .logout-img{
         vertical-align: middle;
         margin-left: 80px;
-}
+    }
 </style>

src/pages/activity/useActivityStepOne.vue

@@ -175,7 +175,8 @@ export default {
 
 .text {
   position: relative;
-  left: 100px;
+  left: 50px;
+  line-height: 44px;
 }
 
 .inputClass {

src/pages/activity/useTable.vue

@@ -1,50 +1,46 @@
 <template>
   <div class="use_box">
-    <Modal :scrollable="false"
+    <Modal
+      :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;"
+    >
-             :current="currentStep">
+      <Steps style="padding: 40px;" :current="currentStep">
         <Step title="基本信息"></Step>
-        <Step :title="isModify ? '修改零售公司' : '选择零售公司'"
+        <Step :title="isModify ? '修改零售公司' : '选择零售公司'" content></Step>
-              content></Step>
+        <Step :title="isModify ? '修改店铺' : '选择店铺'" content></Step>
-        <Step :title="isModify ? '修改店铺' : '选择店铺'"
+        <Step title="确认信息" content></Step>
-              content></Step>
-        <Step title="确认信息"
-              content></Step>
       </Steps>
-      <useActivityStepOne :schedule="schedule"
+      <useActivityStepOne :schedule="schedule" :isModify="isModify" v-if="currentStep == 0 && show"></useActivityStepOne>
-                          :isModify="isModify"
+      <useActivityStepTwo :schedule="schedule" :isModify="isModify" v-if="currentStep == 1"></useActivityStepTwo>
-                          v-if="currentStep == 0 && show"></useActivityStepOne>
+      <useActivityStepThree :schedule="schedule" :isModify="isModify" v-if="currentStep == 2"></useActivityStepThree>
-      <useActivityStepTwo :schedule="schedule"
+      <useActivityStepFoure :schedule="schedule" :isModify="isModify" v-if="currentStep == 3"></useActivityStepFoure>
-                          :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 v-if="currentStep !== 0"
+        <Button
+          v-if="currentStep !== 0"
           type="primary"
           shape="circle"
           :loading="modal_loading"
-                @click="back">上一步</Button>
+          @click="back"
-        <Button v-if="currentStep !== 3"
+        >上一步</Button>
+        <Button
+          v-if="currentStep !== 3"
           type="primary"
           shape="circle"
           :loading="modal_loading"
-                @click="next">下一步</Button>
+          @click="next"
-        <Button v-if="currentStep == 3"
+        >下一步</Button>
+        <Button
+          v-if="currentStep == 3"
           type="primary"
           shape="circle"
           :loading="modal_loading"
-                @click="finish">完成</Button>
+          @click="finish"
+        >完成</Button>
       </div>
     </Modal>
   </div>
@@ -66,7 +62,7 @@ export default {
     useActivityStepFoure
   },
   inject: ["setMenuName"],
-  data () {
+  data() {
     return {
       currentStep: 0,
       modal_loading: false,
@@ -87,26 +83,27 @@ export default {
     }
   },
   watch: {
-    show () {
+    show() {
       this.showUse = this.show;
     },
-    schedule () {
+    schedule() {
       store.getters.useData.scheduleId = this.schedule.id;
     }
   },
-  created () {
+  created() {
+    this.setMenuName("活动管理", "活动计划");
   },
-  mounted () { },
+  mounted() {},
   methods: {
-    visibleChange (show) { },
+    visibleChange(show) {},
-    cancel () {
+    cancel() {
       store.commit("RSET_useData");
       this.$emit("doShow", false);
       this.modal_loading = false;
       this.showUse = false;
       this.currentStep = 0;
     },
-    next () {
+    next() {
       let data = store.getters.useData;
       data.name = this.schedule.name;
       if (this.currentStep === 0) {
@@ -149,22 +146,29 @@ export default {
       store.commit("SET_useData", data);
       this.currentStep = this.currentStep + 1;
     },
-    back () {
+    back() {
       this.currentStep = this.currentStep - 1;
     },
-    finish () {
+    finish() {
       let that = this;
       let data = store.getters.useData;
       data.isGetActivityInfo = true;
       this.modal_loading = true;
-      ActivityManager.saveActivityData(store.getters.useData, function (data) {
+      ActivityManager.saveActivityData(store.getters.useData, function(data) {
         store.commit("RSET_useData");
         that.$emit("doShow", false);
-        that.setMenuName("活动管理", "活动计划");
+        // that.$router.push("/activity/plan");
-        that.$router.push("/activity/plan");
         that.currentStep = 0;
         that.modal_loading = false;
         that.showUse = false;
+
+        let request = {
+          selectedMenu: "活动管理",
+          selectedSubMenu: "活动计划",
+          data: {},
+          type: 2
+        };
+        that.bus.$emit("callBack",request);
       });
     }
   }

src/pages/user/RoleManager.vue

@@ -367,7 +367,13 @@
             goToAccManagerPage: function (item) {
                 // this.$router.push({path: '/account/manager',query:item});
                 // 回调首页更新菜单栏选择
-                this.bus.$emit("callBack",item);
+                let request = {
+                    selectedMenu: "设置管理",
+                    selectedSubMenu: "账户管理",
+                    data: item,
+                    type: 1
+                };
+                this.bus.$emit("callBack",request);
             },
             //选中角色
             selectRole: function (id) {

src/services/CommonHttp.js

@@ -7,7 +7,7 @@ import commonUtils from '../utils/Common'
 // http://mf.kiisoo.com:58080/
 // axios.defaults.baseURL = 'https://wxtk.bsdits.com/kiisoo-ic/';
 axios.defaults.baseURL =
-  process.env.NODE_ENV === 'production' ? '/kiisoo-ic' : '/kiisoo-ic'
+  process.env.NODE_ENV === 'production' ? 'https://wxtk.bsdits.com/kiisoo-ic/' : '/kiisoo-ic'
 
 //响应时间
 axios.defaults.timeout = 120000