王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 cc72a1009a83d9663e9a15ba36309610a6a44ae9 1 个父辈 14912d8e
1 个管道 的构建 通过 耗费 1 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 92 行增加 和 109 行删除
... ... @@ -6,6 +6,7 @@
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -33,20 +34,29 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="audit_status.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/audit_status.html">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
<caret line="37" column="27" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
<state relative-caret-position="409">
<caret line="93" column="32" selection-start-line="93" selection-start-column="32" selection-end-line="93" selection-end-column="32" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.css" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/index.css">
<file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="477">
<caret line="63" column="22" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
<state relative-caret-position="459">
<caret line="35" column="25" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="23" column="90" selection-start-line="23" selection-start-column="90" selection-end-line="23" selection-end-column="90" />
</state>
</provider>
</entry>
... ... @@ -103,7 +113,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
<option value="$PROJECT_DIR$/application/home/view/public/NAV.html" />
<option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
<option value="$PROJECT_DIR$/application/home/controller/User.php" />
... ... @@ -133,12 +142,10 @@
<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" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/swiper.min.css" />
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
<option value="$PROJECT_DIR$/application/home/view/member/my_information.html" />
<option value="$PROJECT_DIR$/application/home/view/public/head.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/index.css" />
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/video_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
... ... @@ -148,12 +155,15 @@
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantGoods.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Goods.php" />
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/index.css" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
<option value="$PROJECT_DIR$/application/home/model/Goods.php" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
</list>
</option>
</component>
... ... @@ -244,19 +254,6 @@
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" 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="controller" 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="home" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -269,21 +266,6 @@
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" 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="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="merchant" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -386,49 +368,7 @@
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="13747000" />
</task>
<task id="LOCAL-00544" summary=" 商户申请">
<created>1573294162462</created>
<option name="number" value="00544" />
<option name="presentableId" value="LOCAL-00544" />
<option name="project" value="LOCAL" />
<updated>1573294162462</updated>
</task>
<task id="LOCAL-00545" summary=" 商户申请">
<created>1573294224448</created>
<option name="number" value="00545" />
<option name="presentableId" value="LOCAL-00545" />
<option name="project" value="LOCAL" />
<updated>1573294224448</updated>
</task>
<task id="LOCAL-00546" summary=" 商户申请">
<created>1573521445217</created>
<option name="number" value="00546" />
<option name="presentableId" value="LOCAL-00546" />
<option name="project" value="LOCAL" />
<updated>1573521445217</updated>
</task>
<task id="LOCAL-00547" summary=" 商户申请">
<created>1573522719090</created>
<option name="number" value="00547" />
<option name="presentableId" value="LOCAL-00547" />
<option name="project" value="LOCAL" />
<updated>1573522719090</updated>
</task>
<task id="LOCAL-00548" summary=" 商户申请">
<created>1573523542474</created>
<option name="number" value="00548" />
<option name="presentableId" value="LOCAL-00548" />
<option name="project" value="LOCAL" />
<updated>1573523542474</updated>
</task>
<task id="LOCAL-00549" summary=" 商户申请">
<created>1573523611578</created>
<option name="number" value="00549" />
<option name="presentableId" value="LOCAL-00549" />
<option name="project" value="LOCAL" />
<updated>1573523611578</updated>
<workItem from="1573519427130" duration="15978000" />
</task>
<task id="LOCAL-00550" summary=" 商户申请">
<created>1573526660242</created>
... ... @@ -731,11 +671,53 @@
<option name="project" value="LOCAL" />
<updated>1573544641437</updated>
</task>
<option name="localTasksCounter" value="593" />
<task id="LOCAL-00593" summary=" 商户申请">
<created>1573545137272</created>
<option name="number" value="00593" />
<option name="presentableId" value="LOCAL-00593" />
<option name="project" value="LOCAL" />
<updated>1573545137272</updated>
</task>
<task id="LOCAL-00594" summary=" 商户申请">
<created>1573561922444</created>
<option name="number" value="00594" />
<option name="presentableId" value="LOCAL-00594" />
<option name="project" value="LOCAL" />
<updated>1573561922444</updated>
</task>
<task id="LOCAL-00595" summary=" 商户申请">
<created>1573562112589</created>
<option name="number" value="00595" />
<option name="presentableId" value="LOCAL-00595" />
<option name="project" value="LOCAL" />
<updated>1573562112589</updated>
</task>
<task id="LOCAL-00596" summary=" 商户申请">
<created>1573562145766</created>
<option name="number" value="00596" />
<option name="presentableId" value="LOCAL-00596" />
<option name="project" value="LOCAL" />
<updated>1573562145766</updated>
</task>
<task id="LOCAL-00597" summary=" 商户申请">
<created>1573562164520</created>
<option name="number" value="00597" />
<option name="presentableId" value="LOCAL-00597" />
<option name="project" value="LOCAL" />
<updated>1573562164520</updated>
</task>
<task id="LOCAL-00598" summary=" 商户申请">
<created>1573562241873</created>
<option name="number" value="00598" />
<option name="presentableId" value="LOCAL-00598" />
<option name="project" value="LOCAL" />
<updated>1573562241873</updated>
</task>
<option name="localTasksCounter" value="599" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="420054000" />
<option name="totallyTimeSpent" value="422285000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -822,13 +804,6 @@
<option name="LAST_COMMIT_MESSAGE" value=" 商户申请" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="61" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403">
... ... @@ -948,13 +923,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1241">
<caret line="73" column="9" lean-forward="true" selection-start-line="73" selection-start-column="9" selection-end-line="73" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
... ... @@ -1051,13 +1019,6 @@
</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="2765">
<caret line="173" column="80" lean-forward="true" selection-start-line="173" selection-start-column="80" selection-end-line="173" selection-end-column="80" />
</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="538">
... ... @@ -1119,15 +1080,36 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/audit_status.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
<state relative-caret-position="629">
<caret line="37" column="27" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="477">
<caret line="63" column="22" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
<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/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="93" column="32" selection-start-line="93" selection-start-column="32" selection-end-line="93" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="23" column="90" selection-start-line="23" selection-start-column="90" selection-end-line="23" selection-end-column="90" />
</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="459">
<caret line="35" column="25" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
</state>
</provider>
</entry>
... ...
... ... @@ -33,6 +33,7 @@ class Index extends WechatBase
$goods_ids[] = $value['goods_id'];
}
}
dump($goods_ids);
$goodsModel = new Goods();
$data = $goodsModel->selectPageData(['id'=>['not in',$goods_ids]],1,5);
foreach($data as $key => $vo){
... ...