王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 12f20cc29df26330ab2446716c5ecbe0d476ca97 1 个父辈 cb26755a
1 个管道 的构建 通过 耗费 1 秒

后台bug

内嵌 并排对比
正在显示 4 个修改的文件 包含 154 行增加 和 162 行删除
@@ -5,7 +5,10 @@ @@ -5,7 +5,10 @@
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 beforePath="$PROJECT_DIR$/thinkphp/library/think/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/thinkphp/library/think/Controller.php" 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$/application/admin/controller/UserMoneyLogAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/public/assets/js/backend/goods.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/goods.js" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/public/assets/js/backend/users.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/users.js" afterDir="false" />
9 </list> 12 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 13 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 14 <option name="TRACKING_ENABLED" value="true" />
@@ -33,32 +36,11 @@ @@ -33,32 +36,11 @@
33 </component> 36 </component>
34 <component name="FileEditorManager"> 37 <component name="FileEditorManager">
35 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 38 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
36 - <file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">  
37 - <entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">  
38 - <provider selected="true" editor-type-id="text-editor">  
39 - <state relative-caret-position="391">  
40 - <caret line="185" column="42" selection-start-line="185" selection-start-column="42" selection-end-line="185" selection-end-column="42" />  
41 - <folding>  
42 - <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />  
43 - </folding>  
44 - </state>  
45 - </provider>  
46 - </entry>  
47 - </file>  
48 <file leaf-file-name="users.js" pinned="false" current-in-tab="false"> 39 <file leaf-file-name="users.js" pinned="false" current-in-tab="false">
49 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js"> 40 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">
50 <provider selected="true" editor-type-id="text-editor"> 41 <provider selected="true" editor-type-id="text-editor">
51 - <state relative-caret-position="436">  
52 - <caret line="40" column="57" selection-start-line="40" selection-start-column="57" selection-end-line="40" selection-end-column="57" />  
53 - </state>  
54 - </provider>  
55 - </entry>  
56 - </file>  
57 - <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">  
58 - <entry file="file://$PROJECT_DIR$/application/admin/view/users/edit.html">  
59 - <provider selected="true" editor-type-id="text-editor">  
60 - <state relative-caret-position="646">  
61 - <caret line="62" column="41" selection-start-line="62" selection-start-column="41" selection-end-line="62" selection-end-column="41" /> 42 + <state relative-caret-position="402">
  43 + <caret line="38" column="82" selection-start-line="38" selection-start-column="82" selection-end-line="38" selection-end-column="82" />
62 </state> 44 </state>
63 </provider> 45 </provider>
64 </entry> 46 </entry>
@@ -66,62 +48,72 @@ @@ -66,62 +48,72 @@
66 <file leaf-file-name="Index.php" pinned="false" current-in-tab="false"> 48 <file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
67 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 49 <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
68 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
69 - <state relative-caret-position="102">  
70 - <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" /> 51 + <state relative-caret-position="170">
  52 + <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
71 </state> 53 </state>
72 </provider> 54 </provider>
73 </entry> 55 </entry>
74 </file> 56 </file>
75 - <file leaf-file-name="WechatBase.php" pinned="false" current-in-tab="false">  
76 - <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php"> 57 + <file leaf-file-name="Users.php" pinned="false" current-in-tab="false">
  58 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
77 <provider selected="true" editor-type-id="text-editor"> 59 <provider selected="true" editor-type-id="text-editor">
78 - <state relative-caret-position="153">  
79 - <caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" /> 60 + <state relative-caret-position="2312">
  61 + <caret line="137" column="27" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />
80 </state> 62 </state>
81 </provider> 63 </provider>
82 </entry> 64 </entry>
83 </file> 65 </file>
84 - <file leaf-file-name="Controller.php" pinned="false" current-in-tab="true">  
85 - <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php"> 66 + <file leaf-file-name="UserMoneyLogAudit.php" pinned="false" current-in-tab="false">
  67 + <entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
