作者 王晓刚
1 个管道 的构建 通过 耗费 0 秒

商户申请

@@ -69,15 +69,6 @@ @@ -69,15 +69,6 @@
69 </provider> 69 </provider>
70 </entry> 70 </entry>
71 </file> 71 </file>
72 - <file leaf-file-name="index.html" pinned="false" current-in-tab="false">  
73 - <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">  
74 - <provider selected="true" editor-type-id="text-editor">  
75 - <state relative-caret-position="1241">  
76 - <caret line="73" column="9" lean-forward="true" selection-start-line="73" selection-start-column="9" selection-end-line="73" selection-end-column="9" />  
77 - </state>  
78 - </provider>  
79 - </entry>  
80 - </file>  
81 <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false"> 72 <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">
82 <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html"> 73 <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
83 <provider selected="true" editor-type-id="text-editor"> 74 <provider selected="true" editor-type-id="text-editor">
@@ -93,8 +84,17 @@ @@ -93,8 +84,17 @@
93 <file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="true"> 84 <file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="true">
94 <entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php"> 85 <entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
95 <provider selected="true" editor-type-id="text-editor"> 86 <provider selected="true" editor-type-id="text-editor">
  87 + <state relative-caret-position="323">
  88 + <caret line="91" column="15" selection-start-line="91" selection-start-column="15" selection-end-line="91" selection-end-column="15" />
  89 + </state>
  90 + </provider>
  91 + </entry>
  92 + </file>
  93 + <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
  94 + <entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html">
  95 + <provider selected="true" editor-type-id="text-editor">
96 <state relative-caret-position="374"> 96 <state relative-caret-position="374">
97 - <caret line="94" column="9" selection-start-line="94" selection-start-column="9" selection-end-line="94" selection-end-column="9" /> 97 + <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
98 </state> 98 </state>
99 </provider> 99 </provider>
100 </entry> 100 </entry>
@@ -181,7 +181,6 @@ @@ -181,7 +181,6 @@
181 <component name="IdeDocumentHistory"> 181 <component name="IdeDocumentHistory">
182 <option name="CHANGED_PATHS"> 182 <option name="CHANGED_PATHS">
183 <list> 183 <list>
184 - <option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />  
185 <option value="$PROJECT_DIR$/application/extra/wechat.php" /> 184 <option value="$PROJECT_DIR$/application/extra/wechat.php" />
186 <option value="$PROJECT_DIR$/application/common/controller/Backend.php" /> 185 <option value="$PROJECT_DIR$/application/common/controller/Backend.php" />
187 <option value="$PROJECT_DIR$/extend/fast/Auth.php" /> 186 <option value="$PROJECT_DIR$/extend/fast/Auth.php" />
@@ -231,6 +230,7 @@ @@ -231,6 +230,7 @@
231 <option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" /> 230 <option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
232 <option value="$PROJECT_DIR$/application/home/controller/Index.php" /> 231 <option value="$PROJECT_DIR$/application/home/controller/Index.php" />
233 <option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" /> 232 <option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
  233 + <option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
234 <option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" /> 234 <option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
235 </list> 235 </list>
236 </option> 236 </option>
@@ -336,6 +336,21 @@ @@ -336,6 +336,21 @@
336 <item name="advertising" type="b2602c69:ProjectViewProjectNode" /> 336 <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
337 <item name="advertising" type="462c0819:PsiDirectoryNode" /> 337 <item name="advertising" type="462c0819:PsiDirectoryNode" />
338 <item name="application" type="462c0819:PsiDirectoryNode" /> 338 <item name="application" type="462c0819:PsiDirectoryNode" />
  339 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  340 + <item name="view" type="462c0819:PsiDirectoryNode" />
  341 + </path>
  342 + <path>
  343 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  344 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  345 + <item name="application" type="462c0819:PsiDirectoryNode" />
  346 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  347 + <item name="view" type="462c0819:PsiDirectoryNode" />
  348 + <item name="user_exp_log_audit" type="462c0819:PsiDirectoryNode" />
  349 + </path>
  350 + <path>
  351 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  352 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  353 + <item name="application" type="462c0819:PsiDirectoryNode" />
