dongyuan0658 6 years ago
parent
commit
706817dd9e
7 changed files with 195 additions and 138 deletions
  1. 146 113
      .idea/workspace.xml
  2. 17 3
      component/my/my.js
  3. 3 3
      component/my/my.wxml
  4. 8 0
      pages/index/index.js
  5. 8 2
      pages/user/myEdit/myEdit.js
  6. 0 12
      pages/user/myEdit/myEdit.wxml
  7. 13 5
      utils/APIClient.js

+ 146 - 113
.idea/workspace.xml

@@ -3,14 +3,11 @@
   <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$/component/my/my.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/component/my/my.wxss" 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$/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$/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.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$/pages/user/myEdit/myEdit.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/user/myconcern/myconcern.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/user/myconcern/myconcern.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pages/user/myconcern/myconcern.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/user/myconcern/myconcern.wxml" 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/" />
@@ -30,16 +27,17 @@
           <entry key="project.open.time.15" 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="1" />
-          <entry key="project.opened" value="4" />
+          <entry key="project.opened" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="jpg" value="1" />
-          <entry key="js" value="18" />
+          <entry key="js" value="27" />
           <entry key="json" value="5" />
-          <entry key="wxml" value="15" />
+          <entry key="wxml" value="17" />
           <entry key="wxss" value="9" />
         </counts>
       </usages-collector>
@@ -47,23 +45,23 @@
         <counts>
           <entry key="Image" value="1" />
           <entry key="JSON" value="5" />
-          <entry key="JavaScript" value="18" />
-          <entry key="PLAIN_TEXT" value="24" />
+          <entry key="JavaScript" value="27" />
+          <entry key="PLAIN_TEXT" value="26" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="js" value="104" />
+          <entry key="js" value="572" />
           <entry key="json" value="5" />
-          <entry key="wxml" value="55" />
+          <entry key="wxml" value="90" />
           <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="104" />
-          <entry key="PLAIN_TEXT" value="142" />
+          <entry key="JavaScript" value="572" />
+          <entry key="PLAIN_TEXT" value="177" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
@@ -75,62 +73,84 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="480">
-              <caret line="28" column="31" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="31" />
+            <state relative-caret-position="234">
+              <caret line="31" column="88" lean-forward="true" selection-start-line="31" selection-start-column="88" selection-end-line="31" selection-end-column="88" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="270">
+              <caret line="27" column="23" lean-forward="true" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss">
+        <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
           <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 relative-caret-position="2970">
+              <caret line="99" column="4" lean-forward="true" selection-start-line="99" selection-start-column="4" selection-end-line="99" selection-end-column="4" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
+        <entry file="file://$PROJECT_DIR$/utils/APIClient.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="480">
-              <caret line="22" column="26" lean-forward="true" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
+            <state relative-caret-position="422">
+              <caret line="172" column="20" lean-forward="true" selection-start-line="172" selection-start-column="20" selection-end-line="172" selection-end-column="20" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/app.json">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/utils/WXHttpRequest.js">
           <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 relative-caret-position="960">
+              <caret line="32" column="32" lean-forward="true" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/utils/APIClient.js">
+        <entry file="file://$PROJECT_DIR$/pages/index/index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="630">
-              <caret line="170" column="29" selection-start-line="170" selection-start-column="29" selection-end-line="170" selection-end-column="29" />
+            <state relative-caret-position="272">
+              <caret line="89" column="35" lean-forward="true" selection-start-line="89" selection-start-column="35" selection-end-line="89" selection-end-column="35" />
+              <folding>
+                <element signature="n#!!doc" expanded="true" />
+                <element signature="e#20#81#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
+        <entry file="file://$PROJECT_DIR$/component/my/my.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1170">
+              <caret line="39" column="11" lean-forward="true" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/utils/httpUtil.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="540">
-              <caret line="90" column="6" lean-forward="true" selection-start-line="90" selection-start-column="6" selection-end-line="90" selection-end-column="6" />
+            <state relative-caret-position="810">
+              <caret line="29" column="6" lean-forward="true" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/component/follow/follow.js">
+        <entry file="file://$PROJECT_DIR$/component/my/my.wxml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="240">
-              <caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
+            <state relative-caret-position="-270">
+              <caret line="18" column="68" lean-forward="true" selection-start-line="18" selection-start-column="68" selection-end-line="18" selection-end-column="68" />
             </state>
           </provider>
         </entry>
@@ -140,6 +160,13 @@
   <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">
@@ -154,10 +181,14 @@
         <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$/utils/APIClient.js" />
         <option value="$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml" />
-        <option value="$PROJECT_DIR$/pages/user/myEdit/myEdit.js" />
         <option value="$PROJECT_DIR$/app.json" />
