Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/teaching-uniapp

App.vue

@@ -14,4 +14,11 @@
 
 <style>
 	/*每个页面公共css */
+	body{
+		background-color: #f9f9f9;
+	}
+	view{
+			box-sizing: border-box;
+			padding: 0;
+		}
 </style>

manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "",
+        "appid" : "wxcb284ff05d9ea544",
         "setting" : {
             "urlCheck" : false
         },

pages.json

@@ -3,15 +3,116 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "首页"
+				
 			}
-		}
-	],
+		},
+	    {
+            "path" : "pages/login/login",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "登录",
+                "enablePullDownRefresh": false
+            }
+            
+        },
+		
+		{
+            "path" : "pages/login_two/login_two",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "手机号登录",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/login_three/login_three",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "找回密码",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/resource/resource",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "资源库",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/activityPage/activityPage",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "活动页",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/message/message",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "消息",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/mine/mine",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "我的",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
+	"tabBar": {
+		"list": [
+			
+			{
+				"pagePath": "pages/index/index",
+				"text": "首页"
+				// "iconPath": "static/img/home.png",
+				// "selectedIconPath": "static/img/home_1.png"
+			},
+			{
+				"pagePath": "pages/resource/resource",
+				"text": "资源库"
+				// "iconPath": "static/img/home.png",
+				// "selectedIconPath": "static/img/home_1.png"
+			},
+			{
+				"pagePath": "pages/activityPage/activityPage",
+				"text": "活动"
+				// "iconPath": "static/img/home.png",
+				// "selectedIconPath": "static/img/home_1.png"
+			},
+			{
+				"pagePath": "pages/message/message",
+				"text": "消息"
+				// "iconPath": "static/img/home.png",
+				// "selectedIconPath": "static/img/home_1.png"
+			},
+			{
+				"pagePath": "pages/mine/mine",
+				"text": "我的"
+				// "iconPath": "static/img/home.png",
+				// "selectedIconPath": "static/img/home_1.png"
+			}
+		]
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
 		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8"
+		"backgroundColor": "#F8F8F8",
+		"navigationBarTitleCentered": true
 	},
 	"uniIdRouter": {}
 }

pages/activityPage/activityPage.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		活动页
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/index/index.vue

@@ -1,9 +1,6 @@
 <template>
 	<view class="content">
-		<image class="logo" src="/static/logo.png"></image>
-		<view class="text-area">
-			<text class="title">{{title}}</text>
-		</view>
+			首页
 	</view>
 </template>
 
@@ -23,30 +20,8 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
-	}
-
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
-
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
+		
 	}
 </style>

pages/login/login.vue

