112701

common/params.js

@@ -1,4 +1,6 @@
 module.exports = {
+	web_bms_url:'https://m.bms16.com/',
+	web_zxbms_url:'https://m.zxbms16.com/',
 	api_zh_url: 'https://bmsapi.dev.bms16.com/',
 	api_en_url: 'https://api.gps.zxbms16.com/',
 	// api_web_url: 'https://bmsapi.bms16.com/',

locale/en.json

@@ -684,6 +684,20 @@
 	
 	"%1s分钟之前刷新": "%1s refresh minutes ago",
 	
+	"订单列表":"Order List",
+	"BMS信息":"BMS Information",
+	"全局搜索":"Global Search",
+	"报警位置":"Alert Location",
+	"配置短信报警":"Configure SMS Alerts",
+	"短信报警记录":"SMS Alert History",
+	"佣金记录":"Commission Records",
+	"批量修改":"Batch Edit",
+	"退换货申请":"Return/Exchange Request",
+	"设备转移":"Device Transfer",
+	"用户退租记录":"Lease Termination History",
+	"里程统计":"Mileage Statistics",
+	"搜索用户":"Search Users",
+	
 	"门店没有足够的余额，提醒商家进行充值": "Stores don't have enough balance to remind merchants to reload",
 	"您正在关闭短信通知，关闭后您将接收不到短信警报提醒，您是否要继续关闭?": "You are turning off SMS notifications, after turning it off you will not receive SMS alert reminders, do you want to keep it off?",
 	"根据G-Sensor的判断，设备检测到震动时，按设置的时间间隔定时上报位置；静止超过三分钟，自动进入休眠仅维持心跳，显示在线": "According to the judgment of G-Sensor, when the device detects vibration, it will report the position regularly according to the set time interval; If it is still for more than three minutes, it will automatically enter sleep and only maintain the heartbeat, which is displayed online",

locale/zh-Hans.json

@@ -684,6 +684,21 @@
 	
 	"%1s分钟之前刷新": "%1s分钟之前刷新",
 	
+	"订单列表":"订单列表",
+	"BMS信息":"BMS信息",
+	"全局搜索":"全局搜索",
+	"报警位置":"报警位置",
+	"配置短信报警":"配置短信报警",
+	"短信报警记录":"短信报警记录",
+	"佣金记录":"佣金记录",
+	"批量修改":"批量修改",
+	"退换货申请":"退换货申请",
+	"设备转移":"设备转移",
+	"用户退租记录":"用户退租记录",
+	"里程统计":"里程统计",
+	"搜索用户":"搜索用户",
+	
+	
 	"门店没有足够的余额，提醒商家进行充值": "门店没有足够的余额，提醒商家进行充值",
 	"您正在关闭短信通知，关闭后您将接收不到短信警报提醒，您是否要继续关闭?": "您正在关闭短信通知，关闭后您将接收不到短信警报提醒，您是否要继续关闭?",
 	"根据G-Sensor的判断，设备检测到震动时，按设置的时间间隔定时上报位置；静止超过三分钟，自动进入休眠仅维持心跳，显示在线": "根据G-Sensor的判断，设备检测到震动时，按设置的时间间隔定时上报位置；静止超过三分钟，自动进入休眠仅维持心跳，显示在线",

myPages/pages/addDevice/addDevice.vue

@@ -34,7 +34,11 @@ export default {
     /**
      * 生命周期函数--监听页面加载
      */,
-    onLoad: function (options) {},
+    onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('添加设备')
+		});
+	},
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

myPages/pages/bmsbd02/bmsbd02.vue

