菜单配置等

epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss

@@ -637,7 +637,10 @@
 									}
 								}
 							}
+
+           
 						}
+           
 					}
         }
         
@@ -841,7 +844,68 @@
 									color: rgba(51, 51, 51, 1);
 								}
 							}
+
+						}
+					}
+        }
+
+        // 更多功能2
+        .mw-cpt-cnt_function2 {
+					position: relative;
+					margin-top: 10px;
+
+					.d-cpt-wrap {
+            border-radius: 10px;
+						// overflow-x: scroll;
+						overflow: hidden;
+            margin: 0 13px;
+            background-color: white;
+				
+            .link {
+              width: 100%;
+              position: relative;
+
+              > img {
+                width: 308px;
+                margin: 13px;
+                height: 160px;
+                border-radius: 10px;
+              }
+              span {
+                position: absolute;
+                top: 30px;
+                left: 20px;
+                color: #fff;
+                font-size: 22px;
+                font-family: PingFang SC;
+                font-weight: bold;
+                color: #ffffff;
+              }
             }
+            .dots {
+              position: absolute;
+              bottom: 12px;
+              left: 0;
+              right: 0;
+              width: 100%;
+              display: flex;
+              justify-content: center;
+          
+              > i {
+                float: right;
+                position: relative;
+                top: 11px;
+                margin: 0 2px;
+                width: 5px;
+                height: 5px;
+                border-radius: 50%;
+                background: rgba(0, 0, 0, 0.26);
+                &.z-on {
+                  background: rgba(255, 255, 255, 1);
+                }
+              }
+            }
+				
 					}
         }
         

epmet-oper-web/src/components/wx-index/cpt-item.vue

@@ -144,7 +144,7 @@
       </div>
     </div>
 
-    <!-- 中间菜单栏组件 -->
+    <!-- 更多功能组件 -->
     <div class="mw-cpt-cnt_menus"
          v-else-if="item.componentFrontId==='resi-functionList-extend-moreFunctionIcons'">
       <div class="d-cpt-wrap">
@@ -167,7 +167,34 @@
         </div>
       </div>
     </div>
+    <!-- 更多功能2栏组件 -->
+    <div class="mw-cpt-cnt_function2"
+         v-else-if="item.componentFrontId==='resi-functionList-extend-moreFunctionIcons2'">
+      <div class="d-cpt-wrap">
+
+        <div class="link">
+          <img src="@/assets/img/modules/wx-mini/index-set/wailian-bg.jpg"
+               mode="aspectFill" />
+          <span>{{'建议直通车'}}</span>
+          <img src="@/assets/img/modules/wx-mini/index-set/wailian-bg.jpg"
+               mode="aspectFill" />
+          <span>{{'建议直通车'}}</span>
+
+        </div>
+        <div class="dots">
+          <i></i>
+          <i></i>
+          <i></i>
+          <i class="z-on"></i>
+          <!-- <div class="dot {{index==currentIndex ? 'z-on' : ''}}"
+               wx:key="*this"
+               wx:for-index="index"
+               wx:for-item="item"
+               wx:for="{{list}}"></div> -->
+        </div>
 
+      </div>
+    </div>
     <!-- 群组件 -->
     <div class="mw-cpt-cnt_groups"
          v-else-if="item.componentFrontId==='resi-functionList-group-recommendGroupSlider'">
@@ -356,7 +383,8 @@
             <p class="rank_title_right">社区党员</p>
           </div>
           <div class="rank_img_score">
-	    	<div class="list"><!--:key,列表循环的唯一标识符 -->
+            <div class="list">
+              <!--:key,列表循环的唯一标识符 -->
               <div class="item"
                    :key="subindex"
                    v-for="(subitem, subindex) in item.demoData.list1">
@@ -370,9 +398,12 @@
                 </div>
 
                 <div class="d-group-rank">
-	    			<span v-if="subindex===0" class="rank_1">2</span>
+                  <span v-if="subindex===0"
-	    			<span v-if="subindex===1" class="rank_2">1</span>
+                        class="rank_1">2</span>
-	    			<span v-if="subindex===2" class="rank_3">3</span>
+                  <span v-if="subindex===1"
+                        class="rank_2">1</span>
+                  <span v-if="subindex===2"
+                        class="rank_3">3</span>
 
                 </div>
 
@@ -397,17 +428,22 @@
                 </div>
 
                 <div class="d-group-score">
