王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 ac7e71061832296ee439a5edcb5e6f908376dd5c 1 个父辈 2f63515c
1 个管道 的构建 通过 耗费 1 秒

我的钱包

内嵌 并排对比
正在显示 2 个修改的文件 包含 50 行增加 和 52 行删除
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 </component> 5 </component>
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> 7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
8 - <change beforePath="$PROJECT_DIR$/application/home/view/share/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/share/index.html" afterDir="false" /> 8 + <change beforePath="$PROJECT_DIR$/application/home/controller/Share.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Share.php" afterDir="false" />
9 </list> 9 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -60,16 +60,16 @@ @@ -60,16 +60,16 @@
60 </provider> 60 </provider>
61 </entry> 61 </entry>
62 </file> 62 </file>
63 - <file leaf-file-name="Share.php" pinned="false" current-in-tab="false"> 63 + <file leaf-file-name="Share.php" pinned="false" current-in-tab="true">
64 <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php"> 64 <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
65 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
66 - <state relative-caret-position="672">  
67 - <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" /> 66 + <state relative-caret-position="536">
  67 + <caret line="152" column="31" lean-forward="true" selection-start-line="152" selection-start-column="31" selection-end-line="152" selection-end-column="31" />
68 </state> 68 </state>
69 </provider> 69 </provider>
70 </entry> 70 </entry>
71 </file> 71 </file>
72 - <file leaf-file-name="index.html" pinned="false" current-in-tab="true"> 72 + <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
73 <entry file="file://$PROJECT_DIR$/application/home/view/share/index.html"> 73 <entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
74 <provider selected="true" editor-type-id="text-editor"> 74 <provider selected="true" editor-type-id="text-editor">
75 <state relative-caret-position="425"> 75 <state relative-caret-position="425">
@@ -188,8 +188,8 @@ @@ -188,8 +188,8 @@
188 <option value="$PROJECT_DIR$/application/home/controller/Member.php" /> 188 <option value="$PROJECT_DIR$/application/home/controller/Member.php" />
189 <option value="$PROJECT_DIR$/application/home/view/collect/index.html" /> 189 <option value="$PROJECT_DIR$/application/home/view/collect/index.html" />
190 <option value="$PROJECT_DIR$/application/home/controller/Collect.php" /> 190 <option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
191 - <option value="$PROJECT_DIR$/application/home/controller/Share.php" />  
192 <option value="$PROJECT_DIR$/application/home/view/share/index.html" /> 191 <option value="$PROJECT_DIR$/application/home/view/share/index.html" />
  192 + <option value="$PROJECT_DIR$/application/home/controller/Share.php" />
193 </list> 193 </list>
194 </option> 194 </option>
195 </component> 195 </component>
@@ -401,42 +401,7 @@ @@ -401,42 +401,7 @@
401 <workItem from="1572914713443" duration="29898000" /> 401 <workItem from="1572914713443" duration="29898000" />
402 <workItem from="1573000530976" duration="6061000" /> 402 <workItem from="1573000530976" duration="6061000" />
403 <workItem from="1573087576825" duration="5555000" /> 403 <workItem from="1573087576825" duration="5555000" />
404 - <workItem from="1573174620844" duration="18169000" />  
405 - </task>  
406 - <task id="LOCAL-00256" summary="我的钱包">  
407 - <created>1573177833568</created>  
408 - <option name="number" value="00256" />  
409 - <option name="presentableId" value="LOCAL-00256" />  
410 - <option name="project" value="LOCAL" />  
411 - <updated>1573177833568</updated>  
412 - </task>  
413 - <task id="LOCAL-00257" summary="我的钱包">  
414 - <created>1573179194736</created>  
415 - <option name="number" value="00257" />  
416 - <option name="presentableId" value="LOCAL-00257" />  
417 - <option name="project" value="LOCAL" />  
418 - <updated>1573179194736</updated>  
419 - </task>  
420 - <task id="LOCAL-00258" summary="我的钱包">  
421 - <created>1573179272796</created>  
422 - <option name="number" value="00258" />  
423 - <option name="presentableId" value="LOCAL-00258" />  
424 - <option name="project" value="LOCAL" />  
425 - <updated>1573179272796</updated>  
426 - </task>  
427 - <task id="LOCAL-00259" summary="我的钱包">  
428 - <created>1573179449086</created>  
429 - <option name="number" value="00259" />  
430 - <option name="presentableId" value="LOCAL-00259" />  
431 - <option name="project" value="LOCAL" />  
432 - <updated>1573179449086</updated>  
433 - </task>  
434 - <task id="LOCAL-00260" summary="我的钱包">  
435 - <created>1573179497306</created>  
436 - <option name="number" value="00260" />  
437 - <option name="presentableId" value="LOCAL-00260" />  
438 - <option name="project" value="LOCAL" />  
439 - <updated>1573179497306</updated> 404 + <workItem from="1573174620844" duration="18417000" />
440 </task> 405 </task>
441 <task id="LOCAL-00261" summary="我的钱包"> 406 <task id="LOCAL-00261" summary="我的钱包">
442 <created>1573179611601</created> 407 <created>1573179611601</created>
@@ -746,11 +711,46 @@ @@ -746,11 +711,46 @@
746 <option name="project" value="LOCAL" /> 711 <option name="project" value="LOCAL" />
747 <updated>1573199387237</updated> 712 <updated>1573199387237</updated>
748 </task> 713 </task>
749 - <option name="localTasksCounter" value="305" /> 714 + <task id="LOCAL-00305" summary="我的钱包">
  715 + <created>1573199414317</created>
  716 + <option name="number" value="00305" />
  717 + <option name="presentableId" value="LOCAL-00305" />
  718 + <option name="project" value="LOCAL" />
  719 + <updated>1573199414317</updated>
  720 + </task>
  721 + <task id="LOCAL-00306" summary="我的钱包">
  722 + <created>1573199459831</created>
  723 + <option name="number" value="00306" />
  724 + <option name="presentableId" value="LOCAL-00306" />
  725 + <option name="project" value="LOCAL" />
  726 + <updated>1573199459831</updated>
  727 + </task>
  728 + <task id="LOCAL-00307" summary="我的钱包">
  729 + <created>1573199522117</created>
  730 + <option name="number" value="00307" />
  731 + <option name="presentableId" value="LOCAL-00307" />
  732 + <option name="project" value="LOCAL" />
  733 + <updated>1573199522118</updated>
  734 + </task>
  735 + <task id="LOCAL-00308" summary="我的钱包">
  736 + <created>1573199535324</created>
  737 + <option name="number" value="00308" />
  738 + <option name="presentableId" value="LOCAL-00308" />
  739 + <option name="project" value="LOCAL" />
  740 + <updated>1573199535324</updated>
  741 + </task>
  742 + <task id="LOCAL-00309" summary="我的钱包">
  743 + <created>1573199598264</created>
  744 + <option name="number" value="00309" />
  745 + <option name="presentableId" value="LOCAL-00309" />
  746 + <option name="project" value="LOCAL" />
  747 + <updated>1573199598264</updated>
  748 + </task>
  749 + <option name="localTasksCounter" value="310" />