@@ -325,6 +325,9 @@ export default {
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('BMS信息')
+		});
         const battery_sn = options.battery_sn || '015356934636';
         if (!battery_sn) {
             uni.navigateBack({

myPages/pages/commandList/commandList.vue

@@ -58,6 +58,9 @@ export default {
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('记录')
+		});
         if (!options.macid) {
             uni.navigateBack({
                 delta: 1

myPages/pages/commissionlist/commissionlist.vue

@@ -99,6 +99,9 @@ export default {
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('佣金记录')
+		});
         this.loadCommissionMoney();
         this.refreshCommissionList();
     },

myPages/pages/deviceBatchAlter/deviceBatchAlter.vue

@@ -118,6 +118,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('批量修改')
+		});
         const userBaseInfo = storage.getUserInfo();
         this.setData({
             userBaseInfo: userBaseInfo

myPages/pages/deviceBatchList/deviceBatchList.vue

@@ -24,6 +24,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('设备列表')
+		});
         const devicelist = storage.getBatchSelectedDeviceList();
         if (!devicelist || devicelist.length === 0) {
             uni.navigateBack({

myPages/pages/deviceCommand/deviceCommand.vue

@@ -289,6 +289,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('设置')
+		});
         if (!options.macid) {
             uni.navigateBack({
                 delta: 1

myPages/pages/deviceInfo/deviceInfo.vue

@@ -176,6 +176,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('设备详情')
+		});
         const userBaseInfo = storage.getUserInfo();
         const _deviceInfo = options.deviceInfo;
         const deviceInfo = JSON.parse(decodeURIComponent(_deviceInfo));

myPages/pages/deviceReplace/deviceReplace.vue

@@ -72,6 +72,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('退换货申请')
+		});
         const userBaseInfo = storage.getUserInfo();
         this.setData({
             userBaseInfo: userBaseInfo,

myPages/pages/deviceTransfer/deviceTransfer.vue

@@ -57,6 +57,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('设备转移')
+		});
         storage.setSelectedShop(null);
         const devicelist = storage.getBatchSelectedDeviceList();
         if (!devicelist || devicelist.length === 0) {

myPages/pages/deviceUserReturn/deviceUserReturn.vue

@@ -51,6 +51,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('用户退租记录')
+		});
         const userBaseInfo = storage.getUserInfo();
         this.setData({
             userBaseInfo: userBaseInfo,

myPages/pages/mileage/mileage.vue

@@ -134,6 +134,9 @@ export default {
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('里程统计')
+		});
         if (!options.macid) {
             uni.navigateBack({
                 delta: 1

myPages/pages/notice/notice.vue

@@ -30,11 +30,17 @@ export default {
     /**
      * 生命周期函数--监听页面加载
      */,
-    onLoad: function (options) {},
+    onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('报警通知设置')
+		});
+	},
     /**
      * 生命周期函数--监听页面初次渲染完成
      */
-    onReady: function () {},
+    onReady: function () {
+		
+	},
     /**
      * 生命周期函数--监听页面显示
      */

myPages/pages/paymentDetail/paymentDetail.vue

@@ -144,6 +144,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('收支明细')
+		});
         const userInfo = storage.getUserInfo();
         this.setData({
             userInfo: userInfo

myPages/pages/searchOrder/searchOrder.vue

@@ -116,6 +116,9 @@ export default {
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('搜索')
+		});
         if ('type' in options) {
             this.setData({
                 selectedTypeIndex: parseInt(options.type)

myPages/pages/searchUser/searchUser.vue

@@ -51,7 +51,11 @@ export default {
     /**
      * 生命周期函数--监听页面加载
      */,
-    onLoad: function (options) {},
+    onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('搜索用户')
+		});
+	},
     methods: {
         searchUserInfo: function (e) {
             const phone = e.detail.value.phone;

myPages/pages/setPassword/setPassword.vue

@@ -53,7 +53,11 @@ export default {
     /**
      * 生命周期函数--监听页面加载
      */,
-    onLoad: function (options) {},
+    onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('设置密码')
+		});
+	},
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

myPages/pages/wallet/wallet.vue

@@ -56,6 +56,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('充值')
+		});
         //currentMoney
         this.loadGetCoin();
         this.loadCoinConfig();

pages.json

