Browse Source

Merge branch 'develop' of Software/android-cloud-H5 into release/v5.4.1

zengzhixiang 2 years ago
parent
commit
54a8b6d2d0

+ 9 - 0
app.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html {{ HTML_ATTRS }}>
+  <head {{ HEAD_ATTRS }}>
+    {{ HEAD }}
+  </head>
+  <body {{ BODY_ATTRS }}>
+    {{ APP }}
+  </body>
+</html>

BIN
assets/image/activity/invite-user/bg-3@2x.png


+ 4 - 0
assets/style/main.scss

@@ -4,4 +4,8 @@ html {
   // * {
   //   box-sizing: inherit;
   // }
+  // overscroll-behavior-y: contain;
+}
+body {
+  // overscroll-behavior-y: contain;
 }

+ 3 - 0
modules/postcss-px-to-viewport.js

@@ -12,8 +12,11 @@ export default function () {
     buildOptions.postcss.plugins = buildOptions.postcss.plugins || {};
 
     buildOptions.postcss.plugins['postcss-px-to-viewport'] = {
+      unitToConvert: 'px',
       viewportWidth: 375,
       unitPrecision: 10,
+      viewportUnit: 'vw',
+      mediaQuery: false,
     };
   });
 }

+ 1 - 2
package.json

@@ -74,8 +74,7 @@
     "postcss": "^8",
     "postcss-html": "^1.3.0",
     "postcss-loader": "^4",
-    "postcss-px-to-viewport": "^1.1.1",
-    "postcss-px-to-viewport-8-plugin": "^1.1.5",
+    "postcss-px-to-viewport": "github:evrone/postcss-px-to-viewport#master",
     "prettier": "^2.5.1",
     "stylelint": "^14.1.0",
     "stylelint-config-prettier": "^9.0.3",

+ 29 - 10
pages/activity/invite-user/index.vue

@@ -2,14 +2,15 @@
   <v-container class="invite-user" fluid :class="`bg-${type}`">
     <activity-invite-user-box class="box1">
       <template #title>参与步骤</template>
-      <v-img class="cybz-content" :src="contentImg" />
+      <v-img
+        class="cybz-content"
+        :src="returnContent ? returnContent.img : null"
+      />
       <div class="cybz-content-text">
         <div class="cybz-content-text-item">分享好友</div>
         <div class="cybz-content-text-item">邀请购买云机</div>
         <div class="cybz-content-text-item">
-          <template v-if="type === 1">返星币换现金</template>
-          <template v-else-if="type === 2">返云手机时长</template>
-          <template v-else-if="type === 3">返积分</template>
+          {{ returnContent ? returnContent.content : '' }}
         </div>
       </div>
       <v-btn class="share-button" rounded @click="share()">