86 <provider selected="true" editor-type-id="text-editor"> 68 <provider selected="true" editor-type-id="text-editor">
87 - <state relative-caret-position="425">  
88 - <caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" /> 69 + <state relative-caret-position="510">
  70 + <caret line="72" column="129" selection-start-line="72" selection-start-column="129" selection-end-line="72" selection-end-column="129" />
89 </state> 71 </state>
90 </provider> 72 </provider>
91 </entry> 73 </entry>
92 </file> 74 </file>
93 - <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">  
94 - <entry file="file://$PROJECT_DIR$/application/admin/view/merchant/edit.html"> 75 + <file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
  76 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php">
95 <provider selected="true" editor-type-id="text-editor"> 77 <provider selected="true" editor-type-id="text-editor">
96 - <state relative-caret-position="544">  
97 - <caret line="95" column="12" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="108" /> 78 + <state relative-caret-position="570">
  79 + <caret line="71" selection-start-line="71" selection-end-line="72" />
98 </state> 80 </state>
99 </provider> 81 </provider>
100 </entry> 82 </entry>
101 </file> 83 </file>
102 - <file leaf-file-name="User.php" pinned="false" current-in-tab="false">  
103 - <entry file="file://$PROJECT_DIR$/application/home/controller/User.php"> 84 + <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
  85 + <entry file="file://$PROJECT_DIR$/application/admin/view/goods/index.html">
  86 + <provider selected="true" editor-type-id="text-editor" />
  87 + </entry>
  88 + </file>
  89 + <file leaf-file-name="goods.js" pinned="false" current-in-tab="true">
  90 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods.js">
104 <provider selected="true" editor-type-id="text-editor"> 91 <provider selected="true" editor-type-id="text-editor">
105 - <state relative-caret-position="17">  
106 - <caret line="25" column="40" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" /> 92 + <state relative-caret-position="425">
  93 + <caret line="58" column="155" selection-start-line="58" selection-start-column="155" selection-end-line="58" selection-end-column="155" />
107 </state> 94 </state>
108 </provider> 95 </provider>
109 </entry> 96 </entry>
110 </file> 97 </file>
111 - <file leaf-file-name="money.html" pinned="false" current-in-tab="false">  
112 - <entry file="file://$PROJECT_DIR$/application/admin/view/users/money.html"> 98 + <file leaf-file-name="MerchantGoods.php" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
113 <provider selected="true" editor-type-id="text-editor"> 100 <provider selected="true" editor-type-id="text-editor">
114 - <state relative-caret-position="391">  
115 - <caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="114" /> 101 + <state relative-caret-position="510">
  102 + <caret line="61" column="92" selection-start-line="61" selection-start-column="92" selection-end-line="61" selection-end-column="92" />
116 </state> 103 </state>
117 </provider> 104 </provider>
118 </entry> 105 </entry>
119 </file> 106 </file>
120 - <file leaf-file-name="Users.php" pinned="false" current-in-tab="false">  
121 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php"> 107 + <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
  108 + <entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html">
  109 + <provider selected="true" editor-type-id="text-editor" />
  110 + </entry>
  111 + </file>
  112 + <file leaf-file-name="user_money_log_audit.js" pinned="false" current-in-tab="false">
  113 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js">
122 <provider selected="true" editor-type-id="text-editor"> 114 <provider selected="true" editor-type-id="text-editor">
123 - <state relative-caret-position="640">  
124 - <caret line="137" column="27" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" /> 115 + <state relative-caret-position="612">
  116 + <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
