王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 e6be8df49056d3df4b070d2311a3e03ec51a0a1a 1 个父辈 783dd021
1 个管道 的构建 通过 耗费 11 秒

提现

内嵌 并排对比
正在显示 4 个修改的文件 包含 456 行增加 和 200 行删除
@@ -3,6 +3,8 @@ @@ -3,6 +3,8 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> 4 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/application/admin/controller/PayView.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/PayView.php" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" afterDir="false" />
6 <change beforePath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" afterDir="false" /> 8 <change beforePath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" afterDir="false" />
7 </list> 9 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,12 +18,12 @@ @@ -16,12 +18,12 @@
16 <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath> 18 <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
17 </component> 19 </component>
18 <component name="FileEditorManager"> 20 <component name="FileEditorManager">
19 - <leaf> 21 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
20 <file leaf-file-name="PayView.php" pinned="false" current-in-tab="false"> 22 <file leaf-file-name="PayView.php" pinned="false" current-in-tab="false">
21 <entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php"> 23 <entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
22 <provider selected="true" editor-type-id="text-editor"> 24 <provider selected="true" editor-type-id="text-editor">
23 - <state relative-caret-position="810">  
24 - <caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" /> 25 + <state relative-caret-position="544">
  26 + <caret line="52" column="55" selection-start-line="52" selection-start-column="24" selection-end-line="52" selection-end-column="55" />
25 <folding> 27 <folding>
26 <element signature="e#129#163#0#PHP" expanded="true" /> 28 <element signature="e#129#163#0#PHP" expanded="true" />
27 </folding> 29 </folding>
@@ -29,69 +31,86 @@ @@ -29,69 +31,86 @@
29 </provider> 31 </provider>
30 </entry> 32 </entry>
31 </file> 33 </file>
32 - <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">  
33 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php"> 34 + <file leaf-file-name="merchant_goods.js" pinned="false" current-in-tab="false">
  35 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js">
34 <provider selected="true" editor-type-id="text-editor"> 36 <provider selected="true" editor-type-id="text-editor">
35 - <state relative-caret-position="765">  
36 - <caret line="90" column="38" selection-start-line="90" selection-start-column="38" selection-end-line="90" selection-end-column="38" />  
37 - <folding>  
38 - <element signature="e#42#79#0#PHP" expanded="true" />  
39 - </folding> 37 + <state relative-caret-position="2805">
  38 + <caret line="183" column="13" selection-start-line="183" selection-start-column="13" selection-end-line="183" selection-end-column="13" />
40 </state> 39 </state>
41 </provider> 40 </provider>
42 </entry> 41 </entry>
43 </file> 42 </file>
44 - <file leaf-file-name="index.html" pinned="false" current-in-tab="false">  
45 - <entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html"> 43 + <file leaf-file-name="pay_view.js" pinned="false" current-in-tab="false">
  44 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
  45 + <provider selected="true" editor-type-id="text-editor">
  46 + <state relative-caret-position="1490">
  47 + <caret line="130" column="47" selection-start-line="130" selection-start-column="47" selection-end-line="130" selection-end-column="47" />
  48 + </state>
  49 + </provider>
  50 + </entry>
  51 + </file>
  52 + <file leaf-file-name="UserMoneyLogAudit.php" pinned="false" current-in-tab="true">
  53 + <entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
46 <provider selected="true" editor-type-id="text-editor"> 54 <provider selected="true" editor-type-id="text-editor">
47 - <state relative-caret-position="759">  
48 - <caret line="62" column="50" selection-start-line="62" selection-start-column="50" selection-end-line="62" selection-end-column="50" /> 55 + <state relative-caret-position="589">
  56 + <caret line="128" column="27" selection-start-line="128" selection-start-column="27" selection-end-line="128" selection-end-column="27" />
49 <folding> 57 <folding>
50 - <element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />  
51 - <element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />  
52 - <element signature="n#style#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />  
53 - <element signature="e#2136#2142#0" expanded="true" />  
54 - <element signature="e#2151#2157#0" expanded="true" />  
55 - <element signature="e#2157#2163#0" expanded="true" />  
56 - <element signature="n#style#0;n#span#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />  
57 - <element signature="n#style#0;n#td#1;n#tr#5;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" /> 58 + <element signature="e#40#74#0#PHP" expanded="true" />
58 </folding> 59 </folding>
59 </state> 60 </state>
60 </provider> 61 </provider>
61 </entry> 62 </entry>
62 </file> 63 </file>
63 - <file leaf-file-name="common.js" pinned="false" current-in-tab="false">  
64 - <entry file="file://$PROJECT_DIR$/public/assets/addons/epay/js/common.js"> 64 + <file leaf-file-name="wechat.php" pinned="false" current-in-tab="false">
  65 + <entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
65 <provider selected="true" editor-type-id="text-editor"> 66 <provider selected="true" editor-type-id="text-editor">
66 - <state>  
67 - <caret column="15" selection-start-column="15" selection-end-column="15" /> 67 + <state relative-caret-position="595">
  68 + <caret line="50" column="18" selection-start-line="50" selection-start-column="9" selection-end-line="50" selection-end-column="18" />
68 </state> 69 </state>
69 </provider> 70 </provider>
70 </entry> 71 </entry>
71 </file> 72 </file>
72 - <file leaf-file-name="pay_view.js" pinned="false" current-in-tab="true">  
73 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js"> 73 + <file leaf-file-name="WechatBase.php" pinned="false" current-in-tab="false">
  74 + <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
74 <provider selected="true" editor-type-id="text-editor"> 75 <provider selected="true" editor-type-id="text-editor">
75 - <state relative-caret-position="527">  
76 - <caret line="79" column="51" selection-start-line="79" selection-start-column="51" selection-end-line="79" selection-end-column="51" /> 76 + <state relative-caret-position="504">
  77 + <caret line="74" column="43" selection-start-line="74" selection-start-column="37" selection-end-line="74" selection-end-column="43" />
