分包，添加分销系统

config/index.js

@@ -65,6 +65,7 @@ const config = {
   h5: {
     publicPath: '/',
     staticDirectory: 'static',
+    esnextModules: ['taro-ui'],
     postcss: {
       autoprefixer: {
         enable: true,

package-lock.json

@@ -7604,6 +7604,12 @@
                 "whatwg-url": "^7.0.0"
             }
         },
+        "dayjs": {
+            "version": "1.11.7",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
+            "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==",
+            "dev": true
+        },
         "de-indent": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -18473,6 +18479,18 @@
                 }
             }
         },
+        "taro-ui": {
+            "version": "3.0.0-alpha.9",
+            "resolved": "https://registry.npmjs.org/taro-ui/-/taro-ui-3.0.0-alpha.9.tgz",
+            "integrity": "sha512-o3M7AB9cySYvrI5KU0RFc35b3uHmRqNkIpMBEgaWY2sKB1QqpCbJLOSQFTVMe74DFLb/Ud4Kvxb9GcJ347LZOw==",
+            "dev": true,
+            "requires": {
+                "classnames": "^2.2.6",
+                "dayjs": "^1.7.7",
+                "lodash": "^4.17.10",
+                "prop-types": "^15.7.2"
+            }
+        },
         "term-size": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",

package.json

@@ -75,6 +75,7 @@
         "eslint-plugin-react-hooks": "^4.2.0",
         "react-refresh": "^0.11.0",
         "stylelint": "^14.4.0",
