taoqiang hace 4 años
padre
commit
b2c6acec20
Se han modificado 4 ficheros con 127 adiciones y 11 borrados
  1. 4 0
      common/locales/en.js
  2. 3 2
      common/locales/zh.js
  3. 112 5
      pages/home/index.vue
  4. 8 4
      pages/msg/index.vue

+ 4 - 0
common/locales/en.js

@@ -25,5 +25,9 @@ export default {
 		sucupload:"",
 		delupload:"",
 		reloadText:""
+	},
+	message: {
+		title: 'info',
+		noData: 'no data'
 	}
 }

+ 3 - 2
common/locales/zh.js

@@ -243,8 +243,9 @@ export default {
 	// 消息
 	message: {
 		title: "消息",
-		noNews: "暂无新消息",
-		deleted: "删除"
+		noData: "暂无新消息",
+		deleted: "删除",
+		deletedSuc: "删除成功"
 	},
 	// 我的
 	my: {

+ 112 - 5
pages/home/index.vue

@@ -7,23 +7,29 @@
 			<view class="u-m-t-35">
 				<u-swiper :list="bannersList" :height="310" :effect3d="true" border-radius="20" effect3d-previous-margin="20"
 				 bg-color="#FFF" class="u-skeleton-fillet" v-if="bannersList.length!=0"></u-swiper>
-				<u-swiper :list="list" :height="310" :effect3d="true" border-radius="20" effect3d-previous-margin="20" bg-color="#FFF"
+				<u-swiper :list="package[langIndex].swiper" :height="310" :effect3d="true" border-radius="20" effect3d-previous-margin="20" bg-color="#FFF"
 				 class="u-skeleton-fillet" v-else></u-swiper>
 			</view>
 			<view class="u-flex u-m-t-35  u-m-l-20 u-m-r-20 u-skeleton-fillet" style="width:710rpx;">
 				<u-notice-bar mode="vertical" :list="noticebarList" style="width: 710rpx;" type="primary"></u-notice-bar>
 			</view>
-			<view class="u-flex u-m-t-35 u-row-around u-m-l-10 u-m-r-10">
+			<!-- <view class="u-flex u-m-t-35 u-row-around u-m-l-10 u-m-r-10">
 				<u-image width="350rpx" src="../../static/sailun/scan_in.png" @tap="$u.throttle(inPage(0), 1000)" mode="widthFix"
 				 class="u-skeleton-fillet"></u-image>
 				<u-image width="350rpx" src="../../static/sailun/scan_out.png" @tap="$u.throttle(inPage(1), 1000)" mode="widthFix"
 				 class="u-skeleton-fillet"></u-image>
+			</view> -->
+			<view class="u-flex u-m-t-35 u-row-around u-m-l-10 u-m-r-10">
+				<template v-for="(item, index) in package[langIndex].banner">
+				<u-image width="350rpx" :src="item.img" @tap="$u.throttle(routerPage(item.url), 1000)" mode="widthFix"
+				 class="u-skeleton-fillet"></u-image>
+				</template>
 			</view>
 			<view class="u-m-t-35">
 				<view class="u-m-l-30 u-m-b-10" style="font-size: 34rpx;">
 					快捷服务
 				</view>
-				<view class="u-flex u-flex-wrap u-row-center">
+				<!-- <view class="u-flex u-flex-wrap u-row-center">
 					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/task.png" style="margin:10rpx 10rpx 25rpx 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
 					 @click="inPage(5)"></u-image>
 					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/2.png" style="margin: 10rpx 10rpx 25rpx 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
@@ -32,10 +38,18 @@
 					 @click="inPage(4)"></u-image>
 					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" src="../../static/sailun/1.png" style="margin: 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
 					 @click="inPage(2)"></u-image>
+				</view> -->
+				<view class="u-flex u-flex-wrap u-row-center">
+					<template v-for="(item, index) in package[langIndex].service">
+					<u-image class="u-skeleton-fillet" width="350rpx" height="212rpx" :src="item.img" style="margin:10rpx 10rpx 25rpx 10rpx;box-shadow:0rpx 0rpx 20rpx rgba(0,0,0,0.2);border-radius: 30rpx;"
+					 @click="routerPage(item.url)"></u-image>
+					</template>
 				</view>
 			</view>
 			<view class="u-flex u-row-center u-m-t-35">
-				<u-image class="u-skeleton-fillet" width="680rpx" src="../../static/sailun/88reward.png" mode="widthFix"></u-image>
+				<template v-for="(item, index) in package[langIndex].ad">
+					<u-image class="u-skeleton-fillet" width="680rpx" :src="item" mode="widthFix"></u-image>
+				</template>
 			</view>
 		</view>
 		<!-- 与包裹页面所有内容的元素u-page同级,且在它的下方 -->
@@ -73,7 +87,80 @@
 				url: '',
 				is_force: false,
 				Copywriting: '',
-				platform:''
+				platform:'',
+				langIndex: 0,
+				package: [{
+					swiper: [
+						'../../static/sailun/swiper1.png',
+						'../../static/sailun/swiper1.png'
+					],
+					banner: [
+						{
+							img: '../../static/sailun/scan_in.png',
+							url: 'pages/home/scancode/index'
+						},
+						{
+							img: '../../static/sailun/scan_out.png',
+							url: 'pages/home/scancode/scancodeout'
+						}
+					],
+					service: [
+						{
+							img: '../../static/sailun/task.png',
+							url: 'pages/home/Statistical-task/index',
+						},
+						{
+							img: '../../static/sailun/2.png',
+							url: 'pages/home/monthly-policy/monthly-policy'
+						},
+						{
+							img: '../../static/sailun/inquire.png',
+							url: 'pages/home/scancodequery/result'
+						},
+						{
+							img: '../../static/sailun/1.png',
+							url: 'pages/home/my-stock/my-stock'
+						}
+					],
+					ad:[
+						'../../static/sailun/88reward.png'
+					]
+				}, {
+					swiper: [
+						'../../static/sailun/swiper1.png'
+					],
+					banner: [
+						{
+							img: '../../static/sailun/scan_out.png',
+							url: 'pages/home/scancode/scancodeout'
+						},
+						{
+							img: '../../static/sailun/scan_in.png',
+							url: 'pages/home/scancode/index'
+						}
+					],
+					service: [
+						{
+							img: '../../static/sailun/inquire.png',
+							url: 'pages/home/scancodequery/result'
+						},
+						{
+							img: '../../static/sailun/1.png',
+							url: 'pages/home/my-stock/my-stock'
+						},
+						{
+							img: '../../static/sailun/task.png',
+							url: 'pages/home/Statistical-task/index',
+						},
+						{
+							img: '../../static/sailun/2.png',
+							url: 'pages/home/monthly-policy/monthly-policy'
+						}
+					],
+					ad:[
+						'../../static/sailun/88reward.png'
+					]
+				}]
 			}
 		},
 		onLoad() {
@@ -107,7 +194,19 @@
 						this.loading = false;
 						uni.hideLoading();
 					})
