Merge branch 'hjw-qudao' into 'master'

Hjw qudao

See merge request spfm/spfm-market-front!407

public/index.html

@@ -19,7 +19,7 @@
   <link rel='stylesheet' href='/static/js/luckysheet/plugins/plugins.css' />
   <link rel='stylesheet' href='/static/js/luckysheet/css/luckysheet.css' />
   <link rel='stylesheet' href='/static/js/luckysheet/assets/iconfont/iconfont.css' />
-
+  <script src="./static/js/base64.min.js"></script>
   <script src="/static/js/ace.js"></script>
 </head>
 

src/pages/main/memberFamily/dataStatistics.vue

@@ -30,6 +30,9 @@
 						</template>
 					</el-table-column>
 				</el-table>
+				<el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
+                    :total="total">
+                </el-pagination>
 			</div>
 		</div>
 	</fullscreen>

src/pages/main/memberFamily/index.vue

@@ -17,7 +17,8 @@
 						
 
 					</div>
-					<div @click="advmaterial(typeList[1])" v-if="roleStatus <= 1">
+					<!-- <div @click="advmaterial(typeList[1])" v-if="roleStatus <= 1"> -->
+					<div @click="advmaterial(typeList[1])" v-if="roleStatus <= 2">
 						
 							<span><i class="el-icon-folder-opened"></i></span>
 							<span>信息汇总</span>