添加画头像功能

package-lock.json

@@ -18458,6 +18458,11 @@
                 "xtend": "^4.0.0"
             }
         },
+        "taro-cropper": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmjs.org/taro-cropper/-/taro-cropper-1.2.3.tgz",
+            "integrity": "sha512-pW8/39KU2BfSwA6EZ7GYU0dKfDAa3Nf1vk2keh3lCY7LM9yLYdW6fb7ufGBSDYpTkDnxdjw5IKznN3LCGER0cA=="
+        },
         "taro-css-to-react-native": {
             "version": "3.5.7",
             "resolved": "https://registry.npmjs.org/taro-css-to-react-native/-/taro-css-to-react-native-3.5.7.tgz",

package.json

@@ -57,7 +57,8 @@
         "@vant/weapp": "^1.10.14",
         "postcss": "^8.2.1",
         "react": "^18.0.0",
-        "react-dom": "^18.0.0"
+        "react-dom": "^18.0.0",
+        "taro-cropper": "^1.2.3"
     },
     "devDependencies": {
         "@babel/core": "^7.8.0",

src/app.config.js

@@ -3,11 +3,8 @@ import Taro from '@tarojs/taro'
 export default defineAppConfig({
   pages: [
     'pages/index/index',
-    'pages/collection/index',
-    "pages/darwDetail/index",
-    "pages/communityDetail/index",
-    "pages/earnPoints/index",
     "pages/mine/index",
+    'pages/collection/index',
     "pages/activity/index"
   ],
   subpackages: [
@@ -18,8 +15,19 @@ export default defineAppConfig({
         "pages/invite/index",
         "pages/wallet/index",
         "pages/shareCnt/index",
+        "pages/upload/index",//图片裁剪页面
+        "pages/darwDetail/index",
+        "pages/communityDetail/index",
+        "pages/earnPoints/index",
       ]
     },
+    // {
+    //   root: "moduleB",
+    //   name: "分包B",
+    //   pages: [
+       
+    //   ]
+    // },
     
   ],
   window: {
@@ -48,12 +56,12 @@ export default defineAppConfig({
         selectedIconPath: "images/nav/play_pin.png",
         text: "创作"
       },
-      // {
-      //   pagePath: "pages/activity/index",
-      //   iconPath: "images/nav/task.png",
-      //   selectedIconPath: "images/nav/task_pin.png",
-      //   text: "活动"
-      // },
+      {
+        pagePath: "pages/activity/index",
+        iconPath: "images/nav/task.png",
+        selectedIconPath: "images/nav/task_pin.png",
+        text: "活动"
+      },
       {
         pagePath: "pages/mine/index",
         iconPath: "images/nav/my.png",

src/app.js

@@ -15,9 +15,6 @@ class App extends Component {
     }
   }
   onLaunch () {
-    // if (wx.getStorageSync('channel_name') == '') {
-    //   wx.setStorageSync('channel_name', "channel_name")
-    // }
 
     // 保持屏幕常亮
     Taro.setKeepScreenOn({

src/pages/communityDetail/index.jsx

@@ -1,9 +1,9 @@
 import { Component } from 'react'
 import { View, Swiper, SwiperItem, Image, Textarea } from '@tarojs/components'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
-import tool from '../../common/tool'
-import TaroCanvasDrawer from '../../component/taro-plugin-canvas';
-import * as api from '../../service/index'
+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 {
@@ -50,7 +50,7 @@ export default class Task extends Component {
     /// 获取到base64Data
     var base64Data = dataurl;
     /// 通过微信小程序自带方法将base64转为二进制去除特殊符号，再转回base64
-    base64Data = wx.arrayBufferToBase64(wx.base64ToArrayBuffer(base64Data));
+    base64Data = Taro.arrayBufferToBase64(Taro.base64ToArrayBuffer(base64Data));
     /// 拼接请求头，data格式可以为image/png或者image/jpeg等，看需求
     const base64ImgUrl = "data:image/png;base64," + base64Data;
 
@@ -60,9 +60,9 @@ export default class Task extends Component {
     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({
+    const fileStream = Taro.base64ToArrayBuffer(base64ImgData);
+    const filePath = Taro.env.USER_DATA_PATH + '/test.png';
+    Taro.getFileSystemManager().writeFile({
       filePath: filePath,
       data: fileStream,
       encoding: 'binary',
@@ -205,14 +205,14 @@ export default class Task extends Component {
         config: {}
       }, () => {
         Taro.hideLoading();
-        wx.showShareImageMenu({
+        Taro.showShareImageMenu({
           path: tempFilePath
         })
         //画图成功之后打开分享
-        // wx.downloadFile({
+        // Taro.downloadFile({
         //   url: this.state.shareImage,
         //   success: (res) => {
-        //     wx.showShareImageMenu({
+        //     Taro.showShareImageMenu({
         //       path: res.tempFilePath
         //     })
         //   }

src/pages/darwDetail/index.jsx

@@ -1,9 +1,9 @@
 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 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 {
@@ -58,7 +58,7 @@ export default class Task extends Component {
     /// 获取到base64Data
     var base64Data = dataurl;
     /// 通过微信小程序自带方法将base64转为二进制去除特殊符号，再转回base64
-    base64Data = wx.arrayBufferToBase64(wx.base64ToArrayBuffer(base64Data));
+    base64Data = Taro.arrayBufferToBase64(Taro.base64ToArrayBuffer(base64Data));
     /// 拼接请求头，data格式可以为image/png或者image/jpeg等，看需求
     const base64ImgUrl = "data:image/png;base64," + base64Data;
 
@@ -68,9 +68,9 @@ export default class Task extends Component {
     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({
+    const fileStream = Taro.base64ToArrayBuffer(base64ImgData);
+    const filePath = Taro.env.USER_DATA_PATH + '/test.png';
+    Taro.getFileSystemManager().writeFile({
       filePath: filePath,
       data: fileStream,
       encoding: 'binary',
@@ -356,16 +356,16 @@ export default class Task extends Component {
         isFill: false,
         config: {}
       }, () => {
-        wx.showShareImageMenu({
+        Taro.showShareImageMenu({
           path: tempFilePath
         })
       })
        //画图成功之后打开分享
-      //  wx.downloadFile({
+      //  Taro.downloadFile({
       //   url: tempFilePath,
       //   success: (res) => {
       //     console.log('打开分享');
-      //     wx.showShareImageMenu({
+      //     Taro.showShareImageMenu({
       //       path: res.tempFilePath
       //     })
       //   }

src/pages/earnPoints/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from 'react'
 import { View, Swiper, SwiperItem, Image, Textarea, Text, ScrollView, RichText } from '@tarojs/components'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
-import tool from '../../common/tool'
-import * as api from '../../service/index'
+import tool from '../../../common/tool'
+import * as api from '../../../service/index'
 import './index.less'
 
 export default class Task extends Component {

src/moduleA/pages/invite/index.jsx

@@ -51,7 +51,7 @@ export default class Task extends Component {
     /// 获取到base64Data
     var base64Data = dataurl;
     /// 通过微信小程序自带方法将base64转为二进制去除特殊符号，再转回base64
-    base64Data = wx.arrayBufferToBase64(wx.base64ToArrayBuffer(base64Data));
+    base64Data = Taro.arrayBufferToBase64(Taro.base64ToArrayBuffer(base64Data));
     /// 拼接请求头，data格式可以为image/png或者image/jpeg等，看需求
     const base64ImgUrl = "data:image/png;base64," + base64Data;
 
@@ -61,9 +61,9 @@ export default class Task extends Component {
     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({
+    const fileStream = Taro.base64ToArrayBuffer(base64ImgData);
+    const filePath = Taro.env.USER_DATA_PATH + '/test.png';
+    Taro.getFileSystemManager().writeFile({
       filePath: filePath,
       data: fileStream,
       encoding: 'binary',
@@ -223,11 +223,11 @@ export default class Task extends Component {
 
       })
       //画图成功之后打开分享
-      //  wx.downloadFile({
+      //  Taro.downloadFile({
       //   url: tempFilePath,
       //   success: (res) => {
       //     console.log('打开分享');
-      //     wx.showShareImageMenu({
+      //     Taro.showShareImageMenu({
       //       path: res.tempFilePath
       //     })
       //   }
@@ -274,7 +274,7 @@ export default class Task extends Component {
   }
   //分享
   shareImage () {
-    wx.showShareImageMenu({
+    Taro.showShareImageMenu({
       path: this.state.shareImage
     })
   }

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

@@ -0,0 +1,5 @@
+export default definePageConfig({
+  navigationBarTitleText: '裁剪图片',
+  enableShareAppMessage: true,
+  enableShareTimeline: true ,
+})

src/moduleA/pages/upload/index.jsx

@@ -0,0 +1,134 @@
+import React, { Component } from 'react'
+import { View, Text, Button, Image, ScrollView, Input } from '@tarojs/components'
+import Taro, { getCurrentInstance } from '@tarojs/taro'
+import TaroCropper from 'taro-cropper';
+import tool from '../../../common/tool'
+import * as api from '../../../service/index'
+
+import './index.less'
+
+export default class Mine extends Component {
+  $instance = getCurrentInstance()
+  inputRef = React.createRef();
+  state = {
+    src: '',
+    cutImagePath: '',
+    cropperWidth: 500,
+    cropperHeight: 500,
+    imgSize: [],
+    sizeIndex: 0
+  }
+
+  componentDidShow () {
+    let routers = this.$instance.router.params
+    this.setState({
+      src: routers.image
+    })
+    console.log(routers, 'routers');
+    this.getDrawIndex()
+  }
+  getDrawIndex () {
+    api.getDrawIndex().then(res => {
+      if (res.code == 200) {
+        this.setState({
+          imgSize: res.data.img_size,
+        }, () => {
+          let routers = this.$instance.router.params
+          console.log(routers, 'rou');
+          if (routers.task_id) {
+            Taro.showLoading({
+              title: '加载中',
+            })
+            this.getDrawTaskStatus()
+          }
+        })
+      }
+    })
+  }
+  changeMeasurement (item, index) {
+    let cropperHeight = 500
+    console.log(item);
+    let sizeList = item.name.split(":")
+    cropperHeight = 500 * sizeList[1] / sizeList[0]
+    console.log(cropperHeight, 'cropperHeight');
+    this.setState({
+      sizeIndex: index,
+      cropperHeight: cropperHeight
+    })
+  }
+  onShareAppMessage = (res) => {
+    let shareData = {
+      title: tool.shareTitle,
+      path: `/pages/index/index?c=${Taro.getStorageSync('user_id')}&s=rightTap`,
+      imageUrl: tool.shareImg
+    }
+    return shareData;
+  }
+  onCut(e){
+    Taro.showLoading({
+      title: '加载中...',
+    })
+    let base64Img = Taro.getFileSystemManager().readFileSync(e, 'base64')
+    api.uploadImg({ img_data: base64Img }).then(res => {
+      if (res.code == 200) {
+        // 传裁剪图片到上个页面
+        var pages = Taro.getCurrentPages(); //获取当前页面栈
+        if (pages.length >1) {
+          var beforePage = pages[pages.length - 2]; //获取上一个页面实例对象
+          console.log(beforePage,'beforePage');
+          beforePage.setData({
+            //返回参数 ps：这里我打印出beforePage只有一个setData能调用到
+            consultImg: res.data,
+            sizeIndex:this.state.sizeIndex
+          },()=>{
+            Taro.hideLoading()
+            Taro.navigateBack({delta: 1}); //返回上一个页面
+          })
+        }
+      }
+    })
+    console.log(e,'cut');
+  }
+  onCancel(e){
+    Taro.navigateBack({delta: 1})
+  }
+
+  componentDidMount () { }
+
+  render () {
+    return (
+      <View className='wallet'>
+        <ScrollView
+          className='measurement-list'
+          showScrollbar
+          scrollX
+        >
+          {
+            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={item.img}></Image>
+                <View className='measurement-title'>{item.name}</View>
+              </View>
+            ))
+          }
+        </ScrollView>
+        <View className='index'>
+          <TaroCropper
+            id='taro-cropper'
+            src={this.state.src}
+            // src='https://video-h5.fyshark.com/tmp/10581_168007502299.png'
+            cropperWidth={this.state.cropperWidth}
+            cropperHeight={this.state.cropperHeight}
+            height={'1300'}
+            hideCancelText={false}
+            themeColor='#1084EC'
+            onCut={res => {
+              this.onCut(res)
+            }}
+            onCancel={e => (this.onCancel(e))}
+          />
+        </View>
+      </View>
+    )
+  }
+}

src/moduleA/pages/upload/index.less

@@ -0,0 +1,35 @@
+.wallet{
+  min-height: 100vh;
+  background-color: rgb(0 0 0);
+}
+.measurement-list {
+  display: flex;
+  flex-wrap: wrap;
+
+  .measurement-info {
+    position: relative;
+    display: inline-block;
+    margin: 0 20px;
+    width: 116px;
+    box-sizing: border-box;
+    height: 116px;
+    background-color: rgba(5, 5, 5, 0.5);
+    border-radius: 16px;
+  }
+
+  .measurement-img {
+    margin-top: 22px;
+    position: relative;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 48px;
+    height: 48px;
+  }
+
+  .measurement-title {
+    text-align: center;
+    font-family: PingFangSC-Regular;
+    font-size: 20px;
+    color: #0F84EC;
+  }
+}

src/pages/activity/index.config.js

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

src/pages/activity/index.jsx

@@ -7,150 +7,97 @@ 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:最新
+    consultImg: 'http://video-img.fyshark.com/1680144082044%E7%BC%96%E7%BB%84.png',
+    sizeIndex: 0,
+    isImage: false
   }
 
   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
+  componentDidShow () {
+    //接收裁剪图片
+    let pages = Taro.getCurrentPages();
+    let currentPage = pages[pages.length - 1]; // 获取当前页面
+    if (currentPage.__data__.consultImg) { // 获取值
+      this.setState({
+        consultImg: currentPage.__data__.consultImg,
+        sizeIndex: currentPage.__data__.sizeIndex,
+        isImage: true
+      })
     }
-    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
+  upLode () {
+    let that = this
+    Taro.chooseMedia({
+      count: 1, // 默认
+      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 _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
+        Taro.hideLoading()
+        Taro.navigateTo({
+          url: `/moduleA/pages/upload/index?image=${file}`
         })
       }
     })
   }
-  onReachBottom () {
-    if (!this.state.total) {
-      this.setState({
-        page: this.state.page + 1
-      })
-      this.getHubList((this.state.page + 1), this.state.type)
+  generatePictures () {
+    if (!this.state.isImage) {
+      Taro.showToast({ title: '请先上传图片', icon: 'none' })
+      return
     }
-  }
-  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}`
+    api.drawGcImg({ img_url: this.state.consultImg }).then(res => {
+      if (res.code == 200) {
+        Taro.navigateTo({
+          url: `/moduleA/pages/darwDetail/index?task_id=${res.data.task_id}`
+        })
+      }else {
+        Taro.hideLoading()
+        Taro.showModal({
+          title: '您的余额不足',
+          content: '是否前往获取点券？',
+          success: function (res) {
+            if (res.confirm) {
+              Taro.navigateTo({
+                url: `/moduleA/pages/earnPoints/index`
+              })
+            } else if (res.cancel) {
+              console.log('用户点击取消')
+            }
+          }
+        })
+      }
     })
   }
 
   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 className='title'>人物动漫化</View>
+        <View className='content' onClick={e => (this.upLode())}>
+          <Image className='content-img'
+            mode='aspectFit'
+            src={this.state.consultImg}
+          ></Image>
+          {
+            !this.state.isImage &&
+            <View className='add-content'>
+              <Image className='add-img' src='http://video-img.fyshark.com/1680144257329%2B.png'></Image>
+              <View className='add-tips'>上传图片</View>
+            </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 className='img-tips'>绝美的动漫头像，上传图片一件生成</View>
+        <View className='generate-pictures' onClick={e => (this.generatePictures(e))} >
+          生成图片（消耗2点券）
         </View>
       </View>
     )

src/pages/activity/index.less

@@ -3,93 +3,69 @@
   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;
-    }
+  .title {
+    margin-top: 48px;
+    font-family: PingFangSC-Regular;
+    font-size: 32px;
+    color: #FFFFFF;
   }
 
-  .image-list {
-    margin-top: 50px;
-    display: flex;
-    justify-content: space-between;
-
-    .list-left {
-      width: 330px;
-    }
-
-    .list-right {
-      width: 330px;
-    }
+  .content {
+    position: relative;
+    margin-top: 20px;
 
-    .image-info {
-      margin-top: 20px;
-      border-radius: 8px;
-      border: 2px solid rgba(15, 132, 236, 1);
+    .add-content {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%,-50%);
+      // display: flex;
+      // justify-content: center;
 
-      .info-top {
-        width: 100%;
-
-        .info-img {
-          width: 100%;
-          min-height: 360px;
-          display: block;
-        }
+      .add-img {
+        position: relative;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 80px;
+        height: 80px;
       }
 
-      .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;
-          }
+      .add-tips {
+        margin-top: 12px;
+        font-family: PingFangSC-Regular;
+        font-size: 28px;
+        color: #FFFFFF;
+        text-align: center;
+      }
+    }
 
-          .info-head-img {
-            width: 32px;
-            height: 32px;
-          }
+    .content-img {
+      width: 100%;
+      max-height: 760px;
+    }
+  }
 
-          .info-sampling {
-            margin-left: 8px;
-          }
+  .generate-pictures {
+    width: 382px;
+    height: 96px;
+    border-radius: 96px;
+    line-height: 96px;
+    text-align: center;
+    position: fixed;
+    bottom: 40px;
+    left: 50%;
+    z-index: 100;
+    transform: translateX(-50%);
+    background-image: linear-gradient(-49deg, #5D81FF 0%, #0F84EC 100%);
+    font-family: PingFangSC-Regular;
+    font-size: 28px;
+    color: #FFFFFF;
+  }
 
-          .info-like-img {
-            margin-left: 10px;
-            width: 28px;
-            height: 24px;
-            margin-right: 10px;
-          }
-        }
-      }
-    }
+  .img-tips {
+    margin-top: 20px;
+    font-family: PingFangSC-Regular;
+    font-size: 24px;
+    color: #FFFFFF;
   }
 }

src/pages/collection/index.jsx

@@ -90,7 +90,7 @@ export default class collection extends Component {
   detail (item, index) {
     console.log(item, 'item');
     Taro.navigateTo({
-      url: `/pages/communityDetail/index?task_id=${item.id}`
+      url: `/moduleA/pages/communityDetail/index?task_id=${item.id}`
     })
   }
 

src/pages/index/index.jsx

@@ -32,11 +32,19 @@ export default class Mine extends Component {
   }
 
   componentDidShow () {
+    //接收裁剪图片
+    let pages = Taro.getCurrentPages();
+    let currentPage = pages[pages.length - 1]; // 获取当前页面
+    if (currentPage.__data__.consultImg) { // 获取值
+      this.setState({
+        consultImg: currentPage.__data__.consultImg,
+        sizeIndex: currentPage.__data__.sizeIndex
+      })
+    }
     this.getDrawIndex()
     this.getWxTemplate()
     this.getTagsDev()
   }
-
   componentDidMount () {
 
   }
@@ -203,6 +211,13 @@ export default class Mine extends Component {
     })
   }
   changeMeasurement (item, index) {
+    if (this.state.consultImg.length > 0) {
+      Taro.showToast({
+        title: `您已选择图尺寸`,
+        icon: 'error',
+      });
+      return
+    }
     this.setState({
       sizeIndex: index
     })
@@ -307,14 +322,23 @@ export default class Mine extends Component {
         Taro.hideLoading()
         this.subscribe(res.data.task_id)
         Taro.navigateTo({
-          url: `/pages/darwDetail/index?task_id=${res.data.task_id}`
+          url: `/moduleA/pages/darwDetail/index?task_id=${res.data.task_id}`
         })
       } else {
         Taro.hideLoading()
-        Taro.showToast({
-          title: res.msg,
-          icon: 'error',
-        });
+        Taro.showModal({
+          title: '您的余额不足',
+          content: '是否前往获取点券？',
+          success: function (res) {
+            if (res.confirm) {
+              Taro.navigateTo({
+                url: `/moduleA/pages/earnPoints/index`
+              })
+            } else if (res.cancel) {
+              console.log('用户点击取消')
+            }
+          }
+        })
       }
     })
     // }, 1000)
@@ -384,21 +408,18 @@ export default class Mine extends Component {
           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
-            })
-          }
+        Taro.hideLoading()
+        Taro.navigateTo({
+          url: `/moduleA/pages/upload/index?image=${file}`
         })
       }
     })
   }
+  deleteImg(){
+    this.setState({
+      consultImg:''
+    })
+  }
 
   render () {
     return (
@@ -528,7 +549,10 @@ export default class Mine extends Component {
                   +
                 </View>
                 :
-                <Image className='consult-img' mode='aspectFit' onClick={e => (this.upLode())} src={this.state.consultImg}></Image>
+                <View className='consult-model'>
+                  <Image className='consult-img' mode='aspectFit' onClick={e => (this.upLode())} src={this.state.consultImg}></Image>
+                  <Image className='delete' src='http://video-img.fyshark.com/1680147210173guanbi.png' onClick={e=>(this.deleteImg())}></Image>
+                </View>
             }
           </View>
           <View className='draw-title'>色彩丰富度</View>

src/pages/index/index.less

@@ -82,7 +82,8 @@
       text-align: center;
 
     }
-    .layout-content{
+
+    .layout-content {
       padding-bottom: 120px;
     }
 
@@ -92,7 +93,8 @@
       z-index: 1000;
       transform: translateX(-50%);
       left: 50%;
-      .selection-botton{
+
+      .selection-botton {
         padding: 0 38px;
         height: 80px;
         line-height: 80px;
@@ -395,23 +397,40 @@
     font-size: 28px;
     color: #FFFFFF;
   }
-  .consult{
+
+  .consult {
     margin-top: 20px;
-    .consult-content{
+
+    .consult-content {
       width: 222px;
       height: 218px;
-      border: 1px dashed rgba(255,255,255,.4);
+      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);
+      color: rgba(15, 132, 236, 1);
     }
-    .consult-img{
-      width: 222px;
-      height: 218px;
+
+    .consult-model {
+      position: relative;
+      display: inline-block;
+      border: 1px dashed rgba(255, 255, 255, .4);
+
+      .consult-img {
+        width: 222px;
+        height: 218px;
+      }
+      .delete{
+        position: absolute;
+        position: absolute;
+        right: -20px;
+        top: -20px;
+        width: 40px;
+        height: 40px;
+      }
     }
   }
 }

src/pages/mine/index.jsx

@@ -136,11 +136,11 @@ export default class Mine extends Component {
     } else {
       if (this.state.type == 1) {
         Taro.navigateTo({
-          url: `/pages/communityDetail/index?task_id=${item.id}`
+          url: `/moduleA/pages/communityDetail/index?task_id=${item.id}`
         })
       }else{
         Taro.navigateTo({
-          url: `/pages/darwDetail/index?task_id=${item.task_id}&img_id=${item.id}`
+          url: `/moduleA/pages/darwDetail/index?task_id=${item.task_id}&img_id=${item.id}`
         })
       }
     }
@@ -229,7 +229,7 @@ export default class Mine extends Component {
 
   getEarnPoints () {
     Taro.navigateTo({
-      url: `/pages/earnPoints/index`
+      url: `/moduleA/pages/earnPoints/index`
     })
   }
   wallet(){

src/service/index.js

@@ -165,7 +165,13 @@ Request({
   method: 'POST',
   data,
 });
-
+  //获取用户分销明细
+  export const drawGcImg = data =>
+  Request({
+    url: '/api/draw_gc_img',
+    method: 'POST',
+    data,
+  });