王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 c647c0b7f665fecd6a61f30bd1507c6ce6c9577b 1 个父辈 f7271ed0
1 个管道 的构建 通过 耗费 8 秒

后台bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 81 行增加 和 54 行删除
... ... @@ -5,7 +5,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/application/home/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" />
<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/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" />
... ... @@ -51,11 +52,29 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="521">
<caret line="107" column="7" lean-forward="true" selection-start-line="90" selection-start-column="4" selection-end-line="107" selection-end-column="7" />
<state relative-caret-position="453">
<caret line="103" column="52" selection-start-line="103" selection-start-column="52" selection-end-line="103" selection-end-column="52" />
</state>
</provider>
</entry>
</file>
<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="306">
<caret line="63" column="68" selection-start-line="63" selection-start-column="68" selection-end-line="63" selection-end-column="68" />
</state>
</provider>
</entry>
</file>
<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 relative-caret-position="459">
<caret line="95" column="14" selection-start-line="95" selection-start-column="8" selection-end-line="95" selection-end-column="14" />
</state>
</provider>
</entry>
... ... @@ -118,7 +137,6 @@
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
<option value="$PROJECT_DIR$/application/home/view/member/my_information.html" />
<option value="$PROJECT_DIR$/application/home/view/public/head.html" />
<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/admin/controller/UserExpLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
... ... @@ -156,13 +174,14 @@
<option value="$PROJECT_DIR$/application/admin/view/users/edit.html" />
<option value="$PROJECT_DIR$/thinkphp/library/think/Controller.php" />
<option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/users.js" />
<option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
<option value="$PROJECT_DIR$/application/home/controller/Question.php" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/video_detail.html" />
</list>
</option>
</component>
... ... @@ -334,6 +353,14 @@
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="goods" 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>
... ... @@ -443,35 +470,7 @@
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="17475000" />
<workItem from="1573605070739" duration="29138000" />
<workItem from="1573691027933" duration="990000" />
</task>
<task id="LOCAL-00624" summary=" 商户申请">
<created>1573615257512</created>
<option name="number" value="00624" />
<option name="presentableId" value="LOCAL-00624" />
<option name="project" value="LOCAL" />
<updated>1573615257512</updated>
</task>
<task id="LOCAL-00625" summary=" 商户申请">
<created>1573615898984</created>
<option name="number" value="00625" />
<option name="presentableId" value="LOCAL-00625" />
<option name="project" value="LOCAL" />
<updated>1573615898984</updated>
</task>
<task id="LOCAL-00626" summary=" 商户申请">
<created>1573625341601</created>
<option name="number" value="00626" />
<option name="presentableId" value="LOCAL-00626" />
<option name="project" value="LOCAL" />
<updated>1573625341601</updated>
</task>
<task id="LOCAL-00627" summary="后台bug">
<created>1573625586532</created>
<option name="number" value="00627" />
<option name="presentableId" value="LOCAL-00627" />
<option name="project" value="LOCAL" />
<updated>1573625586532</updated>
<workItem from="1573691027933" duration="2534000" />
</task>
<task id="LOCAL-00628" summary="后台bug">
<created>1573626294912</created>
... ... @@ -788,11 +787,39 @@
<option name="project" value="LOCAL" />
<updated>1573691401318</updated>
</task>
<option name="localTasksCounter" value="673" />
<task id="LOCAL-00673" summary="后台bug">
<created>1573692416579</created>
<option name="number" value="00673" />
<option name="presentableId" value="LOCAL-00673" />
<option name="project" value="LOCAL" />
<updated>1573692416579</updated>
</task>
<task id="LOCAL-00674" summary="后台bug">
<created>1573692507953</created>
<option name="number" value="00674" />
<option name="presentableId" value="LOCAL-00674" />
<option name="project" value="LOCAL" />
<updated>1573692507953</updated>
</task>
<task id="LOCAL-00675" summary="后台bug">
<created>1573692592756</created>
<option name="number" value="00675" />
<option name="presentableId" value="LOCAL-00675" />
<option name="project" value="LOCAL" />
<updated>1573692592756</updated>
</task>
<task id="LOCAL-00676" summary="后台bug">
<created>1573693331724</created>
<option name="number" value="00676" />
<option name="presentableId" value="LOCAL-00676" />
<option name="project" value="LOCAL" />
<updated>1573693331724</updated>
</task>
<option name="localTasksCounter" value="677" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="453910000" />
<option name="totallyTimeSpent" value="455454000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -882,13 +909,6 @@
<option name="LAST_COMMIT_MESSAGE" value="后台bug" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/view/goods/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="388">
<caret line="220" column="73" selection-start-line="220" selection-start-column="73" selection-end-line="220" selection-end-column="73" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/goods_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
... ... @@ -1107,13 +1127,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/users/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
... ... @@ -1192,8 +1205,22 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="521">
<caret line="107" column="7" lean-forward="true" selection-start-line="90" selection-start-column="4" selection-end-line="107" selection-end-column="7" />
<state relative-caret-position="453">
<caret line="103" column="52" selection-start-line="103" selection-start-column="52" selection-end-line="103" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="95" column="14" selection-start-line="95" selection-start-column="8" selection-end-line="95" selection-end-column="14" />
</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="306">
<caret line="63" column="68" selection-start-line="63" selection-start-column="68" selection-end-line="63" selection-end-column="68" />
</state>
</provider>
</entry>
... ...
... ... @@ -61,7 +61,7 @@
<!-- 视频 -->
<div class="detail_video_wrap">
<div class="detail_video">
<video src="{$data.video}" id="vide" webkit-playsinline="true" x5-playsinline="true" playsinline="true"></video>
<video src="{$data.video}" id="vide" controls="false" webkit-playsinline="true" x5-playsinline="true" playsinline="true"></video>
<!-- 禁止拖动 -->
<div class="stop_drag"></div>
<div class="video_img">
... ...