@@ -73,6 +73,12 @@
 				}
 			}
 		},
+		{
+			"path": "pages/deviceLocalWeb/deviceLocal",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		{
 			"path": "pages/bms/bms",
 			"style": {

pages/bms/bms.vue

@@ -531,6 +531,9 @@
 		 * 生命周期函数--监听页面加载
 		 */
 		onLoad: function(options) {
+			uni.setNavigationBarTitle({
+				title: this.$t('BMS信息')
+			});
 			const battery_sn = options.macid;
 			const userInfo = storage.getUserInfo();
 			if (!battery_sn) {

pages/credit/credit.vue

@@ -53,6 +53,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('物联网卡充值')
+		});
         if (!options.macid) {
             uni.navigateBack({
                 delta: 1

pages/device/device.vue

@@ -238,6 +238,9 @@ export default {
     onLoad: function (options) {
         const selectedShopInfo = storage.getSelectedShopInfo();
         const macid = options.macid;
+		uni.setNavigationBarTitle({
+			title: this.$t('设备列表')
+		});
         if (selectedShopInfo) {
             this.setData({
                 selectedShopInfo: selectedShopInfo

pages/deviceLocalWeb/deviceLocal.css

@@ -0,0 +1,33 @@
+/* pages/credit/credit.wxss */
+.credit-container {
+    margin-top: 13rpx;
+}
+.credit-item {
+    padding: 40rpx 28rpx;
+}
+.item-titie {
+    font-size: 30rpx;
+    font-family: PingFang SC;
+    font-weight: 400;
+    color: rgba(0, 0, 0, 1);
+    line-height: 40rpx;
+}
+.item-value {
+    font-size: 30rpx;
+    font-family: DIN;
+    font-weight: 400;
+    color: rgba(0, 0, 0, 1);
+    line-height: 40rpx;
+}
+.credit-btn {
+    width: 100%;
+    height: 90rpx;
+    background: rgba(17, 191, 150, 1);
+    border-radius: 45rpx;
+    font-size: 32rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: rgba(255, 255, 255, 1);
+    text-align: center;
+    margin: 0 auto;
+}

pages/deviceLocalWeb/deviceLocal.vue

@@ -0,0 +1,62 @@
+<template>
+	<view class="container">
+		<web-view :src="web_url"></web-view>
+	</view>
+</template>
+
+<script>
+	const params = require('../../common/params.js');
+	export default {
+		data() {
+			return {
+				web_url: '',
+			};
+		}
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		,
+		onLoad: function(options) {
+			const macid = options.macid;
+			const token = storage.getApiToken()
+			const web_zxbms_url = params.web_zxbms_url
+			const web_bms_url = params.web_bms_url
+			//这里做个判断
+			var webUrl = web_zh + 'monitorGooglePhone?macid=' + macid +'&token=' + token
+		},
+		/**
+		 * 生命周期函数--监听页面初次渲染完成
+		 */
+		onReady: function() {},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow: function() {},
+		/**
+		 * 生命周期函数--监听页面隐藏
+		 */
+		onHide: function() {},
+		/**
+		 * 生命周期函数--监听页面卸载
+		 */
+		onUnload: function() {},
+		/**
+		 * 页面相关事件处理函数--监听用户下拉动作
+		 */
+		onPullDownRefresh: function() {},
+		/**
+		 * 页面上拉触底事件的处理函数
+		 */
+		onReachBottom: function() {},
+		/**
+		 * 用户点击右上角分享
+		 */
+		onShareAppMessage: function() {},
+		methods: {
+
+		}
+	};
+</script>
+<style>
+	@import './credit.css';
+</style>

pages/home/home.vue

@@ -382,16 +382,27 @@
 			
 			setMePositioning() {
 				let _this = this
+				// const marker = new google.maps.Marker({
+				// 	position: {
+				// 		lat: parseFloat(_this.deviceInfo.latitude),
+				// 		lng: parseFloat(_this.deviceInfo.longitude)
+				// 	},
+				// 	icon: {
+				// 		url: "https://maps.gstatic.com/mapfiles/ms2/micons/red.png",
+				// 		scaledSize: new google.maps.Size(50, 50)
+				// 	},
+				// 	map: _this.map
+				// });
 				const marker = new google.maps.Marker({
-					position: {
-						lat: parseFloat(_this.deviceInfo.latitude),
-						lng: parseFloat(_this.deviceInfo.longitude)
-					},
+					id: 1001,
+					map: _this.map,
+					position:new google.maps.LatLng( parseFloat(_this.deviceInfo.latitude), parseFloat(_this.deviceInfo.longitude)),
 					icon: {
 						url: "https://maps.gstatic.com/mapfiles/ms2/micons/red.png",
+						size: new google.maps.Size(50, 50),
 						scaledSize: new google.maps.Size(50, 50)
 					},
-					map: _this.map
+					zIndex: 20
 				});
 				meMarker.push(marker)
 			},
@@ -1218,9 +1229,16 @@ export default {
                     common.simpleToast(this,this.$t('该设备暂无位置信息'));
                     return;
                 }
-                uni.navigateTo({
-                    url: '/pages/deviceLocal/deviceLocal'
-                });
+				let locale = uni.getLocale();
+				if (locale === 'zh-Hans' || locale === 'zh') {
+				  uni.navigateTo({
+				      url: '/pages/deviceLocal/deviceLocal'
+				  });
+				} else {
+				  uni.navigateTo({
+				      url: '/pages/deviceLocalWeb/deviceLocal'+ '?macid=' + this.macid
+				  });
+				}
             }
         },
 

pages/orderlist/orderlist.vue

@@ -1,232 +1,244 @@
 <template>
-    <view class="container">
-        <view class="main-container">
-            <view class="nav-tab flex-row flex-between">
-                <view class="order-type-container flex-row flex-start">
-                    <view :class="'nav-item ' + (navSelected == 1 ? 'nav-active' : '')" @tap="bindSelectNavTab" data-nav="1">{{$t('待确认')}}</view>
-                    <view :class="'nav-item ' + (navSelected == 2 ? 'nav-active' : '')" @tap="bindSelectNavTab" data-nav="2">{{$t('支付成功')}}</view>
-                    <view :class="'nav-item ' + (navSelected == 3 ? 'nav-active' : '')" @tap="bindSelectNavTab" data-nav="3">{{$t('全部')}}</view>
-                </view>
-                <view class="search-btn" style="margin-right: 20px" @tap="navigatorToPage" data-page="/myPages/pages/searchOrder/searchOrder">
-                    <image style="width: 19px; height: 19px" src="/static/resource/images/search-i.png"></image>
-                </view>
-            </view>
+	<view class="container">
+		<view class="main-container">
+			<view class="nav-tab flex-row flex-between">
+				<view class="order-type-container flex-row flex-start">
+					<view :class="'nav-item ' + (navSelected == 1 ? 'nav-active' : '')" @tap="bindSelectNavTab"
+						data-nav="1">{{$t('待确认')}}</view>
+					<view :class="'nav-item ' + (navSelected == 2 ? 'nav-active' : '')" @tap="bindSelectNavTab"
+						data-nav="2">{{$t('支付成功')}}</view>
+					<view :class="'nav-item ' + (navSelected == 3 ? 'nav-active' : '')" @tap="bindSelectNavTab"
+						data-nav="3">{{$t('全部')}}</view>
+				</view>
+				<view class="search-btn" style="margin-right: 20px" @tap="navigatorToPage"
+					data-page="/myPages/pages/searchOrder/searchOrder">
+					<image style="width: 19px; height: 19px" src="/static/resource/images/search-i.png"></image>
+				</view>
+			</view>
 
-            <view class="list-group">
-                <view class="list-item" v-for="(item, index) in orderList" :key="index">
-                    <view class="list-item-head flex-row flex-between">
-                        <view class="order-time">{{ item.ctime }}</view>
-                        <view class="order-status">
-                            <text v-if="item.pay_type == 1 && item.status == 0" class="i-status to-check">{{$t('线下-待确认')}}</text>
-                            <text v-if="item.pay_type == 1 && item.status == 1" class="i-status to-pay-ok">{{$t('线下-支付成功')}}</text>
-                            <text v-if="item.pay_type == 0 && item.status == 1" class="i-status to-pay-ok">{{$t('微信-支付成功')}}</text>
-                        </view>
-                    </view>
+			<view class="list-group">
+				<view class="list-item" v-for="(item, index) in orderList" :key="index">
+					<view class="list-item-head flex-row flex-between">
+						<view class="order-time">{{ item.ctime }}</view>
+						<view class="order-status">
+							<text v-if="item.pay_type == 1 && item.status == 0"
+								class="i-status to-check">{{$t('线下-待确认')}}</text>
+							<text v-if="item.pay_type == 1 && item.status == 1"
+								class="i-status to-pay-ok">{{$t('线下-支付成功')}}</text>
+							<text v-if="item.pay_type == 0 && item.status == 1"
+								class="i-status to-pay-ok">{{$t('微信-支付成功')}}</text>
+						</view>
+					</view>
 
-                    <view class="list-item-body">
-                        <view class="form-item flex-row flex-between">
-                            <view class="form-label">{{$t('门店')}}</view>
-                            <view class="form-value">{{ item.shop_name }}</view>
-                        </view>
-                        <view class="form-item flex-row flex-between">
-                            <view class="form-label">{{$t('电池编号')}}</view>
-                            <view class="form-value" @tap="handleClipboard" :data-clipdata="item.battery_sn">
-                                {{ item.battery_sn }}
-                                <image src="/static/resource/images/clip.png" style="width: 10px; height: 10px; margin-left: 5px"></image>
-                            </view>
-                        </view>
-                        <view class="form-item flex-row flex-between">
-                            <view class="form-label">单价</view>
-                            <view class="form-value">
-                                <text>{{ item.hire_price / 100 + $t('元')}}/</text>
-                                <text v-if="item.hire_duration_unit == 1">{{$t('天')}}</text>
-                                <text v-else-if="item.hire_duration_unit == 2">{{$t('月')}}</text>
-                                <text v-else-if="item.hire_duration_unit == 3">{{$t('年')}}</text>
-                            </view>
-                        </view>
-                        <view class="form-item flex-row flex-between">
-                            <view class="form-label">{{$t('租赁用户')}}</view>
-                            <view class="form-value">{{ item.user_name }} {{ item.phone }}</view>
-                        </view>
-                        <view class="form-item flex-row flex-between">
-                            <view class="form-label">{{$t('租赁时长')}}</view>
-                            <view class="form-value">
-                                <text>{{ item.hire_duration }}</text>
-                                <text v-if="item.hire_duration_unit == 1">{{$t('天')}}</text>
-                                <text v-else-if="item.hire_duration_unit == 2">{{$t('月')}}</text>
-                                <text v-else-if="item.hire_duration_unit == 3">{{$t('年')}}</text>
-                            </view>
-                        </view>
-                        <view class="form-item flex-row flex-between">
-                            <view class="form-label">{{$t('应付金额')}}</view>
-                            <view class="form-value pay-money">{{ item.money / 100 }}元</view>
-                        </view>
-                    </view>
+					<view class="list-item-body">
+						<view class="form-item flex-row flex-between">
+							<view class="form-label">{{$t('门店')}}</view>
+							<view class="form-value">{{ item.shop_name }}</view>
+						</view>
+						<view class="form-item flex-row flex-between">
+							<view class="form-label">{{$t('电池编号')}}</view>
+							<view class="form-value" @tap="handleClipboard" :data-clipdata="item.battery_sn">
+								{{ item.battery_sn }}
+								<image src="/static/resource/images/clip.png"
+									style="width: 10px; height: 10px; margin-left: 5px"></image>
+							</view>
+						</view>
+						<view class="form-item flex-row flex-between">
+							<view class="form-label">单价</view>
+							<view class="form-value">
+								<text>{{ item.hire_price / 100 + $t('元')}}/</text>
+								<text v-if="item.hire_duration_unit == 1">{{$t('天')}}</text>
+								<text v-else-if="item.hire_duration_unit == 2">{{$t('月')}}</text>
+								<text v-else-if="item.hire_duration_unit == 3">{{$t('年')}}</text>
+							</view>
+						</view>
+						<view class="form-item flex-row flex-between">
+							<view class="form-label">{{$t('租赁用户')}}</view>
+							<view class="form-value">{{ item.user_name }} {{ item.phone }}</view>
+						</view>
+						<view class="form-item flex-row flex-between">
+							<view class="form-label">{{$t('租赁时长')}}</view>
+							<view class="form-value">
+								<text>{{ item.hire_duration }}</text>
+								<text v-if="item.hire_duration_unit == 1">{{$t('天')}}</text>
+								<text v-else-if="item.hire_duration_unit == 2">{{$t('月')}}</text>
+								<text v-else-if="item.hire_duration_unit == 3">{{$t('年')}}</text>
+							</view>
+						</view>
+						<view class="form-item flex-row flex-between">
+							<view class="form-label">{{$t('应付金额')}}</view>
+							<view class="form-value pay-money">{{ item.money / 100 }}元</view>
+						</view>
+					</view>
 
-                    <view v-if="item.pay_type == 1 && item.status == 0" class="list-item-footer flex-row flex-end">
-                        <view class="op-btn" @tap="bindCheckPay" :data-ordersn="item.order_sn" :data-idx="index">{{$t('确认支付')}}</view>
-                    </view>
-                </view>
-            </view>
+					<view v-if="item.pay_type == 1 && item.status == 0" class="list-item-footer flex-row flex-end">
+						<view class="op-btn" @tap="bindCheckPay" :data-ordersn="item.order_sn" :data-idx="index">
+							{{$t('确认支付')}}</view>
+					</view>
+				</view>
+			</view>
 
-            <no-more :is-loading="isLoading" />
-        </view>
-    </view>
+			<no-more :is-loading="isLoading" />
+		</view>
+	</view>
 </template>
 
 <script>
-import noMore from '@/component/nomore/nomore';
-// pages/orderlist/orderlist.js
-var config = require('../../common/config.js');
-var http = require('../../common/http.js');
-var common = require('../../common/common.js');
-var storage = require('../../common/storage.js');
-export default {
-    components: {
-        noMore
-    },
-    data() {
-        return {
-            navSelected: 1,
-            start_page: 1,
-            limit_page: 10,
-            orderList: [],
-            isLoading: false
-        };
-    },
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad: function (options) {
-        this.refreshOrderList();
-    },
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow: function () {},
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage: function () {},
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh: function () {
-        this.refreshOrderList();
-    },
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom: function () {
-        this.setData({
-            isLoading: true
-        });
-        this.start_page++;
-        this.loadOrderList();
-    },
-    methods: {
-        bindSelectNavTab: function (e) {
-            const navSelected = e.currentTarget.dataset.nav || 1;
-            this.setData({
-                navSelected: navSelected,
-                start_page: 1,
-                orderList: []
-            });
-            this.loadOrderList();
-        },
+	import noMore from '@/component/nomore/nomore';
+	// pages/orderlist/orderlist.js
+	var config = require('../../common/config.js');
+	var http = require('../../common/http.js');
+	var common = require('../../common/common.js');
+	var storage = require('../../common/storage.js');
+	export default {
+		components: {
+			noMore
+		},
+		data() {
+			return {
+				navSelected: 1,
+				start_page: 1,
+				limit_page: 10,
+				orderList: [],
+				isLoading: false
+			};
+		},
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad: function(options) {
+			this.refreshOrderList();
+			uni.setNavigationBarTitle({
+				title: this.$t('订单列表')
+			});
+		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow: function() {},
+		/**
+		 * 用户点击右上角分享
+		 */
+		onShareAppMessage: function() {},
+		/**
+		 * 页面相关事件处理函数--监听用户下拉动作
+		 */
+		onPullDownRefresh: function() {
+			this.refreshOrderList();
+		},
+		/**
+		 * 页面上拉触底事件的处理函数
+		 */
+		onReachBottom: function() {
+			this.setData({
+				isLoading: true
+			});
+			this.start_page++;
+			this.loadOrderList();
+		},
+		methods: {
+			bindSelectNavTab: function(e) {
+				const navSelected = e.currentTarget.dataset.nav || 1;
+				this.setData({
+					navSelected: navSelected,
+					start_page: 1,
+					orderList: []
+				});
+				this.loadOrderList();
+			},
 
-        refreshOrderList() {
-            this.setData({
-                start_page: 1,
-                orderList: []
-            });
-            this.loadOrderList();
-        },
+			refreshOrderList() {
+				this.setData({
+					start_page: 1,
+					orderList: []
+				});
+				this.loadOrderList();
+			},
 
-        loadOrderList: function () {
-            const pData = {
-                page: this.start_page,
-                limit: this.limit_page,
-                order_status: this.navSelected
-            };
-            const that = this;
-            common.loading(this);
-            http.postApi(config.API_ORDER_CHILDREN_LIST, pData, function (resp) {
-                uni.hideLoading();
-                uni.stopPullDownRefresh();
-                if (resp.data.code === 200) {
-                    let orderList = that.orderList;
-                    orderList.push.apply(orderList, resp.data.data.list);
-                    that.setData({
-                        orderList: orderList,
-                        isLoading: false
-                    });
-                } else {
-                    common.simpleToast(that,resp.data.msg);
-                }
-            });
-        },
+			loadOrderList: function() {
+				const pData = {
+					page: this.start_page,
+					limit: this.limit_page,
+					order_status: this.navSelected
+				};
+				const that = this;
+				common.loading(this);
+				http.postApi(config.API_ORDER_CHILDREN_LIST, pData, function(resp) {
+					uni.hideLoading();
+					uni.stopPullDownRefresh();
+					if (resp.data.code === 200) {
+						let orderList = that.orderList;
+						orderList.push.apply(orderList, resp.data.data.list);
+						that.setData({
+							orderList: orderList,
+							isLoading: false
+						});
+					} else {
+						common.simpleToast(that, resp.data.msg);
+					}
+				});
+			},
 
-        bindCheckPay: function (e) {
-            const idx = e.currentTarget.dataset.idx;
-            const order_sn = e.currentTarget.dataset.ordersn;
-            const orderInfo = this.orderList[idx];
-            if (!orderInfo) {
-                common.simpleToast(this,'订单错误');
-                return;
-            }
-            if (orderInfo.pay_type != 1 || orderInfo.status != 0) {
-                common.simpleToast(this,'该订单不是线下支付订单');
-                return;
-            }
-            const that = this;
-            uni.showModal({
-                title: this.$t('提示'),
-                content: this.$t('请确定该用户已线下支付'),
-                showCancel: true,
-                cancelText: this.$t('取消'),
-                cancelColor: '',
-                confirmText: this.$t('确定'),
-                confirmColor: '',
-                success: function (res) {
-                    if (res.confirm) {
-                        const pData = {
-                            order_sn: order_sn,
-                            idx: idx
-                        };
-                        http.postApi(config.API_ORDER_PAY_SUCCESS, pData, function (resp) {
-                            if (resp.data.code === 200) {
-                                that.refreshOrderList();
-                            } else {
-                                common.simpleToast(that,resp.data.msg);
-                            }
-                        });
-                    }
-                },
-                fail: function (res) {},
-                complete: function (res) {}
-            });
-        },
+			bindCheckPay: function(e) {
+				const idx = e.currentTarget.dataset.idx;
+				const order_sn = e.currentTarget.dataset.ordersn;
+				const orderInfo = this.orderList[idx];
+				if (!orderInfo) {
+					common.simpleToast(this, '订单错误');
+					return;
+				}
+				if (orderInfo.pay_type != 1 || orderInfo.status != 0) {
+					common.simpleToast(this, '该订单不是线下支付订单');
+					return;
+				}
+				const that = this;
+				uni.showModal({
+					title: this.$t('提示'),
+					content: this.$t('请确定该用户已线下支付'),
+					showCancel: true,
+					cancelText: this.$t('取消'),
+					cancelColor: '',
+					confirmText: this.$t('确定'),
+					confirmColor: '',
+					success: function(res) {
+						if (res.confirm) {
+							const pData = {
+								order_sn: order_sn,
+								idx: idx
+							};
+							http.postApi(config.API_ORDER_PAY_SUCCESS, pData, function(resp) {
+								if (resp.data.code === 200) {
+									that.refreshOrderList();
+								} else {
+									common.simpleToast(that, resp.data.msg);
+								}
+							});
+						}
+					},
+					fail: function(res) {},
+					complete: function(res) {}
+				});
+			},
 
-        handleClipboard(e) {
-            const clipdata = e.currentTarget.dataset.clipdata;
-            uni.setClipboardData({
-                data: clipdata
-            });
-        },
+			handleClipboard(e) {
+				const clipdata = e.currentTarget.dataset.clipdata;
+				uni.setClipboardData({
+					data: clipdata
+				});
+			},
 
-        navigatorToPage: function (e) {
-            const page = e.currentTarget.dataset.page;
-            if (!page) {
-                return;
-            }
-            uni.navigateTo({
-                url: page
-            });
-        }
-    }
-};
+			navigatorToPage: function(e) {
+				const page = e.currentTarget.dataset.page;
+				if (!page) {
+					return;
+				}
+				uni.navigateTo({
+					url: page
+				});
+			}
+		}
+	};
 </script>
 <style>
-@import './orderlist.css';
-</style>
+	@import './orderlist.css';
+</style>

pages/register/register.vue

@@ -83,7 +83,11 @@ export default {
     /**
      * 生命周期函数--监听页面加载
      */,
-    onLoad: function (options) {},
+    onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('注册')
+		});
+	},
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

pages/searchDevice/searchDevice.vue

@@ -147,6 +147,9 @@ export default {
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('全局搜索')
+		});
         if (options.search) {
             this.setData({
                 seach_value: options.search

pages/smsAlarm/smsAlarm.vue

@@ -110,6 +110,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('短信报警')
+		});
         const userInfo = storage.getUserInfo();
         this.setData({
             userInfo: userInfo,

pages/smsConfig/smsConfig.vue

@@ -65,6 +65,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('配置短信报警')
+		});
         this.setData({
             macid: options.macid || ''
         });

pages/smsRecord/smsRecord.vue

@@ -62,6 +62,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('短信报警记录')
+		});
         this.setData({
             macid: options.macid || ''
         });

pages/warnList/warnList.vue

@@ -44,6 +44,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('报警列表')
+		});
         this.macid = options.macid || '';
         console.log(options);
         common.loading(this);

pages/warnMap/warnMap.vue

@@ -35,6 +35,9 @@ export default {
      * 生命周期函数--监听页面加载
      */,
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('报警位置')
+		});
         const index = options.index;
         this.readyAlarmInfo();
     },

pages/willExpire/willExpireDevice.vue

@@ -68,6 +68,9 @@ export default {
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+		uni.setNavigationBarTitle({
+			title: this.$t('即将到期')
+		});
         const selectedShopInfo = storage.getSelectedShopInfo();
         if (selectedShopInfo) {
             this.setData({