125 </state> 117 </state>
126 </provider> 118 </provider>
127 </entry> 119 </entry>
@@ -178,9 +170,6 @@ @@ -178,9 +170,6 @@
178 <component name="IdeDocumentHistory"> 170 <component name="IdeDocumentHistory">
179 <option name="CHANGED_PATHS"> 171 <option name="CHANGED_PATHS">
180 <list> 172 <list>
181 - <option value="$PROJECT_DIR$/application/home/view/collect/index.html" />  
182 - <option value="$PROJECT_DIR$/application/home/view/public/js.html" />  
183 - <option value="$PROJECT_DIR$/application/home/view/share/index.html" />  
184 <option value="$PROJECT_DIR$/public/assets/advertising/css/entry.css" /> 173 <option value="$PROJECT_DIR$/public/assets/advertising/css/entry.css" />
185 <option value="$PROJECT_DIR$/application/home/view/member/index.html" /> 174 <option value="$PROJECT_DIR$/application/home/view/member/index.html" />
186 <option value="$PROJECT_DIR$/application/home/view/public/nav.html" /> 175 <option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
@@ -210,7 +199,6 @@ @@ -210,7 +199,6 @@
210 <option value="$PROJECT_DIR$/application/admin/view/merchant_goods/edit.html" /> 199 <option value="$PROJECT_DIR$/application/admin/view/merchant_goods/edit.html" />
211 <option value="$PROJECT_DIR$/application/admin/controller/Goods.php" /> 200 <option value="$PROJECT_DIR$/application/admin/controller/Goods.php" />
212 <option value="$PROJECT_DIR$/application/admin/controller/GoodsAudit.php" /> 201 <option value="$PROJECT_DIR$/application/admin/controller/GoodsAudit.php" />
213 - <option value="$PROJECT_DIR$/application/home/controller/Index.php" />  
214 <option value="$PROJECT_DIR$/application/admin/view/slide/edit.html" /> 202 <option value="$PROJECT_DIR$/application/admin/view/slide/edit.html" />
215 <option value="$PROJECT_DIR$/application/admin/view/slide/add.html" /> 203 <option value="$PROJECT_DIR$/application/admin/view/slide/add.html" />
216 <option value="$PROJECT_DIR$/public/assets/js/backend/slide.js" /> 204 <option value="$PROJECT_DIR$/public/assets/js/backend/slide.js" />
@@ -227,8 +215,12 @@ @@ -227,8 +215,12 @@
227 <option value="$PROJECT_DIR$/application/admin/view/users/money.html" /> 215 <option value="$PROJECT_DIR$/application/admin/view/users/money.html" />
228 <option value="$PROJECT_DIR$/application/admin/view/merchant/edit.html" /> 216 <option value="$PROJECT_DIR$/application/admin/view/merchant/edit.html" />
229 <option value="$PROJECT_DIR$/application/admin/view/users/edit.html" /> 217 <option value="$PROJECT_DIR$/application/admin/view/users/edit.html" />
230 - <option value="$PROJECT_DIR$/public/assets/js/backend/users.js" />  
231 <option value="$PROJECT_DIR$/thinkphp/library/think/Controller.php" /> 218 <option value="$PROJECT_DIR$/thinkphp/library/think/Controller.php" />
  219 + <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
  220 + <option value="$PROJECT_DIR$/application/home/controller/Index.php" />
  221 + <option value="$PROJECT_DIR$/public/assets/js/backend/users.js" />
  222 + <option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" />
  223 + <option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />
232 </list> 224 </list>
233 </option> 225 </option>
234 </component> 226 </component>
@@ -364,6 +356,14 @@ @@ -364,6 +356,14 @@
364 <item name="application" type="462c0819:PsiDirectoryNode" /> 356 <item name="application" type="462c0819:PsiDirectoryNode" />
365 <item name="admin" type="462c0819:PsiDirectoryNode" /> 357 <item name="admin" type="462c0819:PsiDirectoryNode" />
366 <item name="view" type="462c0819:PsiDirectoryNode" /> 358 <item name="view" type="462c0819:PsiDirectoryNode" />
  359 + <item name="user_money_log_audit" type="462c0819:PsiDirectoryNode" />
  360 + </path>
  361 + <path>
  362 + <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
  363 + <item name="advertising" type="462c0819:PsiDirectoryNode" />
  364 + <item name="application" type="462c0819:PsiDirectoryNode" />
  365 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  366 + <item name="view" type="462c0819:PsiDirectoryNode" />
