Merge branch 'yiruiwen' into dev

umicro · Jun 28, 2020 · 09be3a9 · 09be3a9
2 parents 51658bc + fad8df8
commit 09be3a9
Show file tree

Hide file tree

Showing 33 changed files with 626 additions and 389 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,13 @@
+[*]
+#缩进风格：空格
+indent_style = space
+#缩进大小2
+indent_size = 4
+#换行符lf
+end_of_line = lf
+#字符集utf-8
+charset = utf-8
+#是否删除行尾的空格
+trim_trailing_whitespace = true
+
+
diff --git a/common/demo.scss b/common/demo.scss
@@ -1,3 +1,9 @@
+/* #ifndef APP-NVUE */
+view,
+text {
+	box-sizing: border-box;
+}
+/* #endif */
 
 /* start--演示页面使用的统一样式--start */
 .u-demo {

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "uView",
     "appid" : "__UNI__60F4B81",
     "description" : "多平台快速开发的UI框架",
-    "versionName" : "1.3.8",
+    "versionName" : "1.4.0",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {

diff --git a/pages.json b/pages.json
@@ -2,14 +2,14 @@
 	"easycom": {
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
 	},
-	// "condition": { //模式配置，仅开发期间生效
-	// 	"current": 0, //当前激活的模式(list 的索引项)
-	// 	"list": [{
-	// 		"name": "test", //模式名称
-	// 		"path": "pages/componentsC/test/index", //启动页面，必选
-	// 		"query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
-	// 	}] 
-	// },
+	"condition": { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [{
+			"name": "test", //模式名称
+			"path": "pages/componentsC/test/index", //启动页面，必选
+			"query": "id=1&name=2" //启动参数，在页面的onLoad函数里面得到
+		}] 
+	},
 	"pages": [
 		// 演示-组件 
 		{
@@ -656,6 +656,13 @@
 						"navigationBarTitleText": "line-线条"
 					}
 				},
+				// image-图片
+				{
+					"path": "image/index",
+					"style": {
+						"navigationBarTitleText": "image-图片"
+					}
+				},
 				// card-卡片
 				{
 					"path": "card/index",

diff --git a/pages/componentsA/field/index.vue b/pages/componentsA/field/index.vue
@@ -3,27 +3,25 @@
 		<view class="u-demo-wrap" style="background-color: #FFFFFF;">
 			<view class="u-demo-title">演示效果</view>
 			<view class="u-demo-area">
-				<u-cell-group>
-					<u-field
-						v-model="mobile"
-						label="手机号"
-						:error-message="errorMessage"
-						placeholder="请填写手机号"
-						:required="required"
-						:icon="icon1"
-						:type="type"
-					>
-					</u-field>
-					<u-field
-						v-model="code"
-						label="验证码"
-						placeholder="请填写验证码"
-						:required="required"
-						:icon="icon2"
-					>
-						<u-button v-if="showBtn" slot="right" size="mini" type="success">发送验证码</u-button>
-					</u-field>
-				</u-cell-group>
+				<u-field
+					v-model="mobile"
+					label="手机号"
+					:error-message="errorMessage"
+					placeholder="请填写手机号"
+					:required="required"
+					:icon="icon1"
+					:type="type"
+				>
+				</u-field>
+				<u-field
+					v-model="code"
+					label="验证码"
+					placeholder="请填写验证码"
+					:required="required"
+					:icon="icon2"
+				>
+					<u-button v-if="showBtn" slot="right" size="mini" type="success">发送验证码</u-button>
+				</u-field>
 			</view>
 		</view>
 		<view class="u-config-wrap">

diff --git a/pages/componentsA/icon/index.vue b/pages/componentsA/icon/index.vue
@@ -628,7 +628,6 @@
 		flex: 0 0 33.33333333%;
 		justify-content: center;
 		overflow: hidden;
-		padding: 0 6rpx;
 	}
 	
 	.u-icon-name {

diff --git a/pages/componentsA/tag/index.vue b/pages/componentsA/tag/index.vue
@@ -4,14 +4,11 @@
 			<view class="u-demo-title">演示效果</view>
 			<view class="u-demo-area">
 				<u-toast ref="uToast"></u-toast>
-				<u-tag :text="text" :type="type" :shape="shape" :closeable="closeable" :mode="mode" 
-				@close="close" @click="click" :show="show" :size="size"/>
+				<u-tag :text="text" :type="type" :shape="shape" :closeable="closeable" :mode="mode" @close="close" @click="click" :show="show" :size="size" />
 			</view>
 		</view>
 		<view class="u-config-wrap">
-			<view class="u-config-title u-border-bottom">
-				参数配置
-			</view>
+			<view class="u-config-title u-border-bottom">参数配置</view>
 			<view class="u-config-item">
 				<view class="u-item-title">模式选择</view>
 				<u-subsection vibrateShort :list="['light', 'dark', 'plain']" @change="modeChange"></u-subsection>
@@ -41,53 +38,54 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				text: '蒹葭苍苍',
-				mode: 'light',
-				type: 'error',
-				size: 'default',
-				shape: 'square',
-				closeable: true,
-				show: true
-			}
+export default {
+	data() {
+		return {
+			text: '蒹葭苍苍',
+			mode: 'light',
+			type: 'error',
+			size: 'default',
+			shape: 'square',
+			closeable: true,
+			show: true
+		};
+	},
+	methods: {
+		modeChange(index) {
+			this.mode = index == 0 ? 'light' : index == 1 ? 'dark' : 'plain';
+		},
+		textChange(index) {
+			this.text = index == 0 ? '蒹葭苍苍' : index == 1 ? '白露为霜' : '在水一方';
+		},
+		typeChange(index) {
+			this.type = index == 0 ? 'primary' : index == 1 ? 'success' : index == 2 ? 'error' : index == 3 ? 'warning' : 'info';
+		},
+		shapeChange(index) {
+			this.shape = index == 0 ? 'square' : index == 1 ? 'circle' : index == 2 ? 'circleLeft' : 'circleRight';
+		},
+		sizeChange(index) {
+			this.size = index == 0 ? 'default' : 'mini';
+		},
+		closeableChange(index) {
+			this.closeable = index == 0 ? true : false;
+		},
+		click(index) {
+			this.$refs.uToast.show({
+				title: `第${index + 1}个标签被点击`,
+				type: 'success'
+			});
 		},
-		methods: {
-			modeChange(index) {
-				this.mode = index == 0 ? 'light' : index == 1 ? 'dark' : 'plain';
-			},
-			textChange(index) {
-				this.text = index == 0 ? '蒹葭苍苍' : index == 1 ? '白露为霜' : '在水一方';
-			},
-			typeChange(index) {
-				this.type = index == 0 ? 'primary' : index == 1 ? 'success' : index == 2 ? 'error' : index == 3 ? 'warning'  : 'info';
-			},
-			shapeChange(index) {
-				this.shape = index == 0 ? 'square' : index == 1 ? 'circle' : index == 2 ? 'circleLeft' : 'circleRight';
-			},
-			sizeChange(index) {
-				this.size = index == 0 ? 'default' : 'mini';
-			},
-			closeableChange(index) {
-				this.closeable = index == 0 ? true : false;
-			},
-			click(index) {
-				this.$refs.uToast.show({
-					title: `第${index + 1}个标签被点击`,
-					type: 'success'
-				})
-			},
-			close(index) {
-				this.$refs.uToast.show({
-					title: `关闭图标被点击`,
-					type: 'success'
-				})
-			},
+		close(index) {
+			this.$refs.uToast.show({
+				title: `关闭图标被点击`,
+				type: 'success'
+			});
 		}
 	}
+};
 </script>
 
 <style lang="scss" scoped>
-	.u-demo {}
-</style>
+.u-demo {
+}
+</style>