王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 7fc4aa267890e5e8333cc20e6f48b9586982111f 1 个父辈 214985b6
1 个管道 的构建 通过 耗费 1 秒

视频详情

内嵌 并排对比
正在显示 3 个修改的文件 包含 80 行增加 和 58 行删除
... ... @@ -67,11 +67,11 @@
</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="493">
<caret line="215" column="26" lean-forward="true" selection-start-line="215" selection-start-column="26" selection-end-line="215" selection-end-column="26" />
<state relative-caret-position="577">
<caret line="163" column="12" selection-start-line="163" selection-start-column="12" selection-end-line="163" selection-end-column="102" />
<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" />
... ... @@ -90,11 +90,11 @@
</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="204">
<caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<state relative-caret-position="238">
<caret line="176" column="102" selection-start-line="176" selection-start-column="102" selection-end-line="176" selection-end-column="102" />
<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" />
... ... @@ -113,19 +113,19 @@
</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">
<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="-4732" />
<state relative-caret-position="68">
<caret line="4" column="72" lean-forward="true" selection-start-line="4" selection-start-column="72" selection-end-line="4" selection-end-column="72" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="public.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
<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="-1275">
<caret line="30" column="30" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
</state>
<state relative-caret-position="-4732" />
</provider>
</entry>
</file>
... ... @@ -140,7 +140,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find />
<find>required</find>
<find>row</find>
<find>statusList</find>
... ... @@ -170,6 +169,7 @@
<find>error_btn</find>
<find>{if condition='$data.is_correct eq 0 &amp;&amp; $data.is_answer eq 1'}</find>
<find>checkMore</find>
<find>showErr</find>
</findStrings>
<replaceStrings>
<replace />
... ... @@ -229,9 +229,9 @@
<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/controller/Goods.php" />
<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>
... ... @@ -332,6 +332,29 @@
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -403,14 +426,7 @@
<workItem from="1572483209367" duration="35426000" />
<workItem from="1572568391799" duration="24440000" />
<workItem from="1572668245063" duration="699000" />
<workItem from="1572827640492" duration="17816000" />
</task>
<task id="LOCAL-00024" summary="提现">
<created>1572415401060</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1572415401060</updated>
<workItem from="1572827640492" duration="19412000" />
</task>
<task id="LOCAL-00025" summary="提现">
<created>1572415609581</created>
... ... @@ -748,11 +764,18 @@
<option name="project" value="LOCAL" />
<updated>1572854439522</updated>
</task>
<option name="localTasksCounter" value="73" />
<task id="LOCAL-00073" summary="视频详情">
<created>1572854512388</created>
<option name="number" value="00073" />
<option name="presentableId" value="LOCAL-00073" />
<option name="project" value="LOCAL" />
<updated>1572854512388</updated>
</task>
<option name="localTasksCounter" value="74" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="291919000" />
<option name="totallyTimeSpent" value="293515000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1062,13 +1085,6 @@
</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="51">
<caret line="3" column="69" selection-start-line="3" selection-start-column="69" selection-end-line="3" selection-end-column="69" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2465">
... ... @@ -1131,10 +1147,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="23" column="19" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
<state relative-caret-position="2527">
<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/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret line="41" selection-start-line="41" selection-end-line="42" />
</state>
</provider>
</entry>
... ... @@ -1143,40 +1166,40 @@
<state relative-caret-position="-4732" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<entry file="file://$PROJECT_DIR$/application/home/view/public/js.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2527">
<caret line="187" column="56" selection-start-line="187" selection-start-column="56" selection-end-line="187" selection-end-column="56" />
<state relative-caret-position="68">
<caret line="4" column="72" lean-forward="true" selection-start-line="4" selection-start-column="72" selection-end-line="4" selection-end-column="72" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret line="41" selection-start-line="41" selection-end-line="42" />
<state relative-caret-position="255">
<caret line="23" column="19" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="12" column="17" lean-forward="true" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<state relative-caret-position="577">
<caret line="163" column="12" selection-start-line="163" selection-start-column="12" selection-end-line="163" selection-end-column="102" />
<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" />
<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" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="215" column="26" lean-forward="true" selection-start-line="215" selection-start-column="26" selection-end-line="215" selection-end-column="26" />
<state relative-caret-position="238">
<caret line="176" column="102" selection-start-line="176" selection-start-column="102" selection-end-line="176" selection-end-column="102" />
<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" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
<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>
... ...
... ... @@ -161,7 +161,7 @@
var lat = '';
var lng = '';
//定位当前位置
var geolocation = new qq.maps.Geolocation("LQNBZ-F3L34-EQMUR-DILMD-LBR4Q-GDFOH", "myapp");
var geolocation = new qq.maps.Geolocation("JMPBZ-DV7WU-WT4V7-BYCU2-XG3E5-OZB7T", "广告公众号");
var positionNum = 0;
var options = {
timeout: 5000
... ... @@ -212,8 +212,7 @@
});
}
function showErr(res) {
alert(res);
function showErr() {
toast('定位失败');
};
//定位
... ...
... ... @@ -174,7 +174,7 @@
var lat = '';
var lng = '';
//定位当前位置
var geolocation = new qq.maps.Geolocation("LQNBZ-F3L34-EQMUR-DILMD-LBR4Q-GDFOH", "myapp");
var geolocation = new qq.maps.Geolocation("JMPBZ-DV7WU-WT4V7-BYCU2-XG3E5-OZB7T", "广告公众号");
var positionNum = 0;
var options = {
timeout: 5000
... ...