diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c550253..2fc8a55 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,6 +5,7 @@ </component> <component name="ChangeListManager"> <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/view/goods/audio_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -93,8 +94,8 @@ <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="747"> - <caret line="329" column="17" lean-forward="true" selection-start-line="329" selection-start-column="17" selection-end-line="329" selection-end-column="17" /> + <state relative-caret-position="254"> + <caret line="314" column="33" selection-start-line="314" selection-start-column="33" selection-end-line="314" selection-end-column="33" /> <folding> <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> </folding> @@ -132,7 +133,6 @@ </component> <component name="FindInProjectRecents"> <findStrings> - <find>#D12324</find> <find>answer_word</find> <find>vide</find> <find>nav_img</find> @@ -162,6 +162,7 @@ <find>business_images</find> <find>与服务器断开连接</find> <find>与服务器断开连接3</find> + <find>quest_condition</find> </findStrings> <replaceStrings> <replace /> @@ -496,28 +497,7 @@ <workItem from="1573174620844" duration="32581000" /> <workItem from="1573259331081" duration="30435000" /> <workItem from="1573432217070" duration="2199000" /> - <workItem from="1573519427130" duration="4238000" /> - </task> - <task id="LOCAL-00504" summary=" 商户申请"> - <created>1573284036394</created> - <option name="number" value="00504" /> - <option name="presentableId" value="LOCAL-00504" /> - <option name="project" value="LOCAL" /> - <updated>1573284036394</updated> - </task> - <task id="LOCAL-00505" summary=" 商户申请"> - <created>1573284984083</created> - <option name="number" value="00505" /> - <option name="presentableId" value="LOCAL-00505" /> - <option name="project" value="LOCAL" /> - <updated>1573284984083</updated> - </task> - <task id="LOCAL-00506" summary=" 商户申请"> - <created>1573286104682</created> - <option name="number" value="00506" /> - <option name="presentableId" value="LOCAL-00506" /> - <option name="project" value="LOCAL" /> - <updated>1573286104682</updated> + <workItem from="1573519427130" duration="4554000" /> </task> <task id="LOCAL-00507" summary=" 商户申请"> <created>1573286413188</created> @@ -841,11 +821,32 @@ <option name="project" value="LOCAL" /> <updated>1573526757451</updated> </task> - <option name="localTasksCounter" value="553" /> + <task id="LOCAL-00553" summary=" 商户申请"> + <created>1573526837622</created> + <option name="number" value="00553" /> + <option name="presentableId" value="LOCAL-00553" /> + <option name="project" value="LOCAL" /> + <updated>1573526837622</updated> + </task> + <task id="LOCAL-00554" summary=" 商户申请"> + <created>1573526885516</created> + <option name="number" value="00554" /> + <option name="presentableId" value="LOCAL-00554" /> + <option name="project" value="LOCAL" /> + <updated>1573526885516</updated> + </task> + <task id="LOCAL-00555" summary=" 商户申请"> + <created>1573527096735</created> + <option name="number" value="00555" /> + <option name="presentableId" value="LOCAL-00555" /> + <option name="project" value="LOCAL" /> + <updated>1573527096735</updated> + </task> + <option name="localTasksCounter" value="556" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="410545000" /> + <option name="totallyTimeSpent" value="410861000" /> </component> <component name="ToolWindowManager"> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> @@ -1228,8 +1229,8 @@ </entry> <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="747"> - <caret line="329" column="17" lean-forward="true" selection-start-line="329" selection-start-column="17" selection-end-line="329" selection-end-column="17" /> + <state relative-caret-position="254"> + <caret line="314" column="33" selection-start-line="314" selection-start-column="33" selection-end-line="314" selection-end-column="33" /> <folding> <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> </folding> diff --git a/application/home/view/goods/audio_detail.html b/application/home/view/goods/audio_detail.html index 3de3d8c..d7f0fbe 100644 --- a/application/home/view/goods/audio_detail.html +++ b/application/home/view/goods/audio_detail.html @@ -312,6 +312,7 @@ $.ajax({ url:"{:url('home/index/distance_where')}", type:"POST", + dataType: "json", data:{'user_id':user_id,'longitude':lng,'latitude':lat,'goods_id':goods_id}, success:function(res){ console.log("@@@@");