77 </state> 78 </state>
78 </provider> 79 </provider>
79 </entry> 80 </entry>
80 </file> 81 </file>
81 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 82 <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
82 - <entry file="file://$PROJECT_DIR$/application/admin/view/example/customform/index.html"> 83 + <entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html">
  84 + <provider selected="true" editor-type-id="text-editor">
  85 + <state relative-caret-position="340">
  86 + <caret line="20" column="33" selection-start-line="14" selection-start-column="24" selection-end-line="20" selection-end-column="33" />
  87 + </state>
  88 + </provider>
  89 + </entry>
  90 + </file>
  91 + <file leaf-file-name="user_money_log_audit.js" pinned="false" current-in-tab="false">
  92 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js">
83 <provider selected="true" editor-type-id="text-editor"> 93 <provider selected="true" editor-type-id="text-editor">
84 - <state relative-caret-position="203">  
85 - <caret line="95" column="36" selection-start-line="91" selection-start-column="8" selection-end-line="95" selection-end-column="36" /> 94 + <state relative-caret-position="646">
  95 + <caret line="38" column="71" selection-start-line="38" selection-start-column="71" selection-end-line="38" selection-end-column="71" />
86 </state> 96 </state>
87 </provider> 97 </provider>
88 </entry> 98 </entry>
89 </file> 99 </file>
90 - <file leaf-file-name="multitable.js" pinned="false" current-in-tab="false">  
91 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/example/multitable.js"> 100 + <file leaf-file-name="user_money_log.js" pinned="false" current-in-tab="false">
  101 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log.js">
92 <provider selected="true" editor-type-id="text-editor"> 102 <provider selected="true" editor-type-id="text-editor">
93 - <state relative-caret-position="459">  
94 - <caret line="27" column="22" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="22" /> 103 + <state relative-caret-position="544">
  104 + <caret line="32" column="165" selection-start-line="32" selection-start-column="69" selection-end-line="32" selection-end-column="165" />
  105 + </state>
  106 + </provider>
  107 + </entry>
  108 + </file>
  109 + <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
  110 + <entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html">
  111 + <provider selected="true" editor-type-id="text-editor">
  112 + <state relative-caret-position="402">
  113 + <caret line="24" column="33" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" />
95 </state> 114 </state>
96 </provider> 115 </provider>
97 </entry> 116 </entry>
@@ -106,6 +125,7 @@ @@ -106,6 +125,7 @@
106 <find>required</find> 125 <find>required</find>
107 <find>row</find> 126 <find>row</find>
108 <find>statusList</find> 127 <find>statusList</find>
  128 + <find>money</find>
109 </findStrings> 129 </findStrings>
110 </component> 130 </component>
111 <component name="Git.Settings"> 131 <component name="Git.Settings">
@@ -114,13 +134,6 @@ @@ -114,13 +134,6 @@
114 <component name="IdeDocumentHistory"> 134 <component name="IdeDocumentHistory">
115 <option name="CHANGED_PATHS"> 135 <option name="CHANGED_PATHS">
116 <list> 136 <list>
117 - <option value="$PROJECT_DIR$/application/home/model/Slide.php" />  
118 - <option value="$PROJECT_DIR$/application/home/model/Question.php" />  
119 - <option value="$PROJECT_DIR$/application/common.php" />  
120 - <option value="$PROJECT_DIR$/application/home/model/User_question_answer.php" />  
121 - <option value="$PROJECT_DIR$/application/home/model/UserQuestionAnswer.php" />  
122 - <option value="$PROJECT_DIR$/application/home/controller/Goods.php" />  
123 - <option value="$PROJECT_DIR$/application/home/controller/Collect.php" />  
124 <option value="$PROJECT_DIR$/application/home/controller/Upload.php" /> 137 <option value="$PROJECT_DIR$/application/home/controller/Upload.php" />
125 <option value="$PROJECT_DIR$/application/home/controller/Share.php" /> 138 <option value="$PROJECT_DIR$/application/home/controller/Share.php" />
126 <option value="$PROJECT_DIR$/application/home/controller/Member.php" /> 139 <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
@@ -161,10 +174,17 @@ @@ -161,10 +174,17 @@
161 <option value="$PROJECT_DIR$/public/assets/js/backend/wechat/pay.js" /> 174 <option value="$PROJECT_DIR$/public/assets/js/backend/wechat/pay.js" />
162 <option value="$PROJECT_DIR$/application/admin/view/pay/index.html" /> 175 <option value="$PROJECT_DIR$/application/admin/view/pay/index.html" />
163 <option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" /> 176 <option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
164 - <option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />  
165 <option value="$PROJECT_DIR$/application/admin/controller/Pay.php" /> 177 <option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
166 - <option value="$PROJECT_DIR$/application/admin/controller/PayView.php" /> 178 + <option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />
167 <option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" /> 179 <option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" />
  180 + <option value="$PROJECT_DIR$/application/admin/view/user_money_log/index.html" />
  181 + <option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLog.php" />
  182 + <option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log.js" />
  183 + <option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html" />
  184 + <option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js" />
  185 + <option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" />
  186 + <option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
  187 + <option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" />
168 </list> 188 </list>
169 </option> 189 </option>
170 </component> 190 </component>
@@ -269,13 +289,65 @@ @@ -269,13 +289,65 @@
269 <item name="advertising" type="462c0819:PsiDirectoryNode" /> 289 <item name="advertising" type="462c0819:PsiDirectoryNode" />
270 <item name="application" type="462c0819:PsiDirectoryNode" /> 290 <item name="application" type="462c0819:PsiDirectoryNode" />
271 <item name="admin" type="462c0819:PsiDirectoryNode" /> 291 <item name="admin" type="462c0819:PsiDirectoryNode" />
  292 + <item name="library" type="462c0819:PsiDirectoryNode" />
  293 + </path>
  294 + <path>
  295 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  296 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  297 + <item name="application" type="462c0819:PsiDirectoryNode" />
  298 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  299 + <item name="library" type="462c0819:PsiDirectoryNode" />
  300 + <item name="traits" type="462c0819:PsiDirectoryNode" />
  301 + </path>
  302 + <path>
  303 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  304 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  305 + <item name="application" type="462c0819:PsiDirectoryNode" />
  306 + <item name="admin" type="462c0819:PsiDirectoryNode" />
