王晓刚 / advertising · 提交

转到一个项目

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

我的分享

内嵌 并排对比
正在显示 3 个修改的文件 包含 154 行增加 和 72 行删除
... ... @@ -5,9 +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/audit_status.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/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" 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" />
... ... @@ -35,20 +35,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Member.php" pinned="false" current-in-tab="true">
<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="677">
<caret line="380" column="20" selection-start-line="380" selection-start-column="20" selection-end-line="380" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MerchantAudit.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="131" column="38" lean-forward="true" selection-start-line="131" selection-start-column="38" selection-end-line="131" selection-end-column="38" />
<state relative-caret-position="201">
<caret line="373" column="13" lean-forward="true" selection-start-line="373" selection-start-column="13" selection-end-line="373" selection-end-column="13" />
</state>
</provider>
</entry>
... ... @@ -56,8 +47,8 @@
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476">
<caret line="43" column="41" selection-start-line="43" selection-start-column="41" selection-end-line="43" selection-end-column="41" />
<state relative-caret-position="510">
<caret line="78" column="4" lean-forward="true" selection-start-line="78" selection-start-column="4" selection-end-line="78" selection-end-column="32" />
</state>
</provider>
</entry>
... ... @@ -71,6 +62,27 @@
</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="827">
<caret line="80" column="30" selection-start-line="80" selection-start-column="30" selection-end-line="80" selection-end-column="30" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="audit_status.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/audit_status.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="538">
<caret line="44" column="18" lean-forward="true" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -123,7 +135,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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" />
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
... ... @@ -167,13 +178,14 @@
<option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter.html" />
<option value="$PROJECT_DIR$/application/home/view/merchant/index.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.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/Server.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" />
</list>
</option>
</component>
... ... @@ -327,16 +339,16 @@
<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\public" />
<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" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\wamp\www\advertising\public\assets\js\backend" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
... ... @@ -383,21 +395,7 @@
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="2482000" />
</task>
<task id="LOCAL-00381" summary="我的分享">
<created>1573210480144</created>
<option name="number" value="00381" />
<option name="presentableId" value="LOCAL-00381" />
<option name="project" value="LOCAL" />
<updated>1573210480144</updated>
</task>
<task id="LOCAL-00382" summary="我的分享">
<created>1573210509641</created>
<option name="number" value="00382" />
<option name="presentableId" value="LOCAL-00382" />
<option name="project" value="LOCAL" />
<updated>1573210509641</updated>
<workItem from="1573259331081" duration="4133000" />
</task>
<task id="LOCAL-00383" summary="我的分享">
<created>1573210555775</created>
... ... @@ -728,11 +726,25 @@
<option name="project" value="LOCAL" />
<updated>1573214175320</updated>
</task>
<option name="localTasksCounter" value="430" />
<task id="LOCAL-00430" summary="我的分享">
<created>1573262474593</created>
<option name="number" value="00430" />
<option name="presentableId" value="LOCAL-00430" />
<option name="project" value="LOCAL" />
<updated>1573262474594</updated>
</task>
<task id="LOCAL-00431" summary="我的分享">
<created>1573262872433</created>
<option name="number" value="00431" />
<option name="presentableId" value="LOCAL-00431" />
<option name="project" value="LOCAL" />
<updated>1573262872433</updated>
</task>
<option name="localTasksCounter" value="432" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="376155000" />
<option name="totallyTimeSpent" value="377806000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -817,13 +829,6 @@
<option name="LAST_COMMIT_MESSAGE" value="我的分享" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/home/model/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/js/toast.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="850">
... ... @@ -1053,16 +1058,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="561">
<caret line="40" column="30" selection-start-line="40" selection-start-column="30" selection-end-line="40" selection-end-column="30" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/bg2.png">
<provider selected="true" editor-type-id="images" />
</entry>
... ... @@ -1125,13 +1120,6 @@
</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="476">
<caret line="43" column="41" selection-start-line="43" selection-start-column="41" selection-end-line="43" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
... ... @@ -1148,8 +1136,32 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="677">
<caret line="380" column="20" selection-start-line="380" selection-start-column="20" selection-end-line="380" selection-end-column="20" />
<state relative-caret-position="201">
<caret line="373" column="13" lean-forward="true" selection-start-line="373" selection-start-column="13" selection-end-line="373" selection-end-column="13" />
</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="510">
<caret line="78" column="4" lean-forward="true" selection-start-line="78" selection-start-column="4" selection-end-line="78" selection-end-column="32" />
</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="827">
<caret line="80" column="30" selection-start-line="80" selection-start-column="30" selection-end-line="80" 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/audit_status.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="538">
<caret line="44" column="18" lean-forward="true" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
</state>
</provider>
</entry>
... ...
... ... @@ -35,12 +35,9 @@ class Merchant extends WechatBase
$domain_name = $this->request->domain();//域名
$data = Db::name('merchant_audit')->where(['user_id'=>$this->user_id])->find();
if(!empty($data)){
if($data['status'] == 1){
//审核中
$this->redirect('audit1');
}else if($data['status'] == 2){
//审核通过
$this->redirect('audit2');
if($data['status'] == 1 || $data['status'] == 2){
//审核中或者审核通过提示
$this->redirect('audit_status');
}
$business_images = explode(',',$data['business_images']);
foreach($business_images as $key => $b_i){
... ... @@ -67,4 +64,20 @@ class Merchant extends WechatBase
$this->assign('jssdk',$jssdk);
return $this->fetch();
}
public function audit_status(){
$data = Db::name('merchant_audit')->where(['user_id'=>$this->user_id])->find();
if(empty($data)){
$this->redirect('enter_view');
}
$title = '';
if($data['status'] == 3){
$this->redirect('enter_view');
}else if($data['status'] == 2){
$title = "审核通过";
}else if($data['status'] == 1){
$title = "审核中";
}
$this->assign('title',$title);
return $this->fetch();
}
}
\ No newline at end of file
... ...
<!DOCTYPE html>
<html lang="en">
{include file="public/head"/}
<style>
.examin_top {
width: 100%;
height: 4rem;
background-image: url("__CDN__/assets/advertising/img/examinBg.png");
background-position: 0 0;
background-size: contain;
background-repeat: no-repeat;
}
.examin_type {
width: 1.64rem;
height: 1.64rem;
margin: 0 auto;
padding-top: 0.6rem;
}
.examin_msg {
color: #06121E;
font-size: 0.32rem;
margin: 0.84rem 0 0.32rem;
text-align: center;
}
.examin_tips {
color: #06121E;
text-align: center;
font-size: 0.24rem;
}
</style>
<body>
<div class="examine">
<div class="examin_top">
<div class="examin_type">
{if condition="$data.status eq 1"}
<img src="__CDN__/assets/advertising/img/examin.png" alt="" class="examin_img">
{elseif condition="$data.status eq 2"}
<img src="__CDN__/assets/advertising/img/examin1.png" alt="" class="examin_img">
{/if}
</div>
</div>
{if condition="$data.status eq 1"}
<div class="examin_msg">注册信息正在审核中!</div>
<div class="examin_tips">请您耐心等待</div>
{elseif condition="$data.status eq 2"}
<div class="examin_msg">注册信息已审核通过!</div>
{/if}
</div>
{include file="public/js" /}
</body>
</html>
\ No newline at end of file
... ...