add: 增加uni-app-x工程

src/pages.json

@@ -9,7 +9,7 @@
 			// "^u-(.*)": "uview-plus/components/up-$1/up-$1.vue",
 			// "^up-(.*)": "uview-plus/components/up-$1/up-$1.vue",
 			// "^u-(.*)": "uview-plus/components/up-$1/up-$1.vue",
-			"^up-(.*)": "@/uni_modules/uview-plus/components/up-$1/up-$1.vue",
+			"^up-(.*)": "@/uni_modules/uview-plus/components/up-$1/up-$1.vue"
 		}
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages

src/uni_modules/uview-plus/components/up-button/up-button.nvue → src/uni_modules/uview-plus/components/up-button/up-button.uvue

@@ -314,7 +314,7 @@ $up-button-square-border-top-right-radius: 3px !default;
 $up-button-square-border-top-left-radius: 3px !default;
 $up-button-square-border-bottom-left-radius: 3px !default;
 $up-button-square-border-bottom-right-radius: 3px !default;
-$up-button-icon-min-width: 1em !default;
+$up-button-icon-min-width: 4px !default;
 $up-button-plain-background-color: #fff !default;
 $up-button-hairline-border-width: 0.5px !default;
 $up-button-active-opacity:0.75 !default;
@@ -432,8 +432,8 @@ $up-button-active-opacity:0.75 !default;
 
     &__icon {
         min-width: $up-button-icon-min-width;
-        line-height: inherit !important;
-        vertical-align: top;
+        // line-height: inherit !important;
+        // vertical-align: top;
     }
 
     &--plain {

src/uni_modules/uview-plus/components/up-button/vue.scss

@@ -29,11 +29,13 @@ $up-button-plain-up-button-warning-color:$up-error;
 		left:$up-button-before-left;
 		width:$up-button-before-width;
 		height:$up-button-before-height;
+		/* #ifndef UNI-APP-X */
 		border: inherit;
 		border-radius: inherit;
+		/* #endif */
 		transform:$up-button-before-transform;
 		opacity:$up-button-before-opacity;
-		content: " ";
+		// content: " ";
 		background-color:$up-button-before-background-color;
 		border-color:$up-button-before-border-color;
 	}
@@ -44,7 +46,9 @@ $up-button-plain-up-button-warning-color:$up-error;
 		}
 	}
 
+	/* #ifndef UNI-APP-X */
 	&__icon+&__text:not(:empty),
+	/* #endif */
 	&__loading-text {
 		margin-left:$up-button-icon-margin-left;
 	}

src/uni_modules/uview-plus/components/up-cell/up-cell.uvue

@@ -247,9 +247,6 @@
 
 		&--disabled {
 			color: $up-cell-disabled-color;
-			/* #ifndef APP-NVUE */
-			cursor: not-allowed;
-			/* #endif */
 		}
 
 		&--center {

src/uni_modules/uview-plus/components/up-icon/up-icon.uvue

@@ -156,7 +156,6 @@
 
 <style lang="scss" scoped>
 	@import "../../libs/css/components.scss";
-	@import "/static/iconfont/iconfont.css";
 
 	// 变量定义
 	$up-icon-primary: $up-primary !default;

src/uni_modules/uview-plus/components/up-image/up-image.uvue

@@ -93,7 +93,6 @@
 	 * @event {Function} load 图片加载成功时触发
 	 * @example <up-image width="100%" height="300px" :src="src"></up-image>
 	 */
-	import defProps from '../../libs/config/props'
 	export default {
 		name: 'up-image',
 		mixins: [mpMixin, mixin, propsImage],

src/uni_modules/uview-plus/libs/mixin/button.uts

@@ -1,4 +1,4 @@
-import { defineMixin } from '../vue.uts'
+import { defineMixin } from 'vue'
 
 export const buttonMixin = defineMixin({
     props: {

src/uni_modules/uview-plus/libs/mixin/mixin.uts

@@ -1,4 +1,4 @@
-import { defineMixin } from '../vue.uts'
+import { defineMixin } from 'vue'
 import {
 	array as testArray
 } from '../function/test.uts'

src/uni_modules/uview-plus/libs/mixin/mpMixin.uts

@@ -1,4 +1,4 @@
-import { defineMixin } from '../vue.uts'
+import { defineMixin } from 'vue'
 
 export const mpMixin = defineMixin({
     // #ifdef MP-WEIXIN

src/uni_modules/uview-plus/libs/mixin/openType.uts

@@ -1,4 +1,4 @@
-import { defineMixin } from '../vue.uts'
+import { defineMixin } from 'vue'
 
 export const openType = defineMixin({
     props: {

uni-app-x/.gitignore

@@ -0,0 +1,10 @@
+/unpackage/dist/*
+/unpackage/cache/*
+/unpackage/release/*
+/node_modules/*
+/.idea/*
+/dist/
+deploy.sh
+/.hbuilderx/
+/*-lock.*
+/stats.html

uni-app-x/App.uvue

@@ -0,0 +1,48 @@
+<script lang="uts">
+	let firstBackTime = 0
+	import { loadFont } from '@/uni_modules/uview-plus/index.uts'
+	export default {
+		onLaunch: function () {
+			console.log('App Launch')
+			loadFont()
+		},
+		onShow: function () {
+			console.log('App Show')
+		},
+		onHide: function () {
+			console.log('App Hide')
+		},
+		// #ifdef APP-ANDROID
+		onLastPageBackPress: function () {
+			console.log('App LastPageBackPress')
+			if (firstBackTime == 0) {
+				uni.showToast({
+					title: '再按一次退出应用',
+					position: 'bottom',
+				})
+				firstBackTime = Date.now()
+				setTimeout(() => {
+					firstBackTime = 0
+				}, 2000)
+			} else if (Date.now() - firstBackTime < 2000) {
+				firstBackTime = Date.now()
+				uni.exit()
+			}
+		},
+		// #endif
+		onExit: function () {
+			console.log('App Exit')
+		},
+	}
+</script>
+
+<style>	/* @import "@/uni_modules/uview-plus/index.scss";	@import "common/demo.scss"; */
+	/*每个页面公共css */
+	.uni-row {
+		flex-direction: row;
+	}
+
+	.uni-column {
+		flex-direction: column;
+	}
+</style>

uni-app-x/common/api.js

@@ -0,0 +1,3 @@
+const { http } = uni.$u
+// 获取菜单
+export const fetchMenu = (params, config = {}) => http.post('/ebapi/public_api/index', params, config)