Merge branch 'ft-dev' into 'main'

fix：移除意见反馈联系方式字段

See merge request huang/thingskit-app!69

 import {
 	getTabbarHeight
 } from '@/plugins/utils';
-let baseUrl = "";
-let baseDrawioUrl = ""
-if (process.env.NODE_ENV === 'development') {
-	// 开发环境
-	// baseUrl = 'http://192.168.10.115:8080/api'
-	baseUrl = 'https://dev.thingskit.com/api'
-	baseDrawioUrl = 'https://dev.thingskit.com/thingskit-drawio'
-} else if (process.env.NODE_ENV === 'production') {
-	// 生产环境
-	// baseUrl = 'http://47.99.141.212:8080/api'
-	baseUrl = 'https://dev.thingskit.com/api'
-	baseDrawioUrl = 'https://dev.thingskit.com/thingskit-drawio'
-}
+let baseUrl = "https://dev.thingskit.com/api";
+let baseDrawioUrl = "https://dev.thingskit.com/thingskit-drawio"
 
 let systemInfo = {
 	...getTabbarHeight(),
@@ -42,8 +31,8 @@ systemInfo.platform = 'plus'
 console.log(systemInfo, 'systemInfo')
 const courtConfig = {
 	publicAppId: '', //公众号appId
-	baseUrl: baseUrl, //域名
-	baseDrawioUrl: baseDrawioUrl,
+	baseUrl, //域名
+	baseDrawioUrl,
 	systemInfo: systemInfo, //系统信息
 	mapData: {
 		key: '', //地图key

-// /**
-//  * 需要修改
-//  */
-// const APPID = 'wx99c411dc3c5571ef'
-// const APPSECRECT = '606153abd59308b20a6e41fb6c852ad2'
-
-// module.exports = {
-// 	appId: APPID,
-// 	appSecrect: APPSECRECT,
-// };

@@ -11,15 +11,6 @@
 					<u-form-item required label="姓名" prop="feedbackInfo.name" borderBottom ref="item1">
 						<u--input placeholder="请输入姓名" v-model="feedbackData.feedbackInfo.name" border="none"></u--input>
 					</u-form-item>
-					<u-form-item label="手机" prop="feedbackInfo.phone" borderBottom ref="item1">
-						<u--input placeholder="请输入手机" v-model="feedbackData.feedbackInfo.phone" border="none"></u--input>
-					</u-form-item>
-					<u-form-item label="QQ" prop="feedbackInfo.qq" borderBottom ref="item1">
-						<u--input placeholder="请输入QQ" v-model="feedbackData.feedbackInfo.qq" border="none"></u--input>
-					</u-form-item>
-					<u-form-item label="邮箱" prop="feedbackInfo.email" borderBottom ref="item1">
-						<u--input placeholder="请输入邮箱" v-model="feedbackData.feedbackInfo.email" border="none"></u--input>
-					</u-form-item>
 					<view class="info">
 						<view class="info-contain">
 							<u-form-item  required label="反馈" prop="feedbackInfo.message" borderBottom ref="item1">
@@ -64,9 +55,6 @@ export default {
 				feedbackInfo: {
 					title: '',
 					name: '',
-					phone: '',
-					qq: '',
-					email: '',
 					images: [],
 					message: ''
 				}
@@ -87,25 +75,6 @@ export default {
 								message: '请填写姓名或者姓名格式错误',
 								trigger: ['blur', 'change']
 							},
-							'feedbackInfo.phone': {
-								type: 'number',
-								min: 11,
-								max:11,
-								message: '请填写手机或者手机格式错误',
-								trigger: ['blur', 'change']
-							},
-							'feedbackInfo.qq': {
-								type: 'number',
-								min: 5,
-								max:10,
-								message: '请填写qq或者qq格式错误',
-								trigger: ['blur', 'change']
-							},
-							'feedbackInfo.email': {
-								type: 'email',
-								message: '请填写邮箱或者邮箱格式错误',
-								trigger: ['blur', 'change']
-							},
 							'feedbackInfo.message': {
 								type: 'string',
 								required: true,
@@ -211,15 +180,9 @@ export default {
 				.validate()
 				.then(res => {
 					if(res){
-						let contactInfo = {
-							qq: this.feedbackData.feedbackInfo?.qq,
-							email: this.feedbackData.feedbackInfo?.email,
-							phone: this.feedbackData.feedbackInfo?.phone
-						};
 						let httpData = {
 							title: this.feedbackData.feedbackInfo.title,
 							name: this.feedbackData.feedbackInfo.name,
-							contact: JSON.stringify(contactInfo),
 							images: this.feedbackData.feedbackInfo.images.length == 0 ? '' : JSON.stringify(this.feedbackData.feedbackInfo.images),
 							message: this.feedbackData.feedbackInfo.message
 						};

 <template>
 	<view class="status-page">
-		<f-navbar navbarType="2" @leftClick="leftClick">
-			<view class="u-flex search-top" slot="left">
+		<view style="margin-left:15rpx;background-color: #f8f9fa;position:fixed;top:0rpx;z-index: 99999;">
+			<view style="height:35rpx;background-color: #f8f9fa;"></view>
+			<view class="u-flex search-top">
 				<view class="search-main"><u--input @change="inputChanged" prefixIcon="search" placeholder="请输入组态名称" border="surround" shape="circle"></u--input></view>
 			</view>
-		</f-navbar>
+		</view>
+		<view style="height:35rpx"></view>
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
+		<!-- 自带分页组件 -->
 		<mescroll-body ref="mescrollRef" :up="upOption" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
-			<view class="status-container">
-				<view @click="openConfigDetail(item.id)" v-for="(item, index) in list" :key="index" class="status-item u-flex">
-					<view style="cursor: pointer;" class="item-image"><image class="image" :src="item.icon || defaultConfigImage"></image></view>
-					<view class="item-text">
-						<text class="text">{{ item.name }}</text>
+			<view class="configuation-container">
+				<view class="configuation-item">
+					<view @click="openConfigDetail(item.id)" v-for="(item, index) in list" :key="index" class="item">
+						<image class="image" :src="item.icon || defaultConfigImage"></image>
+						<text class="name">{{ item.name }}</text>
 					</view>
 				</view>
 			</view>
 		</mescroll-body>
+		<!-- 自带分页组件 -->
+		<view style="height: 60rpx;"></view>
 	</view>
 </template>
 
 <script>
-import fNavbar from '@/components/module/f-navbar/f-navbar';
 import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 
 export default {
-	components: {
-		fNavbar
-	},
 	mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
 	data() {
 		return {
+			defaultConfigImage: '../../../static/test.png',
 			page: {
 				num: 0,
 				size: 10
@@ -41,7 +43,6 @@ export default {
 			upOption: {
 				auto: false // 不自动加载
 			},
-			defaultConfigImage: '../../../static/test.png',
 			list: []
 		};
 	},
@@ -87,17 +88,18 @@ export default {
 			this.page.num += 1;
 			this.loadData(this.page.num);
 		},
-		loadData(pageNo, T) {
+		loadData(pageNo, organizationV) {
 			let httpData = {
 				page: pageNo,
 				pageSize: 10,
-				name: T
+				name: organizationV
 			};
 			uni.$u.http
 				.get('/yt/configuration/center', { params: httpData, custom: { load: false } })
 				.then(res => {
 					uni.stopPullDownRefresh();
 					this.mescroll.endByPage(res.items.length, res.total);
+					this.cameraTotal = res.total;
 					if (pageNo == 1) {
 						this.list = res.items;
 					} else {

@@ -10,36 +10,35 @@
 			margin-top: -34rpx;
 		}
 	}
-}
-.status-container {
-	width: 700rpx;
-	height: 250rpx;
-	display: flex;
-	flex-wrap: wrap;
-	align-content: space-between;
-	justify-content: space-between;
-	flex-direction: row;
-	.status-item {
-		width: 300rpx;
-		height: 250rpx;
-		margin: 23rpx;
-		background-color: #ffffff;
-		border-radius: 20px;
-		flex-direction: column;
-		justify-content: space-between;
-		.item-image {
-			margin-top: 38rpx;
-			.image {
-				width: 198rpx;
-				height: 119rpx;
-			}
-		}
-		.item-text {
-			position: relative;
-			top: -25rpx;
-			.text {
-				color: #333333;
-				font-size: 14px;
+	.configuation-container {
+		.configuation-item {
+			width: 750rpx;
+			display: flex;
+			justify-content: space-between;
+			flex-wrap: wrap;
+			margin: 58rpx 0rpx 0rpx 6rpx;
+			.item {
+				width: 330rpx;
+				height: 288rpx;
+				background-color: #fff;
+				border-radius: 10px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+				margin: 0rpx 43rpx 35rpx 0rpx;
+				.image {
+					width: 200rpx;
+					height: 144rpx;
+				}
+				.name {
+					font-size: 14px;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 20px;
+					margin-top: 29rpx;
+				}
 			}
 		}
 	}

@@ -21,6 +21,7 @@ export const mutations = {
 	// 退出APP
 	emptyUserInfo(state) {
 		state.userInfo = {};
+		state.badgeInfo = 0;
 		// #ifdef H5
 		window.sessionStorage.removeItem("userInfo");
 		// #endif
@@ -29,7 +30,7 @@ export const mutations = {
 		uni.removeStorageSync('storagePre');
 		// #endif
 	},
-	setBadgeInfo(state,payload){
+	setBadgeInfo(state, payload) {
 		state.badgeInfo = payload;
 	}
 };
@@ -39,7 +40,6 @@ export const actions = {
 		state,
 		commit
 	}, data) {
-		commit('setBadgeInfo',data)
-		console.log('Change total', data,state);
+		commit('setBadgeInfo', data)
 	}
 };

@@ -10,12 +10,6 @@
 		</view>
 		<view style="height: 110rpx;"></view>
 		<view class="notify-main">
-			<!-- 无数据图片 -->
-			<view v-if="list.length == 0" style="position: relative;top: 100rpx;flex-direction: column;" class="u-flex">
-				<view><image style="width: 280rpx;height: 250rpx;" src="../../static/empty.png"></image></view>
-				<view style="text-align: center;"><text style="font-size: 12px;color: gray;">~ 空空如也 ~</text></view>
-			</view>
-			<!-- 无数据图片 -->
 			<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
 				<view class="u-flex main">
 					<view @click="clickNotifyDetail(item, index)" class="u-flex main-item" v-for="(item, index) in list" :key="index">