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

src/components/Index.vue

@@ -90,7 +90,7 @@
               <el-table-column prop="name" label="商城名称" width="155">
                 <template slot-scope="scope">
                   <p style="color:#409EFF;cursor:pointer;"
-                    @click="setMallBaseId(scope.row.MallBaseId,scope.row.MallName),CommonJump('mall',{})">
+                    @click="setMallBaseId(scope.row.MallBaseId,scope.row.MallName),goHomePage()">
                     {{scope.row.MallName}}</p>
                   <p>账号:{{scope.row.Account}}</p>
                   <p>
@@ -707,6 +707,15 @@
           }
         })
       },
+      //跳转至首页
+      goHomePage(){
+        this.$router.push({
+          name: 'mall',
+          query: {
+            FIndex:1
+          }
+        });
+      }
     },
     mounted() {
       this.TestMall();

src/components/StoreDesign/customPoster.vue

 <style>
-  .custom_Header {
+  .customPoster .custom_Header {
     padding: 0 20px;
     height: 56px;
     line-height: 56px;
@@ -7,7 +7,7 @@
     margin-bottom: 15px;
   }
 
-  .custom_Main {
+  .customPoster .custom_Main {
     display: flex;
   }
 
@@ -122,7 +122,7 @@
     overflow: hidden;
   }
 
-  .poster_User {
+  .customPoster .poster_User {
     margin-top: 96px;
     margin-bottom: 64px;
   }
@@ -152,7 +152,7 @@
     border-radius: 16px 16px 0 0;
   }
 
-  .goodsone_bg {
+  .customPoster .goodsone_bg {
     height: 310px;
     margin: 0 auto;
     width: 702px;
@@ -161,18 +161,18 @@
     border-radius: 0 0 16px 16px;
   }
 
-  .goods-name {
+  .goodsone_bg .goods-name {
     padding: 28px 0;
     font-size: 34px;
     color: #353535;
   }
 
-  .goods_price {
+  .customPoster .goods_price {
     padding-top: 50px;
     color: #ff4544;
   }
 
-  .goods_remark {
+  .customPoster .goods_remark {
     margin-top: 28px;
     color: #999999;
     font-size: 28px;

src/components/mall.vue

@@ -462,13 +462,18 @@
       goLittlePrograme(){
         let routeData = this.$router.resolve({
           name: 'Fsetting',
-          query: {}
+          query: {
+            FIndex:1
+          }
         });
         window.open(routeData.href, "_blank");
       }
     },
     mounted() {
       this.getMenuList();
+      if(this.$route.query.FIndex){
+        this.CommonJump('zanIndex');
+      }
       this.Height = document.documentElement.clientHeight - 60;
       //监听浏览器窗口变化　
       window.onresize = () => {

src/components/sallCenter/templateEdit.vue

@@ -33,13 +33,13 @@
     border-bottom: 1px solid #eeeeee;
   }
 
-  .all-components .component-list {
+  .all-components .Mycomponent-list {
     margin-right: -2px;
     margin-top: -2px;
     flex-wrap: wrap;
   }
 
-  .all-components .component-list .component-item {
+  .all-components .Mycomponent-list .Mycomponent-item {
     width: 100px;
     height: 100px;
     border: 0 solid #eeeeee;
@@ -49,7 +49,7 @@
     cursor: pointer;
   }
 
-  .component-item:nth-child(3n) {
+  .Mycomponent-item:nth-child(3n) {
     border-right: 0 !important;
   }
 
@@ -189,8 +189,8 @@
         </el-form>
         <div class="component-group" v-for="(item,index) in allComponents" :key="index">
           <div class="component-group-name">{{item.GroupName}}</div>
-          <div flex class="component-list">
-            <div class="component-item" v-for="(subItem,subIndex) in item.SubList" @click="addPlugin(subItem.Id)"
+          <div flex class="Mycomponent-list">
+            <div class="Mycomponent-item" v-for="(subItem,subIndex) in item.SubList" @click="addPlugin(subItem.Id)"
               :key="subIndex">
               <img :src="subItem.Icon" alt="" />
               <div>{{subItem.Name}}</div>