王晓刚 / advertising · 提交

转到一个项目

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

我的分享

内嵌 并排对比
正在显示 3 个修改的文件 包含 154 行增加 和 72 行删除
@@ -5,9 +5,9 @@ @@ -5,9 +5,9 @@
5 </component> 5 </component>
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> 7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
  8 + <change afterPath="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" afterDir="false" />
8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 9 <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/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" afterDir="false" />  
10 - <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" /> 10 + <change beforePath="$PROJECT_DIR$/application/home/controller/Merchant.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Merchant.php" afterDir="false" />
11 </list> 11 </list>
12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
13 <option name="TRACKING_ENABLED" value="true" /> 13 <option name="TRACKING_ENABLED" value="true" />
@@ -35,20 +35,11 @@ @@ -35,20 +35,11 @@
35 </component> 35 </component>
36 <component name="FileEditorManager"> 36 <component name="FileEditorManager">
37 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 37 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
38 - <file leaf-file-name="Member.php" pinned="false" current-in-tab="true"> 38 + <file leaf-file-name="Member.php" pinned="false" current-in-tab="false">
39 <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php"> 39 <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
40 <provider selected="true" editor-type-id="text-editor"> 40 <provider selected="true" editor-type-id="text-editor">
41 - <state relative-caret-position="677">  
42 - <caret line="380" column="20" selection-start-line="380" selection-start-column="20" selection-end-line="380" selection-end-column="20" />  
43 - </state>  
44 - </provider>  
45 - </entry>  
46 - </file>  
47 - <file leaf-file-name="MerchantAudit.php" pinned="false" current-in-tab="false">  
48 - <entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">  
49 - <provider selected="true" editor-type-id="text-editor">  
50 - <state relative-caret-position="255">  
51 - <caret line="131" column="38" lean-forward="true" selection-start-line="131" selection-start-column="38" selection-end-line="131" selection-end-column="38" /> 41 + <state relative-caret-position="201">
  42 + <caret line="373" column="13" lean-forward="true" selection-start-line="373" selection-start-column="13" selection-end-line="373" selection-end-column="13" />
52 </state> 43 </state>
53 </provider> 44 </provider>
54 </entry> 45 </entry>
@@ -56,8 +47,8 @@ @@ -56,8 +47,8 @@
56 <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false"> 47 <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false">
57 <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> 48 <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
58 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
59 - <state relative-caret-position="476">  
60 - <caret line="43" column="41" selection-start-line="43" selection-start-column="41" selection-end-line="43" selection-end-column="41" /> 50 + <state relative-caret-position="510">
  51 + <caret line="78" column="4" lean-forward="true" selection-start-line="78" selection-start-column="4" selection-end-line="78" selection-end-column="32" />
61 </state> 52 </state>
62 </provider> 53 </provider>
63 </entry> 54 </entry>
@@ -71,6 +62,27 @@ @@ -71,6 +62,27 @@
71 </provider> 62 </provider>
72 </entry> 63 </entry>
73 </file> 64 </file>
  65 + <file leaf-file-name="Merchant.php" pinned="false" current-in-tab="false">
  66 + <entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
  67 + <provider selected="true" editor-type-id="text-editor">
  68 + <state relative-caret-position="827">
  69 + <caret line="80" column="30" selection-start-line="80" selection-start-column="30" selection-end-line="80" selection-end-column="30" />
  70 + <folding>
  71 + <element signature="e#129#166#0#PHP" expanded="true" />
  72 + </folding>
  73 + </state>
  74 + </provider>
  75 + </entry>
  76 + </file>
  77 + <file leaf-file-name="audit_status.html" pinned="false" current-in-tab="true">
  78 + <entry file="file://$PROJECT_DIR$/application/home/view/merchant/audit_status.html">
  79 + <provider selected="true" editor-type-id="text-editor">
  80 + <state relative-caret-position="538">
  81 + <caret line="44" column="18" lean-forward="true" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
  82 + </state>
  83 + </provider>
  84 + </entry>
  85 + </file>
