王晓刚 / advertising · 提交

转到一个项目

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

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 58 行增加 和 49 行删除
... ... @@ -5,8 +5,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<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" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -34,11 +33,20 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="460">
<caret line="100" column="30" selection-start-line="100" selection-start-column="30" selection-end-line="100" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<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="307">
<caret line="87" column="44" selection-start-line="87" selection-start-column="44" selection-end-line="87" selection-end-column="44" />
<state relative-caret-position="749">
<caret line="92" column="34" selection-start-line="92" selection-start-column="34" selection-end-line="92" selection-end-column="34" />
</state>
</provider>
</entry>
... ... @@ -46,8 +54,8 @@
<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="306">
<caret line="26" column="38" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="38" />
<state relative-caret-position="-918">
<caret line="80" column="9" selection-start-line="80" selection-start-column="9" selection-end-line="80" selection-end-column="9" />
</state>
</provider>
</entry>
... ... @@ -55,8 +63,8 @@
<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>
<caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" />
</state>
</provider>
</entry>
... ... @@ -146,7 +154,6 @@
<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$/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" />
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
... ... @@ -164,6 +171,7 @@
<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" />
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
</list>
</option>
</component>
... ... @@ -368,28 +376,7 @@
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="16054000" />
</task>
<task id="LOCAL-00551" summary=" 商户申请">
<created>1573526718080</created>
<option name="number" value="00551" />
<option name="presentableId" value="LOCAL-00551" />
<option name="project" value="LOCAL" />
<updated>1573526718080</updated>
</task>
<task id="LOCAL-00552" summary=" 商户申请">
<created>1573526757451</created>
<option name="number" value="00552" />
<option name="presentableId" value="LOCAL-00552" />
<option name="project" value="LOCAL" />
<updated>1573526757451</updated>
</task>
<task id="LOCAL-00553" summary=" 商户申请">
<created>1573526837622</created>
<option name="number" value="00553" />
<option name="presentableId" value="LOCAL-00553" />
<option name="project" value="LOCAL" />
<updated>1573526837622</updated>
<workItem from="1573519427130" duration="16660000" />
</task>
<task id="LOCAL-00554" summary=" 商户申请">
<created>1573526885516</created>
... ... @@ -713,11 +700,32 @@
<option name="project" value="LOCAL" />
<updated>1573562324144</updated>
</task>
<option name="localTasksCounter" value="600" />
<task id="LOCAL-00600" summary=" 商户申请">
<created>1573562410823</created>
<option name="number" value="00600" />
<option name="presentableId" value="LOCAL-00600" />
<option name="project" value="LOCAL" />
<updated>1573562410823</updated>
</task>
<task id="LOCAL-00601" summary=" 商户申请">
<created>1573562434793</created>
<option name="number" value="00601" />
<option name="presentableId" value="LOCAL-00601" />
<option name="project" value="LOCAL" />
<updated>1573562434793</updated>
</task>
<task id="LOCAL-00602" summary=" 商户申请">
<created>1573562470170</created>
<option name="number" value="00602" />
<option name="presentableId" value="LOCAL-00602" />
<option name="project" value="LOCAL" />
<updated>1573562470170</updated>
</task>
<option name="localTasksCounter" value="603" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="422361000" />
<option name="totallyTimeSpent" value="422967000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -1002,13 +1010,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="164">
<caret line="105" column="56" selection-start-line="105" selection-start-column="56" selection-end-line="105" selection-end-column="56" />
</state>
</provider>
</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="288">
... ... @@ -1092,24 +1093,31 @@
</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="749">
<caret line="92" column="34" selection-start-line="92" selection-start-column="34" selection-end-line="92" selection-end-column="34" />
</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>
<caret column="5" lean-forward="true" selection-start-column="5" 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="306">
<caret line="26" column="38" selection-start-line="26" selection-start-column="19" selection-end-line="26" selection-end-column="38" />
<state relative-caret-position="-918">
<caret line="80" column="9" selection-start-line="80" selection-start-column="9" selection-end-line="80" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="460">
<caret line="100" column="30" selection-start-line="100" selection-start-column="30" selection-end-line="100" selection-end-column="30" />
</state>
</provider>
</entry>
... ...
... ... @@ -92,7 +92,8 @@ class Goods extends WechatBase
}else{
$data['is_answer'] = 1;//答过题
//判断是否全部正确
$correct = Db::name('user_question_answer')->where(['goods_id'=>$goods_id,'user_id'=>$this->user_id,'is_correct'=>0])->find();
$correct = Db::name('user_question_answer')->where(['goods_id'=>$goods_id,'user_id'=>$this->user_id,'is_correct'=>0])->fetchSql()->find();
dump($correct);
if(empty($correct)){
$is_correct = 1;//全部正确
}else{
... ...