dongyuan0658 6 rokov pred
rodič
commit
b6069f89d4

+ 115 - 143
.idea/workspace.xml

@@ -3,13 +3,15 @@
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="2ecf3c01-ae46-4667-8997-db10a46d1157" name="Default Changelist" comment="">
     <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$/.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/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/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$/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.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/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$/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>
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -24,43 +26,44 @@
     <session id="-1384404472">
     <session id="-1384404472">
       <usages-collector id="statistics.lifecycle.project">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
         <counts>
-          <entry key="project.closed" value="3" />
+          <entry key="project.closed" value="4" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.30" value="1" />
           <entry key="project.open.time.30" value="1" />
+          <entry key="project.open.time.32" value="1" />
           <entry key="project.open.time.5" value="1" />
           <entry key="project.open.time.5" value="1" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.opened" value="4" />
         </counts>
         </counts>
       </usages-collector>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
       <usages-collector id="statistics.file.extensions.open">
         <counts>
         <counts>
           <entry key="jpg" value="1" />
           <entry key="jpg" value="1" />
-          <entry key="js" value="16" />
-          <entry key="json" value="4" />
-          <entry key="wxml" value="14" />
-          <entry key="wxss" value="8" />
+          <entry key="js" value="18" />
+          <entry key="json" value="5" />
+          <entry key="wxml" value="15" />
+          <entry key="wxss" value="9" />
         </counts>
         </counts>
       </usages-collector>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
       <usages-collector id="statistics.file.types.open">
         <counts>
         <counts>
           <entry key="Image" value="1" />
           <entry key="Image" value="1" />
-          <entry key="JSON" value="4" />
-          <entry key="JavaScript" value="16" />
-          <entry key="PLAIN_TEXT" value="22" />
+          <entry key="JSON" value="5" />
+          <entry key="JavaScript" value="18" />
+          <entry key="PLAIN_TEXT" value="24" />
         </counts>
         </counts>
       </usages-collector>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
         <counts>
-          <entry key="js" value="2" />
-          <entry key="json" value="1" />
-          <entry key="wxml" value="3" />
-          <entry key="wxss" value="86" />
+          <entry key="js" value="104" />
+          <entry key="json" value="5" />
+          <entry key="wxml" value="55" />
+          <entry key="wxss" value="87" />
         </counts>
         </counts>
       </usages-collector>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
       <usages-collector id="statistics.file.types.edit">
         <counts>
         <counts>
-          <entry key="JSON" value="1" />
-          <entry key="JavaScript" value="2" />
-          <entry key="PLAIN_TEXT" value="89" />
+          <entry key="JSON" value="5" />
+          <entry key="JavaScript" value="104" />
+          <entry key="PLAIN_TEXT" value="142" />
         </counts>
         </counts>
       </usages-collector>
       </usages-collector>
       <usages-collector id="statistics.js.language.service.starts" />
       <usages-collector id="statistics.js.language.service.starts" />
@@ -70,46 +73,55 @@
   <component name="FileEditorManager">
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxml">
+        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="21" selection-start-column="21" selection-end-column="21" />
+            <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>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.js">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2070">
-              <caret line="69" column="98" selection-start-line="69" selection-start-column="98" selection-end-line="69" selection-end-column="98" />
+            <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>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxss">
+        <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.js">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="3" column="1" selection-start-line="3" selection-start-column="1" selection-end-line="3" selection-end-column="1" />
+            <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>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <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>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
+        <entry file="file://$PROJECT_DIR$/utils/APIClient.js">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-150">
-              <caret line="61" column="5" lean-forward="true" selection-start-line="2" selection-start-column="4" selection-end-line="61" selection-end-column="5" />
+            <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>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/pages/main/class/class.wxss">
+        <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2730">
-              <caret line="91" column="18" selection-start-line="91" selection-start-column="18" selection-end-line="91" selection-end-column="18" />
+            <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>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -141,6 +153,11 @@
         <option value="$PROJECT_DIR$/pages/user/myconcern/myconcern.wxml" />
         <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.js" />
         <option value="$PROJECT_DIR$/pages/user/myconcern/myconcern.wxss" />
         <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" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -162,6 +179,7 @@
       <foldersAlwaysOnTop value="true" />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     </navigator>
     <panes>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
       <pane id="ProjectPane">
         <subPane>
         <subPane>
           <expand>
           <expand>
