依赖文件

pages/index/customer.vue

@@ -25,7 +25,7 @@
 							<view class="">{{item.created_at}}</view>
 							<view class="right">
 								<text class="medal" :style="{color:(item.magnitude == 0 ?'#F5AB00' : item.magnitude == 1 ?'#8495B8': '#9B7200')}">{{item.magnitude_txt}}</text>
-								<text class="tag" :style="{background:(item.follow == 0 ?'#3471FF' : item.follow == 1 ?'#27C89C': '#FF4040')}">{{$t('followup')}}</text>
+								<text class="tag" :style="{background:(item.follow == 0 ?'#3471FF' : item.follow == 1 ?'#27C89C': '#FF4040')}">{{item.follow_txt}}</text>
 							</view>
 						</view>
 						<u-line margin="20rpx 0px"></u-line>
@@ -34,7 +34,7 @@
 								<view class=""><text class="name">{{item.contacts}}</text><text class="phone">{{item.phone}}</text></view>
 								<view class="ststus">{{item.grade_txt}}</view>
 							</view>
-							<view class="info"><text class="sex">{{item.sex_txt}}</text> | <text class="addr">迪拜</text><text class="type">{{item.car_type_name}}</text>
+							<view class="info"><text class="sex">{{item.sex_txt}}</text> | <text class="addr">{{item.country_name}}</text><text class="type">{{item.car_type_name}}</text>
 							</view>
 						</view>
 					</view>
@@ -223,7 +223,9 @@
 		height: calc(100vh - 50px);
 	}
 	.navbar{
-		padding-top: 44px;
+		/* #ifdef APP-PLUS */
+			padding-top: 44px;
+		/* #endif */	
 		height: 44px;
 		line-height: 44px;
 		text-align: center;
@@ -255,7 +257,7 @@
 		    padding: 6px 16px 2px;
 		    text-align: center;
 		    position: absolute;
-		    top: 2px;
+		    top: 3px;
 		    right: 5px;
 		    font-size: 12px;
 			image{

pages/index/index.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="content">
 		<z-paging ref="paging" v-model="datalist" @query="queryList" style="background: #F3F3F3;"
-			empty-view-text='暂无数据!'>
+			empty-view-text='暂无数据!' >
 			<template #top>
 				<view class="contop">
 					<view class="changeyy" @click="showlang = true">
 						<image src="/static/image/change.png" mode=""></image>{{$t('home.langbtn')}}
 					</view>
 					<view class="title">
-						{{$t('home.title')}} HESU CRM
+						{{$t('home.title')}} CRM
 					</view>
 					<view class="num">
-						66 <text>{{$t('home.day')}}</text>
+						{{statisticsdata.day}}<text>{{$t('home.day')}}</text>
 					</view>
 				</view>
 				<view class="data-briefing">
@@ -52,9 +52,9 @@
 				</view>
 			</view>
 		</z-paging>
-		<u-datetime-picker :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="show" v-model="value1"
+		<u-datetime-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" :show="show" @close="close('show')"  v-model="value1"
 			@confirm="confirm" @cancel="cancel" mode="year-month"></u-datetime-picker>
-		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" @close="close" :show="showlang" :columns="columns"
+		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')" @close="close('showlang')" :show="showlang" :columns="columns"
 			@cancel="cancellang" @confirm="confirmlang" :title="$t('home.langbtn')" keyName="label"></u-picker>
 	</view>
 </template>
@@ -84,13 +84,13 @@
 				follow:'',
 				columns: [
 					[{
-						label: '中文',
-						id: 'zh'
+						label: this.$t('zh'),
+						id: 'zh-Hans'
 					}, {
-						label: 'English',
+						label: this.$t('en'),
 						id: 'en'
 					}, {
-						label: 'Russian',
+						label:this.$t('ru'),
 						id: 'ru'
 					}]
 				],
@@ -127,8 +127,8 @@
 			this.getstatistics()
 		},
 		methods: {
-			close(){
-				this.showlang = false
+			close(value){
+				this[value] = false
 			},
 			// 处理滚动事件
 			onPageScroll(event) {
@@ -157,8 +157,22 @@
 			},
 			//语言切换事件
 			confirmlang(e) {
+				// uni.setLocale(e.value[0].id)
 				this.$i18n.locale = e.value[0].id
+				uni.setStorageSync('i18locale', e.value[0].id);
 				this.showlang = false
+				this.columns =[
+					[{
+						label: this.$t('zh'),
+						id: 'zh-Hans'
+					}, {
+						label: this.$t('en'),
+						id: 'en'
+					}, {
+						label:this.$t('ru'),
+						id: 'ru'
+					}]
+				];
 				this.list1 = [{
 					name: this.$t('all'),
 				}, {

pages/index/mine.vue

@@ -131,8 +131,11 @@
 		background-color: #F6F6F6 !important;
 	}
 	.badge{
-		padding: 5px 10px;
+		padding: 0px 7px;
+		/* #ifdef APP-PLUS */
+		padding: 2px 8px;
 		margin-right: 30px;
+		/* #endif */
 		display: inline-block;
 		text-align: center;
 		background-color: #ff3d40;
@@ -145,7 +148,7 @@
 		background-repeat: no-repeat;
 	}
 	.navbar{
-		padding-top: 44px;
+		padding-top: 30px;
 		height: 50px;
 		line-height: 50px;
 		text-align: center;
@@ -153,11 +156,11 @@
 		font-size: 32rpx;
 	}
 	.content{
-		padding:20px 15px 15px;
+		padding:10px 15px 15px;
 		.contop{
 			display: flex;
 			align-items: center;
-			margin: 25px 0px 50px;
+			margin: 15px 0px 30px;
 			font-size: 34rpx;
 			color: white;
 			.right{
@@ -227,11 +230,13 @@
 			color: #000;
 			margin-bottom: 10px;
 			position: relative;
+			/* #ifdef APP-PLUS */
 			.icon{
 				position: absolute;
 				right: -15px;
 				top: 32%;
 			}
+			/* #endif */
 			.son-img-bg {
 				width: 20px;
 				height: 20px;