74 </leaf> 86 </leaf>
75 </component> 87 </component>
76 <component name="FileTemplateManagerImpl"> 88 <component name="FileTemplateManagerImpl">
@@ -123,7 +135,6 @@ @@ -123,7 +135,6 @@
123 <component name="IdeDocumentHistory"> 135 <component name="IdeDocumentHistory">
124 <option name="CHANGED_PATHS"> 136 <option name="CHANGED_PATHS">
125 <list> 137 <list>
126 - <option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/index.html" />  
127 <option value="$PROJECT_DIR$/public/assets/js/backend/user_exp_log_audit.js" /> 138 <option value="$PROJECT_DIR$/public/assets/js/backend/user_exp_log_audit.js" />
128 <option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" /> 139 <option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" />
129 <option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" /> 140 <option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
@@ -167,13 +178,14 @@ @@ -167,13 +178,14 @@
167 <option value="$PROJECT_DIR$/application/home/controller/Collect.php" /> 178 <option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
168 <option value="$PROJECT_DIR$/application/home/view/merchant/enter.html" /> 179 <option value="$PROJECT_DIR$/application/home/view/merchant/enter.html" />
169 <option value="$PROJECT_DIR$/application/home/view/merchant/index.html" /> 180 <option value="$PROJECT_DIR$/application/home/view/merchant/index.html" />
170 - <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />  
171 <option value="$PROJECT_DIR$/application/home/view/share/index.html" /> 181 <option value="$PROJECT_DIR$/application/home/view/share/index.html" />
172 <option value="$PROJECT_DIR$/application/home/controller/Share.php" /> 182 <option value="$PROJECT_DIR$/application/home/controller/Share.php" />
173 <option value="$PROJECT_DIR$/application/home/controller/Server.php" /> 183 <option value="$PROJECT_DIR$/application/home/controller/Server.php" />
174 <option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" /> 184 <option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
175 - <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />  
176 <option value="$PROJECT_DIR$/application/home/controller/Member.php" /> 185 <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
  186 + <option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
  187 + <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
  188 + <option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" />
177 </list> 189 </list>
178 </option> 190 </option>
179 </component> 191 </component>
@@ -327,16 +339,16 @@ @@ -327,16 +339,16 @@
327 <property name="settings.editor.selected.configurable" value="terminal" /> 339 <property name="settings.editor.selected.configurable" value="terminal" />
328 </component> 340 </component>
329 <component name="RecentsManager"> 341 <component name="RecentsManager">
  342 + <key name="MoveFile.RECENT_KEYS">
  343 + <recent name="D:\wamp\www\advertising\public\assets\js\backend" />
  344 + </key>
330 <key name="CopyFile.RECENT_KEYS"> 345 <key name="CopyFile.RECENT_KEYS">
331 - <recent name="D:\wamp\www\advertising\public" />  
332 <recent name="D:\wamp\www\advertising\application\home\view\merchant" /> 346 <recent name="D:\wamp\www\advertising\application\home\view\merchant" />
  347 + <recent name="D:\wamp\www\advertising\public" />
