From 3203a722a6e3e538fbcfab81e81ab85af19096c5 Mon Sep 17 00:00:00 2001
From: weilanwl <1273753708@qq.com>
Date: Mon, 15 Nov 2021 21:31:25 +0800
Subject: [PATCH] up

---
 pages/login/login.vue                         |  6 +++---
 ui/components/ui-avatar/ui-avatar.vue         |  6 +-----
 ui/components/ui-card/ui-card.vue             | 13 ++++---------
 ui/components/ui-form-group/ui-form-group.vue |  9 ++-------
 ui/components/ui-loading/ui-loading.vue       |  8 ++------
 ui/components/ui-menu-item/ui-menu-item.vue   | 12 ++++--------
 ui/components/ui-navbar/ui-navbar.vue         | 16 ++++++----------
 ui/components/ui-progress/ui-progress.vue     |  7 +------
 8 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 21428e7..415e01a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -12,9 +12,9 @@
 			</block>
 			<block v-if="tabCur == 1">
 				<ui-form ui="ui-BG mt-4">
-					<ui-form-group><ui-input v-model="login.phone" placeholder="手机号" ></ui-input></ui-form-group>
-					<ui-form-group>
-						<ui-input v-model="login.code" placeholder="验证码" ></ui-input>
+					<ui-form-group icon="cicon-mobile text-gray"><ui-input v-model="login.phone" placeholder="手机号" ></ui-input></ui-form-group>
+					<ui-form-group icon="cicon-numcode text-gray">
+						<ui-input v-model="login.code" placeholder="验证码"></ui-input>
 						<block slot="action"><button class="ui-btn bg-blue-gradient">发送验证码</button></block>
 					</ui-form-group>
 				</ui-form>
