diff --git a/src/miniprogram/app.js b/src/miniprogram/app.js
index 29a697e..7f7d830 100644
--- a/src/miniprogram/app.js
+++ b/src/miniprogram/app.js
@@ -16,6 +16,25 @@ App({
this.globalData = {
// OPENID: wx.cloud.getWXContext().OPENID
+ OPENID: '',
+ USERID: ''
};
+
+ try {
+ this.globalData.USERID = wx.getStorageSync('user_id')
+ } catch (e) {
+ console.log(e);
+ }
+
+ if (this.globalData.USERID) {
+ wx.cloud.database().collection("user_id").doc(this.globalData.USERID).get({
+ success: function() {
+ // todo
+ }
+ })
+ } else {
+ console.log("首次登录");
+ }
+
}
});
diff --git a/src/miniprogram/app.json b/src/miniprogram/app.json
index 969961e..6dc846f 100644
--- a/src/miniprogram/app.json
+++ b/src/miniprogram/app.json
@@ -5,7 +5,8 @@
"pages/Profile/profile",
"pages/Tprofile/Tprofile",
"pages/Comments/Comments",
- "pages/Order/order"
+ "pages/Order/order",
+ "pages/Details/details"
],
"window": {
"backgroundColor": "#FFF",
diff --git a/src/miniprogram/pages/Detailed/detailed.wxml b/src/miniprogram/pages/Detailed/detailed.wxml
deleted file mode 100644
index 801359e..0000000
--- a/src/miniprogram/pages/Detailed/detailed.wxml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-pages/Detailed/detailed.wxml
diff --git a/src/miniprogram/pages/Detailed/detailed.wxss b/src/miniprogram/pages/Detailed/detailed.wxss
deleted file mode 100644
index 4e6213b..0000000
--- a/src/miniprogram/pages/Detailed/detailed.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pages/Detailed/detailed.wxss */
\ No newline at end of file
diff --git a/src/miniprogram/pages/Detailed/detailed.js b/src/miniprogram/pages/Details/details.js
similarity index 79%
rename from src/miniprogram/pages/Detailed/detailed.js
rename to src/miniprogram/pages/Details/details.js
index 1d824f2..2187006 100644
--- a/src/miniprogram/pages/Detailed/detailed.js
+++ b/src/miniprogram/pages/Details/details.js
@@ -1,11 +1,13 @@
// pages/Detailed/detailed.js
+const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
+
Page({
/**
* 页面的初始数据
*/
- data: {
-
+ data:{
+ avatarUrl: defaultAvatarUrl,
},
/**
diff --git a/src/miniprogram/pages/Detailed/detailed.json b/src/miniprogram/pages/Details/details.json
similarity index 100%
rename from src/miniprogram/pages/Detailed/detailed.json
rename to src/miniprogram/pages/Details/details.json
diff --git a/src/miniprogram/pages/Details/details.wxml b/src/miniprogram/pages/Details/details.wxml
new file mode 100644
index 0000000..4363841
--- /dev/null
+++ b/src/miniprogram/pages/Details/details.wxml
@@ -0,0 +1,15 @@
+
+
+
+
+
+ 姓名: 老师
+ 科目: NULL
+ 空闲时间: NULL
+ 学历: NULL
+ 时薪: NULL
+
+
+
+ 综合评分: 10.0
+
diff --git a/src/miniprogram/pages/Details/details.wxss b/src/miniprogram/pages/Details/details.wxss
new file mode 100644
index 0000000..c421cb8
--- /dev/null
+++ b/src/miniprogram/pages/Details/details.wxss
@@ -0,0 +1,15 @@
+/* pages/Detailed/detailed.wxss */
+.avatar-wrapper {
+ display: flex;
+ justify-content: left;
+}
+
+/* 子元素选择器 */
+.avatar-wrapper > image {
+ height: 100px;
+ width: 100px;
+ border-style: solid;
+ border-color: #000;
+ border-width: 1px;
+ margin: 20px;
+}
\ No newline at end of file
diff --git a/src/miniprogram/pages/Main/main.js b/src/miniprogram/pages/Main/main.js
index fc2def5..6e7d4cc 100644
--- a/src/miniprogram/pages/Main/main.js
+++ b/src/miniprogram/pages/Main/main.js
@@ -10,13 +10,17 @@ Page({
currentTab: 0,
showPopup: false,
teacher: {},
- exist: false
+ exist: false,
+ rec: false
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ // wx.showLoading({
+ // title: '加载中',
+ // })
//检测用户是否注册过
wx.cloud.database()
.collection('user_Data')
@@ -73,6 +77,16 @@ Page({
})
},
+ navToDetails: () => {
+ wx.navigateTo({
+ url: '/pages/Details/details',
+ success: function(res) {
+ // 通过eventChannel向被打开页面传送数据
+ res.eventChannel.emit('acceptDataFromOpenerPage', { data: 'test' })
+ }
+ })
+ },
+
// contactTeacher(event) {
// // console.log(event);
// wx.makePhoneCall({
@@ -84,5 +98,12 @@ Page({
inputValue: e.detail.value
});
},
-
+
+ recommend() {
+ // TODO
+ this.setData({
+ rec: true
+ })
+ console.log("rec");
+ }
})
\ No newline at end of file
diff --git a/src/miniprogram/pages/Main/main.wxml b/src/miniprogram/pages/Main/main.wxml
index eff54b4..0f7e3de 100644
--- a/src/miniprogram/pages/Main/main.wxml
+++ b/src/miniprogram/pages/Main/main.wxml
@@ -15,13 +15,8 @@
-<<<<<<< HEAD
教员列表
系统推荐
-=======
- 教员风采
- 学员情况
->>>>>>> dev
@@ -39,7 +34,7 @@
-
+
{{item.name}}
@@ -64,26 +59,66 @@
-<<<<<<< HEAD
- 需求科目
- 教师资历
- 上课时间
+
+
+ 科目：{{array[index]}}当前选择科目
+
+
+
+ \
+ 周一
+ 周一
+ 周一
+ 周一
+ 周一
+ 周一
+ 周一
+ 上午
+
+
+
+
+
+
+
+ 上午
+
+
+
+
+
+
+
+
-=======
-
-
-
-
- 标题
-
- 描述信息
-
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+ 电话号码：{{item.phone}}
+ email：{{item.email}}
+ 其他信息：null
+
+
+
+
+
+
+
-
-
->>>>>>> dev
+
+
-
+
diff --git a/src/miniprogram/pages/Main/main.wxss b/src/miniprogram/pages/Main/main.wxss
index 415a66f..154d9a6 100644
--- a/src/miniprogram/pages/Main/main.wxss
+++ b/src/miniprogram/pages/Main/main.wxss
@@ -547,4 +547,16 @@ page {
border-radius: 10rpx;
}
+.picker {
+ margin: 10rpx;
+ border-radius: 15px;
+ border-style: solid;
+ padding: 10rpx;
+}
+/*分割线样式*/
+.divLine{
+ background: #E0E3DA;
+ width: 100%;
+ height: 5rpx;
+ }
\ No newline at end of file