018A UI部分完成了

2025-12-15 10:22:05 +08:00
parent 8ad20ad7fc
commit 2cf02932e5
14 changed files with 1867 additions and 10 deletions
--- a/manifest.json
+++ b/manifest.json
@ -2,7 +2,7 @@
    "name" : "星汉物联",
    "appid" : "__UNI__A21EF43",
    "description" : "设备管控",
-    "versionName" : "1.0.7",
+    "versionName" : "1.0.8",
    "versionCode" : "100",
    "transformPx" : false,
    /* 5+App特有相关 */
--- a/pages.json
+++ b/pages.json
@ -355,6 +355,20 @@
 			{
 				"navigationBarTitleText" : "注销账号"
 			}
+		},
+		{
+			"path" : "pages/common/aboutUs/ContactUs",
+			"style" : 
+			{
+				"navigationBarTitleText" : "联系我们"
+			}
+		},
+		{
+			"path" : "pages/018A/HBY018A",
+			"style" : 
+			{
+				"navigationBarTitleText" : "HBY018A"
+			}
 		}


--- a/pages/018A/HBY018A.vue
+++ b/pages/018A/HBY018A.vue
--- a/pages/common/aboutUs/ContactUs.vue
+++ b/pages/common/aboutUs/ContactUs.vue
@ -0,0 +1,272 @@
+<template>
+	<view class="maincontent contentBg">
+		<view class="title">
+			您可以反馈App使用中的问题、产品问题、投诉、意见或建议,向我们获取使用教程,我们将在收到您的反馈后,15个工作日内答复您,请保持您的注册手机号畅通。
+		</view>
+		<view class="main">
+			<view class="text-content">
+
+				<textarea class="textarea" v-model="txt" auto-focus="true" placeholder-class="placehoderClass" auto-height="true"
+					placeholder="您需要反馈的内容" :auto-height="true" maxlength="2000" cursor-color="#BBE600" />
+
+
+
+			</view>
+			<view class="footBtn">
+				<view class="fright convert" @click.stop="Send">发送</view>
+				<view class="fright audioSett" @click.stop="txt=''">清空</view>
+				<view class="clear"></view>
+			</view>
+		</view>
+
+		<MessagePopup :visible="Status.Pop.showPop" :type="Status.Pop.popType" :bgColor="Status.Pop.bgColor"
+			:borderColor="Status.Pop.borderColor" :textColor="Status.Pop.textColor"
+			:buttonBgColor="Status.Pop.buttonBgColor" :buttonTextColor="Status.Pop.buttonTextColor"
+			:iconUrl="Status.Pop.iconUrl" :message="Status.Pop.message" :buttonText="Status.Pop.buttonText"
+			@buttonClick="HidePop" :visiblePrompt="Status.Pop.visiblePrompt" :promptTitle="Status.Pop.promptTitle"
+			v-model="Status.Pop.modelValue" @closePop="closePop" />
+
+		<global-loading ref="loading" />
+	</view>
+</template>
+
+<script>
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js' ;
+	var these=null;
+	export default {
+		data() {
+			return {
+				txt: "",
+				Status: {
+					Pop: {
+						showPop: false, //是否显示弹窗
+						popType: 'custom',
+						bgColor: '#383934bd',
+						borderColor: '#BBE600',
+						textColor: '#ffffffde',
+						buttonBgColor: '#BBE600',
+						buttonTextColor: '#232323DE',
+						iconUrl: '',
+						message: '您确定要这样做吗？',
+						buttonText: '确定',
+						clickEvt: '',
+						visiblePrompt: false,
+						promptTitle: '设备名称',
+						modelValue: '',
+						visibleClose: false,
+						okCallback: null
+					}
+				}
+			}
+		},
+		onLoad(){
+			these=this;
+		},
+		methods: {
+			Send() {
+				if(!this.txt){
+					this.showPop({
+						showPop: true,
+						message: "请输入反馈内容",
+						iconUrl: "/static/images/6155/DeviceDetail/warnning.png",
+						borderColor: "#e034344d",
+						buttonBgColor: "#E03434",
+					});
+					return;
+				}
+				showLoading(this,{text:'正在发送'});
+				setTimeout(()=>{
+					//假装联系了我们
+					this.showPop({
+						showPop: true,
+						message: "已收到您的反馈",
+						iconUrl: "/static/images/common/success.png"
+					});
+					this.txt="";
+					hideLoading(this);
+				},800);
+				
+
+			},
+
+			closePop: function() {
+				this.Status.Pop.showPop = false;
+
+				if (this.Status.Pop.cancelCallback) {
+					this.Status.Pop.cancelCallback();
+				}
+			},
+			HidePop: function() {
+				if (this.Status.Pop.clickEvt == 'SendUsr') {
+
+				}
+
+
+				this.Status.Pop.showPop = false;
+				if (this.Status.Pop.okCallback) {
+					this.Status.Pop.okCallback();
+				}
+			},
+			showPop: function(option) {
+				hideLoading(this);
+				let def = {
+					showPop: true, //是否显示弹窗
+					popType: 'custom',
+					bgColor: '#383934bd',
+					borderColor: '#BBE600',
+					textColor: '#ffffffde',
+					buttonBgColor: '#BBE600',
+					buttonTextColor: '#232323DE',
+					iconUrl: '',
+					message: '',
+					buttonText: '确定',
+					clickEvt: '',
+					visiblePrompt: false,
+					promptTitle: '',
+					modelValue: '',
+					visibleClose: false,
+					okCallback: null,
+					showSlot: false,
+					buttonCancelText: '',
+					showCancel: false,
+				}
+
+				let keys = Object.keys(def);
+
+				for (let i = 0; i < keys.length; i++) {
+					let key = keys[i];
+					if (key in option) {
+						continue;
+					}
+					this.Status.Pop[key] = def[key];
+				}
+				if (option) {
+					keys = Object.keys(option);
+					for (let i = 0; i < keys.length; i++) {
+						let key = keys[i];
+
+						this.Status.Pop[key] = option[key];
+					}
+				}
+
+				if (!option.borderColor) {
+					option.borderColor = '#BBE600';
+					option.buttonBgColor = '#BBE600';
+				}
+				these.Status.Pop.showPop = true;
+			},
+
+		}
+	}
+</script>
+
+<style>
+	.title{
+		margin: 50rpx 0rpx;
+		color: #FFFFFFDE;
+		
+		
+		font-family: PingFang SC;
+		font-size: 27rpx;
+		font-weight: 400;
+		line-height: 40rpx;
+		letter-spacing: 0px;
+		text-align: left;
+	}
+	.footBtn .audioSett {
+		margin-right: 50rpx;
+		color: #FFFFFFDE;
+		
+
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 55rpx;
+		letter-spacing: 0px;
+		text-align: center;
+	}
+
+	.footBtn .convert {
+		/* 组合 99 */
+		width: 130rpx;
+		height: 55rpx;
+		line-height: 55rpx;
+		border-radius: 180px;
+		color: #232323;
+		background-color: #AED600;
+		text-align: center;
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		letter-spacing: 12rpx;
+	}
+
+	.main {
+		width: 100%;
+		height: 100%;
+
+
+	}
+
+	.maincontent {
+		height: 100vh;
+		overflow: hidden;
+	}
+
+	.footBtn {
+		width: 100%;
+
+	}
+
+
+	.line {
+		width: 100%;
+		height: 0rpx;
+		border-bottom: 1rpx solid rgba(255, 255, 255, 0.36);
+		margin-bottom: 20rpx;
+	}
+
+	.placehoderClass {
+		color: rgba(255, 255, 255, 0.6);
+
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 44rpx;
+		letter-spacing: 0.14px;
+	}
+
+	.text-content {
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		width: 100%;
+		height: 70%;
+		box-sizing: border-box;
+		padding: 20rpx;
+		margin-bottom: 20rpx;
+		overflow-y: scroll;
+	}
+
+	.importTxt {
+		color: rgba(174, 214, 0, 1);
+
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		height: 60rpx;
+		line-height: 60rpx;
+		letter-spacing: 0.14px;
+
+	}
+
+	.textarea {
+
+		overflow-y: scroll;
+		width: 100%;
+		box-sizing: border-box;
+	}
+</style>
--- a/pages/common/addBLE/addEquip.vue
+++ b/pages/common/addBLE/addEquip.vue
@ -34,7 +34,7 @@
 						<view class="centertxt ">
 							<view class="name" v-text="item.name"></view>
 							<view class="id">