-	    			<span v-if="subindex===0" class="score_1">{{subitem.title1}}</span>
+                  <span v-if="subindex===0"
-	    			<span v-if="subindex===1" class="score_2">{{subitem.title2}}</span>
+                        class="score_1">{{subitem.title1}}</span>
-	    			<span v-if="subindex===2" class="score_3">{{subitem.title3}}</span>
+                  <span v-if="subindex===1"
+                        class="score_2">{{subitem.title2}}</span>
+                  <span v-if="subindex===2"
+                        class="score_3">{{subitem.title3}}</span>
                 </div>
 
                 <div class="d-group-name">
 
-
+                  <span v-if="subindex===0"
-	    	   	<span v-if="subindex===0" class="name_1">{{subitem.info1}}</span>
+                        class="name_1">{{subitem.info1}}</span>
-	    	   	<span v-if="subindex===1" class="name_2">{{subitem.info2}}</span>
+                  <span v-if="subindex===1"
-	    	   	<span v-if="subindex===2" class="name_3">{{subitem.info3}}</span>
+                        class="name_2">{{subitem.info2}}</span>
+                  <span v-if="subindex===2"
+                        class="name_3">{{subitem.info3}}</span>
 
                 </div>
               </div>
@@ -443,7 +479,7 @@
                   <img v-else-if="subindex===3"
                        src="../../assets/img/modules/wx-mini/index-set/page/duck.jpg"
                        class="list3_img1">
-					<img v-else="subindex===4"
+                  <img v-else-if="subindex===4"
                        src="../../assets/img/modules/wx-mini/index-set/page/duck.jpg"
                        class="list3_img1">
                 </div>
@@ -456,8 +492,6 @@
               </div>
             </div>
 
-
-
           </div>
 
           <div class="line"></div>
@@ -467,8 +501,6 @@
       </div>
     </div>
 
-
-
     <!-- 占位组件 -->
     <div class="mw-cpt-placeholder"
          v-else>
@@ -479,6 +511,7 @@
 
     <!-- 操作区 -->
     <div class="d-cpt-operate a-scale-in"
+         z
          :class="{'z-small': item.region!=='functionList'}"
          v-show="isFocused"
          @click.stop>

epmet-oper-web/src/router/index.js