+        "taro-ui": "^3.0.0-alpha.9",
         "webpack": "5.69.0"
     },
     "taroConfig": {

project.tt.json

@@ -1,10 +1,10 @@
 {
     "miniprogramRoot": "./",
-    "projectname": "未来智囊",
+    "projectname": "AI绘画练习生",
     "appid": "tt6e291894f116667e01",
     "setting": {
         "es6": false,
         "minified": false
     },
-    "description": "未来智囊"
+    "description": "AI绘画练习生"
 }

src/app.config.js

@@ -8,7 +8,19 @@ export default defineAppConfig({
     "pages/communityDetail/index",
     "pages/earnPoints/index",
     "pages/mine/index",
-
+    "pages/activity/index"
+  ],
+  subpackages: [
+    {
+      root: "moduleA",
+      name: "分包A",
+      pages: [
+        "pages/invite/index",
+        "pages/wallet/index",
+        "pages/shareCnt/index",
+      ]
+    },
+    
   ],
   window: {
     backgroundTextStyle: 'light',
@@ -37,10 +49,10 @@ export default defineAppConfig({
         text: "创作"
       },
       // {
-      //   pagePath: "pages/task/index",
+      //   pagePath: "pages/activity/index",
       //   iconPath: "images/nav/task.png",
       //   selectedIconPath: "images/nav/task_pin.png",
-      //   text: "任务"
+      //   text: "活动"
       // },
       {
         pagePath: "pages/mine/index",

src/app.js

@@ -1,6 +1,7 @@
 import { Component } from 'react'
 import tool from './common/tool'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
+// import 'taro-ui/dist/style/index.scss'
 import './app.less'
 
 class App extends Component {

src/moduleA/pages/invite/index.config.js

@@ -0,0 +1,5 @@
+export default definePageConfig({
+  navigationBarTitleText: '邀请海报',
+  enableShareAppMessage: true,
+  enableShareTimeline: true ,
+})

src/moduleA/pages/invite/index.jsx

@@ -0,0 +1,313 @@
+import { Component } from 'react'
+import { View, Swiper, SwiperItem, Image, Textarea, Canvas, Button } from '@tarojs/components'
+import Taro, { getCurrentInstance, CanvasContext } from '@tarojs/taro'
+import tool from '../../../common/tool'
+import TaroCanvasDrawer from '../../../component/taro-plugin-canvas';
+import * as api from '../../../service/index'
+import './index.less'
+
+export default class Task extends Component {
+  $instance = getCurrentInstance()
+  state = {
+
+    canvasImage: '',
+    qrCodeImg: '',
+    // 绘图配置文件
+    config: {},
+    // 绘制的图片
+    shareImage: '',
+    // TaroCanvasDrawer 组件状态
+    canvasStatus: false,
+    isFill: false,//是否画海报
+  }
+
+  componentDidMount () {
+
+  }
+
+  componentWillMount () {
+    this.getWxCodeImg()
+  }
+  getWxCodeImg () {
+    Taro.showLoading({
+      title: '加载中...'
+    })
+    api.getWxCodeImg({ code_from: 'bill' }).then(res => {
+      this.dataURLtoFile(res.data)
+    })
+  }
+  onShareAppMessage = (res) => {
+    let shareData = {
+      title: tool.shareTitle,
+      path: `/pages/index/index?c=${Taro.getStorageSync('user_id')}&s=rightTap`,
+      imageUrl: tool.shareImg
+    }
+    return shareData;
+  }
+
+  //base64转本地路径
+  dataURLtoFile (dataurl) {
+    let that = this
+    /// 获取到base64Data
+    var base64Data = dataurl;
+    /// 通过微信小程序自带方法将base64转为二进制去除特殊符号，再转回base64
+    base64Data = wx.arrayBufferToBase64(wx.base64ToArrayBuffer(base64Data));
+    /// 拼接请求头，data格式可以为image/png或者image/jpeg等，看需求
+    const base64ImgUrl = "data:image/png;base64," + base64Data;
+
+    const base64ImgData = base64ImgUrl.replace(/^data:image\/\w+;base64,/, '');
+    const buffer = new ArrayBuffer(base64ImgData.length);
+    const view = new Uint8Array(buffer);
+    for (let i = 0; i < base64ImgData.length; i++) {
+      view[i] = base64ImgData.charCodeAt(i);
+    }
+    const fileStream = wx.base64ToArrayBuffer(base64ImgData);
+    const filePath = wx.env.USER_DATA_PATH + '/test.png';
+    wx.getFileSystemManager().writeFile({
+      filePath: filePath,
+      data: fileStream,
+      encoding: 'binary',
+      success: function (res) {
+        console.log('writeFile success:', res, filePath);
+        that.setState({
+          qrCodeImg: filePath
+        }, () => {
+          that.canvasDrawFunc()
+        })
+      },
+      fail: function (res) {
+        console.log('保存失败')
+      }
+    })
+    /// 刷新数据
+    return base64ImgUrl;
+  }
+  download () {
+    this.downImg()
+  }
+  // 鉴权操作 判断是否有保存到相册的权限
+  // 有就直接下载 没有就弹窗提示给权限
+  downImg () {
+    Taro.getSetting({
+      success: res => {
+        if (!res.authSetting['scope.writePhotosAlbum']) {
+          Taro.authorize({
+            scope: 'scope.writePhotosAlbum',
+            success: () => {
+              this.doSaveImg()
+            },
+            fail: () => {
+              this.openConfirm()
+            }
+          })
+        } else {
+          this.doSaveImg()
+        }
+      }
+    })
+  }
+  // 生成临时路径 保存图片到手机
+  doSaveImg () {
+    Taro.downloadFile({
+      url: this.state.draw_infos[0].img,
+      success: res => {
+        Taro.saveImageToPhotosAlbum({
+          filePath: res.tempFilePath,
+          success: () => {
+            Taro.showToast({ title: '已保存到相册', icon: 'success' })
+          },
+          fail: () => {
+            Taro.showToast({ title: '保存失败', icon: 'none' })
+          }
+        })
+      }
+    })
+  }
+  // 权限弹窗
+  openConfirm () {
+    Taro.showModal({
+      content: '检测到您没有打开小程序相册权限，是否取设置打开？',
+      showCancel: true,
+      success: res => {
+        if (res.confirm) {
+          // 打开权限
+          Taro.openSetting({
+            success: res => {
+              this.doSaveImg()
+            }
+          })
+        }
+      }
+    })
+  }
+
+  copyPrompt () {
+    Taro.setClipboardData({
+      data: this.state.draw_data.prompt,
+      success: function (res) {
+      }
+    })
+  }
+
+  copyNegativePrompt () {
+    Taro.setClipboardData({
+      data: this.state.draw_data.negative_prompt,
+      success: function (res) {
+      }
+    })
+  }
+
+  componentDidMount () { }
+  //页面销毁之前调用
+  previewImage (item, index) {
+    Taro.previewImage({
+      current: item.img, // 当前显示图片的http链接  
+      urls: [`${item.img}`] // 需要预览的图片http链接列表  
+    })
+  }
+  // 调用绘画 => canvasStatus 置为true、同时设置config
+  canvasDrawFunc () {
+    let rssConfig = {
+      width: 352,
+      height: 526,
+      backgroundColor: 'rgba(255,255,255,0)',
+      debug: false,
+      pixelRatio: 3,
+      blocks: [
+      ],
+      images: [
+        {
+          url: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1679730160667.png',
+          width: 352,
+          height: 526,
+          x: 0,
+          y: 0,
+          borderRadius: 12,
+          zIndex: 8,
+        },
+        {
+          url: this.state.qrCodeImg,
+          width: 156,
+          height: 156,
+          x: 97,
+          y: 131,
+          borderRadius: 12,
+          zIndex: 12,
+        },
+      ],
+    }
+    console.log('回执');
+    this.setState({
+      config: rssConfig,
+    }, () => {
+      this.setState({
+        isFill: true
+      })
+    })
+
+  }
+
+  // 绘制成功回调函数 （必须实现）=> 接收绘制结果、重置 TaroCanvasDrawer 状态
+  onCreateSuccess = (result) => {
+    console.log('成功', result);
+    const { tempFilePath, errMsg } = result;
+    Taro.hideLoading();
+
+    if (errMsg === 'canvasToTempFilePath:ok') {
+      this.setState({
+        shareImage: tempFilePath,
+        // 重置 TaroCanvasDrawer 状态，方便下一次调用
+        isFill: false,
+        config: {}
+      }, () => {
+
+      })
+      //画图成功之后打开分享
+      //  wx.downloadFile({
+      //   url: tempFilePath,
+      //   success: (res) => {
+      //     console.log('打开分享');
+      //     wx.showShareImageMenu({
+      //       path: res.tempFilePath
+      //     })
+      //   }
+      // })
+    } else {
+      // 重置 TaroCanvasDrawer 状态，方便下一次调用
+      this.setState({
+        isFill: false,
+        config: {}
+      })
+      Taro.showToast({ icon: 'none', title: errMsg || '出现错误' });
+      console.log(errMsg);
+    }
+    // 预览
+    // Taro.previewImage({
+    //   current: tempFilePath,
+    //   urls: [tempFilePath]
+    // })
+  }
+
+  // 绘制失败回调函数 （必须实现）=> 接收绘制错误信息、重置 TaroCanvasDrawer 状态
+  onCreateFail = (error) => {
+    console.log('失败');
+    Taro.hideLoading();
+    // 重置 TaroCanvasDrawer 状态，方便下一次调用
+    this.setState({
+      isFill: false,
+      config: {}
+    })
+    console.log(error);
+  }
+
+  // 保存图片至本地
+  saveToAlbum = () => {
+    const res = Taro.saveImageToPhotosAlbum({
+      filePath: this.state.shareImage,
+      success: () => {
+        Taro.showToast({ title: '已保存到相册', icon: 'success' })
+      },
+      fail: () => {
+        Taro.showToast({ title: '保存失败', icon: 'none' })
+      }
+    });
+  }
+  //分享
+  shareImage () {
+    wx.showShareImageMenu({
+      path: this.state.shareImage
+    })
+  }
+  openFill () {
+    this.canvasDrawFunc()
+  }
+
+
+  render () {
+    return (
+      <View className='mine'>
+        {
+          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>
+            </View>
+          </View>
+        }
+        {
+          this.state.isFill &&
+          <View>
+            <TaroCanvasDrawer
+              config={this.state.config} // 绘制配置
+              onCreateSuccess={e => (this.onCreateSuccess(e))} // 绘制成功回调
+              onCreateFail={e => (this.onCreateFail(e))} // 绘制失败回调
+            />
+          </View>
+        }
+      </View>
+    )
+  }
+}

src/moduleA/pages/invite/index.less

@@ -0,0 +1,25 @@
+.mine {
+  min-height: 100vh;
+  background-color: #000000;
+  padding: 24px;
+
+  .invite-image {
+    width: 100%;
+    height: 1052px;
+  }
+  .console{
+    display: flex;
+    justify-content: space-around;
+    .inte-button {
+      width: 216px;
+      height: 80px;
+      line-height: 80px;
+      background-image: linear-gradient(-45deg, #4EC3F8 0%, #0F84EC 100%);
+      border-radius: 40px;
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      color: #FFFFFF;
+      text-align: center;
+    }
+  }
+}

src/moduleA/pages/shareCnt/index.config.js

@@ -0,0 +1,5 @@
+export default definePageConfig({
+  navigationBarTitleText: '分销明细',
+  enableShareAppMessage: true,
+  enableShareTimeline: true ,
+})

src/moduleA/pages/shareCnt/index.jsx

@@ -0,0 +1,98 @@
+import { Component } from 'react'
+import { View, Text, Button, Image, scrollView, Input } from '@tarojs/components'
+import Taro, { } from '@tarojs/taro'
+import tool from '../../../common/tool'
+import * as api from '../../../service/index'
+import './index.less'
+
+export default class Mine extends Component {
+  state = {
+    all_coin: 0,
+    page: 1,
+    size: 20,
+    share:0,//邀请人数
+    total: true,
+    walletList: [],
+  }
+
+  componentDidShow () {
+    this.getUserShareCnt()
+  }
+  getUserShareCnt () {
+    api.getUserShareCnt({ page_size: this.state.size, page: this.state.page }).then(res => {
+      let total = true
+      if (res.data.data.length < this.state.size) {
+        total = false
+      }
+      let walletList = this.state.walletList.concat(res.data.data)
+      this.setState({
+        all_coin: res.data.all_coin,
+        walletList: walletList,
+        total: total,
+        share:res.data.share
+      })
+    })
+  }
+  onShareAppMessage = (res) => {
+    let shareData = {
+      title: tool.shareTitle,
+      path: `/pages/index/index?c=${Taro.getStorageSync('user_id')}&s=rightTap`,
+      imageUrl: tool.shareImg
+    }
+    return shareData;
+  }
+
+  onReachBottom () {
+    if (!this.state.total)return
+      this.setState({
+        page: this.state.page + 1
+      }, () => {
+        this.getUserShareCnt()
+      })
+  }
+  toBuyPage (e) {
+    Taro.navigateTo({
+      url: `/pages/earnPoints/index`
+    })
+  }
+
+  componentDidMount () { }
+
+  render () {
+    return (
+      <View className='wallet'>
+        <View className='user_info_div'>
+          <View className='user-info-top'>
+            <View className='user_info_txt_hit'>邀请人数</View>
+            <View className='user_info_money'>
+              <View className='user_info_txt_money'>{this.state.share}</View>
+              {/* <View className='user_info_btn' onClick={(e) => (this.toBuyPage(e))}  >充值点券</View> */}
+            </View>
+          </View>
+        </View>
+
+        <View className='wallet_detail_div'>
+          {
+            this.state.walletList.map((item, index) => (
+              <View className='wallet_item_list' key={index}>
+                <View className='wallet_item_list_left'>
+                  <Text className='wallet-item-title'>{item.user_name}</Text>
+                  {/* <Text className='wallet_item_list_hint'>{item.title}</Text> */}
+                </View>
+                <View className='wallet_item_list_right'>
+                  <Text className='wallet-item-title'>{item.time}</Text>
+                  {/* <Text className='wallet_item_list_hint'>{item.time}</Text> */}
+                </View>
+              </View>
+            ))
+          }
+
+        </View>
+        <View className='vallet-list-tips'>
+          暂无更多记录~
+        </View>
+
+      </View>
+    )
+  }
+}

src/moduleA/pages/shareCnt/index.less

@@ -0,0 +1,134 @@
+.wallet {
+  min-height: 100vh;
+  // background: url('https://video-h5.fyshark.com/total_picture/1665727305169.png') no-repeat;
+  background-size: 100% 100%;
+  background-color: #041129;
+
+}
+
+.user_info_div {
+  width: 100%;
+  padding-top: 52px;
+  background-repeat: no-repeat;
+  display: flex;
+  background-image: url(https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1679475362928.png);
+  // justify-content: center;
+  align-items: center;
+  position: relative;
+}
+
+.user-info-top {
+  width: 100%;
+  position: relative;
+  margin: 0 32px;
+  padding: 52px 52px;
+  margin-bottom: -12px;
+  // background: url('https://video-h5.fyshark.com/total_picture/1665727410365.png') no-repeat;
+  background-size: 100% 100%;
+
+}
+
+.wallet_detail_div {
+ 
+}
+
+.user_info_money {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.user_info_txt_money {
+  font-size: 104px;
+  font-family: DIN;
+  font-weight: bold;
+  color: #0F84EC;
+  line-height: 154px;
+}
+
+.user_info_txt_hit {
+  font-size: 28px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 0.75);;
+  opacity: 0.9;
+}
+
+.user_info_btn {
+  width: 200px;
+  height: 68px;
+  line-height: 68px;
+  text-align: center;
+  background-image: linear-gradient(-45deg, #4EC3F8 0%, #0F84EC 100%);
+  opacity: 0.8;
+  border-radius: 34px;
+  font-size: 34px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #FFFFFF;
+}
+
+.user_info_btn:active {
+  opacity: 0.6;
+}
+
+.wallet_item_list {
+  // margin: 0 26px;
+  width: 100%;
+  padding: 20px 0;
+  display: flex;
+  background: #0F1A2F;
+  justify-content: space-between;
+  margin-bottom: 2px;
+}
+
+.wallet_item_list_left {
+  margin-left: 32px;
+  margin-top: 8px;
+  display: flex;
+  flex-direction: column;
+  font-size: 24px;
+  color: rgba(255, 255, 255, 0.75);
+}
+
+.wallet-item-title {
+  font-size: 28px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 36px;
+}
+
+.wallet_item_list_hint {
+  margin-top: 12px;
+  font-size: 24px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 0.75);
+  line-height: 36px;
+  opacity: 0.6;
+}
+
+.wallet_item_list_right {
+  margin-top: 8px;
+  margin-right: 32px;
+  display: flex;
+  flex-direction: column;
+  font-size: 24px;
+  color: rgba(255, 255, 255, 0.75);
+  text-align: right;
+}
+
+.vallet-list-tips {
+  margin-top: 60px;
+  padding-bottom: 100px;
+  width: 100%;
+  text-align: center;
+  font-size: 24px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 0.75);
+  line-height: 36px;
+  opacity: 0.6;
+}

src/moduleA/pages/wallet/index.config.js

@@ -0,0 +1,5 @@
+export default definePageConfig({
+  navigationBarTitleText: '点券明细',
+  enableShareAppMessage: true,
+  enableShareTimeline: true ,
+})

src/moduleA/pages/wallet/index.jsx

@@ -0,0 +1,99 @@
+import { Component } from 'react'
+import { View, Text, Button, Image, scrollView, Input } from '@tarojs/components'
+import Taro, { } from '@tarojs/taro'
+import tool from '../../../common/tool'
+import * as api from '../../../service/index'
+import './index.less'
+
+export default class Mine extends Component {
+  state = {
+    all_coin: 0,
+    page: 1,
+    size: 20,
+    total: true,
+    walletList: [],
+  }
+
+  componentDidShow () {
+    this.getUserCoinDetail()
+  }
+  getUserCoinDetail () {
+    api.getUserCoinDetail({ page_size: this.state.size, page: this.state.page }).then(res => {
+      let total = true
+      if (res.data.data.length < this.state.size) {
+        total = false
+      }
+      let walletList = this.state.walletList.concat(res.data.data)
+      this.setState({
+        all_coin: res.data.all_coin,
+        walletList: walletList,
+        total: total
+      })
+    })
+  }
+  onShareAppMessage = (res) => {
+    let shareData = {
+      title: tool.shareTitle,
+      path: `/pages/index/index?c=${Taro.getStorageSync('user_id')}&s=rightTap`,
+      imageUrl: tool.shareImg
+    }
+    return shareData;
+  }
+
+  onReachBottom () {
+    if (!this.state.total)return
+      this.setState({
+        page: this.state.page + 1
+      }, () => {
+        this.getUserCoinDetail()
+      })
+  }
+  toBuyPage (e) {
+    Taro.navigateTo({
+      url: `/pages/earnPoints/index`
+    })
+  }
+
+  componentDidMount () { }
+
+  render () {
+    return (
+      <View className='wallet'>
+        <View className='user_info_div'>
+          <View className='user-info-top'>
+            <View className='user_info_txt_hit'>我的点券</View>
+            <View className='user_info_money'>
+              <View className='user_info_txt_money'>{this.state.all_coin}</View>
+              <View className='user_info_btn' onClick={(e) => (this.toBuyPage(e))}  >充值点券</View>
+            </View>
+          </View>
+        </View>
+
+        <View className='wallet_detail_div'>
+          {
+            this.state.walletList.map((item, index) => (
+
+              <View className='wallet_item_list' key={index}>
+                <View className='wallet_item_list_left'>
+                  <Text className='wallet-item-title'>{item.title}</Text>
+                  {/* <Text className='wallet_item_list_hint'>{item.title}</Text> */}
+                </View>
+                <View className='wallet_item_list_right'>
+                  <Text className='wallet-item-title'>{item.coin}</Text>
+                  <Text className='wallet_item_list_hint'>{item.time}</Text>
+                </View>
+
+              </View>
+
+            ))
+          }
+
+        </View>
+        <View className='vallet-list-tips'>
+          暂无更多记录~
+        </View>
+
+      </View>
+    )
+  }
+}

src/moduleA/pages/wallet/index.less

@@ -0,0 +1,134 @@
+.wallet {
+  min-height: 100vh;
+  // background: url('https://video-h5.fyshark.com/total_picture/1665727305169.png') no-repeat;
+  background-size: 100% 100%;
+  background-color: #041129;
+
+}
+
+.user_info_div {
+  width: 100%;
+  padding-top: 52px;
+  background-repeat: no-repeat;
+  display: flex;
+  background-image: url(https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1679475362928.png);
+  // justify-content: center;
+  align-items: center;
+  position: relative;
+}
+
+.user-info-top {
+  width: 100%;
+  position: relative;
+  margin: 0 32px;
+  padding: 52px 52px;
+  margin-bottom: -12px;
+  // background: url('https://video-h5.fyshark.com/total_picture/1665727410365.png') no-repeat;
+  background-size: 100% 100%;
+
+}
+
+.wallet_detail_div {
+ 
+}
+
+.user_info_money {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.user_info_txt_money {
+  font-size: 104px;
+  font-family: DIN;
+  font-weight: bold;
+  color: #0F84EC;
+  line-height: 154px;
+}
+
+.user_info_txt_hit {
+  font-size: 28px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 0.75);;
+  opacity: 0.9;
+}
+
+.user_info_btn {
+  width: 200px;
+  height: 68px;
+  line-height: 68px;
+  text-align: center;
+  background-image: linear-gradient(-45deg, #4EC3F8 0%, #0F84EC 100%);
+  opacity: 0.8;
+  border-radius: 34px;
+  font-size: 34px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #FFFFFF;
+}
+
+.user_info_btn:active {
+  opacity: 0.6;
+}
+
+.wallet_item_list {
+  // margin: 0 26px;
+  width: 100%;
+  padding: 20px 0;
+  display: flex;
+  background: #0F1A2F;
+  justify-content: space-between;
+  margin-bottom: 2px;
+}
+
+.wallet_item_list_left {
+  margin-left: 32px;
+  margin-top: 8px;
+  display: flex;
+  flex-direction: column;
+  font-size: 24px;
+  color: rgba(255, 255, 255, 0.75);
+}
+
+.wallet-item-title {
+  font-size: 28px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 36px;
+}
+
+.wallet_item_list_hint {
+  margin-top: 12px;
+  font-size: 24px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 0.75);
+  line-height: 36px;
+  opacity: 0.6;
+}
+
+.wallet_item_list_right {
+  margin-top: 8px;
+  margin-right: 32px;
+  display: flex;
+  flex-direction: column;
+  font-size: 24px;
+  color: rgba(255, 255, 255, 0.75);
+  text-align: right;
+}
+
+.vallet-list-tips {
+  margin-top: 60px;
+  padding-bottom: 100px;
+  width: 100%;
+  text-align: center;
+  font-size: 24px;
+  font-family: PingFang SC;
+  font-weight: 400;
+  color: rgba(255, 255, 255, 0.75);
+  line-height: 36px;
+  opacity: 0.6;
+}

src/pages/activity/index.config.js

@@ -0,0 +1,5 @@
+export default definePageConfig({
+  navigationBarTitleText: '社区',
+  enableShareAppMessage: true,
+  enableShareTimeline: true ,
+})

src/pages/activity/index.jsx

@@ -0,0 +1,158 @@
+import { Component } from 'react'
+import { View, Text, Button, Image, scrollView, Input } from '@tarojs/components'
+import * as api from '../../service/index'
+import tool from '../../common/tool'
+import Taro, { } from '@tarojs/taro'
+import './index.less'
+
+export default class collection extends Component {
+  state = {
+    tableIndex: 0,
+    total: false,
+    page: 1,
+    page_size: 20,
+    cardinalInfos: [],//基数
+    evenInfos: [],//偶数
+    type: 'hot',//hot:热门，time:最新
+  }
+
+  componentWillMount () {
+    // this.setInit(1, 'hot')
+  }
+  componentDidShow(){
+    this.setInit(1, 'hot')
+  }
+  setInit (page, type) {
+    this.setState({
+      total: false,//是否加载完
+      page: 1,
+      page_size: 20,
+      cardinalInfos: [],//基数
+      evenInfos: [],//偶数
+    })
+    this.getHubList(page, type)
+  }
+  onShareAppMessage = (res) => {
+    let shareData = {
+      title:tool.shareTitle,
+      path: `/pages/index/index?c=${Taro.getStorageSync('user_id')}&s=rightTap`,
+      imageUrl: tool.shareImg
+    }
+    return shareData;
+  }
+
+  getHubList (page, type) {
+    let params = {
+      page: page,
+      page_size: this.state.page_size,
+      otype: type
+    }
+    Taro.showLoading({
+      title: '加载中',
+    })
+    api.getHubList(params).then(res => {
+      if (res.code == 200) {
+        Taro.hideLoading()
+        let _evenInfos = res.data.filter((item, index) => {
+          return index % 2 == 1
+        })
+        let _cardinalInfos = res.data.filter((item, index) => {
+          return index % 2 == 0
+        })
+        console.log(_cardinalInfos, '_cardinalInfos');
+        let cardinalInfos = this.state.cardinalInfos.concat(_cardinalInfos)
+        let evenInfos = this.state.evenInfos.concat(_evenInfos)
+        this.setState({
+          cardinalInfos: cardinalInfos,//基数
+          evenInfos: evenInfos,//偶数
+          total: res.data.length < 20 ? true : false
+        })
+      }
+    })
+  }
+  onReachBottom () {
+    if (!this.state.total) {
+      this.setState({
+        page: this.state.page + 1
+      })
+      this.getHubList((this.state.page + 1), this.state.type)
+    }
+  }
+  componentDidHide () { }
+  changeTab (index) {
+    let _type = index == 0 ? 'hot' : 'time'
+    this.setState({
+      tableIndex: index,
+      type: _type
+    })
+    this.setInit(1, _type)
+  }
+  detail (item, index) {
+    console.log(item, 'item');
+    Taro.navigateTo({
+      url: `/pages/communityDetail/index?task_id=${item.id}`
+    })
+  }
+
+  render () {
+    return (
+      <View className='mine'>
+        <View className='table'>
+          <View className='table-info' onClick={e => (this.changeTab(0))} style={this.state.tableIndex == 0 ? 'font-size: 20px;color: #FFFFFF;border-bottom: 4px solid #0F84EC;' : ''}>热门</View>
+          <View className='table-info' onClick={e => (this.changeTab(1))} style={this.state.tableIndex == 1 ? 'font-size: 20px;color: #FFFFFF;border-bottom: 4px solid #0F84EC;' : ''}>最新</View>
+        </View>
+        <View className='image-list'>
+          <View className='list-left'>
+            {
+              this.state.cardinalInfos.map((item, index) => (
+                <View className='image-info' key={index} onClick={e => (this.detail(item, index))}>
+                  <View className='info-top'>
+                    <Image className='info-img' lazyLoad mode='widthFix' src={item.img}></Image>
+                  </View>
+                  <View className='info-bottom'>
+                    <View className='info-name'></View>
+                    <View className='info-tips'>
+                      <View className='info-tips-left'>
+                        <Image className='info-head-img' src={item.user_info.head_img}></Image>
+                        <View className='info-sampling'>{tool.ellipsis(item.user_info.user_name, 8)}</View>
+                      </View>
+                      <View className='info-tips-right'>
+                        <Image className='info-like-img' src={item.has_like == 0 ? 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1679296882735.png' : 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1679296893058.png'}></Image>
+                        <View className='like-num'>{item.like_cnt}</View>
+                      </View>
+                    </View>
+                  </View>
+                </View>
+              ))
+            }
+          </View>
+          <View className='list-right'>
+            {
+              this.state.evenInfos.map((item, index) => (
+                <View className='image-info' key={index} onClick={e => (this.detail(item, index))}>
+                  <View className='info-top'>
+                    <Image className='info-img' lazyLoad mode='widthFix' src={item.img}></Image>
+                  </View>
+                  <View className='info-bottom'>
+                    <View className='info-name'></View>
+                    <View className='info-tips'>
+                      <View className='info-tips-left'>
+                        <Image className='info-head-img' src={item.user_info.head_img}></Image>
+                        <View className='info-sampling'>{tool.ellipsis(item.user_info.user_name, 8)}</View>
+                      </View>
+                      <View className='info-tips-right'>
+                        <Image className='info-like-img' src={item.has_like == 0 ? 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1679296882735.png' : 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1679296893058.png'}></Image>
+                        <View className='like-num'>{item.like_cnt}</View>
+                      </View>
+                    </View>
+                  </View>
+                </View>
+              ))
+            }
+          </View>
+
+        </View>
+      </View>
+    )
+  }
+}

src/pages/activity/index.less

@@ -0,0 +1,95 @@
+.mine {
+  padding: 48px 32px;
+  min-height: 100vh;
+  background-color: #041129;
+
+  .table {
+    display: flex;
+    .table-info {
+      font-family: PingFangSC-Regular;
+      font-size: 32px;
+      color: rgba(255, 255, 255, .75);
+      letter-spacing: 0;
+      height: 60px;
+      line-height: 60px;
+      padding: 0 10px;
+      margin-right: 20px;
+    }
+  }
+
+  .image-list {
+    margin-top: 50px;
+    display: flex;
+    justify-content: space-between;
+
+    .list-left {
+      width: 330px;
+    }
+
+    .list-right {
+      width: 330px;
+    }
+
+    .image-info {
+      margin-top: 20px;
+      border-radius: 8px;
+      border: 2px solid rgba(15, 132, 236, 1);
+
+      .info-top {
+        width: 100%;
+
+        .info-img {
+          width: 100%;
+          min-height: 360px;
+          display: block;
+        }
+      }
+
+      .info-bottom {
+        padding: 20px 22px;
+
+        .info-name {
+          font-family: PingFangSC-Medium;
+          font-size: 28px;
+          color: #FFFFFF;
+        }
+
+        .info-tips {
+          margin-top: 8px;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          font-family: PingFangSC-Regular;
+          font-size: 20px;
+          color: rgba(255, 255, 255, .75);
+
+          .info-tips-left {
+            display: flex;
+            align-items: center;
+          }
+
+          .info-tips-right {
+            display: flex;
+            align-items: center;
+          }
+
+          .info-head-img {
+            width: 32px;
+            height: 32px;
+          }
+
+          .info-sampling {
+            margin-left: 8px;
+          }
+
+          .info-like-img {
+            margin-left: 10px;
+            width: 28px;
+            height: 24px;
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+}

src/pages/communityDetail/index.jsx

@@ -338,10 +338,9 @@ export default class Task extends Component {
   }
 
   copyPrompt () {
-    Taro.setClipboardData({
-      data: this.state.task_info.prompt,
-      success: function (res) {
-      }
+    let routers = this.$instance.router.params
+    Taro.reLaunch({
+      url: `/pages/index/index?task_id=${routers.task_id}`
     })
   }
 
@@ -406,8 +405,7 @@ export default class Task extends Component {
             />
             <View className='copy'>
               <View className='copy-button' onClick={e => (this.copyPrompt())}>
-                <Image className='copy-icon' src='https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1679017836200.png'></Image>
-                <View>复制</View>
+                <View>画同款</View>
               </View>
             </View>
 
@@ -425,10 +423,14 @@ export default class Task extends Component {
               <View className='info-title'>图片尺寸</View>
               <View className='info-text'>{this.state.task_info.img_size} </View>
             </View>
-            {/* <View className='draw-info'>
+            <View className='draw-info'>
               <View className='info-title'>图片质量</View>
-              <View className='info-text'>{} </View>
-            </View> */}
+              <View className='info-text'>{this.state.task_info.img_type==0?'普通':'高清'} </View>
+            </View>
+            <View className='draw-info'>
+              <View className='info-title'>采样方式</View>
+              <View className='info-text'>{this.state.task_info.sampler} </View>
+            </View>
           </View>
           <View className='draw-title'>绘画不要的元素</View>
           <View className='draw-text'>
@@ -440,12 +442,12 @@ export default class Task extends Component {
               maxlength='1000'
               disabled
             />
-            <View className='copy'>
+            {/* <View className='copy'>
               <View className='copy-button' onClick={e => (this.copyNegativePrompt())}>
                 <Image className='copy-icon' src='https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1679017836200.png'></Image>
                 <View>复制</View>
               </View>
-            </View>
+            </View> */}
           </View>
         </View>
         <View className='func'>

src/pages/communityDetail/index.less

@@ -18,6 +18,7 @@
     padding: 0 30px;
 
     .user-text {
+      margin-top: 30px;
       display: flex;
       justify-content: space-between;
       font-family: PingFangSC-Regular;
@@ -76,8 +77,8 @@
         .copy-button {
           display: flex;
           align-items: center;
-          border: 2px solid #0F84EC;
-          color: #0F84EC;
+          color: #FFFFFF;
+          background-image: linear-gradient(-45deg, #4EC3F8 0%, #0F84EC 100%);
           font-size: 24px;
           padding: 5px 20px;
           border-radius: 30px;

src/pages/darwDetail/index.jsx

@@ -447,7 +447,7 @@ export default class Task extends Component {
           {
             this.state.draw_status != 2 &&
             <View className='banner-tips'>
-              预计等待{Math.floor((this.state.que_cnt - 1)*0.2+1)}分钟...
+              预计等待{Math.ceil((this.state.que_cnt - 1)*0.2+1)}分钟...
             </View>
           }
         </Swiper>
@@ -483,10 +483,14 @@ export default class Task extends Component {
               <View className='info-title'>图片尺寸</View>
               <View className='info-text'>{this.state.draw_data.img_size} </View>
             </View>
-            {/* <View className='draw-info'>
+            <View className='draw-info'>
               <View className='info-title'>图片质量</View>
-              <View className='info-text'>{} </View>
-            </View> */}
+              <View className='info-text'>{this.state.draw_data.img_type==0?'普通':'高清'} </View>
+            </View>
+            <View className='draw-info'>
+              <View className='info-title'>采样方式</View>
+              <View className='info-text'>{this.state.draw_data.sampler} </View>
+            </View>
           </View>
           <View className='draw-title'>绘画不要的元素</View>
           <View className='draw-text'>

src/pages/earnPoints/index.jsx

@@ -63,6 +63,19 @@ export default class Task extends Component {
     })
   }
   finishTask (item, index) {
+    if (item.status != 0) return
+    if (item.btn_title == '去点赞') {
+      Taro.switchTab({
+        url: '/pages/collection/index'
+      })
+      return
+    }
+    if (item.btn_title == '邀请') {
+      Taro.navigateTo({
+        url: '/moduleA/pages/invite/index'
+      })
+      return
+    }
     api.finishTask({ task_id: item.id }).then(res => {
       if (res.code == 200) {
         this.getUserInfo()
@@ -70,6 +83,11 @@ export default class Task extends Component {
       }
     })
   }
+  toShareCnt () {
+    Taro.navigateTo({
+      url: '/moduleA/pages/shareCnt/index'
+    })
+  }
   //充值
   toOrder (item, index) {
     let that = this
@@ -161,7 +179,7 @@ export default class Task extends Component {
       <View className='mine'>
         <View className='banner'>
           <View className='banner-left'>
-            <View className='banner-title'>剩余积分：</View>
+            <View className='banner-title'>剩余点券：</View>
             <View className='banner-num'>{this.state.userInfo.total_coin}</View>
           </View>
           <View className='banner-right'>
@@ -181,6 +199,17 @@ export default class Task extends Component {
             ))
           }
           {
+            //分销用户
+            this.state.userInfo.p_user_id == 1 &&
+            <View className='register'>
+              <View className='register-left'>
+                <View className='register-title'><Image className='register-icon' src='http://video-img.fyshark.com/1680060033169%E5%88%86%E9%94%80.png' ></Image> 分销明细</View>
+                {/* <View className='register-tips'>{item.sub_title}</View> */}
+              </View>
+              <View className='register-right' onClick={e => (this.toShareCnt())}>查看</View>
+            </View>
+          }
+          {
             !this.state.isIos &&
             < View >
               <View className='contact-title'>

src/pages/index/index.jsx

@@ -1,19 +1,21 @@
 import { Component } from 'react'
-import { View, Text, Button, Image, scrollView, Input, Textarea, Slider } from '@tarojs/components'
+import { View, Text, Button, Image, ScrollView, Input, Textarea, Slider, Block } from '@tarojs/components'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
 import tool from '../../common/tool'
+import { AtFloatLayout } from 'taro-ui'
+import "taro-ui/dist/style/components/float-layout.scss";
 import * as api from '../../service/index'
 
 import './index.less'
 
 export default class Mine extends Component {
-
+  $instance = getCurrentInstance()
   state = {
     models: [],//模板
     imgSize: [],//图片尺寸
     sampling: [],//采样方式
     samplingIndex: 0,//当前选择的采样方式
-    loraIndex: 0,//当前选择的lora
+    loraIndex: 0,//当前选择的风格
     sizeIndex: 0,//当前选择的尺寸
     isOpen: false,
     value: '',//绘画描述
@@ -22,13 +24,39 @@ export default class Mine extends Component {
     sliderNum: 7,//色彩丰富度
     drawNum: 1,//图片数量
     mass: 0,//图片质量
+    tmplIds: [],//订阅列标
+    tags: [],//标签列表
+    tagsIndex: 0,//当前选择的主标签
+    isTags: false,//是否打开标签弹窗
+    consultImg: '',//参考图
   }
 
   componentDidShow () {
     this.getDrawIndex()
+    this.getWxTemplate()
+    this.getTagsDev()
   }
 
-  componentDidMount () { }
+  componentDidMount () {
+
+  }
+
+  getTagsDev () {
+    api.getTagsDev().then(res => {
+      if (res.code == 200) {
+        let _tags = res.data
+        _tags.forEach(item => {
+          item.tags.forEach(e => {
+            e['isSelect'] = false
+          })
+        })
+        console.log(_tags, '_tags');
+        this.setState({
+          tags: _tags
+        })
+      }
+    })
+  }
 
   onShareAppMessage = (res) => {
     let shareData = {
@@ -49,10 +77,65 @@ export default class Mine extends Component {
           models: res.data.models,
           imgSize: res.data.img_size,
           sampling: res.data.Sampler
+        }, () => {
+          let routers = this.$instance.router.params
+          console.log(routers, 'rou');
+          if (routers.task_id) {
+            Taro.showLoading({
+              title: '加载中',
+            })
+            this.getDrawTaskStatus()
+          }
         })
       }
     })
   }
+  //获取同款信息
+  getDrawTaskStatus () {
+    let routers = this.$instance.router.params
+    api.getImgDetail({ img_id: routers.task_id }).then(res => {
+      Taro.hideLoading()
+      if (res.code == 200) {
+        let model_id_index = 0
+        this.state.models.forEach((item, index) => {
+          if (item.id == res.data.task_info.model_id) {
+            model_id_index = index
+          }
+        });
+        let style_id_index = 0
+        this.state.models[model_id_index].lora_infos.forEach((item, index) => {
+          if (item.id == res.data.task_info.style_id) {
+            style_id_index = index
+          }
+        })
+        let _sizeIndex = 0
+        this.state.imgSize.forEach((item, index) => {
+          if (res.data.task_info.img_size == item.name) {
+            _sizeIndex = index
+          }
+        })
+        let _samplingIndex = 0
+        this.state.sampling.forEach((item, index) => {
+          if (item == res.data.task_info.sampler) {
+            _samplingIndex = index
+          }
+        })
+
+        //定时器不要轻易改，避免造成服务器攻击
+        if (res.code == 200) {
+          this.setState({
+            value: res.data.task_info.prompt,
+            negativeValue: res.data.task_info.negative_prompt,
+            modelIndex: model_id_index,
+            loraIndex: style_id_index,
+            sizeIndex: _sizeIndex,
+            mass: res.data.task_info.img_type,
+            samplingIndex: _samplingIndex
+          })
+        }
+      }
+    })
+  }
   getRadomPrompt () {
     api.getRadomPrompt().then(res => {
       if (res.code == 200) {
@@ -65,14 +148,14 @@ export default class Mine extends Component {
       }
     })
   }
-  deleteDrawText(){
+  deleteDrawText () {
     this.setState({
-      value:''
+      value: ''
     })
   }
-  deleteNegativeValue(){
+  deleteNegativeValue () {
     this.setState({
-      negativeValue:''
+      negativeValue: ''
     })
   }
   onInput (e) {
@@ -139,6 +222,56 @@ export default class Mine extends Component {
       mass: e
     })
   }
+  getWxTemplate () {
+    api.getWxTemplate().then(res => {
+      let tmplIds = []
+      res.data.forEach(item => {
+        tmplIds.push(item.template_id)
+      })
+      this.setState({
+        tmplIds: tmplIds
+      })
+    })
+  }
+  //订阅
+  subscribe (task_id) {
+    let that = this
+    console.log('订阅', this.state.tmplIds);
+    Taro.requestSubscribeMessage({
+      tmplIds: this.state.tmplIds,
+      success: function (item) {
+        console.log('订阅成功');
+        if (item.errMsg === 'requestSubscribeMessage:ok') {
+          let keys = Object.keys(item);
+          let tempids = [];
+
+          keys.forEach(element => {
+            if (item[element] == "accept") {
+              tempids.push(element)
+            }
+          });
+          console.log(tempids, 'tempidstempids');
+          let pramas = {
+            task_id: task_id,
+            template_ids: tempids
+          }
+          api.subscribeTemplate(pramas)
+        }
+        Taro.showToast({
+          title: '已订阅',
+          icon: 'none',
+          duration: 2000
+        })
+      },
+
+      complete: function (res) {
+      },
+
+      fail: function (res) {
+      }
+
+    })
+  }
   //生成图片
   generatePictures () {
     Taro.showLoading({
@@ -147,44 +280,124 @@ export default class Mine extends Component {
 
     console.log('生成图片');
     console.log();
-    setTimeout(() => {
-      if (this.state.value.length == 0) {
+    // setTimeout(() => {
+    if (this.state.value.length == 0) {
+      Taro.showToast({
+        title: `请填写绘画描述`,
+        icon: 'error',
+      });
+      return
+    }
+    let pramas = {
+      // model_name: this.state.models[this.state.modelIndex].model_name,
+      // file_name: this.state.models[this.state.modelIndex].lora_infos.length > 0 ? this.state.models[this.state.modelIndex].lora_infos[this.state.loraIndex].file_name : '',
+      model_id: this.state.models[this.state.modelIndex].id,
+      style_id: this.state.models[this.state.modelIndex].lora_infos.length > 0 ? this.state.models[this.state.modelIndex].lora_infos[this.state.loraIndex].id : 0,
+      img_size: this.state.imgSize[this.state.sizeIndex].name,
+      img_cnt: this.state.drawNum,
+      cfg_scale: this.state.sliderNum,
+      sampler: this.state.sampling[this.state.samplingIndex],
+      prompt: this.state.value,
+      negative_prompt: this.state.negativeValue,
+      img_type: this.state.mass,
+      img_url: this.state.consultImg
+    }
+    api.drawTxt2img(pramas).then(res => {
+      if (res.code == 200) {
+        Taro.hideLoading()
+        this.subscribe(res.data.task_id)
+        Taro.navigateTo({
+          url: `/pages/darwDetail/index?task_id=${res.data.task_id}`
+        })
+      } else {
+        Taro.hideLoading()
         Taro.showToast({
-          title: `请填写绘画描述`,
+          title: res.msg,
           icon: 'error',
         });
-        return
       }
-      let pramas = {
-        // model_name: this.state.models[this.state.modelIndex].model_name,
-        // file_name: this.state.models[this.state.modelIndex].lora_infos.length > 0 ? this.state.models[this.state.modelIndex].lora_infos[this.state.loraIndex].file_name : '',
-        model_id: this.state.models[this.state.modelIndex].id,
-        style_id: this.state.models[this.state.modelIndex].lora_infos.length > 0 ? this.state.models[this.state.modelIndex].lora_infos[this.state.loraIndex].id : 0,
-        img_size: this.state.imgSize[this.state.sizeIndex].name,
-        img_cnt: this.state.drawNum,
-        cfg_scale: this.state.sliderNum,
-        sampler: this.state.sampling[this.state.samplingIndex],
-        prompt: this.state.value,
-        negative_prompt: this.state.negativeValue,
-        img_type: this.state.mass
+    })
+    // }, 1000)
+  }
+  toChat (e) {
+  }
+  //选择标签
+  selectedLabel (item, index) {
+    this.setState({
+      tagsIndex: index,
+      isTags: true
+    })
+  }
+  //选择子标签
+  selectedSubtag (item, index) {
+    let tags = this.state.tags
+    tags[this.state.tagsIndex].tags[index].isSelect = !tags[this.state.tagsIndex].tags[index].isSelect
+    this.setState({
+      tags: tags
+    })
+  }
+  //确定标签
+  defineSubtag () {
+    console.log('defineSubtag');
+    let nowSelectTag = []
+    let value = this.state.value
+    let nowSelectTagObj = ''
+    this.state.tags[this.state.tagsIndex].tags.forEach(item => {
+      if (item.isSelect) {
+        nowSelectTag.push(item.zh_name)
       }
-      api.drawTxt2img(pramas).then(res => {
-        if (res.code == 200) {
-          Taro.hideLoading()
-          Taro.navigateTo({
-            url: `/pages/darwDetail/index?task_id=${res.data.task_id}`
-          })
-        } else {
-          Taro.hideLoading()
-          Taro.showToast({
-            title: res.msg,
-            icon: 'error',
-          });
-        }
+    })
+    nowSelectTagObj = nowSelectTag.toString()
+    let _value = value.length > 0 ? `${value},${nowSelectTagObj}` : nowSelectTagObj
+    this.setState({
+      value: _value,
+      isTags: !this.state.isTags
+    }, () => {
+      let _tags = this.state.tags
+      _tags.forEach(item => {
+        item.tags.forEach(e => {
+          e['isSelect'] = false
+        })
       })
-    }, 1000)
+      this.setState({
+        tags: _tags
+      })
+    })
   }
-  toChat (e) {
+  onClose (e) {
+    console.log('onClose');
+    this.setState({
+      isTags: false
+    })
+  }
+  //上传参考图
+  upLode () {
+    let that = this
+    Taro.chooseMedia({
+      count: 1, // 默认9
+      sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
+      sourceType: ['album', 'camera'],
+      success: function (res) {
+        console.log(res, 'res');
+        const file = res.tempFiles[0].tempFilePath
+        if (res.tempFiles[0].size > 2000000) {
+          Taro.showToast({ title: '图片大小不能超过2M', icon: 'none' })
+          return
+        }
+        Taro.showLoading({
+          title: '图片上传中',
+        })
+        let base64Img = Taro.getFileSystemManager().readFileSync(file, 'base64')
+        api.uploadImg({ img_data: base64Img }).then(res => {
+          if (res.code == 200) {
+            Taro.hideLoading()
+            that.setState({
+              consultImg: res.data
+            })
+          }
+        })
+      }
+    })
   }
 
   render () {
@@ -194,13 +407,6 @@ export default class Mine extends Component {
           <Image className='banner-image' src=''></Image>
         </View> */}
         <View className='draw-content'>
-          {/* <View className='draw-brack'>
-            <View className='draw-tab'>
-              <View className='tab-text' style={'background: #0F84EC;color: #FFFFFF;'}>AI绘画</View>
-              <View className='tab-text'>人物头像</View>
-              <View className='tab-text'>风景头像</View>
-            </View>
-          </View> */}
           <View className='draw-title'>绘画描述</View>
           <View className='draw-text'>
             <View className='recommend'>
@@ -221,6 +427,47 @@ export default class Mine extends Component {
             }
             <View className='textarea-num' id='textarea-num'>{this.state.value.length}/1000</View>
           </View>
+          <View className='draw-title'>选择标签</View>
+          <ScrollView
+            className='recharge'
+            scrollX
+          >
+            {
+              this.state.tags.map((item, index) => (
+                <View className='recharge-info'
+                  key={index}
+                  onClick={e => (this.selectedLabel(item, index))}>
+                  {item.name}
+                </View>
+              ))
+            }
+          </ScrollView>
+          <Block>
+            {
+              this.state.isTags &&
+              <AtFloatLayout isOpened scrollX title={this.state.tags[this.state.tagsIndex].name} onClose={e => (this.onClose(e))}>
+                <View className='layout-content'>
+                  {
+                    this.state.tags[this.state.tagsIndex].tags.map((item, index) => (
+                      <View className='layout-block'
+                        key={index}
+                        style={item.isSelect ? ' border: 2px solid #0F84EC;background: #0F84EC;color: #FFFFFF;' : 'border: 2px solid rgba(2, 2, 2, 0.75); color: rgba(2, 2, 2, 0.75);background: #FFFFFF;'}
+                        onClick={e => (this.selectedSubtag(item, index))}
+                      >
+                        {item.zh_name}
+                      </View>
+                    ))
+                  }
+                </View>
+
+                <View className='selection'>
+                  <View className='selection-botton' onClick={e => (this.defineSubtag())}>
+                    确定标签
+                  </View>
+                </View>
+              </AtFloatLayout>
+            }
+          </Block>
           <View className='draw-title'>选择模型</View>
           <View className='model-list'>
             {
@@ -248,13 +495,13 @@ export default class Mine extends Component {
             }
           </View>
           {
-            this.state.models.length>6&&
-          <View className='isOpen'>
-            <View className='open-content' onClick={e => (this.changeOpen())}>
-              <View className='open-title'>{!this.state.isOpen ? '展开' : '收起'}</View>
-              <Image className='open-img' src={!this.state.isOpen ? 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1678935050487.png' : 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1678935114571.png'}></Image>
+            this.state.models.length > 6 &&
+            <View className='isOpen'>
+              <View className='open-content' onClick={e => (this.changeOpen())}>
+                <View className='open-title'>{!this.state.isOpen ? '展开' : '收起'}</View>
+                <Image className='open-img' src={!this.state.isOpen ? 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1678935050487.png' : 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1678935114571.png'}></Image>
+              </View>
             </View>
-          </View>
           }
           {
             this.state.models[this.state.modelIndex] &&
@@ -273,6 +520,17 @@ export default class Mine extends Component {
               </View>
             </View>
           }
+          <View className='draw-title'>上传参考图</View>
+          <View className='consult'>
+            {
+              this.state.consultImg.length == 0 ?
+                <View className='consult-content' onClick={e => (this.upLode())}>
+                  +
+                </View>
+                :
+                <Image className='consult-img' mode='aspectFit' onClick={e => (this.upLode())} src={this.state.consultImg}></Image>
+            }
+          </View>
           <View className='draw-title'>色彩丰富度</View>
           <View className='components-page'>
             <Slider style={'margin: 10px 0;'} showValue step={1} max={15} min={1} activeColor='#0F84EC' value={this.state.sliderNum} />
@@ -282,7 +540,7 @@ export default class Mine extends Component {
             {
               this.state.imgSize.map((item, index) => (
                 <View className='measurement-info' style={this.state.sizeIndex == index ? 'border: 2px solid #0F84EC;' : ''} key={index} onClick={e => (this.changeMeasurement(item, index))}>
-                  <Image className='measurement-img' src=''></Image>
+                  <Image className='measurement-img' src={item.img}></Image>
                   <View className='measurement-title'>{item.name}</View>
                 </View>
               ))
@@ -317,7 +575,7 @@ export default class Mine extends Component {
               onInput={e => (this.onInputNegative(e))}
               onBlur={e => (this.onBlurNegative(e))}
               maxlength='1000' />
-              {
+            {
               this.state.negativeValue.length > 0 &&
               <Image className='delete-draw-text' src='https://we-spa.oss-cn-shenzhen.aliyuncs.com/total_picture/1679637370560.png' onClick={e => (this.deleteNegativeValue())}></Image>
             }
@@ -325,7 +583,7 @@ export default class Mine extends Component {
           </View>
         </View>
         <View className='generate-pictures' onClick={e => (this.generatePictures(e))} >
-          生成图片（消耗{this.state.drawNum * 2 * (this.state.mass + 1)}积分）
+          生成图片（消耗{this.state.drawNum * 2 * (this.state.mass + 1)}点券）
         </View>
       </View>
     )

src/pages/index/index.less

@@ -46,6 +46,65 @@
       color: #FFFFFF;
     }
 
+    .recharge {
+      margin-top: 30px;
+      width: 100%;
+      white-space: nowrap;
+
+      .recharge-info {
+
+        padding: 0 38px;
+        height: 80px;
+        line-height: 80px;
+        display: inline-block;
+        margin-right: 24px;
+        border: 2px solid rgba(255, 255, 255, .75);
+        color: rgba(255, 255, 255, .75);
+        border-radius: 40px;
+        font-family: PingFangSC-Regular;
+        font-size: 28px;
+        text-align: center;
+      }
+    }
+
+    .layout-block {
+      margin-top: 20px;
+      padding: 0 38px;
+      height: 80px;
+      line-height: 80px;
+      display: inline-block;
+      margin-right: 24px;
+      border: 2px solid rgba(2, 2, 2, 0.75);
+      color: rgba(2, 2, 2, 0.75);
+      border-radius: 40px;
+      font-family: PingFangSC-Regular;
+      font-size: 28px;
+      text-align: center;
+
+    }
+    .layout-content{
+      padding-bottom: 120px;
+    }
+
+    .selection {
+      position: fixed;
+      bottom: 20px;
+      z-index: 1000;
+      transform: translateX(-50%);
+      left: 50%;
+      .selection-botton{
+        padding: 0 38px;
+        height: 80px;
+        line-height: 80px;
+        background: #0F84EC;
+        border-radius: 20px;
+        font-family: PingFangSC-Medium;
+        font-size: 28px;
+        color: #FFFFFF;
+
+      }
+    }
+
     .draw-text {
       margin-top: 30px;
       position: relative;
@@ -90,7 +149,8 @@
         text-align: end;
         color: rgba(255, 255, 255, .5);
       }
-      .delete-draw-text{
+
+      .delete-draw-text {
         position: absolute;
         right: 5px;
         bottom: 65px;
@@ -207,6 +267,7 @@
       flex-wrap: wrap;
 
       .measurement-info {
+        position: relative;
         margin: 0 20px;
         width: 116px;
         box-sizing: border-box;
@@ -216,8 +277,12 @@
       }
 
       .measurement-img {
-        width: 100px;
-        height: 60px;
+        margin-top: 22px;
+        position: relative;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 48px;
+        height: 48px;
       }
 
       .measurement-title {
@@ -323,11 +388,30 @@
     position: fixed;
     bottom: 40px;
     left: 50%;
-    z-index: 1000;
+    z-index: 100;
     transform: translateX(-50%);
     background-image: linear-gradient(-49deg, #5D81FF 0%, #0F84EC 100%);
     font-family: PingFangSC-Regular;
     font-size: 28px;
     color: #FFFFFF;
   }
+  .consult{
+    margin-top: 20px;
+    .consult-content{
+      width: 222px;
+      height: 218px;
+      border: 1px dashed rgba(255,255,255,.4);
+      background: url(http://video-img.fyshark.com/1679900121628%E8%BE%B9%E8%A7%92.png);
+      background-size: 100% 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      font-size: 48px;
+      color: rgba(15,132,236,1);
+    }
+    .consult-img{
+      width: 222px;
+      height: 218px;
+    }
+  }
 }

src/pages/mine/index.jsx

@@ -232,6 +232,11 @@ export default class Mine extends Component {
       url: `/pages/earnPoints/index`
     })
   }
+  wallet(){
+    Taro.navigateTo({
+      url: `/moduleA/pages/wallet/index`
+    })
+  }
 
   componentDidMount () { }
 
@@ -246,8 +251,9 @@ export default class Mine extends Component {
                 <View className='info-top'>
                   <View className='user-name'>{this.state.userInfo.user_name}</View>
                 </View>
-                <View className='info-bottom'>
+                <View className='info-bottom' onClick={e=>(this.wallet())}>
                   <View className='integral'>点券：{this.state.userInfo.total_coin}</View>
+                  <Image className='integral-img' src='http://video-img.fyshark.com/1680055380074%E7%A7%AF%E5%88%86%E6%98%8E%E7%BB%86.png'></Image>
                 </View>
               </View>
             </View>

src/pages/mine/index.less

@@ -39,12 +39,20 @@
 
         .info-bottom {
           display: flex;
+          align-items: center;
 
           .integral {
             font-family: PingFangSC-Regular;
             font-size: 28px;
             color: rgba(255, 255, 255, .75);
           }
+
+          .integral-img {
+            margin-left: 10px;
+            width: 28px;
+            height: 28px;
+            display: block;
+          }
         }
       }
     }

src/service/index.js

@@ -121,6 +121,52 @@ export const userDelImg = data =>
     method: 'POST',
     data,
   });
- 
+//获取订阅模板
+export const getWxTemplate = data =>
+  Request({
+    url: '/api/get_wx_template',
+    method: 'POST',
+    data,
+  });
+
+//订阅上传
+export const subscribeTemplate = data =>
+  Request({
+    url: '/api/subscribe_template',
+    method: 'POST',
+    data,
+  });
+
+//获取标签
+export const getTagsDev = data =>
+  Request({
+    url: '/api/get_tags_dev',
+    method: 'POST',
+    data,
+  });
+//上传图片
+export const uploadImg = data =>
+  Request({
+    url: '/api/image2url',
+    method: 'POST',
+    data,
+  });
+//获取用户金币明细
+export const getUserCoinDetail = data =>
+  Request({
+    url: '/api/get_user_coin_detail',
+    method: 'POST',
+    data,
+  });
+  //获取用户分销明细
+export const getUserShareCnt = data =>
+Request({
+  url: '/api/get_user_share_cnt',
+  method: 'POST',
+  data,
+});
+
+
+