From 45a58ddc0daa74cc317b0b8521f639ab9f592ba9 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Wed, 27 Mar 2024 14:57:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A1=E6=B2=AB=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/common/showModal.vue         |   5 +-
 src/mycomponents/form/customerFrom.vue        | 176 ++++---
 src/pages/foam/check.vue                      |  25 +-
 .../components/u-radio/u-radio.vue            | 491 +++++++++---------
 4 files changed, 362 insertions(+), 335 deletions(-)

diff --git a/src/mycomponents/common/showModal.vue b/src/mycomponents/common/showModal.vue
index ba3f46e..509ea04 100644
--- a/src/mycomponents/common/showModal.vue
+++ b/src/mycomponents/common/showModal.vue
@@ -71,15 +71,16 @@
 		height: 400rpx;
 		border-radius: 8rpx;
 		position: relative;
+		text-align: center;
 		//modal-content下的第一个view
 		view:first-child{
 			padding: 10rpx;
-			font-size:30rpx;
+			font-size:35rpx;
 			font-weight:bold;
 		}
 		//modal-content下的第二个view
 		view:nth-child(2){
-			font-size:30rpx;
+			font-size:32rpx;
 			padding-left: 10rpx;
 			color:red
 		}
diff --git a/src/mycomponents/form/customerFrom.vue b/src/mycomponents/form/customerFrom.vue
index 48dbe4c..0872891 100644
--- a/src/mycomponents/form/customerFrom.vue
+++ b/src/mycomponents/form/customerFrom.vue
@@ -22,21 +22,24 @@
 				</view>
 				<view class="">
 					<view class="" style="margin-left: 50rpx;">
-						<text style="font-size: 32rpx; font-weight:550">点检状态</text>
-						<text style="font-size: 30rpx; color: #9e9e9e;">(单选)</text>
-						<u-radio-group v-model="item.name" @change="radioGroupChange">
+						<view class="">
+							<text style="font-size: 32rpx; font-weight:550">点检状态</text>
+							<text style="font-size: 30rpx; color: #9e9e9e;">(单选)</text>
+						</view>
+						<u-radio-group v-if="isRefresh" v-model="item.name" @change="radioGroupChange(item)">
 							<view class="uni-flex" style="width: 50%; margin-left: 0rpx;"
-								v-for="(radio, index) in dataList" :key="index" @change="radioChange">
+								v-for="(radio, index) in dataList" :key="index">
 								<view class="uni-flex " style="margin-top: 10rpx; justify-content: flex-start;">
-									<u-radio :name="radio.name">
+									<u-radio :name="radio.name" @change="radioChange(radio)">
 										{{radio.name}}
 									</u-radio>
 								</view>
 							</view>
 						</u-radio-group>
+
 					</view>
-					<input class="input" :disabled="false" style="margin-left: 50rpx;"
-						:placeholder="item.placeholder" v-model="item.name" />
+					<input class="input" disabled style="margin-left: 50rpx;" :placeholder="item.placeholder"
+						v-model="item.name" />
 				</view>
 			</view>
 
@@ -61,21 +64,23 @@
 
 				<view class="">
 					<view class="" style="margin-left: 50rpx;">
-						<text style="font-size: 32rpx; font-weight:550">点检状态</text>
-						<text style="font-size: 30rpx; color: #9e9e9e;">(单选)</text>
-						<u-radio-group v-model="item.name" @change="radioGroupChange">
+						<view class="">
+							<text style="font-size: 32rpx; font-weight:550">点检状态</text>
+							<text style="font-size: 30rpx; color: #9e9e9e;">(单选)</text>
+						</view>
+						<u-radio-group v-if="isRefresh" v-model="item.name" @change="radioGroupChange(item)">
 							<view class="uni-flex" style="width: 50%; margin-left: 0rpx;"
-								v-for="(radio, index) in dataList" :key="index" @change="radioChange">
+								v-for="(radio, index) in dataInputList" :key="index">
 								<view class="uni-flex " style="margin-top: 10rpx; justify-content: flex-start;">