339 <item name="home" type="462c0819:PsiDirectoryNode" /> 354 <item name="home" type="462c0819:PsiDirectoryNode" />
340 </path> 355 </path>
341 <path> 356 <path>
@@ -502,35 +517,7 @@ @@ -502,35 +517,7 @@
502 <workItem from="1573000530976" duration="6061000" /> 517 <workItem from="1573000530976" duration="6061000" />
503 <workItem from="1573087576825" duration="5555000" /> 518 <workItem from="1573087576825" duration="5555000" />
504 <workItem from="1573174620844" duration="32581000" /> 519 <workItem from="1573174620844" duration="32581000" />
505 - <workItem from="1573259331081" duration="29041000" />  
506 - </task>  
507 - <task id="LOCAL-00483" summary="商户申请">  
508 - <created>1573280678744</created>  
509 - <option name="number" value="00483" />  
510 - <option name="presentableId" value="LOCAL-00483" />  
511 - <option name="project" value="LOCAL" />  
512 - <updated>1573280678744</updated>  
513 - </task>  
514 - <task id="LOCAL-00484" summary="商户申请">  
515 - <created>1573280799675</created>  
516 - <option name="number" value="00484" />  
517 - <option name="presentableId" value="LOCAL-00484" />  
518 - <option name="project" value="LOCAL" />  
519 - <updated>1573280799675</updated>  
520 - </task>  
521 - <task id="LOCAL-00485" summary="商户申请">  
522 - <created>1573280962475</created>  
523 - <option name="number" value="00485" />  
524 - <option name="presentableId" value="LOCAL-00485" />  
525 - <option name="project" value="LOCAL" />  
526 - <updated>1573280962475</updated>  
527 - </task>  
528 - <task id="LOCAL-00486" summary="商户申请">  
529 - <created>1573281110799</created>  
530 - <option name="number" value="00486" />  
531 - <option name="presentableId" value="LOCAL-00486" />  
532 - <option name="project" value="LOCAL" />  
533 - <updated>1573281110799</updated> 520 + <workItem from="1573259331081" duration="29290000" />
534 </task> 521 </task>
535 <task id="LOCAL-00487" summary="商户申请"> 522 <task id="LOCAL-00487" summary="商户申请">
536 <created>1573281203802</created> 523 <created>1573281203802</created>
@@ -847,11 +834,39 @@ @@ -847,11 +834,39 @@
847 <option name="project" value="LOCAL" /> 834 <option name="project" value="LOCAL" />
848 <updated>1573292513436</updated> 835 <updated>1573292513436</updated>
849 </task> 836 </task>
850 - <option name="localTasksCounter" value="532" /> 837 + <task id="LOCAL-00532" summary=" 商户申请">
  838 + <created>1573292578903</created>
  839 + <option name="number" value="00532" />
  840 + <option name="presentableId" value="LOCAL-00532" />
  841 + <option name="project" value="LOCAL" />
  842 + <updated>1573292578903</updated>
  843 + </task>
  844 + <task id="LOCAL-00533" summary=" 商户申请">
  845 + <created>1573292669147</created>
  846 + <option name="number" value="00533" />
  847 + <option name="presentableId" value="LOCAL-00533" />
  848 + <option name="project" value="LOCAL" />
  849 + <updated>1573292669147</updated>
  850 + </task>
  851 + <task id="LOCAL-00534" summary=" 商户申请">
  852 + <created>1573292730768</created>
  853 + <option name="number" value="00534" />
  854 + <option name="presentableId" value="LOCAL-00534" />
  855 + <option name="project" value="LOCAL" />
  856 + <updated>1573292730768</updated>
  857 + </task>
  858 + <task id="LOCAL-00535" summary=" 商户申请">
  859 + <created>1573292751851</created>
  860 + <option name="number" value="00535" />
  861 + <option name="presentableId" value="LOCAL-00535" />
  862 + <option name="project" value="LOCAL" />
  863 + <updated>1573292751851</updated>
  864 + </task>
  865 + <option name="localTasksCounter" value="536" />
