Procházet zdrojové kódy

chore: 版本号更新至1.15.23,优化设备列表页面交互

1. 调整设备列表页分组控制按钮位置至页面底部
2. 移动原有的分组控制按钮到顶部tab栏下方
3. 修复开关组件未设置 inactiveColor 的问题
4. 移除列表项内重复的分组控制按钮
5. 移除调试用的console日志
6. 调整按钮样式适配底部固定布局
allen před 3 dny
rodič
revize
fb691c3991
2 změnil soubory, kde provedl 20 přidání a 8 odebrání
  1. 2 2
      manifest.json
  2. 18 6
      pages/equipList2/index.vue

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.15.22",
-    "versionCode" : 11522,
+    "versionName" : "1.15.23",
+    "versionCode" : 11523,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */

+ 18 - 6
pages/equipList2/index.vue

@@ -50,6 +50,9 @@
             :class="{'active-tab' : device_status == '0'}"
           >离线{{ offline_counts }}</view>
 				</view>
+				<view class="action-group" v-if="type_id == 49 && myuser_type == 4">
+					<view class="action-item" @click="toControls">分组控制</view>
+				</view>
 				<scroll-view 
           :scroll-top="0"
           :scroll-y="true"
@@ -58,6 +61,7 @@
 					@scrolltolower="lower"
           @scroll="scroll"
         >
+					
 					<view class="list_item" v-for="(item, index) in eqlistdata" :key="index" @click="historys(item)">
 						<view class="list_item_top">
 							<view class="p1">
@@ -121,6 +125,7 @@
 										<u-switch 
 											:value="n.switchValue"
 											active-color="#0BBC58"
+											inactiveColor="#C3CAD8"
 											@click.native="()=>changeSwitchStatus(n.value,n,item)" 
 											size="36"
 										 ></u-switch>
@@ -133,9 +138,6 @@
 									</view>
 								</view>
 							</view>
-							<view class="action-group" v-if="type_id == 49 && myuser_type == 4">
-								<view class="action-item" @click="toControls(item)">分组控制</view>
-							</view>
 						</view>
 					</view>
 				</scroll-view>
@@ -322,9 +324,9 @@ import openingDegree from '../assets/openingDegree.png';
 			};
 		},
 		methods: {
-			toControls(item){
+			toControls(){
 				uni.navigateTo({
-					url: '/pages/cb/zhamenFirst/controls?id=' + item.id,
+					url: '/pages/cb/zhamenFirst/controls',
 				});
 			},
 			getvalve_params(item){
@@ -1103,6 +1105,7 @@ import openingDegree from '../assets/openingDegree.png';
 			uni.getStorage({
 				key:"myuser_type",
 				success:(res)=>{
+					console.log(res,'resresres')
 					this.myuser_type = res?.data;
 				}
 			})
@@ -1431,6 +1434,14 @@ import openingDegree from '../assets/openingDegree.png';
 		align-items: center;
 		gap: 16rpx;
 		margin-top: 24rpx;
+		background: #0BBC58;
+		position: fixed;
+		bottom: 0rpx;;
+		border-radius: 8rpx;
+		z-index:1000;
+		color:#fff;
+		width:100%;
+		padding: 10rpx 0;
 		.action-item{
 			display: flex;
 			align-items: center;
@@ -1441,7 +1452,7 @@ import openingDegree from '../assets/openingDegree.png';
 			border:2rpx solid #0BBC58;
 			padding: 16rpx 0;
 			font-size: 24rpx;
-			color: #0BBC58;
+			color: #fff;
 			.item-icon{
 				width: 15px;
 				height: 15px;
@@ -1491,6 +1502,7 @@ import openingDegree from '../assets/openingDegree.png';
 		// margin-bottom: 100rpx;
 		overflow-y: auto;
 		padding: 0 32rpx;
+		padding-bottom: 100rpx;
 		box-sizing: border-box;
 		.list_item {
 			width: 100%;