-									<u-radio :name="radio.name">
+									<u-radio :name="radio.name" @change="radioChange(radio)">
 										{{radio.name}}
 									</u-radio>
 								</view>
 							</view>
 						</u-radio-group>
 					</view>
-					<input  class="input" :disabled="false" style="margin-left: 50rpx;"
-						:placeholder="item.placeholder" v-model="item.name" />
+					<input class="input" style="margin-left: 50rpx;" :placeholder="item.placeholder"
+						v-model="item.name" />
 				</view>
 
 				<view class="" v-if="item.main">
@@ -109,19 +114,19 @@
 				<view class="">
 					<view class="" style="margin-left: 50rpx;">
 						<view style="font-size: 30rpx; color: #9e9e9e;">(单选)</view>
-						<u-radio-group v-model="item.name" @change="radioGroupChange">
+						<u-radio-group v-if="isRefresh" v-model="item.name" @change="radioGroupChange(item)">
 							<view class="uni-flex" style="width: 50%; margin-left: 0rpx;"
-								v-for="(radio, index) in dataClassList" :key="index" @change="radioChange">
+								v-for="(radio, index) in dataClassList" :key="index">
 								<view class="uni-flex " style="margin-top: 10rpx; justify-content: flex-start;">
-									<u-radio :name="radio.name">
+									<u-radio :name="radio.name" @change="radioChange(radio)">
 										{{radio.name}}
 									</u-radio>
 								</view>
 							</view>
 						</u-radio-group>
 					</view>
-					<input class="input" :disabled="false" style="margin-left: 50rpx;"
-						:placeholder="item.placeholder" v-model="item.name" />
+					<input class="input" :disabled="false" style="margin-left: 50rpx;" :placeholder="item.placeholder"
+						v-model="item.name" />
 				</view>
 
 			</view>
@@ -165,7 +170,9 @@
 
 <script>
 	import showModal from '../../mycomponents/common/showModal.vue'
-
+	import {
+		deepCopyData
+	} from "@/common/basic.js"
 
 	export default {
 		components: {
@@ -200,55 +207,44 @@
 						name: "停机状态",
 					}
 				],
+				dataInputList: [{
+					value: 4,
+					name: "停机状态",
+				}],
 				dataClassList: [{
 						value: 1,
-						name: "白班",
+						name: "三班",
 					},
 					{
 						value: 2,
-						name: "二班",
+						name: "白班",
 					},
 					{
 						value: 3,
-						name: "三班",
+						name: "二班",
 					}
 				],
-
-				// formData: [{
-				// 	content: "检查各个管路及接头",
-				// 	methond: "目视野无液体渗出",
-				// 	placeholder: "请输入类型1",
-				// 	name: '',
-				// 	value:"",
-				// },
-				// {
-				// 	content: "电机检查",
-				// 	methond: "倾听无异响",
-				// 	placeholder: "请输入类型2",
-				// 	name: '',
-				// 	value:"",
-				// }],
-				selectStateItem: {},
-				selectClassItem: {},
+				testName: null,
 				current: 0,