851 <servers /> 866 <servers />
852 </component> 867 </component>
853 <component name="TimeTrackingManager"> 868 <component name="TimeTrackingManager">
854 - <option name="totallyTimeSpent" value="402714000" /> 869 + <option name="totallyTimeSpent" value="402963000" />
855 </component> 870 </component>
856 <component name="ToolWindowManager"> 871 <component name="ToolWindowManager">
857 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 872 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -938,13 +953,6 @@ @@ -938,13 +953,6 @@
938 <option name="LAST_COMMIT_MESSAGE" value=" 商户申请" /> 953 <option name="LAST_COMMIT_MESSAGE" value=" 商户申请" />
939 </component> 954 </component>
940 <component name="editorHistoryManager"> 955 <component name="editorHistoryManager">
941 - <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css">  
942 - <provider selected="true" editor-type-id="text-editor">  
943 - <state relative-caret-position="249">  
944 - <caret line="26" column="16" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />  
945 - </state>  
946 - </provider>  
947 - </entry>  
948 <entry file="file://$PROJECT_DIR$/application/home/controller/Upload.php"> 956 <entry file="file://$PROJECT_DIR$/application/home/controller/Upload.php">
949 <provider selected="true" editor-type-id="text-editor"> 957 <provider selected="true" editor-type-id="text-editor">
950 <state relative-caret-position="544"> 958 <state relative-caret-position="544">
@@ -1257,10 +1265,17 @@ @@ -1257,10 +1265,17 @@
1257 </state> 1265 </state>
1258 </provider> 1266 </provider>
1259 </entry> 1267 </entry>
1260 - <entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php"> 1268 + <entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html">
1261 <provider selected="true" editor-type-id="text-editor"> 1269 <provider selected="true" editor-type-id="text-editor">
1262 <state relative-caret-position="374"> 1270 <state relative-caret-position="374">
1263 - <caret line="94" column="9" selection-start-line="94" selection-start-column="9" selection-end-line="94" selection-end-column="9" /> 1271 + <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
  1272 + </state>
  1273 + </provider>
  1274 + </entry>
  1275 + <entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
  1276 + <provider selected="true" editor-type-id="text-editor">
  1277 + <state relative-caret-position="323">
  1278 + <caret line="91" column="15" selection-start-line="91" selection-start-column="15" selection-end-line="91" selection-end-column="15" />
1264 </state> 1279 </state>
1265 </provider> 1280 </provider>
1266 </entry> 1281 </entry>
@@ -88,13 +88,13 @@ class UserExpLogAudit extends Backend @@ -88,13 +88,13 @@ class UserExpLogAudit extends Backend
88 $this->error(__('No Results were found')); 88 $this->error(__('No Results were found'));
89 } 89 }
90 $adminIds = $this->getDataLimitAdminIds(); 90 $adminIds = $this->getDataLimitAdminIds();
91 - echo 1;  
92 - exit();  
93 if (is_array($adminIds)) { 91 if (is_array($adminIds)) {
94 if (!in_array($row[$this->dataLimitField], $adminIds)) { 92 if (!in_array($row[$this->dataLimitField], $adminIds)) {
95 $this->error(__('You have no permission')); 93 $this->error(__('You have no permission'));
96 } 94 }
97 } 95 }
  96 + echo 1;
  97 + exit();
98 if ($this->request->isPost()) { 98 if ($this->request->isPost()) {
99 $params = $this->request->post("row/a"); 99 $params = $this->request->post("row/a");
100 if ($params) { 100 if ($params) {