From 686b0bc55c80c802a3147e14538974b3251f26aa Mon Sep 17 00:00:00 2001
From: 王晓刚 <wxg@bronet.cn>
Date: Tue, 5 Nov 2019 17:00:43 +0800
Subject: [PATCH]     音频

---
 .idea/workspace.xml                              | 69 +++++++++++++++++++++++++++++++++++----------------------------------
 application/home/controller/Member.php           |  8 +++++++-
 application/home/view/member/my_information.html |  2 +-
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dead52e..d1b6b39 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,6 +7,7 @@
     <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/home/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/home/view/member/my_information.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/member/my_information.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -34,20 +35,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Member.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Member.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="439">
-              <caret line="346" column="125" selection-start-line="346" selection-start-column="125" selection-end-line="346" selection-end-column="125" />
+            <state relative-caret-position="643">
+              <caret line="358" column="74" lean-forward="true" selection-start-line="358" selection-start-column="74" selection-end-line="358" selection-end-column="74" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="my_information.html" pinned="false" current-in-tab="false">
+      <file leaf-file-name="my_information.html" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="544">
-              <caret line="139" column="69" selection-start-line="139" selection-start-column="61" selection-end-line="139" selection-end-column="69" />
+            <state relative-caret-position="391">
+              <caret line="29" column="164" selection-start-line="29" selection-start-column="164" selection-end-line="29" selection-end-column="164" />
             </state>
           </provider>
         </entry>
@@ -64,7 +65,7 @@
       <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/home/view/member/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="691">
+            <state relative-caret-position="1734">
               <caret line="120" column="32" selection-start-line="120" selection-start-column="32" selection-end-line="120" selection-end-column="32" />
             </state>
           </provider>
@@ -194,8 +195,8 @@
         <option value="$PROJECT_DIR$/application/home/view/member/index.html" />
         <option value="$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css" />
         <option value="$PROJECT_DIR$/application/home/view/index/index.html" />
-        <option value="$PROJECT_DIR$/application/home/view/member/my_information.html" />
         <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
+        <option value="$PROJECT_DIR$/application/home/view/member/my_information.html" />
       </list>
     </option>
   </component>
@@ -441,21 +442,7 @@
       <workItem from="1572568391799" duration="24440000" />
       <workItem from="1572668245063" duration="699000" />
       <workItem from="1572827640492" duration="25475000" />
-      <workItem from="1572914713443" duration="23536000" />
-    </task>
-    <task id="LOCAL-00157" summary="视频详情">
-      <created>1572930709950</created>
-      <option name="number" value="00157" />
-      <option name="presentableId" value="LOCAL-00157" />
-      <option name="project" value="LOCAL" />
-      <updated>1572930709950</updated>
-    </task>
-    <task id="LOCAL-00158" summary="视频详情">
-      <created>1572930757401</created>
-      <option name="number" value="00158" />
-      <option name="presentableId" value="LOCAL-00158" />
-      <option name="project" value="LOCAL" />
-      <updated>1572930757401</updated>
+      <workItem from="1572914713443" duration="24308000" />
     </task>
     <task id="LOCAL-00159" summary="视频详情">
       <created>1572930903590</created>
@@ -786,11 +773,25 @@
       <option name="project" value="LOCAL" />
       <updated>1572943519309</updated>
     </task>
-    <option name="localTasksCounter" value="206" />
+    <task id="LOCAL-00206" summary="    音频">
+      <created>1572943677657</created>
+      <option name="number" value="00206" />
+      <option name="presentableId" value="LOCAL-00206" />
+      <option name="project" value="LOCAL" />
+      <updated>1572943677659</updated>
+    </task>
+    <task id="LOCAL-00207" summary="    音频">
+      <created>1572943982400</created>
+      <option name="number" value="00207" />
+      <option name="presentableId" value="LOCAL-00207" />
+      <option name="project" value="LOCAL" />
+      <updated>1572943982400</updated>
+    </task>
+    <option name="localTasksCounter" value="208" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="323114000" />
+    <option name="totallyTimeSpent" value="323886000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1199,24 +1200,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/view/member/index.html">
+    <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="691">
-          <caret line="120" column="32" selection-start-line="120" selection-start-column="32" selection-end-line="120" selection-end-column="32" />
+        <state relative-caret-position="643">
+          <caret line="358" column="74" lean-forward="true" selection-start-line="358" selection-start-column="74" selection-end-line="358" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
+    <entry file="file://$PROJECT_DIR$/application/home/view/member/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="544">
-          <caret line="139" column="69" selection-start-line="139" selection-start-column="61" selection-end-line="139" selection-end-column="69" />
+        <state relative-caret-position="1734">
+          <caret line="120" column="32" selection-start-line="120" selection-start-column="32" selection-end-line="120" selection-end-column="32" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
+    <entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="439">
-          <caret line="346" column="125" selection-start-line="346" selection-start-column="125" selection-end-line="346" selection-end-column="125" />
+        <state relative-caret-position="391">
+          <caret line="29" column="164" selection-start-line="29" selection-start-column="164" selection-end-line="29" selection-end-column="164" />
         </state>
       </provider>
     </entry>
diff --git a/application/home/controller/Member.php b/application/home/controller/Member.php
index d02c7c5..47c40d5 100644
--- a/application/home/controller/Member.php
+++ b/application/home/controller/Member.php
@@ -339,9 +339,10 @@ class Member extends WechatBase
         $this->success('success');
     }
     public function get_city(){
+        $user_id = $this->request->param('user_id');
         $longitude = $this->request->param('longitude');
         $latitude = $this->request->param('latitude');
-        if(empty($longitude) || empty($latitude)){
+        if(empty($longitude) || empty($latitude) || empty($user_id)){
             $this->error('404');
         }
         $url = "https://apis.map.qq.com/ws/geocoder/v1/?location=$latitude,$longitude&key=JMPBZ-DV7WU-WT4V7-BYCU2-XG3E5-OZB7T";
@@ -350,6 +351,11 @@ class Member extends WechatBase
         if($data['status'] != 0){
             $this->error('请求失败');
         }
+        $arr['province'] = $data['result']['address_component']['province'];
+        $arr['city'] = $data['result']['address_component']['city'];
+        $arr['district'] = $data['result']['address_component']['district'];
+        //修改用户信息
+        Db::name('user')->where(['id'=>$user_id])->update($arr);
         $this->success('SUCCESS','',$data['result']['address_component']);
     }
     public static function http_get($url){
diff --git a/application/home/view/member/my_information.html b/application/home/view/member/my_information.html
index 6713aec..ef5decd 100644
--- a/application/home/view/member/my_information.html
+++ b/application/home/view/member/my_information.html
@@ -27,7 +27,7 @@
         <div class="per_msg_single layout align_center justify flex_row" id="sexPicker">
             <div class="">性别</div>
             <div class="layout align_center justify flex_row">
-                <input type="text" placeholder="请选择性别" disabled class="sex_input" value="{$user.gender}">
+                <input type="text" placeholder="请选择性别" disabled class="sex_input" value="{if condition='$user.gender eq 1'}男{elseif condition='$user.gender eq 2'/}女{/if}">
                 <img src="__CDN__/assets/advertising/img/right.png" alt="">
             </div>
         </div>
--
libgit2 0.24.0