@@ -124,56 +124,56 @@ router.beforeEach((to, from, next) => {
   if (userType === 'work') {
     const customerId=localStorage.getItem('customerId')
     console.log('customerId：' ,customerId)
-    if(customerId==='1e68188b8f7e9ab15658c164bd5b3676'){
+    // if(customerId==='1e68188b8f7e9ab15658c164bd5b3676'){
-    // if(customerId==='45687aa479955f9d06204d415238f7cc'){
+    // // if(customerId==='45687aa479955f9d06204d415238f7cc'){
-      const menuList=[
+    //   const menuList=[
-        {
+    //     {
-          children: [],
+    //       children: [],
-          createdBy: "a76fc711807ac9827d7611b0f94ec220",
+    //       createdBy: "a76fc711807ac9827d7611b0f94ec220",
-          createdTime: "2020-08-26 16:38",
+    //       createdTime: "2020-08-26 16:38",
-          delFlag: null,
+    //       delFlag: null,
-          icon: "icon-database",
+    //       icon: "icon-database",
-          id: "abe812eb350f6b5eda575e268e50ac1c",
+    //       id: "abe812eb350f6b5eda575e268e50ac1c",
-          name: "定制功能配置",
+    //       name: "定制功能配置",
-          parentName: null,
+    //       parentName: null,
-          permissions: "",
+    //       permissions: "",
-          pid: "0",
+    //       pid: "0",
-          resourceList: null,
+    //       resourceList: null,
-          revision: 0,
+    //       revision: 0,
-          showFlag: 1,
+    //       showFlag: 1,
-          sort: 2,
+    //       sort: 2,
-          type: 0,
+    //       type: 0,
-          updatedBy: "a76fc711807ac9827d7611b0f94ec220",
+    //       updatedBy: "a76fc711807ac9827d7611b0f94ec220",
-          updatedTime: "2020-09-02 14:49",
+    //       updatedTime: "2020-09-02 14:49",
-          url: "customer/customize/ConfigItem",
+    //       url: "customer/customize/ConfigItem",
-        },
+    //     },
-        {
+    //     {
-          children: [],
+    //       children: [],
-          createdBy: "a76fc711807ac9827d7611b0f94ec220",
+    //       createdBy: "a76fc711807ac9827d7611b0f94ec220",
-          createdTime: "2020-08-26 16:38",
+    //       createdTime: "2020-08-26 16:38",
-          delFlag: null,
+    //       delFlag: null,
-          icon: "icon-file-text",
+    //       icon: "icon-file-text",
-          id: "8e55eba74c920c00c44c125e3bc73ddc",
+    //       id: "8e55eba74c920c00c44c125e3bc73ddc",
-          name: "居民端首页配置",
+    //       name: "居民端首页配置",
-          parentName: null,
+    //       parentName: null,
-          permissions: "",
+    //       permissions: "",
-          pid: "0",
+    //       pid: "0",
-          resourceList: null,
+    //       resourceList: null,
-          revision: 0,
+    //       revision: 0,
-          showFlag: 1,
+    //       showFlag: 1,
-          sort: 3,
+    //       sort: 3,
-          type: 0,
+    //       type: 0,
-          updatedBy: "a76fc711807ac9827d7611b0f94ec220",
+    //       updatedBy: "a76fc711807ac9827d7611b0f94ec220",
-          updatedTime: "2020-09-02 14:49",
+    //       updatedTime: "2020-09-02 14:49",
-          url: "customer/customize/MiniHome",
+    //       url: "customer/customize/MiniHome",
-        }
+    //     }
-      ]
+    //   ]
 
-      window.SITE_CONFIG['menuList'] = menuList
+    //   window.SITE_CONFIG['menuList'] = menuList
-      fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList'])
+    //   fnAddDynamicMenuRoutes(window.SITE_CONFIG['menuList'])
+    //   // next({ ...to, replace: true })
     //   next({ ...to, replace: true })
-      next({ ...to, replace: true })
+    //  }else{
-     }else{
       http
       .get('/gov/access/menu/nav')
       .then(({ data: res }) => {
@@ -189,7 +189,7 @@ router.beforeEach((to, from, next) => {
       .catch(() => {
         next({ name: 'loginWork' })
       })
-     }
+    //  }
 
     // localStorage.getItem('customerId')
     // 1e68188b8f7e9ab15658c164bd5b3676

epmet-oper-web/src/views/modules/customer/customize/ConfigEdit.vue

@@ -35,8 +35,9 @@
       <div v-if="userType==='oper'"
            style="margin-top:20px">
         <el-form-item label="外链地址"
+                      class="block"
                       prop="targetLink">
-          <el-input class="item_width_1"
+          <el-input style="width:400px;display:block;margin-bottom:10px; float:left"
                     v-model="dataForm.targetLink"
                     placeholder="外链地址"></el-input>
 
@@ -51,7 +52,7 @@
 
           <div>
 
-            <el-input style="width:300px;display:block;margin-bottom:10px; float:left"
+            <el-input style="width:400px;display:block;margin-bottom:10px; float:left"
                       placeholder='请输入业务域名'
                       v-model="dataForm.domainName"> </el-input>
 

epmet-oper-web/src/views/modules/customer/customize/MiniHome.vue

@@ -180,15 +180,14 @@
                   <span>{{ focusedCpt.configurationDescription }}</span>
                 </div>
 
-                <div v-if="focusedCpt.componentFrontId === 'resi-functionList-heart-banner'" class="d-set-banners">
+                <div v-if="focusedCpt.componentFrontId === 'resi-functionList-heart-banner'"
+                     class="d-set-banners">
                   <span>Banner图</span>
-                  <el-upload
+                  <el-upload class="upload-demos"
-                    class="upload-demos"
                              :show-file-list="false"
                              :on-success="handleBannerSuccess"
                              :before-upload="beforeBannerUpload"
-                    :action="uploadUlr"
+                             :action="uploadUlr">
-                    >
                     <i class="el-icon-plus avatar-uploader-icon"></i>
                   </el-upload>
                 </div>
@@ -810,6 +809,7 @@ export default {
     addCpt (item, tempOnlyId, displayOrder = 0) {
       console.log('添加组件到实例')
       let trueItem = cloneDeep(item)
+      debugger
       trueItem.tempOnlyId = tempOnlyId
       trueItem.displayOrder = displayOrder
       this.cptList.push(trueItem)