diff --git a/Api/api.js b/Api/api.js
index 47db19b..24baf24 100644
--- a/Api/api.js
+++ b/Api/api.js
@@ -169,6 +169,26 @@ function ApiLogout(openid) {
}
+function ApiLogin(openid,username) {
+ return new Promise((resolve, reject) => {
+ wx.request({
+ url: baseurl+'/API/ApiLogin.php',
+ method: 'GET', // 或 'POST'
+ data: {
+ openid: openid,
+ username: username,
+ },
+ success: res => {
+ resolve(res.data); // 将获取的结果通过Promise的resolve传递
+ },
+ fail: err => {
+ reject(err); // 如果请求失败，传递错误给Promise的reject
+ }
+ });
+ });
+
+}
+
function ApiPasswordCodeValidate(openid, passwordcode) {
return new Promise((resolve, reject) => {
@@ -375,6 +395,7 @@ function ApiGetTips() {
ApiGetWebPagesFromDB,
ApiGetWebPageContent,
ApiGetUserCourseDataFromDB,
+ ApiLogin,
ApiLogout,
ApiGetCourseData,
ApiGetFreeCourseData,
diff --git a/app.js b/app.js
index a265eea..f4beef2 100644
--- a/app.js
+++ b/app.js
@@ -27,6 +27,7 @@ App({
this.globalData.LastLoginDate= result1.data.最后登录日期;
this.globalData.UserName= result1.data.用户名;
this.globalData.NewUser= result1.result;
+ this.globalData.HeadiconID= result1.data.HeadiconID;
// 将信息存储到本地缓存中
wx.setStorageSync('UserInfoCache', this.globalData);
@@ -81,6 +82,7 @@ App({
UserName: null,
NewUser: null,
OwnedCourse: null,
- Tips: null
+ Tips: null,
+ HeadiconID: null
}
})
diff --git a/app.json b/app.json
index 10420c1..74b0d97 100644
--- a/app.json
+++ b/app.json
@@ -9,7 +9,8 @@
"pages/VideoDetailsPage/VideoDetailsPage",
"pages/IndexNewCourseDetails/IndexNewCourseDetails",
"pages/IndexFreeCourseDetails/IndexFreeCourseDetails",
- "pages/SetPasswordCode/SetPasswordCode"
+ "pages/SetPasswordCode/SetPasswordCode",
+ "pages/ChangeUserInfo/ChangeUserInfo"
],
"window": {
"navigationBarTextStyle": "black",
diff --git a/pages/ChangeUserInfo/ChangeUserInfo.js b/pages/ChangeUserInfo/ChangeUserInfo.js
new file mode 100644
index 0000000..4360eaa
--- /dev/null
+++ b/pages/ChangeUserInfo/ChangeUserInfo.js
@@ -0,0 +1,66 @@
+// pages/ChangeUserInfo/ChangeUserInfo.js
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/ChangeUserInfo/ChangeUserInfo.json b/pages/ChangeUserInfo/ChangeUserInfo.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/ChangeUserInfo/ChangeUserInfo.json
@@ -0,0 +1,3 @@
+{
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/ChangeUserInfo/ChangeUserInfo.wxml b/pages/ChangeUserInfo/ChangeUserInfo.wxml
new file mode 100644
index 0000000..6223d9e
--- /dev/null
+++ b/pages/ChangeUserInfo/ChangeUserInfo.wxml
@@ -0,0 +1,2 @@
+
+pages/ChangeUserInfo/ChangeUserInfo.wxml
\ No newline at end of file
diff --git a/pages/ChangeUserInfo/ChangeUserInfo.wxss b/pages/ChangeUserInfo/ChangeUserInfo.wxss
new file mode 100644
index 0000000..6257a36
--- /dev/null
+++ b/pages/ChangeUserInfo/ChangeUserInfo.wxss
@@ -0,0 +1 @@
+/* pages/ChangeUserInfo/ChangeUserInfo.wxss */
\ No newline at end of file
diff --git a/pages/LoginOrOutDetails/LoginOrOutDetails.js b/pages/LoginOrOutDetails/LoginOrOutDetails.js
index fedd56d..ce5a3b1 100644
--- a/pages/LoginOrOutDetails/LoginOrOutDetails.js
+++ b/pages/LoginOrOutDetails/LoginOrOutDetails.js
@@ -58,23 +58,60 @@ Page({
console.log("用户名: "+random_username);
- // 复制本地图片到用户数据路径,如果文件不存在，先复制
- const UpLoadfilePath = wx.env.USER_DATA_PATH + '/defaultAvatar.png';
- try {wx.getFileSystemManager().accessSync(UpLoadfilePath);}
- catch (e) {
- wx.getFileSystemManager().copyFileSync('static/image/defaultAvatar.png', UpLoadfilePath);
- }
+ // // 复制本地图片到用户数据路径,如果文件不存在，先复制
+ // const UpLoadfilePath = wx.env.USER_DATA_PATH + '/defaultAvatar.png';
+ // try {wx.getFileSystemManager().accessSync(UpLoadfilePath);}
+ // catch (e) {
+ // wx.getFileSystemManager().copyFileSync('static/image/defaultAvatar.png', UpLoadfilePath);
+ // }
- wx.uploadFile({
- filePath: UpLoadfilePath,
- name: "HeadIconKey",
- url: getApp().globalData.BaseURL+'/API/ApiChangeUserInfo.php', //这里会在后端设置为已登录
- formData:{
- username: random_username,
- openid: wx.getStorageSync('UserInfoCache').user_openid
- },
- success(res) {
- //打印服务器返回数据
+ // wx.uploadFile({
+ // filePath: UpLoadfilePath,
+ // name: "HeadIconKey",
+ // url: getApp().globalData.BaseURL+'/API/ApiChangeUserInfo.php', //这里会在后端设置为已登录
+ // formData:{
+ // username: random_username,
+ // openid: wx.getStorageSync('UserInfoCache').user_openid
+ // },
+ // success(res) {
+ // //打印服务器返回数据
+ // wx.showToast({
+ // title: '成功！',
+ // icon: 'success',
+ // mask:true,
+ // duration: 4000
+ // });
+ // //这里修改缓存
+ // var tempuesrinfo=wx.getStorageSync('UserInfoCache')
+ // tempuesrinfo.UserName=random_username
+ // tempuesrinfo.IsAdministor=isAdmin
+ // tempuesrinfo.IsLogin="1"
+ // wx.setStorageSync('UserInfoCache', tempuesrinfo)
+
+ // setTimeout(function() {
+ // wx.hideToast();
+ // wx.switchTab({
+ // url: '/pages/wode/wode',
+ // })
+ // },3000);
+
+ // },
+ // fail(res) {
+ // //打印服务器返回数据
+ // console.log(res);
+ // setTimeout(function() {
+ // wx.hideToast();
+ // wx.switchTab({
+ // url: '/pages/wode/wode',
+ // })
+ // },3000);
+
+ // }
+ // });
+
+ MyApi.ApiLogin(wx.getStorageSync('UserInfoCache').user_openid, random_username)
+ .then(result1 => {
+ //打印服务器返回数据
wx.showToast({
title: '成功！',
icon: 'success',
@@ -94,20 +131,9 @@ Page({
url: '/pages/wode/wode',
})
},3000);
-
- },
- fail(res) {
- //打印服务器返回数据
- console.log(res);
- setTimeout(function() {
- wx.hideToast();
- wx.switchTab({
- url: '/pages/wode/wode',
- })
- },3000);
-
- }
- })
+ })
+ .catch(err => {
+ });
diff --git a/pages/wode/wode.js b/pages/wode/wode.js
index 2fb74cb..b94ba58 100644
--- a/pages/wode/wode.js
+++ b/pages/wode/wode.js
@@ -8,10 +8,12 @@ Page({
data: {
value: '',
show: false,
+ showCode: false,
passwordcode: null,
intervalId: null,
headiconurl: '/static/image/user.png',
urlstring: getApp().globalData.BaseURL + "/Images/ToolsIcon/toolsicon",
+ CodeURL:getApp().globalData.BaseURL + "/Images/WXCode/Yeomai.png",
LoginBtnText: '登录注册',
UserNameText: '未登录',
user_openid: null,
@@ -37,17 +39,42 @@ Page({
}
},
+
+ ChangeUserInfo() {
+ wx.navigateTo({
+ url: '/pages/ChangeUserInfo/ChangeUserInfo',
+ });
+ },
+
onChange(e) {
this.setData({
passwordcode: e.detail
});
},
+
onClose() {
this.setData({
show: false,
- passwordcode: null
+ passwordcode: null,
});
},
+
+ showCode() {
+ this.setData({
+ showCode: true,
+ });
+ },
+
+ OnClickCodeImage() {
+ console.log("点击了二维码");
+ },
+
+ onCodeClose() {
+ this.setData({
+ showCode: false,
+ });
+ },
+
GetCourse() {
//点击确定后的课程获取
if (this.data.passwordcode) {
@@ -122,8 +149,8 @@ Page({
if (Storage.IsLogin === "1") {
this.setData({
IsLogin: Storage.IsLogin,
- headiconurl: getApp().globalData.BaseURL + "/Images/UsersHeadIcon/" + Storage.user_openid + ".png",
- LoginBtnText: "个人信息",
+ headiconurl: getApp().globalData.BaseURL + "/Images/Headicons/Headicon" + Storage.HeadiconID + ".png",
+ LoginBtnText: "退出登录",
UserNameText: Storage.UserName,
IsAdministor: Storage.IsAdministor,
});
diff --git a/pages/wode/wode.json b/pages/wode/wode.json
index 8988c2f..9a83d88 100644
--- a/pages/wode/wode.json
+++ b/pages/wode/wode.json
@@ -2,7 +2,9 @@
"usingComponents": {
"van-dialog": "@vant/weapp/dialog/index",
"van-field": "@vant/weapp/field/index",
- "van-button": "@vant/weapp/button/index"
+ "van-button": "@vant/weapp/button/index",
+ "van-popup": "@vant/weapp/popup/index",
+ "van-image": "@vant/weapp/image/index"
},
"navigationBarTitleText": "个人中心"
}
\ No newline at end of file
diff --git a/pages/wode/wode.wxml b/pages/wode/wode.wxml
index 96aec21..ad2756c 100644
--- a/pages/wode/wode.wxml
+++ b/pages/wode/wode.wxml
@@ -1,4 +1,19 @@
+
+
+ 长按图片识别
+
+
+
+
-->
-