367 <item name="users" type="462c0819:PsiDirectoryNode" /> 367 <item name="users" type="462c0819:PsiDirectoryNode" />
368 </path> 368 </path>
369 <path> 369 <path>
@@ -485,28 +485,7 @@ @@ -485,28 +485,7 @@
485 <workItem from="1573259331081" duration="30435000" /> 485 <workItem from="1573259331081" duration="30435000" />
486 <workItem from="1573432217070" duration="2199000" /> 486 <workItem from="1573432217070" duration="2199000" />
487 <workItem from="1573519427130" duration="17475000" /> 487 <workItem from="1573519427130" duration="17475000" />
488 - <workItem from="1573605070739" duration="26868000" />  
489 - </task>  
490 - <task id="LOCAL-00616" summary=" 商户申请">  
491 - <created>1573607436524</created>  
492 - <option name="number" value="00616" />  
493 - <option name="presentableId" value="LOCAL-00616" />  
494 - <option name="project" value="LOCAL" />  
495 - <updated>1573607436524</updated>  
496 - </task>  
497 - <task id="LOCAL-00617" summary=" 商户申请">  
498 - <created>1573607503025</created>  
499 - <option name="number" value="00617" />  
500 - <option name="presentableId" value="LOCAL-00617" />  
501 - <option name="project" value="LOCAL" />  
502 - <updated>1573607503025</updated>  
503 - </task>  
504 - <task id="LOCAL-00618" summary=" 商户申请">  
505 - <created>1573613749446</created>  
506 - <option name="number" value="00618" />  
507 - <option name="presentableId" value="LOCAL-00618" />  
508 - <option name="project" value="LOCAL" />  
509 - <updated>1573613749446</updated> 488 + <workItem from="1573605070739" duration="27701000" />
510 </task> 489 </task>
511 <task id="LOCAL-00619" summary=" 商户申请"> 490 <task id="LOCAL-00619" summary=" 商户申请">
512 <created>1573614237426</created> 491 <created>1573614237426</created>
@@ -830,11 +809,32 @@ @@ -830,11 +809,32 @@
830 <option name="project" value="LOCAL" /> 809 <option name="project" value="LOCAL" />
831 <updated>1573648085758</updated> 810 <updated>1573648085758</updated>
832 </task> 811 </task>
833 - <option name="localTasksCounter" value="665" /> 812 + <task id="LOCAL-00665" summary="后台bug">
  813 + <created>1573648167991</created>
  814 + <option name="number" value="00665" />
  815 + <option name="presentableId" value="LOCAL-00665" />
  816 + <option name="project" value="LOCAL" />
  817 + <updated>1573648167991</updated>
  818 + </task>
  819 + <task id="LOCAL-00666" summary="后台bug">
  820 + <created>1573648220248</created>
  821 + <option name="number" value="00666" />
  822 + <option name="presentableId" value="LOCAL-00666" />
  823 + <option name="project" value="LOCAL" />
  824 + <updated>1573648220248</updated>
  825 + </task>
  826 + <task id="LOCAL-00667" summary="后台bug">
  827 + <created>1573648297986</created>
  828 + <option name="number" value="00667" />
  829 + <option name="presentableId" value="LOCAL-00667" />
  830 + <option name="project" value="LOCAL" />
  831 + <updated>1573648297986</updated>
  832 + </task>
  833 + <option name="localTasksCounter" value="668" />
