王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 05921d0dd3de3db0cdddabade58b718ac9595222 1 个父辈 95b0ce9f
1 个管道 的构建 通过 耗费 0 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 51 行增加 和 51 行删除
... ... @@ -5,7 +5,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" 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/UserExpLogAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -78,11 +79,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
<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="679">
<caret line="351" column="14" lean-forward="true" selection-start-line="351" selection-start-column="14" selection-end-line="351" selection-end-column="14" />
<state relative-caret-position="402">
<caret line="96" column="57" lean-forward="true" selection-start-line="96" selection-start-column="57" selection-end-line="96" selection-end-column="57" />
<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>
... ... @@ -90,6 +91,15 @@
</provider>
</entry>
</file>
<file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="65" column="42" lean-forward="true" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="video_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -111,15 +121,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="head.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/public/head.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="113" selection-start-line="4" selection-start-column="113" selection-end-line="4" selection-end-column="113" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/index.css">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -167,9 +168,9 @@
<find>over</find>
<find>referrer</find>
<find>get_city</find>
<find>alert</find>
<find>distance_where</find>
<find>quest_box</find>
<find>alert</find>
</findStrings>
<replaceStrings>
<replace />
... ... @@ -181,7 +182,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/extra/wechat.php" />
<option value="$PROJECT_DIR$/application/common/controller/Backend.php" />
... ... @@ -232,6 +232,7 @@
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
</list>
</option>
</component>
... ... @@ -502,28 +503,7 @@
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="28231000" />
</task>
<task id="LOCAL-00477" summary="商户申请">
<created>1573279589367</created>
<option name="number" value="00477" />
<option name="presentableId" value="LOCAL-00477" />
<option name="project" value="LOCAL" />
<updated>1573279589367</updated>
</task>
<task id="LOCAL-00478" summary="商户申请">
<created>1573280078075</created>
<option name="number" value="00478" />
<option name="presentableId" value="LOCAL-00478" />
<option name="project" value="LOCAL" />
<updated>1573280078075</updated>
</task>
<task id="LOCAL-00479" summary="商户申请">
<created>1573280162844</created>
<option name="number" value="00479" />
<option name="presentableId" value="LOCAL-00479" />
<option name="project" value="LOCAL" />
<updated>1573280162845</updated>
<workItem from="1573259331081" duration="28862000" />
</task>
<task id="LOCAL-00480" summary="商户申请">
<created>1573280213600</created>
... ... @@ -847,11 +827,32 @@
<option name="project" value="LOCAL" />
<updated>1573291532994</updated>
</task>
<option name="localTasksCounter" value="526" />
<task id="LOCAL-00526" summary=" 商户申请">
<created>1573291711162</created>
<option name="number" value="00526" />
<option name="presentableId" value="LOCAL-00526" />
<option name="project" value="LOCAL" />
<updated>1573291711162</updated>
</task>
<task id="LOCAL-00527" summary=" 商户申请">
<created>1573291740678</created>
<option name="number" value="00527" />
<option name="presentableId" value="LOCAL-00527" />
<option name="project" value="LOCAL" />
<updated>1573291740678</updated>
</task>
<task id="LOCAL-00528" summary=" 商户申请">
<created>1573292276591</created>
<option name="number" value="00528" />
<option name="presentableId" value="LOCAL-00528" />
<option name="project" value="LOCAL" />
<updated>1573292276591</updated>
</task>
<option name="localTasksCounter" value="529" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="401904000" />
<option name="totallyTimeSpent" value="402535000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -938,13 +939,6 @@
<option name="LAST_COMMIT_MESSAGE" value=" 商户申请" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/personal.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="407">
<caret line="28" column="22" selection-start-line="28" selection-start-column="22" selection-end-line="28" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/js/qqmap-wx-jssdk.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -1252,14 +1246,21 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="679">
<caret line="351" column="14" lean-forward="true" selection-start-line="351" selection-start-column="14" selection-end-line="351" selection-end-column="14" />
<state relative-caret-position="402">
<caret line="96" column="57" lean-forward="true" selection-start-line="96" selection-start-column="57" selection-end-line="96" selection-end-column="57" />
<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>
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="65" column="42" lean-forward="true" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
... ...
... ... @@ -52,18 +52,17 @@ class UserExpLogAudit extends Backend
return $this->selectpage();
}
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
exit();
$total = $this->model
->with(['user'])
->where($where)
->where(['user_exp_log_audit.type'=>1])
// ->where(['user_exp_log_audit.type'=>1])
->order($sort, $order)
->count();
$list = $this->model
->with(['user'])
->where($where)
->where(['user_exp_log_audit.type'=>1])
// ->where(['user_exp_log_audit.type'=>1])
->order($sort, $order)
->limit($offset, $limit)
->select();
... ...