添加关注抖音号

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "chat-gpt.lang": "cn"
+}

app_list.json

@@ -1,7 +1,7 @@
 {
   "taroConfig": {
-    "version": "1.5.3",
-    "desc": "更改绘画详情页"
+    "version": "1.5.7",
+    "desc": "添加关注抖音号"
   },
   "app_list": [
     {

package.json

@@ -81,7 +81,7 @@
         "webpack": "5.69.0"
     },
     "taroConfig": {
-        "version": "1.5.3",
-        "desc": "更改绘画详情页"
+        "version": "1.5.7",
+        "desc": "添加关注抖音号"
     }
 }

src/app.config.js

@@ -43,6 +43,9 @@ export default defineAppConfig({
     },
     
   ],
+  navigateToMiniProgramAppIdList: [
+    "ttf31985a46c214faf"
+  ],
   window: {
     backgroundTextStyle: 'light',
     navigationBarBackgroundColor: '#041129',

src/moduleA/pages/darwDetailIndex/index.jsx

@@ -184,7 +184,7 @@ export default class Task extends Component {
   // 生成临时路径 保存图片到手机
   doSaveImg () {
     Taro.downloadFile({
-      url: this.state.draw_infos[0].img,
+      url: this.state.draw_infos[this.state.current].img,
       success: res => {
         Taro.saveImageToPhotosAlbum({
           filePath: res.tempFilePath,

src/moduleA/pages/invite/index.jsx

@@ -294,7 +294,6 @@ export default class Task extends Component {
           this.state.shareImage.length > 0 &&
           <View className='content'>
             <Image className='invite-image' src={this.state.shareImage}></Image>
-
             <View className='console'>
               <View className='inte-button' onClick={e => (this.saveToAlbum())}>保存</View>
               <View className='inte-button' onClick={e => (this.shareImage())}>分享</View>

src/moduleB/pages/comic/index.jsx

@@ -307,12 +307,14 @@ export default class collection extends Component {
   //充值
   toOrder () {
     if (this.state.creatInfo.ios_status==0) {
-      Taro.showToast({
-        title: 'ios暂不支持充值',
-        icon: 'none',
-        duration: 2000
-      })
-      return
+      if (this.state.isIos) {
+        Taro.showToast({
+          title: 'ios暂不支持充值',
+          icon: 'none',
+          duration: 2000
+        })
+        return
+      }
     }
     let that = this
     if (process.env.TARO_ENV === 'tt') {

src/moduleB/pages/comicActivity/index.jsx

@@ -289,12 +289,14 @@ export default class collection extends Component {
   //充值
   toOrder () {
     if (this.state.models.ios_status==0) {
-      Taro.showToast({
-        title: 'ios暂不支持充值',
-        icon: 'none',
-        duration: 2000
-      })
-      return
+      if (this.state.isIos) {
+        Taro.showToast({
+          title: 'ios暂不支持充值',
+          icon: 'none',
+          duration: 2000
+        })
+        return
+      }
     }
     let that = this
     if (process.env.TARO_ENV === 'tt') {

src/moduleB/pages/comicActivityCurrent/index.jsx

@@ -1,5 +1,5 @@
 import { Component } from 'react'
-import { View, Text, Button, Image, scrollView,Video, Input } from '@tarojs/components'
+import { View, Text, Button, Image, scrollView, Video, Input } from '@tarojs/components'
 import * as api from '../../../service/index'
 import tool from '../../../common/tool'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
@@ -126,6 +126,9 @@ export default class collection extends Component {
             Taro.showToast({ title: item.msg, icon: 'none' })
           }
         })
+      },
+      fail: function (params) {
+        console.log(params, 'fail');
       }
     })
   }
@@ -139,7 +142,7 @@ export default class collection extends Component {
       if (res.code == 200) {
         if (this.state.is_week == 1) {
           Taro.navigateTo({
-            url: `/moduleB/pages/comicActivityCurrentDetail/index?task_id=${res.data.task_id}`
+            url: `/moduleB/pages/comicActivityCurrentDetail/index?task_id=${res.data.task_id}&promotion_img=${this.state.models.promotion_img}`
           })
         } else {
           this.setState({
@@ -196,7 +199,7 @@ export default class collection extends Component {
       Taro.hideLoading()
       if (data.isEnded) {
         Taro.navigateTo({
-          url: `/moduleB/pages/comicActivityDetail/index?task_id=${that.state.drawTaskId}`
+          url: `/moduleB/pages/comicActivityCurrentDetail/index?task_id=${that.state.drawTaskId}&promotion_img=${that.state.models.promotion_img}`
         })
       } else {
 
@@ -234,7 +237,7 @@ export default class collection extends Component {
         if (res && res.isEnded || res === undefined) {
           // 正常播放结束，可以下发游戏奖励
           Taro.navigateTo({
-            url: `/moduleB/pages/comicActivityDetail/index?task_id=${that.state.drawTaskId}`
+            url: `/moduleB/pages/comicActivityCurrentDetail/index?task_id=${that.state.drawTaskId}&promotion_img=${that.state.models.promotion_img}`
           })
         } else {
           //提前关闭小程序
@@ -291,13 +294,15 @@ export default class collection extends Component {
   }
   //充值
   toOrder () {
-    if (this.state.models.ios_status==0) {
-      Taro.showToast({
-        title: 'ios暂不支持充值',
-        icon: 'none',
-        duration: 2000
-      })
-      return
+    if (this.state.models.ios_status == 0) {
+      if (this.state.isIos) {
+        Taro.showToast({
+          title: 'ios暂不支持充值',
+          icon: 'none',
+          duration: 2000
+        })
+        return
+      }
     }
     let that = this
     if (process.env.TARO_ENV === 'tt') {
@@ -380,6 +385,22 @@ export default class collection extends Component {
       url: `/moduleB/pages/comic/index`
     })
   }
+  //关注抖音号
+  followAwemeUser () {
+    console.log('关联');
+    tt.followAwemeUser({
+      success: (res) => {
+        Taro.showToast({
+          title: '关注成功',
+          icon: 'none',
+          duration: 2000
+        })
+      },
+      fail: (res) => {
+        console.log(res);
+      }
+    });
+  }
 
   render () {
     return (
@@ -399,7 +420,7 @@ export default class collection extends Component {
                     mode='aspectFit'
                     src={this.state.consultImg}
                   ></Image> */}
-                   <Video
+                  <Video
                     className='album_swiper_video'
                     src={this.state.models.video_url}
                     showCenterPlayBtn={false}
@@ -416,6 +437,15 @@ export default class collection extends Component {
                     x5-video-orientation='portraint'
                   ></Video>
                 </View>
+                {
+                  process.env.TARO_ENV == 'tt' &&
+                  <View className='follow'>
+                    <View className='follow-content' onClick={e => (this.followAwemeUser())}>
+                      <Image className='follow-img' src='https://video-img.fyshark.com/1685585243379ajlna.png'></Image>
+                      预览效果
+                    </View>
+                  </View>
+                }
                 <View className='step'>
                   <Image className='step-img' src='http://video-img.fyshark.com/1683196371096123.png'>
                   </Image>

src/moduleB/pages/comicActivityCurrent/index.less

@@ -61,7 +61,30 @@
         height: 40px;
       }
     }
-
+    .follow {
+      margin-top: 20px;
+      width: 100%;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+  
+      .follow-content {
+        padding: 10px 12px;
+        display: flex;
+        background: linear-gradient(90deg, #038EFF, #3342FF);
+        border-radius: 10px;
+        align-items: center;
+        justify-content: center;
+        color: #FFFFFF;
+        font-size: 24px;
+  
+        .follow-img {
+          width: 30px;
+          height: 30px;
+          margin-right: 10px;
+        }
+      }
+    }
 
     .banner-tips {
       margin-top: 20px;

src/moduleB/pages/comicActivityCurrentDetail/index.jsx

@@ -14,6 +14,7 @@ export default class collection extends Component {
     repeat: 0,//广告次数
     current: 0,
     interval: null,
+    intervalVideo: null,
     draw_status: 0,
     draw_infos: [],
     que_cnt: 0,
@@ -39,6 +40,7 @@ export default class collection extends Component {
   componentWillUnmount () {
     //避免服务器攻击
     clearInterval(this.state.interval)
+    clearInterval(this.state.intervalVideo)
   }
   getCoinTaskAd () {
     api.getCoinTaskAd().then(res => {
@@ -332,9 +334,9 @@ export default class collection extends Component {
     })
   }
   toIndex () {
-    // Taro.reLaunch({
-    //   url: `/pages/index/index`
-    // })
+    Taro.reLaunch({
+      url: `/pages/index/index`
+    })
   }
   previewImage () {
     Taro.previewImage({
@@ -342,11 +344,77 @@ export default class collection extends Component {
       urls: [`${this.state.draw_infos[this.state.current].img}`] // 需要预览的图片http链接列表  
     })
   }
-  onUploadDouyinVideo = async () => {
-    Taro.navigateTo({
-      url: `/native-pages/index/index?videoUrl=http://video-img.fyshark.com/16833402744695%E6%9C%885%E6%97%A5(1).mp4`
+  onUploadDouyinVideo () {
+    Taro.showLoading({
+      title: '加载中...',
     })
+    api.drawImg2video({ img_id: this.state.draw_infos[this.state.current].img_id }).then(res => {
+      if (res.code == 200) {
+        this.getImg2videoUrl()
+      }
+    })
+
+
   };
+  getImg2videoUrl () {
+    api.getImg2videoUrl({ img_id: this.state.draw_infos[this.state.current].img_id }).then(res => {
+      if (res.data.video_type != 2) {
+        clearInterval(this.state.intervalVideo)
+        this.state.intervalVideo = setInterval(() => {
+          this.getImg2videoUrl()
+        }, 1000 * 2)
+      } else {
+        clearInterval(this.state.intervalVideo)
+        Taro.hideLoading()
+        this.downloadAndSaveVideo(res.data.video_url)
+      }
+    })
+  }
+  // downloadFile (videoUrl) {
+
+  // }
+  downloadAndSaveVideo (videoUrl) {
+    let routers = this.$instance.router.params
+    tt.downloadFile({
+      url: videoUrl,
+      success (res) {
+        if (res.statusCode === 200) {
+          tt.saveVideoToPhotosAlbum({
+            filePath: res.tempFilePath,
+            success () {
+              console.log('视频已保存到相册');
+              tt.showToast({
+                title: '视频已保存到相册',
+                icon: 'success',
+              });
+              Taro.navigateTo({
+                url: `/native-pages/index/index?videoUrl=${res.tempFilePath}&promotion_img=${routers.promotion_img}`
+              })
+            },
+            fail () {
+              tt.showToast({
+                title: '保存失败',
+                icon: 'none',
+              });
+            },
+          });
+        } else {
+          tt.showToast({
+            title: '下载失败',
+            icon: 'none',
+          });
+        }
+      },
+      fail () {
+        tt.showToast({
+          title: '下载失败',
+          icon: 'none',
+        });
+      },
+    });
+  }
+
+
 
 
   render () {
@@ -364,6 +432,7 @@ export default class collection extends Component {
             </View>
           </View>
         }
+        
         <ScrollView
           className='recharge'
           scrollX
@@ -393,14 +462,22 @@ export default class collection extends Component {
         </View> */}
         {
           this.state.draw_infos.length > 0 && this.state.draw_infos[this.state.current].status == 2 &&
-          <View className='control'>
-            <View className='download' onClick={e => (this.download())}>保存图片</View>
-            <View className='toIndex' onClick={e => (this.toIndex())}>前往探索更多玩法</View>
+          <View>
+            <View className='control'>
+              <View className='download' onClick={e => (this.download())}>保存图片</View>
+              <View className='toIndex' onClick={e => (this.toIndex())}>前往探索更多玩法</View>
+            </View>
+            {
+              process.env.TARO_ENV == 'tt' &&
+              <View className='result-update-button'
+                onClick={e => (tool.throttle(this.onUploadDouyinVideo()), 2000)}
+              >
+                <Image className='result-update-img' src='http://video-img.fyshark.com/1682414441783aghidjnl.png'></Image>
+                生成视频并发布
+              </View>
+            }
           </View>
         }
-        {/* <Button open-type="uploadDouyinVideo" className='upload-button' onClick={this.onUploadDouyinVideo}>
-          上传抖音视频
-        </Button> */}
       </View>
     )
   }

src/moduleB/pages/comicActivityCurrentDetail/index.less

@@ -213,4 +213,24 @@
     }
   }
 
+  .result-update-button {
+    margin-top: 40px;
+    background: linear-gradient(90deg, #C367DE, #3342FF);
+    border-radius: 23px;
+    width: 100%;
+    height: 94px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #FFFFFF;
+
+    .result-update-img {
+      width: 52px;
+      height: 52px;
+      display: block;
+      margin-right: 20px;
+    }
+  }
+
+
 }

src/moduleB/pages/realDetail/index.less

@@ -8,6 +8,4 @@
   h1,h2,h3,h4,h5,h6{
     color: #FFFFFF;
   }
- 
- 
 }

src/native-pages/index/index.js

@@ -1,14 +1,17 @@
 // index.js
+import ttappid from '../../../project.tt.json'
 Page({
   data: {
-    videoUrl:'',
+    videoUrl: '',
+    promotion_img:''
   },
-   onLoad(options){
-    console.log(options,'pages');
+  onLoad (options) {
+    console.log(options, 'pages');
     this.setData({
-      videoUrl: options.videoUrl
+      videoUrl: options.videoUrl,
+      promotion_img:options.promotion_img
     })
-    console.log(this.data.videoUrl,'videoUrl');
+    console.log(this.data.videoUrl, 'videoUrl');
   },
   // onUploadDouyinVideo 和 onLoad 等其他钩子同级
   async onUploadDouyinVideo (uploadOptions) {
@@ -17,26 +20,11 @@ Page({
     console.log("onUploadDouyinVideoOptions: ", uploadOptions);
 
     // 可以利用异步能力配合其他 API 获取必要的字段信息
-    const videoPath = await this.chooseVideo();
+    const videoPath = this.data.videoUrl;
     console.log("videoPath:", videoPath);
     // 返回值（文档中称之为 uploadParams）将被当作发布参数传入视频发布器，发布视频
     return {
       videoPath,
-      titleConfig: {
-        title: "视频标题",
-        mentionMarkers: [
-          {
-            start: 0,
-            openId: "标题里要 @ 的人",
-          },
-        ],
-        hashtagMarkers: [
-          {
-            start: 0,
-            hashtag: "标题里要 # 的话题",
-          },
-        ],
-      },
       extra: {
         anchor: {
           anchorType: "app",
@@ -56,26 +44,20 @@ Page({
       },
     };
   },
-  chooseVideo () {
-    return new Promise((resolve) => {
-      tt.chooseVideo({
-        sourceType: ["album", "camera"],
-        compressed: true,
-        success: (res) => {
-          resolve(res.tempFilePath);
-        },
-        fail: (err) => {
-          let errType = err.errMsg.includes("chooseVideo:fail cancel")
-            ? "取消选择"
-            : "选择失败";
-          tt.showModal({
-            title: errType,
-            content: err.errMsg,
-            showCancel: false,
-          });
-          resolve("");
-        },
-      });
+  toPromotion () {
+    console.log('当前小程序的 AppID 实例为：', ttappid.appid);
+    tt.navigateToMiniProgram({
+      appId: "ttf31985a46c214faf",
+      path: `subPackage/subApp/appDetail/index?appId=${ttappid.appid}`,
+      extraData: {
+
+      },
+      success: function () {
+        console.log('跳转成功');
+      },
+      fail: function (e) {
+        console.log(e, '失败');
+      },
     });
   },
   navigateBack () {

src/native-pages/index/index.ttml

@@ -1,16 +1,23 @@
 <view class="intro">
-  <view class="banner-content" hover-class="none" hover-stop-propagation="false">
-    <video class='album_swiper_video' src="{{videoUrl}}" showCenterPlayBtn="{{false}}" showPlayBtn="{{false}}"
-      showFullscreenBtn="{{false}}" autoplay objectFit='cover' loop controls="{{false}}" x5-video-player-type='h5-page'
-      webkit-playsinline='true' x5-playsinline='true' x5-video-orientation='portraint'></video>
+  
+  <view class="content" hover-class="none" hover-stop-propagation="false">
+    <view class="banner-content" hover-class="none" hover-stop-propagation="false">
+      <video class='album_swiper_video' src="{{videoUrl}}" showCenterPlayBtn="{{false}}" showPlayBtn="{{false}}"
+        showFullscreenBtn="{{false}}" autoplay object-fit='contain' loop controls="{{false}}" x5-video-player-type='h5-page'
+        webkit-playsinline='true' x5-playsinline='true' x5-video-orientation='portraint'></video>
+    </view>
+    <view class="console" hover-class="none" hover-stop-propagation="false">
+      <view class="back" type="primary" bindtap="navigateBack">返回上一页</view>
+      <button class="release" open-type="uploadDouyinVideo">
+        <image class="douyin-logo" src="http://video-img.fyshark.com/1683353853830%E6%8A%96%E9%9F%B3.png"
+          mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="">
+        </image>
+        一键发布至抖音
+      </button>
+    </view>
   </view>
-  <view class="console" hover-class="none" hover-stop-propagation="false">
-    <view class="back" type="primary" bindtap="navigateBack">返回上一页</view>
-    <button class="" open-type="uploadDouyinVideo">
-      <image class="douyin-logo" src="http://video-img.fyshark.com/1683353853830%E6%8A%96%E9%9F%B3.png"
-        mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="">
-      </image>
-      保存视频并发布
-    </button>
+  <view class="promotion" hover-class="none"  bindtap="toPromotion" hover-stop-propagation="false">
+    <image class="promotion-img" src="{{promotion_img}}" mode="widthFix" lazy-load="false" binderror="" bindload="">
+    </image>
   </view>
 </view>

src/native-pages/index/index.ttss

@@ -1,8 +1,13 @@
 .intro {
-  padding: 48px 20px;
   min-height: 100vh;
   background-color: #041129;
 }
+
+.content {
+  padding: 48px 20px;
+
+}
+
 .banner-content {
   position: relative;
   left: 50%;
@@ -10,20 +15,59 @@
   width: 100%;
   height: 700px;
 }
+
 .album_swiper_video {
   width: 100%;
   height: 100%;
 }
-.console{
+
+.console {
+  margin-top: 100px;
   width: 100%;
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
-.back{
+
+.back {
+  width: 260px;
+  height: 80px;
+  line-height: 80px;
+  font-size: 28px;
+  text-align: center;
+  border: 2px solid #FFFFFF;
+  color: #FFFFFF;
+  border-radius: 14px;
 
 }
-.douyin-logo{
-  width: 60px;
-  height: 60px;
+
+.release {
+  margin: 0;
+  width: 380px;
+  height: 80px;
+  line-height: 80px;
+  font-size: 28px;
+  text-align: center;
+  background: linear-gradient(90deg, #C367DE, #3342FF);
+  border-radius: 23px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #FFFFFF;
+
+}
+
+.douyin-logo {
+  width: 52px;
+  height: 52px;
+  display: block;
+  margin-right: 10px;
+}
+
+.promotion {}
+
+.promotion-img {
+  /* border: 2px solid aliceblue; */
+  width: 100%;
+  border-radius: 10px;
 }

src/pages/activity/index.jsx

@@ -14,9 +14,9 @@ export default class collection extends Component {
   }
 
   componentWillMount () {
+    this.init()
   }
   componentDidShow () {
-    this.init()
   }
   init () {
     this.setState({

src/service/index.js

@@ -172,13 +172,20 @@ export const getUserShareCnt = data =>
     method: 'POST',
     data,
   });
-//获取用户分销明细
+//画画
 export const drawGcImg = data =>
   Request({
     url: '/api/draw_gc_img',
     method: 'POST',
     data,
   });
+//单风格画画
+export const drawGcImgAlone = data =>
+  Request({
+    url: '/api/draw_gc_img_alone',
+    method: 'POST',
+    data,
+  });
 //获取资讯列表
 export const getInformationList = data =>
   Request({
@@ -284,6 +291,20 @@ export const getDrawAloneImgIndex = data =>
     method: 'POST',
     data,
   });
+//生成视频
+export const drawImg2video = data =>
+  Request({
+    url: '/api/draw_img2video',
+    method: 'POST',
+    data,
+  });
+//获取视频
+export const getImg2videoUrl = data =>
+  Request({
+    url: '/api/get_img2video_url',
+    method: 'POST',
+    data,
+  });