-								<text>信号:{{110+item.RSSI>100?100:110+item.RSSI}}%</text>
+								<text>信号:{{item.RSSI}}dBm</text>
 							</view>
 						</view>
 						<view class="rightIco center">
@ -71,7 +71,7 @@
 							</view>

 							<view class="id">
-								<text>信号:{{110+item.RSSI>100?100:110+item.RSSI}}%</text>
+								<text>信号:{{item.RSSI}}dBm</text>
 							</view>
 						</view>

@ -377,6 +377,8 @@
 							}
 							these.EquipMents.push(device);
 						}
+						
+						these.EquipMents.sort((a, b) => b.RSSI - a.RSSI);//信号好的排前面，一般信号好的是目标设备
 					}
 				}, pagePath);
 			}
--- a/pages/common/forgotPassword/index.vue
+++ b/pages/common/forgotPassword/index.vue
@ -72,7 +72,7 @@
 				agreed: false,
 				isCounting: false,
 				countdown: 0,
-				isChecked: true,
+				isChecked: false,
 				showAgreement: false, // 控制弹窗显示
 			}
 		},
--- a/pages/common/login/index.vue
+++ b/pages/common/login/index.vue
@ -217,7 +217,9 @@
 					this.showAgreement = true
 					return false
 				}
+				
 				try {
+					
 					uni.showLoading({
 						title: '登录中...'
 					})
--- a/pages/common/register/index.vue
+++ b/pages/common/register/index.vue
@ -75,7 +75,7 @@
 				agreed: false,
 				isCounting: false,
 				countdown: 0,
-				isChecked: true,
+				isChecked: false,
 				showAgreement: false, // 控制弹窗显示
 			}
 		},
--- a/pages/common/user/index.vue
+++ b/pages/common/user/index.vue
@ -27,13 +27,18 @@
 					<text class="title">版本更新 ({{appVersion}})</text>
 					<uni-icons type="right" size="25" color="rgba(255, 255, 255, 0.4)" class="uniIcon"></uni-icons>
 				</view>
+				<view class="menu-item" @click="sendCounsel">
+					<image src="/static/images/common/yijianfankui.png" class="icon"></image>
+					<text class="title">举报反馈</text>
+					<uni-icons type="right" size="25" color="rgba(255, 255, 255, 0.4)" class="uniIcon"></uni-icons>
+				</view>
 				<view class="menu-item" @click="aboutUs">
-					<image src="/static/images/common/wm.png" class="icon"></image>
+					<image src="/static/images/common/guanyuwomen.png" class="icon"></image>
 					<text class="title">关于我们</text>
 					<uni-icons type="right" size="25" color="rgba(255, 255, 255, 0.4)" class="uniIcon"></uni-icons>
 				</view>
 				<view class="menu-item" @click="logOff">
-					<image src="/static/images/common/wm.png" class="icon"></image>
+					<image src="/static/images/common/zhuxiao.png" class="icon"></image>
 					<text class="title">注销账号</text>
 					<uni-icons type="right" size="25" color="rgba(255, 255, 255, 0.4)" class="uniIcon"></uni-icons>
 				</view>
@ -160,7 +165,7 @@
 			},
 			logOff(){
 				uni.navigateTo({
-					url:'/pages/common/user/logOff'
+					url:'/pages/common/account/deleteAccount/index'
 				})
 			},
 			// 关于我们
@ -169,6 +174,12 @@
 					url: '/pages/common/aboutUs/index'
 				})
 			},
+			//举报反馈、联系我们
+			sendCounsel(){
+				uni.navigateTo({
+					url: '/pages/common/aboutUs/ContactUs'
+				})
+			},
 			// 账户安全
 			account(){
 				uni.navigateTo({
--- a/pages/common/user/logOff.vue
+++ b/pages/common/user/logOff.vue
@ -65,7 +65,7 @@
 			logOff(){
 				let task=()=>{
 					return new Promise((resolve,reject)=>{
-						
+						//假装注销
 						setTimeout(()=>{
 							resolve();
 						},500)
@ -74,7 +74,9 @@
 				}
 				
 				let logOut=()=>{
+					let phone=uni.getStorageSync('phone');
 					uni.clearStorageSync();
+					uni.setStorageSync("logOutPhone",phone)
 					uni.reLaunch({
 						url:'/pages/common/login/index'
 					})
--- a/static/images/common/guanyuwomen.png
+++ b/static/images/common/guanyuwomen.png
--- a/static/images/common/yijianfankui.png
+++ b/static/images/common/yijianfankui.png
--- a/static/images/common/zhuxiao.png
+++ b/static/images/common/zhuxiao.png
--- a/utils/MqHelper.js
+++ b/utils/MqHelper.js
@ -50,7 +50,7 @@ class MqHelper {
 		});

 	}
-	//订阅消息
+	//订阅消息{topic:'主题名称',callback:fn(payload,receive)}
 	subscribes(topics) {
 		return new Promise((resolve,reject)=>{