diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8d00b9b..c8dcc3b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,8 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> - <change afterPath="$PROJECT_DIR$/application/home/controller/Merchant.php" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/application/home/view/member/my_information.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/application/home/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Member.php" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/application/home/view/goods/video_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/video_detail.html" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/application/home/view/member/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/member/index.html" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/personal.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/personal.css" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -36,11 +31,11 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="Member.php" pinned="false" current-in-tab="true"> + <file leaf-file-name="Member.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="680"> - <caret line="71" column="31" selection-start-line="71" selection-start-column="31" selection-end-line="71" selection-end-column="31" /> + <state relative-caret-position="561"> + <caret line="64" column="32" lean-forward="true" selection-start-line="64" selection-start-column="32" selection-end-line="64" selection-end-column="32" /> </state> </provider> </entry> @@ -48,8 +43,17 @@ <file leaf-file-name="my_information.html" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="147"> - <caret line="120" column="41" lean-forward="true" selection-start-line="120" selection-start-column="41" selection-end-line="120" selection-end-column="41" /> + <state relative-caret-position="493"> + <caret line="29" column="102" selection-start-line="29" selection-start-column="102" selection-end-line="29" selection-end-column="102" /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="personalMsg.css" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="356"> + <caret line="25" column="23" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" /> </state> </provider> </entry> @@ -72,15 +76,6 @@ </provider> </entry> </file> - <file leaf-file-name="personal.css" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/personal.css"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="407"> - <caret line="28" column="22" selection-start-line="28" selection-start-column="22" selection-end-line="28" selection-end-column="22" /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="video_detail.html" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html"> <provider selected="true" editor-type-id="text-editor"> @@ -156,7 +151,6 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/application/admin/view/goods_audit/index.html" /> <option value="$PROJECT_DIR$/application/admin/controller/GoodsAudit.php" /> <option value="$PROJECT_DIR$/application/admin/controller/Goods.php" /> <option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" /> @@ -205,8 +199,9 @@ <option value="$PROJECT_DIR$/application/home/controller/Merchant.php" /> <option value="$PROJECT_DIR$/application/home/view/goods/video_detail.html" /> <option value="$PROJECT_DIR$/application/home/view/member/index.html" /> - <option value="$PROJECT_DIR$/application/home/view/member/my_information.html" /> <option value="$PROJECT_DIR$/application/home/controller/Member.php" /> + <option value="$PROJECT_DIR$/application/home/view/member/my_information.html" /> + <option value="$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css" /> </list> </option> </component> @@ -444,21 +439,7 @@ <workItem from="1572568391799" duration="24440000" /> <workItem from="1572668245063" duration="699000" /> <workItem from="1572827640492" duration="25475000" /> - <workItem from="1572914713443" duration="20835000" /> - </task> - <task id="LOCAL-00150" summary="视频详情"> - <created>1572923628456</created> - <option name="number" value="00150" /> - <option name="presentableId" value="LOCAL-00150" /> - <option name="project" value="LOCAL" /> - <updated>1572923628456</updated> - </task> - <task id="LOCAL-00151" summary="视频详情"> - <created>1572923711205</created> - <option name="number" value="00151" /> - <option name="presentableId" value="LOCAL-00151" /> - <option name="project" value="LOCAL" /> - <updated>1572923711205</updated> + <workItem from="1572914713443" duration="20959000" /> </task> <task id="LOCAL-00152" summary="视频详情"> <created>1572923759714</created> @@ -789,11 +770,25 @@ <option name="project" value="LOCAL" /> <updated>1572939116261</updated> </task> - <option name="localTasksCounter" value="199" /> + <task id="LOCAL-00199" summary="音频"> + <created>1572940978286</created> + <option name="number" value="00199" /> + <option name="presentableId" value="LOCAL-00199" /> + <option name="project" value="LOCAL" /> + <updated>1572940978286</updated> + </task> + <task id="LOCAL-00200" summary="音频"> + <created>1572941029824</created> + <option name="number" value="00200" /> + <option name="presentableId" value="LOCAL-00200" /> + <option name="project" value="LOCAL" /> + <updated>1572941029824</updated> + </task> + <option name="localTasksCounter" value="201" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="320413000" /> + <option name="totallyTimeSpent" value="320537000" /> </component> <component name="ToolWindowManager"> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> @@ -872,13 +867,6 @@ <option name="LAST_COMMIT_MESSAGE" value="音频" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="453"> - <caret line="131" column="44" lean-forward="true" selection-start-line="131" selection-start-column="44" selection-end-line="131" selection-end-column="44" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/application/extra/wechat.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="709"> @@ -1192,13 +1180,6 @@ </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="147"> - <caret line="120" column="41" lean-forward="true" selection-start-line="120" selection-start-column="41" selection-end-line="120" selection-end-column="41" /> - </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="460"> @@ -1220,8 +1201,22 @@ </entry> <entry file="file://$PROJECT_DIR$/application/home/controller/Member.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="680"> - <caret line="71" column="31" selection-start-line="71" selection-start-column="31" selection-end-line="71" selection-end-column="31" /> + <state relative-caret-position="561"> + <caret line="64" column="32" lean-forward="true" selection-start-line="64" selection-start-column="32" selection-end-line="64" selection-end-column="32" /> + </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="493"> + <caret line="29" column="102" selection-start-line="29" selection-start-column="102" selection-end-line="29" selection-end-column="102" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/public/assets/advertising/css/personalMsg.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="356"> + <caret line="25" column="23" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" /> </state> </provider> </entry> diff --git a/public/assets/advertising/css/personalMsg.css b/public/assets/advertising/css/personalMsg.css index 1ebab31..40eabbb 100644 --- a/public/assets/advertising/css/personalMsg.css +++ b/public/assets/advertising/css/personalMsg.css @@ -22,6 +22,9 @@ html { width: 1.2rem; height: 1.2rem; } +.header_img img{ + border-radius: 50%; +} .per_msg_nick { padding: 0.4rem 0;