834 <servers /> 834 <servers />
835 </component> 835 </component>
836 <component name="TimeTrackingManager"> 836 <component name="TimeTrackingManager">
837 - <option name="totallyTimeSpent" value="450650000" /> 837 + <option name="totallyTimeSpent" value="451483000" />
838 </component> 838 </component>
839 <component name="ToolWindowManager"> 839 <component name="ToolWindowManager">
840 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 840 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -849,7 +849,7 @@ @@ -849,7 +849,7 @@
849 <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" /> 849 <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
850 <window_info anchor="bottom" id="运行" order="7" /> 850 <window_info anchor="bottom" id="运行" order="7" />
851 <window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" /> 851 <window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" />
852 - <window_info content_ui="combo" id="Project" order="0" weight="0.15085287" /> 852 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" />
853 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 853 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
854 <window_info anchor="right" id="Database" order="3" weight="0.32995737" /> 854 <window_info anchor="right" id="Database" order="3" weight="0.32995737" />
855 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 855 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -924,41 +924,6 @@ @@ -924,41 +924,6 @@
924 <option name="LAST_COMMIT_MESSAGE" value="后台bug" /> 924 <option name="LAST_COMMIT_MESSAGE" value="后台bug" />
925 </component> 925 </component>
926 <component name="editorHistoryManager"> 926 <component name="editorHistoryManager">
927 - <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/index.css">  
928 - <provider selected="true" editor-type-id="text-editor">  
929 - <state relative-caret-position="357">  
930 - <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />  
931 - </state>  
932 - </provider>  
933 - </entry>  
934 - <entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">  
935 - <provider selected="true" editor-type-id="text-editor">  
936 - <state>  
937 - <caret column="5" selection-start-column="5" selection-end-column="5" />  
938 - </state>  
939 - </provider>  
940 - </entry>  
941 - <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/personal.css">  
942 - <provider selected="true" editor-type-id="text-editor">  
943 - <state relative-caret-position="221">  
944 - <caret line="28" column="23" lean-forward="true" selection-start-line="28" selection-start-column="23" selection-end-line="28" selection-end-column="23" />  
945 - </state>  
946 - </provider>  
947 - </entry>  
948 - <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">  
949 - <provider selected="true" editor-type-id="text-editor">  
950 - <state relative-caret-position="419">  
951 - <caret line="39" column="17" selection-start-line="39" selection-start-column="17" selection-end-line="39" selection-end-column="17" />  
952 - </state>  
953 - </provider>  
954 - </entry>  
955 - <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">  
956 - <provider selected="true" editor-type-id="text-editor">  
957 - <state relative-caret-position="247">  
958 - <caret line="75" column="98" lean-forward="true" selection-start-line="75" selection-start-column="98" selection-end-line="75" selection-end-column="98" />  
959 - </state>  
960 - </provider>  
961 - </entry>  
962 <entry file="file://$PROJECT_DIR$/application/admin/view/goods_audit/add.html"> 927 <entry file="file://$PROJECT_DIR$/application/admin/view/goods_audit/add.html">
963 <provider selected="true" editor-type-id="text-editor"> 928 <provider selected="true" editor-type-id="text-editor">
964 <state relative-caret-position="-2587" /> 929 <state relative-caret-position="-2587" />
@@ -1013,13 +978,6 @@ @@ -1013,13 +978,6 @@
1013 </state> 978 </state>
1014 </provider> 979 </provider>
1015 </entry> 980 </entry>
1016 - <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">  
1017 - <provider selected="true" editor-type-id="text-editor">  
1018 - <state relative-caret-position="1530">  
1019 - <caret line="99" column="13" selection-start-line="99" selection-start-column="13" selection-end-line="99" selection-end-column="13" />  
1020 - </state>  
1021 - </provider>  
1022 - </entry>  
1023 <entry file="file://$PROJECT_DIR$/application/admin/view/slide/add.html"> 981 <entry file="file://$PROJECT_DIR$/application/admin/view/slide/add.html">
1024 <provider selected="true" editor-type-id="text-editor"> 982 <provider selected="true" editor-type-id="text-editor">
1025 <state relative-caret-position="136"> 983 <state relative-caret-position="136">
@@ -1044,13 +1002,6 @@ @@ -1044,13 +1002,6 @@
1044 <entry file="file://$PROJECT_DIR$/application/admin/controller/Slide.php"> 1002 <entry file="file://$PROJECT_DIR$/application/admin/controller/Slide.php">
1045 <provider selected="true" editor-type-id="text-editor" /> 1003 <provider selected="true" editor-type-id="text-editor" />
1046 </entry> 1004 </entry>
1047 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php">  
1048 - <provider selected="true" editor-type-id="text-editor">  
1049 - <state relative-caret-position="570">  
1050 - <caret line="71" column="26" lean-forward="true" selection-start-line="71" selection-start-column="26" selection-end-line="71" selection-end-column="26" />  
1051 - </state>  
1052 - </provider>  
1053 - </entry>  
1054 <entry file="file://$PROJECT_DIR$/application/admin/controller/GoodsAudit.php"> 1005 <entry file="file://$PROJECT_DIR$/application/admin/controller/GoodsAudit.php">
1055 <provider selected="true" editor-type-id="text-editor"> 1006 <provider selected="true" editor-type-id="text-editor">
1056 <state relative-caret-position="391"> 1007 <state relative-caret-position="391">
@@ -1152,13 +1103,6 @@ @@ -1152,13 +1103,6 @@
1152 </state> 1103 </state>
1153 </provider> 1104 </provider>
1154 </entry> 1105 </entry>
1155 - <entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">  
1156 - <provider selected="true" editor-type-id="text-editor">  
1157 - <state relative-caret-position="442">  
1158 - <caret line="57" column="12" lean-forward="true" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="40" />  
1159 - </state>  
1160 - </provider>  
1161 - </entry>  
1162 <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php"> 1106 <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
1163 <provider selected="true" editor-type-id="text-editor"> 1107 <provider selected="true" editor-type-id="text-editor">
1164 <state relative-caret-position="494"> 1108 <state relative-caret-position="494">
@@ -1180,13 +1124,6 @@ @@ -1180,13 +1124,6 @@
1180 </state> 1124 </state>
1181 </provider> 1125 </provider>
1182 </entry> 1126 </entry>
1183 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">  
1184 - <provider selected="true" editor-type-id="text-editor">  
1185 - <state relative-caret-position="640">  
1186 - <caret line="137" column="27" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />  
1187 - </state>  
1188 - </provider>  
1189 - </entry>  
1190 <entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html"> 1127 <entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
1191 <provider selected="true" editor-type-id="text-editor"> 1128 <provider selected="true" editor-type-id="text-editor">
1192 <state relative-caret-position="528"> 1129 <state relative-caret-position="528">
@@ -1221,6 +1158,34 @@ @@ -1221,6 +1158,34 @@
1221 </state> 1158 </state>
1222 </provider> 1159 </provider>
1223 </entry> 1160 </entry>
  1161 + <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
  1162 + <provider selected="true" editor-type-id="text-editor">
  1163 + <state relative-caret-position="221">
  1164 + <caret line="76" column="8" selection-start-line="76" selection-start-column="8" selection-end-line="82" selection-end-column="9" />
  1165 + </state>
  1166 + </provider>
  1167 + </entry>
  1168 + <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
  1169 + <provider selected="true" editor-type-id="text-editor">
  1170 + <state relative-caret-position="315">
  1171 + <caret line="44" column="30" selection-start-line="44" selection-start-column="30" selection-end-line="44" selection-end-column="30" />
  1172 + </state>
  1173 + </provider>
  1174 + </entry>
  1175 + <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
  1176 + <provider selected="true" editor-type-id="text-editor">
  1177 + <state relative-caret-position="187">
  1178 + <caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="31" selection-end-column="5" />
  1179 + </state>
  1180 + </provider>
  1181 + </entry>
  1182 + <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
  1183 + <provider selected="true" editor-type-id="text-editor">
  1184 + <state relative-caret-position="170">
  1185 + <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
  1186 + </state>
  1187 + </provider>
  1188 + </entry>
