王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 10131848f992c19cfdfb438c4eec14e5ff5c6eed 1 个父辈 9081acda
1 个管道 的构建 通过 耗费 3 秒

视频详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 105 行增加 和 77 行删除
... ... @@ -2,7 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<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" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -39,15 +40,6 @@
</provider>
</entry>
</file>
<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="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>
</file>
<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">
... ... @@ -60,8 +52,8 @@
<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="357">
<caret line="267" column="45" selection-start-line="267" selection-start-column="45" selection-end-line="267" selection-end-column="45" />
<state relative-caret-position="17">
<caret line="18" selection-start-line="18" selection-end-line="55" selection-end-column="6" />
<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" />
... ... @@ -74,17 +66,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 relative-caret-position="561">
<state relative-caret-position="17">
<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="true">
<file leaf-file-name="video_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339">
<caret line="288" column="31" selection-start-line="288" selection-start-column="31" selection-end-line="288" selection-end-column="31" />
<state relative-caret-position="308">
<caret line="475" column="52" lean-forward="true" selection-start-line="475" selection-start-column="52" selection-end-line="475" selection-end-column="52" />
<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" />
... ... @@ -94,11 +86,33 @@
</provider>
</entry>
</file>
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5561">
<caret line="486" lean-forward="true" selection-start-line="486" selection-end-line="486" />
<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" />
<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>
</file>
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="521">
<caret line="50" column="36" selection-start-line="50" selection-start-column="36" selection-end-line="50" selection-end-column="36" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="26" column="20" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
</state>
</provider>
</entry>
... ... @@ -128,8 +142,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>row</find>
<find>statusList</find>
<find>money</find>
<find>target_url</find>
<find>sun_05</find>
... ... @@ -158,6 +170,8 @@
<find>showErr</find>
<find>checkMore</find>
<find>error_btn</find>
<find>submit</find>
<find>end_day</find>
</findStrings>
<replaceStrings>
<replace />
... ... @@ -169,7 +183,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js" />
<option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
<option value="$PROJECT_DIR$/application/admin/model/Goods.php" />
... ... @@ -216,10 +229,11 @@
<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/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" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
</list>
</option>
</component>
... ... @@ -332,6 +346,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>
... ... @@ -415,28 +437,7 @@
<workItem from="1572568391799" duration="24440000" />
<workItem from="1572668245063" duration="699000" />
<workItem from="1572827640492" duration="25475000" />
<workItem from="1572914713443" duration="159000" />
</task>
<task id="LOCAL-00051" summary="调试授权登录">
<created>1572505046783</created>
<option name="number" value="00051" />
<option name="presentableId" value="LOCAL-00051" />
<option name="project" value="LOCAL" />
<updated>1572505046783</updated>
</task>
<task id="LOCAL-00052" summary="调试授权登录">
<created>1572505152338</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1572505152338</updated>
</task>
<task id="LOCAL-00053" summary="调试授权登录">
<created>1572505172092</created>
<option name="number" value="00053" />
<option name="presentableId" value="LOCAL-00053" />
<option name="project" value="LOCAL" />
<updated>1572505172092</updated>
<workItem from="1572914713443" duration="1823000" />
</task>
<task id="LOCAL-00054" summary="调试授权登录">
<created>1572505198570</created>
... ... @@ -760,11 +761,32 @@
<option name="project" value="LOCAL" />
<updated>1572914753549</updated>
</task>
<option name="localTasksCounter" value="100" />
<task id="LOCAL-00100" summary="视频详情">
<created>1572914877477</created>
<option name="number" value="00100" />
<option name="presentableId" value="LOCAL-00100" />
<option name="project" value="LOCAL" />
<updated>1572914877477</updated>
</task>
<task id="LOCAL-00101" summary="视频详情">
<created>1572914936317</created>
<option name="number" value="00101" />
<option name="presentableId" value="LOCAL-00101" />
<option name="project" value="LOCAL" />
<updated>1572914936318</updated>
</task>
<task id="LOCAL-00102" summary="视频详情">
<created>1572916289087</created>
<option name="number" value="00102" />
<option name="presentableId" value="LOCAL-00102" />
<option name="project" value="LOCAL" />
<updated>1572916289088</updated>
</task>
<option name="localTasksCounter" value="103" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="299737000" />
<option name="totallyTimeSpent" value="301401000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -842,20 +864,6 @@
<option name="LAST_COMMIT_MESSAGE" value="视频详情" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/view/slide/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="30" column="33" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/Slide.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="511">
<caret line="34" column="46" selection-start-line="34" selection-start-column="46" selection-end-line="34" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Slide.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
... ... @@ -1146,13 +1154,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="561">
<caret line="41" selection-start-line="41" selection-end-line="42" />
</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="119">
... ... @@ -1160,17 +1161,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="17">
<caret line="41" selection-start-line="41" selection-end-line="42" />
</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="357">
<caret line="267" column="45" selection-start-line="267" selection-start-column="45" selection-end-line="267" selection-end-column="45" />
<state relative-caret-position="17">
<caret line="18" selection-start-line="18" selection-end-line="55" selection-end-column="6" />
<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" />
... ... @@ -1181,8 +1182,8 @@
</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="339">
<caret line="288" column="31" selection-start-line="288" selection-start-column="31" selection-end-line="288" selection-end-column="31" />
<state relative-caret-position="308">
<caret line="475" column="52" lean-forward="true" selection-start-line="475" selection-start-column="52" selection-end-line="475" selection-end-column="52" />
<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" />
... ... @@ -1191,6 +1192,31 @@
</state>
</provider>
</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="5561">
<caret line="486" lean-forward="true" selection-start-line="486" selection-end-line="486" />
<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" />
<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/model/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="26" column="20" selection-start-line="26" selection-start-column="20" selection-end-line="26" selection-end-column="20" />
</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="521">
<caret line="50" column="36" selection-start-line="50" selection-start-column="36" selection-end-line="50" selection-end-column="36" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
... ...
... ... @@ -44,9 +44,11 @@ class Goods extends WechatBase
$data['video'] = $domain_name.$data['video'];
}
if(!empty($data['voice'])){
foreach($data['voice'] as $key => $v){
$data[$key]['voice'] = $domain_name.$v;
$voice = explode(',',$data['voice']);
foreach($voice as $key => $v){
$voice[$key] = $domain_name.$v;
}
$data['voice'] = $voice;
}
if(empty($data)){
$this->error('404');
... ...