Merge branch 'dev-ft' into 'main'

fix:修复所有请求接口无基础路径问题

See merge request huang/thingskit-app!21

@@ -15,8 +15,8 @@
 				<block v-for="(item, index) in list" :key="index">
 					<!-- 自定义icon -->
 					<u-tabbar-item :text="item.name" :badge="item.badge" :dot="item.dot" :badgeStyle="item.badgeStyle">
-						<view slot="active-icon"><image style="width:30rpx;height: 30rpx;" :src="item.iconFill" mode=""></image></view>
-						<view slot="inactive-icon"><image style="width:30rpx;height: 30rpx;" :src="item.icon" mode=""></image></view>
+						<view slot="active-icon"><image style="width:50rpx;height: 50rpx;" :src="item.iconFill" mode=""></image></view>
+						<view slot="inactive-icon"><image style="width:50rpx;height: 50rpx;" :src="item.icon" mode=""></image></view>
 					</u-tabbar-item>
 				</block>
 			</u-tabbar>

@@ -2,17 +2,12 @@ import {
 	getTabbarHeight
 } from '@/plugins/utils';
 let baseUrl = "";
-let imageUrl = ''
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	baseUrl = 'http://47.99.141.212:8080/api'
-	// baseUrl = 'http://192.168.10.103:8080/api'
-	imageUrl='http://192.168.10.103:8080/api'
-	// baseUrl = 'http://192.168.1.228/fan_php/public/index.php'
 } else if (process.env.NODE_ENV === 'production') {
 	// 生产环境
-	baseUrl = 'https://api.yichengshi.cn'
-	imageUrl='http://47.99.141.212:8080/api'
+	baseUrl = 'http://47.99.141.212:8080/api'
 }
 
 let systemInfo = {
@@ -43,7 +38,6 @@ console.log(systemInfo, 'systemInfo')
 const courtConfig = {
 	publicAppId: '', //公众号appId
 	baseUrl: baseUrl, //域名
-	imageUrl:imageUrl,//上传图片
 	systemInfo: systemInfo, //系统信息
 	mapData: {
 		key: '', //地图key

@@ -6,19 +6,10 @@ import {
 
 // 初始化请求配置
 uni.$u.http.setConfig((config) => {
-	let token = store.state.userInfo.isToken || (uni.getStorageSync('userInfo').isToken || undefined)
+	const token = store.state.userInfo.isToken || (uni.getStorageSync('userInfo').isToken || undefined)
 	// #ifdef H5
 	window.sessionStorage.getItem('userInfo').isToken;
 	// #endif
-	if (!token) {
-		uni.showToast({
-			title: '请先登录',
-			icon: 'none'
-		});
-		return uni.reLaunch({
-			url: '/pages/public/login'
-		})
-	}
 	/* config 为默认全局配置*/
 	config.baseURL = base.baseUrl; /* 根域名 */
 	config.header = {
@@ -40,9 +31,10 @@ uni.$u.http.interceptors.request.use((config) => { // å¯ä½¿ç”¨async await åšå¼
 	config.data = config.data || {}
 	// 根据custom参数中配置的是否需要token，添加对应的请求头
 	if (config?.custom?.auth) {
-		config.header.Authorization = 'Bearer ' + store.state.userInfo.isToken
+		config.header.Authorization = 'Bearer ' + store.state.userInfo.isToken || (uni.getStorageSync(
+			'userInfo').isToken || undefined)
 	}
-	// console.log("请求开始", config);
+	console.log("请求开始", config);
 	if (config?.custom?.load) {
 		//打开加载动画
 		store.commit("setLoadingShow", true);
@@ -105,7 +97,7 @@ uni.$u.http.interceptors.response.use((response) => {
 		})
 		store.commit('emptyUserInfo')
 	} else if (message == 'Invalid username or password') {
-		errorData = '请重新登录'
+		errorData = '用户名或者密码无效'
 		uni.reLaunch({
 			url: '/pages/public/login'
 		})

@@ -3,7 +3,7 @@
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
 		<view class="form-page">
-			<u--form labelPosition="left" :model="feedbackData" :rules="rules" ref="form1">
+			<u--form labelPosition="left" :model="feedbackData" :rules="rules" ref="myfeedBackFormRef">
 				<u-form-item required label="主题" prop="feedbackInfo.title" borderBottom ref="item1">
 					<u--input placeholder="请输入主题" v-model="feedbackData.feedbackInfo.title" border="none"></u--input>
 				</u-form-item>
@@ -42,6 +42,7 @@
 <script>
 import fTabbar from '@/components/module/f-tabbar/f-tabbar';
 import baseUrl from '@/config/baseUrl.js';
+import { mapState } from 'vuex';
 
 export default {
 	components: {
@@ -77,6 +78,21 @@ export default {
 						trigger: ['change', 'blur']
 					}
 				],
+				'feedbackInfo.name': [
+					{
+						type: 'string',
+						required: true,
+						message: '请填写姓名',
+						trigger: ['blur', 'change']
+					},
+					{
+						validator: (rule, value, callback) => {
+							return uni.$u.test.chinese(value);
+						},
+						message: '姓名必须为中文',
+						trigger: ['change', 'blur']
+					}
+				],
 				'feedbackInfo.phone': [
 					{
 						type: 'string',
@@ -85,7 +101,6 @@ export default {
 						trigger: ['blur', 'change']
 					},
 					{
-						// 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
 						validator: (rule, value, callback) => {
 							return uni.$u.test.mobile(value);
 						},
@@ -101,7 +116,6 @@ export default {
 						trigger: ['blur', 'change']
 					},
 					{
-						// 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
 						validator: (rule, value, callback) => {
 							return uni.$u.test.email(value);
 						},
@@ -131,6 +145,9 @@ export default {
 		// 隐藏原生的tabbar
 		uni.hideTabBar();
 	},
+	computed: {
+		...mapState(['userInfo'])
+	},
 	methods: {
 		// 删除图片
 		deletePic(event) {
@@ -138,7 +155,6 @@ export default {
 		},
 		// 新增图片
 		async afterRead(event) {
-			// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
 			let lists = [].concat(event.file);
 			let fileListLen = this[`fileList${event.name}`].length;
 			lists.map(item => {
@@ -164,25 +180,22 @@ export default {
 			}
 		},
 		uploadFilePromise(url) {
-			// store.state.userInfo.isToken ||
 			let token;
-			token = uni.getStorageSync('userInfo').isToken || undefined;
+			token = this.userInfo.isToken || uni.getStorageSync('userInfo').isToken || undefined;
 			// #ifdef H5
 			token = window.sessionStorage.getItem('userInfo').isToken;
 			// #endif
 			if (!token) return uni.$u.toast('请登录后上传图片');
 			return new Promise((resolve, reject) => {
 				let a = uni.uploadFile({
-					url: 'http://47.99.141.212:8080/api/yt/oss/upload',
+					url: `${baseUrl.baseUrl}/yt/oss/upload`,
 					filePath: url,
 					name: 'file',
 					header: {
 						'content-type': 'multipart/form-data',
 						Authorization: 'Bearer ' + token
 					},
-					formData: {
-						user: 'test'
-					},
+					formData: {},
 					success: res => {
 						setTimeout(() => {
 							if (res) {
@@ -198,33 +211,40 @@ export default {
 			});
 		},
 		submit() {
-			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
-			};
-			uni.$u.http
-				.post('/yt/opinion', httpData)
+			this.$refs.myfeedBackFormRef
+				.validate()
 				.then(res => {
-					if (res) {
-						uni.showToast({
-							title: '意见反馈提交成功~',
-							icon: 'none'
+					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
+					};
+					uni.$u.http
+						.post('/yt/opinion', httpData)
+						.then(res => {
+							if (res) {
+								uni.showToast({
+									title: '意见反馈提交成功~',
+									icon: 'none'
+								});
+								setTimeout(() => {
+									uni.navigateBack();
+								}, 500);
+							}
+						})
+						.catch(e => {
+							uni.$u.toast(e.data?.message);
 						});
-						setTimeout(() => {
-							uni.navigateBack();
-						}, 500);
-					}
 				})
-				.catch(e => {
-					uni.$u.toast(e.data?.message);
+				.catch(errors => {
+					uni.$u.toast('校验失败');
 				});
 		}
 	}

@@ -2,7 +2,7 @@
 	<view class="set-page">
 		<!-- 公共组件-每个页面必须引入 -->
 		<public-module></public-module>
-		<view class="u-flex set-main">
+		<view @click="upAvatar" class="u-flex set-main">
 			<view class="main-image"><image class="image" :src="avatar || '../../static/default-avatar.png'"></image></view>
 			<view class="main-right-image"><image class="image" src="../../static/arrow-right.png"></image></view>
 		</view>
@@ -111,7 +111,6 @@ export default {
 						trigger: ['blur', 'change']
 					},
 					{
-						// 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
 						validator: (rule, value, callback) => {
 							return uni.$u.test.email(value);
 						},
@@ -135,6 +134,50 @@ export default {
 		}
 	},
 	methods: {
+		// 修改头像
+		upAvatar() {
+			var that = this;
+			uni.chooseImage({
+				count: 1,
+				sourceType: ['camera', 'album'],
+				success: res => {
+					const tempFilePaths = res.tempFilePaths;
+					//限制上传的图片大小不超过2M
+					let resSize = res.tempFiles[0].size;
+					if (resSize > 2097152) {
+						uni.showToast({
+							title: '上传的图片大小不能超过2M',
+							icon: 'none',
+							duration: 2000,
+							mask: true
+						});
+						return;
+					}
+					//限制图片类型
+					let resType = res.tempFiles[0].type.substring(0, 5);
+					if (resType != 'image' || res.tempFiles[0].type.substring(6, 7) == 'g') {
+						uni.showToast({
+							title: '限制图片类型以及过滤git图',
+							icon: 'none',
+							duration: 2000,
+							mask: true
+						});
+						return;
+					}
+					uni.$u.http
+						.upload('/yt/oss/upload', {
+							filePath: tempFilePaths[0],
+							name: 'file'
+						})
+						.then(res => {
+							if (res) {
+								that.avatar = res.fileStaticUri;
+								return uni.$u.toast('头像上传成功');
+							}
+						});
+				}
+			});
+		},
 		onSubmitFunc() {
 			this.$refs.myInfoFormRef
 				.validate()