王晓刚 / advertising · 提交

转到一个项目

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

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 59 行增加 和 48 行删除
... ... @@ -6,7 +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/view/merchant/enter_view.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Merchant.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Merchant.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -34,11 +34,20 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true">
<file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="160" column="45" selection-start-line="160" selection-start-column="45" selection-end-line="160" selection-end-column="45" />
<state relative-caret-position="459">
<caret line="107" column="57" selection-start-line="107" selection-start-column="45" selection-end-line="107" selection-end-column="57" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Merchant.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="52" column="54" selection-start-line="52" selection-start-column="54" selection-end-line="52" selection-end-column="54" />
</state>
</provider>
</entry>
... ... @@ -139,13 +148,13 @@
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
<option value="D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.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" />
</list>
</option>
</component>
... ... @@ -271,7 +280,7 @@
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="merchant" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -363,21 +372,7 @@
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="12088000" />
</task>
<task id="LOCAL-00536" summary=" 商户申请">
<created>1573292769617</created>
<option name="number" value="00536" />
<option name="presentableId" value="LOCAL-00536" />
<option name="project" value="LOCAL" />
<updated>1573292769617</updated>
</task>
<task id="LOCAL-00537" summary=" 商户申请">
<created>1573292790408</created>
<option name="number" value="00537" />
<option name="presentableId" value="LOCAL-00537" />
<option name="project" value="LOCAL" />
<updated>1573292790408</updated>
<workItem from="1573519427130" duration="12679000" />
</task>
<task id="LOCAL-00538" summary=" 商户申请">
<created>1573292821346</created>
... ... @@ -708,11 +703,25 @@
<option name="project" value="LOCAL" />
<updated>1573543410564</updated>
</task>
<option name="localTasksCounter" value="585" />
<task id="LOCAL-00585" summary=" 商户申请">
<created>1573543475505</created>
<option name="number" value="00585" />
<option name="presentableId" value="LOCAL-00585" />
<option name="project" value="LOCAL" />
<updated>1573543475505</updated>
</task>
<task id="LOCAL-00586" summary=" 商户申请">
<created>1573543777045</created>
<option name="number" value="00586" />
<option name="presentableId" value="LOCAL-00586" />
<option name="project" value="LOCAL" />
<updated>1573543777045</updated>
</task>
<option name="localTasksCounter" value="587" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="418395000" />
<option name="totallyTimeSpent" value="418986000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -799,9 +808,6 @@
<option name="LAST_COMMIT_MESSAGE" value=" 商户申请" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/bg1.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
... ... @@ -1021,13 +1027,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
<caret line="113" column="42" selection-start-line="113" selection-start-column="42" selection-end-line="113" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
... ... @@ -1059,13 +1058,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-289">
<caret line="25" column="40" lean-forward="true" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
</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">
... ... @@ -1094,17 +1086,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="43" column="23" selection-start-line="43" selection-start-column="23" selection-end-line="43" selection-end-column="23" />
<caret line="43" selection-start-line="43" selection-end-line="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1921">
<caret line="25" column="40" lean-forward="true" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="160" column="45" selection-start-line="160" selection-start-column="45" selection-end-line="160" selection-end-column="45" />
<state relative-caret-position="459">
<caret line="107" column="57" selection-start-line="107" selection-start-column="45" selection-end-line="107" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="52" column="54" selection-start-line="52" selection-start-column="54" selection-end-line="52" selection-end-column="54" />
</state>
</provider>
</entry>
... ...
... ... @@ -45,11 +45,13 @@ class Merchant extends WechatBase
// }
$data['business_images'] = $business_images;
$other_images = explode(',',$data['other_images']);
// foreach($other_images as $key => $o_i){
// $other_images[$key] = $domain_name.$o_i;
// }
$data['other_images'] = $other_images;
if(!empty($data['other_images'])){
$other_images = explode(',',$data['other_images']);
// foreach($other_images as $key => $o_i){
// $other_images[$key] = $domain_name.$o_i;
// }
$data['other_images'] = $other_images;
}
}
$this->assign('user_id',$this->user_id);
$this->assign('data',$data);
... ...