+        <option value="$PROJECT_DIR$/utils/APIClient.js" />
+        <option value="$PROJECT_DIR$/component/my/my.wxml" />
+        <option value="$PROJECT_DIR$/pages/index/index.js" />
+        <option value="$PROJECT_DIR$/utils/httpUtil.js" />
+        <option value="$PROJECT_DIR$/component/my/my.js" />
+        <option value="$PROJECT_DIR$/pages/user/myEdit/myEdit.js" />
       </list>
     </option>
   </component>
@@ -167,7 +198,7 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds" extendedState="7">
     <option name="x" value="260" />
     <option name="y" value="20" />
     <option name="width" value="1400" />
@@ -179,7 +210,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -190,30 +220,24 @@
             <path>
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
               <item name="reader" type="462c0819:PsiDirectoryNode" />
-              <item name="pages" 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="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="user" 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" />
-              <item name="user" type="462c0819:PsiDirectoryNode" />
-              <item name="myEdit" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="reader" type="b2602c69:ProjectViewProjectNode" />
-              <item name="reader" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -249,14 +273,16 @@
       <workItem from="1541157092216" duration="2211000" />
       <workItem from="1541402122086" duration="6360000" />
       <workItem from="1541554466111" duration="5820000" />
+      <workItem from="1541581837551" duration="8734000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="15153000" />
+    <option name="totallyTimeSpent" value="23887000" />
   </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" visible="true" weight="0.14278187" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -284,13 +310,6 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/component/my/my.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="59" column="32" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/utils/util.js">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -298,13 +317,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="8" column="101" selection-start-line="8" selection-start-column="91" selection-end-line="8" selection-end-column="101" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/index/index.json">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -312,17 +324,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/index/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="3" column="7" lean-forward="true" selection-start-line="3" selection-start-column="7" selection-end-line="3" selection-end-column="7" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#41#97#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/utils/const.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -330,13 +331,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/WXHttpRequest.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1320">
-          <caret line="44" column="38" lean-forward="true" selection-start-line="44" selection-start-column="38" selection-end-line="44" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/component/my/my.wxss">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1596">
@@ -382,13 +376,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/component/my/my.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="2" column="13" lean-forward="true" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/component/hot/hot.wxss">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -409,13 +396,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/component/follow/follow.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxml">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -437,45 +417,98 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
+    <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/user/myEdit/myEdit.wxss">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="540">
-          <caret line="90" column="6" lean-forward="true" selection-start-line="90" selection-start-column="6" selection-end-line="90" selection-end-column="6" />
+        <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$/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$/component/follow/follow.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="46" column="34" lean-forward="true" selection-start-line="46" selection-start-column="34" selection-end-line="46" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/component/my/my.wxml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-270">
+          <caret line="18" column="68" lean-forward="true" selection-start-line="18" selection-start-column="68" selection-end-line="18" selection-end-column="68" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/utils/APIClient.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="170" column="29" selection-start-line="170" selection-start-column="29" selection-end-line="170" selection-end-column="29" />
+        <state relative-caret-position="422">
+          <caret line="172" column="20" lean-forward="true" selection-start-line="172" selection-start-column="20" selection-end-line="172" selection-end-column="20" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss">
+    <entry file="file://$PROJECT_DIR$/utils/WXHttpRequest.js">
       <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 relative-caret-position="960">
+          <caret line="32" column="32" lean-forward="true" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/utils/httpUtil.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="810">
+          <caret line="29" column="6" lean-forward="true" selection-start-line="29" selection-start-column="6" selection-end-line="29" selection-end-column="6" />
         </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="480">
-          <caret line="28" column="31" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="31" />
+        <state relative-caret-position="234">
+          <caret line="31" column="88" lean-forward="true" selection-start-line="31" selection-start-column="88" selection-end-line="31" selection-end-column="88" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
+    <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="22" column="26" lean-forward="true" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
+        <state relative-caret-position="2970">
+          <caret line="99" column="4" lean-forward="true" selection-start-line="99" selection-start-column="4" selection-end-line="99" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app.json">
+    <entry file="file://$PROJECT_DIR$/pages/index/index.js">
       <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 relative-caret-position="272">
+          <caret line="89" column="35" lean-forward="true" selection-start-line="89" selection-start-column="35" selection-end-line="89" selection-end-column="35" />
+          <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.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1170">
+          <caret line="39" column="11" lean-forward="true" selection-start-line="39" selection-start-column="11" selection-end-line="39" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="270">
+          <caret line="27" column="23" lean-forward="true" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
         </state>
       </provider>
     </entry>

+ 17 - 3
component/my/my.js

@@ -1,15 +1,15 @@
+import APIClient from '../../utils/APIClient'
 export const myInit =  (that) => {
   that.setData({
     myData: {
         title: '修改资料',
         concern: '我的关注',
-        imgUrl: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
-        name: 'ABC',
         address:['北京海淀','中关村','三小'],
         playNum: 31549,
         attentionCount: 10254,
         point: 6317,
-        flowerNum: 56245
+        flowerNum: 56245,
+        user: {}
     }
   })
   that.toMyEdit = (e) => {
@@ -25,4 +25,18 @@ export const myInit =  (that) => {
     });
   }
 
