王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 0d1546fd90fda4f1d157fd08089bd9da35785576 1 个父辈 111aed74
1 个管道 的构建 通过 耗费 1 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 26 行增加 和 28 行删除
... ... @@ -5,8 +5,8 @@
</component>
<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" />
<change beforePath="$PROJECT_DIR$/application/home/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -34,20 +34,20 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<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 relative-caret-position="307">
<caret line="87" column="44" selection-start-line="87" selection-start-column="44" selection-end-line="87" selection-end-column="44" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
<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="459">
<caret line="35" column="25" selection-start-line="35" selection-start-column="25" selection-end-line="35" selection-end-column="25" />
<state relative-caret-position="306">
<caret line="26" column="38" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="38" />
</state>
</provider>
</entry>
... ... @@ -161,9 +161,9 @@
<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" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
</list>
</option>
</component>
... ... @@ -368,14 +368,7 @@
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="15978000" />
</task>
<task id="LOCAL-00550" summary=" 商户申请">
<created>1573526660242</created>
<option name="number" value="00550" />
<option name="presentableId" value="LOCAL-00550" />
<option name="project" value="LOCAL" />
<updated>1573526660242</updated>
<workItem from="1573519427130" duration="16054000" />
</task>
<task id="LOCAL-00551" summary=" 商户申请">
<created>1573526718080</created>
... ... @@ -713,11 +706,18 @@
<option name="project" value="LOCAL" />
<updated>1573562241873</updated>
</task>
<option name="localTasksCounter" value="599" />
<task id="LOCAL-00599" summary=" 商户申请">
<created>1573562324144</created>
<option name="number" value="00599" />
<option name="presentableId" value="LOCAL-00599" />
<option name="project" value="LOCAL" />
<updated>1573562324144</updated>
</task>
<option name="localTasksCounter" value="600" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="422285000" />
<option name="totallyTimeSpent" value="422361000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1092,24 +1092,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
<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 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/model/Goods.php">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.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" />
<caret line="26" column="38" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<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 relative-caret-position="307">
<caret line="87" column="44" selection-start-line="87" selection-start-column="44" selection-end-line="87" selection-end-column="44" />
</state>
</provider>
</entry>
... ...
... ... @@ -33,7 +33,6 @@ 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){
... ... @@ -80,7 +79,6 @@ class Index extends WechatBase
$goods_ids[] = $value['goods_id'];
}
}
dump($goods_ids);
$goodsModel = new Goods();
$data = $goodsModel->selectPageData(['id'=>['not in',$goods_ids]],$page,$pageNum);
foreach($data as $key => $vo){
... ...