Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
tangdehang
/
android-cloud-H5
Tarkkaile 1
Äänestä 0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

Merge branch 'release/v5.4.1'

zengzhixiang 2 vuotta sitten
vanhempi
fdc8bbcc60 982d6b6248
commit
65def024ee
5 muutettua tiedostoa jossa 65 lisäystä ja 5 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 60 0
      pages/agreement/_code.vue
  2. 2 2
      static/microserviceUserH5/vcloud/actFission.html
  3. 1 1
      static/microserviceUserH5/vcloud/actFissionList.html
  4. 1 1
      static/microserviceUserH5/vcloud/actFissionShare.html
  5. 1 1
      static/microserviceUserH5/vcloud/register.html

+ 60 - 0
pages/agreement/_code.vue
Näytä tiedosto 

@@ -0,0 +1,60 @@
 
+<template lang="">
 
+  <div class="agreement" :class="{ dark }">
 
+    <!-- eslint-disable-next-line vue/no-v-html -->
 
+    <div class="content-wrap p-4" v-html="content"></div>
 
+  </div>
 
+</template>
 
+<script>
 
+export default {
 
+  name: 'Agreement',
 
+  auth: false,
 
+  data() {
 
+    return {
 
+      data: {
 
+        title: '',
 
+        content: '',
 
+      },
 
+      dark: false,
 
+    };
 
+  },
 
+  async fetch() {
 
+    const agreementCoding = this.$route.params.code;
 
+    if (this.$route.query.dark === 'true') {
 
+      this.dark = true;
 
+    }
 
+    const res = await this.$axios.$get(
 
+      '/public/v5/agreementApi/content/getContentByType',
 
+      {
 
+        params: {
 
+          agreementCoding,
 
+          type: 1,
 
+        },
 
+      },
 
+    );
 
+    this.data = res.data;
 
+  },
 
+  computed: {
 
+    content() {
 
+      return this.data.content
 
+        .replace(/[\d\D]*<body>([\d\D]+)<\/body>[\d\D]*/i, '$1')
 
+        .replace(/<div class="phone-container">([\d\D]+)<\/div>/g, '$1');
 
+    },
 
+  },
 
+};
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+.agreement {
 
+  min-height: 100vh;
 
+  box-sizing: border-box;
 
+  padding-bottom: env(safe-area-inset-bottom, 0px);
 
+  background-color: #fff;
 
+  color: #333;
 
+  &.dark {
 
+    background-color: #000;
 
+    color: #ccc;
 
+  }
 
+}
 
+.content-wrap {
 
+}
 
+</style>

+ 2 - 2
static/microserviceUserH5/vcloud/actFission.html
Näytä tiedosto 

@@ -329,7 +329,7 @@
 
 				<div class="select-title">选择你要分享的内容</div>
 
 				<div class="select-list">
 
 					<div v-for="(item,index) in tagList" :key="index" @click="toDetail(item)">
 
-						<img :src="fileCenterApi + `/document/newFile/download/0/347905r86eb745a1sc38?fileKey=${item.cover}`" class="icon" alt="">
 
+						<img :src="fileCenterApi + `/document/newFile/download/0/${uploadKey}?fileKey=${item.cover}`" class="icon" alt="">
 
 					</div>
 
 				</div>
 
 			</div>
 
@@ -487,7 +487,7 @@
 
 
 				},
 
 				standarImg(id) {
 
-					return `${fileCenterApi}/document/newFile/download/0/347905r86eb745a1sc38?fileKey=${id}`;
 
+					return `${fileCenterApi}/document/newFile/download/0/${uploadKey}?fileKey=${id}`;
 
 				},
 
 				getShare() {
 
 					systemBuriedPoint({

+ 1 - 1
static/microserviceUserH5/vcloud/actFissionList.html
Näytä tiedosto 

@@ -79,7 +79,7 @@
 
 		<van-list v-model="loading" :finished-text="finishedText" :finished="finished"
 
 			:immediate-check=false @load="onLoad">
 
 			<div v-for="(item,index) in tagList" :key="index" class="item" @click="toDetail(item)">
 
-				<img :src="fileCenterApi + `/document/newFile/download/0/347905r86eb745a1sc38?fileKey=${item.fileId}`" class="icon" alt="">
 
+				<img :src="fileCenterApi + `/document/newFile/download/0/${uploadKey}?fileKey=${item.fileId}`" class="icon" alt="">
 
 				<div class="right">
 
 					<div class="titles">{{item.strategyTitle}}</div>
 
 					<div class="contents">{{getContent(index,item.content)}}</div>

+ 1 - 1
static/microserviceUserH5/vcloud/actFissionShare.html
Näytä tiedosto 

@@ -786,7 +786,7 @@
 
                     }
 
                 },
 
                 standarImg(id) {
 
-                    return `${fileCenterApi}/document/newFile/download/0/347905r86eb745a1sc38?fileKey=${id}`;
 
+                    return `${fileCenterApi}/document/newFile/download/0/${uploadKey}?fileKey=${id}`;
 
                 },
 
                 getMarquee() {
 
                     getMarquee().then(res => {

+ 1 - 1
static/microserviceUserH5/vcloud/register.html
Näytä tiedosto 

@@ -187,7 +187,7 @@
 
     function getHead(fileId) {
 
       $('.head img').attr('src', '../static/img/invite/header-img.png');
 
       if (fileId) {
 
-        $('.head img').attr('src', `${fileCenterApi}/document/newFile/download/0/347905r86eb745a1sc38?fileKey=${fileId}`);
 
+        $('.head img').attr('src', `${fileCenterApi}/document/newFile/download/0/${uploadKey}?fileKey=${fileId}`);
 
       }
 
     }
 
     function encrypt(word, keyStr) {