From deb3c86769a3f7fcacaec44e39dc44754c4ebee9 Mon Sep 17 00:00:00 2001 From: educoder_weapp Date: Sat, 16 May 2020 18:17:08 +0800 Subject: [PATCH] =?UTF-8?q?=20*=20A=20=E6=94=AF=E6=8C=81=E5=A1=AB=E5=85=A5?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 4 ++ cloudfunctions/openapi/index.js | 4 +- miniprogram/account/pages/account/account.js | 5 ++- .../account/pages/account/account.json | 3 +- .../account/pages/account/account.wxml | 4 +- .../account/pages/account/account.wxss | 40 +++++------------ miniprogram/account/pages/profile/profile.js | 44 ++++++++++++++++++- .../account/pages/profile/profile.json | 2 +- .../account/pages/profile/profile.wxml | 15 ++++--- .../account/pages/profile/profile.wxss | 10 +++-- miniprogram/app.js | 6 ++- miniprogram/app.json | 1 + miniprogram/components/iconfont/iconfont.wxss | 18 +++++--- miniprogram/config.js | 2 +- .../components/index-list/index-list.js | 5 +++ .../components/index-list/index-list.wxml | 3 +- .../course/modules/students/students.js | 7 ++- miniprogram/js/client.js | 2 +- miniprogram/js/utils.js | 4 +- .../markdown/components/rich-md/rich-md.js | 8 +++- miniprogram/markdown/task/task/task.js | 3 +- .../shixuns/shixun-item/shixun-item.json | 4 +- .../shixuns/shixun-item/shixun-item.wxml | 5 ++- .../shixuns/shixun-item/shixun-item.wxss | 4 ++ miniprogram/pages/home/home.json | 1 - miniprogram/pages/home/home.wxml | 1 + .../my_course/course-item/course-item.wxml | 4 +- .../my_course/course-item/course-item.wxss | 21 ++++----- miniprogram/pages/main/my_course/my_course.js | 11 ++++- .../pages/main/my_course/my_course.wxml | 2 +- .../setting/pages/image_crop/image_crop.js | 11 ++--- 31 files changed, 167 insertions(+), 87 deletions(-) diff --git a/changelog.md b/changelog.md index 429ba91..a2ed193 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +## v0.16.8 + * A 支持填入微信个人信息 + * F 使用用户名登录时账号判断错误而无法登录 + ## v0.16.7 * F 用户信息未完善时加入课堂bug diff --git a/cloudfunctions/openapi/index.js b/cloudfunctions/openapi/index.js index 113fdd8..e708934 100644 --- a/cloudfunctions/openapi/index.js +++ b/cloudfunctions/openapi/index.js @@ -69,7 +69,7 @@ async function getWXACodeUnlimited(data){ const fileExtension = (fileExtensionMatches && fileExtensionMatches[1]) || 'jpg' return cloud.uploadFile({ - cloudPath: `images/wxacode/${(page+"?"+scene).replace(/[\/?&]/g, "_")}.${fileExtension}`, + cloudPath: `images/wxacode/${(page+"?"+scene).replace(/[\/?=&]/g, "_")}.${fileExtension}`, fileContent: wxacodeResult.buffer, }) } @@ -85,7 +85,7 @@ async function getWXACode(data) { const fileExtension = (fileExtensionMatches && fileExtensionMatches[1]) || 'jpg' return cloud.uploadFile({ - cloudPath: `images/wxacode/${path.replace(/[\/?&]/g,"_")}.${fileExtension}`, + cloudPath: `images/wxacode/${path.replace(/[\/?=&]/g,"_")}.${fileExtension}`, fileContent: wxacodeResult.buffer, }); } diff --git a/miniprogram/account/pages/account/account.js b/miniprogram/account/pages/account/account.js index 3bf191f..42d5fdb 100644 --- a/miniprogram/account/pages/account/account.js +++ b/miniprogram/account/pages/account/account.js @@ -22,6 +22,9 @@ Page({ return this.setData({showtip:0}); } let {action} = this.data; + if(action=="login") + // some use login to login, this case judge can be wrong + return this.setData({hasError:0}); let type = action=="register"?1:2; if(this.cache.login==login&&this.cache.type==type) return; app.api("accounts.valid_email_and_phone")({ @@ -32,7 +35,7 @@ Page({ } }) .then(res=>{ - this.setData({hasError:0,error:""}); + this.setData({hasError:0}); }) .catch(e=>{ var hasError = e.message.indexOf("网络")!=-1?2:1; diff --git a/miniprogram/account/pages/account/account.json b/miniprogram/account/pages/account/account.json index 5f47cb0..ad3f77e 100644 --- a/miniprogram/account/pages/account/account.json +++ b/miniprogram/account/pages/account/account.json @@ -1,6 +1,7 @@ { "usingComponents": { - "iconfont":"/components/iconfont/iconfont" + "iconfont":"/components/iconfont/iconfont", + "mp-toptips":"/weui-miniprogram/toptips/toptips" }, "navigationBarTitleText": "账号", "navigationBarBackgroundColor": "#ffffff" diff --git a/miniprogram/account/pages/account/account.wxml b/miniprogram/account/pages/account/account.wxml index 867cde9..856f334 100644 --- a/miniprogram/account/pages/account/account.wxml +++ b/miniprogram/account/pages/account/account.wxml @@ -1,9 +1,7 @@ - - {{error}} - + diff --git a/miniprogram/account/pages/profile/profile.wxss b/miniprogram/account/pages/profile/profile.wxss index efbbf50..5f1e580 100644 --- a/miniprogram/account/pages/profile/profile.wxss +++ b/miniprogram/account/pages/profile/profile.wxss @@ -5,7 +5,11 @@ .profile, page { height: 100%; } - +.sticky{ + top: 0; + position: sticky; + z-index: 10000; +} .header { display: flex; align-items: center; @@ -23,7 +27,7 @@ bottom: 0; right: 0; transition: 0.72s all ease; - background: orange; + background: #fa5151; color: white; padding: 0 20px; display: flex; @@ -58,6 +62,6 @@ .footer { font-size: 24rpx; text-align: center; - margin-top: 12px; + margin: 12px 0; color: grey; } diff --git a/miniprogram/app.js b/miniprogram/app.js index 5d5c3f6..cf473a2 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -3,7 +3,9 @@ import { client } from "./js/client"; wx.cloud.init({ traceUser: true, - env: "educoder" + env: "educoder", + success:console.log, + fail: console.error }); App({ @@ -60,7 +62,7 @@ App({ this.globalData.scene = options.scene; if(options.scene==1129){ this.globalData.isCrawl = true; - this.cloudfunction("login")({mpcrawl: true}); + // this.cloudfunction("login")({mpcrawl: true}); this.api("accounts.login")(global.accountManager.testAccount) .then(res=>{ let account = { ...res, ...global.accountManager.testAccount}; diff --git a/miniprogram/app.json b/miniprogram/app.json index ffbce86..6dd818e 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -7,6 +7,7 @@ "backgroundColor": "#f5f5f5" }, "usingComponents": { + "iconfont":"/components/iconfont/iconfont", "require-login": "/components/require-login/require-login" }, "pages": [ diff --git a/miniprogram/components/iconfont/iconfont.wxss b/miniprogram/components/iconfont/iconfont.wxss index 4a1ad19..aab1a1f 100644 --- a/miniprogram/components/iconfont/iconfont.wxss +++ b/miniprogram/components/iconfont/iconfont.wxss @@ -1,11 +1,11 @@ @font-face { font-family: 'iconfont'; /* project id 1656783 */ - src: url('//at.alicdn.com/t/font_1656783_1qepxw56cybi.eot'); - src: url('//at.alicdn.com/t/font_1656783_1qepxw56cybi.eot?#iefix') format('embedded-opentype'), - url('//at.alicdn.com/t/font_1656783_1qepxw56cybi.woff2') format('woff2'), - url('//at.alicdn.com/t/font_1656783_1qepxw56cybi.woff') format('woff'), - url('//at.alicdn.com/t/font_1656783_1qepxw56cybi.ttf') format('truetype'), - url('//at.alicdn.com/t/font_1656783_1qepxw56cybi.svg#iconfont') format('svg'); + src: url('//at.alicdn.com/t/font_1656783_wv69r0ez2j.eot'); + src: url('//at.alicdn.com/t/font_1656783_wv69r0ez2j.eot?#iefix') format('embedded-opentype'), + url('//at.alicdn.com/t/font_1656783_wv69r0ez2j.woff2') format('woff2'), + url('//at.alicdn.com/t/font_1656783_wv69r0ez2j.woff') format('woff'), + url('//at.alicdn.com/t/font_1656783_wv69r0ez2j.ttf') format('truetype'), + url('//at.alicdn.com/t/font_1656783_wv69r0ez2j.svg#iconfont') format('svg'); } .iconfont { display: inline-block; @@ -121,4 +121,10 @@ } .icon-shezhi:before{ content: "\e625"; +} +.icon-dengji:before{ + content: "\e606"; +} +.icon-chengyuan:before{ + content: "\e62a"; } \ No newline at end of file diff --git a/miniprogram/config.js b/miniprogram/config.js index 8105eff..ed5ea25 100644 --- a/miniprogram/config.js +++ b/miniprogram/config.js @@ -1,6 +1,6 @@ const cloudDir = "cloud://educoder.6564-educoder-1300855313/"; -let _version = "0.16.7"; +let _version = "0.16.8"; /** */ let { miniProgram:{ envVersion="release", version=_version}={}} = wx.getAccountInfoSync(); diff --git a/miniprogram/course/components/index-list/index-list.js b/miniprogram/course/components/index-list/index-list.js index 74bd8ae..3dea2d0 100644 --- a/miniprogram/course/components/index-list/index-list.js +++ b/miniprogram/course/components/index-list/index-list.js @@ -11,6 +11,7 @@ Component({ type: Array, value: [], observer: function observer(newVal) { + console.log("observer list change", newVal) var _this = this; if (newVal.length === 0) return; @@ -30,6 +31,10 @@ Component({ ext:{ type:Object }, + key:{ + type:String, + value:"user_id" + }, vibrated: { type: Boolean, value: true diff --git a/miniprogram/course/components/index-list/index-list.wxml b/miniprogram/course/components/index-list/index-list.wxml index 9cdf010..e1f98ca 100644 --- a/miniprogram/course/components/index-list/index-list.wxml +++ b/miniprogram/course/components/index-list/index-list.wxml @@ -12,7 +12,8 @@ {{item.letter}} - + diff --git a/miniprogram/course/modules/students/students.js b/miniprogram/course/modules/students/students.js index 9020ee0..fbf4d6a 100644 --- a/miniprogram/course/modules/students/students.js +++ b/miniprogram/course/modules/students/students.js @@ -35,10 +35,13 @@ Component({ refresh(){ let {course_id, course_identity} = this.data; let {sort_type=''} = this; + wx.showLoading({ + title: '加载中', + }); if(sort_type!='id') app.api("weapps.courses.students")({course_id, limit:1000}).then(res=>{ var {students,students_count} = res; - this.setData({students,students_count}); + this.setData({students,students_count}, wx.hideLoading); if(!this.imageMap) this.imageMap = new Map(); for(var item of students){ @@ -61,7 +64,7 @@ Component({ else students = []; var {students_count} = res; - this.setData({ students, students_count}); + this.setData({ students, students_count}, wx.hideLoading); }); let ext = {course_id, course_identity}; this.setData({ext}); diff --git a/miniprogram/js/client.js b/miniprogram/js/client.js index 871d573..1598194 100644 --- a/miniprogram/js/client.js +++ b/miniprogram/js/client.js @@ -57,7 +57,7 @@ class Client{ }); this.on("success","accounts.login", res=>{ this.synch=0; - this.user = {}; + this.user = res; this.save_cookies(); }); this.on("success", "accounts.register", res => { diff --git a/miniprogram/js/utils.js b/miniprogram/js/utils.js index 8482ace..159a65f 100644 --- a/miniprogram/js/utils.js +++ b/miniprogram/js/utils.js @@ -136,7 +136,7 @@ class AccountManager{ } setCurrentAccount(account,sync=1){ this.currentAccount = account; - this.currentAccount.active = account.active||1; //登录保存 登录不保存 保存不登录 不保存不登录 + this.currentAccount.active = account.active||1; if (sync) this.setStorage(); } @@ -211,7 +211,7 @@ export const accountManager = global.accountManager = new AccountManager(); export function getWXACodeUrl({url, scene}){ - return global.config.imgDir + "wxacode/" + (url + "?" + scene).replace(/[\/?&]/g, "_") + ".jpeg"; + return global.config.imgDir + "wxacode/" + (url + "?" + scene).replace(/[\/?=&]/g, "_") + ".jpeg"; } //https://www.educoder.net/shixuns/ac46rzbw/challenges/3481 export function parseUrl({url}){ diff --git a/miniprogram/markdown/components/rich-md/rich-md.js b/miniprogram/markdown/components/rich-md/rich-md.js index 096ce82..9e0e7aa 100644 --- a/miniprogram/markdown/components/rich-md/rich-md.js +++ b/miniprogram/markdown/components/rich-md/rich-md.js @@ -18,6 +18,10 @@ Component({ key, success: res=>{ this.setData({_nodes:res.data}); + wx.setStorage({ + data: {}, + key, + }) }, }); return key; @@ -47,6 +51,7 @@ Component({ methods: { handleTap(e){ + console.log("onTap", e); var {target:{dataset:{data}},currentTarget:{dataset:{data:_data}}} = e; let {tag, attr} = _data; if(tag=='navigator'&&attr.href){ @@ -63,7 +68,8 @@ Component({ if(data&&data._e.tag=="code") data={attr:{class:"h2w__pre"},child:[data],tag:"view",type:"tag",_e:{type:"tag",attr:{},tag:"pre", child:[data]}} if(data&&data._e.tag=='pre'){ - data = {theme:'light',child:[data],_e:{child:[data]}} + data = {theme:'light',child:[data],_e:{child:[data]}}; + var key = "RICH_MD_STORAGE" wx.setStorage({ key,data,success:res=>{ wx.navigateTo({ diff --git a/miniprogram/markdown/task/task/task.js b/miniprogram/markdown/task/task/task.js index 6827268..365c1dd 100644 --- a/miniprogram/markdown/task/task/task.js +++ b/miniprogram/markdown/task/task/task.js @@ -260,7 +260,8 @@ Page({ this.checkTime(); }, onHide: function () { - this.updateFile(); + if(this.content) + this.updateFile(); }, onShareAppMessage: function () { diff --git a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.json b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.json index e8cfaaf..4a42478 100644 --- a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.json +++ b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.json @@ -1,4 +1,6 @@ { "component": true, - "usingComponents": {} + "usingComponents": { + + } } \ No newline at end of file diff --git a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml index c95f7d5..fc7fdfb 100644 --- a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml +++ b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml @@ -2,7 +2,10 @@ - 初级 + + {{data.level}} + {{data.study_count}} + diff --git a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss index d238121..e7fd96b 100644 --- a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss +++ b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss @@ -17,8 +17,12 @@ justify-content: space-between; flex: auto; } +.data-detail{ + display: flex; +} .level{ font-size: 12px; + margin-right: 10px; } .highlight{ color: #00b0f0; diff --git a/miniprogram/pages/home/home.json b/miniprogram/pages/home/home.json index 1b779c6..aa50eff 100644 --- a/miniprogram/pages/home/home.json +++ b/miniprogram/pages/home/home.json @@ -2,7 +2,6 @@ "navigationBarTitleText": "个人中心", "enablePullDownRefresh": false, "usingComponents": { - "iconfont":"/components/iconfont/iconfont", "mp-icon":"/weui-miniprogram/icon/icon" } } diff --git a/miniprogram/pages/home/home.wxml b/miniprogram/pages/home/home.wxml index 65f03d9..ff0485d 100644 --- a/miniprogram/pages/home/home.wxml +++ b/miniprogram/pages/home/home.wxml @@ -53,6 +53,7 @@ diff --git a/miniprogram/setting/pages/image_crop/image_crop.js b/miniprogram/setting/pages/image_crop/image_crop.js index a3e3edc..8db8cea 100644 --- a/miniprogram/setting/pages/image_crop/image_crop.js +++ b/miniprogram/setting/pages/image_crop/image_crop.js @@ -189,7 +189,7 @@ Page({ } }) }, - initCanvas(src) { + initCanvas(src="") { const { cropperOpt } = this.data; Object.assign(cropperOpt, { src }); this.mycropper = new WeCropper(cropperOpt); @@ -225,11 +225,8 @@ Page({ }, onLoad(option) { this.setCanvasOptions(); - const { src } = option; - if (src) { - this.initCanvas(src); - } else { - this.chooseImage({navback:1}) - } + const { src="" } = option; + this.initCanvas(src); + this.chooseImage({navback:1}) } }) \ No newline at end of file