1224 <entry file="file://$PROJECT_DIR$/application/admin/view/users/edit.html"> 1189 <entry file="file://$PROJECT_DIR$/application/admin/view/users/edit.html">
1225 <provider selected="true" editor-type-id="text-editor"> 1190 <provider selected="true" editor-type-id="text-editor">
1226 <state relative-caret-position="646"> 1191 <state relative-caret-position="646">
@@ -1230,29 +1195,56 @@ @@ -1230,29 +1195,56 @@
1230 </entry> 1195 </entry>
1231 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js"> 1196 <entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">
1232 <provider selected="true" editor-type-id="text-editor"> 1197 <provider selected="true" editor-type-id="text-editor">
1233 - <state relative-caret-position="436">  
1234 - <caret line="40" column="57" selection-start-line="40" selection-start-column="57" selection-end-line="40" selection-end-column="57" /> 1198 + <state relative-caret-position="402">
  1199 + <caret line="38" column="82" selection-start-line="38" selection-start-column="82" selection-end-line="38" selection-end-column="82" />
1235 </state> 1200 </state>
1236 </provider> 1201 </provider>
1237 </entry> 1202 </entry>
1238 - <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> 1203 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
1239 <provider selected="true" editor-type-id="text-editor"> 1204 <provider selected="true" editor-type-id="text-editor">
1240 - <state relative-caret-position="102">  
1241 - <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" /> 1205 + <state relative-caret-position="2312">
  1206 + <caret line="137" column="27" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />
