commit

src/pages/composite/img.vue

@@ -215,7 +215,6 @@ export default {
       //获取盒子的大小
       const boxW = this.$refs.maskBox.clientWidth
       const boxH = this.$refs.maskBox.clientHeight
-
       if (realWidth >= realHeight) {
         this.imgH = hwRatio * boxW
         const nih = this.imgH
@@ -228,7 +227,8 @@ export default {
         this.top = (boxH - this.imgH) / 2
         this.left = (boxW - this.imgW) / 2
       } else {
-        this.imgW = (boxH / realHeight) * realWidth
+        // this.imgW = (boxH / realHeight) * realWidth
+        this.imgW = realWidth
         this.imgH = boxH
         this.left = (boxW - this.imgW) / 2
       }

src/pages/composite/index.vue

@@ -31,7 +31,7 @@
           @click="handleacibe(item, index)"
           :key="index"
         >
-          <img :src="item.img" alt="" />
+          <img :src="item.sltImg" alt="" />
           <!-- <div>{{ item.name }}</div> -->
         </div>
       </div>
@@ -121,27 +121,33 @@ export default {
       list: [
         {
           name: '黑白',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/03@2x.png'
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/03@2x.png',
+          sltImg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/03.png'
         },
         {
           name: '黑白',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/01@2x.png'
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/01@2x.png',
+          sltImg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/01.png'
         },
         {
           name: '黑白',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/02@2x.png'
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/02@2x.png',
+          sltImg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/02.png'
         },
         {
           name: '黑白',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/04@2x.png'
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/04@2x.png',
+          sltImg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/04.png'
         },
         {
           name: '黑白',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/05@2x.png'
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/05@2x.png',
+          sltImg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/05.png'
         },
         {
           name: '黑白',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/06@2x.png'
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/06@2x.png',
+          sltImg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/06.png'
         }
       ]
     }

src/pages/home/index.vue

@@ -248,7 +248,8 @@ export default {
       // uni.$u.route("/pages/home/map");
     },
     handleRoam() {
-      Toast('功能开发中~');
+      // Toast('功能开发中~');url
+      this.$router.replace('/url')
       // uni.$u.route("/pages/home/roam");
     },
     handleItem(item) {

src/pages/prayers/list.vue

@@ -204,7 +204,7 @@ export default {
   created() {
     this.getRequest('/api/wx/pray/check',).then(res => {
       console.log('res', res)
-      if(res){
+      if(res.data){
         this.$router.replace('/prayers/show')
       }
     })

src/pages/web/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="dcs">
     <!-- <div><button @click="changeChild">点击改变子组件参数</button></div> -->
     <iframe ref="child" :src="url" width="100%" height="100%" scrolling="no" frameborder="0">
     </iframe>
@@ -22,8 +22,8 @@
           <div class="flex justify-between shareImg">
             <div class="code">
               <img
-               style="width: 66px;height: 66px"
-                src="https://4dscene.4dage.com/new4dkk/deng/static/img/icon_scan_active@2x.png"
+               style="width: 66px;height: 66px;margin-left: 5px;"
+                src="https://4dscene.4dage.com/new4dkk/deng/static/img/code/gzhcode.png"
               ></img>
             </div>
             <div class="zz">
@@ -55,9 +55,9 @@ import { mapState } from 'vuex'
 export default {
   data() {
     return {
-      url: 'https://sit-nanhuacs.4dage.com/show/index.html?m=SG-w51bY2f2Ojj&lang=zh',
+      url: 'https://sit-nanhuacs.4dage.com/show/index.html?m=SG-PHP2F5mD35e&lang=zh',
       number: 0,
-      showShare: true
+      showShare: false
     }
   },
   computed: {
@@ -171,4 +171,8 @@ export default {
     }
   }
 }
+.dcs{
+  height: 100vh !important;
+
+}
 </style>