@@ -172,63 +190,13 @@
             <path>
             <path>
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
               <item name="reader" type="462c0819:PsiDirectoryNode" />
               <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="hot" 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" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
               <item name="reader" type="462c0819:PsiDirectoryNode" />
               <item name="reader" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
               <item name="pages" type="462c0819:PsiDirectoryNode" />
-              <item name="main" 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="main" type="462c0819:PsiDirectoryNode" />
-              <item name="class" 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="main" type="462c0819:PsiDirectoryNode" />
-              <item name="reading" 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>
-            <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="user" type="462c0819:PsiDirectoryNode" />
-              <item name="myconcern" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
@@ -240,13 +208,12 @@
             <path>
             <path>
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
               <item name="reader" type="b2602c69:ProjectViewProjectNode" />
               <item name="reader" type="462c0819:PsiDirectoryNode" />
               <item name="reader" type="462c0819:PsiDirectoryNode" />
-              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
           </expand>
           </expand>
           <select />
           <select />
         </subPane>
         </subPane>
       </pane>
       </pane>
-      <pane id="Scope" />
     </panes>
     </panes>
   </component>
   </component>
   <component name="PropertiesComponent">
   <component name="PropertiesComponent">
@@ -281,11 +248,12 @@
       <workItem from="1541144291161" duration="762000" />
       <workItem from="1541144291161" duration="762000" />
       <workItem from="1541157092216" duration="2211000" />
       <workItem from="1541157092216" duration="2211000" />
       <workItem from="1541402122086" duration="6360000" />
       <workItem from="1541402122086" duration="6360000" />
+      <workItem from="1541554466111" duration="5820000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9333000" />
+    <option name="totallyTimeSpent" value="15153000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -323,13 +291,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/APIClient.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="480">
-          <caret line="16" column="41" lean-forward="true" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/utils/util.js">
     <entry file="file://$PROJECT_DIR$/utils/util.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state>
         <state>
@@ -376,13 +337,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app.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$/component/my/my.wxss">
     <entry file="file://$PROJECT_DIR$/component/my/my.wxss">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1596">
         <state relative-caret-position="-1596">
@@ -390,9 +344,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxss">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/main/books/books.wxml">
     <entry file="file://$PROJECT_DIR$/pages/main/books/books.wxml">
       <provider selected="true" editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     </entry>
@@ -412,25 +363,11 @@
     <entry file="file://$PROJECT_DIR$/pages/main/class/class.json">
     <entry file="file://$PROJECT_DIR$/pages/main/class/class.json">
       <provider selected="true" editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     </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$/component/hot/hot.wxml">
     <entry file="file://$PROJECT_DIR$/component/hot/hot.wxml">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-290" />
         <state relative-caret-position="-290" />
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/main/class/class.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-150">
-          <caret line="61" column="5" lean-forward="true" selection-start-line="2" selection-start-column="4" selection-end-line="61" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pages/main/class/class.wxml">
     <entry file="file://$PROJECT_DIR$/pages/main/class/class.wxml">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="510">
         <state relative-caret-position="510">
@@ -445,20 +382,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.wxml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="14" column="23" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="23" />
-        </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="1530">
-          <caret line="51" column="8" selection-start-line="51" selection-start-column="8" selection-end-line="51" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/component/my/my.js">
     <entry file="file://$PROJECT_DIR$/component/my/my.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
         <state relative-caret-position="60">
@@ -466,13 +389,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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$/component/hot/hot.wxss">
     <entry file="file://$PROJECT_DIR$/component/hot/hot.wxss">
       <provider selected="true" editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     </entry>
@@ -488,11 +404,25 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/main/class/class.wxss">
     <entry file="file://$PROJECT_DIR$/pages/main/class/class.wxss">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2730">
+        <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" />
           <caret line="91" column="18" selection-start-line="91" selection-start-column="18" selection-end-line="91" selection-end-column="18" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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>
+          <caret column="21" selection-start-column="21" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxss">
     <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.wxss">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
         <state relative-caret-position="90">
@@ -502,8 +432,50 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.js">
     <entry file="file://$PROJECT_DIR$/pages/user/myconcern/myconcern.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2070">
-          <caret line="69" column="98" selection-start-line="69" selection-start-column="98" selection-end-line="69" selection-end-column="98" />
+        <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$/pages/main/class/class.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>
+      </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>
+      </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$/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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pages/user/myEdit/myEdit.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>
+      </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>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>

+ 1 - 1
component/my/my.wxss

@@ -33,7 +33,7 @@
   align-items: center;
   align-items: center;
   position: absolute;
   position: absolute;
   left: 280rpx;
   left: 280rpx;
-  /* top: 18rpx; */
+  top: 18rpx;
 }
 }
 
 
 .mine-avatar{
 .mine-avatar{

+ 1 - 5
pages/main/class/class.js

@@ -69,11 +69,7 @@ Page({
         avatar: '../../../static/image/timg.jpg',
         avatar: '../../../static/image/timg.jpg',
         likes: '1123',
         likes: '1123',
         uid: '1'
         uid: '1'
-      },
-
-
-
-    ]
+      }]
   },
   },
   onLoad: function (option) {
   onLoad: function (option) {
     console.log(option);
     console.log(option);

+ 19 - 49
pages/user/myEdit/myEdit.js

@@ -1,61 +1,31 @@
+import httpRequestApi from '../../../utils/APIClient';
 Page({
 Page({
-
   /**
   /**
    * 页面的初始数据
    * 页面的初始数据
    */
    */
   data: {
   data: {
-    zradio: [
-      { name: 'radio', sex: '女', bool: false, checked: true },
-      { name: 'radio', sex: '男', bool: false, checked: false }
-    ],
-    flag: true,
+    sexs: [
+      { value: '女',checked: true },
+      { value: '男', checked: false }
+      ], 
     occupations: [
     occupations: [
-      { name: 'radio', occupation: '家长', checked: false, status: 0 },
-      { name: 'radio', occupation: '老师', checked: false, status: 1 },
-      { name: 'radio', occupation: '学生', checked: true, status: 2  }
-    ],
-    region: ['北京市', '海淀区','万泉胜景远小学']
+      { value: '家长', checked: false },
+      { value: '老师', checked: false },
+      { value: '学生', checked: true }
+    ]
   },
   },
-  radioChange: function (e) {
-    var zradio = this.data.zradio;
-    var index = e.currentTarget.dataset.index;
-    for (let i = 0; i < zradio.length;i++){
-      if (zradio[i].checked){
-        zradio[i].checked = false;
-      }
-      else{
-        zradio[i].checked = true;
-      }
-    }
-    this.setData({
-      zradio: zradio
-    });
+  optionAction:function(e){
+    console.log(e.detail.value);
   },
   },
-  radioSetting:function(e){
-    let occupations = this.data.occupations;
-    let index = e.currentTarget.dataset.index;
-    for (let i = 0; i < occupations.length;i++){
-      let state = index;//缓存 用户当前点击的索引。
-      if (occupations[state].checked){
-        occupations[state].checked = false;
-      }
-      else{
-        occupations[state].checked = true;
-      }
-    }
-    this.setData({
-      occupations: occupations
-    });
-    console.log(occupations);
-  },
-  formSubmit: function (e) {
-    console.log('form发生了submit事件,携带数据为:', e.detail.value)
+  optionSetting: function (e) {
+    console.log(e.detail.value);
   },
   },
-  bindRegionChange: function (e) {
-    console.log('picker发送选择改变,携带值为', e.detail.value)
-    this.setData({
-      region: e.detail.value
-    })
+  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 => {
+      console.log(res.data.data);
+    });
   },
   },
   /**
   /**
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载

+ 30 - 22
pages/user/myEdit/myEdit.wxml

@@ -1,10 +1,10 @@
-<view class='container'>
+<view>
   <view class='setting-info'>
   <view class='setting-info'>
-    <form bindsubmit="formSubmit">
+    <form bindsubmit="formSubmit" class='form'>
       <view class='nickname-box'>
       <view class='nickname-box'>
         <text class='setting-title'>昵称</text>
         <text class='setting-title'>昵称</text>
         <view class='user-action'>
         <view class='user-action'>
-          <input class='nickname' type='text' placeholder='喔喔' placeholder-class='placeholderStyle'>
+          <input class='nickname' type='text' placeholder='喔喔' placeholder-class='placeholderStyle' focus='{{ true }}'>
           </input>
           </input>
         </view>
         </view>
         <view class='edit-img'>
         <view class='edit-img'>
@@ -12,34 +12,42 @@
         </view>
         </view>
       </view>
       </view>
       <view class='sex-box'>
       <view class='sex-box'>
-        <text class='setting-title'>性别</text>
-        <view class='radio-box' wx:for='{{ zradio }}' wx:key='{{ index }}' data-index='{{ index }}' bindtap='radioChange'>
-          <view>{{ item.sex }}</view>
-          <view class='radio'>
-            <view class='circle' wx:if='{{ item.bool === !item.checked }}'></view>
-          </view>
-        </view>
+        <view class='setting-title'>性别</view>
+        <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>
+        <!-- <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>
       <view class='birthday-box'>
       <view class='birthday-box'>
         <text class='setting-title'>生日</text>
         <text class='setting-title'>生日</text>
-        <view class='date'>2001年12月12日</view>
+        <input type='text' placeholder='2001年12月12日'></input>        
       </view>
       </view>
       <view class='occupation-box'>
       <view class='occupation-box'>
         <text class='setting-title'>职业</text>
         <text class='setting-title'>职业</text>
-        <view class='radio-box' wx:for='{{ occupations }}' wx:key='{{ index }}' data-index='{{ index }}' bindtap='radioSetting'>
-          <view>{{ item.occupation }}</view>
-          <view class='radio'>
-            <view class='circle' wx:if='{{ item.status === index && item.checked }}'></view>
-          </view>
-        </view>
+        <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>
+        <!-- <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>
       <view class='school-box'>
       <view class='school-box'>
         <text class='setting-title'>学校</text>
         <text class='setting-title'>学校</text>
-        <picker mode="region" bindchange="bindRegionChange" value="{{region}}" custom-item="{{customItem}}">
-          <view class="picker">
-            {{region[0]}}{{region[1]}}{{region[2]}}
-          </view>
-        </picker>
+        <input class='address' type='text' placeholder='北京市海淀区万泉胜景远小学'></input>
         <view class='edit-image'>
         <view class='edit-image'>
           <image src='../../../static/image/edit.png' class='icon'></image>
           <image src='../../../static/image/edit.png' class='icon'></image>
         </view>
         </view>

+ 48 - 31
pages/user/myEdit/myEdit.wxss

@@ -1,4 +1,4 @@
-.container{
+page{
   width: 750rpx;
   width: 750rpx;
   height: 1206rpx;
   height: 1206rpx;
   padding-top: 0;
   padding-top: 0;
@@ -16,6 +16,7 @@
   margin-top: 34rpx;
   margin-top: 34rpx;
   width: 716rpx;
   width: 716rpx;
   height: 88rpx;
   height: 88rpx;
+  position: relative;
   box-sizing: border-box;
   box-sizing: border-box;
   padding: 22rpx 0 22rpx 26rpx;
   padding: 22rpx 0 22rpx 26rpx;
   display: flex;
   display: flex;
@@ -29,10 +30,6 @@
   width: 94rpx; 
   width: 94rpx; 
 }
 }
 
 
-.user-action{
-  position: relative;
-}
-
 .placeholderStyle{
 .placeholderStyle{
   font-size: 32rpx;
   font-size: 32rpx;
   color: #737373;
   color: #737373;
@@ -41,6 +38,7 @@
 .edit-img{
 .edit-img{
   position: absolute;
   position: absolute;
   left: 220rpx;
   left: 220rpx;
+  top: 24rpx;
   width: 22rpx;
   width: 22rpx;
   height: 32rpx;
   height: 32rpx;
 }
 }
@@ -56,88 +54,107 @@
   height: 88rpx;
   height: 88rpx;
   box-sizing: border-box;
   box-sizing: border-box;
   display: flex;
   display: flex;
+  align-items: center;
   background: #FFFFFF;
   background: #FFFFFF;
   padding: 22rpx 0 22rpx 26rpx;
   padding: 22rpx 0 22rpx 26rpx;
   border-radius: 12rpx;
   border-radius: 12rpx;
 }
 }
 
 
-.radio-box{
+.school-title,.radio-each,.birthday-title,.occupation-title{
+  margin-right: 30rpx;
+}
+
+.radio-group{
   display: flex;
   display: flex;
-  margin-right: 50rpx;
 }
 }
 
 
 .sex-title{
 .sex-title{
-  display: inline-block;
-  margin-right: 30rpx;
+  position: relative;
+  top: 10rpx;
 }
 }
 
 
 .radio{
 .radio{
+  margin-right: 50rpx;
+}
+
+radio .wx-radio-input.wx-radio-input-checked::before{
+   border-radius: 50%;
+   width: 12rpx; 
+   height: 12rpx; 
+   text-align: center;
+   font-size:0rpx; /* 对勾大小 去掉 */
+   background-color: #FF5E00; 
+   transform:translate(-50%, -50%) scale(1);
+   -webkit-transform:translate(-50%, -50%) scale(1);
+}
+
+radio{
   margin-left: 20rpx;
   margin-left: 20rpx;
-  width: 32rpx;
-  height: 32rpx;
   border-radius: 50%;
   border-radius: 50%;
-  border: 4rpx solid  #FF8100;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  width: 40rpx;/* 最好是4的倍数,不然会不在中间 */
+  height: 40rpx;
+  border: 4rpx solid #FF8100;/* 设置边框(外圆) */
+  font-size: 0;/* 让边框重合 */
+}
+radio .wx-radio-input{
+   border-radius: 50%;
+   width: 40rpx;
+   height: 40rpx; 
+   border: none;/* 替换边框(隐藏原有边框) */
 }
 }
 
 
-.circle{
-  width: 12rpx;
-  height: 12rpx;
-  border-radius: 50%;
-  background:  #FF5E00;
+radio .wx-radio-input.wx-radio-input-checked{
+   border: none;
+   background: #f00; 
 }
 }
 
 
+
 .birthday-box{
 .birthday-box{
   margin-top: 20rpx;
   margin-top: 20rpx;
   width: 716rpx;
   width: 716rpx;
   height: 88rpx;
   height: 88rpx;
   box-sizing: border-box;
   box-sizing: border-box;
   display: flex;
   display: flex;
+  align-items: center;
   background: #FFFFFF;
   background: #FFFFFF;
   padding: 22rpx 0 22rpx 26rpx;
   padding: 22rpx 0 22rpx 26rpx;
   border-radius: 12rpx;
   border-radius: 12rpx;
 }
 }
 
 
-.birthday-title{
-  margin-right: 30rpx;
-}
-
 .occupation-box{
 .occupation-box{
   margin-top: 20rpx;
   margin-top: 20rpx;
   width: 716rpx;
   width: 716rpx;
   height: 88rpx;
   height: 88rpx;
   box-sizing: border-box;
   box-sizing: border-box;
   display: flex;
   display: flex;
+  align-items: center;
   background: #FFFFFF;
   background: #FFFFFF;
   padding: 22rpx 0 22rpx 26rpx;
   padding: 22rpx 0 22rpx 26rpx;
   border-radius: 12rpx;
   border-radius: 12rpx;
 }
 }
 
 
-.occupation-title{
-  margin-right: 30rpx;
-}
-
 .school-box{
 .school-box{
   margin-top: 20rpx;
   margin-top: 20rpx;
   width: 716rpx;
   width: 716rpx;
   height: 88rpx;
   height: 88rpx;
   box-sizing: border-box;
   box-sizing: border-box;
   display: flex;
   display: flex;
+  align-items: center;
   background: #FFFFFF;
   background: #FFFFFF;
   padding: 22rpx 0 22rpx 26rpx;
   padding: 22rpx 0 22rpx 26rpx;
   border-radius: 12rpx;
   border-radius: 12rpx;
   position: relative;
   position: relative;
 }
 }
 
 
-.school-title{
-  margin-right: 30rpx;
+.address{
+  width: 420rpx;
+  height: 88rpx;
 }
 }
 
 
 .edit-image{
 .edit-image{
   position: absolute;
   position: absolute;
-  right: 136rpx;
+  right: 130rpx;
+  top: 24rpx;
   width: 22rpx;
   width: 22rpx;
   height: 32rpx;
   height: 32rpx;
 }
 }

+ 17 - 10
pages/user/myconcern/myconcern.js

@@ -1,5 +1,5 @@
+import httpRequestApi from '../../../utils/APIClient';
 Page({
 Page({
-
   /**
   /**
    * 页面的初始数据
    * 页面的初始数据
    */
    */
@@ -14,7 +14,7 @@ Page({
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               concerned: '已关注',
               concerned: '已关注',
               followBack: '相互关注',
               followBack: '相互关注',
-              flag: false
+              isEachOther: false
           },
           },
           {
           {
               nickName: '木小雅',
               nickName: '木小雅',
@@ -22,7 +22,7 @@ Page({
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               concerned: '已关注',
               concerned: '已关注',
               followBack: '相互关注',
               followBack: '相互关注',
-              flag: true
+              isEachOther: true
           },
           },
           {
           {
               nickName: '清然未',
               nickName: '清然未',
@@ -30,7 +30,7 @@ Page({
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               concerned: '已关注',
               concerned: '已关注',
               followBack: '相互关注',
               followBack: '相互关注',
-              flag: false
+              isEachOther: false
           },
           },
           {
           {
               nickName: '木小雅',
               nickName: '木小雅',
@@ -38,7 +38,7 @@ Page({
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               concerned: '已关注',
               concerned: '已关注',
               followBack: '相互关注',
               followBack: '相互关注',
-              flag: true
+              isEachOther: true
           },
           },
           {
           {
               nickName: '清然未',
               nickName: '清然未',
@@ -46,7 +46,7 @@ Page({
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               concerned: '已关注',
               concerned: '已关注',
               followBack: '相互关注',
               followBack: '相互关注',
-              flag: false
+              isEachOther: false
           },
           },
           {
           {
               nickName: '清然未',
               nickName: '清然未',
@@ -54,7 +54,7 @@ Page({
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               concerned: '已关注',
               concerned: '已关注',
               followBack: '相互关注',
               followBack: '相互关注',
-              flag: false
+              isEachOther: false
           },
           },
           {
           {
               nickName: '清然未',
               nickName: '清然未',
@@ -62,7 +62,7 @@ Page({
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               concerned: '已关注',
               concerned: '已关注',
               followBack: '相互关注',
               followBack: '相互关注',
-              flag: false
+              isEachOther: false
           },
           },
           {
           {
               nickName: '木小雅',
               nickName: '木小雅',
@@ -70,7 +70,7 @@ Page({
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               concerned: '已关注',
               concerned: '已关注',
               followBack: '相互关注',
               followBack: '相互关注',
-              flag: true
+              isEachOther: true
           },
           },
           {
           {
               nickName: '木小雅',
               nickName: '木小雅',
@@ -78,7 +78,7 @@ Page({
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               avatar: 'https://developers.weixin.qq.com/miniprogram/dev/image/cat/0.jpg?t=18102320',
               concerned: '已关注',
               concerned: '已关注',
               followBack: '相互关注',
               followBack: '相互关注',
-              flag: true
+              isEachOther: true
           },
           },
       ]
       ]
   },
   },
@@ -96,6 +96,13 @@ Page({
         title: option.title
         title: option.title
       });
       });
     }
     }
+    let uid = 1, pageNo = 8, pageSize = 18;
+    httpRequestApi.getFollowUsers(uid, pageNo, pageSize).success(res => {
+      let { data } = res.data;
+      this.setData({
+        isEachOther: data.hasPrevious
+      });
+    });
   },
   },
 
 
   /**
   /**

+ 2 - 2
pages/user/myconcern/myconcern.wxml

@@ -8,13 +8,13 @@
         <text class="nickName">{{ item.nickName }}</text>
         <text class="nickName">{{ item.nickName }}</text>
         <text class="time">{{ item.time }}</text>
         <text class="time">{{ item.time }}</text>
       </view>
       </view>
-      <view class="avatar-follow" wx:if='{{ item.flag }}'>
+      <view class="avatar-follow" wx:if='{{ item.isEachOther }}'>
         <view class='avatar-img'>
         <view class='avatar-img'>
           <image class='avatar-images' src="../../../static/image/concerned.png" />
           <image class='avatar-images' src="../../../static/image/concerned.png" />
         </view>
         </view>
         <view class="follow-status">{{ item.concerned }}</view>
         <view class="follow-status">{{ item.concerned }}</view>
       </view>
       </view>
-      <view class="avatar-follow" wx:elif='{{ item.followBack === item.followBack || item.flag }}'>
+      <view class="avatar-follow" wx:elif='{{ item.followBack === item.followBack || item.isEachOther }}'>
         <view class='avatar-img'>
         <view class='avatar-img'>
           <image class='avatar-images' src="../../../static/image/concernback.png" />
           <image class='avatar-images' src="../../../static/image/concernback.png" />
         </view>
         </view>

+ 9 - 2
project.config.json

@@ -36,7 +36,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 4,
+			"current": 5,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -65,7 +65,14 @@
 				{
 				{
 					"id": -1,
 					"id": -1,
 					"name": "团购",
 					"name": "团购",
-					"pathName": "pages/groupPage/collage-details/collage-details"
+					"pathName": "pages/groupPage/collage-details/collage-details",
+					"query": ""
+				},
+				{
+					"id": 5,
+					"name": "concern",
+					"pathName": "pages/user/myconcern/myconcern",
+					"query": ""
 				}
 				}
 			]
 			]
 		}
 		}

+ 13 - 1
utils/APIClient.js

@@ -157,5 +157,17 @@ module.exports = {
 		}).url(url).data({
 		}).url(url).data({
 			orderId
 			orderId
 		}).method('POST').send();
 		}).method('POST').send();
-	}
+	},
+  // 修改资料
+  settingUserInfo(uid, wechatName, birthday, gender, eyeshield){
+    let url = getBaseUrl(`/wx/user`);
+    return request.getInstance().header({
+      uid
+    }).data({
+      wechatName: wechatName,
+      birthday: birthday,
+      gender: gender,
+      eyeshield: eyeshield
+      }).url(url).method('PUT').send();
+  }
 }
 }