333 <recent name="D:\wamp\www\advertising\application\home\view\share" /> 348 <recent name="D:\wamp\www\advertising\application\home\view\share" />
334 <recent name="D:\wamp\www\advertising\application\home\view\collect" /> 349 <recent name="D:\wamp\www\advertising\application\home\view\collect" />
335 <recent name="D:\wamp\www\advertising\application\home\view\member" /> 350 <recent name="D:\wamp\www\advertising\application\home\view\member" />
336 </key> 351 </key>
337 - <key name="MoveFile.RECENT_KEYS">  
338 - <recent name="D:\wamp\www\advertising\public\assets\js\backend" />  
339 - </key>  
340 </component> 352 </component>
341 <component name="RunDashboard"> 353 <component name="RunDashboard">
342 <option name="ruleStates"> 354 <option name="ruleStates">
@@ -383,21 +395,7 @@ @@ -383,21 +395,7 @@
383 <workItem from="1573000530976" duration="6061000" /> 395 <workItem from="1573000530976" duration="6061000" />
384 <workItem from="1573087576825" duration="5555000" /> 396 <workItem from="1573087576825" duration="5555000" />
385 <workItem from="1573174620844" duration="32581000" /> 397 <workItem from="1573174620844" duration="32581000" />
386 - <workItem from="1573259331081" duration="2482000" />  
387 - </task>  
388 - <task id="LOCAL-00381" summary="我的分享">  
389 - <created>1573210480144</created>  
390 - <option name="number" value="00381" />  
391 - <option name="presentableId" value="LOCAL-00381" />  
392 - <option name="project" value="LOCAL" />  
393 - <updated>1573210480144</updated>  
394 - </task>  
395 - <task id="LOCAL-00382" summary="我的分享">  
396 - <created>1573210509641</created>  
397 - <option name="number" value="00382" />  
398 - <option name="presentableId" value="LOCAL-00382" />  
399 - <option name="project" value="LOCAL" />  
400 - <updated>1573210509641</updated> 398 + <workItem from="1573259331081" duration="4133000" />
401 </task> 399 </task>
402 <task id="LOCAL-00383" summary="我的分享"> 400 <task id="LOCAL-00383" summary="我的分享">
403 <created>1573210555775</created> 401 <created>1573210555775</created>
@@ -728,11 +726,25 @@ @@ -728,11 +726,25 @@
728 <option name="project" value="LOCAL" /> 726 <option name="project" value="LOCAL" />
729 <updated>1573214175320</updated> 727 <updated>1573214175320</updated>
730 </task> 728 </task>
731 - <option name="localTasksCounter" value="430" /> 729 + <task id="LOCAL-00430" summary="我的分享">
  730 + <created>1573262474593</created>
  731 + <option name="number" value="00430" />
  732 + <option name="presentableId" value="LOCAL-00430" />
  733 + <option name="project" value="LOCAL" />
  734 + <updated>1573262474594</updated>
  735 + </task>
  736 + <task id="LOCAL-00431" summary="我的分享">
  737 + <created>1573262872433</created>
  738 + <option name="number" value="00431" />
  739 + <option name="presentableId" value="LOCAL-00431" />
  740 + <option name="project" value="LOCAL" />
  741 + <updated>1573262872433</updated>
  742 + </task>
  743 + <option name="localTasksCounter" value="432" />
