王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 1bae9f948e83e161d50fea7b70e8a9a86e4da2fa 1 个父辈 971bbd15
1 个管道 的构建 通过 耗费 0 秒

广告详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 60 行增加 和 83 行删除
... ... @@ -2,11 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/home/view/goods/content_detail.html" afterDir="false" />
<change 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" />
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -23,29 +20,17 @@
<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="357">
<caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="authorization_view.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="59" column="43" selection-start-line="59" selection-start-column="43" selection-end-line="59" selection-end-column="43" />
<folding>
<element signature="n#style#0;n#html#0;n#!!top" />
</folding>
<state relative-caret-position="476">
<caret line="43" column="57" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="57" />
</state>
</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="323">
<caret line="19" column="91" selection-start-line="19" selection-start-column="91" selection-end-line="19" selection-end-column="91" />
<state relative-caret-position="527">
<caret line="31" column="69" selection-start-line="31" selection-start-column="69" selection-end-line="31" selection-end-column="69" />
</state>
</provider>
</entry>
... ... @@ -77,11 +62,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
<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="657">
<caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
<state relative-caret-position="470">
<caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="69" selection-end-column="32" />
</state>
</provider>
</entry>
... ... @@ -192,8 +177,8 @@
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/User.php" />
<option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
</list>
</option>
</component>
... ... @@ -443,14 +428,7 @@
<workItem from="1572223206994" duration="28857000" />
<workItem from="1572309778506" duration="26117000" />
<workItem from="1572395935540" duration="28313000" />
<workItem from="1572483209367" duration="16126000" />
</task>
<task id="LOCAL-00008" summary="调试授权">
<created>1571976018612</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1571976018612</updated>
<workItem from="1572483209367" duration="16289000" />
</task>
<task id="LOCAL-00009" summary="调试授权">
<created>1571979680270</created>
... ... @@ -788,11 +766,18 @@
<option name="project" value="LOCAL" />
<updated>1572505562274</updated>
</task>
<option name="localTasksCounter" value="57" />
<task id="LOCAL-00057" summary="广告详情">
<created>1572507187873</created>
<option name="number" value="00057" />
<option name="presentableId" value="LOCAL-00057" />
<option name="project" value="LOCAL" />
<updated>1572507187873</updated>
</task>
<option name="localTasksCounter" value="58" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="229664000" />
<option name="totallyTimeSpent" value="229827000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -862,7 +847,8 @@
<MESSAGE value="调试提现" />
<MESSAGE value="权限调试" />
<MESSAGE value="调试授权登录" />
<option name="LAST_COMMIT_MESSAGE" value="调试授权登录" />
<MESSAGE value="广告详情" />
<option name="LAST_COMMIT_MESSAGE" value="广告详情" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js">
... ... @@ -1142,13 +1128,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
... ... @@ -1187,41 +1166,48 @@
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="59" column="43" selection-start-line="59" selection-start-column="43" selection-end-line="59" selection-end-column="43" />
<folding>
<element signature="n#style#0;n#html#0;n#!!top" />
</folding>
<state relative-caret-position="334">
<caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" column="91" selection-start-line="19" selection-start-column="91" selection-end-line="19" selection-end-column="91" />
<state relative-caret-position="493">
<caret line="149" column="46" selection-start-line="149" selection-start-column="35" selection-end-line="149" selection-end-column="46" />
</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 relative-caret-position="334">
<caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
<state relative-caret-position="470">
<caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="69" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="149" column="46" selection-start-line="149" selection-start-column="35" selection-end-line="149" selection-end-column="46" />
<state relative-caret-position="306">
<caret line="63" selection-start-line="63" selection-end-line="63" selection-end-column="28" />
<folding>
<element signature="n#style#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476">
<caret line="43" column="57" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="57" />
</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="657">
<caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
<state relative-caret-position="527">
<caret line="31" column="69" selection-start-line="31" selection-start-column="69" selection-end-line="31" selection-end-column="69" />
</state>
</provider>
</entry>
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>广告商城</title>
<link rel="stylesheet" href="css/public.css">
<link rel="stylesheet" href="css/advDetail.css">
</head>
{include file="public/head"/}
<link rel="stylesheet" href="css/advDetail.css">
<body>
<div class="adv_detail clearfix">
... ... @@ -35,25 +29,25 @@
<div class="answer layout align_center flex_row">
<div class="layout align_center flex_row ans_single" data-index="1">
<div class="ans_img">
<img src="img/sun_07@2x.png" alt="" class="choice_img">
<img src="__CDN__/assets/advertising/img/sun_07@2x.png" alt="" class="choice_img">
</div>
<div class="answer_word choice_ans">老坛酸菜牛肉面</div>
</div>
<div class="layout align_center flex_row ans_single" data-index="2">
<div class="ans_img">
<img src="img/sun_06@2x.png" alt="" class="choice_img">
<img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
</div>
<div class="answer_word">红烧牛肉鸡蛋面</div>
</div>
<div class="layout align_center flex_row ans_single" data-index="3">
<div class="ans_img">
<img src="img/sun_06@2x.png" alt="" class="choice_img">
<img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
</div>
<div class="answer_word">黑椒牛排酸菜牛肉面</div>
</div>
<div class="layout align_center flex_row ans_single" data-index="4">
<div class="ans_img">
<img src="img/sun_06@2x.png" alt="" class="choice_img">
<img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
</div>
<div class="answer_word">牛骨酸菜牛肉面</div>
</div>
... ... @@ -66,25 +60,25 @@
<div class="answer layout align_center flex_row">
<div class="layout align_center flex_row ans_single" data-index="5">
<div class="ans_img">
<img src="img/sun_07@2x.png" alt="" class="choice_img">
<img src="__CDN__/assets/advertising/img/sun_07@2x.png" alt="" class="choice_img">
</div>
<div class="answer_word choice_ans">老坛酸菜牛肉面</div>
</div>
<div class="layout align_center flex_row ans_single" data-index="6">
<div class="ans_img">
<img src="img/sun_06@2x.png" alt="" class="choice_img">
<img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
</div>
<div class="answer_word">红烧牛肉鸡蛋面</div>
</div>
<div class="layout align_center flex_row ans_single" data-index="7">
<div class="ans_img">
<img src="img/sun_06@2x.png" alt="" class="choice_img">
<img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
</div>
<div class="answer_word">黑椒牛排酸菜牛肉面</div>
</div>
<div class="layout align_center flex_row ans_single" data-index="8">
<div class="ans_img">
<img src="img/sun_06@2x.png" alt="" class="choice_img">
<img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
</div>
<div class="answer_word">牛骨酸菜牛肉面</div>
</div>
... ... @@ -153,22 +147,19 @@
<div class="detail_bottom clearfix layout flex_row">
<div class="bottom_link layout align_center flex_row justify_center" onclick="Jump()">
<div class="link_img">
<img src="img/sun_10@2x.png" alt="">
<img src="__CDN__/assets/advertising/img/sun_10@2x.png" alt="">
</div>
<a class="jump_a">https://www.baidu.com/</a>
</div>
<div class="bottom_collect layout align_center justify_center flex_diection">
<div class="collect_img">
<img src="img/sun_05@2x.png" alt="" class="collect_img_link">
<img src="__CDN__/assets/advertising/img/sun_05@2x.png" alt="" class="collect_img_link">
</div>
<div>收藏</div>
</div>
</div>
</div>
<script src="js/base.js"></script>
<script src="js/jquery.js"></script>
<script src="js/toast.js"></script>
<script type="text/javascript" src="https://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js"></script>
{include file="public/js" /}
<script>
// 截止日期
var endDay = 212321312312; //后台时间戳
... ...