+				isRefresh: true
 
 			};
 
 
 		},
 		methods: {
-			radioChange(e) {
-				console.log(e)
+			radioChange(radio) {
+				console.log("radioChange")
+			},
+			radioGroupChange(item) {
+				console.log("radioGroupChange", item)
 				// for (let i = 0; i < this.dataList.length; i++) {
-				// 	if (this.dataList[i].value === evt.detail.value) {
+				// 	if (this.dataList[i].name === item.name) {
 				// 		this.current = i;
 				// 		break;
 				// 	}
 				// }
 			},
-			radioGroupChange(e) {
-				console.log(e)
-			},
 			inputMain(item) {
 				item.name = item.minor.name + "~" + item.main.name;
 				if (item.minor.name == "" && item.main.name == "") {
@@ -308,42 +304,44 @@
 							break
 						} else {
 							if (!this.isExitList(item.name)) {
-									if (item.main) {
-										if (item.main.name == "") {
-											this.showHint(hintIndex + ".点检内容 : " + item.content, item.main.placeholder)
-											isCheckPass = false;
-											break
-										}
-
-										if (item.minor.name == "") {
-											this.showHint(hintIndex + ".点检内容 : " + item.content, item.minor.placeholder)
-											isCheckPass = false;
-											break
-										}
-
-										if (!this.isWithinInterval(item.minor.name, item.minor.lower, item.minor.upper)) {
-											this.showHint(hintIndex + ".点检内容 : " + item.content, "输入数量【" + item.minor
-												.name + "】不在【" + item.minor.lower + "】和【" + item.minor.upper + "】之间")
-											isCheckPass = false;
-											break
-										}
-
-										if (!this.isWithinInterval(item.main.name, item.main.lower, item.main.upper)) {
-											this.showHint(hintIndex + ".点检内容 : " + item.content, "输入数量【" + item.main.name +
-												"】不在【" + item.main.lower + "】和【" + item.main.upper + "】之间")
-											isCheckPass = false;
-											break
-										}
-
-									} else {
-										if (!this.isWithinInterval(item.name, item.lower, item.upper)) {
-											this.showHint(hintIndex + ".点检内容 : " + item.content, "输入数量【" + item.name +
-												"】不在【" + item.lower + "】和【" + item.upper + "】之间")
-											isCheckPass = false;
-											break
-										}
+								if (item.main) {
+
+
+									if (item.minor.name == "") {
+										this.showHint(hintIndex + ".点检内容 : " + item.content, item.minor.placeholder)
+										isCheckPass = false;
+										break
+									}
+
+									if (!this.isWithinInterval(item.minor.name, item.minor.lower, item.minor.upper)) {
+										this.showHint(hintIndex + ".点检内容 : " + item.content, "输入数量【" + item.minor
+											.name + "】不在" + item.minor.hint)
+										isCheckPass = false;
+										break
+									}
+
+									if (item.main.name == "") {
+										this.showHint(hintIndex + ".点检内容 : " + item.content, item.main.placeholder)
+										isCheckPass = false;
+										break
+									}
+
+									if (!this.isWithinInterval(item.main.name, item.main.lower, item.main.upper)) {
+										this.showHint(hintIndex + ".点检内容 : " + item.content, "输入数量【" + item.main.name +
+											"】不在" + item.main.hint)
+										isCheckPass = false;
+										break
 									}
 
+								} else {
+									if (!this.isWithinInterval(item.name, item.lower, item.upper)) {
+										this.showHint(hintIndex + ".点检内容 : " + item.content, "输入数量【" + item.name +
+											"】不在【" + item.lower + "】和【" + item.upper + "】之间")
+										isCheckPass = false;
+										break
+									}
+								}
+
 							}
 
 						}
@@ -354,7 +352,6 @@
 							break
 						}
 					}
-
 				}
 				if (isCheckPass) {
 					callBack(this.formData)
@@ -372,7 +369,7 @@
 			},
 			isExitList(name) {
 				var isExit = this.dataList.filter(res => res.name == name)
-				if(isExit.length==0){
+				if (isExit.length == 0) {
 					return false
 				}
 				return true;
@@ -409,10 +406,21 @@
 						item.name = ""
 						item.value = ""
 					}
-
 				}
+				// var testList =deepCopyData(this.dataList)
+				// this.dataList =[];
+				// this.dataList=testList
+				this.reload();
 				this.$emit("reset", this.formData)
-				console.log(this.formData)
+
+				console.log("重置", this.formData)
+			}
+			,
+			reload(){
+				this.isRefresh = false
+				this.$nextTick(() => {
+					this.isRefresh = true
+				})
 			}
 
 
diff --git a/src/pages/foam/check.vue b/src/pages/foam/check.vue
index 75117b0..16a4d87 100644
--- a/src/pages/foam/check.vue
+++ b/src/pages/foam/check.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page-wraper">
 		<view class="page-header flex"
-			style="font-size: 35rpx; padding-left: 10rpx; padding-top: 20rpx; flex-direction: column;">
+			style="font-size: 32rpx; padding-left: 10rpx; padding-top: 10rpx; flex-direction: column;">
 			<view class="flex u-col-center space-between">
 				<view class="">
 					设备编号 : {{deviceCode}}