272 <item name="view" type="462c0819:PsiDirectoryNode" /> 307 <item name="view" type="462c0819:PsiDirectoryNode" />
273 </path> 308 </path>
274 <path> 309 <path>
275 <item name="advertising" type="b2602c69:ProjectViewProjectNode" /> 310 <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
276 <item name="advertising" type="462c0819:PsiDirectoryNode" /> 311 <item name="advertising" type="462c0819:PsiDirectoryNode" />
277 <item name="application" type="462c0819:PsiDirectoryNode" /> 312 <item name="application" type="462c0819:PsiDirectoryNode" />
278 - <item name="common" type="462c0819:PsiDirectoryNode" /> 313 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  314 + <item name="view" type="462c0819:PsiDirectoryNode" />
  315 + <item name="merchant_audit" type="462c0819:PsiDirectoryNode" />
  316 + </path>
  317 + <path>
  318 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  319 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  320 + <item name="application" type="462c0819:PsiDirectoryNode" />
  321 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  322 + <item name="view" type="462c0819:PsiDirectoryNode" />
  323 + <item name="user_money_log" type="462c0819:PsiDirectoryNode" />
  324 + </path>
  325 + <path>
  326 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  327 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  328 + <item name="application" type="462c0819:PsiDirectoryNode" />
  329 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  330 + <item name="view" type="462c0819:PsiDirectoryNode" />
  331 + <item name="user_money_log_audit" type="462c0819:PsiDirectoryNode" />
  332 + </path>
  333 + <path>
  334 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  335 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  336 + <item name="application" type="462c0819:PsiDirectoryNode" />
  337 + <item name="extra" type="462c0819:PsiDirectoryNode" />
  338 + </path>
  339 + <path>
  340 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  341 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  342 + <item name="application" type="462c0819:PsiDirectoryNode" />
  343 + <item name="home" type="462c0819:PsiDirectoryNode" />
  344 + </path>
  345 + <path>
  346 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  347 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  348 + <item name="application" type="462c0819:PsiDirectoryNode" />
  349 + <item name="home" type="462c0819:PsiDirectoryNode" />
  350 + <item name="controller" type="462c0819:PsiDirectoryNode" />
279 </path> 351 </path>
280 <path> 352 <path>
281 <item name="advertising" type="b2602c69:ProjectViewProjectNode" /> 353 <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
@@ -293,7 +365,15 @@ @@ -293,7 +365,15 @@
293 <item name="advertising" type="462c0819:PsiDirectoryNode" /> 365 <item name="advertising" type="462c0819:PsiDirectoryNode" />
294 <item name="public" type="462c0819:PsiDirectoryNode" /> 366 <item name="public" type="462c0819:PsiDirectoryNode" />
295 <item name="assets" type="462c0819:PsiDirectoryNode" /> 367 <item name="assets" type="462c0819:PsiDirectoryNode" />
296 - <item name="img" type="462c0819:PsiDirectoryNode" /> 368 + <item name="js" type="462c0819:PsiDirectoryNode" />
  369 + </path>
  370 + <path>
  371 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  372 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  373 + <item name="public" type="462c0819:PsiDirectoryNode" />
  374 + <item name="assets" type="462c0819:PsiDirectoryNode" />
  375 + <item name="js" type="462c0819:PsiDirectoryNode" />
  376 + <item name="backend" type="462c0819:PsiDirectoryNode" />
297 </path> 377 </path>
298 <path> 378 <path>
299 <item name="advertising" type="b2602c69:ProjectViewProjectNode" /> 379 <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
@@ -369,7 +449,8 @@ @@ -369,7 +449,8 @@
369 <workItem from="1572050747518" duration="29776000" /> 449 <workItem from="1572050747518" duration="29776000" />
370 <workItem from="1572087949120" duration="1641000" /> 450 <workItem from="1572087949120" duration="1641000" />
371 <workItem from="1572223206994" duration="28857000" /> 451 <workItem from="1572223206994" duration="28857000" />
372 - <workItem from="1572309778506" duration="22840000" /> 452 + <workItem from="1572309778506" duration="26117000" />
  453 + <workItem from="1572395935540" duration="9055000" />
373 </task> 454 </task>
374 <task id="LOCAL-00001" summary="数据库配置"> 455 <task id="LOCAL-00001" summary="数据库配置">
375 <created>1571972429395</created> 456 <created>1571972429395</created>
@@ -518,29 +599,36 @@ @@ -518,29 +599,36 @@
518 <option name="project" value="LOCAL" /> 599 <option name="project" value="LOCAL" />
519 <updated>1572337801981</updated> 600 <updated>1572337801981</updated>
520 </task> 601 </task>
521 - <option name="localTasksCounter" value="22" /> 602 + <task id="LOCAL-00022" summary="支付">
  603 + <created>1572337980656</created>
  604 + <option name="number" value="00022" />
  605 + <option name="presentableId" value="LOCAL-00022" />
  606 + <option name="project" value="LOCAL" />
  607 + <updated>1572337980656</updated>
  608 + </task>
  609 + <option name="localTasksCounter" value="23" />
522 <servers /> 610 <servers />
523 </component> 611 </component>
524 <component name="TimeTrackingManager"> 612 <component name="TimeTrackingManager">
525 - <option name="totallyTimeSpent" value="181948000" /> 613 + <option name="totallyTimeSpent" value="194280000" />
526 </component> 614 </component>
527 <component name="ToolWindowManager"> 615 <component name="ToolWindowManager">
528 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 616 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
529 <editor active="true" /> 617 <editor active="true" />
530 <layout> 618 <layout>
  619 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13646056" />
531 <window_info anchor="bottom" id="TODO" order="6" /> 620 <window_info anchor="bottom" id="TODO" order="6" />
532 <window_info anchor="bottom" id="调试" order="7" /> 621 <window_info anchor="bottom" id="调试" order="7" />
  622 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
533 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32997763" /> 623 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32997763" />
  624 + <window_info anchor="right" id="Database" order="3" />
534 <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> 625 <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
535 <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" /> 626 <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
536 - <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />  
537 - <window_info anchor="bottom" id="运行" order="7" />  
538 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13539445" />  
539 - <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />  
540 - <window_info anchor="right" id="Database" order="3" />  
541 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 627 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  628 + <window_info anchor="bottom" id="运行" order="7" />
  629 + <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
