刘晓艳 / informationPlatform · 提交

转到一个项目

作者 吴孟雨
提交 0c5d8b2e19f60e63d393456eeb72ac64c1599b2a 1 个父辈 78f77055

修改心愿首页

内嵌 并排对比
正在显示 3 个修改的文件 包含 142 行增加 和 115 行删除
... ... @@ -21,36 +21,36 @@
<counts>
<entry key="project.closed" value="38" />
<entry key="project.open.time.0" value="8" />
<entry key="project.open.time.1" value="12" />
<entry key="project.open.time.1" value="13" />
<entry key="project.open.time.10" value="4" />
<entry key="project.open.time.11" value="3" />
<entry key="project.open.time.7" value="1" />
<entry key="project.open.time.8" value="4" />
<entry key="project.open.time.9" value="6" />
<entry key="project.opened" value="38" />
<entry key="project.opened" value="39" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="js" value="175" />
<entry key="js" value="176" />
<entry key="json" value="48" />
<entry key="png" value="3" />
<entry key="wxml" value="153" />
<entry key="wxml" value="154" />
<entry key="wxss" value="57" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="57" />
<entry key="HTML" value="153" />
<entry key="HTML" value="154" />
<entry key="Image" value="3" />
<entry key="JSON" value="48" />
<entry key="JavaScript" value="175" />
<entry key="JavaScript" value="176" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="12835" />
<entry key="js" value="12887" />
<entry key="json" value="177" />
<entry key="txt" value="757" />
<entry key="wxml" value="3435" />
... ... @@ -62,7 +62,7 @@
<entry key="CSS" value="2014" />
<entry key="HTML" value="3435" />
<entry key="JSON" value="177" />
<entry key="JavaScript" value="12835" />
<entry key="JavaScript" value="12887" />
<entry key="PLAIN_TEXT" value="757" />
</counts>
</usages-collector>
... ... @@ -76,28 +76,10 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3256">
<caret line="149" column="22" selection-start-line="149" selection-start-column="22" selection-end-line="149" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/service/release/release.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2860">
<caret line="130" column="46" selection-start-line="130" selection-start-column="46" selection-end-line="130" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/service/release/release.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="820">
<caret line="63" column="27" selection-start-line="63" selection-start-column="27" selection-end-line="63" selection-end-column="27" />
<state relative-caret-position="673">
<caret line="68" column="7" lean-forward="true" selection-start-line="68" selection-start-column="7" selection-end-line="68" selection-end-column="7" />
</state>
</provider>
</entry>
... ... @@ -132,8 +114,22 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/wish/wish.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5192">
<caret line="236" column="11" selection-start-line="236" selection-start-column="11" selection-end-line="236" selection-end-column="11" />
<state relative-caret-position="279">
<caret line="58" column="18" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="37" column="36" lean-forward="true" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="36" />
</state>
</provider>
</entry>
... ... @@ -150,8 +146,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/wish/wish.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1298">
<caret line="59" column="37" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="37" />
<state relative-caret-position="279">
<caret line="19" column="100" selection-start-line="19" selection-start-column="89" selection-end-line="19" selection-end-column="100" />
</state>
</provider>
</entry>
... ... @@ -169,11 +165,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>swiper</find>
<find>del</find>
<find>swi</find>
<find>recommend_box</find>
<find>modal</find>
<find>thumbnail</find>
<find>close-btn</find>
<find>@</find>
... ... @@ -199,6 +190,11 @@
<find>wxP</find>
<find>nowDate</find>
<find>forEach</find>
<find>全部</find>
<find>心愿</find>
<find>getOpenId</find>
<find>wishAllInfo</find>
<find>wishIndex</find>
</findStrings>
<dirStrings>
<dir>D:\info\informationPlatform\wxParse</dir>
... ... @@ -228,7 +224,6 @@
<option value="$PROJECT_DIR$/pages/my/messageDetail/messageDetail.wxss" />
<option value="$PROJECT_DIR$/pages/service/comment/comment.js" />
<option value="$PROJECT_DIR$/pages/my/mycollect/mycollect.wxml" />
<option value="$PROJECT_DIR$/pages/start/start.js" />
<option value="$PROJECT_DIR$/pages/wish/release/release.js" />
<option value="$PROJECT_DIR$/pages/my/my.json" />
<option value="$PROJECT_DIR$/pages/service/myindex/myindex.wxml" />
... ... @@ -258,9 +253,10 @@
<option value="$PROJECT_DIR$/pages/my/mycollect/mycollect.js" />
<option value="$PROJECT_DIR$/pages/report/report.js" />
<option value="$PROJECT_DIR$/pages/report/report.wxml" />
<option value="$PROJECT_DIR$/pages/wish/wish.js" />
<option value="$PROJECT_DIR$/pages/service/myindex/myindex.js" />
<option value="$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js" />
<option value="$PROJECT_DIR$/pages/wish/wish.js" />
<option value="$PROJECT_DIR$/pages/start/start.js" />
</list>
</option>
</component>
... ... @@ -281,7 +277,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -326,15 +321,28 @@
<item name="service" type="462c0819:PsiDirectoryNode" />
<item name="release" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="informationPlatform" type="b2602c69:ProjectViewProjectNode" />
<item name="informationPlatform" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="start" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="informationPlatform" type="b2602c69:ProjectViewProjectNode" />
<item name="informationPlatform" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="wish" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="D:/project/life" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="vcs.Git" />
... ... @@ -405,6 +413,7 @@
<workItem from="1543367095559" duration="1048000" />
<workItem from="1543376425554" duration="4241000" />
<workItem from="1543404062236" duration="83000" />
<workItem from="1543903183003" duration="3608000" />
</task>
<task id="LOCAL-00001" summary="启动页">
<created>1537858583070</created>
... ... @@ -732,7 +741,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="360029000" />
<option name="totallyTimeSpent" value="363637000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -745,6 +754,7 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4989154" visible="true" weight="0.14752372" />
<window_info id="Structure" order="1" sideWeight="0.5010846" side_tool="true" weight="0.14805058" />
... ... @@ -757,7 +767,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" weight="0.329718" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49947312" weight="0.5460455" />
<window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49947312" weight="0.54555315" />
<window_info anchor="bottom" id="Terminal" order="9" weight="0.329718" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50052685" side_tool="true" weight="0.40238613" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
... ... @@ -826,13 +836,6 @@
<option name="LAST_COMMIT_MESSAGE" value="优化心愿进入主页，添加举报默认文字" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/my/my.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="1" lean-forward="true" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/renting/search/search.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -1053,13 +1056,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1364">
<caret line="62" column="40" selection-start-line="62" selection-start-column="40" selection-end-line="62" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/consult/consult.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3564">
... ... @@ -1116,38 +1112,48 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/wish/wish.js">
<entry file="file://$PROJECT_DIR$/pages/report/report.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5192">
<caret line="236" column="11" selection-start-line="236" selection-start-column="11" selection-end-line="236" selection-end-column="11" />
<state relative-caret-position="66">
<caret line="3" column="97" selection-start-line="3" selection-start-column="97" selection-end-line="3" selection-end-column="97" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/report/report.wxml">
<entry file="file://$PROJECT_DIR$/pages/my/mycollect/mycollect.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="97" selection-start-line="3" selection-start-column="97" selection-end-line="3" selection-end-column="97" />
<state relative-caret-position="660">
<caret line="30" column="18" selection-start-line="30" selection-start-column="11" selection-end-line="30" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/release/release.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="673">
<caret line="68" column="7" lean-forward="true" selection-start-line="68" selection-start-column="7" selection-end-line="68" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/wish/wish.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1298">
<caret line="59" column="37" selection-start-line="59" selection-start-column="31" selection-end-line="59" selection-end-column="37" />
<state relative-caret-position="279">
<caret line="19" column="100" selection-start-line="19" selection-start-column="89" selection-end-line="19" selection-end-column="100" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/mycollect/mycollect.js">
<entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/wish/wish.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="30" column="18" selection-start-line="30" selection-start-column="11" selection-end-line="30" selection-end-column="18" />
<state relative-caret-position="279">
<caret line="58" column="18" selection-start-line="58" selection-start-column="9" selection-end-line="58" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/release/release.wxml">
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="820">
<caret line="63" column="27" selection-start-line="63" selection-start-column="27" selection-end-line="63" selection-end-column="27" />
<state relative-caret-position="550">
<caret line="37" column="36" lean-forward="true" selection-start-line="37" selection-start-column="36" selection-end-line="37" selection-end-column="36" />
</state>
</provider>
</entry>
... ...
... ... @@ -14,27 +14,28 @@ Page({
// 获取用户信息
start(e) {
let that = this;
console.log(e)
// console.log(e,that.data.openid,that.data.session_key)
let geturl = '/wxapp/public/login';
let url = '/wxapp/public/getSessionKey'
wx.login({
success: function (res) {
// console.log(res)
app.post(url, {
code: res.code
}, {}).then((res) => {
// let url = '/wxapp/public/getSessionKey'
// wx.login({
// success: function (res) {
// console.log(res)
// app.post(url, {
// code: res.code
// }, {}).then((res) => {
// console.log('res',ret);
let params = {
encrypted_data: e.detail.encryptedData,
iv: e.detail.iv,
raw_data: e.detail.rawData,
signature: e.detail.signature,
openid: res.openid,
session_key: res.session_key,
openid: that.data.openid,
session_key: that.data.session_key,
}
app.post(geturl, params).then((ret) => {
wx.setStorageSync('token', ret.token)
app.globalData.userInfo = ret.user_type
// console.log(ret);
app.globalData.userInfo = ret.user_type
// console.log('userInfo',app.globalData.userInfo,ret);
if (ret.user_type == 2) {
wx.redirectTo({
... ... @@ -44,13 +45,13 @@ Page({
}
})
})
},
fail: function (res) {
},
complete: function (res) {
},
})
// })
// },
// fail: function (res) {
// },
// complete: function (res) {
// },
// })
},
example() {
... ... @@ -67,30 +68,49 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
getOpenId(){
let that = this
let url = '/wxapp/public/getSessionKey'
wx.login({
success: function (res) {
// console.log(res)
app.post(url, {
code: res.code
}, {}).then((ret) => {
// console.log('res',ret);
that.setData({
openid: ret.openid,
session_key: ret.session_key
})
})
},
fail: function (res) {
},
complete: function (res) {
},
})
let that = this
let url = '/wxapp/public/getSessionKey'
wx.login({
success: function (res) {
// console.log(res)
app.post(url, {
code: res.code
}, {}).then((ret) => {
// console.log('res',ret);
that.setData({
openid: ret.openid,
session_key: ret.session_key
})
})
},
fail: function (res) {
},
complete: function (res) {
},
})
},
// getOpenId(){
// let that = this
// let url = '/wxapp/public/getSessionKey'
// wx.login({
// success: function (res) {
// // console.log(res)
// app.post(url, {
// code: res.code
// }, {}).then((ret) => {
// // console.log('res',ret);
// that.setData({
// openid: ret.openid,
// session_key: ret.session_key
// })
// })
// },
// fail: function (res) {
// },
// complete: function (res) {
// },
// })
// },
/**
* 生命周期函数--监听页面初次渲染完成
... ...
... ... @@ -87,7 +87,7 @@ Page({
portal_post: this.data.portal_post.concat(list),
portal_two: res.portal_two,
})
console.log('portal_post',this.data.portal_post)
// console.log('portal_post',this.data.portal_post)
})
},
... ... @@ -557,6 +557,7 @@ Page({
wx.redirectTo({
url: '/pages/wish/wish',
})
this.initAll();
}
},
... ... @@ -662,8 +663,8 @@ Page({
*/
onShow: function () {
this.initAll();
this.wishIndex()
this.wishAllInfo()
// this.wishIndex()
// this.wishAllInfo()
},
/**
... ...