@@ -221,13 +222,32 @@ export default {
     // },
   },
   computed: {
-    contentImg() {
+    returnContent() {
       return {
-        1: require('@/assets/image/activity/invite-user/cybz-content@2x.png'),
-        2: require('@/assets/image/activity/invite-user/cybz-content-2@2x.png'),
-        3: require('@/assets/image/activity/invite-user/cybz-content-3@2x.png'),
+        1: {
+          img: require('@/assets/image/activity/invite-user/cybz-content@2x.png'),
+          content: '返星币换现金',
+        },
+        2: {
+          img: require('@/assets/image/activity/invite-user/cybz-content-2@2x.png'),
+          content: '返云机时长',
+        },
+        3: {
+          img: require('@/assets/image/activity/invite-user/cybz-content-3@2x.png'),
+          content: '返积分',
+        },
       }[this.type];
     },
+    // contentImg() {
+    //   return {
+    //     1: require('@/assets/image/activity/invite-user/cybz-content@2x.png'),
+    //     2: require('@/assets/image/activity/invite-user/cybz-content-2@2x.png'),
+    //     3: require('@/assets/image/activity/invite-user/cybz-content-3@2x.png'),
+    //   }[this.type];
+    // },
+    // returnContent() {
+    //   return { 1: '返星币换现金', 2: '返云机时长', 3: '返积分' }[this.type];
+    // },
     codeHasMore() {
       return (
         this.codeTotal < 0 ||
@@ -333,7 +353,7 @@ export default {
       }
       return {
         title: '双子星APP',
-        desc: '分享好友购买云机套餐,返星币换现金',
+        desc: `分享好友购买云机套餐,${this.returnContent?.content}`,
         link: this.shareUrl,
         imgUrl: location.origin + require('~/assets/image/logo.png'),
       };
@@ -472,7 +492,6 @@ export default {
   // padding-bottom: 30px;
   padding-bottom: env(safe-area-inset-bottom, 30px);
   background-color: #9525e3;
-
   &.bg-1 {
     background-image: url('~/assets/image/activity/invite-user/bg@2x.png');
   }

+ 14 - 17
pnpm-lock.yaml

@@ -42,8 +42,7 @@ specifiers:
   postcss: ^8
   postcss-html: ^1.3.0
   postcss-loader: ^4
-  postcss-px-to-viewport: ^1.1.1
-  postcss-px-to-viewport-8-plugin: ^1.1.5
+  postcss-px-to-viewport: github:evrone/postcss-px-to-viewport#master
   prettier: ^2.5.1
   stylelint: ^14.1.0
   stylelint-config-prettier: ^9.0.3
@@ -115,8 +114,7 @@ devDependencies:
   postcss: 8.4.16
   postcss-html: 1.4.1
   postcss-loader: 4.3.0_yqfl5gugdirklt5o2w2kmcv77i
-  postcss-px-to-viewport: 1.1.1
-  postcss-px-to-viewport-8-plugin: 1.1.5
+  postcss-px-to-viewport: github.com/evrone/postcss-px-to-viewport/9d6c5cee5eea367fb4c7cf0c3bb1117979b5fbf4_postcss@8.4.16
   prettier: 2.6.2
   stylelint: 14.8.5
   stylelint-config-prettier: 9.0.3_stylelint@14.8.5
@@ -9369,19 +9367,6 @@ packages:
       postcss-selector-parser: 5.0.0
     dev: false
 
-  /postcss-px-to-viewport-8-plugin/1.1.5:
-    resolution: {integrity: sha512-qM6x2NyGbRj8R15o/LCbw5hacU+XK1s80zTvWgLjHsOP8B9P1KbDZbNS11BG6/WPut8LR8DvEU5iKw8JnQn9MQ==}
-    dependencies:
-      object-assign: 4.1.1
-    dev: true
-
-  /postcss-px-to-viewport/1.1.1:
-    resolution: {integrity: sha512-2x9oGnBms+e0cYtBJOZdlwrFg/mLR4P1g2IFu7jYKvnqnH/HLhoKyareW2Q/x4sg0BgklHlP1qeWo2oCyPm8FQ==}
-    dependencies:
-      object-assign: 4.1.1
-      postcss: 8.4.16
-    dev: true
-
   /postcss-reduce-initial/4.0.3:
     resolution: {integrity: sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==}
     engines: {node: '>=6.9.0'}
@@ -12274,3 +12259,15 @@ packages:
   /yocto-queue/0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
+
+  github.com/evrone/postcss-px-to-viewport/9d6c5cee5eea367fb4c7cf0c3bb1117979b5fbf4_postcss@8.4.16:
+    resolution: {tarball: https://codeload.github.com/evrone/postcss-px-to-viewport/tar.gz/9d6c5cee5eea367fb4c7cf0c3bb1117979b5fbf4}
+    id: github.com/evrone/postcss-px-to-viewport/9d6c5cee5eea367fb4c7cf0c3bb1117979b5fbf4
+    name: postcss-px-to-viewport
+    version: 1.1.1
+    peerDependencies:
+      postcss: '>=5.0.2'
+    dependencies:
+      object-assign: 4.1.1
+      postcss: 8.4.16
+    dev: true