Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-ui/src/views/system/setting/index.vue

@@ -381,6 +381,7 @@ export default {
 			}
       if (this.form.value) {
         this.form.value = this.form.value.replace(/\\/g, '') // 兼容表格
+				this.form.value = encodeURIComponent(this.form.value)
         console.log("	this.form.value",	this.form.value)
       }
       
@@ -432,30 +433,30 @@ export default {
 				// 处理回显逻辑
 				this.settingList.forEach((item) => {
 					if (item.key == 'USER_AGREEMENT') {
-						this.userAgreementFrom.userAgreement = item.value
+						this.userAgreementFrom.userAgreement = decodeURIComponent(item.value);
 						this.userAgreementFrom.userAgreementId = item.id
 					}
 					if (item.key == 'PRIVACY_AGREEMENT') {
-						this.privacyAgreementFrom.privacyAgreement = item.value
+						this.privacyAgreementFrom.privacyAgreement = decodeURIComponent(item.value);
 						this.privacyAgreementFrom.privacyAgreementId = item.id
 					}
 					if (item.key == 'INTEGRAL_RULE') {
-						this.integralRuleFrom.integralRule = item.value
+						this.integralRuleFrom.integralRule = decodeURIComponent(item.value);
 						this.integralRuleFrom.integralRuleId = item.id
 					}
 					if (item.key == 'ABOUT_US') {
-						this.aboutUsFrom.aboutUs = item.value
+						this.aboutUsFrom.aboutUs = decodeURIComponent(item.value);
 						this.aboutUsFrom.aboutUsId = item.id
 					}
 					if (item.key == 'BLUETOOTH_GUIDANCE_PERMISSIONS') {
 						this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissions =
-							item.value
+						decodeURIComponent(item.value);
 						this.bluetoothGuidancePermissionsFrom.bluetoothGuidancePermissionsId =
 							item.id
 					}
 					if (item.key == 'LOCATION_GUIDANCE_PERMISSIONS') {
 						this.locationGuidancePermissionsFrom.locationGuidancePermissions =
-							item.value
+						decodeURIComponent(item.value);
 						this.locationGuidancePermissionsFrom.locationGuidancePermissionsId =
 							item.id
 					}