Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/Register.vue

@@ -306,8 +306,8 @@
       </div>
       <div class="audit-box" v-if="StepIndex==3">
         <img src="../assets/img/submit.png" alt="" />
-        <div>您的注册申请已提交</div>
-        <button class="el-button el-button--primary is-round" style="margin-top:15px;">
+        <div>您的注册申请已提交,请等待审核信息!</div>
+        <button class="el-button el-button--primary is-round" style="margin-top:15px;" @click="goLogin">
           <span>我知道了</span>
         </button>
       </div>
@@ -605,7 +605,6 @@
       LastStep() {
         this.apipost("/api/Tenant/SetTenantSecond", this.msg2, res => {
           if (res.data.resultCode == 1) {
-
             this.StepIndex = 3;
           } else {
             this.Info(res.data.message);

src/components/mall.vue

@@ -324,7 +324,7 @@
                 <span>店铺设计</span>
               </template>
               <el-menu-item-group>
-                <el-menu-item index="1-1" @click="changeMenu()">
+                <el-menu-item index="1-1">
                   <div class="isaa" :class="defaultActive=='1-1'?'isActive':''">轮播图</div>
                 </el-menu-item>
                 <el-menu-item index="1-2">
@@ -406,9 +406,9 @@
       //获取菜单列表
       getMenuList() {
         this.apipost("/api/Tenant/GetMenuList", {}, res => {
-          console.log(res);
           if (res.data.resultCode == 1) {
             this.MenuList = res.data.data;
+            console.log("this.MenuList",this.MenuList);
           } else {
             this.Info(res.data.message);
           }
@@ -424,7 +424,8 @@
         this.showTwo = true;
         this.isShowOne = false;
       },
-      changeMenu: function () {
+      //菜单点击
+      clickMenu(item){
         this.$router.push({
           path: 'Register'
         });