Merge branch 'feature/去掉footer'

# Conflicts:
#	src/components/photo-album/album.vue

src/components/achievement/achievement_interaction.vue

@@ -102,9 +102,9 @@
         </div>
       </div>
     </div>
-    <div class="footer-box">
+    <!-- <div class="footer-box">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
     <!--编辑奖励-->
     <el-dialog
       title="编辑奖励"

src/components/achievement/achievement_sale.vue

@@ -96,9 +96,9 @@
       </div>
     </div>
 
-    <div class="footer-box">
+    <!-- <div class="footer-box">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
     <!--编辑奖励-->
     <el-dialog
       title="编辑奖励"

src/components/block-list/index.vue

@@ -99,9 +99,9 @@
       </el-dialog>
 
     </div>
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 <script>

src/components/labelmanager/labelmanager.vue

@@ -164,9 +164,9 @@
       </el-dialog>
       <!--新增标签-end-->
     </div>
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/membergroup/membergroup.vue

@@ -121,9 +121,9 @@
         </div>
       </div>
     </div>
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/membergroup/membergroupAdd.vue

@@ -80,7 +80,7 @@
         </div>
       </div>
     </div>
-    <vue-gic-footer></vue-gic-footer>
+    <!-- <vue-gic-footer></vue-gic-footer> -->
     <div class="footwrap">
       <el-button
         type="primary"

src/components/membergroup/membergroupDetail.vue

@@ -188,7 +188,7 @@
         </div>
       </div>
     </div>
-    <vue-gic-footer></vue-gic-footer>
+    <!-- <vue-gic-footer></vue-gic-footer> -->
     <!-- <div class="footwrap">
       <el-button plain @click="goback">返回</el-button>
     </div> -->

src/components/memberlist/memberReturn.vue

@@ -647,9 +647,9 @@
         ></vue-gic-store>
       </div>
     </div>
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/memberlist/pos-recycle.vue

@@ -646,9 +646,9 @@
         ></vue-gic-store>
       </div>
     </div>
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/membertask/membertask.vue

@@ -86,9 +86,9 @@
         </div>
       </div>
     </div>
-    <div class="footer-box foot-add">
+    <!-- <div class="footer-box foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/photo-album/album.vue

@@ -2,7 +2,7 @@
   <div class="page-content">
     <v-nav :navpath="navpath"></v-nav>
     <photo-album :member-id="memberId" :from="from" />
-    <vue-gic-footer style="padding-bottom:80px"></vue-gic-footer>
+    <!-- <vue-gic-footer style="padding-bottom:80px"></vue-gic-footer> -->
   </div>
 </template>
 

src/components/photo-album/img-list.vue

@@ -2,7 +2,7 @@
   <div class="page-content">
     <v-nav :navpath="navpath"></v-nav>
     <photo-album :member-id="memberId" :folder-id="folderId"/>
-    <vue-gic-footer style="padding-bottom:80px"></vue-gic-footer>
+    <!-- <vue-gic-footer style="padding-bottom:80px"></vue-gic-footer> -->
   </div>
 </template>
 

src/components/posmembers/posmemberDetail.vue

@@ -273,9 +273,9 @@
         </span>
     </el-dialog>
     <!--会员等级修改-弹框-end-->
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/posmembers/posmembers.vue

@@ -877,9 +877,9 @@
         ></vue-gic-store>
       </div>
     </div>
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/wechatmembers/abnormal-member-option.vue

@@ -209,9 +209,9 @@
       </div>
     </div>
 
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
 
   </div>
 </template>

src/components/wechatmembers/ajaxmembersinfo.vue

@@ -409,9 +409,9 @@
       </span>
     </el-dialog>
     <!--订单详情-end-->
-    <div class="footer-box">
+    <!-- <div class="footer-box">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/wechatmembers/bulkIntegral.vue

@@ -95,7 +95,7 @@
         </dm-pagination>
       </div>
     </div>
-    <vue-gic-footer></vue-gic-footer>
+    <!-- <vue-gic-footer></vue-gic-footer> -->
 
     <!-- 新建导入 -->
     <el-dialog

src/components/wechatmembers/bulkLogsDetail.vue

@@ -93,7 +93,7 @@
         </dm-pagination>
       </div>
     </div>
-    <vue-gic-footer></vue-gic-footer>
+    <!-- <vue-gic-footer></vue-gic-footer> -->
   </div>
 </template>
 <script>

src/components/wechatmembers/frozenList.vue

@@ -233,9 +233,9 @@
       </div>
     </div>
 
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/wechatmembers/frozenMember.vue

@@ -236,9 +236,9 @@
       </div>
     </div>
 
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
 
   </div>
 </template>

src/components/wechatmembers/infoMall.vue

@@ -159,9 +159,9 @@
       </div>
     </div>
 
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
 
   </div>
 </template>

src/components/wechatmembers/integralDataPage.vue

@@ -208,9 +208,9 @@
       </span>
     </el-dialog>
 
-    <div class="footer-box">
+    <!-- <div class="footer-box">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/wechatmembers/memberSetting.vue

@@ -15,9 +15,9 @@
         </div>
       </div>
     </div>
-    <div class="footer-box">
+    <!-- <div class="footer-box">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/wechatmembers/talkLogPage.vue

@@ -157,9 +157,9 @@
       </div>
     </div>
 
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
 
     <!-- <div class="footwrap">
       <el-button plain @click="goback">返回</el-button>

src/components/wechatmembers/wechat-total.vue

@@ -688,9 +688,9 @@
           :selectId="selectId"></vue-gic-store>
       </div>
     </div>
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/wechatmembers/wechatmemberDetail.vue

@@ -679,7 +679,7 @@
     </el-dialog>
     <!--修改导购备注-end-->
     <ModifyGuide :dialogVisible.sync="modifyClerkDialog" :memberId="memberbaseinfo.memberId" :mainStoreId="memberbaseinfo.mainStoreId" @getList="getBaseDetail" />
-    <vue-gic-footer></vue-gic-footer>
+    <!-- <vue-gic-footer></vue-gic-footer> -->
   </div>
 </template>
 

src/components/wechatmembers/wechatmembers.vue

@@ -869,9 +869,9 @@
         ></vue-gic-store>
       </div>
     </div>
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/components/wechatmembers/wmDetail.vue

@@ -129,9 +129,9 @@
       </div>
     </div>
 
-    <div class="foot-add">
+    <!-- <div class="foot-add">
       <vue-gic-footer></vue-gic-footer>
-    </div>
+    </div> -->
 
   </div>
 </template>