王晓刚 / advertising · 提交

转到一个项目

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

我的钱包

内嵌 并排对比
正在显示 3 个修改的文件 包含 87 行增加 和 89 行删除
... ... @@ -5,7 +5,9 @@
</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/Share.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Share.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/bg1.png" beforeDir="false" afterPath="$PROJECT_DIR$/public/bg1.png" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -63,8 +65,8 @@
<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="485">
<caret line="86" column="38" selection-start-line="86" selection-start-column="38" selection-end-line="86" selection-end-column="38" />
<state relative-caret-position="640">
<caret line="88" column="28" selection-start-line="88" selection-start-column="28" selection-end-line="88" selection-end-column="28" />
</state>
</provider>
</entry>
... ... @@ -81,8 +83,8 @@
<file leaf-file-name="Merchant.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<caret line="41" column="38" selection-start-line="41" selection-start-column="38" selection-end-line="41" selection-end-column="38" />
<state relative-caret-position="595">
<caret line="40" column="30" selection-start-line="40" selection-start-column="30" selection-end-line="40" selection-end-column="30" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
... ... @@ -208,8 +210,8 @@
<option value="$PROJECT_DIR$/application/home/view/share/index.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/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
</list>
</option>
... ... @@ -430,49 +432,7 @@
<workItem from="1572914713443" duration="29898000" />
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="27542000" />
</task>
<task id="LOCAL-00314" summary="我的钱包">
<created>1573201422968</created>
<option name="number" value="00314" />
<option name="presentableId" value="LOCAL-00314" />
<option name="project" value="LOCAL" />
<updated>1573201422968</updated>
</task>
<task id="LOCAL-00315" summary="我的钱包">
<created>1573201523560</created>
<option name="number" value="00315" />
<option name="presentableId" value="LOCAL-00315" />
<option name="project" value="LOCAL" />
<updated>1573201523560</updated>
</task>
<task id="LOCAL-00316" summary="我的钱包">
<created>1573201590859</created>
<option name="number" value="00316" />
<option name="presentableId" value="LOCAL-00316" />
<option name="project" value="LOCAL" />
<updated>1573201590859</updated>
</task>
<task id="LOCAL-00317" summary="我的钱包">
<created>1573201601539</created>
<option name="number" value="00317" />
<option name="presentableId" value="LOCAL-00317" />
<option name="project" value="LOCAL" />
<updated>1573201601539</updated>
</task>
<task id="LOCAL-00318" summary="我的钱包">
<created>1573201693858</created>
<option name="number" value="00318" />
<option name="presentableId" value="LOCAL-00318" />
<option name="project" value="LOCAL" />
<updated>1573201693858</updated>
</task>
<task id="LOCAL-00319" summary="我的钱包">
<created>1573201752632</created>
<option name="number" value="00319" />
<option name="presentableId" value="LOCAL-00319" />
<option name="project" value="LOCAL" />
<updated>1573201752632</updated>
<workItem from="1573174620844" duration="28147000" />
</task>
<task id="LOCAL-00320" summary="我的钱包">
<created>1573201786077</created>
... ... @@ -775,11 +735,53 @@
<option name="project" value="LOCAL" />
<updated>1573209337918</updated>
</task>
<option name="localTasksCounter" value="363" />
<task id="LOCAL-00363" summary="我的钱包">
<created>1573209426911</created>
<option name="number" value="00363" />
<option name="presentableId" value="LOCAL-00363" />
<option name="project" value="LOCAL" />
<updated>1573209426911</updated>
</task>
<task id="LOCAL-00364" summary="我的钱包">
<created>1573209450613</created>
<option name="number" value="00364" />
<option name="presentableId" value="LOCAL-00364" />
<option name="project" value="LOCAL" />
<updated>1573209450613</updated>
</task>
<task id="LOCAL-00365" summary="我的钱包">
<created>1573209482396</created>
<option name="number" value="00365" />
<option name="presentableId" value="LOCAL-00365" />
<option name="project" value="LOCAL" />
<updated>1573209482396</updated>
</task>
<task id="LOCAL-00366" summary="我的钱包">
<created>1573209569202</created>
<option name="number" value="00366" />
<option name="presentableId" value="LOCAL-00366" />
<option name="project" value="LOCAL" />
<updated>1573209569202</updated>
</task>
<task id="LOCAL-00367" summary="我的钱包">
<created>1573209606522</created>
<option name="number" value="00367" />
<option name="presentableId" value="LOCAL-00367" />
<option name="project" value="LOCAL" />
<updated>1573209606522</updated>
</task>
<task id="LOCAL-00368" summary="我的钱包">
<created>1573209701097</created>
<option name="number" value="00368" />
<option name="presentableId" value="LOCAL-00368" />
<option name="project" value="LOCAL" />
<updated>1573209701097</updated>
</task>
<option name="localTasksCounter" value="369" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="368634000" />
<option name="totallyTimeSpent" value="369239000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -863,13 +865,6 @@
<option name="LAST_COMMIT_MESSAGE" value="我的钱包" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="623">
<caret line="81" column="14" selection-start-line="81" selection-start-column="14" selection-end-line="81" selection-end-column="14" />
</state>
</provider>
</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="306">
... ... @@ -1133,13 +1128,6 @@
<entry file="file://$PROJECT_DIR$/public/white.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Collect.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="793">
<caret line="56" column="9" selection-start-line="56" selection-start-column="9" selection-end-line="56" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
... ... @@ -1147,16 +1135,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="612">
<caret line="41" column="38" selection-start-line="41" selection-start-column="38" selection-end-line="41" selection-end-column="38" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
... ... @@ -1164,17 +1142,20 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595">
<caret line="78" column="38" lean-forward="true" selection-start-line="71" selection-start-column="8" selection-end-line="78" selection-end-column="38" />
<state relative-caret-position="130">
<caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="74" column="34" selection-start-line="74" selection-start-column="34" selection-end-line="74" selection-end-column="34" />
<state relative-caret-position="595">
<caret line="40" column="30" selection-start-line="40" selection-start-column="30" selection-end-line="40" selection-end-column="30" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -1185,20 +1166,37 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<entry file="file://$PROJECT_DIR$/application/home/controller/Collect.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1077">
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
<state relative-caret-position="793">
<caret line="56" column="9" selection-start-line="56" selection-start-column="9" selection-end-line="56" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/bg2.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/public/bg1.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595">
<caret line="78" column="38" lean-forward="true" selection-start-line="71" selection-start-column="8" selection-end-line="78" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1077">
<caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" selection-end-column="29" />
</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="485">
<caret line="86" column="38" selection-start-line="86" selection-start-column="38" selection-end-line="86" selection-end-column="38" />
<state relative-caret-position="640">
<caret line="88" column="28" selection-start-line="88" selection-start-column="28" selection-end-line="88" selection-end-column="28" />
</state>
</provider>
</entry>
... ...
... ... @@ -84,9 +84,9 @@ class Share extends WechatBase
}
//圆形的头像
$image = \think\Image::open(ROOT_PATH."public/white.png");
$image->water($avatar_url,[520,80],100)
$image->water($avatar_url,[150,40],100)
->water(ROOT_PATH."public/bg$type.png")
->water($url,[344,980],100)
->water($url,[300,500],100)
->save($savePath."poster_$user[id].png");
return "./uploads/poster$type/poster_$user[id].png";
}
... ... @@ -124,7 +124,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(88, 90,\think\Image::THUMB_SCALING)->save($save_path);
return ['code'=>0,'file_path'=>$new_file,'save_path'=>$save_path];
... ... @@ -153,7 +153,7 @@ class Share extends WechatBase
file_put_contents($savePath.$file_name,$code);
//等比放大缩小二维码
//$image = \think\Image::open($savePath.$file_name);
//$image->thumb(500, 450,\think\Image::THUMB_SCALING)->save($savePath.$file_name);
//$image->thumb(450, 450,\think\Image::THUMB_SCALING)->save($savePath.$file_name);
}
return "./uploads/code_img/$file_name";
}
... ...

310.5 KB | 宽: | 高:

193.6 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