正在显示
2 个修改的文件
包含
59 行增加
和
52 行删除
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> | 8 | <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> |
9 | - <change beforePath="$PROJECT_DIR$/application/home/view/index/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" /> | 9 | + <change beforePath="$PROJECT_DIR$/application/home/controller/Share.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Share.php" afterDir="false" /> |
10 | </list> | 10 | </list> |
11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
12 | <option name="TRACKING_ENABLED" value="true" /> | 12 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -37,17 +37,26 @@ | @@ -37,17 +37,26 @@ | ||
37 | <file leaf-file-name="Goods.php" pinned="false" current-in-tab="false"> | 37 | <file leaf-file-name="Goods.php" pinned="false" current-in-tab="false"> |
38 | <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php"> | 38 | <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php"> |
39 | <provider selected="true" editor-type-id="text-editor"> | 39 | <provider selected="true" editor-type-id="text-editor"> |
40 | - <state relative-caret-position="443"> | 40 | + <state relative-caret-position="1530"> |
41 | <caret line="99" column="13" selection-start-line="99" selection-start-column="13" selection-end-line="99" selection-end-column="13" /> | 41 | <caret line="99" column="13" selection-start-line="99" selection-start-column="13" selection-end-line="99" selection-end-column="13" /> |
42 | </state> | 42 | </state> |
43 | </provider> | 43 | </provider> |
44 | </entry> | 44 | </entry> |
45 | </file> | 45 | </file> |
46 | - <file leaf-file-name="index.html" pinned="false" current-in-tab="true"> | 46 | + <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> |
47 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> | 47 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> |
48 | <provider selected="true" editor-type-id="text-editor"> | 48 | <provider selected="true" editor-type-id="text-editor"> |
49 | - <state relative-caret-position="527"> | ||
50 | - <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="57" selection-end-column="19" /> | 49 | + <state relative-caret-position="595"> |
50 | + <caret line="52" column="12" selection-start-line="52" selection-start-column="12" selection-end-line="52" selection-end-column="12" /> | ||
51 | + </state> | ||
52 | + </provider> | ||
53 | + </entry> | ||
54 | + </file> | ||
55 | + <file leaf-file-name="Share.php" pinned="false" current-in-tab="true"> | ||
56 | + <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php"> | ||
57 | + <provider selected="true" editor-type-id="text-editor"> | ||
58 | + <state relative-caret-position="145"> | ||
59 | + <caret line="67" column="11" lean-forward="true" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" /> | ||
51 | </state> | 60 | </state> |
52 | </provider> | 61 | </provider> |
53 | </entry> | 62 | </entry> |
@@ -55,7 +64,7 @@ | @@ -55,7 +64,7 @@ | ||
55 | <file leaf-file-name="public.css" pinned="false" current-in-tab="false"> | 64 | <file leaf-file-name="public.css" pinned="false" current-in-tab="false"> |
56 | <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css"> | 65 | <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css"> |
57 | <provider selected="true" editor-type-id="text-editor"> | 66 | <provider selected="true" editor-type-id="text-editor"> |
58 | - <state relative-caret-position="810"> | 67 | + <state relative-caret-position="4607"> |
59 | <caret line="271" column="1" selection-start-line="271" selection-start-column="1" selection-end-line="271" selection-end-column="1" /> | 68 | <caret line="271" column="1" selection-start-line="271" selection-start-column="1" selection-end-line="271" selection-end-column="1" /> |
60 | </state> | 69 | </state> |
61 | </provider> | 70 | </provider> |
@@ -64,7 +73,7 @@ | @@ -64,7 +73,7 @@ | ||
64 | <file leaf-file-name="Index.php" pinned="false" current-in-tab="false"> | 73 | <file leaf-file-name="Index.php" pinned="false" current-in-tab="false"> |
65 | <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> | 74 | <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> |
66 | <provider selected="true" editor-type-id="text-editor"> | 75 | <provider selected="true" editor-type-id="text-editor"> |
67 | - <state relative-caret-position="-918"> | 76 | + <state relative-caret-position="1224"> |
68 | <caret line="80" column="9" selection-start-line="80" selection-start-column="9" selection-end-line="80" selection-end-column="9" /> | 77 | <caret line="80" column="9" selection-start-line="80" selection-start-column="9" selection-end-line="80" selection-end-column="9" /> |
69 | </state> | 78 | </state> |
70 | </provider> | 79 | </provider> |
@@ -74,7 +83,7 @@ | @@ -74,7 +83,7 @@ | ||
74 | <entry file="file://$PROJECT_DIR$/application/home/model/Goods.php"> | 83 | <entry file="file://$PROJECT_DIR$/application/home/model/Goods.php"> |
75 | <provider selected="true" editor-type-id="text-editor"> | 84 | <provider selected="true" editor-type-id="text-editor"> |
76 | <state> | 85 | <state> |
77 | - <caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" /> | 86 | + <caret column="5" selection-start-column="5" selection-end-column="5" /> |
78 | </state> | 87 | </state> |
79 | </provider> | 88 | </provider> |
80 | </entry> | 89 | </entry> |
@@ -150,7 +159,6 @@ | @@ -150,7 +159,6 @@ | ||
150 | <option value="$PROJECT_DIR$/application/home/view/member/withdraw_log.html" /> | 159 | <option value="$PROJECT_DIR$/application/home/view/member/withdraw_log.html" /> |
151 | <option value="$PROJECT_DIR$/application/home/view/merchant/enter.html" /> | 160 | <option value="$PROJECT_DIR$/application/home/view/merchant/enter.html" /> |
152 | <option value="$PROJECT_DIR$/application/home/view/merchant/index.html" /> | 161 | <option value="$PROJECT_DIR$/application/home/view/merchant/index.html" /> |
153 | - <option value="$PROJECT_DIR$/application/home/controller/Share.php" /> | ||
154 | <option value="$PROJECT_DIR$/application/home/controller/Server.php" /> | 162 | <option value="$PROJECT_DIR$/application/home/controller/Server.php" /> |
155 | <option value="$PROJECT_DIR$/application/home/controller/Collect.php" /> | 163 | <option value="$PROJECT_DIR$/application/home/controller/Collect.php" /> |
156 | <option value="$PROJECT_DIR$/application/home/view/collect/index.html" /> | 164 | <option value="$PROJECT_DIR$/application/home/view/collect/index.html" /> |
@@ -182,6 +190,7 @@ | @@ -182,6 +190,7 @@ | ||
182 | <option value="$PROJECT_DIR$/application/home/controller/Goods.php" /> | 190 | <option value="$PROJECT_DIR$/application/home/controller/Goods.php" /> |
183 | <option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" /> | 191 | <option value="$PROJECT_DIR$/public/assets/advertising/css/public.css" /> |
184 | <option value="$PROJECT_DIR$/application/home/view/index/index.html" /> | 192 | <option value="$PROJECT_DIR$/application/home/view/index/index.html" /> |
193 | + <option value="$PROJECT_DIR$/application/home/controller/Share.php" /> | ||
185 | </list> | 194 | </list> |
186 | </option> | 195 | </option> |
187 | </component> | 196 | </component> |
@@ -387,20 +396,7 @@ | @@ -387,20 +396,7 @@ | ||
387 | <workItem from="1573259331081" duration="30435000" /> | 396 | <workItem from="1573259331081" duration="30435000" /> |
388 | <workItem from="1573432217070" duration="2199000" /> | 397 | <workItem from="1573432217070" duration="2199000" /> |
389 | <workItem from="1573519427130" duration="17475000" /> | 398 | <workItem from="1573519427130" duration="17475000" /> |
390 | - </task> | ||
391 | - <task id="LOCAL-00562" summary=" 商户申请"> | ||
392 | - <created>1573539953748</created> | ||
393 | - <option name="number" value="00562" /> | ||
394 | - <option name="presentableId" value="LOCAL-00562" /> | ||
395 | - <option name="project" value="LOCAL" /> | ||
396 | - <updated>1573539953748</updated> | ||
397 | - </task> | ||
398 | - <task id="LOCAL-00563" summary=" 商户申请"> | ||
399 | - <created>1573540230853</created> | ||
400 | - <option name="number" value="00563" /> | ||
401 | - <option name="presentableId" value="LOCAL-00563" /> | ||
402 | - <option name="project" value="LOCAL" /> | ||
403 | - <updated>1573540230853</updated> | 399 | + <workItem from="1573605070739" duration="1661000" /> |
404 | </task> | 400 | </task> |
405 | <task id="LOCAL-00564" summary=" 商户申请"> | 401 | <task id="LOCAL-00564" summary=" 商户申请"> |
406 | <created>1573540273174</created> | 402 | <created>1573540273174</created> |
@@ -731,17 +727,32 @@ | @@ -731,17 +727,32 @@ | ||
731 | <option name="project" value="LOCAL" /> | 727 | <option name="project" value="LOCAL" /> |
732 | <updated>1573563728008</updated> | 728 | <updated>1573563728008</updated> |
733 | </task> | 729 | </task> |
734 | - <option name="localTasksCounter" value="611" /> | 730 | + <task id="LOCAL-00611" summary=" 商户申请"> |
731 | + <created>1573606558478</created> | ||
732 | + <option name="number" value="00611" /> | ||
733 | + <option name="presentableId" value="LOCAL-00611" /> | ||
734 | + <option name="project" value="LOCAL" /> | ||
735 | + <updated>1573606558479</updated> | ||
736 | + </task> | ||
737 | + <task id="LOCAL-00612" summary=" 商户申请"> | ||
738 | + <created>1573606579887</created> | ||
739 | + <option name="number" value="00612" /> | ||
740 | + <option name="presentableId" value="LOCAL-00612" /> | ||
741 | + <option name="project" value="LOCAL" /> | ||
742 | + <updated>1573606579887</updated> | ||
743 | + </task> | ||
744 | + <option name="localTasksCounter" value="613" /> | ||
735 | <servers /> | 745 | <servers /> |
736 | </component> | 746 | </component> |
737 | <component name="TimeTrackingManager"> | 747 | <component name="TimeTrackingManager"> |
738 | - <option name="totallyTimeSpent" value="423782000" /> | 748 | + <option name="totallyTimeSpent" value="425443000" /> |
739 | </component> | 749 | </component> |
740 | <component name="ToolWindowManager"> | 750 | <component name="ToolWindowManager"> |
741 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> | 751 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> |
742 | <editor active="true" /> | 752 | <editor active="true" /> |
743 | <layout> | 753 | <layout> |
744 | <window_info anchor="bottom" id="TODO" order="6" /> | 754 | <window_info anchor="bottom" id="TODO" order="6" /> |
755 | + <window_info anchor="right" id="层次结构" weight="0.32995737" /> | ||
745 | <window_info anchor="bottom" id="调试" order="7" /> | 756 | <window_info anchor="bottom" id="调试" order="7" /> |
746 | <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32997763" /> | 757 | <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32997763" /> |
747 | <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> | 758 | <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> |
@@ -749,7 +760,7 @@ | @@ -749,7 +760,7 @@ | ||
749 | <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" /> | 760 | <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" /> |
750 | <window_info anchor="bottom" id="运行" order="7" /> | 761 | <window_info anchor="bottom" id="运行" order="7" /> |
751 | <window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" /> | 762 | <window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" /> |
752 | - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14925373" /> | 763 | + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" /> |
753 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> | 764 | <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> |
754 | <window_info anchor="right" id="Database" order="3" weight="0.32995737" /> | 765 | <window_info anchor="right" id="Database" order="3" weight="0.32995737" /> |
755 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | 766 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
@@ -767,28 +778,28 @@ | @@ -767,28 +778,28 @@ | ||
767 | <window_info anchor="bottom" id="Find" order="1" /> | 778 | <window_info anchor="bottom" id="Find" order="1" /> |
768 | </layout> | 779 | </layout> |
769 | <layout-to-restore> | 780 | <layout-to-restore> |
770 | - <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" /> | ||
771 | <window_info anchor="bottom" id="找到" order="14" weight="0.32997763" /> | 781 | <window_info anchor="bottom" id="找到" order="14" weight="0.32997763" /> |
772 | <window_info anchor="bottom" id="运行" order="7" /> | 782 | <window_info anchor="bottom" id="运行" order="7" /> |
773 | <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" /> | 783 | <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" /> |
774 | - <window_info anchor="bottom" id="Run" order="2" /> | 784 | + <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" /> |
775 | <window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" /> | 785 | <window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" /> |
776 | <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" /> | 786 | <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" /> |
777 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> | 787 | <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> |
778 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> | 788 | <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> |
779 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> | 789 | <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> |
780 | - <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" /> | ||
781 | <window_info anchor="bottom" id="TODO" order="6" /> | 790 | <window_info anchor="bottom" id="TODO" order="6" /> |
782 | - <window_info anchor="bottom" id="Message" order="0" /> | 791 | + <window_info anchor="bottom" id="Run" order="2" /> |
792 | + <window_info anchor="bottom" id="Find" order="1" /> | ||
793 | + <window_info anchor="bottom" id="消息" order="15" weight="0.32997763" /> | ||
783 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> | 794 | <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> |
784 | <window_info anchor="right" id="Database" order="4" weight="0.32995737" /> | 795 | <window_info anchor="right" id="Database" order="4" weight="0.32995737" /> |
785 | <window_info anchor="bottom" id="Terminal" order="11" weight="0.32997763" /> | 796 | <window_info anchor="bottom" id="Terminal" order="11" weight="0.32997763" /> |
786 | <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.32997763" /> | 797 | <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.32997763" /> |
787 | - <window_info anchor="bottom" id="消息" order="15" weight="0.32997763" /> | 798 | + <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" /> |
788 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> | 799 | <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> |
789 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> | 800 | <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> |
790 | <window_info anchor="bottom" id="调试" order="13" /> | 801 | <window_info anchor="bottom" id="调试" order="13" /> |
791 | - <window_info anchor="bottom" id="Find" order="1" /> | 802 | + <window_info anchor="bottom" id="Message" order="0" /> |
792 | <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> | 803 | <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> |
793 | <window_info id="Favorites" order="2" side_tool="true" /> | 804 | <window_info id="Favorites" order="2" side_tool="true" /> |
794 | </layout-to-restore> | 805 | </layout-to-restore> |
@@ -829,13 +840,6 @@ | @@ -829,13 +840,6 @@ | ||
829 | </state> | 840 | </state> |
830 | </provider> | 841 | </provider> |
831 | </entry> | 842 | </entry> |
832 | - <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php"> | ||
833 | - <provider selected="true" editor-type-id="text-editor"> | ||
834 | - <state relative-caret-position="723"> | ||
835 | - <caret line="98" column="60" selection-start-line="98" selection-start-column="60" selection-end-line="98" selection-end-column="60" /> | ||
836 | - </state> | ||
837 | - </provider> | ||
838 | - </entry> | ||
839 | <entry file="file://$PROJECT_DIR$/application/home/controller/demo.xml"> | 843 | <entry file="file://$PROJECT_DIR$/application/home/controller/demo.xml"> |
840 | <provider selected="true" editor-type-id="text-editor"> | 844 | <provider selected="true" editor-type-id="text-editor"> |
841 | <state relative-caret-position="731"> | 845 | <state relative-caret-position="731"> |
@@ -959,9 +963,6 @@ | @@ -959,9 +963,6 @@ | ||
959 | <provider selected="true" editor-type-id="text-editor"> | 963 | <provider selected="true" editor-type-id="text-editor"> |
960 | <state relative-caret-position="4182"> | 964 | <state relative-caret-position="4182"> |
961 | <caret line="246" column="21" selection-start-line="246" selection-start-column="21" selection-end-line="246" selection-end-column="21" /> | 965 | <caret line="246" column="21" selection-start-line="246" selection-start-column="21" selection-end-line="246" selection-end-column="21" /> |
962 | - <folding> | ||
963 | - <element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
964 | - </folding> | ||
965 | </state> | 966 | </state> |
966 | </provider> | 967 | </provider> |
967 | </entry> | 968 | </entry> |
@@ -1017,9 +1018,6 @@ | @@ -1017,9 +1018,6 @@ | ||
1017 | <provider selected="true" editor-type-id="text-editor"> | 1018 | <provider selected="true" editor-type-id="text-editor"> |
1018 | <state relative-caret-position="288"> | 1019 | <state relative-caret-position="288"> |
1019 | <caret line="316" column="38" selection-start-line="316" selection-start-column="38" selection-end-line="316" selection-end-column="38" /> | 1020 | <caret line="316" column="38" selection-start-line="316" selection-start-column="38" selection-end-line="316" selection-end-column="38" /> |
1020 | - <folding> | ||
1021 | - <element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" /> | ||
1022 | - </folding> | ||
1023 | </state> | 1021 | </state> |
1024 | </provider> | 1022 | </provider> |
1025 | </entry> | 1023 | </entry> |
@@ -1099,35 +1097,42 @@ | @@ -1099,35 +1097,42 @@ | ||
1099 | <entry file="file://$PROJECT_DIR$/application/home/model/Goods.php"> | 1097 | <entry file="file://$PROJECT_DIR$/application/home/model/Goods.php"> |
1100 | <provider selected="true" editor-type-id="text-editor"> | 1098 | <provider selected="true" editor-type-id="text-editor"> |
1101 | <state> | 1099 | <state> |
1102 | - <caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" /> | 1100 | + <caret column="5" selection-start-column="5" selection-end-column="5" /> |
1103 | </state> | 1101 | </state> |
1104 | </provider> | 1102 | </provider> |
1105 | </entry> | 1103 | </entry> |
1106 | <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> | 1104 | <entry file="file://$PROJECT_DIR$/application/home/controller/Index.php"> |
1107 | <provider selected="true" editor-type-id="text-editor"> | 1105 | <provider selected="true" editor-type-id="text-editor"> |
1108 | - <state relative-caret-position="-918"> | 1106 | + <state relative-caret-position="1224"> |
1109 | <caret line="80" column="9" selection-start-line="80" selection-start-column="9" selection-end-line="80" selection-end-column="9" /> | 1107 | <caret line="80" column="9" selection-start-line="80" selection-start-column="9" selection-end-line="80" selection-end-column="9" /> |
1110 | </state> | 1108 | </state> |
1111 | </provider> | 1109 | </provider> |
1112 | </entry> | 1110 | </entry> |
1113 | <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php"> | 1111 | <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php"> |
1114 | <provider selected="true" editor-type-id="text-editor"> | 1112 | <provider selected="true" editor-type-id="text-editor"> |
1115 | - <state relative-caret-position="443"> | 1113 | + <state relative-caret-position="1530"> |
1116 | <caret line="99" column="13" selection-start-line="99" selection-start-column="13" selection-end-line="99" selection-end-column="13" /> | 1114 | <caret line="99" column="13" selection-start-line="99" selection-start-column="13" selection-end-line="99" selection-end-column="13" /> |
1117 | </state> | 1115 | </state> |
1118 | </provider> | 1116 | </provider> |
1119 | </entry> | 1117 | </entry> |
1120 | <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css"> | 1118 | <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/public.css"> |
1121 | <provider selected="true" editor-type-id="text-editor"> | 1119 | <provider selected="true" editor-type-id="text-editor"> |
1122 | - <state relative-caret-position="810"> | 1120 | + <state relative-caret-position="4607"> |
1123 | <caret line="271" column="1" selection-start-line="271" selection-start-column="1" selection-end-line="271" selection-end-column="1" /> | 1121 | <caret line="271" column="1" selection-start-line="271" selection-start-column="1" selection-end-line="271" selection-end-column="1" /> |
1124 | </state> | 1122 | </state> |
1125 | </provider> | 1123 | </provider> |
1126 | </entry> | 1124 | </entry> |
1127 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> | 1125 | <entry file="file://$PROJECT_DIR$/application/home/view/index/index.html"> |
1128 | <provider selected="true" editor-type-id="text-editor"> | 1126 | <provider selected="true" editor-type-id="text-editor"> |
1129 | - <state relative-caret-position="527"> | ||
1130 | - <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="57" selection-end-column="19" /> | 1127 | + <state relative-caret-position="595"> |
1128 | + <caret line="52" column="12" selection-start-line="52" selection-start-column="12" selection-end-line="52" selection-end-column="12" /> | ||
1129 | + </state> | ||
1130 | + </provider> | ||
1131 | + </entry> | ||
1132 | + <entry file="file://$PROJECT_DIR$/application/home/controller/Share.php"> | ||
1133 | + <provider selected="true" editor-type-id="text-editor"> | ||
1134 | + <state relative-caret-position="145"> | ||
1135 | + <caret line="67" column="11" lean-forward="true" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" /> | ||
1131 | </state> | 1136 | </state> |
1132 | </provider> | 1137 | </provider> |
1133 | </entry> | 1138 | </entry> |
@@ -82,6 +82,8 @@ class Share extends WechatBase | @@ -82,6 +82,8 @@ class Share extends WechatBase | ||
82 | $avatar_url = "./uploads/avatar/avatar_$user_id.jpeg"; | 82 | $avatar_url = "./uploads/avatar/avatar_$user_id.jpeg"; |
83 | }else{ | 83 | }else{ |
84 | $avatar_url = "./".$user['avatar']; | 84 | $avatar_url = "./".$user['avatar']; |
85 | + $image = \think\Image::open($avatar_url); | ||
86 | + $image->thumb(65, 65,\think\Image::THUMB_SCALING)->save($avatar_url); | ||
85 | } | 87 | } |
86 | $savePath = "./uploads/poster$type/"; | 88 | $savePath = "./uploads/poster$type/"; |
87 | if(!file_exists($savePath)){ | 89 | if(!file_exists($savePath)){ |
@@ -136,7 +138,7 @@ class Share extends WechatBase | @@ -136,7 +138,7 @@ class Share extends WechatBase | ||
136 | $new_file = $save_dir.$filename.'.'.$type; | 138 | $new_file = $save_dir.$filename.'.'.$type; |
137 | $save_path= './uploads/avatar/'.$filename.'.'.$type; | 139 | $save_path= './uploads/avatar/'.$filename.'.'.$type; |
138 | if (file_put_contents($new_file, base64_decode(str_replace($result[1], '', $img_content)))) { | 140 | if (file_put_contents($new_file, base64_decode(str_replace($result[1], '', $img_content)))) { |
139 | - //等比放大缩小二维码 | 141 | + //等比缩放二维码 |
140 | $image = \think\Image::open($save_path); | 142 | $image = \think\Image::open($save_path); |
141 | $image->thumb(65, 65,\think\Image::THUMB_SCALING)->save($save_path); | 143 | $image->thumb(65, 65,\think\Image::THUMB_SCALING)->save($save_path); |
142 | return ['code'=>0,'file_path'=>$new_file,'save_path'=>$save_path]; | 144 | return ['code'=>0,'file_path'=>$new_file,'save_path'=>$save_path]; |
-
请 注册 或 登录 后发表评论