王晓刚 / advertising · 提交

转到一个项目

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

广告详情

内嵌 并排对比
正在显示 2 个修改的文件 包含 60 行增加 和 83 行删除
@@ -2,11 +2,8 @@ @@ -2,11 +2,8 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> 4 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
5 - <change afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/application/home/view/goods/content_detail.html" afterDir="false" />  
7 - <change afterPath="$PROJECT_DIR$/application/home/view/goods/video_detail.html" afterDir="false" />  
8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9 - <change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" /> 6 + <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" />
10 </list> 7 </list>
11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -23,29 +20,17 @@ @@ -23,29 +20,17 @@
23 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 20 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
24 <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> 21 <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
25 <provider selected="true" editor-type-id="text-editor"> 22 <provider selected="true" editor-type-id="text-editor">
26 - <state relative-caret-position="357">  
27 - <caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" /> 23 + <state relative-caret-position="476">
  24 + <caret line="43" column="57" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="57" />
28 </state> 25 </state>
29 </provider> 26 </provider>
30 </entry> 27 </entry>
31 </file> 28 </file>
32 - <file leaf-file-name="authorization_view.html" pinned="false" current-in-tab="false">  
33 - <entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">  
34 - <provider selected="true" editor-type-id="text-editor">  
35 - <state relative-caret-position="238">  
36 - <caret line="59" column="43" selection-start-line="59" selection-start-column="43" selection-end-line="59" selection-end-column="43" />  
37 - <folding>  
38 - <element signature="n#style#0;n#html#0;n#!!top" />  
39 - </folding>  
40 - </state>  
41 - </provider>  
42 - </entry>  
43 - </file>  
44 - <file leaf-file-name="content_detail.html" pinned="false" current-in-tab="false"> 29 + <file leaf-file-name="content_detail.html" pinned="false" current-in-tab="true">
45 <entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html"> 30 <entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
46 <provider selected="true" editor-type-id="text-editor"> 31 <provider selected="true" editor-type-id="text-editor">
47 - <state relative-caret-position="323">  
48 - <caret line="19" column="91" selection-start-line="19" selection-start-column="91" selection-end-line="19" selection-end-column="91" /> 32 + <state relative-caret-position="527">
  33 + <caret line="31" column="69" selection-start-line="31" selection-start-column="69" selection-end-line="31" selection-end-column="69" />
49 </state> 34 </state>
50 </provider> 35 </provider>
51 </entry> 36 </entry>
@@ -77,11 +62,11 @@ @@ -77,11 +62,11 @@
77 </provider> 62 </provider>
78 </entry> 63 </entry>
79 </file> 64 </file>
80 - <file leaf-file-name="Goods.php" pinned="false" current-in-tab="true"> 65 + <file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
81 <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php"> 66 <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
82 <provider selected="true" editor-type-id="text-editor"> 67 <provider selected="true" editor-type-id="text-editor">
83 - <state relative-caret-position="657">  
84 - <caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" /> 68 + <state relative-caret-position="470">
  69 + <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="69" selection-end-column="32" />
85 </state> 70 </state>
86 </provider> 71 </provider>
87 </entry> 72 </entry>
@@ -192,8 +177,8 @@ @@ -192,8 +177,8 @@
192 <option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" /> 177 <option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
193 <option value="$PROJECT_DIR$/application/home/controller/User.php" /> 178 <option value="$PROJECT_DIR$/application/home/controller/User.php" />
194 <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" /> 179 <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
195 - <option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />  
196 <option value="$PROJECT_DIR$/application/home/controller/Goods.php" /> 180 <option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
  181 + <option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
197 </list> 182 </list>
198 </option> 183 </option>
199 </component> 184 </component>
@@ -443,14 +428,7 @@ @@ -443,14 +428,7 @@
443 <workItem from="1572223206994" duration="28857000" /> 428 <workItem from="1572223206994" duration="28857000" />
444 <workItem from="1572309778506" duration="26117000" /> 429 <workItem from="1572309778506" duration="26117000" />
445 <workItem from="1572395935540" duration="28313000" /> 430 <workItem from="1572395935540" duration="28313000" />
446 - <workItem from="1572483209367" duration="16126000" />  
447 - </task>  
448 - <task id="LOCAL-00008" summary="调试授权">  
449 - <created>1571976018612</created>  
450 - <option name="number" value="00008" />  
451 - <option name="presentableId" value="LOCAL-00008" />  
452 - <option name="project" value="LOCAL" />  
453 - <updated>1571976018612</updated> 431 + <workItem from="1572483209367" duration="16289000" />
454 </task> 432 </task>
455 <task id="LOCAL-00009" summary="调试授权"> 433 <task id="LOCAL-00009" summary="调试授权">
456 <created>1571979680270</created> 434 <created>1571979680270</created>
@@ -788,11 +766,18 @@ @@ -788,11 +766,18 @@
788 <option name="project" value="LOCAL" /> 766 <option name="project" value="LOCAL" />
789 <updated>1572505562274</updated> 767 <updated>1572505562274</updated>
790 </task> 768 </task>
791 - <option name="localTasksCounter" value="57" /> 769 + <task id="LOCAL-00057" summary="广告详情">
  770 + <created>1572507187873</created>
  771 + <option name="number" value="00057" />
  772 + <option name="presentableId" value="LOCAL-00057" />
  773 + <option name="project" value="LOCAL" />
  774 + <updated>1572507187873</updated>
  775 + </task>
  776 + <option name="localTasksCounter" value="58" />