750 <servers /> 750 <servers />
751 </component> 751 </component>
752 <component name="TimeTrackingManager"> 752 <component name="TimeTrackingManager">
753 - <option name="totallyTimeSpent" value="359261000" /> 753 + <option name="totallyTimeSpent" value="359509000" />
754 </component> 754 </component>
755 <component name="ToolWindowManager"> 755 <component name="ToolWindowManager">
756 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 756 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1160,17 +1160,17 @@ @@ -1160,17 +1160,17 @@
1160 </state> 1160 </state>
1161 </provider> 1161 </provider>
1162 </entry> 1162 </entry>
1163 - <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php"> 1163 + <entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
1164 <provider selected="true" editor-type-id="text-editor"> 1164 <provider selected="true" editor-type-id="text-editor">
1165 - <state relative-caret-position="672">  
1166 - <caret line="86" column="42" selection-start-line="86" selection-start-column="42" selection-end-line="86" selection-end-column="42" /> 1165 + <state relative-caret-position="425">
  1166 + <caret line="82" column="39" lean-forward="true" selection-start-line="82" selection-start-column="39" selection-end-line="82" selection-end-column="39" />
1167 </state> 1167 </state>
1168 </provider> 1168 </provider>
1169 </entry> 1169 </entry>
1170 - <entry file="file://$PROJECT_DIR$/application/home/view/share/index.html"> 1170 + <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
1171 <provider selected="true" editor-type-id="text-editor"> 1171 <provider selected="true" editor-type-id="text-editor">
1172 - <state relative-caret-position="425">  
1173 - <caret line="82" column="39" lean-forward="true" selection-start-line="82" selection-start-column="39" selection-end-line="82" selection-end-column="39" /> 1172 + <state relative-caret-position="536">
  1173 + <caret line="152" column="31" lean-forward="true" selection-start-line="152" selection-start-column="31" selection-end-line="152" selection-end-column="31" />
1174 </state> 1174 </state>
1175 </provider> 1175 </provider>
1176 </entry> 1176 </entry>
@@ -151,8 +151,6 @@ class Share extends WechatBase @@ -151,8 +151,6 @@ class Share extends WechatBase
151 //等比放大缩小二维码 151 //等比放大缩小二维码
152 $image = \think\Image::open($savePath.$file_name); 152 $image = \think\Image::open($savePath.$file_name);
153 $image->thumb(270, 270,\think\Image::THUMB_SCALING)->save($savePath.$file_name); 153 $image->thumb(270, 270,\think\Image::THUMB_SCALING)->save($savePath.$file_name);
154 - echo 111;  
155 - exit();  
156 } 154 }
157 return "./uploads/code_img/$file_name"; 155 return "./uploads/code_img/$file_name";
158 } 156 }