542 <window_info id="Favorites" order="2" side_tool="true" /> 630 <window_info id="Favorites" order="2" side_tool="true" />
543 - <window_info anchor="bottom" id="找到" weight="0.32997763" /> 631 + <window_info anchor="bottom" id="找到" order="8" weight="0.32997763" />
544 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 632 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
545 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 633 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
546 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 634 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -555,24 +643,24 @@ @@ -555,24 +643,24 @@
555 <window_info anchor="bottom" id="运行" order="7" /> 643 <window_info anchor="bottom" id="运行" order="7" />
556 <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" /> 644 <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
557 <window_info anchor="bottom" id="Run" order="2" /> 645 <window_info anchor="bottom" id="Run" order="2" />
558 - <window_info id="Favorites" order="2" side_tool="true" /> 646 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
559 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13113007" /> 647 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13113007" />
560 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 648 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
561 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 649 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
562 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 650 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
563 <window_info anchor="bottom" id="TODO" order="6" /> 651 <window_info anchor="bottom" id="TODO" order="6" />
564 - <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" /> 652 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
565 <window_info anchor="bottom" id="Find" order="1" /> 653 <window_info anchor="bottom" id="Find" order="1" />
566 <window_info anchor="right" id="Database" order="3" /> 654 <window_info anchor="right" id="Database" order="3" />
567 <window_info anchor="bottom" id="Terminal" order="11" weight="0.32997763" /> 655 <window_info anchor="bottom" id="Terminal" order="11" weight="0.32997763" />
568 <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.32997763" /> 656 <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.32997763" />
569 <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" /> 657 <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
570 - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> 658 + <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
571 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 659 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
572 <window_info anchor="bottom" id="调试" order="13" /> 660 <window_info anchor="bottom" id="调试" order="13" />
573 <window_info anchor="bottom" id="Message" order="0" /> 661 <window_info anchor="bottom" id="Message" order="0" />
574 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> 662 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
575 - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 663 + <window_info id="Favorites" order="2" side_tool="true" />
576 </layout-to-restore> 664 </layout-to-restore>
577 </component> 665 </component>
578 <component name="TypeScriptGeneratedFilesManager"> 666 <component name="TypeScriptGeneratedFilesManager">
@@ -590,84 +678,6 @@ @@ -590,84 +678,6 @@
590 <option name="LAST_COMMIT_MESSAGE" value="支付" /> 678 <option name="LAST_COMMIT_MESSAGE" value="支付" />
591 </component> 679 </component>
592 <component name="editorHistoryManager"> 680 <component name="editorHistoryManager">
593 - <entry file="file://$PROJECT_DIR$/public/assets/js/addons.js">  
594 - <provider selected="true" editor-type-id="text-editor" />  
595 - </entry>  
596 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">  
597 - <provider selected="true" editor-type-id="text-editor">  
598 - <state relative-caret-position="323">  
599 - <caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="58" />  
600 - <folding>  
601 - <element signature="e#40#74#0#PHP" expanded="true" />  
602 - </folding>  
603 - </state>  
604 - </provider>  
605 - </entry>  
606 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">  
607 - <provider selected="true" editor-type-id="text-editor">  
608 - <state relative-caret-position="952">  
609 - <caret line="56" column="56" selection-start-line="56" selection-start-column="56" selection-end-line="56" selection-end-column="56" />  
610 - </state>  
611 - </provider>  
612 - </entry>  
613 - <entry file="file://$PROJECT_DIR$/public/assets/addons/ueditor/third-party/highcharts/highcharts.src.js">  
614 - <provider selected="true" editor-type-id="text-editor">  
615 - <state relative-caret-position="-1275">  
616 - <caret line="3599" column="34" lean-forward="true" selection-start-line="3599" selection-start-column="34" selection-end-line="3599" selection-end-column="34" />  
617 - <folding>  
618 - <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />  
619 - <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />  
620 - <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />  
621 - <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />  
622 - <element signature="n#style#0;n#span#0;n#!!top" expanded="true" />  
623 - </folding>  
624 - </state>  
625 - </provider>  
626 - </entry>  
627 - <entry file="file://$PROJECT_DIR$/application/admin/view/auth/rule/index.html">  
628 - <provider selected="true" editor-type-id="text-editor" />  
629 - </entry>  
630 - <entry file="file://$PROJECT_DIR$/application/admin/model/AuthRule.php">  
631 - <provider selected="true" editor-type-id="text-editor" />  
632 - </entry>  
633 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Ajax.php">  
634 - <provider selected="true" editor-type-id="text-editor">  
635 - <state relative-caret-position="-2295" />  
636 - </provider>  
637 - </entry>  
638 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/auth/rule.js">  
639 - <provider selected="true" editor-type-id="text-editor">  
640 - <state relative-caret-position="-1723">  
641 - <caret line="30" column="61" lean-forward="true" selection-start-line="30" selection-start-column="61" selection-end-line="30" selection-end-column="61" />  
642 - </state>  
643 - </provider>  
644 - </entry>  
645 - <entry file="file://$PROJECT_DIR$/application/admin/controller/auth/Rule.php">  
646 - <provider selected="true" editor-type-id="text-editor">  
647 - <state relative-caret-position="-612" />  
648 - </provider>  
649 - </entry>  
650 - <entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">  
651 - <provider selected="true" editor-type-id="text-editor">  
652 - <state relative-caret-position="289">  
653 - <caret line="249" column="23" selection-start-line="249" selection-start-column="23" selection-end-line="249" selection-end-column="23" />  
654 - </state>  
655 - </provider>  
656 - </entry>  
657 - <entry file="file://$PROJECT_DIR$/public/assets/js/require-table.js">  
658 - <provider selected="true" editor-type-id="text-editor">  
659 - <state relative-caret-position="17">  
660 - <caret line="15" column="22" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="22" />  
661 - </state>  
662 - </provider>  
663 - </entry>  
664 - <entry file="file://$PROJECT_DIR$/application/admin/model/MerchantGoods.php">  
665 - <provider selected="true" editor-type-id="text-editor">  
666 - <state relative-caret-position="493">  
667 - <caret line="29" column="26" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />  
668 - </state>  
669 - </provider>  
670 - </entry>  
671 <entry file="file://$PROJECT_DIR$/application/admin/model/Question.php"> 681 <entry file="file://$PROJECT_DIR$/application/admin/model/Question.php">
672 <provider selected="true" editor-type-id="text-editor"> 682 <provider selected="true" editor-type-id="text-editor">
673 <state relative-caret-position="510"> 683 <state relative-caret-position="510">
@@ -744,20 +754,6 @@ @@ -744,20 +754,6 @@
744 </state> 754 </state>
745 </provider> 755 </provider>
746 </entry> 756 </entry>
747 - <entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">  
748 - <provider selected="true" editor-type-id="text-editor">  
749 - <state relative-caret-position="385">  
750 - <caret line="195" column="5" selection-start-line="145" selection-start-column="4" selection-end-line="195" selection-end-column="5" />  
751 - </state>  
752 - </provider>  
753 - </entry>  
754 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js">  
755 - <provider selected="true" editor-type-id="text-editor">  
756 - <state relative-caret-position="714">  
757 - <caret line="183" column="13" selection-start-line="183" selection-start-column="13" selection-end-line="183" selection-end-column="13" />  
758 - </state>  
759 - </provider>  
760 - </entry>  
761 <entry file="file://$PROJECT_DIR$/application/admin/view/question/edit.html"> 757 <entry file="file://$PROJECT_DIR$/application/admin/view/question/edit.html">
762 <provider selected="true" editor-type-id="text-editor"> 758 <provider selected="true" editor-type-id="text-editor">
763 <state relative-caret-position="136"> 759 <state relative-caret-position="136">
@@ -787,13 +783,6 @@ @@ -787,13 +783,6 @@
787 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 783 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
788 <provider selected="true" editor-type-id="text-editor" /> 784 <provider selected="true" editor-type-id="text-editor" />
789 </entry> 785 </entry>
790 - <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">  
791 - <provider selected="true" editor-type-id="text-editor">  
792 - <state relative-caret-position="623">  
793 - <caret line="68" column="58" selection-start-line="68" selection-start-column="51" selection-end-line="68" selection-end-column="58" />  
794 - </state>  
795 - </provider>  
796 - </entry>  
797 <entry file="file://$PROJECT_DIR$/application/admin/view/index/index.html"> 786 <entry file="file://$PROJECT_DIR$/application/admin/view/index/index.html">
798 <provider selected="true" editor-type-id="text-editor" /> 787 <provider selected="true" editor-type-id="text-editor" />
799 </entry> 788 </entry>
@@ -801,10 +790,6 @@ @@ -801,10 +790,6 @@
801 <provider selected="true" editor-type-id="text-editor"> 790 <provider selected="true" editor-type-id="text-editor">
802 <state relative-caret-position="17"> 791 <state relative-caret-position="17">
803 <caret line="1" selection-start-line="1" selection-end-line="2" /> 792 <caret line="1" selection-start-line="1" selection-end-line="2" />
804 - <folding>  
805 - <element signature="n#style#0;n#div#2;n#form#0;n#!!top" expanded="true" />  
806 - <element signature="n#style#0;n#div#3;n#form#0;n#!!top" expanded="true" />  
807 - </folding>  
808 </state> 793 </state>
809 </provider> 794 </provider>
810 </entry> 795 </entry>
@@ -829,13 +814,6 @@ @@ -829,13 +814,6 @@
829 </state> 814 </state>
830 </provider> 815 </provider>
831 </entry> 816 </entry>
832 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/example/multitable.js">  
833 - <provider selected="true" editor-type-id="text-editor">  
834 - <state relative-caret-position="459">  
835 - <caret line="27" column="22" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="22" />  
836 - </state>  
837 - </provider>  
838 - </entry>  
839 <entry file="file://$PROJECT_DIR$/addons/epay/controller/Api.php"> 817 <entry file="file://$PROJECT_DIR$/addons/epay/controller/Api.php">
840 <provider selected="true" editor-type-id="text-editor"> 818 <provider selected="true" editor-type-id="text-editor">
841 <state relative-caret-position="-459" /> 819 <state relative-caret-position="-459" />
@@ -873,10 +851,34 @@ @@ -873,10 +851,34 @@
873 <entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt"> 851 <entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">
874 <provider selected="true" editor-type-id="text-editor" /> 852 <provider selected="true" editor-type-id="text-editor" />
875 </entry> 853 </entry>
876 - <entry file="file://$PROJECT_DIR$/public/assets/addons/epay/js/common.js"> 854 + <entry file="file://$PROJECT_DIR$/public/assets/img/qrcode.png">
  855 + <provider selected="true" editor-type-id="images" />
  856 + </entry>
  857 + <entry file="file://$PROJECT_DIR$/public/assets/js/fast.js">
  858 + <provider selected="true" editor-type-id="text-editor">
  859 + <state relative-caret-position="562">
  860 + <caret line="341" column="24" selection-start-line="341" selection-start-column="19" selection-end-line="341" selection-end-column="24" />
  861 + </state>
  862 + </provider>
  863 + </entry>
  864 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
  865 + <provider selected="true" editor-type-id="text-editor">
  866 + <state relative-caret-position="1530">
  867 + <caret line="93" column="100" selection-start-line="93" selection-start-column="77" selection-end-line="93" selection-end-column="100" />
  868 + </state>
  869 + </provider>
  870 + </entry>
  871 + <entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log/edit.html">