+					
+					let lang = localStorage.getItem('lang')
+					if (lang === 'zh') {
+						console.log('当前为中文')
+						this.langIndex = 0
+					} else if (lang === 'en') {
+						console.log('当前为英文')
+						this.langIndex = 1
+					} else {
+						this.langIndex = 0
+					}
 			}
+			
 		},
 		onShow() {
 			this.system()
@@ -279,6 +378,14 @@
 					}
 				})
 			},
+			
+			// 当前跳转路由
+			routerPage(url) {
+				this.$u.route({
+					url: url,
+				})
+			},
+			
 			inPage(index) {
 				switch (index) {
 					case 0:

+ 8 - 4
pages/msg/index.vue

@@ -30,7 +30,7 @@
 			</u-swipe-action>
 		</view>
 		<view v-else class="u-flex u-row-center" style="height: 100vh;">
-			<u-empty  text="暂无新消息" mode="message"></u-empty>
+			<u-empty :text="$t('message.noData')" mode="message"></u-empty>
 		</view>
 	</view>
 </template>
@@ -49,14 +49,18 @@
 				btnWidth: 180,
 				show: false,
 				options: [{
-					text: "删除",
+					text: this.$t('message.deleted'),
 					style: {
 						backgroundColor: "#dd524d",
 					},
 				}, ],
 			};
 		},
-		created() {},
+		created() {
+			uni.setNavigationBarTitle({
+			    title: this.$t('message.title')
+			});
+		},
 		onShow() {
 			this.getDate();
 		},
@@ -115,7 +119,7 @@
 						},
 					})
 					.then((res) => {
-						this.$u.toast(`删除成功`);
+						this.$u.toast(this.$t('message.deletedSuc'));
 						this.getDate();
 					})
 					.catch((err) => {})