@@ -0,0 +1,89 @@
+<template>
+	<view class="login">
+		<view class="img">
+			<image src="../../static/logo.png"  mode="aspectFill"></image>
+		</view>
+		
+		<view class="mid">
+			<!-- <view class="quan"></view> -->
+			<radio value="r1" @click="radioCheck" :checked="isOK" />
+			<view class="">
+				我已阅读并同意<text>《教育小程序服务条款》</text>和 <text>《 隐私协议》</text>新用户自动注册
+			</view>
+		</view>
+		
+		<button class="btn">一键登录</button>
+		<view class="footer" @click="goto">
+			<text>手机号登录/账号密码登录</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isOK:false
+			};
+		},
+		methods:{
+			goto(){
+				uni.navigateTo({
+					url:"/pages/login_two/login_two"
+				})
+			},
+			radioCheck(){
+				this.isOK=!this.isOK
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.login{
+		.img{
+			// margin-top: 150rpx;
+			// background-color: #ccc;
+			padding: 150rpx 0;
+			width: 750rpx;
+			display: flex;
+			justify-content: center;
+			image{
+				width: 200rpx;
+				height: 200rpx;
+				border-radius: 50%;
+				
+			}
+		}
+		.mid{
+			display: flex;
+			justify-content: flex-start;
+			width: 750rpx;
+			padding: 0rpx 20rpx;
+			font-size: 13px;
+			/deep/ .uni-radio-input{
+				width: 15px;
+				height: 15px;
+			}
+			text{
+				color: #4a97f2;
+			}
+		}
+		
+		.btn{
+			background-color: #0056a8;
+			color: #ffffff;
+			border-radius: 30px;
+			margin: 30rpx 35rpx;
+			// padding: 0rpx 10rpx;
+			font-size: 16px;
+		}
+		.footer{
+			display: flex;
+			justify-content: center;
+			font-size: 14px;
+			margin: auto;
+			color: #666666;
+		}
+	}
+</style>

pages/login_three/login_three.vue

@@ -0,0 +1,21 @@
+<template>
+	<view class="login_three">
+		找回密码
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.login_three{
+		
+	}
+</style>

pages/login_two/login_two.vue

@@ -0,0 +1,129 @@
+<template>
+	<view class="login_two">
+		<view class="top">
+			<view class="left" :className="current==0?info1:info2">手机号登录</view>
+			<view class="right" :className="current==1?info1:info2">账号密码登录</view>
+		</view>
+		<swiper class="scroll-view-height" @change="swipeIndex" :current="current" :duration="300">
+		    <swiper-item>
+					<view class="inputBox">
+						<input type="text" class="inp" placeholder="手机号">
+						<input type="text" class="inp" placeholder="请输入验证码">
+						<button class="yzm">获取验证码</button>
+					</view>
+		    </swiper-item>
+			
+		    <swiper-item>
+					<view class="inputBox">
+						<input type="text" class="inp inp2" placeholder="用户名/绑定手机/绑定邮箱">
+						<input type="text" class="inp" placeholder="登录密码">
+						<button class="yzm">获取验证码</button>
+					</view>
+					<text @click="goto" style="font-size: 14px;float: right;padding: 20rpx;padding-right: 30rpx;">忘记密码</text>
+		  </swiper-item>
+		</swiper>
+		
+		<view class="mid">
+			<!-- <view class="quan"></view> -->
+			<radio value="r1" @click="radioCheck" :checked="isOK" />
+			<view class="">
+				我已阅读并同意<text>《教育小程序服务条款》</text>和 <text>《 隐私协议》</text>新用户自动注册
+			</view>
+		</view>
+		
+		<button class="btn">登录</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				current:0,
+				info1:'',
+				info2:'',
+				isOK:false
+			}
+		},
+		methods: {
+			// 登录方式切换
+			swipeIndex(index){
+				// console.log(index);
+			},
+			// 是否同意条约
+			radioCheck(){
+				this.isOK=!this.isOK
+			},
+			// 忘记密码
+			goto(){
+				uni.navigateTo({
+					url:"/pages/login_three/login_three"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.login_two{
+		.top{
+			width: 500rpx;
+			display: flex;
+			justify-content: space-between;
+			margin: auto;
+			margin-top: 100rpx;
+			margin-bottom: 60rpx;
+			.info1{
+				font-weight: bold;
+				
+			}
+			.info2{
+				
+			}
+		}
+		.inputBox{
+			padding: 0 30rpx;
+			position: relative;
+			.yzm{
+				position: absolute;
+				bottom: 10rpx;
+				right: 20rpx;
+				font-size: 12px;
+				background-color: #7eb5f6;
+				color: #fff;
+			}
+			.inp{
+				padding: 10rpx 15rpx;
+				// margin-top: 50rpx;
+				border-bottom: 1px #ccc solid;
+			}
+			.inp:nth-child(1){
+				margin-bottom: 50rpx;
+			}
+		}
+		
+		.mid{
+			display: flex;
+			justify-content: flex-start;
+			width: 750rpx;
+			padding: 0rpx 20rpx;
+			font-size: 13px;
+			/deep/ .uni-radio-input{
+				width: 15px;
+				height: 15px;
+			}
+			text{
+				color: #4a97f2;
+			}
+		}
+		
+		.btn{
+			background-color: #0056a8;
+			color: #ffffff;
+			border-radius: 30px;
+			margin: 30rpx 35rpx;
+			// padding: 0rpx 10rpx;
+			font-size: 16px;
+		}
+	}
+</style>

pages/message/message.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		消息
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/mine/mine.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		我的
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/resource/resource.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		资源库
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

project.config.json

@@ -0,0 +1,29 @@
+{
+  "compileType": "miniprogram",
+  "setting": {
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "ignoreUploadUnusedFiles": true
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  },
+  "libVersion": "3.1.2",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "appid": "wx9933d9929a941e56"
+}

project.private.config.json

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

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

@@ -1,13 +1,45 @@
 {
   "pages": [
-    "pages/index/index"
+    "pages/index/index",
+    "pages/login/login",
+    "pages/login_two/login_two",
+    "pages/login_three/login_three",
+    "pages/resource/resource",
+    "pages/activityPage/activityPage",
+    "pages/message/message",
+    "pages/mine/mine"
   ],
   "subPackages": [],
   "window": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "uni-app",
     "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8"
+    "backgroundColor": "#F8F8F8",
+    "navigationBarTitleCentered": true
+  },
+  "tabBar": {
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/resource/resource",
+        "text": "资源库"
+      },
+      {
+        "pagePath": "pages/activityPage/activityPage",
+        "text": "活动"
+      },
+      {
+        "pagePath": "pages/message/message",
+        "text": "消息"
+      },
+      {
+        "pagePath": "pages/mine/mine",
+        "text": "我的"
+      }
+    ]
   },
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -14,4 +14,11 @@
 
 
 /*每个页面公共css */
+page{
+	background-color: #f9f9f9;
+}
+view{
+		box-sizing: border-box;
+		padding: 0;
+}
 

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

@@ -9477,9 +9477,15 @@ 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) {
 
@@ -9623,9 +9629,15 @@ 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.js

@@ -0,0 +1 @@
+Component({})

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

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

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

@@ -0,0 +1 @@
+<view>活动页</view>

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

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "uni-app",
+  "navigationBarTitleText": "首页",
   "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/index/index.wxml

@@ -1 +1 @@
-<view class="content"><image class="logo" src="/static/logo.png"></image><view class="text-area"><text class="title">{{title}}</text></view></view>
+<view class="content data-v-57280228">首页</view>

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -1,24 +1,27 @@
-
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-}
-.logo {
-	height: 200rpx;
-	width: 200rpx;
-	margin-top: 200rpx;
-	margin-left: auto;
-	margin-right: auto;
-	margin-bottom: 50rpx;
-}
-.text-area {
-	display: flex;
-	justify-content: center;
-}
-.title {
-	font-size: 36rpx;
-	color: #8f8f94;
-}
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
 

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

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

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

@@ -0,0 +1 @@
+<view class="login"><view class="img"><image src="../../static/logo.png" mode="aspectFill"></image></view><view class="mid"><radio value="r1" checked="{{isOK}}" data-event-opts="{{[['tap',[['radioCheck',['$event']]]]]}}" bindtap="__e"></radio><view>我已阅读并同意<text>《教育小程序服务条款》</text>和<text>《 隐私协议》</text>新用户自动注册</view></view><button class="btn">一键登录</button><view data-event-opts="{{[['tap',[['goto',['$event']]]]]}}" class="footer" bindtap="__e"><text>手机号登录/账号密码登录</text></view></view>

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

@@ -0,0 +1,66 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.login .img {
+  padding: 150rpx 0;
+  width: 750rpx;
+  display: flex;
+  justify-content: center;
+}
+.login .img image {
+  width: 200rpx;
+  height: 200rpx;
+  border-radius: 50%;
+}
+.login .mid {
+  display: flex;
+  justify-content: flex-start;
+  width: 750rpx;
+  padding: 0rpx 20rpx;
+  font-size: 13px;
+}
+.login .mid .uni-radio-input {
+  width: 15px;
+  height: 15px;
+}
+.login .mid text {
+  color: #4a97f2;
+}
+.login .btn {
+  background-color: #0056a8;
+  color: #ffffff;
+  border-radius: 30px;
+  margin: 30rpx 35rpx;
+  font-size: 16px;
+}
+.login .footer {
+  display: flex;
+  justify-content: center;
+  font-size: 14px;
+  margin: auto;
+  color: #666666;
+}
+

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

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

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

@@ -0,0 +1 @@
+<view class="login_three">找回密码</view>

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

@@ -0,0 +1,27 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+

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

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

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

@@ -0,0 +1 @@
+<view class="login_two"><view class="top"><view class="left" className="{{current==0?info1:info2}}">手机号登录</view><view class="right" className="{{current==1?info1:info2}}">账号密码登录</view></view><swiper class="scroll-view-height" current="{{current}}" duration="{{300}}" data-event-opts="{{[['change',[['swipeIndex',['$event']]]]]}}" bindchange="__e"><swiper-item><view class="inputBox"><input class="inp" type="text" placeholder="手机号"/><input class="inp" type="text" placeholder="请输入验证码"/><button class="yzm">获取验证码</button></view></swiper-item><swiper-item><view class="inputBox"><input class="inp inp2" type="text" placeholder="用户名/绑定手机/绑定邮箱"/><input class="inp" type="text" placeholder="登录密码"/><button class="yzm">获取验证码</button></view><text data-event-opts="{{[['tap',[['goto',['$event']]]]]}}" style="font-size:14px;float:right;padding:20rpx;padding-right:30rpx;" bindtap="__e">忘记密码</text></swiper-item></swiper><view class="mid"><radio value="r1" checked="{{isOK}}" data-event-opts="{{[['tap',[['radioCheck',['$event']]]]]}}" bindtap="__e"></radio><view>我已阅读并同意<text>《教育小程序服务条款》</text>和<text>《 隐私协议》</text>新用户自动注册</view></view><button class="btn">登录</button></view>

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

@@ -0,0 +1,78 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.login_two .top {
+  width: 500rpx;
+  display: flex;
+  justify-content: space-between;
+  margin: auto;
+  margin-top: 100rpx;
+  margin-bottom: 60rpx;
+}
+.login_two .top .info1 {
+  font-weight: bold;
+}
+.login_two .inputBox {
+  padding: 0 30rpx;
+  position: relative;
+}
+.login_two .inputBox .yzm {
+  position: absolute;
+  bottom: 10rpx;
+  right: 20rpx;
+  font-size: 12px;
+  background-color: #7eb5f6;
+  color: #fff;
+}
+.login_two .inputBox .inp {
+  padding: 10rpx 15rpx;
+  border-bottom: 1px #ccc solid;
+}
+.login_two .inputBox .inp:nth-child(1) {
+  margin-bottom: 50rpx;
+}
+.login_two .mid {
+  display: flex;
+  justify-content: flex-start;
+  width: 750rpx;
+  padding: 0rpx 20rpx;
+  font-size: 13px;
+}
+.login_two .mid .uni-radio-input {
+  width: 15px;
+  height: 15px;
+}
+.login_two .mid text {
+  color: #4a97f2;
+}
+.login_two .btn {
+  background-color: #0056a8;
+  color: #ffffff;
+  border-radius: 30px;
+  margin: 30rpx 35rpx;
+  font-size: 16px;
+}
+

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

@@ -0,0 +1 @@
+Component({})

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

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

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

@@ -0,0 +1 @@
+<view>消息</view>

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

@@ -0,0 +1 @@
+Component({})

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

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

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

@@ -0,0 +1 @@
+<view>我的</view>

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

@@ -0,0 +1 @@
+Component({})

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

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

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

@@ -0,0 +1 @@
+<view>资源库</view>

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

@@ -1,8 +1,7 @@
 {
   "description": "项目配置文件。",
   "packOptions": {
-    "ignore": [],
-    "include": []
+    "ignore": []
   },
   "setting": {
     "urlCheck": false,
@@ -10,20 +9,28 @@
     "postcss": false,
     "minified": false,
     "newFeature": true,
-    "bigPackageSizeSupport": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    }
+    "bigPackageSizeSupport": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.1.2",
-  "appid": "touristappid",
+  "libVersion": "",
+  "appid": "wxcb284ff05d9ea544",
   "projectname": "kklbWe",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": []
+    }
   }
 }

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

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