王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 37d571cdddbb8388ea83b31c19ee94fc186c6d37 1 个父辈 f2554cdc
1 个管道 的构建 通过 耗费 0 秒

视频详情

内嵌 并排对比
正在显示 3 个修改的文件 包含 28 行增加 和 27 行删除
... ... @@ -3,6 +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/public/js.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/public/js.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -67,11 +68,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="content_detail.html" pinned="false" current-in-tab="false">
<file leaf-file-name="content_detail.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="373">
<caret line="166" column="30" lean-forward="true" selection-start-line="166" selection-start-column="30" selection-end-line="166" selection-end-column="30" />
<state relative-caret-position="186">
<caret line="113" column="90" selection-start-line="113" selection-start-column="90" selection-end-line="113" selection-end-column="90" />
<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" />
... ... @@ -113,11 +114,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="js.html" pinned="false" current-in-tab="true">
<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="17">
<caret line="1" column="59" selection-start-line="1" selection-start-column="59" selection-end-line="1" selection-end-column="59" />
<state>
<caret column="28" selection-start-column="28" selection-end-column="28" />
</state>
</provider>
</entry>
... ... @@ -230,8 +231,8 @@
<option value="$PROJECT_DIR$/application/database.php" />
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/video_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/public/js.html" />
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
</list>
</option>
</component>
... ... @@ -426,14 +427,7 @@
<workItem from="1572483209367" duration="35426000" />
<workItem from="1572568391799" duration="24440000" />
<workItem from="1572668245063" duration="699000" />
<workItem from="1572827640492" duration="20560000" />
</task>
<task id="LOCAL-00031" summary="调试提现">
<created>1572416152695</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1572416152695</updated>
<workItem from="1572827640492" duration="20611000" />
</task>
<task id="LOCAL-00032" summary="调试提现">
<created>1572416234275</created>
... ... @@ -771,11 +765,18 @@
<option name="project" value="LOCAL" />
<updated>1572856936108</updated>
</task>
<option name="localTasksCounter" value="80" />
<task id="LOCAL-00080" summary="视频详情">
<created>1572857259487</created>
<option name="number" value="00080" />
<option name="presentableId" value="LOCAL-00080" />
<option name="project" value="LOCAL" />
<updated>1572857259487</updated>
</task>
<option name="localTasksCounter" value="81" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="294663000" />
<option name="totallyTimeSpent" value="294714000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1185,10 +1186,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/public/js.html">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="28" selection-start-column="28" selection-end-column="28" />
</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="373">
<caret line="166" column="30" lean-forward="true" selection-start-line="166" selection-start-column="30" selection-end-line="166" selection-end-column="30" />
<state relative-caret-position="186">
<caret line="113" column="90" selection-start-line="113" selection-start-column="90" selection-end-line="113" selection-end-column="90" />
<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" />
... ... @@ -1197,13 +1205,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="17">
<caret line="1" column="59" selection-start-line="1" selection-start-column="59" selection-end-line="1" selection-end-column="59" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
... ...
... ... @@ -111,6 +111,7 @@
<div class="btn right_btn submit">提交答案</div>
<div class="btn error_btn" style="display: none;">重新答题（<i class="new_time"></i>）</div>
</div>
<div onclick="geolocation.getLocation(showPosition, showErr);">123456464</div>
<!-- 未满足答题条件 -->
<div class="quest_box {if condition='$user.is_satisfy eq 1'}quest_condition{/if}">
<div class="quest_title">对不起，您未满足当前题目答题条件</div>
... ...
<div class="toast">提示框</div>
<div onclick="geolocation.getLocation(showPosition, showErr);">123456464</div>
<script src="__CDN__/assets/advertising/js/base.js"></script>
<script src="__CDN__/assets/advertising/js/jquery.js"></script>
<!--<script src="__CDN__/assets/advertising/js/toast.js"></script>-->
... ...