刘晓艳 / informationPlatform · 提交

转到一个项目

作者 刘晓艳
提交 0928529c1263a640b71aa5b7900d6fa74b518364 2 个父辈 363e32ff 95ec8873

合并分支 'wumengyu' 到 'master' 

Wumengyu



查看合并请求 !37
内嵌 并排对比
正在显示 7 个修改的文件 包含 403 行增加 和 213 行删除
... ... @@ -2,5 +2,6 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/informationPlatform" vcs="Git" />
</component>
</project>
\ No newline at end of file
... ...
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<<<<<<< HEAD
<list default="true" id="6762183d-f259-4449-ac12-814b45d5f340" name="Default Changelist" comment="暂存">
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
=======
<list default="true" id="6762183d-f259-4449-ac12-814b45d5f340" name="Default Changelist" comment="">
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
... ... @@ -17,52 +22,63 @@
<session id="-663576666">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="45" />
<entry key="project.open.time.0" value="10" />
<entry key="project.open.time.1" value="14" />
<entry key="project.open.time.10" value="7" />
<entry key="project.closed" value="55" />
<entry key="project.open.time.0" value="14" />
<entry key="project.open.time.1" value="17" />
<entry key="project.open.time.10" value="8" />
<entry key="project.open.time.11" value="3" />
<entry key="project.open.time.2" value="1" />
<entry key="project.open.time.26" value="1" />
<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="46" />
<entry key="project.open.time.9" value="7" />
<entry key="project.opened" value="56" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<<<<<<< HEAD
<entry key="js" value="189" />
<entry key="json" value="50" />
=======
<entry key="js" value="182" />
<entry key="json" value="48" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
<entry key="png" value="3" />
<entry key="wxml" value="158" />
<entry key="wxss" value="57" />
<entry key="wxml" value="164" />
<entry key="wxss" value="66" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="57" />
<entry key="HTML" value="158" />
<entry key="CSS" value="66" />
<entry key="HTML" value="164" />
<entry key="Image" value="3" />
<<<<<<< HEAD
<entry key="JSON" value="50" />
<entry key="JavaScript" value="189" />
=======
<entry key="JSON" value="48" />
<entry key="JavaScript" value="182" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="js" value="13033" />
<entry key="json" value="177" />
<entry key="txt" value="768" />
<entry key="wxml" value="3435" />
<entry key="js" value="13035" />
<entry key="json" value="182" />
<entry key="txt" value="785" />
<entry key="wxml" value="3436" />
<entry key="wxss" value="2014" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="2014" />
<entry key="HTML" value="3435" />
<entry key="JSON" value="177" />
<entry key="JavaScript" value="13033" />
<entry key="PLAIN_TEXT" value="768" />
<entry key="HTML" value="3436" />
<entry key="JSON" value="182" />
<entry key="JavaScript" value="13035" />
<entry key="PLAIN_TEXT" value="785" />
</counts>
</usages-collector>
<usages-collector id="statistics.vcs.git.usages">
... ... @@ -83,87 +99,123 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3300">
<caret line="150" column="21" selection-start-line="150" selection-start-column="19" selection-end-line="150" selection-end-column="21" />
=======
<entry file="file://$PROJECT_DIR$/pages/wish/release/release.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="704">
<caret line="32" column="22" selection-start-line="32" selection-start-column="22" selection-end-line="32" selection-end-column="22" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
=======
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="154" column="17" selection-start-line="154" selection-start-column="17" selection-end-line="154" selection-end-column="17" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js">
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.wxss">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="242">
<caret line="11" column="1" lean-forward="true" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
=======
<state relative-caret-position="6688">
<caret line="304" column="51" selection-start-line="304" selection-start-column="51" selection-end-line="304" selection-end-column="51" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.js">
<entry file="file://$PROJECT_DIR$/pages/wish/wish.wxss">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="829">
<caret line="78" column="19" selection-start-line="78" selection-start-column="19" selection-end-line="78" selection-end-column="19" />
=======
<state relative-caret-position="5544">
<caret line="252" column="22" selection-start-line="252" selection-start-column="22" selection-end-line="252" selection-end-column="22" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</state>
</provider>
</entry>
</file>
<<<<<<< HEAD
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/service/service.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="852">
<caret line="195" column="10" selection-start-line="195" selection-start-column="10" selection-end-line="195" selection-end-column="10" />
=======
<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="-616">
<caret line="20" column="30" lean-forward="true" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/wish/release/release.wxml">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1408">
<caret line="64" column="53" selection-start-line="64" selection-start-column="36" selection-end-line="64" selection-end-column="53" />
<state relative-caret-position="168">
<caret line="149" column="38" lean-forward="true" selection-start-line="149" selection-start-column="38" selection-end-line="149" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/report/report.wxml">
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.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="6534">
<caret line="386" column="6" lean-forward="true" selection-start-line="386" selection-start-column="6" selection-end-line="386" selection-end-column="6" />
<folding>
<element signature="e#9548#10642#0" />
<element signature="e#10673#13069#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/wish/wish.wxml">
<entry file="file://$PROJECT_DIR$/pages/service/release/release.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="19" column="100" selection-start-line="19" selection-start-column="89" selection-end-line="19" selection-end-column="100" />
<state relative-caret-position="220">
<caret line="10" column="69" selection-start-line="10" selection-start-column="69" selection-end-line="10" selection-end-column="69" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/my/mycollect/mycollect.js">
<entry file="file://$PROJECT_DIR$/pages/service/release/release.wxss">
<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="1408">
<caret line="64" column="12" lean-forward="true" selection-start-line="64" selection-start-column="12" selection-end-line="64" selection-end-column="12" />
</state>
</provider>
</entry>
... ... @@ -172,6 +224,8 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<<<<<<< HEAD
=======
<find>onloa</find>
<find>tabcurrent</find>
<find>bubble</find>
... ... @@ -194,6 +248,7 @@
<find>全部</find>
<find>心愿</find>
<find>getOpenId</find>
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
<find>wishAllInfo</find>
<find>wishIndex</find>
<find>submitAnonymousPicker</find>
... ... @@ -202,6 +257,31 @@
<find>previewImage</find>
<find>concat</find>
<find>repay</find>
<<<<<<< HEAD
<find>ignore</find>
<find>service</find>
<find>service(</find>
<find>content_item</find>
<find>tab_item</find>
<find>active</find>
<find>tab_box</find>
<find>按时间</find>
<find>chargeTab</find>
<find>sort</find>
<find>setdown</find>
<find>rent_mask</find>
<find>content_box</find>
<find>上传</find>
<find>icon-jia</find>
<find>triangle</find>
<find>tr</find>
<find>wxparse</find>
<find>收藏</find>
<find>overflow-y</find>
<find>display: -webkit-box;</find>
<find>overflow-y: scroll;</find>
=======
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</findStrings>
<dirStrings>
<dir>D:\info\informationPlatform\wxParse</dir>
... ... @@ -209,11 +289,11 @@
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="RESET_MODE" value="SOFT" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/pages/my/alertsDetail/alertsDetail.wxss" />
<option value="$PROJECT_DIR$/pages/service/renting/search/search.wxml" />
<option value="$PROJECT_DIR$/pages/service/renting/search/search.wxss" />
<option value="$PROJECT_DIR$/pages/my/abouttUs/abouttUs.wxml" />
... ... @@ -227,7 +307,6 @@
<option value="$PROJECT_DIR$/pages/consult/consultDetail/consultDetail.wxss" />
<option value="$PROJECT_DIR$/pages/wish/wish.wxss" />
<option value="$PROJECT_DIR$/pages/consult/consult.wxss" />
<option value="$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxss" />
<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" />
... ... @@ -251,7 +330,6 @@
<option value="$PROJECT_DIR$/pages/consult/userrecommend_detail/userrecommend_detail.js" />
<option value="$PROJECT_DIR$/pages/service/renting/renting.js" />
<option value="$PROJECT_DIR$/pages/service/renting/search/search.js" />
<option value="$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxml" />
<option value="$PROJECT_DIR$/pages/my/messageDetail/messageDetail.wxml" />
<option value="$PROJECT_DIR$/pages/my/my.js" />
<option value="$PROJECT_DIR$/pages/consult/consultDetail/consultDetail.js" />
... ... @@ -262,8 +340,11 @@
<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" />
<option value="$PROJECT_DIR$/pages/wish/release/release.js" />
<option value="$PROJECT_DIR$/pages/start/start.js" />
<option value="$PROJECT_DIR$/project.config.json" />
<option value="$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxml" />
<option value="$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxss" />
</list>
</option>
</component>
... ... @@ -274,16 +355,16 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" />
<option name="x" value="132" />
<option name="width" value="1936" />
<option name="height" value="1047" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -306,27 +387,28 @@
<item name="informationPlatform" type="b2602c69:ProjectViewProjectNode" />
<item name="informationPlatform" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="my" type="462c0819:PsiDirectoryNode" />
<item name="consult" type="462c0819:PsiDirectoryNode" />
<item name="consultDetail" 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="my" type="462c0819:PsiDirectoryNode" />
<item name="abouttUs" type="462c0819:PsiDirectoryNode" />
<item name="service" 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="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="service" type="462c0819:PsiDirectoryNode" />
<item name="release" type="462c0819:PsiDirectoryNode" />
<item name="renting" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="informationPlatform" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -334,6 +416,7 @@
<item name="pages" type="462c0819:PsiDirectoryNode" />
<item name="service" type="462c0819:PsiDirectoryNode" />
<item name="renting" type="462c0819:PsiDirectoryNode" />
<item name="search" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="informationPlatform" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -357,14 +440,13 @@
<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" />
<item name="release" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -447,6 +529,19 @@
<workItem from="1544404348257" duration="300000" />
<workItem from="1544407443651" duration="1473000" />
<workItem from="1544430114191" duration="1753000" />
<<<<<<< HEAD
<workItem from="1544591532923" duration="4333000" />
<workItem from="1545441946845" duration="7018000" />
<workItem from="1545735846561" duration="637000" />
<workItem from="1545875495203" duration="2099000" />
<workItem from="1545958870804" duration="868000" />
<workItem from="1545960262791" duration="1110000" />
<workItem from="1546045548819" duration="2841000" />
<workItem from="1546390512176" duration="686000" />
<workItem from="1546405925303" duration="1229000" />
<workItem from="1546507147848" duration="678000" />
<workItem from="1546667562199" duration="622000" />
=======
<workItem from="1544591532923" duration="2605000" />
<workItem from="1544594357457" duration="613000" />
</task>
... ... @@ -456,6 +551,7 @@
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1537858583070</updated>
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</task>
<task id="LOCAL-00002" summary="评论静态页">
<created>1537862079165</created>
... ... @@ -779,11 +875,40 @@
<option name="project" value="LOCAL" />
<updated>1544592264175</updated>
</task>
<<<<<<< HEAD
<task id="LOCAL-00048" summary="忽略.idea">
<created>1544594737836</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1544594737836</updated>
</task>
<task id="LOCAL-00049" summary="去掉忽略.idea">
<created>1544594892788</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1544594892788</updated>
</task>
<task id="LOCAL-00050" summary="暂存">
<created>1544595237851</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1544595237851</updated>
</task>
<option name="localTasksCounter" value="51" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="397153000" />
=======
<option name="localTasksCounter" value="48" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="378250000" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -808,7 +933,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.54555315" />
<window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49947312" weight="0.5449621" />
<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" />
... ... @@ -849,9 +974,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="修改appid" />
<MESSAGE value="添加发布服务成功提示，优化三级分类tab样式，文章详情页添加预览图片功能，优化点击发布按钮弹框消失" />
<MESSAGE value="合并冲突，修改匿名" />
<MESSAGE value="修改我的收藏匿名，优化发布服务picker(分类2-5不是三级联动)，优化我的主页空白页，优化二级分类进详情筛选按钮的显示" />
<MESSAGE value="其他页面也添加关闭发布弹框，优化字号" />
<MESSAGE value="搜索页面添加心愿匿名状态" />
... ... @@ -874,80 +996,12 @@
<MESSAGE value="添加举报页面，联系我们页面增加email显示，增加删除评论或回复功能，" />
<MESSAGE value="优化心愿进入主页，添加举报默认文字" />
<MESSAGE value="优化心愿发布，优化登录" />
<option name="LAST_COMMIT_MESSAGE" value="优化心愿发布，优化登录" />
<MESSAGE value="忽略.idea" />
<MESSAGE value="去掉忽略.idea" />
<MESSAGE value="暂存" />
<option name="LAST_COMMIT_MESSAGE" value="暂存" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pages/service/release/release.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/comment/comment.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" column="1" lean-forward="true" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/wish/release/release.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/images/img2.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/images/start-logo.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/release/release.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4400">
<caret line="200" column="16" lean-forward="true" selection-start-line="200" selection-start-column="16" selection-end-line="200" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/service.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5478">
<caret line="249" column="1" lean-forward="true" selection-start-line="207" selection-end-line="249" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/cha.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/consult/consult.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="25" column="33" selection-start-line="25" selection-start-column="33" selection-end-line="25" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/service.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="71" column="33" selection-start-line="71" selection-start-column="33" selection-end-line="71" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" column="54" lean-forward="true" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="696">
<caret line="55" column="16" lean-forward="true" selection-start-line="55" selection-start-column="16" selection-end-line="55" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/service.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="1" selection-start-line="1" selection-end-line="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/report/report.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
... ... @@ -969,13 +1023,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/service.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="521">
<caret line="270" column="36" lean-forward="true" selection-start-line="270" selection-start-column="36" selection-end-line="270" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myindex/myindex.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
... ... @@ -983,13 +1030,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/consult/consultDetail/consultDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="55" column="22" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/contactUs/contactUs.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
... ... @@ -997,13 +1037,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/renting/search/search.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="158" selection-start-line="158" selection-end-line="165" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/my/myindex/myindex.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="462">
... ... @@ -1024,13 +1057,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/consult/consultDetail/consultDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="279" column="22" selection-start-line="279" selection-start-column="15" selection-end-line="279" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/consult/userrecommend_detail/userrecommend_detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
... ... @@ -1073,6 +1099,8 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
=======
<entry file="file://$PROJECT_DIR$/pages/service/release/release.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2860">
... ... @@ -1080,6 +1108,7 @@
</state>
</provider>
</entry>
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
<entry file="file://$PROJECT_DIR$/pages/my/abouttUs/abouttUs.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
... ... @@ -1094,13 +1123,6 @@
</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="1496">
<caret line="68" column="7" 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/report/report.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
... ... @@ -1125,13 +1147,22 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxml">
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="24" column="54" selection-start-line="24" selection-start-column="45" selection-end-line="24" selection-end-column="54" />
<state relative-caret-position="6688">
<caret line="304" column="51" selection-start-line="304" selection-start-column="51" selection-end-line="304" selection-end-column="51" />
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.wxml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/wish/release/release.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="704">
<caret line="32" column="22" selection-start-line="32" selection-start-column="22" selection-end-line="32" selection-end-column="22" />
=======
<entry file="file://$PROJECT_DIR$/pages/wish/release/release.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="704">
... ... @@ -1150,12 +1181,20 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5544">
<caret line="252" column="22" selection-start-line="252" selection-start-column="22" selection-end-line="252" selection-end-column="22" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.wxml">
<entry file="file://$PROJECT_DIR$/app.wxss">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/project.config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="34" lean-forward="true" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/wish/release/release.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1408">
... ... @@ -1184,17 +1223,167 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1210">
<caret line="55" column="16" lean-forward="true" selection-start-line="55" selection-start-column="16" selection-end-line="55" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/service.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1606">
<caret line="73" column="52" selection-start-line="73" selection-start-column="52" selection-end-line="73" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/service.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="990">
<caret line="45" column="14" selection-start-line="45" selection-start-column="14" selection-end-line="45" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/templates.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="2" column="62" selection-start-line="2" selection-start-column="55" selection-end-line="2" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/consult/consultDetail/consultDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="92" selection-start-line="11" selection-start-column="85" selection-end-line="11" selection-end-column="92" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/consult/consultDetail/consultDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="17" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/consult/consultDetail/consultDetail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308">
<caret line="14" column="8" selection-start-line="14" selection-start-column="8" selection-end-line="14" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/renting/search/search.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="19" column="22" selection-start-line="19" selection-start-column="22" selection-end-line="19" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/renting/search/search.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="440">
<caret line="20" column="50" selection-start-line="20" selection-start-column="50" selection-end-line="20" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/release/release.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4972">
<caret line="316" column="11" selection-start-line="316" selection-start-column="11" selection-end-line="316" selection-end-column="11" />
<folding>
<element signature="e#8124#11289#0" />
<element signature="e#11320#11506#0" />
<element signature="e#11550#11814#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3300">
<caret line="150" column="21" selection-start-line="150" selection-start-column="19" selection-end-line="150" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
<caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="11" column="1" lean-forward="true" selection-start-line="11" selection-start-column="1" selection-end-line="11" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/renting/renting.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6534">
<caret line="386" column="6" lean-forward="true" selection-start-line="386" selection-start-column="6" selection-end-line="386" selection-end-column="6" />
<folding>
<element signature="e#9548#10642#0" />
<element signature="e#10673#13069#0" />
</folding>
</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="220">
<caret line="10" column="69" selection-start-line="10" selection-start-column="69" selection-end-line="10" selection-end-column="69" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/service/release/release.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1408">
<caret line="64" column="12" lean-forward="true" selection-start-line="64" selection-start-column="12" selection-end-line="64" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/wish/wish.wxss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="829">
<caret line="78" column="19" selection-start-line="78" selection-start-column="19" selection-end-line="78" selection-end-column="19" />
=======
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="154" column="17" selection-start-line="154" selection-start-column="17" selection-end-line="154" selection-end-column="17" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pages/start/start.js">
<entry file="file://$PROJECT_DIR$/pages/service/service.js">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="852">
<caret line="195" column="10" selection-start-line="195" selection-start-column="10" selection-end-line="195" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="149" column="38" lean-forward="true" selection-start-line="149" selection-start-column="38" selection-end-line="149" selection-end-column="38" />
=======
<state relative-caret-position="-616">
<caret line="20" column="30" lean-forward="true" selection-start-line="20" selection-start-column="30" selection-end-line="20" selection-end-column="30" />
>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
</state>
</provider>
</entry>
... ...
... ... @@ -49,13 +49,13 @@ Page({
this.setData({
tabcurrent: tindex
})
wx.showToast({
title: '该功能正在开发中',
icon: 'none'
})
// wx.redirectTo({
// url: '/pages/service/service',
// })
// wx.showToast({
// title: '该功能正在开发中',
// icon: 'none'
// })
wx.redirectTo({
url: '/pages/service/service',
})
}
},
//资讯-导航
... ... @@ -89,13 +89,13 @@ Page({
},
//发布服务跳转
releaseService() {
wx.showToast({
title: '该功能正在开发中',
icon: 'none'
})
// wx.navigateTo({
// url: '/pages/service/release/release',
// });
// wx.showToast({
// title: '该功能正在开发中',
// icon: 'none'
// })
wx.navigateTo({
url: '/pages/service/release/release',
});
this.setData({
releasepopup: false
})
... ...
... ... @@ -85,14 +85,14 @@ Page({
this.setData({
tabcurrent: tindex
})
wx.showToast({
title: '该功能正在开发中',
icon: 'none'
})
// wx.showToast({
// title: '该功能正在开发中',
// icon: 'none'
// })
this.personInfo()
// wx.redirectTo({
// url: '/pages/service/service',
// })
wx.redirectTo({
url: '/pages/service/service',
})
}
},
... ... @@ -135,13 +135,13 @@ Page({
//发布服务跳转
releaseService() {
wx.showToast({
title: '该功能正在开发中',
icon: 'none'
});
// wx.navigateTo({
// url: '/pages/service/release/release',
// wx.showToast({
// title: '该功能正在开发中',
// icon: 'none'
// });
wx.navigateTo({
url: '/pages/service/release/release',
});
this.setData({
releasepopup: false
})
... ...
... ... @@ -36,14 +36,14 @@
<view wx:if="{{choose_hot}}" class='list_content' wx:for='{{portal_hot}}' wx:key='index' bindtap='goDetail'
data-index="{{index}}">
<view class='list_img'>
<image src='{{item.thumbnail}}'></image>
<image src='{{item.thumbnail}}' mode="aspectFit"></image>
</view>
<view>{{item.name}}</view>
</view>
<view wx:if="{{!choose_hot}}" class='list_content' wx:for='{{portal_two}}' wx:key='index' bindtap='gorenting'
data-index="{{index}}">
<view class='list_img'>
<image src='{{item.thumbnail}}'></image>
<image src='{{item.thumbnail}}' mode="aspectFit"></image>
</view>
<view>{{item.name}}</view>
</view>
... ...
... ... @@ -177,7 +177,7 @@ swiper {
font-size: 26rpx;
color: #000;
margin-bottom: 60rpx;
margin-right: 30rpx;
margin-right: 70rpx;
text-align: center;
}
... ... @@ -186,8 +186,8 @@ swiper {
}
.list_img {
width: 140rpx;
height: 113rpx;
width: 100rpx;
height: 90rpx;
}
.list_img image {
... ...
... ... @@ -459,14 +459,14 @@ Page({
this.setData({
tabcurrent: tindex
})
wx.showToast({
title: '该功能正在开发中',
icon: 'none'
})
// wx.showToast({
// title: '该功能正在开发中',
// icon: 'none'
// })
this.getBubble();
// wx.redirectTo({
// url: '/pages/service/service',
// })
wx.redirectTo({
url: '/pages/service/service',
})
}
},
... ... @@ -509,13 +509,13 @@ Page({
//发布服务跳转
releaseService() {
wx.showToast({
title: '该功能正在开发中',
icon: 'none'
})
// wx.navigateTo({
// url: '/pages/service/release/release',
// });
// wx.showToast({
// title: '该功能正在开发中',
// icon: 'none'
// })
wx.navigateTo({
url: '/pages/service/release/release',
});
this.setData({
releasepopup: false
})
... ...