1

pages.json

@@ -77,33 +77,33 @@
 			
 			{
 				"pagePath": "pages/index/index",
-				"text": "首页"
-				// "iconPath": "static/img/home.png",
-				// "selectedIconPath": "static/img/home_1.png"
+				"text": "首页",
+				"iconPath": "static/tabBarIcon/home.png",
+				"selectedIconPath": "static/tabBarIcon/home-selected.png"
 			},
 			{
 				"pagePath": "pages/resource/resource",
-				"text": "资源库"
-				// "iconPath": "static/img/home.png",
-				// "selectedIconPath": "static/img/home_1.png"
+				"text": "资源库",
+				"iconPath": "static/tabBarIcon/resource.png",
+				"selectedIconPath": "static/tabBarIcon/resource-selected.png"
 			},
 			{
 				"pagePath": "pages/activityPage/activityPage",
-				"text": "活动"
-				// "iconPath": "static/img/home.png",
-				// "selectedIconPath": "static/img/home_1.png"
+				"text": "活动",
+				"iconPath": "static/tabBarIcon/activity.png",
+				"selectedIconPath": "static/tabBarIcon/activity-selected.png"
 			},
 			{
 				"pagePath": "pages/message/message",
-				"text": "消息"
-				// "iconPath": "static/img/home.png",
-				// "selectedIconPath": "static/img/home_1.png"
+				"text": "消息",
+				"iconPath": "static/tabBarIcon/message.png",
+				"selectedIconPath": "static/tabBarIcon/message-selected.png"
 			},
 			{
 				"pagePath": "pages/mine/mine",
-				"text": "我的"
-				// "iconPath": "static/img/home.png",
-				// "selectedIconPath": "static/img/home_1.png"
+				"text": "我的",
+				"iconPath": "static/tabBarIcon/mine.png",
+				"selectedIconPath": "static/tabBarIcon/mine-selected.png"
 			}
 		]
 	},

unpackage/dist/dev/mp-weixin/app.json

@@ -21,23 +21,33 @@
     "list": [
       {
         "pagePath": "pages/index/index",
-        "text": "首页"
+        "text": "首页",
+        "iconPath": "static/tabBarIcon/home.png",
+        "selectedIconPath": "static/tabBarIcon/home-selected.png"
       },
       {
         "pagePath": "pages/resource/resource",
-        "text": "资源库"
+        "text": "资源库",
+        "iconPath": "static/tabBarIcon/resource.png",
+        "selectedIconPath": "static/tabBarIcon/resource-selected.png"
       },
       {
         "pagePath": "pages/activityPage/activityPage",
-        "text": "活动"
+        "text": "活动",
+        "iconPath": "static/tabBarIcon/activity.png",
+        "selectedIconPath": "static/tabBarIcon/activity-selected.png"
       },
       {
         "pagePath": "pages/message/message",
-        "text": "消息"
+        "text": "消息",
+        "iconPath": "static/tabBarIcon/message.png",
+        "selectedIconPath": "static/tabBarIcon/message-selected.png"
       },
       {
         "pagePath": "pages/mine/mine",
-        "text": "我的"
+        "text": "我的",
+        "iconPath": "static/tabBarIcon/mine.png",
+        "selectedIconPath": "static/tabBarIcon/mine-selected.png"
       }
     ]
   },

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -9477,15 +9477,9 @@ internalMixin(Vue);
 
 /***/ }),
 /* 26 */
-<<<<<<< HEAD
 /*!*****************************************!*\
   !*** D:/Svn/teaching-uniapp/pages.json ***!
   \*****************************************/
-=======
-/*!*******************************************************************!*\
-  !*** C:/Users/yuanyiming/Desktop/学校项目/teaching-uniapp/pages.json ***!
-  \*******************************************************************/
->>>>>>> 0ed48e9ebf4d423ecaf165232cd9299228c19e95
 /*! no static exports found */
 /***/ (function(module, exports) {
 
@@ -9629,15 +9623,9 @@ function normalizeComponent (
 
 /***/ }),
 /* 33 */
-<<<<<<< HEAD
 /*!*******************************************************!*\
   !*** D:/Svn/teaching-uniapp/uni.promisify.adaptor.js ***!
   \*******************************************************/
-=======
-/*!*********************************************************************************!*\
-  !*** C:/Users/yuanyiming/Desktop/学校项目/teaching-uniapp/uni.promisify.adaptor.js ***!
-  \*********************************************************************************/
->>>>>>> 0ed48e9ebf4d423ecaf165232cd9299228c19e95
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

unpackage/dist/dev/mp-weixin/pages/activityPage/activityPage.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "活动页",
-  "enablePullDownRefresh": false
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/login/login.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "登录",
-  "enablePullDownRefresh": false
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/login_three/login_three.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "找回密码",
-  "enablePullDownRefresh": false
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/login_two/login_two.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "手机号登录",
-  "enablePullDownRefresh": false
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/message/message.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "消息",
-  "enablePullDownRefresh": false
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/mine/mine.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "我的",
-  "enablePullDownRefresh": false
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/resource/resource.json

@@ -1,4 +1,5 @@
 {
   "navigationBarTitleText": "资源库",
-  "enablePullDownRefresh": false
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -1,10 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-<<<<<<< HEAD
-  "projectname": "kklbWe",
-=======
   "projectname": "teaching-uniapp",
->>>>>>> 0ed48e9ebf4d423ecaf165232cd9299228c19e95
   "setting": {
     "compileHotReLoad": true
   }