1242 </state> 1207 </state>
1243 </provider> 1208 </provider>
1244 </entry> 1209 </entry>
1245 - <entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php"> 1210 + <entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html">
  1211 + <provider selected="true" editor-type-id="text-editor" />
  1212 + </entry>
  1213 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js">
1246 <provider selected="true" editor-type-id="text-editor"> 1214 <provider selected="true" editor-type-id="text-editor">
1247 - <state relative-caret-position="153">  
1248 - <caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" /> 1215 + <state relative-caret-position="612">
  1216 + <caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
1249 </state> 1217 </state>
1250 </provider> 1218 </provider>
1251 </entry> 1219 </entry>
1252 - <entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php"> 1220 + <entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
  1221 + <provider selected="true" editor-type-id="text-editor">
  1222 + <state relative-caret-position="510">
  1223 + <caret line="72" column="129" selection-start-line="72" selection-start-column="129" selection-end-line="72" selection-end-column="129" />
  1224 + </state>
  1225 + </provider>
  1226 + </entry>
  1227 + <entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
  1228 + <provider selected="true" editor-type-id="text-editor">
  1229 + <state relative-caret-position="510">
  1230 + <caret line="61" column="92" selection-start-line="61" selection-start-column="92" selection-end-line="61" selection-end-column="92" />
  1231 + </state>
  1232 + </provider>
  1233 + </entry>
  1234 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php">
  1235 + <provider selected="true" editor-type-id="text-editor">
  1236 + <state relative-caret-position="570">
  1237 + <caret line="71" selection-start-line="71" selection-end-line="72" />
  1238 + </state>
  1239 + </provider>
  1240 + </entry>
  1241 + <entry file="file://$PROJECT_DIR$/application/admin/view/goods/index.html">
  1242 + <provider selected="true" editor-type-id="text-editor" />
  1243 + </entry>
  1244 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods.js">
