diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c080c09..ef90093 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -105,7 +105,7 @@ </provider> </entry> </file> - <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="true"> + <file leaf-file-name="enter_view.html" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="153"> @@ -114,6 +114,15 @@ </provider> </entry> </file> + <file leaf-file-name="head.html" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/application/home/view/public/head.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="4" column="113" selection-start-line="4" selection-start-column="113" selection-end-line="4" selection-end-column="113" /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FileTemplateManagerImpl"> @@ -136,7 +145,7 @@ <find>btn_more</find> <find>detail_qust</find> <find>detail_top</find> - <find /> + <find>{if condition='$data.is_correct eq 0 && $data.is_answer eq 1'}</find> <find>targetSdkVersion</find> <find>showErr</find> <find>checkMore</find> @@ -174,7 +183,6 @@ <option value="$PROJECT_DIR$/extend/fast/Auth.php" /> <option value="$PROJECT_DIR$/application/admin/controller/PayView.php" /> <option value="$PROJECT_DIR$/application/home/view/public/NAV.html" /> - <option value="$PROJECT_DIR$/application/home/view/public/head.html" /> <option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" /> <option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" /> <option value="$PROJECT_DIR$/application/home/controller/User.php" /> @@ -217,6 +225,7 @@ <option value="$PROJECT_DIR$/application/home/controller/Member.php" /> <option value="$PROJECT_DIR$/application/home/view/member/my_information.html" /> <option value="$PROJECT_DIR$/application/home/controller/Goods.php" /> + <option value="$PROJECT_DIR$/application/home/view/public/head.html" /> </list> </option> </component> @@ -479,14 +488,7 @@ <workItem from="1573000530976" duration="6061000" /> <workItem from="1573087576825" duration="5555000" /> <workItem from="1573174620844" duration="32581000" /> - <workItem from="1573259331081" duration="23796000" /> - </task> - <task id="LOCAL-00459" summary="商户申请"> - <created>1573269540141</created> - <option name="number" value="00459" /> - <option name="presentableId" value="LOCAL-00459" /> - <option name="project" value="LOCAL" /> - <updated>1573269540141</updated> + <workItem from="1573259331081" duration="24084000" /> </task> <task id="LOCAL-00460" summary="商户申请"> <created>1573269608772</created> @@ -824,14 +826,21 @@ <option name="project" value="LOCAL" /> <updated>1573286413188</updated> </task> - <option name="localTasksCounter" value="508" /> + <task id="LOCAL-00508" summary=" 商户申请"> + <created>1573287469988</created> + <option name="number" value="00508" /> + <option name="presentableId" value="LOCAL-00508" /> + <option name="project" value="LOCAL" /> + <updated>1573287469989</updated> + </task> + <option name="localTasksCounter" value="509" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="397469000" /> + <option name="totallyTimeSpent" value="397757000" /> </component> <component name="ToolWindowManager"> - <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <editor active="true" /> <layout> <window_info anchor="bottom" id="TODO" order="6" /> @@ -981,13 +990,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/application/home/view/public/head.html"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="85"> - <caret line="5" column="76" selection-start-line="5" selection-start-column="76" selection-end-line="5" selection-end-column="76" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/application/home/view/member/earnings_log.html"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="561"> @@ -1231,6 +1233,13 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/application/home/view/public/head.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="68"> + <caret line="4" column="113" selection-start-line="4" selection-start-column="113" selection-end-line="4" selection-end-column="113" /> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states> diff --git a/public/assets/advertising/css/index.css b/public/assets/advertising/css/index.css index 1a3b718..f656277 100644 --- a/public/assets/advertising/css/index.css +++ b/public/assets/advertising/css/index.css @@ -61,7 +61,7 @@ background-color: #FB7A17; text-align: center; line-height: 0.56rem; - font-size: 0.28rem; + font-size: 0.24rem; border-radius: 0.1rem; }