Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-xqjy

# Conflicts:
#	pages/login/register.vue
#	pages/login/searchNone.vue

pages/index/index.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :is-back="false"></u-navbar>
 		<view class="home-head">
 			<view class="homeTab">
 				<u-tabs :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>

pages/login/agreement.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar></u-navbar>
 		<view class="article">
 			<view class="article-tit">
 				“荆州工会鹊桥”会员注册协议

pages/login/change.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :background="background" :border-bottom="false"></u-navbar>
 		<view class="jpLogin">
 			<view class="jpLogin-title">
 				<h2>更换手机号</h2>
@@ -53,6 +54,11 @@
 				customStyle:{
 					background: '#FF5E5E'
 				},
+
+				background:{
+					background: 'none'
+				},
+				
 				isSendMsgIng: false,
 				sendMsgSecond: 60 * 2,
 			}
@@ -169,6 +175,7 @@
 		background-size: 100%;
 		min-height: 100vh;
 		padding: 50px;
+		margin-top: -44PX;
 	}
 
 	.jpLogin-title {

pages/login/search.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar back-text="查找工会"></u-navbar>
 		<view class="search">
 			<u-search placeholder="输入关键字查询工会" v-model="keyword" :action-style="actionStyle" @custom="searchQrg" @search="searchQrg"></u-search>
 		</view>

pages/login/searchNone.vue

@@ -0,0 +1,57 @@
+<template>
+	<view>
+		<u-navbar back-text="查找工会"></u-navbar>
+		<view class="search">
+			<u-search placeholder="输入关键字查询工会" v-model="keyword" :action-style="actionStyle"></u-search>
+		</view>
+		<view class="jpDefault">
+			<u-image width="179px" height="126px" src="/static/img/default1.png"></u-image>
+			<p>没有匹配的搜索结果</p>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				keyword: '',
+				actionStyle:{
+					background: '#FF5E5E',
+					color:'#ffffff',
+					padding:'5px 0',
+					width:'60px',
+					borderRadius:'15px',
+				},
+			}
+			methods: {
+
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.search{
+		padding:10px 15px;
+	}
+	.searchList{
+		padding:0 15px;
+		.searchList-item{
+			border-bottom: 1px solid #E5E7EA;
+			padding:15px 0; 
+		}
+	}
+	.jpDefault{
+		padding-top:150px;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		p{
+			color: #A69F9F;
+			font-size: 16px;
+			margin-top: 12px;
+		}
+	}
+</style>

pages/login/step1.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :background="background" :border-bottom="false"></u-navbar>
 		<view class="jpLogin">
 			<view class="jpLogin-title">
 				<h2>填写基础信息<span>1</span>/4</h2>
@@ -57,6 +58,9 @@
 				value:'0',
 				customStyle: {
 					background: '#FF5E5E'
+				},
+				background:{
+					background: 'none'
 				}
 			}
 			methods: {
@@ -92,6 +96,7 @@
 		background-size: 100%;
 		min-height: 100vh;
 		padding: 50px;
+		margin-top: -44px;
 	}
 	.step-btn{
 		text-align: center;

pages/login/step2.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :background="background" :border-bottom="false"></u-navbar>
 		<view class="jpLogin">
 			<view class="jpLogin-title">
 				<h2>完善个人信息<span>2</span>/4</h2>
@@ -92,6 +93,9 @@
 				value:'0',
 				customStyle: {
 					background: '#FF5E5E'
+				},
+				background:{
+					background: 'none'
 				}
 			}
 			methods: {
@@ -133,6 +137,7 @@
 		background-size: 100%;
 		min-height: 100vh;
 		padding: 50px;
+		margin-top: -44px;
 	}
 	.step-btn{
 		text-align: center;

pages/login/step3.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :background="background" :border-bottom="false"></u-navbar>
 		<view class="jpLogin">
 			<view class="jpLogin-title">
 				<h2>我的择偶标准 <span>3</span>/4</h2>
@@ -61,6 +62,9 @@
 				value: '0',
 				customStyle: {
 					background: '#FF5E5E'
+				},
+				background:{
+					background: 'none'
 				}
 			}
 			methods: {
@@ -87,6 +91,7 @@
 		background-size: 100%;
 		min-height: 100vh;
 		padding: 50px;
+		margin-top: -44px;
 	}
 
 	.step-btn {

pages/login/step4.vue

@@ -1,5 +1,6 @@
 <template>
 	<view>
+		<u-navbar :background="background" :border-bottom="false"></u-navbar>
 		<view class="jpLogin">
 			<view class="jpLogin-title">
 				<h2>上传您的头像 <span>4</span>/4</h2>
@@ -34,7 +35,9 @@
 	export default {
 		data() {
 			return {
-
+				background:{
+					background: 'none'
+				}
 			}
 			methods: {
 
@@ -50,6 +53,7 @@
 		background-size: 100%;
 		min-height: 100vh;
 		padding: 50px;
+		margin-top: -44px;
 	}
 	.step-btn {
 		text-align: center;

pages/news/detalis.vue

@@ -11,22 +11,24 @@
 					<span>321</span>
 				</view>
 			</view>
-			<view class="article-con" v-html="detail.content">
+			<view class="article-con" v-html="detail.content" :style="{fontSize:myFontSize+'px'}">
 				 
 			</view>
+			<u-image class="newsList-img" :src="detail.images" mode="widthFix" border-radius="10"></u-image>
+			
 			<view class="article-foot">
 				<view class="u-flex">
-					<view class="article-btn">
+					<view class="article-btn" @click="fontSizeUp1()">
 						<u-icon custom-prefix="custom-icon" name="zoom-in-line"></u-icon>
 						<span>放大</span>
 					</view>
-					<view class="article-btn">
+					<view class="article-btn" @click="fontSizeDown2()">
 						<u-icon custom-prefix="custom-icon" name="zoom-out-line"></u-icon>
 						<span>缩小</span>
 					</view>
 				</view>
 
-				<view class="article-btn">
+				<view class="article-btn" @click="scrollTop()">
 					<u-icon custom-prefix="custom-icon" name="align-top"></u-icon>
 					<span>回顶</span>
 				</view>
@@ -41,7 +43,7 @@
 	export default {
 		data() {
 			return {
-				
+				myFontSize:14,
 				pageTitle: '文章详情',
 				isLoading: false,
 				id: '',
@@ -53,8 +55,42 @@
 			
 			this.id =op.id;
 			this.getDetail();
+			var myFontSize=this.carhelp.get("news-info-fontsize")
+			if(myFontSize){
+				this.myFontSize=myFontSize
+			}
+			
 		},
 		methods: {
+			fontSizeUp1(){
+				if(this.myFontSize>=28){
+					uni.showToast({
+						title: "当前已为最大字体"
+					})
+					return
+				}
+				this.myFontSize=this.myFontSize+2
+				this.carhelp.set("news-info-fontsize",this.myFontSize)
+			},
+			fontSizeDown2(){
+				if(this.myFontSize<=12){
+					uni.showToast({
+					
+						title: "当前已为最小字体"
+					})
+					return
+				}
+				this.myFontSize=this.myFontSize-2
+				this.carhelp.set("news-info-fontsize",this.myFontSize)
+				
+			},
+			scrollTop(){
+				uni.pageScrollTo({
+					scrollTop: 0,
+						duration: 300
+				})
+			},
+			
 			getDetail() {
 			    API.newsdetail({id:this.id}).then(response => {
 			        this.isLoading = false;