Merge branch 'master' into feat/liujie

src/user_pages/downloadBill/index.tsx

@@ -275,10 +275,7 @@ const DownloadBill: React.FC = () => {
           Taro.navigateBack();
         }}
       />
-      <View 
-        className="hint_content"
-        style={{ marginTop: `${totalHeight}px` }}
-      >
+      <View className="hint_content" style={{ marginTop: `147px` }}>
         <Text>最长可导出三个月的账单 </Text>
         <Text className="button_text" onClick={downloadExample}>
           示例文件
@@ -322,8 +319,9 @@ const DownloadBill: React.FC = () => {
               近一周
             </View>
             <View
-              className={`option_button ${dateType === "month" ? "active" : ""
-                }`}
+              className={`option_button ${
+                dateType === "month" ? "active" : ""
+              }`}
               onClick={() => {
                 selectDateRange("month");
               }}
@@ -331,8 +329,9 @@ const DownloadBill: React.FC = () => {
               近一月
             </View>
             <View
-              className={`option_button ${dateType === "custom" ? "active" : ""
-                }`}
+              className={`option_button ${
+                dateType === "custom" ? "active" : ""
+              }`}
               onClick={() => {
                 selectDateRange("custom");
               }}