王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 88eea6df4ae2f0403728e0531482812597d7afa2 1 个父辈 c1d0c7be
1 个管道 的构建 通过 耗费 0 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 38 行增加 和 31 行删除
... ... @@ -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" />
... ... @@ -45,8 +46,8 @@
<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="186">
<caret line="153" column="11" lean-forward="true" selection-start-line="153" selection-start-column="11" selection-end-line="153" selection-end-column="11" />
<state relative-caret-position="526">
<caret line="182" column="80" lean-forward="true" selection-start-line="182" selection-start-column="80" selection-end-line="182" selection-end-column="80" />
</state>
</provider>
</entry>
... ... @@ -221,7 +222,6 @@
<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/controller/Index.php" />
<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" />
... ... @@ -232,6 +232,7 @@
<option value="$PROJECT_DIR$/application/home/view/goods/video_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.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="26878000" />
</task>
<task id="LOCAL-00471" summary="商户申请">
<created>1573277808837</created>
<option name="number" value="00471" />
<option name="presentableId" value="LOCAL-00471" />
<option name="project" value="LOCAL" />
<updated>1573277808837</updated>
</task>
<task id="LOCAL-00472" summary="商户申请">
<created>1573277879109</created>
<option name="number" value="00472" />
<option name="presentableId" value="LOCAL-00472" />
<option name="project" value="LOCAL" />
<updated>1573277879109</updated>
</task>
<task id="LOCAL-00473" summary="商户申请">
<created>1573277948642</created>
<option name="number" value="00473" />
<option name="presentableId" value="LOCAL-00473" />
<option name="project" value="LOCAL" />
<updated>1573277948642</updated>
<workItem from="1573259331081" duration="27605000" />
</task>
<task id="LOCAL-00474" summary="商户申请">
<created>1573278155763</created>
... ... @@ -847,11 +827,32 @@
<option name="project" value="LOCAL" />
<updated>1573289987660</updated>
</task>
<option name="localTasksCounter" value="520" />
<task id="LOCAL-00520" summary=" 商户申请">
<created>1573290377470</created>
<option name="number" value="00520" />
<option name="presentableId" value="LOCAL-00520" />
<option name="project" value="LOCAL" />
<updated>1573290377470</updated>
</task>
<task id="LOCAL-00521" summary=" 商户申请">
<created>1573290472253</created>
<option name="number" value="00521" />
<option name="presentableId" value="LOCAL-00521" />
<option name="project" value="LOCAL" />
<updated>1573290472253</updated>
</task>
<task id="LOCAL-00522" summary=" 商户申请">
<created>1573290728696</created>
<option name="number" value="00522" />
<option name="presentableId" value="LOCAL-00522" />
<option name="project" value="LOCAL" />
<updated>1573290728696</updated>
</task>
<option name="localTasksCounter" value="523" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="400551000" />
<option name="totallyTimeSpent" value="401278000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1255,8 +1256,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186">
<caret line="153" column="11" lean-forward="true" selection-start-line="153" selection-start-column="11" selection-end-line="153" selection-end-column="11" />
<state relative-caret-position="526">
<caret line="182" column="80" lean-forward="true" selection-start-line="182" selection-start-column="80" selection-end-line="182" selection-end-column="80" />
</state>
</provider>
</entry>
... ...
... ... @@ -177,8 +177,14 @@ class Index extends WechatBase
}
}
//判断年龄是否满足
if($goods['min_age'] != 0 || $goods['max_age'] != 0){
if($goods['min_age'] > $user['age'] || $user['age'] > $goods['max_age']){
if(!empty($goods['min_age'])){
if($goods['min_age'] > $user['age']){
$is_distance = 0;
$this->success('SUCCESS','',['is_where_satisfy'=>$is_distance]);
}
}
if(!empty($goods['max_age'])){
if($goods['max_age'] < $user['age']){
$is_distance = 0;
$this->success('SUCCESS','',['is_where_satisfy'=>$is_distance]);
}
... ...