合并

.gitignore

@@ -1,3 +1,4 @@
 /.idea/
 /.idea
 
+/.idea

.idea/workspace.xml

@@ -1,659 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="2ecf3c01-ae46-4667-8997-db10a46d1157" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/component/follow/follow.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/component/follow/follow.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/component/my/my.js" beforeDir="false" afterPath="$PROJECT_DIR$/component/my/my.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/component/my/my.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/component/my/my.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/component/my/my.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/component/my/my.wxss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/main/class/class.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/main/class/class.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/user/myEdit/myEdit.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/user/myEdit/myEdit.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/utils/APIClient.js" beforeDir="false" afterPath="$PROJECT_DIR$/utils/APIClient.js" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/.tmp/" />
-    <ignored path="$PROJECT_DIR$/temp/" />
-    <ignored path="$PROJECT_DIR$/tmp/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="-1384404472">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="8" />
-          <entry key="project.open.time.15" value="1" />
-          <entry key="project.open.time.20" value="1" />
-          <entry key="project.open.time.26" value="1" />
-          <entry key="project.open.time.30" value="1" />
-          <entry key="project.open.time.32" value="1" />
-          <entry key="project.open.time.4" value="1" />
-          <entry key="project.open.time.5" value="2" />
-          <entry key="project.opened" value="8" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="jpg" value="1" />
-          <entry key="js" value="41" />
-          <entry key="json" value="5" />
-          <entry key="wxml" value="32" />
-          <entry key="wxss" value="20" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="Image" value="1" />
-          <entry key="JSON" value="5" />
-          <entry key="JavaScript" value="41" />
-          <entry key="PLAIN_TEXT" value="52" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.extensions.edit">
-        <counts>
-          <entry key="js" value="1335" />
-          <entry key="json" value="5" />
-          <entry key="wxml" value="166" />
-          <entry key="wxss" value="87" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="JSON" value="5" />
-          <entry key="JavaScript" value="1335" />
-          <entry key="PLAIN_TEXT" value="253" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.js.language.service.starts" />
-      <usages-collector id="statistics.vcs.git.usages" />
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/mycollection/mycollection.wxml">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/component/follow/follow.wxml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="114">
-              <caret line="5" column="32" lean-forward="true" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/component/follow/follow.wxss">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="48" column="25" lean-forward="true" selection-start-line="48" selection-start-column="4" selection-end-line="48" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/component/follow/follow.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="3" column="17" lean-forward="true" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/component/my/my.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1260">
-              <caret line="42" column="24" lean-forward="true" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/myread/myread.wxml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/myread/myread.wxss">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/groupPage/discount-group/discount-group.wxss">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="3" column="3" lean-forward="true" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>followInit</find>
-      <find>init</find>
-      <find>onShow</find>
-      <find>getOpenidSessionKey</find>
-      <find>settingUserInfo</find>
-      <find>获取首页人气推荐</find>
-      <find>wx/user</find>
-      <find>opt</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/component/my/my.wxss" />
-        <option value="$PROJECT_DIR$/pages/index/index.json" />
-        <option value="$PROJECT_DIR$/pages/user/myconcern/myconcern.wxml" />
-        <option value="$PROJECT_DIR$/pages/user/myconcern/myconcern.js" />
-        <option value="$PROJECT_DIR$/pages/user/myconcern/myconcern.wxss" />
-        <option value="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss" />
-        <option value="$PROJECT_DIR$/app.json" />
-        <option value="$PROJECT_DIR$/utils/httpUtil.js" />
-        <option value="$PROJECT_DIR$/component/my/my.wxml" />
-        <option value="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml" />
-        <option value="$PROJECT_DIR$/utils/APIClient.js" />
-        <option value="$PROJECT_DIR$/pages/main/class/class.js" />
-        <option value="$PROJECT_DIR$/pages/user/myEdit/myEdit.js" />
-        <option value="$PROJECT_DIR$/pages/user/myread/myread.wxml" />
-        <option value="$PROJECT_DIR$/component/follow/follow.wxml" />
-        <option value="$PROJECT_DIR$/pages/index/index.js" />
-        <option value="$PROJECT_DIR$/component/my/my.js" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="260" />
-    <option name="y" value="20" />
-    <option name="width" value="1400" />
-    <option name="height" value="1000" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State />
-          <State>
-            <id>CSS</id>
-          </State>
-          <State>
-            <id>Code style issuesCSS</id>
-          </State>
-          <State>
-            <id>Control flow issuesJavaScript</id>
-          </State>
-          <State>
-            <id>DOM issuesJavaScript</id>
-          </State>
-          <State>
-            <id>General</id>
-          </State>
-          <State>
-            <id>GeneralJavaScript</id>
-          </State>
-          <State>
-            <id>Invalid elementsCSS</id>
-          </State>
-          <State>
-            <id>JavaScript</id>
-          </State>
-          <State>
-            <id>Probable bugsCSS</id>
-          </State>
-          <State>
-            <id>Pug/Jade</id>
-          </State>
-          <State>
-            <id>YAML</id>
-          </State>
-        </expanded-state>
-      </profile-state>
-    </entry>
-  </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>
-            <path>
-              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="reader" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="reader" type="462c0819:PsiDirectoryNode" />
-              <item name="component" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="reader" type="462c0819:PsiDirectoryNode" />
-              <item name="component" type="462c0819:PsiDirectoryNode" />
-              <item name="follow" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="reader" type="462c0819:PsiDirectoryNode" />
-              <item name="component" type="462c0819:PsiDirectoryNode" />
-              <item name="my" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="reader" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="reader" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="user" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <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="preferences.sourceCode" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="2ecf3c01-ae46-4667-8997-db10a46d1157" name="Default Changelist" comment="" />
-      <created>1541144282324</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1541144282324</updated>
-      <workItem from="1541144291161" duration="762000" />
-      <workItem from="1541157092216" duration="2211000" />
-      <workItem from="1541402122086" duration="6360000" />
-      <workItem from="1541554466111" duration="5820000" />
-      <workItem from="1541581837551" duration="14978000" />
-      <workItem from="1541640549483" duration="10184000" />
-      <workItem from="1541676119862" duration="6983000" />
-      <workItem from="1541727401339" duration="7751000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="55049000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13119073" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/utils/util.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="16" selection-start-column="6" selection-end-column="16" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/index.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="1" lean-forward="true" selection-start-column="1" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/utils/const.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="1" column="18" lean-forward="true" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/reading/reading.wxml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/static/image/timg.jpg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/class/class.json">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/component/hot/hot.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-290" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/class/class.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="510">
-          <caret line="17" column="15" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="17" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/component/hot/hot.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/reading/reading.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="15" lean-forward="true" selection-start-column="15" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/class/class.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1644">
-          <caret line="91" column="18" selection-start-line="91" selection-start-column="18" selection-end-line="91" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="21" selection-start-column="21" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2310">
-          <caret line="77" column="98" selection-start-line="77" selection-start-column="98" selection-end-line="77" selection-end-column="98" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="510">
-          <caret line="17" column="13" lean-forward="true" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="810">
-          <caret line="27" column="20" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/utils/WXHttpRequest.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/utils/httpUtil.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="870">
-          <caret line="29" column="6" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/utils/APIClient.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="451">
-          <caret line="268" column="38" selection-start-line="268" selection-start-column="38" selection-end-line="268" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-90">
-          <caret column="7" selection-start-column="7" selection-end-column="7" />
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/groupPage/collage-details/collage-details.wxml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/groupPage/grade-details/grade-details.wxml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/groupPage/group-details/group-details.wxml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/groupPage/my-group/my-group.wxml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1980">
-          <caret line="66" column="29" selection-start-line="66" selection-start-column="29" selection-end-line="66" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/books/books.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="5" column="7" selection-end-line="5" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/component/hot/hot.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/books/books.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="9" column="60" selection-start-line="9" selection-start-column="60" selection-end-line="9" selection-end-column="60" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/mycollection/mycollection.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myread/myread.js">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/books/books.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="6" column="136" selection-start-line="6" selection-start-column="136" selection-end-line="6" selection-end-column="136" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/component/my/my.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="570">
-          <caret line="19" column="39" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/component/popup/popup.wxml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/social/works/works.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#54#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/social/works/works.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/social/works/works.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="780">
-          <caret line="26" column="33" lean-forward="true" selection-start-line="26" selection-start-column="33" selection-end-line="26" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#20#81#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/component/my/my.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1200">
-          <caret line="40" column="14" lean-forward="true" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="7" column="14" lean-forward="true" selection-start-line="7" selection-start-column="14" selection-end-line="7" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/component/my/my.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1260">
-          <caret line="42" column="24" lean-forward="true" selection-start-line="42" selection-start-column="24" selection-end-line="42" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/component/follow/follow.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="3" column="17" lean-forward="true" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/mycollection/mycollection.wxml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myread/myread.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myread/myread.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/groupPage/discount-group/discount-group.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="3" column="3" lean-forward="true" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/groupPage/discount-group/discount-group.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1020">
-          <caret line="34" column="11" lean-forward="true" selection-start-line="34" selection-start-column="11" selection-end-line="34" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/component/follow/follow.wxss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="48" column="25" lean-forward="true" selection-start-line="48" selection-start-column="4" selection-end-line="48" selection-end-column="25" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/pages/groupPage/discount-group/discount-group.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="354">
-          <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/component/follow/follow.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="5" column="32" lean-forward="true" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>