877 <provider selected="true" editor-type-id="text-editor"> 872 <provider selected="true" editor-type-id="text-editor">
878 <state> 873 <state>
879 - <caret column="15" selection-start-column="15" selection-end-column="15" /> 874 + <caret column="102" lean-forward="true" selection-start-column="102" selection-end-column="102" />
  875 + </state>
  876 + </provider>
  877 + </entry>
  878 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/example/multitable.js">
  879 + <provider selected="true" editor-type-id="text-editor">
  880 + <state relative-caret-position="-306">
  881 + <caret line="27" column="22" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="22" />
880 </state> 882 </state>
881 </provider> 883 </provider>
882 </entry> 884 </entry>
@@ -887,57 +889,144 @@ @@ -887,57 +889,144 @@
887 </state> 889 </state>
888 </provider> 890 </provider>
889 </entry> 891 </entry>
890 - <entry file="file://$PROJECT_DIR$/public/assets/img/qrcode.png">  
891 - <provider selected="true" editor-type-id="images" /> 892 + <entry file="file://$PROJECT_DIR$/public/assets/addons/epay/js/common.js">
  893 + <provider selected="true" editor-type-id="text-editor">
  894 + <state>
  895 + <caret column="15" selection-start-column="15" selection-end-column="15" />
  896 + </state>
  897 + </provider>
