Merge branch 'master' of http://git.bronet.cn/liuxiaoyan/informationPlatform into wumengyu

# Conflicts:
#	.idea/workspace.xml

 <?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/" />
@@ -33,8 +37,13 @@
       </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="164" />
           <entry key="wxss" value="66" />
@@ -45,8 +54,13 @@
           <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">
@@ -73,10 +87,19 @@
         </counts>
       </usages-collector>
     </session>
+    <session id="1061351587">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.open.time.1" value="1" />
+          <entry key="project.opened" value="1" />
+        </counts>
+      </usages-collector>
+    </session>
   </component>
   <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>
@@ -86,15 +109,28 @@
           <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>
@@ -102,8 +138,13 @@
       <file pinned="false" current-in-tab="false">
         <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>
@@ -111,17 +152,30 @@
       <file pinned="false" current-in-tab="false">
         <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>
@@ -170,6 +224,31 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
+<<<<<<< HEAD
+=======
+      <find>onloa</find>
+      <find>tabcurrent</find>
+      <find>bubble</find>
+      <find>onload</find>
+      <find>排序</find>
+      <find>rentingDetail</find>
+      <find>举报</find>
+      <find>report</find>
+      <find>user_id</find>
+      <find>id</find>
+      <find>messageD</find>
+      <find>.data.id</find>
+      <find>user</find>
+      <find>主页</find>
+      <find>console</find>
+      <find>userId</find>
+      <find>wxP</find>
+      <find>nowDate</find>
+      <find>forEach</find>
+      <find>全部</find>
+      <find>心愿</find>
+      <find>getOpenId</find>
+>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
       <find>wishAllInfo</find>
       <find>wishIndex</find>
       <find>submitAnonymousPicker</find>
@@ -178,6 +257,7 @@
       <find>previewImage</find>
       <find>concat</find>
       <find>repay</find>
+<<<<<<< HEAD
       <find>ignore</find>
       <find>service</find>
       <find>service(</find>
@@ -200,6 +280,8 @@
       <find>overflow-y</find>
       <find>display: -webkit-box;</find>
       <find>overflow-y: scroll;</find>
+=======
+>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
     </findStrings>
     <dirStrings>
       <dir>D:\info\informationPlatform\wxParse</dir>
@@ -447,6 +529,7 @@
       <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" />
@@ -458,6 +541,17 @@
       <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>
+    <task id="LOCAL-00001" summary="启动页">
+      <created>1537858583070</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1537858583070</updated>
+>>>>>>> 363e32ff7de457b6ff0b4c539a4cb26b4a37fee9
     </task>
     <task id="LOCAL-00002" summary="评论静态页">
       <created>1537862079165</created>
@@ -781,6 +875,7 @@
       <option name="project" value="LOCAL" />
       <updated>1544592264175</updated>
     </task>
+<<<<<<< HEAD
     <task id="LOCAL-00048" summary="忽略.idea">
       <created>1544594737836</created>
       <option name="number" value="00048" />
@@ -807,6 +902,13 @@
   </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">
@@ -819,7 +921,6 @@
   </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" />
@@ -998,6 +1099,16 @@
         </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">
+          <caret line="130" column="46" selection-start-line="130" selection-start-column="46" selection-end-line="130" selection-end-column="46" />
+        </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">
@@ -1043,6 +1154,7 @@
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/pages/service/renting/renting.wxml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1050,6 +1162,26 @@
       <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">
+          <caret line="32" column="22" selection-start-line="32" selection-start-column="22" selection-end-line="32" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/service/rentingDetail/rentingDetail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <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>
+    <entry file="file://$PROJECT_DIR$/pages/service/renting/renting.js">
+      <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>
@@ -1091,6 +1223,7 @@
         </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">
@@ -1226,11 +1359,18 @@
       <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/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>
@@ -1240,6 +1380,10 @@
       <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>

@@ -6,10 +6,10 @@
   <view class='content_item'>
     <view class='content_title'>{{listdata.title}}</view>
     <!-- <view>{{listdata.content}}</view> -->
-    <view class='content'>
+    <view class='content_detail'>
       <import src="../../../wxParse/wxParse.wxml" />
       <template is='wxParse' data='{{wxParseData:content.nodes}}' />
-     <!-- <rich-text nodes="{{html}}" bindtap="tap"></rich-text> -->
+      <!-- <rich-text nodes="{{html}}" bindtap="tap"></rich-text> -->
     </view>
   </view>
-</view>
+</view>
\ No newline at end of file

@@ -41,31 +41,30 @@ page {
   text-align: center;
 }
 
-.content_item .wxParse-strong image {
-  /* width: 100%;
-  height: 100%;
-  display: block; */
+.content_detail {
+  width: 100%;
+  font-size: 28rpx;
+  color: #666;
+  line-height: 60rpx;
 }
 
-.content_item view {
-  /* display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center; */
+.content_detail view {
+  display: inline-block;
 }
 
-.content {
-  width: 100%;
-  height: 100%;
+.wxParse-p {
+  text-indent: 0 !important;
+  word-spacing: normal;
+  word-wrap: normal;
+  display: block !important;
 }
 
-.wxParse-p .wxParse-img {
+.wxParse-section {
   width: 100% !important;
-  height: 100%;
+  height: 100% !important;
 }
 
-. WxEmojiView  .wxParse-inline ,wxParse-span wxParse-inline {
-  /* white-space: nowrap !important; */
-  word-wrap: normal!important;
-  /* word-spacing: normal!important; */
+.wxParse-img {
+  width: 100% !important;
+  height: 100%;
 }