王晓刚 / advertising · 提交

转到一个项目

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

音频

内嵌 并排对比
正在显示 2 个修改的文件 包含 213 行增加 和 125 行删除
... ... @@ -2,8 +2,7 @@
<project version="4">
<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/audio_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/home/view/member/index.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -31,106 +30,29 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="nav.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html">
<file leaf-file-name="Member.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
<state relative-caret-position="561">
<caret line="45" column="24" selection-start-line="45" selection-start-column="15" selection-end-line="45" selection-end-column="24" />
</state>
</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">
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/member/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="730">
<caret line="443" column="19" selection-start-line="443" selection-start-column="13" selection-end-line="443" selection-end-column="19" />
<state relative-caret-position="691">
<caret line="150" column="13" lean-forward="true" selection-start-line="121" selection-start-column="4" selection-end-line="150" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<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">
<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="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" />
<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="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="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="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="410">
<caret line="253" column="20" lean-forward="true" selection-start-line="253" selection-start-column="20" selection-end-line="253" selection-end-column="49" />
<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" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="204" column="46" selection-start-line="204" selection-start-column="46" selection-end-line="204" selection-end-column="46" />
<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="audioDetail.html" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Desktop/userShopping/audioDetail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="31">
<caret line="191" column="21" selection-start-line="191" selection-start-column="12" selection-end-line="191" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<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="697">
<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>
</file>
<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="119">
<caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
<state relative-caret-position="374">
<caret line="73" selection-start-line="73" selection-end-line="73" selection-end-column="28" />
</state>
</provider>
</entry>
... ... @@ -165,7 +87,7 @@
<find>btn_more</find>
<find>detail_qust</find>
<find>detail_top</find>
<find>{if condition='$data.is_correct eq 0 &amp;&amp; $data.is_answer eq 1'}</find>
<find />
<find>targetSdkVersion</find>
<find>showErr</find>
<find>checkMore</find>
... ... @@ -174,8 +96,8 @@
<find>audio_time</find>
<find>audio_style</find>
<find>submit</find>
<find>quest_box</find>
<find>b_active</find>
<find>quest_box</find>
</findStrings>
<replaceStrings>
<replace />
... ... @@ -187,7 +109,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
<option value="$PROJECT_DIR$/application/admin/model/Goods.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js" />
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
... ... @@ -238,6 +159,7 @@
<option value="$USER_HOME$/Desktop/userShopping/audioDetail.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/member/index.html" />
</list>
</option>
</component>
... ... @@ -366,6 +288,14 @@
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="member" 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="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -415,15 +345,15 @@
<property name="settings.editor.selected.configurable" value="terminal" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\wamp\www\advertising\public\assets\js\backend" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\wamp\www\advertising\application\home\view\member" />
<recent name="D:\wamp\www\advertising\public\assets\advertising\js" />
<recent name="D:\wamp\www\advertising\public\assets\advertising\css" />
<recent name="D:\wamp\www\advertising\application\home\view\goods" />
<recent name="D:\wamp\www\advertising\application\home\view\user" />
<recent name="D:\wamp\www\advertising\application\home\view\public" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\wamp\www\advertising\public\assets\js\backend" />
</key>
</component>
<component name="RunDashboard">
... ... @@ -467,14 +397,7 @@
<workItem from="1572568391799" duration="24440000" />
<workItem from="1572668245063" duration="699000" />
<workItem from="1572827640492" duration="25475000" />
<workItem from="1572914713443" duration="18129000" />
</task>
<task id="LOCAL-00145" summary="视频详情">
<created>1572922520145</created>
<option name="number" value="00145" />
<option name="presentableId" value="LOCAL-00145" />
<option name="project" value="LOCAL" />
<updated>1572922520145</updated>
<workItem from="1572914713443" duration="18519000" />
</task>
<task id="LOCAL-00146" summary="视频详情">
<created>1572922529468</created>
... ... @@ -812,11 +735,18 @@
<option name="project" value="LOCAL" />
<updated>1572938036801</updated>
</task>
<option name="localTasksCounter" value="194" />
<task id="LOCAL-00194" summary="音频">
<created>1572938246566</created>
<option name="number" value="00194" />
<option name="presentableId" value="LOCAL-00194" />
<option name="project" value="LOCAL" />
<updated>1572938246566</updated>
</task>
<option name="localTasksCounter" value="195" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="317707000" />
<option name="totallyTimeSpent" value="318097000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -895,13 +825,6 @@
<option name="LAST_COMMIT_MESSAGE" value="音频" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="33" selection-start-line="14" selection-start-column="24" selection-end-line="20" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
... ... @@ -1133,13 +1056,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="-850">
<caret line="19" selection-start-line="19" selection-end-line="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
... ... @@ -1154,9 +1070,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/public/nav.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
... ... @@ -1248,6 +1161,27 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="45" column="24" selection-start-line="45" selection-start-column="15" selection-end-line="45" selection-end-column="24" />
</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="374">
<caret line="73" selection-start-line="73" selection-end-line="73" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="691">
<caret line="150" column="13" lean-forward="true" selection-start-line="121" selection-start-column="4" selection-end-line="150" selection-end-column="13" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
... ...
<!DOCTYPE html>
<html lang="en">
{include file="public/head"/}
<link rel="stylesheet" href="css/personal.css">
<body>
<!-- 个人中心 -->
<div class="personal">
<!-- 个人账号 -->
<div class="personal_top">
<div class="person_bg"></div>
<!-- 头像 -->
<div class="head_img">
<img src="{$user.avatar}" alt="">
</div>
<!-- 昵称 -->
<div class="nick_name">{$user.nickname}</div>
<!-- 账户信息 -->
<div class="account_msg">
<div class="acc_box clearfix">
<div class="acc_l layout align_center flex_diection">
<div class="acc_num">{$user.exp}</div>
<div class="acc_coupon">我的红包劵</div>
<div class="acc_trans">
约￥{$user.rmb}
</div>
</div>
<div class="acc_r layout align_center flex_diection">
<div class="acc_num">{$user.today_exp}</div>
<div class="acc_coupon">今日红包劵</div>
</div>
</div>
</div>
</div>
<!-- 操作列表 -->
<div class="operat_list">
<div class="operat_single" onclick="toPersonalMsg()">
<div class="operat_box layout justify flex_row align_center">
<div class="layout justify flex_row align_center">
<div class="operat_icon">
<img src="__CDN__/assets/advertising/img/sun_17@2x.png" alt="">
</div>
<div>个人信息</div>
</div>
<div class="">
<img src="__CDN__/assets/advertising/img/right.png" alt="">
</div>
</div>
</div>
<div class="operat_single">
<div class="operat_box layout justify flex_row align_center" onclick="toWallet()">
<div class="layout justify flex_row align_center">
<div class="operat_icon">
<img src="__CDN__/assets/advertising/img/sun_18@2x.png" alt="">
</div>
<div>我的钱包</div>
</div>
<div class="">
<img src="__CDN__/assets/advertising/img/right.png" alt="">
</div>
</div>
</div>
<div class="operat_single">
<div class="operat_box layout justify flex_row align_center" onclick="toCollect()">
<div class="layout justify flex_row align_center">
<div class="operat_icon">
<img src="__CDN__/assets/advertising/img/sun_19@2x.png" alt="">
</div>
<div>我的收藏</div>
</div>
<div class="">
<img src="__CDN__/assets/advertising/img/right.png" alt="">
</div>
</div>
</div>
<div class="operat_single">
<div class="operat_box layout justify flex_row align_center" onclick="toInvite()">
<div class="layout justify flex_row align_center">
<div class="operat_icon">
<img src="__CDN__/assets/advertising/img/sun_20@2x.png" alt="">
</div>
<div>我的邀请</div>
</div>
<div class="">
<img src="__CDN__/assets/advertising/img/right.png" alt="">
</div>
</div>
</div>
<div class="operat_single">
<div class="operat_box layout justify flex_row align_center" onclick="toEntry()">
<div class="layout justify flex_row align_center">
<div class="operat_icon">
<img src="__CDN__/assets/advertising/img/sun_21@2x.png" alt="">
</div>
<div>商家入驻</div>
</div>
<div class="">
<img src="__CDN__/assets/advertising/img/right.png" alt="">
</div>
</div>
</div>
<div class="operat_single">
<div class="operat_box layout justify flex_row align_center" onclick="toService()">
<div class="layout justify flex_row align_center">
<div class="operat_icon">
<img src="__CDN__/assets/advertising/img/sun_22@2x.png" alt="">
</div>
<div>联系客服</div>
</div>
<div class="">
<img src="__CDN__/assets/advertising/img/right.png" alt="">
</div>
</div>
</div>
</div>
<div class="person_bottom"></div>
{include file="public/nav"/}
</div>
{include file="public/js" /}
<script>
// 首页
function toIndex() {
window.location.href = "index.html"
};
// 个人信息
function toPersonalMsg() {
window.location.href = "personalMsg.html"
};
// 我的钱包
function toWallet() {
window.location.href = "myWallet.html"
};
// 我的收藏
function toCollect() {
window.location.href = "collect.html"
};
// 我的邀请
function toInvite() {
window.location.href = "myInvite.html"
};
// 商家入驻
function toEntry() {
window.location.href = "shopEntry.html"
};
// 联系客服
function toService() {
// window.location.href=""
}
</script>
</body>
</html>
\ No newline at end of file
... ...