Merge branch 'feat/liujie'

src/components/UploadCover/upload-from-wx.tsx

@@ -33,7 +33,7 @@ async function convert_to_jpg_and_compress(
   return new Promise((resolve, reject) => {
     Taro.canvasToTempFilePath({
       canvas: canvas as unknown as Taro.Canvas,
-      fileType: "jpg",
+      fileType: "png",
       quality: 0.7,
       success: (res) => resolve(res.tempFilePath),
       fail: reject,

src/other_pages/ntrp-evaluate/index.module.scss

@@ -146,8 +146,22 @@
 .introContainer {
   width: 100vw;
   height: 100vh;
-  background: radial-gradient(227.15% 100% at 50% 0%, #bfffef 0%, #fff 36.58%),
+  background-size: cover;
-    #fafafa;
+  background-repeat: no-repeat;
+  position: relative;
+
+  &::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(227.15% 100% at 50% 0%, #bfffef 0%, #fff 36.58%),
+      #fafafa;
+    z-index: -1;
+    pointer-events: none;
+  }
 
   .result {
     .avatarWrap {
@@ -235,6 +249,8 @@
         height: 52px;
         border-radius: 16px;
         border: 1px solid rgba(0, 0, 0, 0.06);
+        background: #fff;
+        box-shadow: 0 8px 64px 0 rgba(0, 0, 0, 0.1);
         overflow: hidden;
         position: relative;
 
@@ -258,6 +274,16 @@
             font-style: normal;
             font-weight: 600;
             line-height: normal;
+
+            &.primary {
+              color: #fff;
+              background: #000;
+
+              .arrowImage {
+                width: 20px;
+                height: 20px;
+              }
+            }
           }
         }
 
@@ -363,8 +389,23 @@
 .testContainer {
   width: 100vw;
   height: 100vh;
-  background: radial-gradient(227.15% 100% at 50% 0%, #bfffef 0%, #fff 36.58%),
+  background-repeat: no-repeat;
-    #fafafa;
+  background-size: cover;
+  background-position: center;
+  position: relative;
+
+  &::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(227.15% 100% at 50% 0%, #bfffef 0%, #fff 36.58%),
+      #fafafa;
+    z-index: -1;
+    pointer-events: none;
+  }
 
   .bar {
     margin: 12px 20px 36px;

src/other_pages/ntrp-evaluate/index.tsx

@@ -223,7 +223,12 @@ function Intro() {
   }
 
   return (
-    <View className={styles.introContainer}>
+    <View
+      className={styles.introContainer}
+      style={{
+        backgroundImage: `url(${OSS_BASE_URL}/images/215f1ce1-be52-4a92-8250-5a4a69e7f2b3.png)`,
+      }}
+    >
       <CommonGuideBar />
       {ntrpData?.has_test_record ? (
         <View className={styles.result}>
@@ -271,7 +276,7 @@ function Intro() {
             </View>
           </View>
           <View className={styles.actions}>
-            <View className={styles.buttonWrap}>
+            <View className={classnames(styles.buttonWrap, styles.customBtn)}>
               <Button
                 className={classnames(styles.button, styles.primary)}
                 type="primary"
@@ -280,6 +285,12 @@ function Intro() {
                 <Text>再次测试</Text>
                 <Image className={styles.arrowImage} src={ArrowRight} />
               </Button>
+              <View
+                className={classnames(styles.customBtnCover, styles.primary)}
+              >
+                <Text>再次测试</Text>
+                <Image className={styles.arrowImage} src={ArrowRight} />
+              </View>
             </View>
             <View className={classnames(styles.buttonWrap, styles.customBtn)}>
               <Button
@@ -414,7 +425,12 @@ function Test() {
     return "";
   }
   return (
-    <View className={styles.testContainer}>
+    <View
+      className={styles.testContainer}
+      style={{
+        backgroundImage: `url(${OSS_BASE_URL}/images/215f1ce1-be52-4a92-8250-5a4a69e7f2b3.png)`,
+      }}
+    >
       <CommonGuideBar confirm title={`${index + 1} / ${questions.length}`} />
       <View className={styles.bar}>
         <View