王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 ad44d1ded56f2c409782a6980552f82f6790ba8a 1 个父辈 106ad11d
1 个管道 的构建 通过 耗费 1 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 59 行增加 和 52 行删除
... ... @@ -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/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Share.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Share.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -37,17 +37,26 @@
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
<state relative-caret-position="1530">
<caret line="99" column="13" selection-start-line="99" selection-start-column="13" selection-end-line="99" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<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="527">
<caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="57" selection-end-column="19" />
<state relative-caret-position="595">
<caret line="52" column="12" selection-start-line="52" selection-start-column="12" selection-end-line="52" selection-end-column="12" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Share.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
<caret line="67" column="11" lean-forward="true" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" />
</state>
</provider>
</entry>
... ... @@ -55,7 +64,7 @@
<file leaf-file-name="public.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810">
<state relative-caret-position="4607">
<caret line="271" column="1" selection-start-line="271" selection-start-column="1" selection-end-line="271" selection-end-column="1" />
</state>
</provider>
... ... @@ -64,7 +73,7 @@
<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="-918">
<state relative-caret-position="1224">
<caret line="80" column="9" selection-start-line="80" selection-start-column="9" selection-end-line="80" selection-end-column="9" />
</state>
</provider>
... ... @@ -74,7 +83,7 @@
<entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" />
<caret column="5" selection-start-column="5" selection-end-column="5" />
</state>
</provider>
</entry>
... ... @@ -150,7 +159,6 @@
<option value="$PROJECT_DIR$/application/home/view/member/withdraw_log.html" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter.html" />
<option value="$PROJECT_DIR$/application/home/view/merchant/index.html" />
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
<option value="$PROJECT_DIR$/application/home/controller/Server.php" />
<option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
<option value="$PROJECT_DIR$/application/home/view/collect/index.html" />
... ... @@ -182,6 +190,7 @@
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
<option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
</list>
</option>
</component>
... ... @@ -387,20 +396,7 @@
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="17475000" />
</task>
<task id="LOCAL-00562" summary=" 商户申请">
<created>1573539953748</created>
<option name="number" value="00562" />
<option name="presentableId" value="LOCAL-00562" />
<option name="project" value="LOCAL" />
<updated>1573539953748</updated>
</task>
<task id="LOCAL-00563" summary=" 商户申请">
<created>1573540230853</created>
<option name="number" value="00563" />
<option name="presentableId" value="LOCAL-00563" />
<option name="project" value="LOCAL" />
<updated>1573540230853</updated>
<workItem from="1573605070739" duration="1661000" />
</task>
<task id="LOCAL-00564" summary=" 商户申请">
<created>1573540273174</created>
... ... @@ -731,17 +727,32 @@
<option name="project" value="LOCAL" />
<updated>1573563728008</updated>
</task>
<option name="localTasksCounter" value="611" />
<task id="LOCAL-00611" summary=" 商户申请">
<created>1573606558478</created>
<option name="number" value="00611" />
<option name="presentableId" value="LOCAL-00611" />
<option name="project" value="LOCAL" />
<updated>1573606558479</updated>
</task>
<task id="LOCAL-00612" summary=" 商户申请">
<created>1573606579887</created>
<option name="number" value="00612" />
<option name="presentableId" value="LOCAL-00612" />
<option name="project" value="LOCAL" />
<updated>1573606579887</updated>
</task>
<option name="localTasksCounter" value="613" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="423782000" />
<option name="totallyTimeSpent" value="425443000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="right" id="层次结构" weight="0.32995737" />
<window_info anchor="bottom" id="调试" order="7" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32997763" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
... ... @@ -749,7 +760,7 @@
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
<window_info anchor="bottom" id="运行" order="7" />
<window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14925373" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" weight="0.32995737" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
... ... @@ -767,28 +778,28 @@
<window_info anchor="bottom" id="Find" order="1" />
</layout>
<layout-to-restore>
<window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
<window_info anchor="bottom" id="找到" order="14" weight="0.32997763" />
<window_info anchor="bottom" id="运行" order="7" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
<window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="消息" order="15" weight="0.32997763" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Database" order="4" weight="0.32995737" />
<window_info anchor="bottom" id="Terminal" order="11" weight="0.32997763" />
<window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.32997763" />
<window_info anchor="bottom" id="消息" order="15" weight="0.32997763" />
<window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="调试" order="13" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
</layout-to-restore>
... ... @@ -829,13 +840,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="723">
<caret line="98" column="60" selection-start-line="98" selection-start-column="60" selection-end-line="98" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/demo.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="731">
... ... @@ -959,9 +963,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4182">
<caret line="246" column="21" selection-start-line="246" selection-start-column="21" selection-end-line="246" selection-end-column="21" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -1017,9 +1018,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="316" column="38" selection-start-line="316" selection-start-column="38" selection-end-line="316" selection-end-column="38" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -1099,35 +1097,42 @@
<entry file="file://$PROJECT_DIR$/application/home/model/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" />
<caret column="5" 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="-918">
<state relative-caret-position="1224">
<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/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
<state relative-caret-position="1530">
<caret line="99" column="13" selection-start-line="99" selection-start-column="13" selection-end-line="99" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810">
<state relative-caret-position="4607">
<caret line="271" column="1" selection-start-line="271" selection-start-column="1" selection-end-line="271" selection-end-column="1" />
</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="527">
<caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="57" selection-end-column="19" />
<state relative-caret-position="595">
<caret line="52" column="12" selection-start-line="52" selection-start-column="12" selection-end-line="52" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
<caret line="67" column="11" lean-forward="true" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" />
</state>
</provider>
</entry>
... ...
... ... @@ -82,6 +82,8 @@ class Share extends WechatBase
$avatar_url = "./uploads/avatar/avatar_$user_id.jpeg";
}else{
$avatar_url = "./".$user['avatar'];
$image = \think\Image::open($avatar_url);
$image->thumb(65, 65,\think\Image::THUMB_SCALING)->save($avatar_url);
}
$savePath = "./uploads/poster$type/";
if(!file_exists($savePath)){
... ... @@ -136,7 +138,7 @@ class Share extends WechatBase
$new_file = $save_dir.$filename.'.'.$type;
$save_path= './uploads/avatar/'.$filename.'.'.$type;
if (file_put_contents($new_file, base64_decode(str_replace($result[1], '', $img_content)))) {
//等比放大缩小二维码
//等比缩放二维码
$image = \think\Image::open($save_path);
$image->thumb(65, 65,\think\Image::THUMB_SCALING)->save($save_path);
return ['code'=>0,'file_path'=>$new_file,'save_path'=>$save_path];
... ...