Browse Source

Merge branch 'feature/分享好友赚星币修改活动按钮' of Software/android-cloud-H5 into develop

zengzhixiang 2 years ago
parent
commit
dd4d194a92
3 changed files with 11 additions and 3 deletions
  1. 1 0
      package.json
  2. 4 3
      pages/activity/invite-user/index.vue
  3. 6 0
      pnpm-lock.yaml

+ 1 - 0
package.json

@@ -31,6 +31,7 @@
     "core-js": "^3.19.3",
     "dayjs": "^1.11.3",
     "format-number": "^3.0.0",
+    "jmuxer": "^2.0.4",
     "jsencrypt": "^3.2.1",
     "jweixin-module": "^1.6.0",
     "normalize.css": "^8.0.1",

+ 4 - 3
pages/activity/invite-user/index.vue

@@ -12,9 +12,10 @@
           <div class="cybz-content-text-item">邀请购买云机</div>
           <div class="cybz-content-text-item">返星币换现金</div>
         </div>
-        <v-btn class="share-button" rounded @click="share()"
-          >分享好友赚星币</v-btn
-        >
+        <v-btn class="share-button" rounded @click="share()">
+          <template v-if="$userAgent.isApp">分享好友赚星币</template>
+          <template v-else>复制链接分享好友赚星币</template>
+        </v-btn>
         <!-- <button @click="share()">邀请</button> -->
       </div>
       <!-- <div class="h-40">13</div> -->

+ 6 - 0
pnpm-lock.yaml

@@ -28,6 +28,7 @@ specifiers:
   eslint-plugin-nuxt: ^3.1.0
   eslint-plugin-vue: ^8.2.0
   format-number: ^3.0.0
+  jmuxer: ^2.0.4
   jsencrypt: ^3.2.1
   jweixin-module: ^1.6.0
   less: ^4.1.3
@@ -66,6 +67,7 @@ dependencies:
   core-js: 3.22.7
   dayjs: 1.11.4
   format-number: 3.0.0
+  jmuxer: 2.0.4
   jsencrypt: 3.2.1
   jweixin-module: 1.6.0
   normalize.css: 8.0.1
@@ -6962,6 +6964,10 @@ packages:
     resolution: {integrity: sha512-4IwstlaKQc9vCTC+qUXLM1hajy2ImiL9KnLvVYiaHOtS/v3wRjhLlGl121AmgDgx/O43uKmxownJghS5XMya2A==}
     hasBin: true
 
+  /jmuxer/2.0.4:
+    resolution: {integrity: sha512-deIhbfmKufhVVJA2ydXm12F/EXZyG7dxiU0hWvDjAd8J8j3Mzs0S48Uv2+iG5wsWjEFgLyQQ4wb4+EH2/eNXMA==}
+    dev: false
+
   /jpeg-js/0.2.0:
     resolution: {integrity: sha512-Ni9PffhJtYtdD7VwxH6V2MnievekGfUefosGCHadog0/jAevRu6HPjYeMHbUemn0IPE8d4wGa8UsOGsX+iKy2g==}
     dev: true