component/my/my.js

@@ -1,4 +1,3 @@
-// import APIClient from '../../utils/httpUtil.js'
 export const myInit =  (that) => {
   that.setData({
     myData: {
@@ -7,6 +6,7 @@ export const myInit =  (that) => {
         course: '我的课程',
         read: '我的朗读',
         keep: '我的收藏',
+        collage: '我的拼团',
         wallet: '我的钱包',
         address:['北京海淀','中关村','三小'],
         schoolCity: '青岛市',
@@ -17,7 +17,7 @@ export const myInit =  (that) => {
         flowerNum: 56245,
         user: {}
     }
-  })
+  });
   that.toMyEdit = (e) => {
     let title = e.currentTarget.dataset.title;
     wx.navigateTo({
@@ -54,6 +54,17 @@ export const myInit =  (that) => {
       url: `../user/mycollection/mycollection?title=${title}`
     });
   },
+  that.toMyCollage = e => {
+    let title = e.currentTarget.dataset.title;
+    wx.navigateTo({
+      url: `../../pages/groupPage/my-group/my-group?title=${title}`
+    });
+      debugger
+      APIClient.myWallet().success(res => {
+          debugger
+          console.log(res.data.data.data);
+      });
+  },
   that.userInfo = function () {
       const userInfo = wx.getStorageSync('user');
       console.log(userInfo.data.data.data);

component/my/my.wxml

@@ -83,7 +83,7 @@
           </view>
         </view>
       </view>
-      <view class='group-module'>
+      <view class='group-module' bindtap='toMyCollage' data-title='{{ myData.collage }}'>
         <view class='wallet-center'>
           <view class='wallet-left'>
             <view class='icon-box'>

pages/groupPage/my-group/my-group.js

@@ -31,7 +31,16 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: function (option) {
+    console.log(option.title);
+    if (option.title) {
+      wx.setNavigationBarTitle({
+        title: option.title//页面标题为路由参数
+      });
+      this.setData({
+        title: option.title
+      });
+    }
     httpRequestApi.getMygroup().success((res) => {
       if(!res.data.data.list){
         return

pages/groupPage/my-group/my-group.wxml

@@ -20,4 +20,4 @@
     headTextTwo="{{headTextTwo}}"
     content="{{content}}"
     bindGroup="group"
-></popup>
+></popup>

pages/user/myEdit/myEdit.js

@@ -50,9 +50,6 @@ Page({
     let uid = 1, wechatName = nickname, mobile = '13994969642', gender = 3, schoolProvince = 11, schoolCity = '运城市', schoolName = '康杰中学', profession = radioGroup2, birthday = picker;
     httpRequestApi.settingUserInfo(uid, wechatName, mobile, gender, schoolProvince, schoolCity, schoolName, profession, birthday).success(res => {
       console.log(res.data.data.wechatName);//修改资料成功后 调用 getUserInfo
-      // this.setData({
-      //     nickname: res.data.data.wechatName
-      // });
         wx.redirectTo({
             url: '/pages/index/index?index=3'
         });

pages/user/myWallet/myWallet.js

@@ -1,4 +1,4 @@
-// pages/user/myWallet/myWallet.js
+import APIClient from '../../../utils/APIClient.js'
 Page({
   /**
    * 页面的初始数据
@@ -29,6 +29,15 @@ Page({
         title: options.title
       });
     }
+    // 
+    APIClient.myWallet().success(res => {
+      console.log(res.data.data);
+      this.setData({
+        totalMoney:res.data.data.income
+      });
+    }).fail(err => {
+      console.log(err);
+    });
   },
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/user/mycourse/mycourse.js

@@ -1,4 +1,4 @@
-import httpRequestApi from '../../../utils/APIClient';
+import APIClient from '../../../utils/APIClient.js'
 Page({
 
   /**
@@ -7,30 +7,30 @@ Page({
   data: {
     title: '',
     bookList: [
-      {
-        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-        title: '一年级语文下学期'
-      },
-      {
-        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-        title: '二年级语文下学期'
-      },
-      {
-        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-        title: '三年级语文下学期'
-      },
-      {
-        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-        title: '一年级语文下学期'
-      },
-      {
-        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-        title: '二年级语文下学期'
-      },
-      {
-        iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
-        title: '三年级语文下学期'
-      }
+      // {
+      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+      //   title: '一年级语文下学期'
+      // },
+      // {
+      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+      //   title: '二年级语文下学期'
+      // },
+      // {
+      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+      //   title: '三年级语文下学期'
+      // },
+      // {
+      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+      //   title: '一年级语文下学期'
+      // },
+      // {
+      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+      //   title: '二年级语文下学期'
+      // },
+      // {
+      //   iconImg: 'http://q.i03.wimg.taobao.com/bao/uploaded/i3/T1oTl6FzVaXXXXXXXX_!!2-item_pic.png_300x300.jpg',
+      //   title: '三年级语文下学期'
+      // }
     ]
   },
 
@@ -47,16 +47,16 @@ Page({
         title: option.title
       });
     }
-
-    // httpRequestApi.getAllBooks(1, 10).success((res) => {
-    //   this.setData({
-    //     bookList: res.data.data.list
-    //   },()=>{
-    //     console.log(this.data.bookList);
-    //   });
-    // }).fail((error) => {
-    //   console.log('错误', error)
-    // });
+    APIClient.myCourse().success(res => {
+      console.log(res.data.data.list);
+      this.setData({
+        bookList: res.data.data.list
+      },() => {
+        console.log(this.data.bookList);
+      });
+    }).fail(err => {
+      console.log(err);
+    });
   },
 
   /**

pages/user/mycourse/mycourse.wxml

@@ -4,7 +4,7 @@
       <view class='book-box'>
         <image class="item-img" src="{{ item.iconImg }}"></image>
       </view>
-      <view class='item-title'>{{ item.title }}</view>
+      <view class='item-title'>{{ item.groupTitle }}</view>
     </view>    
   </block>             
 </view>

pages/user/myread/myread.js

@@ -1,4 +1,4 @@
-// pages/user/myread/myread.js
+import APIClient from '../../../utils/APIClient.js'
 Page({
 
   /**
@@ -6,78 +6,78 @@ Page({
    */
   data: {
     wareCards: [
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      },
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      },
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      },
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      },
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      },
-      {
-        title: "古诗词诵读（一）江南",
-        grade: "一年级(上学期)",
-        avatarUrl: '../../../static/image/timg.jpg',
-        previewUrl: "../../../static/image/timg.jpg",
-        plays: "17230",
-        likes: "71230",
-        classId: "1",
-        avatar: '../../static/image/timg.jpg',
-        nickName: '喔喔',
-        time: '10-18 09:56'
-      }
+      // {
+      //   title: "古诗词诵读（一）江南",
+      //   grade: "一年级(上学期)",
+      //   avatarUrl: '../../../static/image/timg.jpg',
+      //   previewUrl: "../../../static/image/timg.jpg",
+      //   plays: "17230",
+      //   likes: "71230",
+      //   classId: "1",
+      //   avatar: '../../static/image/timg.jpg',
+      //   nickName: '喔喔',
+      //   time: '10-18 09:56'
+      // },
+      // {
+      //   title: "古诗词诵读（一）江南",
+      //   grade: "一年级(上学期)",
+      //   avatarUrl: '../../../static/image/timg.jpg',
+      //   previewUrl: "../../../static/image/timg.jpg",
+      //   plays: "17230",
+      //   likes: "71230",
+      //   classId: "1",
+      //   avatar: '../../static/image/timg.jpg',
+      //   nickName: '喔喔',
+      //   time: '10-18 09:56'
+      // },
+      // {
+      //   title: "古诗词诵读（一）江南",
+      //   grade: "一年级(上学期)",
+      //   avatarUrl: '../../../static/image/timg.jpg',
+      //   previewUrl: "../../../static/image/timg.jpg",
+      //   plays: "17230",
+      //   likes: "71230",
+      //   classId: "1",
+      //   avatar: '../../static/image/timg.jpg',
+      //   nickName: '喔喔',
+      //   time: '10-18 09:56'
+      // },
+      // {
+      //   title: "古诗词诵读（一）江南",
+      //   grade: "一年级(上学期)",
+      //   avatarUrl: '../../../static/image/timg.jpg',
+      //   previewUrl: "../../../static/image/timg.jpg",
+      //   plays: "17230",
+      //   likes: "71230",
+      //   classId: "1",
+      //   avatar: '../../static/image/timg.jpg',
+      //   nickName: '喔喔',
+      //   time: '10-18 09:56'
+      // },
+      // {
+      //   title: "古诗词诵读（一）江南",
+      //   grade: "一年级(上学期)",
+      //   avatarUrl: '../../../static/image/timg.jpg',
+      //   previewUrl: "../../../static/image/timg.jpg",
+      //   plays: "17230",
+      //   likes: "71230",
+      //   classId: "1",
+      //   avatar: '../../static/image/timg.jpg',
+      //   nickName: '喔喔',
+      //   time: '10-18 09:56'
+      // },
+      // {
+      //   title: "古诗词诵读（一）江南",
+      //   grade: "一年级(上学期)",
+      //   avatarUrl: '../../../static/image/timg.jpg',
+      //   previewUrl: "../../../static/image/timg.jpg",
+      //   plays: "17230",
+      //   likes: "71230",
+      //   classId: "1",
+      //   avatar: '../../static/image/timg.jpg',
+      //   nickName: '喔喔',
+      //   time: '10-18 09:56'
+      // }
     ]
   },
 
@@ -94,7 +94,14 @@ Page({
         title: option.title
       });
     }
-
+    APIClient.myRead().success(res => {
+      console.log(res);
+      this.setData({
+        // wareCards: res.data.data.data.list
+      });
+    }).fail(err => {
+      console.log(err);
+    });
   },
 
   /**

pages/user/walletDetails/walletDetails.js

@@ -1,4 +1,6 @@
 // pages/user/walletDetails/walletDetails.js
+import Date from '../../../utils/util.js' 
+import APIClient from '../../../utils/APIClient.js'
 Page({
 
   /**
@@ -8,43 +10,42 @@ Page({
   data: {
     title: '',
     walletDatails:[
-      {
-        value: '-20.00',
-        time: '2018年9月30日 12:00',
-        nickName: '喔喔',
-      },
-      {
-        value: '-20.00',
-        time: '2018年9月30日 12:00',
-        nickName: '喔喔',
-      },
-      {
-        value: '20.00',
-        time: '2018年9月30日 12:00',
-        nickName: '追忆似水年华',
-      },
-      {
-        value: '-20.00',
-        time: '2018年9月30日 12:00',
-        nickName: '喔喔',
-      },
-      {
-        value: '1822.00',
-        time: '2018年9月30日 12:00',
-        nickName: 'kongzhishuxing',
-      },
-      {
-        value: '20.00',
-        time: '2018年9月30日 12:00',
-        nickName: '喔喔',
-      },
-      {
-        value: '-20.00',
-        time: '2018年9月30日 12:00',
-        nickName: 'hahahahahahahaha',
-      },
-      
-    ],
+      // {
+      //   value: '-20.00',
+      //   time: '2018年9月30日 12:00',
+      //   nickName: '喔喔',
+      // },
+      // {
+      //   value: '-20.00',
+      //   time: '2018年9月30日 12:00',
+      //   nickName: '喔喔',
+      // },
+      // {
+      //   value: '20.00',
+      //   time: '2018年9月30日 12:00',
+      //   nickName: '追忆似水年华',
+      // },
+      // {
+      //   value: '-20.00',
+      //   time: '2018年9月30日 12:00',
+      //   nickName: '喔喔',
+      // },
+      // {
+      //   value: '1822.00',
+      //   time: '2018年9月30日 12:00',
+      //   nickName: 'kongzhishuxing',
+      // },
+      // {
+      //   value: '20.00',
+      //   time: '2018年9月30日 12:00',
+      //   nickName: '喔喔',
+      // },
+      // {
+      //   value: '-20.00',
+      //   time: '2018年9月30日 12:00',
+      //   nickName: 'hahahahahahahaha',
+      // },
+    ]
   },
 
   /**
@@ -59,6 +60,14 @@ Page({
         title: options.title
       });
     }
+    APIClient.myWalletDetails().success(res => {
+      console.log(res.data.data.list);
+      this.setData({
+        walletDatails: res.data.data.list
+      });
+    }).fail(err => {
+      console.log(err);
+    });
   },
 
   /**

pages/user/walletDetails/walletDetails.wxml

@@ -1,34 +1,46 @@
+<wxs module="m1">
+    function formatDate(time, flag) {
+	const t = new Date(time); 
+	const tf = function(i){return (i < 10 ? '0' : '') + i};
+	const year = t.getFullYear();
+	const month = tf(t.getMonth() + 1);
+	const day = tf(t.getDate());
+	const hour = tf(t.getHours());
+	const minute = tf(t.getMinutes());
+	//console.log( month + '月' + day + '日' + hour + ':' + minute);
+	if(flag == 1) {
+		return  month + '月' + day + '日' + ' ' + hour + ':' + minute;
+	}else if(flag == 2) {
+		return year + '-' + month + '-' + day
+	}else if(flag == 3){
+		return month + '-' + day + ' ' + hour + ':' + minute;
+	}
+}
+    module.exports.formatDate = formatDate;
+</wxs>
 <view class='walletDetails'>
-
   <view class="walletDetails-center">
-
     <view class='walletDetails-info' wx:for="{{ walletDatails }}" wx:key="{{ index }}">
-        
         <view class="walletDetails-left">
             <view class='avatar-box'>
                 <image src="../../../static/image/walletdetails.png" />
             </view>
             <view class="avatar-info">
-                <text class="avatar-doc" wx:if='{{ item.value > 0 }}'>收到的奖金-来自{{ item.nickName }}</text>
-                <text class="avatar-doc" wx:else>发出的奖金-奖励{{ item.nickName }}</text>
-                <text class="avatar-time">{{ item.time }}</text>
+                <text class="avatar-doc">{{ item.description }}</text>
+
+                <text class="avatar-time"></text>
             </view>
         </view>
-
         <view class="walletDetails-right">
-            <view class="avatar-value-pos" wx:if='{{ item.value > 0 }}'>
+            <view class="avatar-value-pos" wx:if="{{ item.type === 'INCOME' }}">
                 <text class="avatar-symbol">+</text>
-                <text>{{ item.value }}</text>
+                <text>{{ item.price }}</text>
             </view>
             <view class="avatar-value-neg" wx:else>
                 <text class="avatar-symbol">-</text>
-                <text>{{ item.value }}</text>
+                <text>{{ item.price }}</text>
             </view>
         </view>
-
     </view>
-
-
   </view>
-
 </view>

project.config.json

@@ -36,7 +36,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 13,
+			"current": 19,
 			"list": [
 				{
 					"id": 0,
@@ -128,6 +128,35 @@
 					"pathName": "pages/social/works/works",
 					"query": "id=1541743536238348&title=【课文6】比尾巴",
 					"scene": "1012"
+				},
+				{
+					"id": -1,
+					"name": "collage",
+					"pathName": "pages/user/mycollage/mycollage",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "collage",
+					"pathName": "pages/user/mycollage/mycollage",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "details",
+					"pathName": "pages/user/myWallet/myWallet",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "details",
+					"pathName": "pages/user/myWallet/myWallet",
+					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "course",
+					"pathName": "pages/user/mycourse/mycourse"
 				}
 			]
 		}

utils/APIClient.js

@@ -12,285 +12,304 @@ function getBaseUrl(action) {
 	return HOST_BASE + action;
 }
 module.exports = {
-	//获取推荐首页信息
-	getIndex(uid) {
-		let url = getProductUrl('wx/index');
-		return request.getInstance().header({
-			uid
-		}).url(url).send();
-	},
-	// 获取首页人气推荐
-	getHotRecommend(uid, pageNo, pageSize) {
-		let url = getBaseUrl('wx/userRead/recommend');
-		return request.getInstance().header({
-			uid
-		}).data({
-			pageNo,
-			pageSize,
-		}).url(url).send();
-	},
-	// 获取用户朗读详细信息
-	getWorksDetail(uid, readId) {
-		let url = getBaseUrl(`wx/userRead/info/${readId}`);
-		return request.getInstance().header({
-			uid
-		}).url(url).send();
-	},
-	// 获取全部课本
-	getAllBooks(pageNo, pageSize) {
-		let url = getProductUrl('wx/product');
-		return request.getInstance().header({
-			uid: wx.getStorageSync('uid')
-		}).url(url).data({
-			pageNo,
-			pageSize
-		}).send();
-	},
-	// 获取课本详情
-	getBookDetail(uid, id) {
-		let url = getProductUrl(`wx/product/${id}`);
-		return request.getInstance().header({
-			uid
-		}).url(url).send();
-	},
-	// 获取单课详情
-	getClassDetail(uid, id) {
-		let url = getProductUrl(`wx/lesson/${id}`);
-		return request.getInstance().header({
-			uid
-		}).url(url).send();
-	},
-	// 检查是否收藏过课程
-	classIsLike(uid, data) {
-		let url = getProductUrl(`wx/favorites/isLike`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data(data).send();
-	},
-	getClassDetail(uid, id) {
-		let url = getProductUrl(`wx/lesson/${id}`);
-		return request.getInstance().header({
-			uid
-		}).url(url).send();
-	},
-	// 获取单课朗读信息
-	getClassRead(uid, data) {
-		let url = getBaseUrl(`wx/userRead`);
-		return request.getInstance().header({
-			uid
-		}).data(data).url(url).send();
-	},
-	// 作品播放了+1
-	playWorks(uid, readId) {
-		let url = getBaseUrl(`wx/userRead/play/${readId}`);
-		return request.getInstance().header({
-			uid
-		}).url(url).send();
-	},
-	// 发布作品
-	postWork(uid, data) {
-		console.log(data);
-		let url = getBaseUrl(`wx/userRead`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data(data).method('POST').send();
-	},
-	// 点赞作品
-	likeWorks(uid, readId) {
-		let url = getBaseUrl(`wx/userRead/like/${readId}`);
-		return request.getInstance().header({
-			uid
-		}).url(url).send();
-	},
-	// 关注用户 
-	followUser(uid, followUid) {
-		let url = getBaseUrl(`wx/fans`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data({
-			"uid": followUid
-		}).method('POST').send();
-	},
-	// 取消关注
-	cancerFollow(uid,followUid){
-		let url = getBaseUrl(`wx/fans`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data({
-			"uid": followUid
-		}).method('PUT').send();
-	},
-	//获取关注的用户列表
-	getFollowUsers(uid, pageNo, pageSize) {
-		let url = getBaseUrl(`wx/fans`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data({
-			pageNo: pageNo,
-			pageSize: pageSize
-		}).send();
-	},
-	// 获取关注用户的作品列表
-	getFollowWorks(uid, pageNo, pageSize) {
-		let url = getBaseUrl(`wx/fans/interest`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data({
-			pageNo: pageNo,
-			pageSize: pageSize
-		}).send();
-	},
-	// 搜索
-	getSearchResult(uid, key, pageNo, pageSize) {
-		let url = getProductUrl(`wx/lesson`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data({
-			title: key,
-			productId: '',
-			pageNo: pageNo,
-			pageSize: pageSize
-		}).send();
-	},
-	// 获取回复信息
-	getReply(uid, columnId, pageNo, pageSize) {
-		let url = getBaseUrl(`wx/posts/reply`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data({
-			columnId: columnId,
-			pageNo: pageNo,
-			pageSize: pageSize
-		}).send();
-	},
-	// 获取回复(楼中楼)
-	getReplyComment(uid, postId) {
-		let url = getBaseUrl(`wx/posts/one/${postId}`);
-		return request.getInstance().header({
-			uid
-		}).url(url).send();
-	},
-	// 发布回复(楼中楼)
-	postReplyComment(uid, data) {
-		let url = getBaseUrl(`wx/reply`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data(data).method('POST').send();
-	},
-	// 点赞评论
-	likeCommend(uid, likeUid) {
-		let url = getBaseUrl(`wx/posts/attribute/${likeUid}`);
-		return request.getInstance().header({
-			uid
-		}).url(url).method('GET').send();
-	},
-	// 发布讨论
-	postReply(uid, data) {
-		let url = getBaseUrl(`wx/posts`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data(data).method('POST').send();
-	},
-	// 获取推荐团购信息
-	getGroupList() {
-		let url = getBaseUrl(`wx/groupPurchaseInfo/recommend`);
-		return request.getInstance().header({
-			uid: wx.getStorageSync('uid')
-		}).url(url).send();
-	},
-	// 获取课程团购信息
-	getGroupPurchaseInfo(productId) {
-		let url = getBaseUrl(`wx/groupPurchaseInfo/info/${productId}`);
-		return request.getInstance().header({
-			uid: wx.getStorageSync('uid')
-		}).url(url).send();
-	},
-	// 发起团购
-	SendGroupPurchas(data) {
-		let url = getBaseUrl(`wx/groupPurchase/create`);
-		return request.getInstance().header({
-			uid: wx.getStorageSync('uid')
-		}).url(url).data(data).method('POST').send();
-	},
-	// 参加团购
-	JoinGroupPurchas(orderId) {
-		let url = getBaseUrl(`wx/groupPurchase/join`);
-		return request.getInstance().header({
-			uid: wx.getStorageSync('uid')
-		}).url(url).data({
-			orderId
-		}).method('POST').send();
-	},
-	// 收藏课程
-	collectClass(uid, data) {
-		let url = getProductUrl(`wx/favorites`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data(data).method('POST').send();
-	},
-	//我的团
-	getMygroup() {
-		let url = getBaseUrl(`wx/groupPurchase/my`);
-		return request.getInstance().header({
-			uid: wx.getStorageSync('uid')
-		}).url(url).data({
-			pageNo: 1,
-			pageSize: 100
-		}).send();
-	},
-	//获取团购详情
-	getMygroupInfo(orderId) {
-		let url = getBaseUrl(`wx/groupPurchase/info/${orderId}`);
-		return request.getInstance().header({
-			uid: wx.getStorageSync('uid')
-		}).url(url).send();
-	},
-	//团购是否成功
-	groupSuccess(orderId) {
-		let url = getBaseUrl(`wx/groupPurchase/joinStatus`);
-		return request.getInstance().header({
-			uid: wx.getStorageSync('uid')
-		}).url(url).data({
-			orderId
-		}).send();
-	},
-	// 发起奖励
-	rewardMoney(uid, data) {
-		let url = getBaseUrl(`wx/wallet/award`);
-		return request.getInstance().header({
-			uid
-		}).url(url).data(data).method('POST').send();
-	},
-  // 修改资料
-  settingUserInfo(uid, wechatName, mobile, gender, schoolProvince, schoolCity, schoolName, profession, birthday){
-    let url = getBaseUrl(`wx/user`);
-    return request.getInstance().header({
-      uid
-    }).data({
-      wechatName: wechatName,
-      mobile: mobile,
-      gender: gender,
-      schoolProvince: schoolProvince,
-      schoolCity: schoolCity,
-      schoolName: schoolName,
-      profession: profession,
-      birthday: birthday
-      }).url(url).method('PUT').send();
-  },
-  //获取个人信息
-	getUserInfo () {
-    let url = getBaseUrl(`wx/user`);
-    return request.getInstance().header({
+    //获取推荐首页信息
+    getIndex(uid) {
+        let url = getProductUrl('wx/index');
+        return request.getInstance().header({
+            uid
+        }).url(url).send();
+    },
+    // 获取首页人气推荐
+    getHotRecommend(uid, pageNo, pageSize) {
+        let url = getBaseUrl('wx/userRead/recommend');
+        return request.getInstance().header({
+            uid
+        }).data({
+            pageNo,
+            pageSize,
+        }).url(url).send();
+    },
+    // 获取用户朗读详细信息
+    getWorksDetail(uid, readId) {
+        let url = getBaseUrl(`wx/userRead/info/${readId}`);
+        return request.getInstance().header({
+            uid
+        }).url(url).send();
+    },
+    // 获取全部课本
+    getAllBooks(pageNo, pageSize) {
+        let url = getProductUrl('wx/product');
+        return request.getInstance().header({
+            uid: wx.getStorageSync('uid')
+        }).url(url).data({
+            pageNo,
+            pageSize
+        }).send();
+    },
+    // 获取课本详情
+    getBookDetail(uid, id) {
+        let url = getProductUrl(`wx/product/${id}`);
+        return request.getInstance().header({
+            uid
+        }).url(url).send();
+    },
+    // 获取单课详情
+    getClassDetail(uid, id) {
+        let url = getProductUrl(`wx/lesson/${id}`);
+        return request.getInstance().header({
+            uid
+        }).url(url).send();
+    },
+    // 检查是否收藏过课程
+    classIsLike(uid, data) {
+        let url = getProductUrl(`wx/favorites/isLike`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data(data).send();
+    },
+    getClassDetail(uid, id) {
+        let url = getProductUrl(`wx/lesson/${id}`);
+        return request.getInstance().header({
+            uid
+        }).url(url).send();
+    },
+    // 获取单课朗读信息
+    getClassRead(uid, data) {
+        let url = getBaseUrl(`wx/userRead`);
+        return request.getInstance().header({
+            uid
+        }).data(data).url(url).send();
+    },
+    // 作品播放了+1
+    playWorks(uid, readId) {
+        let url = getBaseUrl(`wx/userRead/play/${readId}`);
+        return request.getInstance().header({
+            uid
+        }).url(url).send();
+    },
+    // 发布作品
+    postWork(uid, data) {
+        console.log(data);
+        let url = getBaseUrl(`wx/userRead`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data(data).method('POST').send();
+    },
+    // 点赞作品
+    likeWorks(uid, readId) {
+        let url = getBaseUrl(`wx/userRead/like/${readId}`);
+        return request.getInstance().header({
+            uid
+        }).url(url).send();
+    },
+    // 关注用户
+    followUser(uid, followUid) {
+        let url = getBaseUrl(`wx/fans`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data({
+            "uid": followUid
+        }).method('POST').send();
+    },
+    //获取关注的用户列表
+    getFollowUsers(uid, pageNo, pageSize) {
+        let url = getBaseUrl(`wx/fans`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data({
+            pageNo: pageNo,
+            pageSize: pageSize
+        }).send();
+    },
+    // 获取关注用户的作品列表
+    getFollowWorks(uid, pageNo, pageSize) {
+        let url = getBaseUrl(`wx/fans/interest`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data({
+            pageNo: pageNo,
+            pageSize: pageSize
+        }).send();
+    },
+    // 搜索
+    getSearchResult(uid, key, pageNo, pageSize) {
+        let url = getProductUrl(`wx/lesson`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data({
+            title: key,
+            productId: '',
+            pageNo: pageNo,
+            pageSize: pageSize
+        }).send();
+    },
+    // 获取回复信息
+    getReply(uid, columnId, pageNo, pageSize) {
+        let url = getBaseUrl(`wx/posts/reply`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data({
+            columnId: columnId,
+            pageNo: pageNo,
+            pageSize: pageSize
+        }).send();
+    },
+    // 获取回复(楼中楼)
+    getReplyComment(uid, postId) {
+        let url = getBaseUrl(`wx/posts/one/${postId}`);
+        return request.getInstance().header({
+            uid
+        }).url(url).send();
+    },
+    // 发布回复(楼中楼)
+    postReplyComment(uid, data) {
+        let url = getBaseUrl(`wx/reply`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data(data).method('POST').send();
+    },
+    // 点赞评论
+    likeCommend(uid, likeUid) {
+        let url = getBaseUrl(`wx/posts/attribute/${likeUid}`);
+        return request.getInstance().header({
+            uid
+        }).url(url).method('GET').send();
+    },
+    // 发布讨论
+    postReply(uid, data) {
+        let url = getBaseUrl(`wx/posts`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data(data).method('POST').send();
+    },
+    // 获取推荐团购信息
+    getGroupList() {
+        let url = getBaseUrl(`wx/groupPurchaseInfo/recommend`);
+        return request.getInstance().header({
+            uid: wx.getStorageSync('uid')
+        }).url(url).send();
+    },
+    // 获取课程团购信息
+    getGroupPurchaseInfo(productId) {
+        let url = getBaseUrl(`wx/groupPurchaseInfo/info/${productId}`);
+        return request.getInstance().header({
+            uid: wx.getStorageSync('uid')
+        }).url(url).send();
+    },
+    // 发起团购
+    SendGroupPurchas(data) {
+        let url = getBaseUrl(`wx/groupPurchase/create`);
+        return request.getInstance().header({
+            uid: wx.getStorageSync('uid')
+        }).url(url).data(data).method('POST').send();
+    },
+    // 参加团购
+    JoinGroupPurchas(orderId) {
+        let url = getBaseUrl(`wx/groupPurchase/join`);
+        return request.getInstance().header({
+            uid: wx.getStorageSync('uid')
+        }).url(url).data({
+            orderId
+        }).method('POST').send();
+    },
+    // 收藏课程
+    collectClass(uid, data) {
+        let url = getProductUrl(`wx/favorites`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data(data).method('POST').send();
+    },
+    //我的团
+    getMygroup() {
+        let url = getBaseUrl(`wx/groupPurchase/my`);
+        return request.getInstance().header({
+            uid: wx.getStorageSync('uid')
+        }).url(url).data({
+            pageNo: 1,
+            pageSize: 100
+        }).send();
+    },
+    //获取团购详情
+    getMygroupInfo(orderId) {
+        let url = getBaseUrl(`wx/groupPurchase/info/${orderId}`);
+        return request.getInstance().header({
+            uid: wx.getStorageSync('uid')
+        }).url(url).send();
+    },
+    //团购是否成功
+    groupSuccess(orderId) {
+        let url = getBaseUrl(`wx/groupPurchase/joinStatus`);
+        return request.getInstance().header({
+            uid: wx.getStorageSync('uid')
+        }).url(url).data({
+            orderId
+        }).send();
+    },
+    // 发起奖励
+    rewardMoney(uid, data) {
+        let url = getBaseUrl(`wx/wallet/award`);
+        return request.getInstance().header({
+            uid
+        }).url(url).data(data).method('POST').send();
+    },
+    // 修改资料
+    settingUserInfo(wechatName, mobile, gender, schoolProvince, schoolCity, schoolName, profession, birthday) {
+        let url = getBaseUrl(`wx/user`);
+        return request.getInstance().header({
+            uid:wx.getStorageSync('uid')
+        }).data({
+            wechatName: wechatName,
+            mobile: mobile,
+            gender: gender,
+            schoolProvince: schoolProvince,
+            schoolCity: schoolCity,
+            schoolName: schoolName,
+            profession: profession,
+            birthday: birthday
+        }).url(url).method('PUT').send();
+    },
+    //获取个人信息
+    getUserInfo() {
+        let url = getBaseUrl(`wx/user`);
+        return request.getInstance().header({
+            uid: wx.getStorageSync('uid')
+        }).data({
+            uid: wx.getStorageSync('uid')
+        }).url(url).send();
+    },
+    // 生成二维码
+    createQRCode(data) {
+        let url = getBaseUrl(`wx/qrCode`);
+        return request.getInstance().header({
+            uid: wx.getStorageSync('uid')
+        }).data(data).url(url).send();
+    },
+//	我的奖金
+    myWallet() {
+      let url = getBaseUrl('wx/wallet/bonus');
+      return request.getInstance().header({
+          uid: wx.getStorageSync('uid')
+      }).url(url).send();
+    },
+    // 資金明細
+    myWalletDetails() {
+      let url = getBaseUrl('wx/wallet/record');
+      return request.getInstance().header({
         uid: wx.getStorageSync('uid')
-    }).data({
+      }).url(url).send();
+    },
+    // 我的課程
+    myCourse() {
+      let url = getBaseUrl('wx/groupPurchase/myCourse');
+      return request.getInstance().header({
         uid: wx.getStorageSync('uid')
-    }).url(url).send();
-},
-	// 生成二维码
-	createQRCode(data){
-		let url = getBaseUrl(`wx/qrCode`);
-		return request.getInstance().header({
-			uid: wx.getStorageSync('uid')
-		}).data(data).url(url).send();
-	}
+      }).url(url).send();
+    },
+    // 我的朗读
+    myRead() {
+      let url = getBaseUrl('wx/userRead/my');
+      return request.getInstance().header({
+        uid: wx.getStorageSync('uid')
+      }).url(url).send();
+    },
 }