@@ -11,10 +11,10 @@
 					<button type="primary" size="mini" @click="openScanPopup">扫描</button>
 				</view>
 			</view>
-			<view class="">
+			<view class="" v-if="deviceName!=''">
 				点检日期 : {{dateTime}}
 			</view>
-			<view class="" style="width: 100%;background-color: gray;height: 2rpx;" />
+			<view class="" style="width: 100%;background-color: gray;height: 2rpx; margin-top: 10rpx;" />
 
 		</view>
 		<view class="page-main">
@@ -36,20 +36,24 @@
 			</view>
 		</view>
 		<winScanNormal ref="scanPopup" title="设备编号" @getResult='getScanResult'></winScanNormal>
+		<showModal ref="comMessage"></showModal>
 	</view>
 
 
 </template>
 
 <script>
+	import showModal from '../../mycomponents/common/showModal.vue'
 	import customerFrom from "@/mycomponents/form/customerFrom.vue"
 	import winScanNormal from "@/mycomponents/scan/winScanNormal.vue"
 	import date from "@/mycomponents/scan/winScanNormal.vue"
-	import {getCurrDateTime} from "@/common/basic.js"
+	import {getCurrDateTime,
+	deepCopyData} from "@/common/basic.js"
 	export default {
 		components: {
 			customerFrom,
-			winScanNormal
+			winScanNormal,
+			showModal
 		},
 		data() {
 			return {
@@ -63,7 +67,7 @@
 						content: "检查各个管路及接头",
 						methond: "目视野无液体渗出",
 						placeholder: "请输入点检状态",
-						name: '',
+						name: "正在处理",
 						value: "",
 					},
 					{
@@ -75,7 +79,7 @@
 						lower: 80,
 						upper: 100,
 						placeholder: "请输入点检状态",
-						name: '',
+						name: '停机状态',
 						value: "",
 					},
 					{
@@ -86,7 +90,7 @@
 						lower: 0,
 						upper: 6,
 						placeholder: "请输入待机状态下真空度",
-						name: '',
+						name: '5',
 						value: "",
 					},
 					{
@@ -193,7 +197,12 @@
 				this.dateTime =getCurrDateTime()
 			},
 			submit() {
+				if(this.deviceCode==""){
+					this.$refs.comMessage.showMessage("提示", "请先扫描设备编号")
+					return
+				}
 				this.$refs.customerFrom.submit(callBack => {
+					
 					console.log("提交", JSON.stringify(callBack))
 
 				})
diff --git a/src/uni_modules/vk-uview-ui/components/u-radio/u-radio.vue b/src/uni_modules/vk-uview-ui/components/u-radio/u-radio.vue
index 41503aa..deb586e 100644
--- a/src/uni_modules/vk-uview-ui/components/u-radio/u-radio.vue
+++ b/src/uni_modules/vk-uview-ui/components/u-radio/u-radio.vue
@@ -1,12 +1,7 @@
 <template>
 	<view class="u-radio" :style="[radioStyle]">
 		<view class="u-radio__icon-wrap" @tap="toggle" :class="[iconClass]" :style="[iconStyle]">
-			<u-icon
-				class="u-radio__icon-wrap__icon"
-				name="checkbox-mark"
-				:size="elIconSize"
-				:color="iconColor"
-			/>
+			<u-icon class="u-radio__icon-wrap__icon" name="checkbox-mark" :size="elIconSize" :color="iconColor" />
 		</view>
 		<view class="u-radio__label" @tap="onClickLabel" :style="{ fontSize: $u.addUnit(labelSize) }">
 			<slot />
@@ -15,262 +10,276 @@
 </template>
 
 <script>
-/**
- * radio 单选框
- * @description 单选框用于有一个选择，用户只能选择其中一个的场景。搭配u-radio-group使用
- * @tutorial https://www.uviewui.com/components/radio.html
- * @property {String Number} icon-size 图标大小，单位rpx（默认24）
- * @property {String Number} label-size label字体大小，单位rpx（默认28）
- * @property {String Number} name radio组件的标示符
- * @property {String} shape 形状，见上方说明（默认circle）
- * @property {Boolean} disabled 是否禁用（默认false）
- * @property {Boolean} label-disabled 点击文本是否可以操作radio（默认true）
- * @property {String} active-color 选中时的颜色，如设置parent的active-color将失效
- * @event {Function} change 某个radio状态发生变化时触发(选中状态)
- * @example <u-radio :label-disabled="false">门掩黄昏，无计留春住</u-radio>
- */
-export default {
-	name: "u-radio",
-	emits: ["change"],
-	props: {
-		// radio的名称
-		name: {
-			type: [String, Number],
-			default: ""
-		},
-		// 组件的整体大小
-		size: {
-			type: [String, Number],
-			default: 34
-		},
-		// 形状，square为方形，circle为原型
-		shape: {
-			type: String,
-			default: ""
-		},
-		// 是否禁用
-		disabled: {
-			type: [String, Boolean],
-			default: ""
-		},
-		// 是否禁止点击提示语选中复选框
-		labelDisabled: {
-			type: [String, Boolean],
-			default: ""
-		},
-		// 选中状态下的颜色，如设置此值，将会覆盖parent的activeColor值
-		activeColor: {
-			type: String,
-			default: ""
-		},
-		// 图标的大小，单位rpx
-		iconSize: {
-			type: [String, Number],
-			default: ""
-		},
-		// label的字体大小，rpx单位
-		labelSize: {
-			type: [String, Number],
-			default: ""
-		}
-	},
-	data() {
-		return {
-			// 父组件的默认值，因为头条小程序不支持在computed中使用this.parent.shape的形式
-			// 故只能使用如此方法
-			parentData: {
-				iconSize: null,
-				labelDisabled: null,
-				disabled: null,
-				shape: null,
-				activeColor: null,
-				size: null,
-				width: null,
-				height: null,
-				value: null,
-				wrap: null
+	/**
+	 * radio 单选框
+	 * @description 单选框用于有一个选择，用户只能选择其中一个的场景。搭配u-radio-group使用
+	 * @tutorial https://www.uviewui.com/components/radio.html
+	 * @property {String Number} icon-size 图标大小，单位rpx（默认24）
+	 * @property {String Number} label-size label字体大小，单位rpx（默认28）
+	 * @property {String Number} name radio组件的标示符
+	 * @property {String} shape 形状，见上方说明（默认circle）
+	 * @property {Boolean} disabled 是否禁用（默认false）
+	 * @property {Boolean} label-disabled 点击文本是否可以操作radio（默认true）
+	 * @property {String} active-color 选中时的颜色，如设置parent的active-color将失效
+	 * @event {Function} change 某个radio状态发生变化时触发(选中状态)
+	 * @example <u-radio :label-disabled="false">门掩黄昏，无计留春住</u-radio>
+	 */
+	export default {
+		name: "u-radio",
+		emits: ["change"],
+		props: {
+			// radio的名称
+			name: {
+				type: [String, Number],
+				default: ""
+			},
+			// 组件的整体大小
+			size: {
+				type: [String, Number],
+				default: 34
+			},
+			// 形状，square为方形，circle为原型
+			shape: {
+				type: String,
+				default: ""
+			},
+			// 是否禁用
+			disabled: {
+				type: [String, Boolean],
+				default: ""
+			},
+			// 是否禁止点击提示语选中复选框
+			labelDisabled: {
+				type: [String, Boolean],
+				default: ""
+			},
+			// 选中状态下的颜色，如设置此值，将会覆盖parent的activeColor值
+			activeColor: {
+				type: String,
+				default: ""
+			},
+			// 图标的大小，单位rpx
+			iconSize: {
+				type: [String, Number],
+				default: ""
+			},
+			// label的字体大小，rpx单位
+			labelSize: {
+				type: [String, Number],
+				default: ""
 			}
-		};
-	},
-	created() {
-		this.parent = false;
-		// 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环引用
-		this.updateParentData();
-		this.parent.children.push(this);
-	},
-	computed: {
-		// 是否禁用，如果父组件u-raios-group禁用的话，将会忽略子组件的配置
-		elDisabled() {
-			return this.disabled !== ""? this.disabled: this.parentData.disabled !== null? this.parentData.disabled: false;
-		},
-		// 是否禁用label点击
-		elLabelDisabled() {
-			return this.labelDisabled !== ""? this.labelDisabled: this.parentData.labelDisabled !== null? this.parentData.labelDisabled: false;
-		},
-		// 组件尺寸，对应size的值，默认值为34rpx
-		elSize() {
-			return this.size ? this.size : this.parentData.size ? this.parentData.size : 34;
-		},
-		// 组件的勾选图标的尺寸，默认20
-		elIconSize() {
-			return this.iconSize? this.iconSize: this.parentData.iconSize? this.parentData.iconSize: 20;
 		},
-		// 组件选中激活时的颜色
-		elActiveColor() {
-			return this.activeColor? this.activeColor: this.parentData.activeColor? this.parentData.activeColor: "primary";
+		data() {
+			return {
+				// 父组件的默认值，因为头条小程序不支持在computed中使用this.parent.shape的形式
+				// 故只能使用如此方法
+				parentData: {
+					iconSize: null,
+					labelDisabled: null,
+					disabled: null,
+					shape: null,
+					activeColor: null,
+					size: null,
+					width: null,
+					height: null,
+					value: null,
+					wrap: null
+				},
+				select: false
+			};
 		},
-		// 组件的形状
-		elShape() {
-			return this.shape ? this.shape : this.parentData.shape ? this.parentData.shape : "circle";
+		created() {
+			this.parent = false;
+			// 支付宝小程序不支持provide/inject，所以使用这个方法获取整个父组件，在created定义，避免循环引用
+			this.updateParentData();
+			this.parent.children.push(this);
 		},
-		// 设置radio的状态，要求radio的name等于parent的value时才为选中状态
-		iconStyle() {
-			let style = {};
-			if (this.elActiveColor && this.parentData.value === this.name && !this.elDisabled) {
-				style.borderColor = this.elActiveColor;
-				style.backgroundColor = this.elActiveColor;
+		computed: {
+			// 是否禁用，如果父组件u-raios-group禁用的话，将会忽略子组件的配置
+			elDisabled() {
+				return this.disabled !== "" ? this.disabled : this.parentData.disabled !== null ? this.parentData
+					.disabled : false;
+			},
+			// 是否禁用label点击
+			elLabelDisabled() {
+				return this.labelDisabled !== "" ? this.labelDisabled : this.parentData.labelDisabled !== null ? this
+					.parentData.labelDisabled : false;
+			},
+			// 组件尺寸，对应size的值，默认值为34rpx
+			elSize() {
+				return this.size ? this.size : this.parentData.size ? this.parentData.size : 34;
+			},
+			// 组件的勾选图标的尺寸，默认20
+			elIconSize() {
+				return this.iconSize ? this.iconSize : this.parentData.iconSize ? this.parentData.iconSize : 20;
+			},
+			// 组件选中激活时的颜色
+			elActiveColor() {
+				return this.activeColor ? this.activeColor : this.parentData.activeColor ? this.parentData.activeColor :
+					"primary";
+			},
+			// 组件的形状
+			elShape() {
+				return this.shape ? this.shape : this.parentData.shape ? this.parentData.shape : "circle";
+			},
+			// 设置radio的状态，要求radio的name等于parent的value时才为选中状态
+			iconStyle() {
+				let style = {};
+				if (this.elActiveColor && this.parentData.value === this.name && !this.elDisabled) {
+					style.borderColor = this.elActiveColor;
+					style.backgroundColor = this.elActiveColor;
+				}
+				style.width = this.$u.addUnit(this.elSize);
+				style.height = this.$u.addUnit(this.elSize);
+				return style;
+			},
+			iconColor() {
+				return this.name === this.parentData.value ? "#ffffff" : "transparent";
+			},
+			iconClass() {
+				let classes = [];
+				classes.push("u-radio__icon-wrap--" + this.elShape);
+				if (this.name === this.parentData.value) classes.push("u-radio__icon-wrap--checked");
+				if (this.elDisabled) classes.push("u-radio__icon-wrap--disabled");
+				if (this.name === this.parentData.value && this.elDisabled)
+					classes.push("u-radio__icon-wrap--disabled--checked");
+				// 支付宝小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
+				return classes.join(" ");
+			},
+			radioStyle() {
+				let style = {};
+				if (this.parentData.width) {
+					style.width = this.$u.addUnit(this.parentData.width);
+					// #ifdef MP
+					// 各家小程序因为它们特殊的编译结构，使用float布局
+					style.float = "left";
+					// #endif
+					// #ifndef MP
+					// H5和APP使用flex布局
+					style.flex = `0 0 ${this.$u.addUnit(this.parentData.width)}`;
+					// #endif
+				}
+				if (this.parentData.wrap) {
+					style.width = "100%";
+					// #ifndef MP
+					// H5和APP使用flex布局，将宽度设置100%，即可自动换行
+					style.flex = "0 0 100%";
+					// #endif
+				}
+				return style;
 			}
-			style.width = this.$u.addUnit(this.elSize);
-			style.height = this.$u.addUnit(this.elSize);
-			return style;
 		},
-		iconColor() {
-			return this.name === this.parentData.value ? "#ffffff" : "transparent";
-		},
-		iconClass() {
-			let classes = [];
-			classes.push("u-radio__icon-wrap--" + this.elShape);
-			if (this.name === this.parentData.value) classes.push("u-radio__icon-wrap--checked");
-			if (this.elDisabled) classes.push("u-radio__icon-wrap--disabled");
-			if (this.name === this.parentData.value && this.elDisabled)
-				classes.push("u-radio__icon-wrap--disabled--checked");
-			// 支付宝小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
-			return classes.join(" ");
-		},
-		radioStyle() {
-			let style = {};
-			if (this.parentData.width) {
-				style.width = this.$u.addUnit(this.parentData.width);
-				// #ifdef MP
-				// 各家小程序因为它们特殊的编译结构，使用float布局
-				style.float = "left";
-				// #endif
-				// #ifndef MP
-				// H5和APP使用flex布局
-				style.flex = `0 0 ${this.$u.addUnit(this.parentData.width)}`;
-				// #endif
-			}
-			if (this.parentData.wrap) {
-				style.width = "100%";
-				// #ifndef MP
-				// H5和APP使用flex布局，将宽度设置100%，即可自动换行
-				style.flex = "0 0 100%";
-				// #endif
+		methods: {
+			updateParentData() {
+				this.getParentData("u-radio-group");
+			},
+			onClickLabel() {
+				if (!this.elLabelDisabled && !this.elDisabled) {
+					this.setRadioCheckedStatus();
+				}
+			},
+			toggle() {
+				if (!this.elDisabled) {
+					this.setRadioCheckedStatus();
+				}
+			},
+			emitEvent() {
+				// u-radio的name不等于父组件的v-model的值时(意味着未选中)，才发出事件，避免多次点击触发事件
+				if (this.parentData.value != this.name) this.$emit("change", this.name);
+			},
+			// 改变组件选中状态
+			// 这里的改变的依据是，更改本组件的parentData.value值为本组件的name值，同时通过父组件遍历所有u-radio实例
+			// 将本组件外的其他u-radio的parentData.value都设置为空(由computed计算后，都被取消选中状态)，因而只剩下一个为选中状态
+			setRadioCheckedStatus() {
+				this.emitEvent();
+				// if (this.parent) {
+				// 	this.parent.setValue(this.name);
+				// 	this.parentData.value = this.name;
+				// }
+				if (this.parent) {
+					if (this.parentData.value !== this.name) {
+						this.parent.setValue(this.name);
+						this.parentData.value = this.name;
+					} else {
+						this.parent.setValue('');
+						this.parentData.value = '';
+					}
+				}
 			}
-			return style;
 		}
-	},
-	methods: {
-		updateParentData() {
-			this.getParentData("u-radio-group");
-		},
-		onClickLabel() {
-			if (!this.elLabelDisabled && !this.elDisabled) {
-				this.setRadioCheckedStatus();
-			}
-		},
-		toggle() {
-			if (!this.elDisabled) {
-				this.setRadioCheckedStatus();
-			}
-		},
-		emitEvent() {
-			// u-radio的name不等于父组件的v-model的值时(意味着未选中)，才发出事件，避免多次点击触发事件
-			if (this.parentData.value != this.name) this.$emit("change", this.name);
-		},
-		// 改变组件选中状态
-		// 这里的改变的依据是，更改本组件的parentData.value值为本组件的name值，同时通过父组件遍历所有u-radio实例
-		// 将本组件外的其他u-radio的parentData.value都设置为空(由computed计算后，都被取消选中状态)，因而只剩下一个为选中状态
-		setRadioCheckedStatus() {
-			this.emitEvent();
-			if (this.parent) {
-				this.parent.setValue(this.name);
-				this.parentData.value = this.name;
-			}
-		}
-	}
-};
+	};
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/style.components.scss";
-
-.u-radio {
-	/* #ifndef APP-NVUE */
-	display: inline-flex;
-	/* #endif */
-	align-items: center;
-	overflow: hidden;
-	user-select: none;
-	line-height: 1.8;
+	@import "../../libs/css/style.components.scss";
 
-	&__icon-wrap {
-		color: $u-content-color;
-		@include vue-flex;
-		flex: none;
+	.u-radio {
+		/* #ifndef APP-NVUE */
+		display: inline-flex;
+		/* #endif */
 		align-items: center;
-		justify-content: center;
-		box-sizing: border-box;
-		width: 42rpx;
-		height: 42rpx;
-		color: transparent;
-		text-align: center;
-		transition-property: color, border-color, background-color;
-		font-size: 20px;
-		border: 1px solid #c8c9cc;
-		transition-duration: 0.2s;
+		overflow: hidden;
+		user-select: none;
+		line-height: 1.8;
 
-		/* #ifdef MP-TOUTIAO */
-		// 头条小程序兼容性问题，需要设置行高为0，否则图标偏下
-		&__icon {
-			line-height: 0;
-		}
-		/* #endif */
+		&__icon-wrap {
+			color: $u-content-color;
+			@include vue-flex;
+			flex: none;
+			align-items: center;
+			justify-content: center;
+			box-sizing: border-box;
+			width: 42rpx;
+			height: 42rpx;
+			color: transparent;
+			text-align: center;
+			transition-property: color, border-color, background-color;
+			font-size: 20px;
+			border: 1px solid #c8c9cc;
+			transition-duration: 0.2s;
 
-		&--circle {
-			border-radius: 100%;
-		}
+			/* #ifdef MP-TOUTIAO */
+			// 头条小程序兼容性问题，需要设置行高为0，否则图标偏下
+			&__icon {
+				line-height: 0;
+			}
 
-		&--square {
-			border-radius: 3px;
-		}
+			/* #endif */
 
-		&--checked {
-			color: #fff;
-			background-color: #2979ff;
-			border-color: #2979ff;
-		}
+			&--circle {
+				border-radius: 100%;
+			}
 
-		&--disabled {
-			background-color: #ebedf0;
-			border-color: #c8c9cc;
-		}
+			&--square {
+				border-radius: 3px;
+			}
+
+			&--checked {
+				color: #fff;
+				background-color: #2979ff;
+				border-color: #2979ff;
+			}
 
-		&--disabled--checked {
-			color: #c8c9cc !important;
+			&--disabled {
+				background-color: #ebedf0;
+				border-color: #c8c9cc;
+			}
+
+			&--disabled--checked {
+				color: #c8c9cc !important;
+			}
 		}
-	}
 
-	&__label {
-		word-wrap: break-word;
-		margin-left: 10rpx;
-		margin-right: 24rpx;
-		color: $u-content-color;
-		font-size: 30rpx;
+		&__label {
+			word-wrap: break-word;
+			margin-left: 10rpx;
+			margin-right: 24rpx;
+			color: $u-content-color;
+			font-size: 30rpx;
 
-		&--disabled {
-			color: #c8c9cc;
+			&--disabled {
+				color: #c8c9cc;
+			}
 		}
 	}
-}
-</style>
+</style>
\ No newline at end of file