792 <servers /> 777 <servers />
793 </component> 778 </component>
794 <component name="TimeTrackingManager"> 779 <component name="TimeTrackingManager">
795 - <option name="totallyTimeSpent" value="229664000" /> 780 + <option name="totallyTimeSpent" value="229827000" />
796 </component> 781 </component>
797 <component name="ToolWindowManager"> 782 <component name="ToolWindowManager">
798 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 783 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -862,7 +847,8 @@ @@ -862,7 +847,8 @@
862 <MESSAGE value="调试提现" /> 847 <MESSAGE value="调试提现" />
863 <MESSAGE value="权限调试" /> 848 <MESSAGE value="权限调试" />
864 <MESSAGE value="调试授权登录" /> 849 <MESSAGE value="调试授权登录" />
865 - <option name="LAST_COMMIT_MESSAGE" value="调试授权登录" /> 850 + <MESSAGE value="广告详情" />
  851 + <option name="LAST_COMMIT_MESSAGE" value="广告详情" />
866 </component> 852 </component>
867 <component name="editorHistoryManager"> 853 <component name="editorHistoryManager">
868 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js"> 854 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js">
@@ -1142,13 +1128,6 @@ @@ -1142,13 +1128,6 @@
1142 </state> 1128 </state>
1143 </provider> 1129 </provider>
1144 </entry> 1130 </entry>
1145 - <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">  
1146 - <provider selected="true" editor-type-id="text-editor">  
1147 - <state relative-caret-position="357">  
1148 - <caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />  
1149 - </state>  
1150 - </provider>  
1151 - </entry>  
1152 <entry file="file://$PROJECT_DIR$/thinkphp/helper.php"> 1131 <entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
1153 <provider selected="true" editor-type-id="text-editor"> 1132 <provider selected="true" editor-type-id="text-editor">
1154 <state relative-caret-position="289"> 1133 <state relative-caret-position="289">
@@ -1187,41 +1166,48 @@ @@ -1187,41 +1166,48 @@
1187 <entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html"> 1166 <entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
1188 <provider selected="true" editor-type-id="text-editor" /> 1167 <provider selected="true" editor-type-id="text-editor" />
1189 </entry> 1168 </entry>
1190 - <entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html"> 1169 + <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
1191 <provider selected="true" editor-type-id="text-editor"> 1170 <provider selected="true" editor-type-id="text-editor">
1192 - <state relative-caret-position="238">  
1193 - <caret line="59" column="43" selection-start-line="59" selection-start-column="43" selection-end-line="59" selection-end-column="43" />  
1194 - <folding>  
1195 - <element signature="n#style#0;n#html#0;n#!!top" />  
1196 - </folding> 1171 + <state relative-caret-position="334">
  1172 + <caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
1197 </state> 1173 </state>
1198 </provider> 1174 </provider>
1199 </entry> 1175 </entry>
1200 - <entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html"> 1176 + <entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
1201 <provider selected="true" editor-type-id="text-editor"> 1177 <provider selected="true" editor-type-id="text-editor">
1202 - <state relative-caret-position="323">  
1203 - <caret line="19" column="91" selection-start-line="19" selection-start-column="91" selection-end-line="19" selection-end-column="91" /> 1178 + <state relative-caret-position="493">
  1179 + <caret line="149" column="46" selection-start-line="149" selection-start-column="35" selection-end-line="149" selection-end-column="46" />
1204 </state> 1180 </state>
1205 </provider> 1181 </provider>
1206 </entry> 1182 </entry>
1207 - <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 1183 + <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
1208 <provider selected="true" editor-type-id="text-editor"> 1184 <provider selected="true" editor-type-id="text-editor">
1209 - <state relative-caret-position="334">  
1210 - <caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" /> 1185 + <state relative-caret-position="470">
  1186 + <caret line="69" column="32" lean-forward="true" selection-start-line="69" selection-start-column="32" selection-end-line="69" selection-end-column="32" />
