王晓刚 / advertising · 提交

转到一个项目

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

后台bug

内嵌 并排对比
正在显示 4 个修改的文件 包含 154 行增加 和 162 行删除
... ... @@ -5,7 +5,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/thinkphp/library/think/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/thinkphp/library/think/Controller.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/js/backend/goods.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/goods.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/js/backend/users.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/users.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -33,32 +36,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="185" column="42" selection-start-line="185" selection-start-column="42" selection-end-line="185" selection-end-column="42" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="users.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="436">
<caret line="40" column="57" selection-start-line="40" selection-start-column="57" selection-end-line="40" selection-end-column="57" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/users/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
<caret line="62" column="41" selection-start-line="62" selection-start-column="41" selection-end-line="62" selection-end-column="41" />
<state relative-caret-position="402">
<caret line="38" column="82" selection-start-line="38" selection-start-column="82" selection-end-line="38" selection-end-column="82" />
</state>
</provider>
</entry>
... ... @@ -66,62 +48,72 @@
<file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
<state relative-caret-position="170">
<caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WechatBase.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
<file leaf-file-name="Users.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
<state relative-caret-position="2312">
<caret line="137" column="27" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Controller.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
<file leaf-file-name="UserMoneyLogAudit.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" />
<state relative-caret-position="510">
<caret line="72" column="129" selection-start-line="72" selection-start-column="129" selection-end-line="72" selection-end-column="129" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant/edit.html">
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="95" column="12" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="108" />
<state relative-caret-position="570">
<caret line="71" selection-start-line="71" selection-end-line="72" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/goods/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="goods.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="25" column="40" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
<state relative-caret-position="425">
<caret line="58" column="155" selection-start-line="58" selection-start-column="155" selection-end-line="58" selection-end-column="155" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="money.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/users/money.html">
<file leaf-file-name="MerchantGoods.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="114" />
<state relative-caret-position="510">
<caret line="61" column="92" selection-start-line="61" selection-start-column="92" selection-end-line="61" selection-end-column="92" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Users.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="user_money_log_audit.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="640">
<caret line="137" column="27" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />
<state relative-caret-position="612">
<caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
</state>
</provider>
</entry>
... ... @@ -178,9 +170,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/home/view/collect/index.html" />
<option value="$PROJECT_DIR$/application/home/view/public/js.html" />
<option value="$PROJECT_DIR$/application/home/view/share/index.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/entry.css" />
<option value="$PROJECT_DIR$/application/home/view/member/index.html" />
<option value="$PROJECT_DIR$/application/home/view/public/nav.html" />
... ... @@ -210,7 +199,6 @@
<option value="$PROJECT_DIR$/application/admin/view/merchant_goods/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Goods.php" />
<option value="$PROJECT_DIR$/application/admin/controller/GoodsAudit.php" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/admin/view/slide/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/slide/add.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/slide.js" />
... ... @@ -227,8 +215,12 @@
<option value="$PROJECT_DIR$/application/admin/view/users/money.html" />
<option value="$PROJECT_DIR$/application/admin/view/merchant/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/users/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/users.js" />
<option value="$PROJECT_DIR$/thinkphp/library/think/Controller.php" />
<option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/users.js" />
<option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />
</list>
</option>
</component>
... ... @@ -364,6 +356,14 @@
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="user_money_log_audit" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="users" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -485,28 +485,7 @@
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="17475000" />
<workItem from="1573605070739" duration="26868000" />
</task>
<task id="LOCAL-00616" summary=" 商户申请">
<created>1573607436524</created>
<option name="number" value="00616" />
<option name="presentableId" value="LOCAL-00616" />
<option name="project" value="LOCAL" />
<updated>1573607436524</updated>
</task>
<task id="LOCAL-00617" summary=" 商户申请">
<created>1573607503025</created>
<option name="number" value="00617" />
<option name="presentableId" value="LOCAL-00617" />
<option name="project" value="LOCAL" />
<updated>1573607503025</updated>
</task>
<task id="LOCAL-00618" summary=" 商户申请">
<created>1573613749446</created>
<option name="number" value="00618" />
<option name="presentableId" value="LOCAL-00618" />
<option name="project" value="LOCAL" />
<updated>1573613749446</updated>
<workItem from="1573605070739" duration="27701000" />
</task>
<task id="LOCAL-00619" summary=" 商户申请">
<created>1573614237426</created>
... ... @@ -830,11 +809,32 @@
<option name="project" value="LOCAL" />
<updated>1573648085758</updated>
</task>
<option name="localTasksCounter" value="665" />
<task id="LOCAL-00665" summary="后台bug">
<created>1573648167991</created>
<option name="number" value="00665" />
<option name="presentableId" value="LOCAL-00665" />
<option name="project" value="LOCAL" />
<updated>1573648167991</updated>
</task>
<task id="LOCAL-00666" summary="后台bug">
<created>1573648220248</created>
<option name="number" value="00666" />
<option name="presentableId" value="LOCAL-00666" />
<option name="project" value="LOCAL" />
<updated>1573648220248</updated>
</task>
<task id="LOCAL-00667" summary="后台bug">
<created>1573648297986</created>
<option name="number" value="00667" />
<option name="presentableId" value="LOCAL-00667" />
<option name="project" value="LOCAL" />
<updated>1573648297986</updated>
</task>
<option name="localTasksCounter" value="668" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="450650000" />
<option name="totallyTimeSpent" value="451483000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -849,7 +849,7 @@
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
<window_info anchor="bottom" id="运行" order="7" />
<window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" />
<window_info content_ui="combo" id="Project" order="0" weight="0.15085287" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" weight="0.32995737" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
... ... @@ -924,41 +924,6 @@
<option name="LAST_COMMIT_MESSAGE" value="后台bug" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="5" selection-start-column="5" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/personal.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="28" column="23" lean-forward="true" selection-start-line="28" selection-start-column="23" selection-end-line="28" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="419">
<caret line="39" column="17" selection-start-line="39" selection-start-column="17" selection-end-line="39" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="75" column="98" lean-forward="true" selection-start-line="75" selection-start-column="98" selection-end-line="75" selection-end-column="98" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/goods_audit/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2587" />
... ... @@ -1013,13 +978,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1530">
<caret line="99" column="13" selection-start-line="99" selection-start-column="13" selection-end-line="99" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/slide/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
... ... @@ -1044,13 +1002,6 @@
<entry file="file://$PROJECT_DIR$/application/admin/controller/Slide.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="71" column="26" lean-forward="true" selection-start-line="71" selection-start-column="26" selection-end-line="71" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/GoodsAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
... ... @@ -1152,13 +1103,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="57" column="12" lean-forward="true" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="494">
... ... @@ -1180,13 +1124,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="640">
<caret line="137" column="27" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="528">
... ... @@ -1221,6 +1158,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="76" column="8" selection-start-line="76" selection-start-column="8" selection-end-line="82" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="44" column="30" selection-start-line="44" selection-start-column="30" selection-end-line="44" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="31" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/users/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
... ... @@ -1230,29 +1195,56 @@
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="436">
<caret line="40" column="57" selection-start-line="40" selection-start-column="57" selection-end-line="40" selection-end-column="57" />
<state relative-caret-position="402">
<caret line="38" column="82" selection-start-line="38" selection-start-column="82" selection-end-line="38" selection-end-column="82" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
<state relative-caret-position="2312">
<caret line="137" column="27" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
<state relative-caret-position="612">
<caret line="39" column="50" selection-start-line="39" selection-start-column="50" selection-end-line="39" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="72" column="129" selection-start-line="72" selection-start-column="129" selection-end-line="72" selection-end-column="129" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="61" column="92" selection-start-line="61" selection-start-column="92" selection-end-line="61" selection-end-column="92" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="71" selection-start-line="71" selection-end-line="72" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/goods/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" />
<caret line="58" column="155" selection-start-line="58" selection-start-column="155" selection-end-line="58" selection-end-column="155" />
</state>
</provider>
</entry>
... ...
... ... @@ -70,7 +70,7 @@ class UserMoneyLogAudit extends Backend
foreach ($list as $row) {
$row->getRelation('admin')->visible(['id','username','nickname','merchant_title','merchant_name']);
$row->getRelation('admin')->visible(['id','username','nickname','merchant_title','merchant_name','merchant_mobile']);
}
$list = collection($list)->toArray();
$result = array("total" => $total, "rows" => $list);
... ...
... ... @@ -55,7 +55,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'updatetime', title: __('Updatetime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'user_is_up', title: __('商户端上架状态'), searchList: {"1":__('已上架'),"0":__('已下架')}, formatter: Table.api.formatter.label},
{field: 'admin_is_up', title: __('管理端上架状态'), searchList: {"1":__('已上架'),"0":__('已下架')}, formatter: Table.api.formatter.label},
{field: 'user_deletetime', title: __('商户端删除时间'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
// {field: 'user_deletetime', title: __('商户端删除时间'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'status', title: __('审核状态'), searchList: {"3":__('审核失败'),"2":__('审核通过'),"1":__('待审核')}, formatter: Table.api.formatter.status},
/*{field: 'admin.id', title: __('Admin.id')},
{field: 'admin.username', title: __('Admin.username')},
... ...
... ... @@ -24,18 +24,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
columns: [
[
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'parent_id', title: __('Parent_id'), formatter: Table.api.formatter.search},
{field: 'id', title: __('Id'), operate:false},
{field: 'parent_id', title: __('Parent_id'), operate:false, formatter: Table.api.formatter.search},
{field: 'parent_nickname', title: __('上级昵称'), operate:false},
{field: 'nickname', title: __('Nickname')},
{field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate:false},
{field: 'gender', title: __('Gender'), searchList: {"2":__('女'),"1":__('男'),"0":__('未知')}, formatter: Table.api.formatter.label},
{field: 'birthday', title: __('Birthday'), operate:'RANGE', addclass:'datetimerange'},
{field: 'birthday', title: __('Birthday'), operate:false, addclass:'datetimerange'},
{field: 'exp', title: __('Exp'), operate:false},
{field: 'loginip', title: __('Loginip'), formatter: Table.api.formatter.search},
{field: 'joinip', title: __('Joinip'), formatter: Table.api.formatter.search},
{field: 'prevtime', title: __('Prevtime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'logintime', title: __('Logintime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
// {field: 'loginip', title: __('Loginip'), formatter: Table.api.formatter.search},
// {field: 'joinip', title: __('Joinip'), formatter: Table.api.formatter.search},
// {field: 'prevtime', title: __('Prevtime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
// {field: 'logintime', title: __('Logintime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'jointime', title: __('Jointime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'status', title: __('Status'), operate:false, formatter: Table.api.formatter.status},
{field: 'name', title: __('姓名')},
... ...