diff --git a/pages/mine/index.js b/pages/mine/index.js
index a9c73ad..a0954fd 100644
--- a/pages/mine/index.js
+++ b/pages/mine/index.js
@@ -3,20 +3,35 @@
Page({
data: {
imageUrl: getApp().globalData.imageUrl,
- bgImage: "background-image: url("+ getApp().globalData.imageUrl + "/img_mybg.png)",
- statusBarHeight:0
+ bgImage: "background-image: url(" + getApp().globalData.imageUrl + "/img_mybg.png)",
+ statusBarHeight: 0,
+ nickName: "",
+ avatarUrl: "",
+ btnShow: false
},
- onLoad:function(){
+ onLoad: function () {
wx.getSystemInfo({
- success:(res)=>{
- let statusBarHeight = res.statusBarHeight
- this.setData({
- statusBarHeight:statusBarHeight
- })
- }
+ success: (res) => {
+ let statusBarHeight = res.statusBarHeight
+ this.setData({
+ statusBarHeight: statusBarHeight
+ })
+ }
})
},
onShow() {
this.getTabBar().init();
+ this.getUser();
},
-});
+ getUser() {
+ if(wx.getStorageSync("userInfo")) {
+ let userInfo = wx.getStorageSync("userInfo");
+ this.setData({
+ nickName: userInfo.nickName,
+ avatarUrl: userInfo.avatarUrl,
+ btnShow: true
+ })
+ }
+ }
+
+});
\ No newline at end of file
diff --git a/pages/mine/index.wxml b/pages/mine/index.wxml
index a819b56..d99c58d 100644
--- a/pages/mine/index.wxml
+++ b/pages/mine/index.wxml
@@ -2,11 +2,11 @@
- 胆怯的麦粒
+ {{nickName}}
欢迎您使⽤硕为思平台
-
+
@@ -22,6 +22,6 @@
-
+
\ No newline at end of file
diff --git a/pages/mine/pages/bindUser/index.js b/pages/mine/pages/bindUser/index.js
index bc097f3..d7ea87c 100644
--- a/pages/mine/pages/bindUser/index.js
+++ b/pages/mine/pages/bindUser/index.js
@@ -13,7 +13,7 @@ Page({
img: '',
unionID: '',
code: '',
- nickName: '',
+ nickName: '未登录',
avatarUrl: ''
},
usernameInput: function (e) {
@@ -30,7 +30,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- this.initData()
+ // this.initData()
},
// 微信用户初始化
initData() {
@@ -48,30 +48,32 @@ Page({
getUserCode() {
let that = this;
return new Promise((resolve, reject) => {
- wx.login({
- success (res) {
+ wx.getUserProfile({
+ desc: 'desc',
+ success(data) {
+ console.log(data)
+ let userInfo = data.userInfo;
that.setData({
- code: res.code
- })
- wx.getUserInfo({
- success(data) {
- let userInfo = data.userInfo;
- that.setData({
- nickName: userInfo.nickName,
- avatarUrl: userInfo.avatarUrl
- })
- resolve(true)
- },
- fail() {
- reject(false)
- }
- })
+ nickName: userInfo.nickName,
+ avatarUrl: userInfo.avatarUrl
+ })
+ wx.login({
+ success(res) {
+ that.setData({
+ code: res.code
+ })
+ resolve(true)
+ },
+ fail() {
+ reject(false)
+ }
+ })
},
fail() {
- reject(false)
+ reject(false)
}
- })
- })
+ })
+ })
},
// 获取openid
getOpenidByCode() {
@@ -90,16 +92,16 @@ Page({
method: 'get',
success: function (res) {
//接口实际返回的内容在res.data中
- if(res.data.Code == 1) {
- let data = res.data.Data;
- that.setData({
- openid: data.openid,
- unionID: data.unionid
- })
- resolve(true);
- } else {
- reject(res.data)
- }
+ if (res.data.Code == 1) {
+ let data = res.data.Data;
+ that.setData({
+ openid: data.openid,
+ unionID: data.unionid
+ })
+ resolve(true);
+ } else {
+ reject(res.data)
+ }
},
fail: function (err) {
reject(err);
@@ -108,7 +110,7 @@ Page({
})
},
login() {
- if(!this.data.userName || !this.data.pwd) {
+ if (!this.data.userName || !this.data.pwd) {
wx.showModal({
title: '提示',
content: '请输入账号或密码！',
@@ -126,28 +128,36 @@ Page({
unionID: this.data.unionID
}
app.globalData.request(obj).then(res => {
+ const userInfo = Object.assign({}, res, {
+ nickName: this.data.nickName,
+ avatarUrl: this.data.avatarUrl
+ })
wx.setStorageSync('token', res.toKen);
- wx.setStorageSync('userInfo', res);
+ wx.setStorageSync('userInfo', userInfo);
wx.setStorageSync('openid', this.data.openid);
wx.navigateBack({
delta: 1
});
}).catch(err => {
- if(err.Code == 2) {
+ if (err.Code == 2) {
let data = err.Data;
+ const userInfo = Object.assign({}, data, {
+ nickName: this.data.nickName,
+ avatarUrl: this.data.avatarUrl
+ })
wx.setStorageSync('token', data.toKen);
- wx.setStorageSync('userInfo', data);
+ wx.setStorageSync('userInfo', userInfo);
wx.setStorageSync('openid', this.data.openid);
wx.showModal({
title: '提示',
content: '登录成功，但未关注公众号。',
success: function (r) {
- if(r.confirm) {
+ if (r.confirm) {
wx.navigateBack({
delta: 1
});
} else {
- console.log('取消')
+ console.log('取消')
}
}
})
diff --git a/pages/mine/pages/helpCenter/index.js b/pages/mine/pages/helpCenter/index.js
index 76eb322..f3dd1fc 100644
--- a/pages/mine/pages/helpCenter/index.js
+++ b/pages/mine/pages/helpCenter/index.js
@@ -5,10 +5,9 @@ Page({
* 页面的初始数据
*/
data: {
- fileList:[]
- },
- afterRead(){
-
+ fileList:[],
+ mobile: '',
+ content: ''
},
/**
* 生命周期函数--监听页面加载
@@ -17,52 +16,35 @@ Page({
},
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
- },
-
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
- },
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
- },
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
+ contentInput(e) {
+ this.setData({
+ content: e.detail.value
+ })
+ },
+ phoneInput(e) {
+ this.setData({
+ mobile: e.detail.value
+ })
+ },
+ afterRead(event) {
+ const { file } = event.detail;
+ wx.uploadFile({
+ url: 'https://example.weixin.qq.com/upload', // 仅为示例，非真实的接口地址
+ filePath: file.url,
+ name: 'file',
+ formData: { user: 'test' },
+ success(res) {
+ // 上传完成需要更新 fileList
+ const { fileList = [] } = this.data;
+ fileList.push({ ...file, url: res.data });
+ this.setData({ fileList });
+ },
+ });
}
})
\ No newline at end of file
diff --git a/pages/mine/pages/helpCenter/index.wxml b/pages/mine/pages/helpCenter/index.wxml
index f180290..b6805ab 100644
--- a/pages/mine/pages/helpCenter/index.wxml
+++ b/pages/mine/pages/helpCenter/index.wxml
@@ -1,11 +1,11 @@
问题描述
-
+
-
+
联系方式
-
+
diff --git a/pages/mine/pages/myReport/index.js b/pages/mine/pages/myReport/index.js
index f6f15a6..03c2080 100644
--- a/pages/mine/pages/myReport/index.js
+++ b/pages/mine/pages/myReport/index.js
@@ -1,3 +1,6 @@
+const app = getApp();
+let iPageIndex = 1;
+let iPageSize = 20;
// pages/mine/pages/myReport/index.js
Page({
@@ -6,7 +9,9 @@ Page({
*/
data: {
imageUrl: getApp().globalData.imageUrl,
-
+ list: [],
+ loadMore: false, //"上拉加载"的变量，默认false，隐藏
+ loadAll: false, //“没有数据”的变量，默认false，隐藏
},
/**
@@ -15,53 +20,98 @@ Page({
onLoad(options) {
},
-
- /**
- * 生命周期函数--监听页面初次渲染完成
- */
- onReady() {
-
+ //页面上拉触底事件的处理函数
+ onReachBottom: function () {
+ let that = this
+ if (!that.data.loadMore) {
+ that.setData({
+ loadMore: true, //加载中
+ loadAll: false //是否加载完所有数据
+ });
+ //加载更多，这里做下延时加载
+ that.getData();
+ }
},
-
- /**
- * 生命周期函数--监听页面显示
- */
onShow() {
-
+ iPageIndex = 1;
+ this.getData()
},
-
- /**
- * 生命周期函数--监听页面隐藏
- */
- onHide() {
-
+ searchScrollLower() {
+ this.getData();
},
-
- /**
- * 生命周期函数--监听页面卸载
- */
- onUnload() {
-
- },
-
- /**
- * 页面相关事件处理函数--监听用户下拉动作
- */
- onPullDownRefresh() {
-
+ getData() {
+ if (iPageIndex == 1) {
+ this.setData({
+ loadMore: true, //把"上拉加载"的变量设为true，显示
+ loadAll: false //把“没有数据”设为false，隐藏
+ })
+ }
+ app.globalData.request({
+ action: "getFileInfoExcel",
+ iPageIndex: iPageIndex,
+ iPageSize: iPageSize,
+ sType: 'User',
+ token: wx.getStorageSync('token') || 't%2BrswgjvzGM='
+ }).then(res => {
+ let arr = res.Table || []
+ if (arr && arr.length > 0) {
+ iPageIndex++;
+ let list = this.data.list.concat(arr);
+ this.setData({
+ list: list,
+ loadMore: false //把"上拉加载"的变量设为false，显示
+ })
+ if (arr.length < iPageSize) {
+ this.setData({
+ loadMore: false, //隐藏加载中。。
+ loadAll: true //所有数据都加载完了
+ });
+ }
+ } else {
+ this.setData({
+ loadAll: true, //把“没有数据”设为true，显示
+ loadMore: false //把"上拉加载"的变量设为false，隐藏
+ });
+ }
+
+ })
},
-
- /**
- * 页面上拉触底事件的处理函数
- */
- onReachBottom() {
-
- },
-
- /**
- * 用户点击右上角分享
- */
- onShareAppMessage() {
-
+ openFile(e) {
+ const row = e.currentTarget.dataset.row
+ if (row.Status !== 2) {
+ wx.showModal({
+ title: '提示',
+ content: '数据还未完成，请耐心等待！'
+ })
+ return;
+ }
+ wx.downloadFile({
+ url: row.FilePath,
+ success: function (res) {
+ // console.log(res)
+ let filePath = res.tempFilePath //返回的文件临时地址，用于后面打开本地预览所用
+ let filename = row.FilePath;
+ let index1 = filename.lastIndexOf(".");
+ let index2 = filename.length;
+ let postf = filename.substring(index1, index2); //后缀名
+ let postf1 = postf.replace(/\./g, '')
+ // console.log(postf1)
+ if (filePath != null) {
+ wx.openDocument({
+ filePath: filePath,
+ fileType: postf1,
+ success: function (res) {
+ console.log(res)
+ },
+ fail: function (res) {
+ console.log(res)
+ }
+ })
+ }
+ },
+ fail: function (res) {
+ console.log(res)
+ }
+ })
}
})
\ No newline at end of file
diff --git a/pages/mine/pages/myReport/index.wxml b/pages/mine/pages/myReport/index.wxml
index bcc10cb..8a62dba 100644
--- a/pages/mine/pages/myReport/index.wxml
+++ b/pages/mine/pages/myReport/index.wxml
@@ -1,22 +1,16 @@
-
+
+
- 测试v7_PPT主题分析报告
- 2022-06-15 11:24:47
-
-
-
-
-
-
- 测试v7_PPT主题分析报告aaaaaaaaaa
- 2022-06-15 11:24:47
+ {{item.Folder}}
+ {{item.AddTime}}
+ 正在载入更多...
+ 已加载全部
+
\ No newline at end of file
diff --git a/pages/mine/pages/myReport/index.wxss b/pages/mine/pages/myReport/index.wxss
index 0c28750..06b166b 100644
--- a/pages/mine/pages/myReport/index.wxss
+++ b/pages/mine/pages/myReport/index.wxss
@@ -38,4 +38,11 @@ page{
display:-webkit-box;
-webkit-line-clamp:1;
-webkit-box-orient: vertical;
+}
+.loading {
+ position: relative;
+ bottom: 5rpx;
+ padding: 10rpx;
+ text-align: center;
+ font-size: 12px;
}
\ No newline at end of file