config.js

@@ -2,17 +2,17 @@
 module.exports = {
 	// todo 打包项目时切换baseUrl
 	// 测试环境 
-	baseUrl: 'http://110.40.171.179:8089',
+	// baseUrl: 'http://110.40.171.179:8089',
 	// 生产环境
-	// baseUrl: 'http://1.15.120.242:8089',
+	baseUrl: 'http://1.15.120.242:8089',
 	// 应用信息
 	appInfo: {
 		// 应用名称
-		name: "xzzn-app",
+		name: "上动EMS",
 		// 应用版本
 		version: "1.2.0",
 		// 应用logo
-		logo: "/static/logo.png",
+		logo: "/static/logo-trans.png",
 		// 官方网站
 		site_url: "http://xzzn.vip",
 		// 政策协议

pages/mine/about/index.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="about-container">
 		<view class="header-section text-center">
-			<image style="width: 150rpx;height: 150rpx;" src="/static/logo.png" mode="widthFix">
+			<image style="width: 150rpx;height: 150rpx;" src="/static/logo-trans.png" mode="widthFix">
 			</image>
 			<uni-title type="h2" title="EMS移动端"></uni-title>
 		</view>

pages/work/index.vue

@@ -21,13 +21,13 @@
 					<uni-grid-item>
 						<view class="grid-item-box">
 							<view class="title">装机功率(MW)</view>
-							<view class="text">{{baseInfo.installPower}}</view>
+							<view class="text">{{baseInfo.installPower | formatNumber}}</view>
 						</view>
 					</uni-grid-item>
 					<uni-grid-item>
 						<view class="grid-item-box">
 							<view class="title">装机容量(MW)</view>
-							<view class="text">{{baseInfo.installCapacity}}</view>
+							<view class="text">{{baseInfo.installCapacity | formatNumber}}</view>
 						</view>
 					</uni-grid-item>
 				</uni-grid>
@@ -455,6 +455,7 @@
 					.text-color {
 						color: #fff;
 						font-size: 34rpx;
+						line-height: 36rpx;
 						font-weight: bolder;
 					}
 

pages/work/pcs/index.vue

@@ -168,16 +168,16 @@
 				list: [],
 				siteId: '',
 				infoData: [{
-						label: "总交流有功电率",
+						label: "总交流有功功率",
 						attr: "totalActivePower",
 						unit: "kW",
-						pointName: "总交流有功电率",
+						pointName: "总交流有功功率",
 					},
 					{
-						label: "总交流无功电率",
+						label: "总交流无功功率",
 						attr: "totalReactivePower",
 						unit: "kVar",
-						pointName: "总交流无功电率",
+						pointName: "总交流无功功率",
 					},
 					{
 						label: "当天交流充电量",

static/scss/colorui.css

@@ -11,7 +11,7 @@
         main 初始化
  ==================== */
 body {
-	background-color: #f1f1f1;
+	background-color: #f5f6f7;
 	font-size: 28upx;
 	color: #333333;
 	font-family: Helvetica Neue, Helvetica, sans-serif;
@@ -2498,11 +2498,13 @@ button.cuIcon.lg {
 .cu-modal.drawer-modal.show .cu-dialog {
 	transform: translateX(0%);
 }
+
 .cu-modal .cu-dialog>.cu-bar:first-child .action {
 	min-width: 100rpx;
 	margin-right: 0;
 	min-height: 100rpx;
 }
+
 /* ==================
          轮播
  ==================== */
@@ -2932,11 +2934,13 @@ scroll-view.cu-steps .cu-item {
 	position: relative;
 	overflow: hidden;
 }
+
 .grid.grid-square>view.bg-img image {
 	width: 100%;
 	height: 100%;
 	position: absolute;
 }
+
 .grid.col-1.grid-square>view {
 	padding-bottom: 100%;
 	height: 0;

static/scss/global.scss

@@ -106,6 +106,7 @@
 	line-height: 100px;
 	height: 100px;
 	font-size: 30rpx;
+	background-color: transparent;
 }
 // 九宫格
 .grid-item-box {