+  that.userInfo = function () {
+      // APIClient.getUserInfo()
+      const userInfo = wx.getStorageSync('user');
+      console.log(userInfo);
+      // getOpenidSessionKey((res) => {
+      //     console.log('个人',res);
+      //     that.data.myData.user = res.data.data.data;
+      //     that.setData({
+      //         myData: that.data.myData
+      //     })
+      // },(error) => {
+      //
+      // })
+  }()
 }

+ 3 - 3
component/my/my.wxml

@@ -4,7 +4,7 @@
       <view class='mine-info'>
         <view class='mine-bg'>
           <view class='mine-avatar'>
-            <image class='avatar-image' src='{{ myData.imgUrl }}'></image>
+            <image class='avatar-image' src='{{ myData.user.avatar }}'></image>
           </view>
         </view>
         <view class='mine-edit' bindtap='toMyEdit' data-title='{{ myData.title }}'>
@@ -15,8 +15,8 @@
         </view>
       </view>
       <view class='mine-detail'>
-        <text class='mine-title'>萝莉</text>
-        <view class='mine-address'>北京市,海淀区中关村三小</view>
+        <text class='mine-title'>{{ myData.user.wechatName }}</text>
+        <view class='mine-address'>{{ myData.schoolCity }},{{ myData.schoolName }}</view>
         <view class='mine-line'></view>
       </view>
       <view class='mine-category'>

+ 8 - 0
pages/index/index.js

@@ -82,6 +82,14 @@ Page({
     }
     if (myIndex == 3) {
       myInit(this);
+      getOpenidSessionKey((res) => {
+          console.log('个人',res);
+      }, (error) => {
+          // console.log(error)
+          this.setData({
+              hide: !this.data.hide
+          })
+      });
     }
   },
   onLoad: function (options) {

+ 8 - 2
pages/user/myEdit/myEdit.js

@@ -22,9 +22,15 @@ Page({
   },
   formSubmit: function(e){
     console.log(3);
-    let uid = 1, wechatName = '木小雅', birthday = '1989年10月23日', gender = 8, eyeshield = 52;
-    httpRequestApi.settingUserInfo(uid, wechatName, birthday, gender, eyeshield).success(res => {
+    let  wechatName = '宋珂', birthday = '1996-07-13', gender = 3, eyeshield = 7;
+    httpRequestApi.settingUserInfo( wechatName, birthday, gender, eyeshield).success(res => {
       console.log(res.data.data);
+        wx.redirectTo({
+            url: '/pages/index/index?index=3'
+        })
+      // wx.navigateBack({
+      //
+      //  });
     });
   },
   /**

+ 0 - 12
pages/user/myEdit/myEdit.wxml

@@ -19,12 +19,6 @@
             <radio value="{{ item.value }}" checked="{{ item.checked }}" color='#fff' />
           </label>
         </radio-group>
-        <!-- <radio-group class="radio-group" bindChange="optionAction">
-          <label class="radio" wx:for="{{ sexs }}" wx:key='{{ index }}'>
-            <text class='sex-title'>{{ item.value }}</text>
-            <radio value="{{ item.value }}" checked="{{ item.checked }}" color='#fff' />
-          </label>
-        </radio-group> -->
       </view>
       <view class='birthday-box'>
         <text class='setting-title'>生日</text>
@@ -38,12 +32,6 @@
             <radio value="{{ item.value }}" checked="{{ item.checked }}" color='#fff' />
           </label>
         </radio-group>
-        <!-- <radio-group class="radio-group" bindChange="optionSetting">
-          <label class="radio" wx:for="{{ occupations }}" wx:key='{{ index }}'>
-            <text class='sex-title'>{{ item.value }}</text>
-            <radio value="{{ item.value }}" checked="{{ item.checked }}" color='#fff' />
-          </label>
-        </radio-group> -->
       </view>
       <view class='school-box'>
         <text class='setting-title'>学校</text>

+ 13 - 5
utils/APIClient.js

@@ -22,7 +22,6 @@ module.exports = {
 	// 获取首页人气推荐
 	getHotRecommend(uid, pageNo, pageSize) {
 		let url = getBaseUrl('wx/userRead/recommend');
-		console.log(url);
 		return request.getInstance().header({
 			uid
 		}).data({
@@ -159,15 +158,24 @@ module.exports = {
 		}).method('POST').send();
 	},
   // 修改资料
-  settingUserInfo(uid, wechatName, birthday, gender, eyeshield){
-    let url = getBaseUrl(`/wx/user`);
+  settingUserInfo( wechatName, birthday, gender, eyeshield){
+    let url = getBaseUrl(`wx/user`);
     return request.getInstance().header({
-      uid
+      uid: wx.getStorageSync('uid')
     }).data({
       wechatName: wechatName,
       birthday: birthday,
       gender: gender,
       eyeshield: eyeshield
       }).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();
+	}
 }