王晓刚 / advertising · 提交

转到一个项目

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

我的钱包

内嵌 并排对比
正在显示 3 个修改的文件 包含 98 行增加 和 58 行删除
... ... @@ -5,8 +5,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/application/home/view/merchant/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/controller/Share.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Share.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Merchant.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Merchant.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -61,20 +62,41 @@
</provider>
</entry>
</file>
<file leaf-file-name="Share.php" pinned="false" current-in-tab="true">
<file leaf-file-name="Share.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="606">
<caret line="86" column="41" selection-start-line="86" selection-start-column="41" selection-end-line="86" selection-end-column="41" />
<state relative-caret-position="657">
<caret line="89" column="53" lean-forward="true" selection-start-line="89" selection-start-column="53" selection-end-line="89" selection-end-column="53" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Merchant.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="29" column="36" selection-start-line="29" selection-start-column="36" selection-end-line="29" selection-end-column="36" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="56" selection-start-line="10" selection-start-column="56" selection-end-line="10" selection-end-column="56" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="82" column="39" lean-forward="true" selection-start-line="82" selection-start-column="39" selection-end-line="82" selection-end-column="39" />
<state relative-caret-position="51">
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
</state>
</provider>
</entry>
... ... @@ -140,7 +162,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/assets/js/backend/exp_ratio.js" />
<option value="$PROJECT_DIR$/application/admin/view/slide/index.html" />
<option value="$PROJECT_DIR$/application/admin/model/Slide.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/slide.js" />
... ... @@ -170,7 +191,6 @@
<option value="$PROJECT_DIR$/public/assets/advertising/css/advDetail.css" />
<option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/personal.css" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/video_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/member/index.html" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
... ... @@ -191,6 +211,8 @@
<option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
<option value="$PROJECT_DIR$/application/home/view/share/index.html" />
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/index.html" />
</list>
</option>
</component>
... ... @@ -317,14 +339,6 @@
<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>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
... ... @@ -348,11 +362,11 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\wamp\www\advertising\application\home\view\merchant" />
<recent name="D:\wamp\www\advertising\public" />
<recent name="D:\wamp\www\advertising\application\home\view\share" />
<recent name="D:\wamp\www\advertising\application\home\view\collect" />
<recent name="D:\wamp\www\advertising\application\home\view\member" />
<recent name="D:\wamp\www\advertising\application\home\controller" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\wamp\www\advertising\public\assets\js\backend" />
... ... @@ -402,21 +416,7 @@
<workItem from="1572914713443" duration="29898000" />
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="21855000" />
</task>
<task id="LOCAL-00285" summary="我的钱包">
<created>1573195809265</created>
<option name="number" value="00285" />
<option name="presentableId" value="LOCAL-00285" />
<option name="project" value="LOCAL" />
<updated>1573195809265</updated>
</task>
<task id="LOCAL-00286" summary="我的钱包">
<created>1573195842154</created>
<option name="number" value="00286" />
<option name="presentableId" value="LOCAL-00286" />
<option name="project" value="LOCAL" />
<updated>1573195842154</updated>
<workItem from="1573174620844" duration="23544000" />
</task>
<task id="LOCAL-00287" summary="我的钱包">
<created>1573195869075</created>
... ... @@ -747,11 +747,25 @@
<option name="project" value="LOCAL" />
<updated>1573203339437</updated>
</task>
<option name="localTasksCounter" value="334" />
<task id="LOCAL-00334" summary="我的钱包">
<created>1573203675366</created>
<option name="number" value="00334" />
<option name="presentableId" value="LOCAL-00334" />
<option name="project" value="LOCAL" />
<updated>1573203675366</updated>
</task>
<task id="LOCAL-00335" summary="我的钱包">
<created>1573203723100</created>
<option name="number" value="00335" />
<option name="presentableId" value="LOCAL-00335" />
<option name="project" value="LOCAL" />
<updated>1573203723100</updated>
</task>
<option name="localTasksCounter" value="336" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="362947000" />
<option name="totallyTimeSpent" value="364636000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -835,13 +849,6 @@
<option name="LAST_COMMIT_MESSAGE" value="我的钱包" />
</component>
<component name="editorHistoryManager">
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_2.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="505" column="28" lean-forward="true" selection-start-line="505" selection-start-column="28" selection-end-line="505" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/traits/controller/Jump.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="341">
... ... @@ -981,13 +988,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="13" column="14" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -1147,13 +1147,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="82" column="39" lean-forward="true" selection-start-line="82" selection-start-column="39" selection-end-line="82" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Collect.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="793">
... ... @@ -1170,8 +1163,32 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="606">
<caret line="86" column="41" selection-start-line="86" selection-start-column="41" selection-end-line="86" selection-end-column="41" />
<state relative-caret-position="657">
<caret line="89" column="53" lean-forward="true" selection-start-line="89" selection-start-column="53" selection-end-line="89" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="29" column="36" selection-start-line="29" selection-start-column="36" selection-end-line="29" selection-end-column="36" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="56" selection-start-line="10" selection-start-column="56" selection-end-line="10" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
</state>
</provider>
</entry>
... ...
... ... @@ -10,6 +10,7 @@ namespace app\home\controller;
use app\common\controller\WechatBase;
use think\Db;
class Merchant extends WechatBase
{
... ... @@ -25,6 +26,8 @@ class Merchant extends WechatBase
$this->user_id = $user_id;
}
public function index(){
$data = Db::name('page')->where(['id'=>1])->find();
$this->assign('data',$data);
return $this->fetch();
}
}
\ No newline at end of file
... ...
<!DOCTYPE html>
<html lang="en">
{include file="public/head"/}
<link rel="stylesheet" href="__CDN__/assets/advertising/css/entry.css">
<body>
<div class="shop_entry">
{$data.data}
<div class="btn" onclick="toEntry()">我要入驻</div>
</div>
{include file="public/js" /}
<script>
function toEntry() {
window.location.href = "entrySubmit.html"
};
</script>
</body>
</html>
\ No newline at end of file
... ...