732 <servers /> 744 <servers />
733 </component> 745 </component>
734 <component name="TimeTrackingManager"> 746 <component name="TimeTrackingManager">
735 - <option name="totallyTimeSpent" value="376155000" /> 747 + <option name="totallyTimeSpent" value="377806000" />
736 </component> 748 </component>
737 <component name="ToolWindowManager"> 749 <component name="ToolWindowManager">
738 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 750 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -817,13 +829,6 @@ @@ -817,13 +829,6 @@
817 <option name="LAST_COMMIT_MESSAGE" value="我的分享" /> 829 <option name="LAST_COMMIT_MESSAGE" value="我的分享" />
818 </component> 830 </component>
819 <component name="editorHistoryManager"> 831 <component name="editorHistoryManager">
820 - <entry file="file://$PROJECT_DIR$/application/home/model/User.php">  
821 - <provider selected="true" editor-type-id="text-editor">  
822 - <state relative-caret-position="238">  
823 - <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />  
824 - </state>  
825 - </provider>  
826 - </entry>  
827 <entry file="file://$PROJECT_DIR$/public/assets/advertising/js/toast.js"> 832 <entry file="file://$PROJECT_DIR$/public/assets/advertising/js/toast.js">
828 <provider selected="true" editor-type-id="text-editor"> 833 <provider selected="true" editor-type-id="text-editor">
829 <state relative-caret-position="850"> 834 <state relative-caret-position="850">
@@ -1053,16 +1058,6 @@ @@ -1053,16 +1058,6 @@
1053 </state> 1058 </state>
1054 </provider> 1059 </provider>
1055 </entry> 1060 </entry>
1056 - <entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">  
1057 - <provider selected="true" editor-type-id="text-editor">  
1058 - <state relative-caret-position="561">  
1059 - <caret line="40" column="30" selection-start-line="40" selection-start-column="30" selection-end-line="40" selection-end-column="30" />  
1060 - <folding>  
1061 - <element signature="e#129#166#0#PHP" expanded="true" />  
1062 - </folding>  
1063 - </state>  
1064 - </provider>  
1065 - </entry>  
1066 <entry file="file://$PROJECT_DIR$/public/bg2.png"> 1061 <entry file="file://$PROJECT_DIR$/public/bg2.png">
1067 <provider selected="true" editor-type-id="images" /> 1062 <provider selected="true" editor-type-id="images" />
1068 </entry> 1063 </entry>
@@ -1125,13 +1120,6 @@ @@ -1125,13 +1120,6 @@
1125 </state> 1120 </state>
1126 </provider> 1121 </provider>
1127 </entry> 1122 </entry>
1128 - <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">  
1129 - <provider selected="true" editor-type-id="text-editor">  
1130 - <state relative-caret-position="476">  
1131 - <caret line="43" column="41" selection-start-line="43" selection-start-column="41" selection-end-line="43" selection-end-column="41" />  
1132 - </state>  
1133 - </provider>  
1134 - </entry>  
1135 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 1123 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
1136 <provider selected="true" editor-type-id="text-editor"> 1124 <provider selected="true" editor-type-id="text-editor">
1137 <state relative-caret-position="153"> 1125 <state relative-caret-position="153">
@@ -1148,8 +1136,32 @@ @@ -1148,8 +1136,32 @@
1148 </entry> 1136 </entry>
1149 <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php"> 1137 <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
1150 <provider selected="true" editor-type-id="text-editor"> 1138 <provider selected="true" editor-type-id="text-editor">
1151 - <state relative-caret-position="677">  
1152 - <caret line="380" column="20" selection-start-line="380" selection-start-column="20" selection-end-line="380" selection-end-column="20" /> 1139 + <state relative-caret-position="201">
  1140 + <caret line="373" column="13" lean-forward="true" selection-start-line="373" selection-start-column="13" selection-end-line="373" selection-end-column="13" />
  1141 + </state>
  1142 + </provider>
  1143 + </entry>
  1144 + <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
  1145 + <provider selected="true" editor-type-id="text-editor">
  1146 + <state relative-caret-position="510">
  1147 + <caret line="78" column="4" lean-forward="true" selection-start-line="78" selection-start-column="4" selection-end-line="78" selection-end-column="32" />
  1148 + </state>
  1149 + </provider>
  1150 + </entry>
  1151 + <entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
  1152 + <provider selected="true" editor-type-id="text-editor">
  1153 + <state relative-caret-position="827">
  1154 + <caret line="80" column="30" selection-start-line="80" selection-start-column="30" selection-end-line="80" selection-end-column="30" />
  1155 + <folding>
  1156 + <element signature="e#129#166#0#PHP" expanded="true" />
  1157 + </folding>
  1158 + </state>
  1159 + </provider>
  1160 + </entry>
  1161 + <entry file="file://$PROJECT_DIR$/application/home/view/merchant/audit_status.html">
  1162 + <provider selected="true" editor-type-id="text-editor">
  1163 + <state relative-caret-position="538">
  1164 + <caret line="44" column="18" lean-forward="true" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