1211 </state> 1187 </state>
1212 </provider> 1188 </provider>
1213 </entry> 1189 </entry>
1214 - <entry file="file://$PROJECT_DIR$/application/home/controller/User.php"> 1190 + <entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
1215 <provider selected="true" editor-type-id="text-editor"> 1191 <provider selected="true" editor-type-id="text-editor">
1216 - <state relative-caret-position="493">  
1217 - <caret line="149" column="46" selection-start-line="149" selection-start-column="35" selection-end-line="149" selection-end-column="46" /> 1192 + <state relative-caret-position="306">
  1193 + <caret line="63" selection-start-line="63" selection-end-line="63" selection-end-column="28" />
  1194 + <folding>
  1195 + <element signature="n#style#0;n#html#0;n#!!top" />
  1196 + </folding>
1218 </state> 1197 </state>
1219 </provider> 1198 </provider>
1220 </entry> 1199 </entry>
1221 - <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php"> 1200 + <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
  1201 + <provider selected="true" editor-type-id="text-editor">
  1202 + <state relative-caret-position="476">
  1203 + <caret line="43" column="57" selection-start-line="43" selection-start-column="30" selection-end-line="43" selection-end-column="57" />
  1204 + </state>
  1205 + </provider>
  1206 + </entry>
  1207 + <entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
1222 <provider selected="true" editor-type-id="text-editor"> 1208 <provider selected="true" editor-type-id="text-editor">
1223 - <state relative-caret-position="657">  
1224 - <caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" /> 1209 + <state relative-caret-position="527">
  1210 + <caret line="31" column="69" selection-start-line="31" selection-start-column="69" selection-end-line="31" selection-end-column="69" />
1225 </state> 1211 </state>
1226 </provider> 1212 </provider>
1227 </entry> 1213 </entry>
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html lang="en"> 2 <html lang="en">
3 3
4 -<head>  
5 - <meta charset="UTF-8">  
6 - <meta name="viewport" content="width=device-width, initial-scale=1.0">  
7 - <meta http-equiv="X-UA-Compatible" content="ie=edge">  
8 - <title>广告商城</title>  
9 - <link rel="stylesheet" href="css/public.css">  
10 - <link rel="stylesheet" href="css/advDetail.css">  
11 -</head> 4 +{include file="public/head"/}
  5 +<link rel="stylesheet" href="css/advDetail.css">