892 </entry> 898 </entry>
893 <entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html"> 899 <entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
894 <provider selected="true" editor-type-id="text-editor"> 900 <provider selected="true" editor-type-id="text-editor">
895 - <state relative-caret-position="759">  
896 - <caret line="62" column="50" selection-start-line="62" selection-start-column="50" selection-end-line="62" selection-end-column="50" /> 901 + <state relative-caret-position="504">
  902 + <caret line="117" column="92" selection-start-line="117" selection-start-column="67" selection-end-line="117" selection-end-column="92" />
897 <folding> 903 <folding>
898 <element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" /> 904 <element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
899 <element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" /> 905 <element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
900 <element signature="n#style#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" /> 906 <element signature="n#style#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
901 - <element signature="e#2136#2142#0" expanded="true" />  
902 - <element signature="e#2151#2157#0" expanded="true" />  
903 - <element signature="e#2157#2163#0" expanded="true" />  
904 <element signature="n#style#0;n#span#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" /> 907 <element signature="n#style#0;n#span#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
905 <element signature="n#style#0;n#td#1;n#tr#5;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" /> 908 <element signature="n#style#0;n#td#1;n#tr#5;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
  909 + <element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
  910 + <element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
906 </folding> 911 </folding>
907 </state> 912 </state>
908 </provider> 913 </provider>
909 </entry> 914 </entry>
910 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php"> 915 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js">
911 <provider selected="true" editor-type-id="text-editor"> 916 <provider selected="true" editor-type-id="text-editor">
912 - <state relative-caret-position="765">  
913 - <caret line="90" column="38" selection-start-line="90" selection-start-column="38" selection-end-line="90" selection-end-column="38" />  
914 - <folding>  
915 - <element signature="e#42#79#0#PHP" expanded="true" />  
916 - </folding> 917 + <state relative-caret-position="2805">
  918 + <caret line="183" column="13" selection-start-line="183" selection-start-column="13" selection-end-line="183" selection-end-column="13" />
917 </state> 919 </state>
918 </provider> 920 </provider>
919 </entry> 921 </entry>
920 - <entry file="file://$PROJECT_DIR$/public/assets/js/fast.js"> 922 + <entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log/index.html">
921 <provider selected="true" editor-type-id="text-editor"> 923 <provider selected="true" editor-type-id="text-editor">
922 - <state relative-caret-position="562">  
923 - <caret line="341" column="24" selection-start-line="341" selection-start-column="19" selection-end-line="341" selection-end-column="24" /> 924 + <state relative-caret-position="238">
  925 + <caret line="14" column="28" selection-start-line="14" selection-start-column="24" selection-end-line="20" selection-end-column="33" />
  926 + </state>
  927 + </provider>
  928 + </entry>
  929 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
  930 + <provider selected="true" editor-type-id="text-editor">
  931 + <state relative-caret-position="1490">
  932 + <caret line="130" column="47" selection-start-line="130" selection-start-column="47" selection-end-line="130" selection-end-column="47" />
  933 + </state>
  934 + </provider>
  935 + </entry>
  936 + <entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLog.php">
  937 + <provider selected="true" editor-type-id="text-editor">
  938 + <state relative-caret-position="782">
  939 + <caret line="46" column="29" selection-start-line="46" selection-start-column="29" selection-end-line="46" selection-end-column="29" />
  940 + </state>
  941 + </provider>
  942 + </entry>
  943 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Merchant.php">
  944 + <provider selected="true" editor-type-id="text-editor">
  945 + <state relative-caret-position="323">
  946 + <caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="100" />
  947 + </state>
  948 + </provider>
  949 + </entry>
  950 + <entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html">
  951 + <provider selected="true" editor-type-id="text-editor">
  952 + <state relative-caret-position="340">
  953 + <caret line="20" column="33" selection-start-line="14" selection-start-column="24" selection-end-line="20" selection-end-column="33" />
  954 + </state>
  955 + </provider>
  956 + </entry>
  957 + <entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
  958 + <provider selected="true" editor-type-id="text-editor">
  959 + <state relative-caret-position="623">
  960 + <caret line="72" column="13" lean-forward="true" selection-start-line="1" selection-start-column="4" selection-end-line="72" selection-end-column="13" />
  961 + </state>
  962 + </provider>
  963 + </entry>
  964 + <entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html">
  965 + <provider selected="true" editor-type-id="text-editor">
  966 + <state relative-caret-position="402">
  967 + <caret line="24" column="33" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" />
  968 + </state>
  969 + </provider>
  970 + </entry>
  971 + <entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
  972 + <provider selected="true" editor-type-id="text-editor">
  973 + <state relative-caret-position="1082">
  974 + <caret line="195" column="5" lean-forward="true" selection-start-line="145" selection-start-column="4" selection-end-line="195" selection-end-column="5" />
  975 + </state>
  976 + </provider>
  977 + </entry>
  978 + <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
  979 + <provider selected="true" editor-type-id="text-editor">
  980 + <state relative-caret-position="221">
  981 + <caret line="21" column="21" lean-forward="true" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
924 </state> 982 </state>
925 </provider> 983 </provider>
926 </entry> 984 </entry>
927 <entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php"> 985 <entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
928 <provider selected="true" editor-type-id="text-editor"> 986 <provider selected="true" editor-type-id="text-editor">
929 - <state relative-caret-position="810">  
930 - <caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" /> 987 + <state relative-caret-position="544">
  988 + <caret line="52" column="55" selection-start-line="52" selection-start-column="24" selection-end-line="52" selection-end-column="55" />
