Bläddra i källkod

Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

# Conflicts:
#	pages/user/freeInstallment.vue
#	pages/user/toJoin.vue
zhengkaixin 3 år sedan
förälder
incheckning
cf5850156e

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 17558 - 1
package-lock.json


+ 57 - 5
pages/login/login.vue

@@ -11,14 +11,14 @@
 				<view class="login-form-item">
 					<view class="title">手机号</view>
 					<view class="input">
-						<u-input v-model="form.telephone" type="number" placeholder="请输入手机号" placeholder-style="font-size:16px;color:#ccc;"/>
+						<u-input :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" v-model="form.telephone" type="number" placeholder="请输入手机号" placeholder-style="font-size:16px;color:#ccc;"/>
 					</view>
 					<view class="tips">未注册的手机号验证后将自动注册</view>
 				</view>
 				<view class="login-form-item">
 					<view class="title">验证码</view>
 					<view class="input">
-						<u-input v-model="form.verifyCode" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
+						<u-input :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" v-model="form.verifyCode" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
 						<view class="code" @click="getCode">{{codeTips}}</view>
 					</view>
 					<view style="width: 350px;">
@@ -49,6 +49,10 @@
 	export default {
 		data() {
 			return {
+				elderMode:false,
+				placeholderStyle:{
+					'font-size':'28rpx'
+				},
 				form: {
 					telephone: '',
 					verifyCode: '',
@@ -104,8 +108,33 @@
 			}
 			
 			
+		},
+		onReady() {
+			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
 		},
 		methods: {
+			theme(type) {
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 let data = { 
+				 	"font-size":'32rpx', 
+				 };
+				 this.placeholderStyle = data;
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				  let data  ={ 
+				  	"font-size":'28rpx', 
+				  };
+				  this.placeholderStyle = data;
+			  } 
+			},
 			codeChange(text) {
 				this.codeTips = text;
 			},
@@ -244,8 +273,17 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size2');
+		}
+	}
 .wrap {
-	font-size: 28rpx;
+	@include themeify{
+		font-size: themed('font-size2');
+	}
+/*	font-size: 28rpx;*/
 	.login {
 		width: 600rpx;
 		padding-top: 80rpx;
@@ -253,7 +291,10 @@
 		.login-title {
 			text-align: left;
 			h3{
-				font-size: 48rpx;
+				@include themeify{
+					font-size: themed('font-size7');
+				}
+/*				font-size: 48rpx;*/
 				font-weight: normal;
 			}
 			p{
@@ -265,6 +306,11 @@
 			margin-top: 40px;
 			.title{
 				margin-bottom: 8px;
+				@include themeify{
+					font-size: themed('font-size2');
+					font-weight: themed('fontWeight');
+					letter-spacing: themed('letterSpacing');
+				}
 			}
 			.input {
 				border-bottom: 1px solid #f7f7f7;
@@ -279,7 +325,10 @@
 			.tips {
 				color: $u-type-info;
 				margin-top: 12px;
-				font-size: 12px;
+				@include themeify{
+					font-size: themed('font-size1');
+				}
+/*				font-size: 12px;*/
 				span{
 					color:#3fbd70;
 				}
@@ -289,6 +338,9 @@
 		.login-btn {
 			margin-top: 40px;
 			background-color: #a7dbc2;
+			@include themeify{
+				font-size: themed('font-size3');
+ 			}
 		}
 		.alternative {
 			color: $u-tips-color;

+ 1 - 0
pages/search/search.vue

@@ -42,6 +42,7 @@
 		data() {
 			
 			return {
+				elderMode:false,
 				inputStyle:{
 					backgroundColor: 'transparent',
 					"font-size":'36rpx',

+ 97 - 16
pages/user/InviteFriends.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="all">
 		<u-mask :show="show" @click="show = false">
 				<u-image width="100%" height="500px"  :mode="'widthFix'"  src="/static/img/guide_point.png"></u-image>
 				
@@ -90,6 +90,7 @@
 	export default {
 		data() {
 			return {
+				elderMode:false,
 				id:"",
 				code:"",
 				show:false,
@@ -105,6 +106,13 @@
 				this.get_wx_config();
 				
 		},
+		onReady(){
+			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+		},
 		onShow() {
 			
 			//pages/user/InviteFriends?id=2&icode=FX&uid=731b9765-3565-4b3c-918b-5d3ec3b505fb
@@ -121,6 +129,25 @@
 				
 		},
 		methods: {
+			theme(type) {
+				
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 let data = {
+				 	"font-size":'32rpx', 
+				 	};
+				 this.placeholderStyle = data;
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 let data = {
+				 	"font-size":'28rpx'
+				 	};
+				 this.placeholderStyle = data;
+			  } 
+			},
 			substrMbName(name){
 				return substrMb(name,0,4)+'***'
 			},
@@ -220,6 +247,13 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size1');
+		}
+	}
+	
 	.InviteFriends{
 		background-image: linear-gradient(0deg, #a2e9c9 , #01b963);
 
@@ -241,7 +275,10 @@
 		border-radius: 20px;
 		padding: 20px;
 		h4{
-			font-size: 15px;
+			@include themeify{
+				font-size: themed('font-size3');
+			}
+/*			font-size: 15px;*/
 			font-weight: normal;
 			text-align: center;
 		}
@@ -251,12 +288,20 @@
 			align-items: flex-end;
 			margin: 16px 0;
 			h2{
+				@include themeify{
+					font-size: themed('font-size17');
+					line-height:themed('font-size17')
+				}
+/*				
 				font-size: 44px;
-				line-height: 44px;
+				line-height: 44px;*/
 				color:#FF9600;
 			}
 			span{
-				font-size: 18px;
+				@include themeify{
+					font-size: themed('font-size4');
+ 				}
+/*				font-size: 18px;*/
 				margin-left: 2px;
 			}
 		}
@@ -292,7 +337,11 @@
 			text-align: center;
 			line-height: 50px;
 			border-radius: 25px;
-			font-size: 20px;
+			@include themeify{
+				font-size: themed('font-size5');
+			}
+
+/*			font-size: 20px;*/
 			color:#fff;
 			span{
 				margin-left: 8px;
@@ -302,7 +351,10 @@
 	.InviteFriends-title{
 		color:#fff;
 		margin: 40px 0 24px;
-		font-size: 18px;
+		@include themeify{
+			font-size: themed('font-size4');
+		}
+/*		font-size: 18px;*/
 	}
 	.InviteFriends-info{
 		background-color: #fff;
@@ -317,7 +369,10 @@
 			}
 			p{
 				margin-left: 12px;
-				font-size: 16px;
+				@include themeify{
+					font-size: themed('font-size3');
+				}
+/*				font-size: 16px;*/
 			}
 		}
 	}
@@ -343,15 +398,23 @@
 		margin: 0 4px;
 		p{
 			color:#fff;
-			font-size: 17px;
+/*			font-size: 17px;*/
+			@include themeify{
+				font-size: themed('font-size4');
+			}
 		}
 		.reward-head-price{
 			color:#fff;
 			display: flex;
 			align-items: flex-end;
 			h2{
-				font-size: 36px;
-				line-height: 36px;
+				@include themeify{
+					font-size: themed('font-size13');
+					line-height: themed('font-size13');
+					
+				}
+/*				font-size: 36px;
+				line-height: 36px;*/
 				margin-right: 2px;
 			}
 		}
@@ -375,7 +438,10 @@
 				border-radius: 12px;
 			}
 			p{
-				font-size: 16px;
+				@include themeify{
+					font-size: themed('font-size3');
+ 				}
+/*				font-size: 16px;*/
 				color:#666;
 				margin-bottom: 10px;
 			}
@@ -383,8 +449,13 @@
 				display: flex;
 				align-items: flex-end;
 				h2{
+					@include themeify{
+						font-size: themed('font-size17');
+						line-height: themed('font-size17');
+					}
+/*	
 					font-size: 44px;
-					line-height: 44px;
+					line-height: 44px;*/
 					margin-right: 2px;
 					color:#00B962;
 				}	
@@ -402,10 +473,14 @@
 			width: 120px;
 			border-radius: 20px;
 			background-color: #00B962 ;
-			line-height: 40px;
+/*			line-height: 40px;*/
 			color:#fff;
 			text-align: center;
-			font-size: 18px;
+			@include themeify{
+				font-size: themed('font-size4');
+				line-height: themed('font-size15');
+ 			}
+/*			font-size: 18px;*/
 			margin: 20px auto;
 		}
 	}
@@ -413,7 +488,10 @@
 		//border-top: 1px dashed #cacaca;
 		padding-top: 20px;
 		.reward-list-title{
-			font-size: 18px;
+			@include themeify{
+				font-size: themed('font-size4');
+ 			}
+/*			font-size: 18px;*/
 			margin-bottom: 20px;
 		}
 		.rewardList-item{
@@ -423,7 +501,10 @@
 			margin-top: 12px;
 			span{
 				margin-left: 12px;
-				font-size: 16px;
+/*				font-size: 16px;*/
+				@include themeify{
+					font-size: themed('font-size3');
+ 				}
 			}
 			p{
 				color:#999;

+ 5 - 5
pages/user/finance/recharge.vue

@@ -2,8 +2,8 @@
 	<view>
 		<u-navbar title="充值"></u-navbar>
 		<view class="recharge">
-			<view class="title">选择充值金额</view>
-			<p>当前余额{{detail.balance}}元</p>
+			<view class="title oldTextjp" oldstyle="font-size:20px">选择充值金额</view>
+			<p class="oldTextjp2" oldstyle="font-size:16px">当前余额{{detail.balance}}元</p>
 			<view class="rechargeMain">
 				<view class="recharge-item" :class="!otherNum&&moneyActiveClass == item.id ? 'active' : ''"
 					v-for="(item,index) in moneyList" :key="item.id" @click="moneyClick(item.id,item)">
@@ -12,7 +12,7 @@
 					</view>
 				
 			</view>
-			<p>其他充值金额</p>
+			<p class="oldTextjp2" oldstyle="font-size:16px">其他充值金额</p>
 		<view  style="margin-bottom: 32px;">
 			
 			<view 
@@ -29,7 +29,7 @@
 			font-family: AlibabaPuHui-regular;"><span style="color:red">*</span>单次充值金额不超过5000元。</view>
 			
 		</view>
-			<view class="title">选择支付方式</view>
+			<view class="title oldTextjp" oldstyle="font-size:20px">选择支付方式</view>
 			<view class="recharge-radio" style="padding-bottom: 70px;">
 				<u-radio-group v-model="value2" @change="radioGroupChange" :wrap="true" width="100%">
 					<u-radio active-color="#00B962" @change="radioChange" v-for="(item, index) in list" :key="index"
@@ -37,7 +37,7 @@
 						<view class="recharge-radio-item">
 							<u-icon :name="item.icon" custom-prefix="custom-icon" :color="item.color" size="48">
 							</u-icon>
-							<view class="recharge-radio-name">
+							<view class="recharge-radio-name oldTextjp2" oldstyle="font-size:18px">
 								{{item.name}}
 							</view>
 						</view>

+ 422 - 436
pages/user/freeInstallment.vue

@@ -1,450 +1,436 @@
-<template>
-	<view class="all">
-		<u-navbar title="免费安桩"  :is-back="back"></u-navbar>
-		<view class="main">
-			<view class="text">
-				为响应政府号召,积极推动充电桩普及,“51充电联盟”现面向公共停车场、私家车位提供“免费安桩”服务,有意加盟“51充电联盟”的机构和个人,均可申请免费安装电动汽车/摩托车/自行车充电桩,在平台的运营支持下,共享风口红利。
-			</view>
-			<view class="suited">
-				<p class="title">适合对象 :</p>
-				<view class="content">
-					<p>1.停车场、停车棚</p>
-					<view class="suited-text">
-						商超、小区、园区、医院等停车场。通过经营充电业务开源增收。
-					</view>
-				</view>
-				<view class="content">
-					<p>2.私人车位所有者</p>
-					<view class="suited-text">
-						可通过共享车位空闲时段,为他人提供充电便利获取被动收入。
-					</view>
-				</view>
-			</view>
-
-			<view class="application-form ">
-				<view class="name">
-					<p>申请人姓名</p>
-					<u-input placeholder="" v-model="name"  ></u-input>
-				</view>
-				<view class="tel">
-					<p>联系电话</p>
-					<u-input placeholder="" v-model="subForm.phone" ></u-input>
-				</view>
-				<view class="place">
-					<p>安装地点</p>
-					<textarea class="textarea"  v-model="address"  placeholder="填写详细位置"></textarea>
-				</view>
-				<view class="type">
-					<p>场地类型</p>
-					<view class="checkbox">
-						<view class="">
-							<u-checkbox-group  active-color="#00B962">
-								<u-checkbox    v-model="item.checked"
-									v-for="(item, index) in typeList" :key="index" :name="item.name">{{item.name}}
-								</u-checkbox>
-							</u-checkbox-group>
-
-						</view>
-					</view>
-				</view>
-				<view class="want">
-					<p>想要安装</p>
-					<view class="checkbox">
-						<view class="">
-							<u-checkbox-group  active-color="#00B962">
-								<u-checkbox    v-model="item.checked"
-									v-for="(item, index) in wantList" :key="index" :name="item.name">{{item.name}}
-								</u-checkbox>
-							</u-checkbox-group>
-
-						</view>
-					</view>
-				</view>
-				<view class="hint">
-					*请保持手机畅通,我们将安排专人与您联系。您也可以拨打
-					<text class="tel-num">400-8899-619</text>查询申请审核进度!
-				</view>
-				<u-button type="warning" @click="submit" >提交申请</u-button>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/friends.js'
+<template>
+	<view class="all">
+		<u-navbar title="免费安桩" :is-back="back" ></u-navbar>
+	    <view class="main">
+			<view class="text">
+				        为响应政府号召,积极推动充电桩普及,“51充电联盟”现面向公共停车场、私家车位提供“免费安桩”服务,有意加盟“51充电联盟”的机构和个人,均可申请免费安装电动汽车/摩托车/自行车充电桩,在平台的运营支持下,共享风口红利。
+			</view>
+	    	<view class="suited">
+	    		<p class="title">适合对象 :</p>
+				<view class="content">
+					<p>1.停车场、停车棚</p>
+					<view class="suited-text">
+						商超、小区、园区、医院等停车场。通过经营充电业务开源增收。
+					</view>
+				</view>
+				<view class="content">
+					<p>2.私人车位所有者</p>
+					<view class="suited-text">
+						可通过共享车位空闲时段,为他人提供充电便利获取被动收入。
+					</view>
+				</view>
+	    	</view>
+			
+			<view class="application-form ">
+				<view class="name">
+					<p>申请人姓名</p>
+					<u-input v-model="name"   :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
+				</view>
+				<view class="tel">
+					<p>联系电话</p>
+					<u-input v-model="subForm.phone" :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
+				</view>
+				<view class="place">
+					<p>安装地点</p>
+					<textarea v-model="address" class="textarea" placeholder="填写详细位置"></textarea>
+				</view>
+				<view class="type">
+					<p>场地类型</p>
+					<view class="checkbox">
+							<view class="">
+									<u-checkbox-group  active-color="#00B962">
+										<u-checkbox 
+										 
+											v-model="item.checked" 
+											v-for="(item, index) in typeList" :key="index" 
+											:name="item.name"
+										>{{item.name}}</u-checkbox>
+									</u-checkbox-group>
+									
+								</view>
+						</view>
+				</view>
+				<view class="want">
+					<p>想要安装</p>
+					<view class="checkbox">
+							<view class="">
+									<u-checkbox-group   active-color="#00B962">
+										<u-checkbox 
+										 
+											v-model="item.checked" 
+											v-for="(item, index) in wantList" :key="index" 
+											:name="item.name"
+										>{{item.name}}</u-checkbox>
+									</u-checkbox-group>
+									
+								</view>
+						</view>
+				</view>
+			      <view class="hint">
+			      	*请保持手机畅通,我们将安排专人与您联系。您也可以拨打 
+					 <text class="tel-num">400-8899-619</text>查询申请审核进度!
+			      </view>
+				 <u-button type="warning" @click="submit" >提交申请</u-button>
+			</view>
+	    </view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/friends.js'
 	import {
 		checkPhone
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				name:"",
-				address:"",
-				text1:[],
-				text2:[],
-				back:false,
-				subForm:{
-					phone:"",
-					openId:"",
-					type:"2",
-					content:""
-				},
-				elderMode: false,
-				typeList: [{
-						name: '停车场',
-						checked: false,
-						disabled: false
-					},
-					{
-						name: '私家车位',
-						checked: false,
-						disabled: false
-					},
-					{
-						name: '停车棚',
-						checked: false,
-						disabled: false
-					}
-				],
-				wantList: [{
-						name: '电动汽车充电桩',
-						checked: false,
-						disabled: false
-					},
-					{
-						name: '电动摩托/自行车充电桩',
-						checked: false,
-						disabled: false
-					},
-
-				]
-
-
-			};
-
-		},
-		onLoad(op) {
-			if(op.isback){
-				this.back=true;
-			}
-		},
-		methods: {
-			 
-			submit(){
-			
-				var obj=[]
-				if(!this.name){
-					uni.showToast({
-						title:"请输入申请人姓名"
-					})
-					return
-				}
-				if(!this.subForm.phone){
-					uni.showToast({
-						title:"请输入联系电话"
-					})
-					return
-				}
-				var checkPhoneResult = checkPhone(this.subForm.phone);
+	} from '@/utils'
+	export default{
+		data() {
+				return {
+					name:"",
+					address:"",
+					back:false,
+					text1:[],
+					text2:[],
+					subForm:{
+						phone:"",
+						openId:"",
+						type:"2",
+						content:""
+					},
+					
+					elderMode:false,
+					placeholderStyle:{
+						'font-size':'28rpx'
+					},
+					typeList: [
+									{
+										name: '停车场',
+										checked: false,
+										disabled: false
+									},
+									{
+										name: '私家车位',
+										checked: false,
+										disabled: false
+									},
+									{
+										name: '停车棚',
+										checked: false,
+										disabled: false
+									}
+								],
+								wantList: [
+													{
+														name: '电动汽车充电桩',
+														checked: false,
+														disabled: false
+													},
+													{
+														name: '电动摩托/自行车充电桩',
+														checked: false,
+														disabled: false
+													},
+													
+												]
 							
-				if (checkPhoneResult !== true) {
-					uni.showToast({
-						title: checkPhoneResult,
-					})
-					return;
-				}
-				if(!this.address){
-					uni.showToast({
-						title:"请填写详细位置"
-					})
-					return
+								
+				};
+				
+			},
+			onLoad(op) {
+				if(op.isback){
+					this.back=true;
 				}
-				obj.push({
-					name:"申请人姓名",
-					value:this.name,
-					type:"text"
-				})
-				obj.push({
-					name:"安装地点",
-					value:this.address,
-					type:"text"
-				})
-				this.text1="";
-				this.text1b=false;
-				this.text2="";
-				this.text2b=false;
-				var list1=this.typeList.map(item=>{
-					if(item.checked){
-						this.text1+="1"
-						this.text1b=true;
-					}else{
-						this.text1+="0"
-					}
-					return item.name
-				})
+			},
+			methods:{
 				
+				submit(){
 				
-				var list2=this.wantList.map(item=>{
-					if(item.checked){
-						this.text2+="1"
-							this.text2b=true;
-					}else{
-						this.text2+="0"
+					var obj=[]
+					if(!this.name){
+						uni.showToast({
+							title:"请输入申请人姓名"
+						})
+						return
 					}
-					return item.name
-				})
-				
-				if(!this.text1b){
-					uni.showToast({
-						title:"请至少勾选一项“场地类型”"
+					if(!this.subForm.phone){
+						uni.showToast({
+							title:"请输入联系电话"
+						})
+						return
+					}
+					var checkPhoneResult = checkPhone(this.subForm.phone);
+								
+					if (checkPhoneResult !== true) {
+						uni.showToast({
+							title: checkPhoneResult,
+						})
+						return;
+					}
+					if(!this.address){
+						uni.showToast({
+							title:"请填写详细位置"
+						})
+						return
+					}
+					obj.push({
+						name:"申请人姓名",
+						value:this.name,
+						type:"text"
 					})
-					return
-				}
-				if(!this.text2b){
-					uni.showToast({
-						title:"请至少勾选一项“想要安装”"
+					obj.push({
+						name:"安装地点",
+						value:this.address,
+						type:"text"
 					})
-					return
-				}
-				obj.push({
-					name:"场地类型",
-					value:this.text1,
-					type:"list",
-					list:list1
-				})
-				obj.push({
-					name:"想要安装",
-					value:this.text2,
-					type:"list",
-					list:list2
-				})
-				this.subForm.openId=this.carhelp.getOpenId();
-				this.subForm.content=JSON.stringify(obj);
-				console.log(this.subForm)
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})		
-				API.submit(this.subForm).then((res) => {
-					uni.hideLoading()
-					uni.showModal({
-						showCancel:false,
-						title:"提示",
-						content:"提交成功!",
-						confirmText:"前往主页",
-						success() {
-							uni.reLaunch({
-								url:"/"
-							})
+					this.text1="";
+					this.text1b=false;
+					this.text2="";
+					this.text2b=false;
+					var list1=this.typeList.map(item=>{
+						if(item.checked){
+							this.text1+="1"
+							this.text1b=true;
+						}else{
+							this.text1+="0"
 						}
+						return item.name
 					})
 					
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
+					
+					var list2=this.wantList.map(item=>{
+						if(item.checked){
+							this.text2+="1"
+								this.text2b=true;
+						}else{
+							this.text2+="0"
+						}
+						return item.name
+					})
+					
+					if(!this.text1b){
+						uni.showToast({
+							title:"请至少勾选一项“场地类型”"
+						})
+						return
+					}
+					if(!this.text2b){
+						uni.showToast({
+							title:"请至少勾选一项“想要安装”"
+						})
+						return
+					}
+					obj.push({
+						name:"场地类型",
+						value:this.text1,
+						type:"list",
+						list:list1
+					})
+					obj.push({
+						name:"想要安装",
+						value:this.text2,
+						type:"list",
+						list:list2
 					})
-				})
-			},
-			theme(type) {
-
-				if (type == 'elder') {
-					document.getElementsByTagName('body')[0].setAttribute('data-theme', type);
-					let data = {
-						"font-size": '32rpx',
-						"font-weight": 'bold!important'
-					};
-					this.titleStyle = data;
-				} else {
-					document.getElementsByTagName('body')[0].setAttribute('data-theme', type);
-					let data = {
-						"font-size": '28rpx'
-					};
-					this.titleStyle = data;
-				}
-			}
-		},
-		onReady() {
-			this.elderMode = this.carhelp.get('getElderModeClass') == '长辈模式';
-			if (this.elderMode)
-				this.theme('elder')
-			else
-				this.theme('standard')
-		}
-	}
-</script>
-
-<style>
-	page {
-		background-color: #00b962;
-	}
-</style>
-
-<style lang="scss" scoped>
-	@import "@/_theme.scss";
-
-	.all {
-		@include themeify {
-			font-size: themed('font-size2');
-		}
-	}
-
-	.main {
-
-		padding: 36px 28px 85px;
-
-		.text {
-			color: rgba(255, 255, 255, 100);
-
-			@include themeify {
-				font-size: themed('font-size4');
-			}
-
-			/*		   font-size: 18px;*/
-			text-align: justify;
-
-		}
-
-		.suited {
-			background-color: #fff;
-			margin-top: 24px;
-			padding: 24px;
-			border-radius: 16px;
-
-			.title {
-				/*height: 18px;*/
-				color: rgba(16, 16, 16, 100);
-
-				@include themeify {
-					font-size: themed('font-size4');
-					height: themed('font-size4');
-				}
-
-				/*			   font-size: 18px;*/
-				font-weight: 600;
-			}
-
-			.content {
-				margin-top: 12px;
-
-				p {
-					font-weight: 550;
-
-					@include themeify {
-						font-size: themed('font-size2');
-					}
-
-					/*				   font-size: 14px*/
-				}
-
-				.suited-text {
-					margin-top: 10px;
-					line-height: 20px;
-				}
-			}
-		}
-
-
-		.application-form {
-			background-color: #fff;
-			border-radius: 16px;
-			margin-top: 24px;
-			padding: 24px;
-
-			.u-input {
-				border-radius: 50px;
-				background-color: rgba(232, 236, 234, 100);
-				margin-top: 12px;
-
-			}
-
-			/deep/.uni-input-input {
-				margin-left: 10px;
-			}
-
-			p {
-				@include themeify {
-					font-size: themed('font-size4');
-					line-height: themed('font-size4');
-					height: themed('font-size4');
-				}
-
-				/*		  				  height: 18px;
-						  line-height: 18px;*/
-				color: rgba(16, 16, 16, 100);
-				/*		  				  font-size: 18px;*/
-			}
-
-			.tel,
-			.place,
-			.type,
-			.want {
-				margin-top: 24px;
-			}
-
-			.textarea {
-				width: 72.2vw;
-				height: 100px;
-				border-radius: 22px;
-				background-color: rgba(232, 236, 234, 100);
-				margin-top: 12px;
-
-				.uni-textarea-placeholder {
-					padding: 12px;
-
-					@include themeify {
-						font-size: themed('font-size2');
-						line-height: themed('font-size2');
-					}
-				}
-
-				/deep/.uni-textarea-textarea {
-					margin: 10px;
-				}
-			}
-		}
-
-		.type {
-			.checkbox {
-				margin-top: 12px;
-
-				/deep/.u-checkbox {
-					width: 50% !important;
-					margin-top: 4px;
-				}
-			}
-
-		}
-
-		.want {
-			/deep/.u-checkbox {
-				margin-top: 8px;
-			}
-		}
-
-		.hint {
-			margin-top: 12px;
-
-			@include themeify {
-				font-size: themed('font-size2');
-				line-height: themed('font-size5');
-			}
-
-			/*
-		font-size: 14px;
-		line-height: 20px;
-		*/
-			text-align: justify;
-
-			.tel-num {
-				color: #9FC7FF;
-			}
-		}
-
-		/deep/.u-btn {
-			border-radius: 50px;
-			margin-top: 24px;
-		}
-	}
+					this.subForm.openId=this.carhelp.getOpenId();
+					this.subForm.content=JSON.stringify(obj);
+					console.log(this.subForm)
+					
+					uni.showLoading({
+						title: "加载中",
+						mask: true,
+					})		
+					API.submit(this.subForm).then((res) => {
+						uni.hideLoading()
+						uni.showModal({
+							showCancel:false,
+							title:"提示",
+							content:"提交成功!",
+							confirmText:"前往主页",
+							success() {
+								uni.reLaunch({
+									url:"/"
+								})
+							}
+						})
+						
+					}).catch(error => {
+						uni.showToast({
+							title: error,
+							icon: "none"
+						})
+					})
+				},
+				theme(type) {
+					
+				  if(type == 'elder')	
+				  {
+					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+					 let data = {
+					 	"font-size":'32rpx', 
+					 	};
+					 this.placeholderStyle = data;
+				  }
+				  else
+				  {
+					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+					 let data = {
+					 	"font-size":'28rpx'
+					 	};
+					 this.placeholderStyle = data;
+				  } 
+				}
+			},
+			onReady(){
+				this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+				if(this.elderMode)
+					this.theme('elder')
+				else
+					this.theme('standard')
+			}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #00b962;
+	}
 </style>
+
+<style lang="scss" scoped>
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size2');
+		}
+	}
+	.main{
+		
+	   padding: 36px 28px 85px;
+	   .text{
+		   color: rgba(255, 255, 255, 100);
+		   @include themeify{
+		   	font-size: themed('font-size4');
+		   }
+/*		   font-size: 18px;*/
+		   text-align: justify;
+
+	   }
+	   .suited{
+		   background-color: #fff;
+		   margin-top: 24px;
+		   padding: 24px;
+		   border-radius: 16px;
+		   .title{
+			   /*height: 18px;*/
+			   color: rgba(16, 16, 16, 100);
+			   @include themeify{
+			   	font-size: themed('font-size4');
+			   	height: themed('font-size4');			   
+				}
+/*			   font-size: 18px;*/
+			   font-weight: 600;
+		   }
+		   .content{
+			   margin-top: 12px;
+			   p{
+				   font-weight: 550;
+				   @include themeify{
+				   	font-size: themed('font-size2');
+    				}
+/*				   font-size: 14px*/
+			   }
+			   .suited-text{
+				   margin-top: 10px;
+				   line-height: 20px;
+			   }
+		   }
+	   }
+	
+	
+	.application-form{
+		background-color: #fff;
+		 border-radius: 16px;
+		 margin-top: 24px;
+		  padding: 24px;
+		  .u-input{
+			  border-radius: 50px;
+			  background-color: rgba(232, 236, 234, 100);
+			  margin-top: 12px;
+			
+		  }
+		  /deep/.uni-input-input{
+			  margin-left: 10px;
+		  }
+		  p{
+			  @include themeify{
+			  	font-size: themed('font-size4');
+			  	line-height: themed('font-size4');
+			  	height: themed('font-size4');
+  				}
+/*		  				  height: 18px;
+						  line-height: 18px;*/
+		  				  color: rgba(16, 16, 16, 100);
+/*		  				  font-size: 18px;*/
+		  }
+		  
+		  .tel,.place,.type,.want{
+			  margin-top: 24px;
+		  }
+		  .textarea{
+			  width: 72.2vw;
+			  height: 100px;
+			  border-radius: 22px;
+			  background-color: rgba(232, 236, 234, 100);
+			   margin-top: 12px;
+			   @include themeify{
+			    	font-size: themed('font-size2');
+			    	line-height: themed('font-size2'); 
+			   }
+			 .uni-textarea-placeholder{
+				 padding: 12px;
+				 @include themeify{
+				 	font-size: themed('font-size2');
+				 	line-height: themed('font-size2'); 
+   				}
+			 }
+			 /deep/.uni-textarea-textarea{
+				 margin: 10px;
+			 }
+		  }
+	}
+	.type{
+		.checkbox{
+			margin-top: 12px;
+			/deep/.u-checkbox{
+				width: 50% !important;
+				margin-top: 4px;
+			}
+		}
+		
+	}
+	.want{
+		/deep/.u-checkbox{
+			margin-top: 8px;
+		}
+	}
+	.hint{
+		margin-top: 12px;
+		@include themeify{
+			font-size: themed('font-size2');
+			line-height: themed('font-size5'); 
+		}
+		/*
+		font-size: 14px;
+		line-height: 20px;
+		*/
+		text-align: justify;
+		.tel-num{
+			color: #9FC7FF;
+		}
+	}
+	/deep/.u-btn{
+		border-radius: 50px ;
+		margin-top: 24px;
+	}
+	}
+	
+</style>

+ 50 - 2
pages/user/logout.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="all">
 		<u-navbar title="注销账号"></u-navbar>
 		<view class="logout-head">
 			<img src="../../static/img/logout.png" alt="">
@@ -28,10 +28,37 @@
 	export default {
 		data() {
 			return {
+				elderMode:false,
 				jpcode: 'toLogin',
 			}
+		}, 
+		onReady(){
+			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
 		},
 		methods: {
+			theme(type) {
+				
+			  if(type == 'elder')	
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 let data = {
+				 	"font-size":'32rpx', 
+				 	};
+				 this.placeholderStyle = data;
+			  }
+			  else
+			  {
+				document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+				 let data = {
+				 	"font-size":'28rpx'
+				 	};
+				 this.placeholderStyle = data;
+			  } 
+			},
 			toSetting() {
 				uni.navigateBack({
 					
@@ -65,6 +92,12 @@
 </style>
 
 <style lang="scss" scoped>
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size2');
+		}
+	}
 	.collapse{
 		background-color: #fff;
 		padding:0 10px;
@@ -83,17 +116,24 @@
 			color:#fff;
 			margin-top: 4px;
 		}
+		@include themeify{
+			font-size: themed('font-size2');
+		}
 	}
 	.logout-text{
 		padding: 24px;
 		p{
-			line-height: 28px;
+/*			line-height: 28px;*/
+			@include themeify{
+				line-height: themed('font-size9'); 
+			}
 		}
 	}
 	.logout-btn{
 		display: flex;
 		justify-content: space-between;
 		padding: 0 24px;
+		
 	}
 	.logout-btn1{
 		color:#BBBBBB!important;
@@ -102,11 +142,19 @@
 		span{
 			color:#333;
 		}
+		@include themeify{
+			font-size: themed('font-size3'); 
+			line-height: themed('font-size3'); 
+		}
 	}
 	.logout-btn2{
 		background-color:#00B962!important;
 		flex: 0.4;
 		border-color: #00B962!important;
 		color:#fff!important;
+		@include themeify{
+			font-size: themed('font-size3'); 
+			line-height: themed('font-size3'); 
+		}
 	}
 </style>

+ 43 - 4
pages/user/message.vue

@@ -1,11 +1,11 @@
 <template>
-  <view>
+  <view class="all">
 		<u-navbar title="意见反馈"></u-navbar>	  
 		<view class="message">
 			<view class="message-form">
 				<u-form :model="subForm" ref="uForm" label-width ="100">
 					<u-form-item label-width="0">
-							<u-input v-model="subForm.content" type="textarea"  placeholder="请描述您的意见" height="200"/>
+							<u-input :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" v-model="subForm.content" type="textarea"  placeholder="请描述您的意见" height="200"/>
 					</u-form-item>
 					<u-form-item label-width="0">
 						<view class="upload">
@@ -16,7 +16,7 @@
 						</view>
 					</u-form-item>
 					<u-form-item >
-						<u-input v-model="subForm.telephone" placeholder="请留下联系方式,方便我们与您取得联系(必填)" />
+						<u-input :customStyle="placeholderStyle"  :placeholderStyle="placeholderStyle" v-model="subForm.telephone" placeholder="请留下联系方式,方便我们与您取得联系(必填)" />
 					</u-form-item>
 				</u-form>
 			</view>
@@ -32,6 +32,10 @@
 	export default {
 		data() {
 			return {
+				elderMode:false,
+				placeholderStyle:{
+					'font-size':'28rpx'
+				},
 				isReady:false,
 				imgBase64: '',
 				listPic: [],
@@ -67,8 +71,33 @@
 					console.log(res)
 			})
 		},
+		onReady(){
+			this.elderMode = this.carhelp.get('getElderModeClass')  == '长辈模式';
+			if(this.elderMode)
+				this.theme('elder')
+			else
+				this.theme('standard')
+		},
 		methods: {
-			 
+			 theme(type) {
+			 	
+			   if(type == 'elder')	
+			   {
+			 	document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+			 	 let data = {
+			 	 	"font-size":'32rpx',
+			 	 	};
+			 	 this.placeholderStyle = data;
+			   }
+			   else
+			   {
+			 	document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
+			 	 let data = {
+			 	 	"font-size":'28rpx'
+			 	 	};
+			 	 this.placeholderStyle = data;
+			   } 
+			 },
 			//微信选择图片
 			chooseImage() {
 				WxJsApi.chooseImage().then(res => {
@@ -170,6 +199,13 @@
 	}
 </script>
 <style lang="scss" scoped>
+	@import "@/_theme.scss";
+	.all{
+		@include themeify{
+			font-size: themed('font-size2');
+		}
+	}
+	
 	.upload{
 		width: 100%;
 	}
@@ -185,5 +221,8 @@
 		background-color:#00B962!important;
 		border-color: #00B962!important;
 		color:#fff!important;
+		@include themeify{
+			font-size: themed('font-size3');
+		}
 	}
 </style>

+ 5 - 2
pages/user/phone.vue

@@ -4,12 +4,12 @@
 		<view class="login-form">
 			<view class="login-form-item">
 				<view class="input">
-					<u-input v-model="form.telephone" type="number" placeholder="请输入手机号" placeholder-style="font-size:16px;color:#ccc;"/>
+					<u-input :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" v-model="form.telephone" type="number" placeholder="请输入手机号" placeholder-style="font-size:16px;color:#ccc;"/>
 				</view>
 			</view>
 			<view class="login-form-item">
 				<view class="input">
-					<u-input v-model="form.verifyCode" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
+					<u-input :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" v-model="form.verifyCode" type="number" placeholder="请输入验证码" placeholder-style="font-size:16px;color:#ccc;"/>
 					<view class="code" @click="getCode">{{codeTips}}</view>
 				</view>
 			</view>
@@ -33,6 +33,9 @@
 		data() {
 			return {
 				elderMode:false,
+				placeholderStyle:{
+					'font-size':'28rpx'
+				},
 				form: {
 					telephone: '',
 					verifyCode: '',

+ 18 - 7
pages/user/toJoin.vue

@@ -18,12 +18,13 @@
 			<view class="application-form ">
 				<view class="name">
 					<p>申请人姓名</p>
-					<u-input placeholder="" v-model="name" ></u-input>
+
+					<u-input   v-model="name" :customStyle="placeholderStyle" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
 				</view>
 				<view class="tel">
 					<p>联系电话</p>
-					<u-input placeholder=""  v-model="subForm.phone" ></u-input>
-				</view>
+					<u-input :customStyle="placeholderStyle"  v-model="subForm.phone" :placeholderStyle="placeholderStyle" placeholder=""></u-input>
+ 				</view>
 				<view class="place">
 					<p>自有电桩地点</p>
 					<textarea class="textarea" v-model="address" placeholder="填写详细位置"></textarea>
@@ -96,6 +97,9 @@
 						content:""
 					},
 					elderMode:false,
+					placeholderStyle:{
+						'font-size':'28rpx'
+					},
 					typeList: [
 									{
 										name: '电动汽车充电桩(快充)',
@@ -268,10 +272,9 @@
 				  {
 					document.getElementsByTagName('body')[0].setAttribute('data-theme',type);
 					 let data = {
-					 	"font-size":'32rpx',
-						"font-weight":'bold!important'
+					 	"font-size":'32rpx', 
 					 	};
-					 this.titleStyle = data;
+					 this.placeholderStyle = data;
 				  }
 				  else
 				  {
@@ -279,7 +282,7 @@
 					 let data = {
 					 	"font-size":'28rpx'
 					 	};
-					 this.titleStyle = data;
+					 this.placeholderStyle = data;
 				  } 
 				}
 			},
@@ -386,8 +389,16 @@
 				  border-radius: 22px;
 				  background-color: rgba(232, 236, 234, 100);
 				   margin-top: 12px;
+				  @include themeify{
+				  	font-size: themed('font-size2');
+				  	line-height: themed('font-size2');
+				  } 
 				 .uni-textarea-placeholder{
 					 padding: 12px;
+					 @include themeify{
+					 	font-size: themed('font-size2');
+					 	line-height: themed('font-size2');
+ 					 }
 				 }
 				 /deep/.uni-textarea-textarea{
 					 margin: 10px;

Vissa filer visades inte eftersom för många filer har ändrats