12 6
13 <body> 7 <body>
14 <div class="adv_detail clearfix"> 8 <div class="adv_detail clearfix">
@@ -35,25 +29,25 @@ @@ -35,25 +29,25 @@
35 <div class="answer layout align_center flex_row"> 29 <div class="answer layout align_center flex_row">
36 <div class="layout align_center flex_row ans_single" data-index="1"> 30 <div class="layout align_center flex_row ans_single" data-index="1">
37 <div class="ans_img"> 31 <div class="ans_img">
38 - <img src="img/sun_07@2x.png" alt="" class="choice_img"> 32 + <img src="__CDN__/assets/advertising/img/sun_07@2x.png" alt="" class="choice_img">
39 </div> 33 </div>
40 <div class="answer_word choice_ans">老坛酸菜牛肉面</div> 34 <div class="answer_word choice_ans">老坛酸菜牛肉面</div>
41 </div> 35 </div>
42 <div class="layout align_center flex_row ans_single" data-index="2"> 36 <div class="layout align_center flex_row ans_single" data-index="2">
43 <div class="ans_img"> 37 <div class="ans_img">
44 - <img src="img/sun_06@2x.png" alt="" class="choice_img"> 38 + <img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
45 </div> 39 </div>
46 <div class="answer_word">红烧牛肉鸡蛋面</div> 40 <div class="answer_word">红烧牛肉鸡蛋面</div>
47 </div> 41 </div>
48 <div class="layout align_center flex_row ans_single" data-index="3"> 42 <div class="layout align_center flex_row ans_single" data-index="3">
49 <div class="ans_img"> 43 <div class="ans_img">
50 - <img src="img/sun_06@2x.png" alt="" class="choice_img"> 44 + <img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
51 </div> 45 </div>
52 <div class="answer_word">黑椒牛排酸菜牛肉面</div> 46 <div class="answer_word">黑椒牛排酸菜牛肉面</div>
53 </div> 47 </div>
54 <div class="layout align_center flex_row ans_single" data-index="4"> 48 <div class="layout align_center flex_row ans_single" data-index="4">
55 <div class="ans_img"> 49 <div class="ans_img">
56 - <img src="img/sun_06@2x.png" alt="" class="choice_img"> 50 + <img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
57 </div> 51 </div>
58 <div class="answer_word">牛骨酸菜牛肉面</div> 52 <div class="answer_word">牛骨酸菜牛肉面</div>
59 </div> 53 </div>
@@ -66,25 +60,25 @@ @@ -66,25 +60,25 @@
66 <div class="answer layout align_center flex_row"> 60 <div class="answer layout align_center flex_row">
67 <div class="layout align_center flex_row ans_single" data-index="5"> 61 <div class="layout align_center flex_row ans_single" data-index="5">
68 <div class="ans_img"> 62 <div class="ans_img">
69 - <img src="img/sun_07@2x.png" alt="" class="choice_img"> 63 + <img src="__CDN__/assets/advertising/img/sun_07@2x.png" alt="" class="choice_img">
70 </div> 64 </div>
71 <div class="answer_word choice_ans">老坛酸菜牛肉面</div> 65 <div class="answer_word choice_ans">老坛酸菜牛肉面</div>
72 </div> 66 </div>
73 <div class="layout align_center flex_row ans_single" data-index="6"> 67 <div class="layout align_center flex_row ans_single" data-index="6">
74 <div class="ans_img"> 68 <div class="ans_img">
75 - <img src="img/sun_06@2x.png" alt="" class="choice_img"> 69 + <img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
76 </div> 70 </div>
77 <div class="answer_word">红烧牛肉鸡蛋面</div> 71 <div class="answer_word">红烧牛肉鸡蛋面</div>
78 </div> 72 </div>
79 <div class="layout align_center flex_row ans_single" data-index="7"> 73 <div class="layout align_center flex_row ans_single" data-index="7">
80 <div class="ans_img"> 74 <div class="ans_img">
81 - <img src="img/sun_06@2x.png" alt="" class="choice_img"> 75 + <img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
82 </div> 76 </div>
83 <div class="answer_word">黑椒牛排酸菜牛肉面</div> 77 <div class="answer_word">黑椒牛排酸菜牛肉面</div>
84 </div> 78 </div>
85 <div class="layout align_center flex_row ans_single" data-index="8"> 79 <div class="layout align_center flex_row ans_single" data-index="8">
86 <div class="ans_img"> 80 <div class="ans_img">
87 - <img src="img/sun_06@2x.png" alt="" class="choice_img"> 81 + <img src="__CDN__/assets/advertising/img/sun_06@2x.png" alt="" class="choice_img">
88 </div> 82 </div>
89 <div class="answer_word">牛骨酸菜牛肉面</div> 83 <div class="answer_word">牛骨酸菜牛肉面</div>
90 </div> 84 </div>
@@ -153,22 +147,19 @@ @@ -153,22 +147,19 @@
153 <div class="detail_bottom clearfix layout flex_row"> 147 <div class="detail_bottom clearfix layout flex_row">
154 <div class="bottom_link layout align_center flex_row justify_center" onclick="Jump()"> 148 <div class="bottom_link layout align_center flex_row justify_center" onclick="Jump()">
155 <div class="link_img"> 149 <div class="link_img">
156 - <img src="img/sun_10@2x.png" alt=""> 150 + <img src="__CDN__/assets/advertising/img/sun_10@2x.png" alt="">
157 </div> 151 </div>
158 <a class="jump_a">https://www.baidu.com/</a> 152 <a class="jump_a">https://www.baidu.com/</a>
159 </div> 153 </div>
160 <div class="bottom_collect layout align_center justify_center flex_diection"> 154 <div class="bottom_collect layout align_center justify_center flex_diection">
161 <div class="collect_img"> 155 <div class="collect_img">
162 - <img src="img/sun_05@2x.png" alt="" class="collect_img_link"> 156 + <img src="__CDN__/assets/advertising/img/sun_05@2x.png" alt="" class="collect_img_link">
163 </div> 157 </div>
164 <div>收藏</div> 158 <div>收藏</div>
165 </div> 159 </div>
166 </div> 160 </div>
167 </div> 161 </div>
168 - <script src="js/base.js"></script>  
169 - <script src="js/jquery.js"></script>  
170 - <script src="js/toast.js"></script>  
171 - <script type="text/javascript" src="https://3gimg.qq.com/lightmap/components/geolocation/geolocation.min.js"></script> 162 + {include file="public/js" /}
172 <script> 163 <script>
173 // 截止日期 164 // 截止日期
174 var endDay = 212321312312; //后台时间戳 165 var endDay = 212321312312; //后台时间戳