王晓刚 / advertising · 提交

转到一个项目

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

我的钱包

内嵌 并排对比
正在显示 4 个修改的文件 包含 158 行增加 和 56 行删除
... ... @@ -5,6 +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/enter_view.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/Merchant.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Merchant.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/merchant/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/merchant/index.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -54,8 +57,8 @@
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/collect/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11">
<caret line="23" column="64" selection-start-line="23" selection-start-column="64" selection-end-line="23" selection-end-column="64" />
<state relative-caret-position="51">
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
</state>
</provider>
</entry>
... ... @@ -72,8 +75,8 @@
<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" />
<state relative-caret-position="476">
<caret line="33" column="30" selection-start-line="33" selection-start-column="30" selection-end-line="33" selection-end-column="30" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
... ... @@ -81,11 +84,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/index.html">
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="204">
<caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<state relative-caret-position="198">
<caret line="55" column="61" selection-start-line="55" selection-start-column="61" selection-end-line="55" selection-end-column="61" />
</state>
</provider>
</entry>
... ... @@ -160,8 +163,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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" />
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/user_exp_log_audit.js" />
... ... @@ -209,8 +210,10 @@
<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/view/merchant/enter.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/index.html" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
</list>
</option>
</component>
... ... @@ -337,6 +340,14 @@
<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="merchant" 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>
... ... @@ -414,28 +425,7 @@
<workItem from="1572914713443" duration="29898000" />
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="24480000" />
</task>
<task id="LOCAL-00294" summary="我的钱包">
<created>1573197852461</created>
<option name="number" value="00294" />
<option name="presentableId" value="LOCAL-00294" />
<option name="project" value="LOCAL" />
<updated>1573197852461</updated>
</task>
<task id="LOCAL-00295" summary="我的钱包">
<created>1573197874331</created>
<option name="number" value="00295" />
<option name="presentableId" value="LOCAL-00295" />
<option name="project" value="LOCAL" />
<updated>1573197874331</updated>
</task>
<task id="LOCAL-00296" summary="我的钱包">
<created>1573197893235</created>
<option name="number" value="00296" />
<option name="presentableId" value="LOCAL-00296" />
<option name="project" value="LOCAL" />
<updated>1573197893235</updated>
<workItem from="1573174620844" duration="25057000" />
</task>
<task id="LOCAL-00297" summary="我的钱包">
<created>1573198674689</created>
... ... @@ -759,11 +749,32 @@
<option name="project" value="LOCAL" />
<updated>1573206234383</updated>
</task>
<option name="localTasksCounter" value="343" />
<task id="LOCAL-00343" summary="我的钱包">
<created>1573206313214</created>
<option name="number" value="00343" />
<option name="presentableId" value="LOCAL-00343" />
<option name="project" value="LOCAL" />
<updated>1573206313215</updated>
</task>
<task id="LOCAL-00344" summary="我的钱包">
<created>1573206434138</created>
<option name="number" value="00344" />
<option name="presentableId" value="LOCAL-00344" />
<option name="project" value="LOCAL" />
<updated>1573206434138</updated>
</task>
<task id="LOCAL-00345" summary="我的钱包">
<created>1573206517079</created>
<option name="number" value="00345" />
<option name="presentableId" value="LOCAL-00345" />
<option name="project" value="LOCAL" />
<updated>1573206517079</updated>
</task>
<option name="localTasksCounter" value="346" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="365572000" />
<option name="totallyTimeSpent" value="366149000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -847,13 +858,6 @@
<option name="LAST_COMMIT_MESSAGE" value="我的钱包" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/thinkphp/library/traits/controller/Jump.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="341">
<caret line="142" column="45" selection-start-line="142" selection-start-column="38" selection-end-line="142" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/socialite/src/Providers/AbstractProvider.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
... ... @@ -1152,16 +1156,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="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/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
... ... @@ -1178,15 +1172,32 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/collect/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11">
<caret line="23" column="64" selection-start-line="23" selection-start-column="64" selection-end-line="23" selection-end-column="64" />
<state relative-caret-position="51">
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
</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="476">
<caret line="33" column="30" selection-start-line="33" selection-start-column="30" selection-end-line="33" selection-end-column="30" />
<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="204">
<caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
<state relative-caret-position="527">
<caret line="31" column="57" lean-forward="true" selection-start-line="31" selection-start-column="57" selection-end-line="31" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="55" column="61" selection-start-line="55" selection-start-column="61" selection-end-line="55" selection-end-column="61" />
</state>
</provider>
</entry>
... ...
... ... @@ -30,4 +30,7 @@ class Merchant extends WechatBase
$this->assign('data',$data);
return $this->fetch();
}
public function enter_view(){
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">
<style>
body,
html {
background-color: #f9f9f9;
}
</style>
<body>
<div class="submit_entry">
<div class="submit_table">
<div class="submit_single align_center layout flex_row">
<div class="submit_title">商家名称<i>*</i></div>
<input type="text" placeholder="请填写商家名称">
</div>
<div class="submit_single align_center layout flex_row">
<div class="submit_title">联系人<i>*</i></div>
<input type="text" placeholder="请填写联系人姓名">
</div>
<div class="submit_single align_center layout flex_row">
<div class="submit_title">联系电话<i>*</i></div>
<input type="text" placeholder="请填写联系人电话">
</div>
<div class="submit_single align_center layout flex_row">
<div class="submit_title">地址</div>
<input type="text" placeholder="请填写所在地址">
</div>
<div class="submit_single layout flex_row">
<div class="submit_title">简介</div>
<textarea name="" id="" cols="30" rows="5" placeholder="请填写商家简介"></textarea>
</div>
<div class="submit_single layout flex_row">
<div class="submit_title">
营业执照<i>*</i>
</div>
<div class="submit_img">
<div class="submit_img_add">
<img src="__CDN__/assets/advertising/img/add.png" alt="">
</div>
<!-- <div class="submited_img">
<img src="" alt="" id="img1">
</div>
<input type="file" id="imgFile" class="submit_img_input" onchange="fileImg(this)"> -->
</div>
</div>
<div class="submit_single layout flex_row">
<div class="submit_title">
其他证件
</div>
<div class="submit_img">
<div class="submit_img_add">
<img src="__CDN__/assets/advertising/img/add.png" alt="">
</div>
<!-- <input type="file" class="submit_img_input" onchange="fileImgOther"> -->
</div>
</div>
</div>
<div class="btn_box">
<div class="btn">
申请入驻
</div>
</div>
</div>
{include file="public/js" /}
<script>
// 营业执照
function fileImg() {
var reads = new FileReader();
var img = document.getElementById("imgFile").files[0];
reads.readAsDataURL(img);
reads.onload = function(e) {
document.getElementById('img1').src = this.result;
console.log($("#img1"))
console.log(e)
};
};
$(".btn_box").click(function() {
window.location.href = "examine.html"
})
</script>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -29,7 +29,7 @@
{include file="public/js" /}
<script>
function toEntry() {
window.location.href = "entrySubmit.html"
window.location.href = "{:url('enter_view')}"
};
</script>
</body>
... ...