// 1 سال پیش
والد
کامیت
2c593dad12
5فایلهای تغییر یافته به همراه13 افزوده شده و 8 حذف شده
  1. 2 6
      pages/activityDet/index.js
  2. 2 2
      pages/greeting/index.js
  3. 1 0
      pages/greeting/index.less
  4. 1 0
      pages/greeting/index.wxss
  5. 7 0
      project.private.config.json

+ 2 - 6
pages/activityDet/index.js

@@ -55,7 +55,6 @@ Page({
         // 录音授权
         wx.getSetting({
             success(res) {
-                console.log(res);
                 if (!res.authSetting['scope.record']) {
                     wx.authorize({
                         scope: 'scope.record',
@@ -103,7 +102,6 @@ Page({
         if (this.data.state == 'before') {
             this.innerAudioContext.play();
             this.innerAudioContext.onEnded((res) => {
-                console.log('音频播放完毕');
                 this.setData({
                     userAudioState: false
                 })
@@ -114,7 +112,6 @@ Page({
             let countDown = Number(this.data.configure.bgMusicLength)
             // 倒计时
             this.dsq = setInterval(item => {
-                console.log('仍然倒计时呢');
                 // 倒计时结束
                 if (countDown == 1) {
                     this.stopRecording()
@@ -194,9 +191,7 @@ Page({
                 fromText: this.data.configure.fromText,
                 templateId: this.data.id
             }
-            console.log(data, 'data');
             let greetingCard = await saveActivity(data)
-            console.log('贺卡生成', greetingCard);
             this.setDuration('endTime', greetingCard.duration)
             this.setData({
                 greetingCard,
@@ -221,8 +216,9 @@ Page({
             this.innerAudioContext.src = this.data.greetingCard.audioPath;
             this.innerAudioContext.onTimeUpdate(() => {
                 this.setDuration('playTime', this.innerAudioContext.currentTime)
+                let vProgress = Math.ceil((Math.ceil(this.innerAudioContext.currentTime) / this.innerAudioContext.duration) * 100)
                 this.setData({
-                    vProgress: Math.ceil((Math.ceil(this.innerAudioContext.currentTime) / this.innerAudioContext.duration) * 100)
+                    vProgress: vProgress < 96 ? vProgress : 100
                 })
             })
             this.innerAudioContext.play();

+ 2 - 2
pages/greeting/index.js

@@ -34,7 +34,6 @@ Page({
      * 生命周期函数--监听页面加载
      */
     async onLoad(options) {
-        console.log(options, '分享');
         this.setData({
             uid: wx.getStorageSync('uid')
         })
@@ -56,8 +55,9 @@ Page({
         this.innerAudioContext = wx.createInnerAudioContext();
         this.innerAudioContext.onTimeUpdate(() => {
             this.setDuration('playTime', this.innerAudioContext.currentTime)
+            let vProgress = Math.ceil((Math.ceil(this.innerAudioContext.currentTime) / this.innerAudioContext.duration) * 100)
             this.setData({
-                vProgress: Math.ceil((Math.ceil(this.innerAudioContext.currentTime) / this.innerAudioContext.duration) * 100)
+                vProgress: vProgress < 96 ? vProgress : 100
             })
         })
         this.innerAudioContext.onEnded((res) => {

+ 1 - 0
pages/greeting/index.less

@@ -131,6 +131,7 @@
         left: 0px;
         bottom: 0px;
         background-color: #00C657;
+        z-index: 99;
 
         image {
             width: 525rpx;

+ 1 - 0
pages/greeting/index.wxss

@@ -110,6 +110,7 @@
   left: 0px;
   bottom: 0px;
   background-color: #00C657;
+  z-index: 99;
 }
 .greetingBox .footerBox image {
   width: 525rpx;

+ 7 - 0
project.private.config.json

@@ -30,6 +30,13 @@
                     "query": "id=51",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "pages/index/index",
+                    "query": "tabbarIndx=0",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }