Skip to content

Commit

Permalink
调整文件适配
Browse files Browse the repository at this point in the history
  • Loading branch information
wlxuqu committed Nov 15, 2021
1 parent 899c313 commit e7f3b8e
Show file tree
Hide file tree
Showing 370 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions App.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
export default {
onLaunch: function() {
onLaunch: function() {
},
onShow: function() {
Expand All @@ -12,8 +12,8 @@
</script>

<style lang="scss">
/*每个页面公共css */
@import "@/uni_modules/uview-v2/index.scss";
@import "common/demo.scss";
</style>
/*每个页面公共css */
@import "@/uni_modules/uview-ui/index.scss";
@import "common/demo.scss";
</style>
10 changes: 5 additions & 5 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ import App from './App'
import store from './store'

// 引入全局uView
import uView from '@/uni_modules/uview-v2'
// #endif
import uView from '@/uni_modules/uview-ui'

import mixin from './common/mixin'
import mixin from './common/mixin'

Vue.prototype.$store = store

Expand All @@ -19,9 +18,10 @@ Vue.use(uView)

// #ifdef MP
// 引入uView对小程序分享的mixin封装
const mpShare = require('@/uni_modules/uview-v2/libs/mixin/mpShare.js')
const mpShare = require('@/uni_modules/uview-ui/libs/mixin/mpShare.js')
Vue.mixin(mpShare)
// #endif

Vue.mixin(mpShare)
Vue.mixin(mixin)

const app = new Vue({
Expand Down
2 changes: 1 addition & 1 deletion uni.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
* 使用的时候,请将下面的一行复制到您的uniapp项目根目录的uni.scss中即可
* uView自定义的css类名和scss变量,均以"u-"开头,不会造成冲突,请放心使用
*/
@import '@/uni_modules/uview-v2/theme.scss';
@import '@/uni_modules/uview-ui/theme.scss';
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ Vue.use(uView);
```css
/* App.vue */
<style lang="scss">
@import "uview-v2/index.scss";
@import "uview-ui/index.scss";
</style>
```

3. `uni.scss`引入全局scss变量文件
```css
/* uni.scss */
@import "uview-v2/theme.scss";
@import "uview-ui/theme.scss";
```

4. `pages.json`配置easycom规则(按需引入)
Expand All @@ -57,9 +57,9 @@ Vue.use(uView);
"easycom": {
// npm安装的方式不需要前面的"@/",下载安装的方式需要"@/"
// npm安装方式
"^u-(.*)": "uview-v2/components/u-$1/u-$1.vue"
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
// 下载安装方式
// "^u-(.*)": "@/uview-v2/components/u-$1/u-$1.vue"
// "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue"
},
// 此为本身已有的内容
"pages": [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit e7f3b8e

Please sign in to comment.