diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1bc82e2..ead5bdd 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,7 @@ <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/content_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/content_detail.html" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/application/home/view/goods/video_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/video_detail.html" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -43,7 +43,7 @@ <file leaf-file-name="advDetail.css" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/advDetail.css"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="271"> + <state relative-caret-position="663"> <caret line="39" column="1" selection-start-line="39" selection-start-column="1" selection-end-line="39" selection-end-column="1" /> </state> </provider> @@ -52,17 +52,17 @@ <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/home/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="2527"> + <state relative-caret-position="3179"> <caret line="187" column="56" selection-start-line="187" selection-start-column="56" selection-end-line="187" selection-end-column="56" /> </state> </provider> </entry> </file> - <file leaf-file-name="content_detail.html" pinned="false" current-in-tab="true"> + <file leaf-file-name="content_detail.html" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="475"> - <caret line="190" column="36" selection-start-line="190" selection-start-column="36" selection-end-line="190" selection-end-column="36" /> + <state relative-caret-position="357"> + <caret line="267" column="45" selection-start-line="267" selection-start-column="45" selection-end-line="267" selection-end-column="45" /> <folding> <element signature="n#style#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> @@ -75,17 +75,17 @@ <file leaf-file-name="Index.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> <provider selected="true" editor-type-id="text-editor"> - <state> + <state relative-caret-position="561"> <caret line="41" selection-start-line="41" selection-end-line="42" /> </state> </provider> </entry> </file> - <file leaf-file-name="video_detail.html" pinned="false" current-in-tab="false"> + <file leaf-file-name="video_detail.html" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="340"> - <caret line="182" column="33" selection-start-line="182" selection-start-column="21" selection-end-line="182" selection-end-column="33" /> + <state relative-caret-position="629"> + <caret line="238" column="26" selection-start-line="238" selection-start-column="26" selection-end-line="238" selection-end-column="26" /> <folding> <element signature="n#style#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> @@ -98,7 +98,7 @@ <file leaf-file-name="Goods.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="674"> + <state relative-caret-position="1887"> <caret line="120" column="60" selection-start-line="120" selection-start-column="60" selection-end-line="120" selection-end-column="60" /> </state> </provider> @@ -107,17 +107,15 @@ <file leaf-file-name="js.html" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/home/view/public/js.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="170"> - <caret line="10" column="27" lean-forward="true" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" /> + <state relative-caret-position="119"> + <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" /> </state> </provider> </entry> </file> <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="-4732" /> - </provider> + <provider selected="true" editor-type-id="text-editor" /> </entry> </file> </leaf> @@ -156,11 +154,11 @@ <find>btn_more</find> <find>detail_qust</find> <find>detail_top</find> - <find>error_btn</find> <find>{if condition='$data.is_correct eq 0 && $data.is_answer eq 1'}</find> <find>targetSdkVersion</find> - <find>checkMore</find> <find>showErr</find> + <find>checkMore</find> + <find>error_btn</find> </findStrings> <replaceStrings> <replace /> @@ -219,10 +217,10 @@ <option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" /> <option value="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" /> <option value="$PROJECT_DIR$/application/database.php" /> - <option value="$PROJECT_DIR$/application/home/view/goods/video_detail.html" /> - <option value="$PROJECT_DIR$/application/home/view/public/js.html" /> <option value="$PROJECT_DIR$/application/home/controller/Goods.php" /> + <option value="$PROJECT_DIR$/application/home/view/public/js.html" /> <option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" /> + <option value="$PROJECT_DIR$/application/home/view/goods/video_detail.html" /> </list> </option> </component> @@ -297,7 +295,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <expand> @@ -350,6 +347,7 @@ <select /> </subPane> </pane> + <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> @@ -417,21 +415,8 @@ <workItem from="1572483209367" duration="35426000" /> <workItem from="1572568391799" duration="24440000" /> <workItem from="1572668245063" duration="699000" /> - <workItem from="1572827640492" duration="23942000" /> - </task> - <task id="LOCAL-00048" summary="调试授权登录"> - <created>1572504815693</created> - <option name="number" value="00048" /> - <option name="presentableId" value="LOCAL-00048" /> - <option name="project" value="LOCAL" /> - <updated>1572504815693</updated> - </task> - <task id="LOCAL-00049" summary="调试授权登录"> - <created>1572504885453</created> - <option name="number" value="00049" /> - <option name="presentableId" value="LOCAL-00049" /> - <option name="project" value="LOCAL" /> - <updated>1572504885453</updated> + <workItem from="1572827640492" duration="25475000" /> + <workItem from="1572914713443" duration="27000" /> </task> <task id="LOCAL-00050" summary="调试授权登录"> <created>1572504923532</created> @@ -762,11 +747,25 @@ <option name="project" value="LOCAL" /> <updated>1572860543038</updated> </task> - <option name="localTasksCounter" value="97" /> + <task id="LOCAL-00097" summary="视频详情"> + <created>1572860646307</created> + <option name="number" value="00097" /> + <option name="presentableId" value="LOCAL-00097" /> + <option name="project" value="LOCAL" /> + <updated>1572860646307</updated> + </task> + <task id="LOCAL-00098" summary="视频详情"> + <created>1572861657991</created> + <option name="number" value="00098" /> + <option name="presentableId" value="LOCAL-00098" /> + <option name="project" value="LOCAL" /> + <updated>1572861657992</updated> + </task> + <option name="localTasksCounter" value="99" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="298045000" /> + <option name="totallyTimeSpent" value="299605000" /> </component> <component name="ToolWindowManager"> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> @@ -780,7 +779,7 @@ <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" /> <window_info anchor="bottom" id="运行" order="7" /> <window_info anchor="right" id="Remote Host" order="3" weight="0.32995737" /> - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15191898" /> + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15351813" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="right" id="Database" order="3" weight="0.32995737" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> @@ -801,25 +800,25 @@ <window_info anchor="bottom" id="运行" order="7" /> <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" /> - <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Remote Host" order="3" weight="0.32995737" /> + <window_info id="Favorites" order="2" side_tool="true" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15191898" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> - <window_info anchor="bottom" id="TODO" order="6" /> + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" /> + <window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="Run" order="2" /> <window_info anchor="bottom" id="Find" order="1" /> - <window_info anchor="bottom" id="Message" order="0" /> - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="right" id="Database" order="4" weight="0.32995737" /> <window_info anchor="bottom" id="Terminal" order="11" weight="0.32997763" /> <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.32997763" /> + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="调试" order="13" /> + <window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> - <window_info id="Favorites" order="2" side_tool="true" /> </layout-to-restore> </component> <component name="TypeScriptGeneratedFilesManager"> @@ -1119,22 +1118,20 @@ </entry> <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/advDetail.css"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="271"> + <state relative-caret-position="663"> <caret line="39" column="1" selection-start-line="39" selection-start-column="1" selection-end-line="39" selection-end-column="1" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/application/home/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="2527"> + <state relative-caret-position="3179"> <caret line="187" column="56" selection-start-line="187" selection-start-column="56" selection-end-line="187" selection-end-column="56" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="-4732" /> - </provider> + <provider selected="true" editor-type-id="text-editor" /> </entry> <entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html"> <provider selected="true" editor-type-id="text-editor"> @@ -1150,43 +1147,31 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/application/home/view/public/js.html"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="170"> - <caret line="10" column="27" lean-forward="true" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html"> + <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="340"> - <caret line="182" column="33" selection-start-line="182" selection-start-column="21" selection-end-line="182" selection-end-column="33" /> - <folding> - <element signature="n#style#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> - <element signature="n#style#0;n#div#4;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> - </folding> + <state relative-caret-position="561"> + <caret line="41" selection-start-line="41" selection-end-line="42" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> + <entry file="file://$PROJECT_DIR$/application/home/view/public/js.html"> <provider selected="true" editor-type-id="text-editor"> - <state> - <caret line="41" selection-start-line="41" selection-end-line="42" /> + <state relative-caret-position="119"> + <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="674"> + <state relative-caret-position="1887"> <caret line="120" column="60" selection-start-line="120" selection-start-column="60" selection-end-line="120" selection-end-column="60" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="475"> - <caret line="190" column="36" selection-start-line="190" selection-start-column="36" selection-end-line="190" selection-end-column="36" /> + <state relative-caret-position="357"> + <caret line="267" column="45" selection-start-line="267" selection-start-column="45" selection-end-line="267" selection-end-column="45" /> <folding> <element signature="n#style#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> @@ -1195,6 +1180,18 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="629"> + <caret line="238" column="26" selection-start-line="238" selection-start-column="26" selection-end-line="238" selection-end-column="26" /> + <folding> + <element signature="n#style#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> + <element signature="n#style#0;n#div#4;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states> diff --git a/application/home/view/goods/video_detail.html b/application/home/view/goods/video_detail.html index d98324e..93226f2 100644 --- a/application/home/view/goods/video_detail.html +++ b/application/home/view/goods/video_detail.html @@ -194,7 +194,7 @@ }); }); - function showPosition(data) { + function success(data) { lat = data.latitude; //经度 lng = data.longitude; //纬度 //保存到用户表 @@ -236,7 +236,7 @@ }); } - function showErr() { + function error() { toast('定位失败'); }; //定位