931 <folding> 989 <folding>
932 <element signature="e#129#163#0#PHP" expanded="true" /> 990 <element signature="e#129#163#0#PHP" expanded="true" />
933 </folding> 991 </folding>
934 </state> 992 </state>
935 </provider> 993 </provider>
936 </entry> 994 </entry>
937 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js"> 995 + <entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
  996 + <provider selected="true" editor-type-id="text-editor">
  997 + <state relative-caret-position="595">
  998 + <caret line="50" column="18" selection-start-line="50" selection-start-column="9" selection-end-line="50" selection-end-column="18" />
  999 + </state>
  1000 + </provider>
  1001 + </entry>
  1002 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log.js">
  1003 + <provider selected="true" editor-type-id="text-editor">
  1004 + <state relative-caret-position="544">
  1005 + <caret line="32" column="165" selection-start-line="32" selection-start-column="69" selection-end-line="32" selection-end-column="165" />
  1006 + </state>
  1007 + </provider>
  1008 + </entry>
  1009 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js">
  1010 + <provider selected="true" editor-type-id="text-editor">
  1011 + <state relative-caret-position="646">
  1012 + <caret line="38" column="71" selection-start-line="38" selection-start-column="71" selection-end-line="38" selection-end-column="71" />
  1013 + </state>
  1014 + </provider>
  1015 + </entry>
  1016 + <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
  1017 + <provider selected="true" editor-type-id="text-editor">
  1018 + <state relative-caret-position="504">
  1019 + <caret line="74" column="43" selection-start-line="74" selection-start-column="37" selection-end-line="74" selection-end-column="43" />
  1020 + </state>
  1021 + </provider>
  1022 + </entry>
  1023 + <entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
938 <provider selected="true" editor-type-id="text-editor"> 1024 <provider selected="true" editor-type-id="text-editor">
939 - <state relative-caret-position="527">  
940 - <caret line="79" column="51" selection-start-line="79" selection-start-column="51" selection-end-line="79" selection-end-column="51" /> 1025 + <state relative-caret-position="589">
  1026 + <caret line="128" column="27" selection-start-line="128" selection-start-column="27" selection-end-line="128" selection-end-column="27" />
  1027 + <folding>
  1028 + <element signature="e#40#74#0#PHP" expanded="true" />
  1029 + </folding>
941 </state> 1030 </state>
942 </provider> 1031 </provider>
943 </entry> 1032 </entry>
@@ -14,10 +14,13 @@ use think\Db; @@ -14,10 +14,13 @@ use think\Db;
14 14
15 class PayView extends Backend 15 class PayView extends Backend
16 { 16 {
17 - public function test(){  
18 - dump(cache('nnn'));  
19 - dump(cache('successful'));  
20 - } 17 + /**
  18 + * 页面
  19 + * @return mixed|\think\response\Json
  20 + * @throws \think\db\exception\DataNotFoundException
  21 + * @throws \think\db\exception\ModelNotFoundException
  22 + * @throws \think\exception\DbException
  23 + */
21 public function index(){ 24 public function index(){
22 //商户信息 25 //商户信息
23 $admin = Db::name('admin')->where(['id'=>$this->auth->id])->find(); 26 $admin = Db::name('admin')->where(['id'=>$this->auth->id])->find();
@@ -27,6 +30,13 @@ class PayView extends Backend @@ -27,6 +30,13 @@ class PayView extends Backend
27 $this->assign('admin',$admin); 30 $this->assign('admin',$admin);
28 return $this->fetch(); 31 return $this->fetch();
29 } 32 }
  33 +
  34 + /**
  35 + * 创建订单
  36 + * @throws \think\db\exception\DataNotFoundException
  37 + * @throws \think\db\exception\ModelNotFoundException
  38 + * @throws \think\exception\DbException
  39 + */
30 public function create_order(){ 40 public function create_order(){
31 $admin_id = $this->request->param('admin_id',0,'intval'); 41 $admin_id = $this->request->param('admin_id',0,'intval');
32 $total = $this->request->param('total',0,'intval'); 42 $total = $this->request->param('total',0,'intval');
@@ -46,6 +56,13 @@ class PayView extends Backend @@ -46,6 +56,13 @@ class PayView extends Backend
46 $order_id = Db::name('order')->insertGetId($arr); 56 $order_id = Db::name('order')->insertGetId($arr);
47 $this->success('','',['order_id'=>$order_id]); 57 $this->success('','',['order_id'=>$order_id]);
48 } 58 }
  59 +
  60 + /**
  61 + * 唤起支付
  62 + * @throws \think\db\exception\DataNotFoundException
  63 + * @throws \think\db\exception\ModelNotFoundException
  64 + * @throws \think\exception\DbException
  65 + */
49 public function pay(){ 66 public function pay(){
50 $order_id = $this->request->param('order_id',0,'intval'); 67 $order_id = $this->request->param('order_id',0,'intval');
51 $data = Db::name('order')->where(['id'=>$order_id])->find(); 68 $data = Db::name('order')->where(['id'=>$order_id])->find();
@@ -56,6 +73,13 @@ class PayView extends Backend @@ -56,6 +73,13 @@ class PayView extends Backend
56 } 73 }
57 \PHPQRCode\QRcode::png($code_url); 74 \PHPQRCode\QRcode::png($code_url);
58 } 75 }
  76 +
  77 + /**
  78 + * 订单是否支付
  79 + * @throws \think\db\exception\DataNotFoundException
  80 + * @throws \think\db\exception\ModelNotFoundException
  81 + * @throws \think\exception\DbException
  82 + */