1153 </state> 1165 </state>
1154 </provider> 1166 </provider>
1155 </entry> 1167 </entry>
@@ -35,12 +35,9 @@ class Merchant extends WechatBase @@ -35,12 +35,9 @@ class Merchant extends WechatBase
35 $domain_name = $this->request->domain();//域名 35 $domain_name = $this->request->domain();//域名
36 $data = Db::name('merchant_audit')->where(['user_id'=>$this->user_id])->find(); 36 $data = Db::name('merchant_audit')->where(['user_id'=>$this->user_id])->find();
37 if(!empty($data)){ 37 if(!empty($data)){
38 - if($data['status'] == 1){  
39 - //审核中  
40 - $this->redirect('audit1');  
41 - }else if($data['status'] == 2){  
42 - //审核通过  
43 - $this->redirect('audit2'); 38 + if($data['status'] == 1 || $data['status'] == 2){
  39 + //审核中或者审核通过提示
  40 + $this->redirect('audit_status');
44 } 41 }
45 $business_images = explode(',',$data['business_images']); 42 $business_images = explode(',',$data['business_images']);
46 foreach($business_images as $key => $b_i){ 43 foreach($business_images as $key => $b_i){
@@ -67,4 +64,20 @@ class Merchant extends WechatBase @@ -67,4 +64,20 @@ class Merchant extends WechatBase
67 $this->assign('jssdk',$jssdk); 64 $this->assign('jssdk',$jssdk);
68 return $this->fetch(); 65 return $this->fetch();
69 } 66 }
  67 + public function audit_status(){
  68 + $data = Db::name('merchant_audit')->where(['user_id'=>$this->user_id])->find();
  69 + if(empty($data)){
  70 + $this->redirect('enter_view');
  71 + }
  72 + $title = '';
  73 + if($data['status'] == 3){
  74 + $this->redirect('enter_view');
  75 + }else if($data['status'] == 2){
  76 + $title = "审核通过";
  77 + }else if($data['status'] == 1){
  78 + $title = "审核中";
  79 + }
  80 + $this->assign('title',$title);
  81 + return $this->fetch();
  82 + }
70 } 83 }
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +
  4 +{include file="public/head"/}
  5 +<style>
  6 + .examin_top {
  7 + width: 100%;
  8 + height: 4rem;
  9 + background-image: url("__CDN__/assets/advertising/img/examinBg.png");
  10 + background-position: 0 0;
  11 + background-size: contain;
  12 + background-repeat: no-repeat;
  13 + }
  14 +
  15 + .examin_type {
  16 + width: 1.64rem;
  17 + height: 1.64rem;
  18 + margin: 0 auto;
  19 + padding-top: 0.6rem;
  20 + }
  21 +
  22 + .examin_msg {
  23 + color: #06121E;
  24 + font-size: 0.32rem;
  25 + margin: 0.84rem 0 0.32rem;
  26 + text-align: center;
  27 + }
  28 +
  29 + .examin_tips {
  30 + color: #06121E;
  31 + text-align: center;
  32 + font-size: 0.24rem;
  33 + }
  34 +</style>
  35 +
  36 +<body>
  37 + <div class="examine">
  38 + <div class="examin_top">
  39 + <div class="examin_type">
  40 + {if condition="$data.status eq 1"}
  41 + <img src="__CDN__/assets/advertising/img/examin.png" alt="" class="examin_img">
  42 + {elseif condition="$data.status eq 2"}
  43 + <img src="__CDN__/assets/advertising/img/examin1.png" alt="" class="examin_img">
  44 + {/if}
  45 + </div>
  46 + </div>
  47 + {if condition="$data.status eq 1"}
  48 + <div class="examin_msg">注册信息正在审核中!</div>
  49 + <div class="examin_tips">请您耐心等待</div>
  50 + {elseif condition="$data.status eq 2"}
  51 + <div class="examin_msg">注册信息已审核通过!</div>
  52 + {/if}
  53 + </div>
  54 + {include file="public/js" /}
  55 +</body>
  56 +
  57 +</html>