commit

public/index.html

@@ -7,7 +7,7 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <meta name="viewport" content="viewport-fit=cover">
     <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
-    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+    <!-- <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script> -->
     <script src="https://gitee.com/dcloud/uni-app/raw/dev/dist/uni.webview.1.5.3.js"></script>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover, user-scalable=0">
     <title>南华灯会</title>
@@ -27,6 +27,6 @@
   
 <script>
   // VConsole 默认会挂载到 `window.VConsole` 上
-  var vConsole = new window.VConsole();
+  // var vConsole = new window.VConsole();
 </script>
 </html>

src/api/request.js

@@ -30,7 +30,6 @@ axios.interceptors.response.use(function (response) {
     if (response.data.code == 5001 || response.data.code == 5002 || response.data.msg === 'redis token is null') {
       //未登录
       Toast.fail("登录信息已失效，请重新登录");
-      console.log(wx, "登录信息已失效，请重新登录");
       setTimeout(() => {
       wx.miniProgram.navigateTo({
         url: '/pages/home/index'
@@ -39,6 +38,7 @@ axios.interceptors.response.use(function (response) {
     }
     if (parseInt(response.data.code) === -1) {
       Toast.fail(response.data.msg);
+      return Promise.reject(response.data);
       // Toast.fail("请求失败");
     }
   }

src/components/tabbar/index.vue

@@ -91,6 +91,27 @@
           </div>
         </div>
     </van-popup>
+    <van-popup
+      closeIconPos="bottom-right"
+      v-model="showOperation"
+      position="center"
+      round
+      @close="czzyclose"
+      bgColor="transparent"
+      style="background: transparent"
+    >
+    <div class="codeData">
+      <div class="close" @click="czzyclose">
+          <img
+            width="42px"
+            height="42px"
+            src="/static/img/icon_cancel@2x.png"
+          ></img>
+        </div>
+    <!-- <van-dialog v-model="showOperation" :width="'calc(100vw - 20px)'" @confirm="handleConfirm" title="操作指引"> -->
+      <img style="width: 100%;" src="https://4dscene.4dage.com/new4dkk/deng/static/img/czzy.png" />
+    </div>
+    </van-popup>
   </div>
 </template>
 
@@ -100,7 +121,7 @@ import QRCode from 'qrcodejs2'
 import wx from 'weixin-js-sdk'
 import { Toast } from 'vant'
 import Bus from '@/utils/bus.js'
-
+import { Dialog } from 'vant'
 // import QiyanQrcode from '@/components/qiyan-qrcode/qiyan-qrcode.vue'
 // import uButton from "udiv-ui/components/u-button/u-button.vue";
 export default {
@@ -110,21 +131,22 @@ export default {
   data() {
     return {
       show: false,
+      showOperation: false,
       qrcode1: null,
       qrcode2: null,
-      codeImg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/01.png',
+      codeImg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/01@2x.png',
       title1: '1.现在时间戳：' + Date.now(),
-      codeListok:[],
-      codeList:{
-        code1: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/01.png',
-        code2: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/02.png',
-        code3: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/04.png',
-        code4: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/05.png',
-        code5: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/06.png',
-        code6: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/07.png',
-        code7: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/11.png',
-        code8: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/12.png',
-        code9: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/13.png',
+      codeListok: [],
+      codeList: {
+        code1: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/01@2x.png',
+        code2: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/02@2x.png',
+        code3: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/03@2x.png',
+        code4: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/04@2x.png',
+        code5: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/05@2x.png',
+        code6: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/06@2x.png',
+        code7: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/07@2x.png',
+        code8: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/08@2x.png',
+        code9: 'https://4dscene.4dage.com/new4dkk/deng/static/img/code/09@2x.png'
       },
       list: [
         {
@@ -160,7 +182,7 @@ export default {
           light: '/static/img/icon_lotus_light@2x.png',
           name: '点亮',
           path: '/prayers/clocked'
-        },
+        }
         // {
         //   active: '/static/img/icon_user_active@2x.png',
         //   dark: '/static/img/icon_user_dark@2x.png',
@@ -175,7 +197,7 @@ export default {
   computed: {
     ...mapState('home', ['active']),
     handleType() {
-      return this.$route.name == 'PrayersClocked'? true : false
+      return this.$route.name == 'PrayersClocked' ? true : false
     }
   },
   watch: {
@@ -200,25 +222,30 @@ export default {
     // })
   },
   methods: {
+    czzyclose(){
+      this.showOperation = false
+      localStorage.setItem('isShow', true)
+      this.handlescanQRCode()
+    },
     getloadlist() {
-      this.getRequest('/api/wx/getCode').then((res) => {
+      this.getRequest('/api/wx/getCode').then(res => {
         this.codeListok = res.data || []
       })
-     },
+    },
     handleItem(item, index) {
-      let obj = { 
-        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=1':this.codeList.code1,
-        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=2':this.codeList.code2,
-        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=3':this.codeList.code3,
-        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=4':this.codeList.code4,
-        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=5':this.codeList.code5,
-        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=6':this.codeList.code6,
-        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=7':this.codeList.code7,
-        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=8':this.codeList.code8,
-        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=9':this.codeList.code9,
-        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=10':this.codeList.code9,
-       };
-      //  let objclockIn = { 
+      let obj = {
+        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=1': this.codeList.code1,
+        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=2': this.codeList.code2,
+        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=3': this.codeList.code3,
+        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=4': this.codeList.code4,
+        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=5': this.codeList.code5,
+        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=6': this.codeList.code6,
+        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=7': this.codeList.code7,
+        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=8': this.codeList.code8,
+        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=9': this.codeList.code9,
+        'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=10': this.codeList.code9
+      }
+      //  let objclockIn = {
       //   'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=1':'SG-PHP2F5mD35e',
       //   'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=2':'SG-PHP2F5mD35e',
       //   'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=3':'SG-PHP2F5mD35e',
@@ -233,52 +260,9 @@ export default {
       let that = this
       if (item.name == '扫码打卡') {
         // 只允许通过相机扫码
-        // uni.scanCode({
-        //   onlyFromCamera: true,
-        //   success: function (res) {
-        //     console.log('条码类型：' + res.scanType)
-        //     console.log('条码内容：' + res.result)
-        // wx.miniProgram.postMessage({ data: { foo: 'scanCode', type: 'tabbar' } })
-        // wx.miniProgram.navigateTo({
-        //   url: '/pages/my/index?scanCode=true'
-        // })
-        // that.show = true
-        // that.$store.commit('home/changeActive', index)
-        // setTimeout(() => {
-        //   this.creatQrCode()
-        // }, 200)
-        //   },
-        //   fail: function (e) {
-        //     console.log('扫码失败', e)
-        //     that.show = true
-        //   }
-        // })
-        wx.scanQRCode({
-          needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-          scanType: ["qrCode","barCode"], // 可以指定扫二维码还是一维码，默认二者都有
-          success: function (res) {
-            console.log(res, 'scanQRCode');
-            var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
-            if(!result || (result && result.indexOf('https://houseoss.4dkankan.com/project/nanHua/index.html') == -1)){
-              return Toast('无效二维码')
-            }
-            if(result == 'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=10'){//线下祈福
-              that.$router.push('/prayers/list')
-              return 
-            }
-            that.show = true;
-            that.codeImg = obj[result];
-            // that.$store.commit("changeActive", index);
-            if(!that.codeListok.includes(result)){
-              that.getRequest('/api/wx/clockIn', {code: result}).then(res => {
-                Bus.emit('handleItem', result)
-                that.getloadlist()
-              })
-            }
-          }
-        });
+        that.handleCode()
         return
-      }else if (item.name == '我的') {
+      } else if (item.name == '我的') {
         this.$store.commit('home/changeActive', 4)
         wx.miniProgram.navigateTo({
           url: '/pages/my/index',
@@ -287,12 +271,71 @@ export default {
         return
       }
       console.log('handleItem', item, index, this.active)
-      if(this.active == index) return
+      if (this.active == index) return
       // that.$store.commit('home/changeActive', index)
       if (item.path) {
         this.$router.push(item.path)
       }
     },
+    handleConfirm() {
+      this.showOperation = false
+      this.handlescanQRCode()
+    },
+    handlescanQRCode() {
+      console.log('handlescanQRCode')
+      let that = this
+      wx.scanQRCode({
+        needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+        scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
+        success: function (res) {
+          console.log(res, 'scanQRCode')
+          var result = res.resultStr // 当needResult 为 1 时，扫码返回的结果
+          if (
+            !result ||
+            (result &&
+              result.indexOf('https://houseoss.4dkankan.com/project/nanHua/index.html') == -1)
+          ) {
+            return Toast('无效二维码')
+          }
+          if (result == 'https://houseoss.4dkankan.com/project/nanHua/index.html#/code?m=10') {
+            //线下祈福
+            that.$router.push('/prayers/list')
+            return
+          }
+          that.show = true
+          that.codeImg = obj[result] + '?m=' + new Date().getTime()
+          // that.$store.commit("changeActive", index);
+          if (!that.codeListok.includes(result)) {
+            Toast('打卡成功')
+            that.getRequest('/api/wx/clockIn', { code: result }).then(res => {
+              Bus.emit('handleItem', result)
+              that.getloadlist()
+            })
+          } else {
+            Toast('已打卡')
+          }
+        }
+      })
+    },
+    handleCode() {
+      let that = this
+      let isShow = localStorage.getItem('isShow')
+      if (isShow) {
+        this.handlescanQRCode()
+      } else {
+        this.showOperation = true
+      }
+      // Dialog.confirm({
+      //   title: '温馨提示',
+      //   message: '是否查看操作指引',
+      // })
+      //   .then(() => {
+      //     that.$router.push('/prayers/operation')
+      //   })
+      //   .catch(() => {
+      //     that.handlescanQRCode()
+      //   });
+    },
     handleHome() {
       console.log('开启云上观灯', uni)
       // uni.$u.route('/pages/home/home')
@@ -302,7 +345,7 @@ export default {
     },
     handleqiyuan() {
       this.show = false
-      this.$router.push('/prayers/list')
+      this.$router.push('/prayers/clocked')
     },
     close() {
       console.log('close', this.qrcode1, this.qrcode2)
@@ -384,7 +427,7 @@ export default {
 }
 .dark {
   background-image: url(https://4dscene.4dage.com/new4dkk/deng/static/img/menu_dark@2x.png);
-  .tabbarItem{
+  .tabbarItem {
     color: #fff;
   }
 }
@@ -446,7 +489,7 @@ export default {
     position: absolute;
     right: -0px;
     top: -0px;
-    img{
+    img {
       width: 42px;
       height: 42px;
     }

src/pages/composite/index.vue

@@ -255,7 +255,7 @@ export default {
     },
     // 使用vuex读取state
     handleVueX() {
-      console.log(this.$store.state.base.b)
+      // console.log(this.$store.state.base.b)
     },
     // 使用mapState映射vuex
     handleMapState() {

src/pages/home/index.vue

@@ -20,7 +20,7 @@
                     width="209px"
                     height="131px"
                     radius="10"
-                    :src="'https://4dscene.4dage.com/new4dkk/deng/static/img/m/cjms.jpg'||item.img"
+                    :src="item.img"
                   ></img>
                   <div class="title">{{ item.title }}</div>
                 </div>
@@ -28,7 +28,7 @@
                   class="flex justify-evenly butList content-center items-center"
                   style="line-height: 24px; color: #fff"
                 >
-                  <div class="flex justify-around content-center  items-center" @click="handleRoam">
+                  <div class="flex justify-around content-center  items-center" @click="handleRoam(item.m)">
                     <img src="https://4dscene.4dage.com/new4dkk/deng/static/img/icon_3d@2x.png" />
                     漫游
                   </div>
@@ -133,49 +133,53 @@ export default {
       active: null,
       list: [
         {
-          id: 1,
-          title: '大雄宝殿',
-          m: 'SG-PHP2F5mD35e',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m/02.png',
+          id: 6,
+          title: '憨山大师系列',
+          m: 'SG-GadEtPyVUvN',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/06.png',
           style: {
             left: '315px',
             top: '326px',
+            height: '145px',
+            paddingTop: '10px'
           }
         },{
-          id: 8,
-          title: '灵照塔',
-          m: 'SG-PHP2F5mD35e',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m/02.png',
+          id: 7,
+          title: '六祖坛经',
+          m: 'SG-5eNn5iZnzej',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/07.png',
           style: {
             left: '373px',
             top: '260px',
           }
         },
         {
-          id: 2,
-          title: '宝林道场',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m/01.png',
-          m: 'SG-OMcbiNUQwPE',
+          id: 8,
+          title: '菩提本无树',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/08.png',
+          m: 'SG-McyGGua70BH',
           style: {
-            left: '355px',
-            top: '114px'
+            left: '265px',
+            top: '495px',
+            height: '125px',
+            paddingTop: '10px'
           }
         },
         {
-          id: 3,
+          id: 4,
           title: '琉璃光如来',
-          m: 'SG-E3S63H7X7QI',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m/03.png',
+          m: 'SG-CU5JTIjXXs0',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/04.png',
           style: {
             left: '317px',
             top: '570px'
           }
         },
         {
-          id: 4,
+          id: 3,
           title: '祈福长廊',
-          m: 'SG-7uj9R1IZNsp',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m/05.png',
+          m: 'SG-E3S63H7X7QI',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/03.png',
           style: {
             left: '354px',
             top: '660px'
@@ -184,11 +188,12 @@ export default {
         {
           id: 5,
           title: '典藏罗汉像',
-          m: 'SG-zlWvkf1WATJ',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m/06.png',
+          m: 'SG-nfYaok3HBhG',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/05.png',
           style: {
             left: '349px',
-            top: '455px'
+            top: '455px',
+            height: '125px',
           }
         },
         // {
@@ -199,30 +204,30 @@ export default {
         //   style: {}
         // },
         {
-          id: 7,
+          id: 9,
           title: '文化长廊',
-          m: 'SG-w51bY2f2Ojj',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m/11.png',
+          m: 'SG-RWc2zM63H5g',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/09.png',
           style: {
             left: '531px',
             top: '467px',
           }
         },
         {
-          id: 9,
+          id: 1,
           title: '一花五叶',
-          m: 'SG-w51bY2f2Ojj',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m/11.png',
+          m: 'SG-PHP2F5mD35e',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/01.png',
           style: {    
             left: '353px',
             top: '798px'
           }
         },
         {
-          id: 10,
+          id: 2,
           title: '智药三藏寻源',
-          m: 'SG-w51bY2f2Ojj',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m/11.png',
+          m: 'SG-SBAYwluXbtk',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/02.png',
           style: {    
             left: '323px',
             top: '750px',
@@ -242,14 +247,15 @@ export default {
   mounted() {
     // document.getElementById('d1').scrollTop=100;//通过scrollTop设置滚动到100位置
     document.getElementById('home-img').scrollLeft=150;//通过scrollTop设置滚动到200位置
+    document.getElementById('home-img').scrollTop=150;//通过scrollTop设置滚动到200位置
   },
   methods: {
     handleMap() {
       // uni.$u.route("/pages/home/map");
     },
-    handleRoam() {
+    handleRoam(m) {
       // Toast('功能开发中~');url
-      this.$router.replace('/url')
+      this.$router.replace('/url?m=' + m)
       // uni.$u.route("/pages/home/roam");
     },
     handleItem(item) {

src/pages/home/map.vue

@@ -24,9 +24,9 @@
       <div class="list">
         <vue-seamless-scroll :data="list" class="wrap">
         <div class="listItem" v-for="item in list" :key="item.id">
-          {{item.creatorName}}
+          <!-- {{item.creatorName}} -->
           <span style="color: #7EE3DE">【{{item.province}}】</span>
-          {{item.name}}
+          {{item.content}}
         </div>
       </vue-seamless-scroll>
       </div>
@@ -126,8 +126,11 @@ export default {
         font-size: 12px;
         color: #ffffff;
         line-height: 14px;
-        text-align: center;
+        text-align: left;
         font-style: normal;
+        overflow:hidden; //超出的文本隐藏
+        text-overflow:ellipsis; //溢出用省略号显示
+        white-space:nowrap; //溢出不换行;
       }
     }
   }

src/pages/prayers/clocked.vue

@@ -73,43 +73,48 @@
       @close="close"
       @open="open"
     >
-      <div class="sharePop" ref="downDiv">
-        <div class="codeData">
-          <img :src="img" class="showImgbase64" alt="">
-        <div class="close" @click="showShare = false">
+    <div class="close" @click="showShare = false">
           <img
             width="42px"
             height="42px"
             src="/static/img/icon_cancel@2x.png"
           ></img>
         </div>
+        <img class="img shareimg" :src="active && active.shareimg" alt="">
+        <div class="codebutList">
+          <div class="downText">
+            <div class="img flex justify-center items-center">
+              <div class="pl-10px">长按保存图片</div>
+            </div>
+          </div>
+        </div>
+      <!-- <div class="sharePop" ref="downDiv">
+        <div class="codeData">
+          <img :src="img" class="showImgbase64" alt="">
         <img class="huaimg" :src="active && active.img" alt="">
         <div class="text">
           <div class="textContent">
             <div class="title">{{active && active.name}}</div>
             <div class="textlist" >{{active && active.text}}</div>
           </div>
-          <div class="codeImg flex justify-end items-center">
-            <div class="qrcode" ref="qrCodeUrl1"></div>
-            <div class="qrcode" ref="qrCodeUrl2"></div>
-          </div>
+            <div class="qrcodeDiv">
+              <div class="codeImg1 qrcode" ref="qrCodeUrl1">
+                <img src="https://4dscene.4dage.com/new4dkk/deng/static/img/code/xcxcode.png" alt="">
+              </div>
+              <div class="codeImg2 qrcode" ref="qrCodeUrl2">
+                <img src="https://4dscene.4dage.com/new4dkk/deng/static/img/code/gzhcode.png" alt="">
+              </div>
+            </div>
         </div>
       </div>
       <div class="codebutList">
           <div class="downText" v-if="img">
             <div class="img flex justify-center items-center">
-              <!-- <div style="width: 36px; height: 36px">
-                <img
-                width="36px"
-                height="36px"
-                src="https://4dscene.4dage.com/new4dkk/deng/static/img/icon_download@2x.png"
-              ></img>
-              </div> -->
               <div class="pl-10px">长按保存图片</div>
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
     </van-popup>
   </div>
 </template>
@@ -134,9 +139,10 @@ export default {
       active: {
           class: 'item2',
           name: '中道灯',
-          text: '黄色光由佛陀的皮肤放出，黄色的莲花灯代表佛教核心教义中的中道。中道教义强调远离两极对立，如有无、苦乐、生灭，主张修行者应在平衡中找到觉悟的道路。',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flower_yellow@2x.png',
-          bgimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/img_flower_yellow@2x.png'
+          text: '白色光由佛陀的骨齿放出，白色的莲花灯代表清净与纯洁。清净灯寓意内心的无染与脱离烦恼，法性的纯净无染引导众生走向内在的自由与心灵的澄明，帮助修行者从轮回中得到解脱，达至清净的境界。',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flowerwhite@2x.png',
+          shareimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/img_flower_white@2x.png',
+          bgimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/img_flower_white@2x.png'
         },
       qrcode2: null,
       checkLight: false,
@@ -146,6 +152,7 @@ export default {
           name: '清净灯',
           text: '白色光由佛陀的骨齿放出，白色的莲花灯代表清净与纯洁。清净灯寓意内心的无染与脱离烦恼，法性的纯净无染引导众生走向内在的自由与心灵的澄明，帮助修行者从轮回中得到解脱，达至清净的境界。',
           img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flowerwhite@2x.png',
+          shareimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/img_flower_white@2x.png',
           bgimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/img_flower_white@2x.png'
         },
         item2: {
@@ -153,13 +160,15 @@ export default {
           name: '中道灯',
           text: '黄色光由佛陀的皮肤放出，黄色的莲花灯代表佛教核心教义中的中道。中道教义强调远离两极对立，如有无、苦乐、生灭，主张修行者应在平衡中找到觉悟的道路。',
           img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flower_yellow@2x.png',
+          shareimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/img_yellow@2x.png',
           bgimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/img_flower_yellow@2x.png'
         },
         item3: {
           class: 'item3',
           name: '福德灯',
           text: '赤色光由佛陀的肌肉放出，赤色莲花灯光辉映着成就福德的力量，为修行者带来无穷的加持与福报。',
-          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flower_orange@2x.png',
+          img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/img_red@2x.png',
+          shareimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/img_flower_orange@2x.png',
           bgimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/img_flower_orange@2x.png'
         },
         item4: {
@@ -167,6 +176,7 @@ export default {
           name: '智慧灯',
           text: '橙色光由佛陀的掌、踵和唇放出，象征佛法与智慧，橙色莲花灯光寓意智慧圆满与庄严，照亮觉悟之路。',
           img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flower_pink@2x.png',
+          shareimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/img_orange@2x.png',
           bgimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/img_flower_pink@2x.png'
         },
         item5: {
@@ -174,14 +184,16 @@ export default {
           name: '真如灯',
           text: '第六色为前五色合成，代表佛教不可见的真理与真如，真如灯非肉眼所能见，代表佛教的真理、真如。',
           img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flower_colorful@2x.png',
+          shareimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/img_colorful@2x.png',
           bgimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/img_flower_colorful@2x.png'
         },
         item6: {
           class: 'item6',
           name: '慈悲灯',
-          bgimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/img_flower_purpose@2x.png',
+          shareimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/m2/img_blue@2x.png',
           text: '蓝色光由佛陀的毛发放出，象征慈悲与和平，莲花灯柔和的蓝光引导众生向慈爱之道前行，照亮内心的宁静与祥和。',
-          // img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flower@2x.png',
+          // img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flower@2x.png',,
+          bgimg: 'https://4dscene.4dage.com/new4dkk/deng/static/img/img_flower_purpose@2x.png',
           img: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flower_purpose@2x.png'
         },
         none: 'https://4dscene.4dage.com/new4dkk/deng/static/img/flower@2x.png'
@@ -315,15 +327,15 @@ export default {
       // setTimeout(() => {
       //   this.creatQrCode();
       // }, 100);
-      this.$store.commit('home/setImg', null)
-      this.$nextTick(() => {
-        console.log('DOM updated!')
-        // 在 DOM 更新后执行的回调函数
-        setTimeout(() => {
-          this.$store.dispatch('home/saveImage', this.$refs.downDiv)
-        }, 1000)
-        // this.$store.dispatch('home/saveImage', this.$refs.downDiv)
-      })
+      // this.$store.commit('home/setImg', null)
+      // this.$nextTick(() => {
+      //   console.log('DOM updated!')
+      //   // 在 DOM 更新后执行的回调函数
+      //   setTimeout(() => {
+      //     this.$store.dispatch('home/saveImage', this.$refs.downDiv)
+      //   }, 1000)
+      //   // this.$store.dispatch('home/saveImage', this.$refs.downDiv)
+      // })
     },
     creatQrCode() {
       if (this.qrcode1) {
@@ -417,8 +429,8 @@ export default {
   }
   .codebutList {
     text-align: center;
-    position: relative;
-    top: 31px;
+    // position: relative;
+    // top: 31px;
     width: 100%;
     // top: 76px;
     .downText {
@@ -457,6 +469,19 @@ export default {
       }
     }
   }
+  .shareimg{
+    width: calc(100vw - 30px);
+    position: relative;
+    left: -18px;
+  }
+  .close {
+      position: absolute;
+      right: -0;
+      top: -0px;
+      // width: 42px;
+      height: 42px;
+      z-index: 10;
+    }
   .sharePop {
     padding: 0 20px 60px 20px;
     width: calc(100vw - 60px);
@@ -480,14 +505,6 @@ export default {
     // width: calc(100vw - 108px);
     height: 522px;
     position: relative;
-    .close {
-      position: absolute;
-      right: -20px;
-      top: -0px;
-      // width: 42px;
-      height: 42px;
-      z-index: 10;
-    }
     .text {
       font-weight: 400;
       font-size: 24px;
@@ -496,6 +513,23 @@ export default {
       position: relative;
       padding-bottom: 72px;
       padding-right: 37px;
+      
+      .qrcodeDiv {
+        position: absolute;
+        bottom: 10px;
+        right: 20px;
+        display: flex;
+        .qrcode {
+          padding: 5px;
+          margin: 0 5px;
+          background: #fff;
+          img {
+            width: 62px;
+            height: 62px;
+            object-fit: cover;
+          }
+        }
+      }
       .textContent {
         padding: 73px 0px 10px 0;
         font-size: 14px;

src/pages/prayers/showlist copy.vue

@@ -439,7 +439,9 @@ export default {
       // flex-direction: column;
       .scroll-item {
         white-space: nowrap;
+        min-width: 150px;
         height: 500px;
+        min-width: 150px;
         width: 118px;
         padding: 0 20px;
         display: inline-block;

src/pages/prayers/showlist.vue

@@ -30,7 +30,7 @@
     <div class="content-scroll swiper">
       <!-- 使用swiper -->
       <div class="swiper-wrapper">
-      <swiper :options="swiperoption" ref="mySwiper"  @slideChange="slideChanged">
+      <swiper :options="swiperoption" style="width: 100%;" ref="mySwiper"  @slideChange="slideChanged">
             <swiper-slide class="swiper-slide scroll-item list active" v-for="(item,index) in list" :key="item.id" :class="
               current == index
                 ? `active index${index} ${curIndex == index ? 'fang' : ''}`
@@ -42,10 +42,10 @@
               </div>
             </div>
             <div class="item-text item" v-else>{{ item.name }}</div>
-            <div class="source">
+            <!-- <div class="source">
               <span style="color: #9c9590;margin-bottom: 10px">来源</span>
               <span>{{item.creatorName}}</span>
-            </div>
+            </div> -->
                 </div>
             </swiper-slide>
         </swiper>
@@ -72,8 +72,8 @@
     </div>
       </div>
       <div class="tips">
-        请选择祈愿类型
-        <div v-if="mycurrentData.id != userInfo.id" class="downButtom flex justify-center">
+        {{mycurrentData.wxUserId != userInfo.id?'':'您已完成祈愿，请明天再来'}}
+        <div v-if="mycurrentData.wxUserId != userInfo.id" class="downButtom flex justify-center">
           <div class="downButtomItem" @click="swiper.slideTo(mycurrent, 100, true)">返回我的祈愿</div>
         </div>
         <div v-else class="downButtom flex justify-center">
@@ -93,7 +93,7 @@
       <div class="popItme" ref="downDiv">
         <div class="mySharepopup planel" id="capture">
           <img v-if="img" :src="img" class="showImgbase64" alt="">
-          <div class="shareItem answer_draw_canvas">
+          <div class="shareItem answer_draw_canvas" style="padding: 160px 0px; width: 150px;height: calc(100% - 450px)">
             <div class="activeItem answer_draw_canvas">
               <div
                 class="activetext answer_draw_canvas"
@@ -127,10 +127,10 @@
             </div>
             <div class="qrcodeDiv">
               <div class="codeImg1 qrcode" ref="qrCodeUrl1">
-                <img src="https://4dscene.4dage.com/new4dkk/deng/static/img/code/gzhcode.png" alt="">
+                <img src="https://4dscene.4dage.com/new4dkk/deng/static/img/code/xcxcode.png" alt="">
               </div>
               <div class="codeImg2 qrcode" ref="qrCodeUrl2">
-                <img src="https://4dscene.4dage.com/new4dkk/deng/static/img/code/xcxcode.png" alt="">
+                <img src="https://4dscene.4dage.com/new4dkk/deng/static/img/code/gzhcode.png" alt="">
               </div>
             </div>
         </div>
@@ -207,9 +207,10 @@ export default {
     this.$store.commit('home/setImg', null)
     this.getRequest('/api/show/pray/getList').then(res => {
       this.list = res.data || []
-      this.mycurrent = res.data.findIndex(item => item.id == this.userInfo.id)
+      this.mycurrent = res.data.findIndex(item => item.wxUserId == this.userInfo.id)
       this.$nextTick(() => {
         this.swiper.slideTo(this.mycurrent, 100, true)
+        this.mycurrentData = this.list[this.mycurrent]
       })
     })
   },
@@ -268,8 +269,8 @@ export default {
       })
     },
     slideChanged() {
-      console.log('slideChanged', this.swiper)
       let active = this.swiper.activeIndex
+      console.log('slideChanged', active)
       this.mycurrentData = this.list[active]
      },
     // 获取标题区域宽度，和每个子元素节点的宽度以及元素距离左边栏的距离
@@ -389,7 +390,7 @@ export default {
   // background: rgba(32, 21, 10, 0.7);
   border-radius: 0px 0px 0px 0px;
   height: 100vh;
-  padding-top: 66px;
+  // padding-top: 66px;
   .img_signal {
     width: 76px;
     height: 106px;
@@ -492,11 +493,7 @@ export default {
       z-index: 10;
     }
     .shareItem {
-      width: 150px;
-      height: calc(100% - 512px);
-      padding: 160px 0px;
       display: inline-block;
-      background-size: 100% 100%;
       font-size: 12px;
       color: #303030;
       line-height: 18px;
@@ -507,7 +504,7 @@ export default {
       flex-direction: column;
       background: url(https://4dscene.4dage.com/new4dkk/deng/static/img/img_label@2x.png) 100% 100%
         no-repeat;
-      background-size: contain;
+      background-size: 100% 100%;
       position: relative;
       // top: 44px;
       font-weight: 400;
@@ -581,6 +578,7 @@ export default {
           position: absolute;
           bottom: 23%;
           left: calc(50% - 70px);
+          letter-spacing: 5px;
         }
         .item-text {
           // transform: rotateY(180deg);

src/pages/web/index.vue

@@ -63,6 +63,12 @@ export default {
   computed: {
     ...mapState('home', ['img'])
   },
+  created() {
+    let m = this.$route.query.m
+    if(m){
+      this.url = `https://sit-nanhuacs.4dage.com/show/index.html?m=${m}&lang=zh`
+    }
+  },
   mounted() {
     this.getRequest('/api/show/pray/count').then(res => {
       this.number = res.data.total

vue.config.js

@@ -67,6 +67,9 @@ module.exports = {
   },
   configureWebpack: {
     devServer: {
+      client: {
+        overlay: false, // 编译错误时，取消全屏覆盖（建议关掉）
+      },
       open: false,
       host: '0.0.0.0',
       port: '8800',