diff --git a/.DS_Store b/.DS_Store
index 63fc4ed3812a1fef87c1f53afb51d86f041b66ce..b3f9f7aafd3c75c73c42334d76be8f8a73c394bb 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/miniprogram/.DS_Store b/miniprogram/.DS_Store
index a54acfe6153db208cb70bce1235a780b8beb7174..da106a7faf2da51503b6ff506c7b7544ebffe004 100644
Binary files a/miniprogram/.DS_Store and b/miniprogram/.DS_Store differ
diff --git a/miniprogram/examples/fengyu/app.json b/miniprogram/examples/fengyu/app.json
index 247107319e9dd5e44f6a3f413213e3c9373d022f..f0b7d7c885fb7369b7acf0c2fe09f92f8ce80e02 100644
--- a/miniprogram/examples/fengyu/app.json
+++ b/miniprogram/examples/fengyu/app.json
@@ -1,11 +1,26 @@
{
"pages": [
"pages/index/index",
- "pages/mine/mine",
- "pages/create/create",
- "pages/search/search",
- "pages/detail/detail"
+ "pages/mine/mine"
],
+ "subPackages": [
+ {
+ "root": "sub_package_other",
+ "name": "sub_package_other",
+ "pages": [
+ "create/create",
+ "search/search",
+ "detail/detail",
+ "choose-info/choose-info"
+ ]
+ }
+ ],
+ "preloadRule": {
+ "pages/index/index": {
+ "network": "all",
+ "packages": ["sub_package_other"]
+ }
+ },
"window": {
"backgroundTextStyle": "dark",
"navigationBarBackgroundColor": "#241eb4",
diff --git a/miniprogram/examples/fengyu/components/question-item/question-item.js b/miniprogram/examples/fengyu/components/question-item/question-item.js
index 407f11286f51bd550b64848ab15d7f85a42f7eff..7ad622ba77d19567623d244664409571572b2c04 100644
--- a/miniprogram/examples/fengyu/components/question-item/question-item.js
+++ b/miniprogram/examples/fengyu/components/question-item/question-item.js
@@ -22,7 +22,7 @@ Component({
// 此时e.target其实是子元素，想要获取到绑定事件的父元素，需要currentTarget
const { id } = e.currentTarget.dataset
wx.navigateTo({
- url: '../../pages/detail/detail?id=' + id,
+ url: '../../sub_package_other/detail/detail?id=' + id,
})
}
},
diff --git a/miniprogram/examples/fengyu/components/question-item/question-item.json b/miniprogram/examples/fengyu/components/question-item/question-item.json
index 84f2d5b00b8b6cc5f41d0971c9d3c684bf3d1cbd..2d0fc6b45ea2c7f8a7d67d49becc04f372005734 100644
--- a/miniprogram/examples/fengyu/components/question-item/question-item.json
+++ b/miniprogram/examples/fengyu/components/question-item/question-item.json
@@ -2,7 +2,6 @@
"component": true,
"usingComponents": {
"van-tag": "@vant/weapp/tag/index",
- "van-divider": "@vant/weapp/divider/index",
"van-icon": "@vant/weapp/icon/index"
}
}
\ No newline at end of file
diff --git a/miniprogram/examples/fengyu/pages/index/index.js b/miniprogram/examples/fengyu/pages/index/index.js
index 3a8e794f39c979c45ec8bd0da6dace10928e7694..1ea045302230c54df2dbe055b6e574db2cfbcd2d 100644
--- a/miniprogram/examples/fengyu/pages/index/index.js
+++ b/miniprogram/examples/fengyu/pages/index/index.js
@@ -55,7 +55,7 @@ Page({
// 打开搜索页
handleToSearch () {
wx.navigateTo({
- url: '../search/search?search=' + this.data.search,
+ url: '../../sub_package_other/search/search?search=' + this.data.search,
// 在这里绑定事件，到时候search页面可以触发这些事件
events: {
// 等待search页面去触发
@@ -68,7 +68,7 @@ Page({
// 打开新增问题页
handleToCreate () {
wx.navigateTo({
- url: '../create/create',
+ url: '../../sub_package_other/create/create',
events: {
handleRefresh: () => {
this.handleRefresh()
diff --git a/miniprogram/examples/fengyu/pages/mine/components/user-info/user-info.js b/miniprogram/examples/fengyu/pages/mine/components/user-info/user-info.js
index 69375761e5fa9aabc61e7f7da74dec3f6075327d..dba603351dbae47f31e17d7e2c52043272c84ba1 100644
--- a/miniprogram/examples/fengyu/pages/mine/components/user-info/user-info.js
+++ b/miniprogram/examples/fengyu/pages/mine/components/user-info/user-info.js
@@ -20,15 +20,30 @@ Component({
*/
methods: {
handleTapLogin () {
- wx.getUserProfile({
- lang: 'zh_CN',
- desc: '需要获取您的用户信息，希望配合',
- success: (e) => {
- this.setData({ userInfo: e.userInfo })
- // 更改全局的userinfo
- appInstance.globalData.userInfo = e.userInfo
- // 通知其他的组件重新获取数据
- bus.emit('refresh:userInfo')
+ // 2.24.1版本不让用， 让我们去新开一个页面去让用户选择头像和昵称
+ // wx.getUserProfile({
+ // lang: 'zh_CN',
+ // desc: '需要获取您的用户信息，希望配合',
+ // success: (e) => {
+ // this.setData({ userInfo: e.userInfo })
+ // // 更改全局的userinfo
+ // appInstance.globalData.userInfo = e.userInfo
+ // // 通知其他的组件重新获取数据
+ // bus.emit('refresh:userInfo')
+ // }
+ // })
+ // 新打开一个页面去选择用户昵称
+ wx.navigateTo({
+ url: '../../../../../sub_package_other/choose-info/choose-info',
+ events: {
+ // 新页面选择好头像昵称后， 触发事件，在这里就可以接受到用户信息
+ chooseInfo: (e) => {
+ this.setData({
+ userInfo: e
+ });
+ appInstance.globalData.userInfo = e;
+ bus.emit('refresh:userInfo');
+ }
}
})
}
diff --git a/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.js b/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.js
new file mode 100644
index 0000000000000000000000000000000000000000..483cc893a3e33d63b5aa90939d36f522d22567cf
--- /dev/null
+++ b/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.js
@@ -0,0 +1,28 @@
+const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
+
+Page({
+ data: {
+ avatarUrl: defaultAvatarUrl,
+ nickName: '',
+ },
+ onChooseAvatar(e) {
+ const { avatarUrl } = e.detail
+ this.setData({
+ avatarUrl,
+ })
+ },
+ onChooseNickName (e) {
+ this.setData({
+ nickName: e.detail.value
+ })
+ },
+ // 点击确认选择，拿到用户头像和昵称，并且返回个人中心页的时候将其传递过去
+ handleTapConfirm () {
+ const { avatarUrl, nickName } = this.data
+ const eventChannel = this.getOpenerEventChannel()
+ eventChannel.emit('chooseInfo', { avatarUrl, nickName })
+ wx.navigateBack({
+ delta: -1
+ })
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.json b/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.json
new file mode 100644
index 0000000000000000000000000000000000000000..0b81116434fd3e8f9beacfdc7a279bb92b3c5f64
--- /dev/null
+++ b/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "van-button": "@vant/weapp/button/index"
+ }
+}
\ No newline at end of file
diff --git a/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.wxml b/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.wxml
new file mode 100644
index 0000000000000000000000000000000000000000..09e623034b3480f3b9b859cebeb246e37e270745
--- /dev/null
+++ b/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.wxml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+ 确认选择
+
+
\ No newline at end of file
diff --git a/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.wxss b/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.wxss
new file mode 100644
index 0000000000000000000000000000000000000000..ed3e378ab53a7387e5a2bf952406ae03ca64e12a
--- /dev/null
+++ b/miniprogram/examples/fengyu/sub_package_other/choose-info/choose-info.wxss
@@ -0,0 +1,19 @@
+.avatar-container {
+ padding: 32rpx;
+}
+.avatar-wrapper {
+ width: 160rpx;
+ height: 160rpx;
+ padding: 0;
+ border: none!important;
+}
+.avatar {
+ width: 100%;
+ height: 100%;
+ border: none;
+}
+.confirm {
+ padding: 64rpx;
+ display: flex;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/miniprogram/examples/fengyu/pages/create/components/editor/editor.js b/miniprogram/examples/fengyu/sub_package_other/create/components/editor/editor.js
similarity index 100%
rename from miniprogram/examples/fengyu/pages/create/components/editor/editor.js
rename to miniprogram/examples/fengyu/sub_package_other/create/components/editor/editor.js
diff --git a/miniprogram/examples/fengyu/pages/create/components/editor/editor.json b/miniprogram/examples/fengyu/sub_package_other/create/components/editor/editor.json
similarity index 100%
rename from miniprogram/examples/fengyu/pages/create/components/editor/editor.json
rename to miniprogram/examples/fengyu/sub_package_other/create/components/editor/editor.json
diff --git a/miniprogram/examples/fengyu/pages/create/components/editor/editor.wxml b/miniprogram/examples/fengyu/sub_package_other/create/components/editor/editor.wxml
similarity index 100%
rename from miniprogram/examples/fengyu/pages/create/components/editor/editor.wxml
rename to miniprogram/examples/fengyu/sub_package_other/create/components/editor/editor.wxml
diff --git a/miniprogram/examples/fengyu/pages/create/components/editor/editor.wxss b/miniprogram/examples/fengyu/sub_package_other/create/components/editor/editor.wxss
similarity index 100%
rename from miniprogram/examples/fengyu/pages/create/components/editor/editor.wxss
rename to miniprogram/examples/fengyu/sub_package_other/create/components/editor/editor.wxss
diff --git a/miniprogram/examples/fengyu/pages/create/components/editor/weui.wxss b/miniprogram/examples/fengyu/sub_package_other/create/components/editor/weui.wxss
similarity index 100%
rename from miniprogram/examples/fengyu/pages/create/components/editor/weui.wxss
rename to miniprogram/examples/fengyu/sub_package_other/create/components/editor/weui.wxss
diff --git a/miniprogram/examples/fengyu/pages/create/create.js b/miniprogram/examples/fengyu/sub_package_other/create/create.js
similarity index 100%
rename from miniprogram/examples/fengyu/pages/create/create.js
rename to miniprogram/examples/fengyu/sub_package_other/create/create.js
diff --git a/miniprogram/examples/fengyu/pages/create/create.json b/miniprogram/examples/fengyu/sub_package_other/create/create.json
similarity index 100%
rename from miniprogram/examples/fengyu/pages/create/create.json
rename to miniprogram/examples/fengyu/sub_package_other/create/create.json
diff --git a/miniprogram/examples/fengyu/pages/create/create.wxml b/miniprogram/examples/fengyu/sub_package_other/create/create.wxml
similarity index 100%
rename from miniprogram/examples/fengyu/pages/create/create.wxml
rename to miniprogram/examples/fengyu/sub_package_other/create/create.wxml
diff --git a/miniprogram/examples/fengyu/pages/create/create.wxss b/miniprogram/examples/fengyu/sub_package_other/create/create.wxss
similarity index 100%
rename from miniprogram/examples/fengyu/pages/create/create.wxss
rename to miniprogram/examples/fengyu/sub_package_other/create/create.wxss
diff --git a/miniprogram/examples/fengyu/pages/detail/detail.js b/miniprogram/examples/fengyu/sub_package_other/detail/detail.js
similarity index 100%
rename from miniprogram/examples/fengyu/pages/detail/detail.js
rename to miniprogram/examples/fengyu/sub_package_other/detail/detail.js
diff --git a/miniprogram/examples/fengyu/pages/detail/detail.json b/miniprogram/examples/fengyu/sub_package_other/detail/detail.json
similarity index 41%
rename from miniprogram/examples/fengyu/pages/detail/detail.json
rename to miniprogram/examples/fengyu/sub_package_other/detail/detail.json
index ffb81b38e1d7672839f7ef3abb8c150d54807c49..804692ef592b96b7d6172f40ebdaa6fa5a6bc792 100644
--- a/miniprogram/examples/fengyu/pages/detail/detail.json
+++ b/miniprogram/examples/fengyu/sub_package_other/detail/detail.json
@@ -1,7 +1,6 @@
{
"usingComponents": {
- "van-skeleton": "@vant/weapp/skeleton/index",
- "van-image": "@vant/weapp/image/index"
+ "van-skeleton": "@vant/weapp/skeleton/index"
},
"navigationBarTitleText": "详情"
}
\ No newline at end of file
diff --git a/miniprogram/examples/fengyu/pages/detail/detail.wxml b/miniprogram/examples/fengyu/sub_package_other/detail/detail.wxml
similarity index 100%
rename from miniprogram/examples/fengyu/pages/detail/detail.wxml
rename to miniprogram/examples/fengyu/sub_package_other/detail/detail.wxml
diff --git a/miniprogram/examples/fengyu/pages/detail/detail.wxss b/miniprogram/examples/fengyu/sub_package_other/detail/detail.wxss
similarity index 100%
rename from miniprogram/examples/fengyu/pages/detail/detail.wxss
rename to miniprogram/examples/fengyu/sub_package_other/detail/detail.wxss
diff --git a/miniprogram/examples/fengyu/pages/search/search.js b/miniprogram/examples/fengyu/sub_package_other/search/search.js
similarity index 100%
rename from miniprogram/examples/fengyu/pages/search/search.js
rename to miniprogram/examples/fengyu/sub_package_other/search/search.js
diff --git a/miniprogram/examples/fengyu/pages/search/search.json b/miniprogram/examples/fengyu/sub_package_other/search/search.json
similarity index 100%
rename from miniprogram/examples/fengyu/pages/search/search.json
rename to miniprogram/examples/fengyu/sub_package_other/search/search.json
diff --git a/miniprogram/examples/fengyu/pages/search/search.wxml b/miniprogram/examples/fengyu/sub_package_other/search/search.wxml
similarity index 100%
rename from miniprogram/examples/fengyu/pages/search/search.wxml
rename to miniprogram/examples/fengyu/sub_package_other/search/search.wxml
diff --git a/miniprogram/examples/fengyu/pages/search/search.wxss b/miniprogram/examples/fengyu/sub_package_other/search/search.wxss
similarity index 100%
rename from miniprogram/examples/fengyu/pages/search/search.wxss
rename to miniprogram/examples/fengyu/sub_package_other/search/search.wxss
diff --git a/miniprogram/firstuniapp/first-uniapp/.hbuilderx/launch.json b/miniprogram/firstuniapp/first-uniapp/.hbuilderx/launch.json
new file mode 100644
index 0000000000000000000000000000000000000000..81f13f4f4025c3f1d4a881de5addd979dff6ae15
--- /dev/null
+++ b/miniprogram/firstuniapp/first-uniapp/.hbuilderx/launch.json
@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+ // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+ "version": "0.0",
+ "configurations": [{
+ "default" :
+ {
+ "launchtype" : "local"
+ },
+ "mp-weixin" :
+ {
+ "launchtype" : "local"
+ },
+ "type" : "uniCloud"
+ }
+ ]
+}
diff --git a/miniprogram/firstuniapp/first-uniapp/App.vue b/miniprogram/firstuniapp/first-uniapp/App.vue
new file mode 100644
index 0000000000000000000000000000000000000000..99f6e289c24a5b04b83037ce171bf1028f0b128b
--- /dev/null
+++ b/miniprogram/firstuniapp/first-uniapp/App.vue
@@ -0,0 +1,17 @@
+
+
+
diff --git a/miniprogram/firstuniapp/first-uniapp/index.html b/miniprogram/firstuniapp/first-uniapp/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..c3ff205f658fda3bafb49b1b8d13a02d0093b954
--- /dev/null
+++ b/miniprogram/firstuniapp/first-uniapp/index.html
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/firstuniapp/first-uniapp/main.js b/miniprogram/firstuniapp/first-uniapp/main.js
new file mode 100644
index 0000000000000000000000000000000000000000..c1caf3606167d6c59e217eb6ef0e8f2fffc3817f
--- /dev/null
+++ b/miniprogram/firstuniapp/first-uniapp/main.js
@@ -0,0 +1,22 @@
+import App from './App'
+
+// #ifndef VUE3
+import Vue from 'vue'
+import './uni.promisify.adaptor'
+Vue.config.productionTip = false
+App.mpType = 'app'
+const app = new Vue({
+ ...App
+})
+app.$mount()
+// #endif
+
+// #ifdef VUE3
+import { createSSRApp } from 'vue'
+export function createApp() {
+ const app = createSSRApp(App)
+ return {
+ app
+ }
+}
+// #endif
\ No newline at end of file
diff --git a/miniprogram/firstuniapp/first-uniapp/manifest.json b/miniprogram/firstuniapp/first-uniapp/manifest.json
new file mode 100644
index 0000000000000000000000000000000000000000..962f056ef63acb7dc877f61c2fbca60a7870418a
--- /dev/null
+++ b/miniprogram/firstuniapp/first-uniapp/manifest.json
@@ -0,0 +1,72 @@
+{
+ "name" : "first-uniapp",
+ "appid" : "__UNI__D9975CD",
+ "description" : "",
+ "versionName" : "1.0.0",
+ "versionCode" : "100",
+ "transformPx" : false,
+ /* 5+App特有相关 */
+ "app-plus" : {
+ "usingComponents" : true,
+ "nvueStyleCompiler" : "uni-app",
+ "compilerVersion" : 3,
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : true,
+ "waiting" : true,
+ "autoclose" : true,
+ "delay" : 0
+ },
+ /* 模块配置 */
+ "modules" : {},
+ /* 应用发布信息 */
+ "distribute" : {
+ /* android打包配置 */
+ "android" : {
+ "permissions" : [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ]
+ },
+ /* ios打包配置 */
+ "ios" : {},
+ /* SDK配置 */
+ "sdkConfigs" : {}
+ }
+ },
+ /* 快应用特有相关 */
+ "quickapp" : {},
+ /* 小程序特有相关 */
+ "mp-weixin" : {
+ "appid" : "",
+ "setting" : {
+ "urlCheck" : false
+ },
+ "usingComponents" : true
+ },
+ "mp-alipay" : {
+ "usingComponents" : true
+ },
+ "mp-baidu" : {
+ "usingComponents" : true
+ },
+ "mp-toutiao" : {
+ "usingComponents" : true
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "vueVersion" : "3"
+}
diff --git a/miniprogram/firstuniapp/first-uniapp/pages.json b/miniprogram/firstuniapp/first-uniapp/pages.json
new file mode 100644
index 0000000000000000000000000000000000000000..600e3f196730fc651eb8d0488d27b406ef89344c
--- /dev/null
+++ b/miniprogram/firstuniapp/first-uniapp/pages.json
@@ -0,0 +1,38 @@
+{
+ "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+ {
+ "path": "pages/index/index",
+ "style": {
+ "navigationBarTitleText": "uni-app"
+ }
+ }
+ ,{
+ "path" : "pages/mine/mine",
+ "style" :
+ {
+ "navigationBarTitleText": "mine",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ],
+ "tabBar": {
+ "list": [
+ {
+ "pagePath": "pages/index/index",
+ "text": "首页"
+ },
+ {
+ "pagePath": "pages/mine/mine",
+ "text": "我的"
+ }
+ ]
+ },
+ "globalStyle": {
+ "navigationBarTextStyle": "black",
+ "navigationBarTitleText": "uni-app",
+ "navigationBarBackgroundColor": "#F8F8F8",
+ "backgroundColor": "#F8F8F8"
+ },
+ "uniIdRouter": {}
+}
diff --git a/miniprogram/firstuniapp/first-uniapp/pages/index/index.vue b/miniprogram/firstuniapp/first-uniapp/pages/index/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..cdf90bb3f7ec5755d953e18b2f3d4b88aebd6e7a
--- /dev/null
+++ b/miniprogram/firstuniapp/first-uniapp/pages/index/index.vue
@@ -0,0 +1,52 @@
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
diff --git a/miniprogram/firstuniapp/first-uniapp/pages/mine/mine.vue b/miniprogram/firstuniapp/first-uniapp/pages/mine/mine.vue
new file mode 100644
index 0000000000000000000000000000000000000000..958a836f596dfb827c623fba9222cf55a72102be
--- /dev/null
+++ b/miniprogram/firstuniapp/first-uniapp/pages/mine/mine.vue
@@ -0,0 +1,37 @@
+
+
+ mine -- {{ count }}
+
+
+
+
+
+
+
+
diff --git a/miniprogram/firstuniapp/first-uniapp/static/logo.png b/miniprogram/firstuniapp/first-uniapp/static/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5771e209bb677e2ebd5ff766ad5ee11790f305a
Binary files /dev/null and b/miniprogram/firstuniapp/first-uniapp/static/logo.png differ
diff --git a/miniprogram/firstuniapp/first-uniapp/uni.promisify.adaptor.js b/miniprogram/firstuniapp/first-uniapp/uni.promisify.adaptor.js
new file mode 100644
index 0000000000000000000000000000000000000000..47fbce111bd11f7c733feb99e3d93f0ffcfd9251
--- /dev/null
+++ b/miniprogram/firstuniapp/first-uniapp/uni.promisify.adaptor.js
@@ -0,0 +1,10 @@
+uni.addInterceptor({
+ returnValue (res) {
+ if (!(!!res && (typeof res === "object" || typeof res === "function") && typeof res.then === "function")) {
+ return res;
+ }
+ return new Promise((resolve, reject) => {
+ res.then((res) => res[0] ? reject(res[0]) : resolve(res[1]));
+ });
+ },
+});
\ No newline at end of file
diff --git a/miniprogram/firstuniapp/first-uniapp/uni.scss b/miniprogram/firstuniapp/first-uniapp/uni.scss
new file mode 100644
index 0000000000000000000000000000000000000000..a9a742d5caf7b569f892cb83c9104fd340600a81
--- /dev/null
+++ b/miniprogram/firstuniapp/first-uniapp/uni.scss
@@ -0,0 +1,76 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color:#333;//基本色
+$uni-text-color-inverse:#fff;//反色
+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable:#c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color:#ffffff;
+$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color:#c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm:12px;
+$uni-font-size-base:14px;
+$uni-font-size-lg:16;
+
+/* 图片尺寸 */
+$uni-img-size-sm:20px;
+$uni-img-size-base:26px;
+$uni-img-size-lg:40px;
+
+/* Border Radius */
+$uni-border-radius-sm: 2px;
+$uni-border-radius-base: 3px;
+$uni-border-radius-lg: 6px;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 5px;
+$uni-spacing-row-base: 10px;
+$uni-spacing-row-lg: 15px;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 4px;
+$uni-spacing-col-base: 8px;
+$uni-spacing-col-lg: 12px;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2C405A; // 文章标题颜色
+$uni-font-size-title:20px;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle:26px;
+$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-font-size-paragraph:15px;
diff --git "a/\346\211\251\345\261\225.md" "b/\346\211\251\345\261\225.md"
index 6a261b5e77e7f93e881c89fbd23aa1e8f98c54b8..32bff424d0d52a4d532bcf3fe40946c283ff18ac 100644
--- "a/\346\211\251\345\261\225.md"
+++ "b/\346\211\251\345\261\225.md"
@@ -334,6 +334,10 @@ window.wx.send('....')
>
> 如果发送ping之后几秒内没有接收到pang，就代表连接中断，SocketIO会自动进行重连。
+# 垃圾回收机制
+
+GC算法：引用计数、标记清除、标记整理
+
# 简历技能
1. 基础： HTML、CSS、Javascript（ES6+）、SASS、LESS