59 public function order_pay(){ 83 public function order_pay(){
60 $order_id = $this->request->param('order_id',0,'intval'); 84 $order_id = $this->request->param('order_id',0,'intval');
61 $data = Db::name('order')->where(['id'=>$order_id])->find(); 85 $data = Db::name('order')->where(['id'=>$order_id])->find();
@@ -64,4 +88,47 @@ class PayView extends Backend @@ -64,4 +88,47 @@ class PayView extends Backend
64 } 88 }
65 $this->success(); 89 $this->success();
66 } 90 }
  91 +
  92 + /**
  93 + * 创建提现记录
  94 + * @throws \think\Exception
  95 + * @throws \think\db\exception\DataNotFoundException
  96 + * @throws \think\db\exception\ModelNotFoundException
  97 + * @throws \think\exception\DbException
  98 + */
  99 + public function create_withdraw(){
  100 + $admin_id = $this->request->param('admin_id',0,'intval');
  101 + $money = $this->request->param('money',0,'intval');
  102 + if(empty($admin_id) || empty($money)){
  103 + $this->error('缺少必要参数');
  104 + }
  105 + //商户信息
  106 + $admin = Db::name('admin')->where(['id'=>$admin_id])->find();
  107 + //红包券充值比例
  108 + $exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
  109 + if($exp_ratio['ratio']*$admin['money']*0.01<$money){
  110 + $this->error('余额不足');
  111 + }
  112 + Db::startTrans();
  113 + //储存记录
  114 + $arr1['admin_id'] = $admin_id;
  115 + $arr1['before_money'] = $admin['money'];
  116 + $arr1['money'] = $exp_ratio['ratio']/0.01*$money;
  117 + $arr1['after_money'] = $admin['money'] - $arr1['money'];
  118 + $arr1['type'] = 1;
  119 + $arr1['createtime'] = time();
  120 + $result1 = Db::name('user_money_log')->insert($arr1);
  121 + if(empty($result1)){
  122 + Db::rollback();
  123 + $this->error('sql执行失败');
  124 + }
  125 + //扣除商户余额
  126 + $result2 = Db::name('admin')->where(['id'=>$admin_id])->setDec('money',$arr1['money']);
  127 + if(empty($result2)){
  128 + Db::rollback();
  129 + $this->error('sql执行失败');
  130 + }
  131 + Db::commit();
  132 + $this->success();
  133 + }
67 } 134 }
@@ -72,8 +72,59 @@ @@ -72,8 +72,59 @@
72 </div> 72 </div>
73 </div> 73 </div>
74 <div class="tab-pane fade" id="second"> 74 <div class="tab-pane fade" id="second">
75 - <table id="table2" class="table table-striped table-bordered table-hover" width="100%">  
76 - </table> 75 + <div class="box box-success">
  76 + <!--<b>
  77 + <div class="panel-heading">
  78 + 账号 ： {$admin.username}
  79 + </div>
  80 + <div class="panel-heading">
  81 + 余额 ： {$admin.money}元
  82 + </div>
  83 + </b>-->
  84 + <div class="panel-body">
  85 + <table class="table table-striped">
  86 + <tbody>
  87 + <tr>
  88 + <td width="100"><b>账号 ： </b></td>
  89 + <td><b>{$admin.username}</b></td>
  90 + </tr>
  91 + <tr>
  92 + <td><b>剩余红包券 ： </b></td>
  93 + <td><b>{$admin.money}&nbsp;&nbsp;<span>约为<span class="text-danger">{$exp_ratio.ratio*$admin.money*0.01}</span>元</span></b></td>
  94 + </tr>
  95 + <tr>
  96 + <td><b>提现方式 ： </b></td>
  97 + <td><b>微信余额</b></td>
  98 + </tr>
  99 + <tr>
  100 + <td style="vertical-align: middle;"><b>提现金额 ： </b></td>
  101 + <td>
  102 + <b>
  103 + <input class="form-control pull-left money" style="width: 140px" type="number" value="" placeholder="请输入提现金额"/>
  104 + <input type="hidden" class="ratio" value="{$exp_ratio.ratio}"/>
  105 + <input type="hidden" class="admin_id" value="{$admin.id}"/>
  106 + <!--<div class="pull-left" style="line-height: 31px;">
  107 + &nbsp;元&nbsp;&nbsp;
  108 + <span class="ticket" style="display: none">约为<span class="text-danger">0</span>红包券</span>
  109 + </div>-->
  110 + </b>
  111 + </td>
  112 + </tr>
  113 + <tr>
  114 + <td></td>
  115 + <td>
  116 + <b>
  117 + <p class="text-warning">提现金额不得小于50元，且必须为整数。</p>
  118 + <p class="text-warning">1元={$exp_ratio.ratio/0.01*1}红包券</p>
  119 + </b>
  120 + </td>
  121 + </tr>
  122 + </tbody>
  123 + </table>
  124 + <button class="btn btn-success withdraw" type="button">立即提现</button>
  125 +
  126 + </div>
  127 + </div>
77 </div> 128 </div>
78 </div> 129 </div>
79 </div> 130 </div>
@@ -91,6 +91,55 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -91,6 +91,55 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
91 }) 91 })
92 } 92 }
93 } 93 }
  94 + //点击立即提现
  95 + $('.withdraw').click(function(){
  96 + var admin_id = $('.admin_id').val();
  97 + var money = $('.money').val();
  98 + if(money == ''){
  99 + top.window.Layer.open({
  100 + title:'温馨提示',
  101 + content:'请输入提现金额'
  102 + });
  103 + return false;
  104 + }else if(money<50){
  105 + top.window.Layer.open({
  106 + title:'温馨提示',
  107 + content:'提现金额不得小于50元'
  108 + });
  109 + return false;
  110 + }else if(!(/(^[1-9]\d*$)/.test(money))){
  111 + top.window.Layer.open({
  112 + title:'温馨提示',
  113 + content:'必须为整数'
  114 + });
  115 + return false;
  116 + }
  117 + $.ajax({
  118 + url:"pay_view/create_withdraw",
  119 + type:"POST",
  120 + data:{'admin_id':admin_id,'money':money},
  121 + success:function(res){
  122 + if(res.code == 1){
  123 + top.window.Layer.open({
  124 + title:'温馨提示',
  125 + content:'提现申请已发送请等待审核',
  126 + });
  127 + window.location.href='';
  128 + }else{
  129 + top.window.Layer.open({
  130 + title:'温馨提示',
  131 + content:res.msg
  132 + });
  133 + }
  134 + },
  135 + error:function(){
  136 + top.window.Layer.open({
  137 + title:'温馨提示',
  138 + content:'与服务器连接失败'
  139 + });
  140 + }
  141 + })
  142 + });
94 143
95 Controller.api.bindevent(); 144 Controller.api.bindevent();
96 }, 145 },