diff --git a/ui/components/ui-avatar/ui-avatar.vue b/ui/components/ui-avatar/ui-avatar.vue
index 6f50a0d..a8dbb7d 100644
--- a/ui/components/ui-avatar/ui-avatar.vue
+++ b/ui/components/ui-avatar/ui-avatar.vue
@@ -11,8 +11,7 @@
 export default {
 	name: 'UiAvatar',
 	data() {
-		return {
-			slots: {}
+		return { 
 		};
 	},
 	props: {
@@ -66,9 +65,6 @@ export default {
 			return false;
 		}
 	},
-	mounted() {
-		this.slots = this.$scopedSlots;
-	},
 	methods: {}
 };
 </script>
diff --git a/ui/components/ui-card/ui-card.vue b/ui/components/ui-card/ui-card.vue
index 705be35..28822f5 100644
--- a/ui/components/ui-card/ui-card.vue
+++ b/ui/components/ui-card/ui-card.vue
@@ -5,17 +5,17 @@
 			<image :src="img" class="ui-card-image" :style="[{position:imgHeight=='auto'?'relative':'absolute'}]" :mode="imgHeight=='auto'?'widthFix':'aspectFill'"></image>
 			<view class="text-cut text-lg text-bold ui-card-fixedTitle bg-mask-bottom" v-if="title && fixedTitle">
 				<view class="">
-					<text v-if="!slots.title">{{ title }}</text>
+					<text v-if="!$scopedSlots.title">{{ title }}</text>
 					<slot name="title"></slot>
 				</view>
 			</view>
-			<view class="ui-card-tag" v-if="slots.tag">
+			<view class="ui-card-tag" v-if="$scopedSlots.tag">
 				<slot name="tag"></slot>
 			</view>
 		</view>
 		<view class="ui-card-content">
 			<view class="text-cut text-lg text-bold ui-card-title" v-if="title && !fixedTitle">
-				<text v-if="!slots.title">{{ title }}</text>
+				<text v-if="!$scopedSlots.title">{{ title }}</text>
 				<slot name="title"></slot>
 			</view>
 			<view class="ui-TC-3 mt-2 text-linecut-2 ui-card-desc" v-if="desc">{{ desc }}</view>
@@ -28,8 +28,7 @@
 export default {
 	name: 'UiCard',
 	data() {
-		return {
-			slots: {}
+		return { 
 		};
 	},
 	props: {
@@ -56,10 +55,6 @@ export default {
 			type: String
 		}, 
 	},
-
-	mounted() {
-		this.slots = this.$scopedSlots;
-	},
 	methods: {
 		_getParent() {
 			let parent = this.$parent;
diff --git a/ui/components/ui-form-group/ui-form-group.vue b/ui/components/ui-form-group/ui-form-group.vue
index 6fbba53..367ef8a 100644
--- a/ui/components/ui-form-group/ui-form-group.vue
+++ b/ui/components/ui-form-group/ui-form-group.vue
@@ -6,7 +6,7 @@
 			<text class="ui-form-required" v-if="required">*</text>
 		</view>
 		<view class="ui-form-content" :class="[contentui]"><slot></slot></view>
-		<view class="ui-form-action" v-if="slots.action"><slot name="action"></slot></view>
+		<view class="ui-form-action" v-if="$scopedSlots.action"><slot name="action"></slot></view>
 	</view>
 </template>
 
@@ -14,8 +14,7 @@
 export default {
 	name: 'UiFormGroup',
 	data() {
-		return {
-			slots: {}
+		return { 
 		};
 	},
 	props: {
@@ -68,10 +67,6 @@ export default {
 				return this.title.length + (this.icon?1.2:0)
 			}			
 		}
-	},
-	
-	mounted() {
-		this.slots = this.$scopedSlots;
 	},
 	methods: {
 		/**
diff --git a/ui/components/ui-loading/ui-loading.vue b/ui/components/ui-loading/ui-loading.vue
index 765db90..7b8e068 100644
--- a/ui/components/ui-loading/ui-loading.vue
+++ b/ui/components/ui-loading/ui-loading.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="ui-loading-box" :class="[size ? `text-${size}` : ``, { loop: slots.default||img },ui]">
+	<view class="ui-loading-box" :class="[size ? `text-${size}` : ``, { loop: $scopedSlots.default||img },ui]">
 		<view class="ui-loading">
 			<view class="ui-loading-cut"><view class="ui-loading-loop" :class="[color == true ? 'color' : `default ${color}`]"></view></view>
 		</view>
@@ -18,8 +18,7 @@ let _this = null;
 export default {
 	name: 'UiLoading',
 	data() {
-		return { 
-			slots: {}
+		return {  
 		};
 	},
 	props: {
@@ -46,9 +45,6 @@ export default {
 			immediate: true
 		}
 	},
-	mounted() {
-		this.slots = this.$scopedSlots;
-	},
 	created() {
 		_this = this;
 	},
diff --git a/ui/components/ui-menu-item/ui-menu-item.vue b/ui/components/ui-menu-item/ui-menu-item.vue
index 08c4578..f64afc4 100644
--- a/ui/components/ui-menu-item/ui-menu-item.vue
+++ b/ui/components/ui-menu-item/ui-menu-item.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="ui-menu-item" :class="[{ 'arrow': arrow },{'first-item':isFirstChild},ui]">
 		<view class="ui-menu-item-icon">
-			<template v-if="slots.icon">
+			<template v-if="$scopedSlots.icon">
 				<slot name="icon"></slot>
 			</template>
 			<template v-else>
@@ -12,7 +12,7 @@
 			<view class="ui-menu-item-title">
 				{{ title }}
 			</view>
-			<view class="ui-menu-item-action" v-if="slots.action">
+			<view class="ui-menu-item-action" v-if="$scopedSlots.action">
 				<slot name="action"></slot>
 			</view>
 		</view>
@@ -24,8 +24,7 @@
 export default {
 	name: 'UiMenuItem',
 	data() {
-		return {
-			slots: {}
+		return { 
 		};
 	},
 	props: {
@@ -59,10 +58,7 @@ export default {
 			}
 			return false
 		}
-	},
-	mounted() {
-		this.slots = this.$scopedSlots;
-	},
+	}, 
 	watch: {},
 	methods: { 
 	}
diff --git a/ui/components/ui-navbar/ui-navbar.vue b/ui/components/ui-navbar/ui-navbar.vue
index 401d513..d5ecd35 100755
--- a/ui/components/ui-navbar/ui-navbar.vue
+++ b/ui/components/ui-navbar/ui-navbar.vue
@@ -2,7 +2,7 @@
 	<ui-fixed :noFixed="noFixed" :val="0" :index="1000" noNav :bg="bg" :ui="ui" :opacity="opacity" :opacityVal="opacityVal" :placeholder="placeholder">
 		<view class="ui-navbar-box" :class="[{'border-bottom':!opacity&&bg!='bg-none'}]" :style="{ paddingTop: sys_statusBar + 'px', height: sys_navBar + 'px' }">
 			<view class="ui-bar" :class="status == '' ? `text-a` : status == 'light' ? 'text-white' : 'text-black'" :style="[{ height: sys_navBar - sys_statusBar + 'px' }]">
-				<block v-if="slots.default"><slot></slot></block>
+				<block v-if="$scopedSlots.default"><slot></slot></block>
 				<block v-else>
 					<view class="left">
 						<view class="back" @tap="_navback" v-if="back && !capsule">
@@ -15,9 +15,9 @@
 						</view>
 						<slot name="left"></slot>
 					</view>
-					<view class="center" v-if="slots.center"><slot name="center"></slot></view>
-					<view class="right" v-if="slots.center && !slots.right"></view>
-					<view class="right" v-if="slots.right">
+					<view class="center" v-if="$scopedSlots.center"><slot name="center"></slot></view>
+					<view class="right" v-if="$scopedSlots.center && !$scopedSlots.right"></view>
+					<view class="right" v-if="$scopedSlots.right">
 						<view class="right-content"><slot name="right"></slot></view>
 						<!-- #ifdef MP -->
 						<view :style="[capsuleStyle]"></view>
@@ -35,8 +35,7 @@ export default {
 		return {
 			statusCur: '',
 			capsuleStyle: {},
-			capsuleBack: {},
-			slots: {},
+			capsuleBack: {}, 
 			opacityVal: 0
 		};
 	},
@@ -130,10 +129,7 @@ export default {
 		// #endif
 
 	},
-	mounted() {
-		this.slots = this.$scopedSlots;
-		
-		console.log(this.sys_isFirstPage);
+	mounted() { 
 		// //设置 statusBarStyle App端必须在渲染后
 		this.changeStatus();
 	},
diff --git a/ui/components/ui-progress/ui-progress.vue b/ui/components/ui-progress/ui-progress.vue
index 1e9322b..861a4ea 100644
--- a/ui/components/ui-progress/ui-progress.vue
+++ b/ui/components/ui-progress/ui-progress.vue
@@ -16,8 +16,7 @@
 	export default {
 		name: 'UiProgress',
 		data() {
-			return {
-				slots: {}
+			return { 
 			};
 		},
 		props: {
@@ -81,10 +80,6 @@
 				default: ''
 			}
 		},
-
-		mounted() {
-			this.slots = this.$scopedSlots;
-		},
 		methods: {}
 	};
 </script>