1253 <provider selected="true" editor-type-id="text-editor"> 1245 <provider selected="true" editor-type-id="text-editor">
1254 <state relative-caret-position="425"> 1246 <state relative-caret-position="425">
1255 - <caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" /> 1247 + <caret line="58" column="155" selection-start-line="58" selection-start-column="155" selection-end-line="58" selection-end-column="155" />
1256 </state> 1248 </state>
1257 </provider> 1249 </provider>
1258 </entry> 1250 </entry>
@@ -70,7 +70,7 @@ class UserMoneyLogAudit extends Backend @@ -70,7 +70,7 @@ class UserMoneyLogAudit extends Backend
70 70
71 foreach ($list as $row) { 71 foreach ($list as $row) {
72 72
73 - $row->getRelation('admin')->visible(['id','username','nickname','merchant_title','merchant_name']); 73 + $row->getRelation('admin')->visible(['id','username','nickname','merchant_title','merchant_name','merchant_mobile']);
74 } 74 }
75 $list = collection($list)->toArray(); 75 $list = collection($list)->toArray();
76 $result = array("total" => $total, "rows" => $list); 76 $result = array("total" => $total, "rows" => $list);
@@ -55,7 +55,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -55,7 +55,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
55 {field: 'updatetime', title: __('Updatetime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 55 {field: 'updatetime', title: __('Updatetime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
56 {field: 'user_is_up', title: __('商户端上架状态'), searchList: {"1":__('已上架'),"0":__('已下架')}, formatter: Table.api.formatter.label}, 56 {field: 'user_is_up', title: __('商户端上架状态'), searchList: {"1":__('已上架'),"0":__('已下架')}, formatter: Table.api.formatter.label},
57 {field: 'admin_is_up', title: __('管理端上架状态'), searchList: {"1":__('已上架'),"0":__('已下架')}, formatter: Table.api.formatter.label}, 57 {field: 'admin_is_up', title: __('管理端上架状态'), searchList: {"1":__('已上架'),"0":__('已下架')}, formatter: Table.api.formatter.label},
58 - {field: 'user_deletetime', title: __('商户端删除时间'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 58 + // {field: 'user_deletetime', title: __('商户端删除时间'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
59 {field: 'status', title: __('审核状态'), searchList: {"3":__('审核失败'),"2":__('审核通过'),"1":__('待审核')}, formatter: Table.api.formatter.status}, 59 {field: 'status', title: __('审核状态'), searchList: {"3":__('审核失败'),"2":__('审核通过'),"1":__('待审核')}, formatter: Table.api.formatter.status},
60 /*{field: 'admin.id', title: __('Admin.id')}, 60 /*{field: 'admin.id', title: __('Admin.id')},
61 {field: 'admin.username', title: __('Admin.username')}, 61 {field: 'admin.username', title: __('Admin.username')},
@@ -24,18 +24,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin @@ -24,18 +24,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
24 columns: [ 24 columns: [
25 [ 25 [
26 {checkbox: true}, 26 {checkbox: true},
27 - {field: 'id', title: __('Id')},  
28 - {field: 'parent_id', title: __('Parent_id'), formatter: Table.api.formatter.search}, 27 + {field: 'id', title: __('Id'), operate:false},
  28 + {field: 'parent_id', title: __('Parent_id'), operate:false, formatter: Table.api.formatter.search},
29 {field: 'parent_nickname', title: __('上级昵称'), operate:false}, 29 {field: 'parent_nickname', title: __('上级昵称'), operate:false},
30 {field: 'nickname', title: __('Nickname')}, 30 {field: 'nickname', title: __('Nickname')},
31 {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate:false}, 31 {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate:false},
32 {field: 'gender', title: __('Gender'), searchList: {"2":__('女'),"1":__('男'),"0":__('未知')}, formatter: Table.api.formatter.label}, 32 {field: 'gender', title: __('Gender'), searchList: {"2":__('女'),"1":__('男'),"0":__('未知')}, formatter: Table.api.formatter.label},
33 - {field: 'birthday', title: __('Birthday'), operate:'RANGE', addclass:'datetimerange'}, 33 + {field: 'birthday', title: __('Birthday'), operate:false, addclass:'datetimerange'},
34 {field: 'exp', title: __('Exp'), operate:false}, 34 {field: 'exp', title: __('Exp'), operate:false},
35 - {field: 'loginip', title: __('Loginip'), formatter: Table.api.formatter.search},  
36 - {field: 'joinip', title: __('Joinip'), formatter: Table.api.formatter.search},  
37 - {field: 'prevtime', title: __('Prevtime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},  
38 - {field: 'logintime', title: __('Logintime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 35 + // {field: 'loginip', title: __('Loginip'), formatter: Table.api.formatter.search},
  36 + // {field: 'joinip', title: __('Joinip'), formatter: Table.api.formatter.search},
  37 + // {field: 'prevtime', title: __('Prevtime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
  38 + // {field: 'logintime', title: __('Logintime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
39 {field: 'jointime', title: __('Jointime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime}, 39 {field: 'jointime', title: __('Jointime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
40 {field: 'status', title: __('Status'), operate:false, formatter: Table.api.formatter.status}, 40 {field: 'status', title: __('Status'), operate:false, formatter: Table.api.formatter.status},
41 {field: 'name', title: __('姓名')}, 41 {field: 'name', title: __('姓名')},