From 9c64e1873201ba354ce73d995b44caed635ef5a2 Mon Sep 17 00:00:00 2001
From: lanzhihui <503792708@qq.com>
Date: Sun, 29 Sep 2024 11:01:17 +0800
Subject: [PATCH] update

---
 src/components/chooseImageTips.wpy      |    2 +-
 src/components/uploadPic.wpy            |    2 +-
 src/components/userTitle.wpy            |    7 +-
 src/components/wepy-image-cropper.wpy   |    4 +-
 src/components/wepy-image-cropperV2.wpy | 1320 -----------------------
 src/mixins/https.js                     |    2 +-
 src/pages/home/registration.wpy         |   61 +-
 src/pages/tabBar/user.wpy               |  209 ++--
 src/pages/users/ImageCropper.wpy        |   10 +-
 src/pages/users/artificial.wpy          |   22 +-
 src/pages/users/blacklist.wpy           |    1 +
 src/pages/users/exclusiveService.wpy    |    2 +-
 src/pages/users/friendlist.wpy          |    2 +-
 src/pages/users/logout.wpy              |    2 +-
 src/pages/users/myCertification.wpy     |    8 +-
 src/pages/users/myDynamic.wpy           |  126 +--
 src/pages/users/setTing.wpy             |  227 +---
 src/pages/users/unmarriV2.wpy           |    3 +-
 src/pages/users/upgradeVIP.wpy          |    6 +-
 src/pages/users/upgradeVIP2.wpy         |   28 +-
 20 files changed, 258 insertions(+), 1786 deletions(-)
 delete mode 100644 src/components/wepy-image-cropperV2.wpy

diff --git a/src/components/chooseImageTips.wpy b/src/components/chooseImageTips.wpy
index e13f099..be2111e 100644
--- a/src/components/chooseImageTips.wpy
+++ b/src/components/chooseImageTips.wpy
@@ -1,6 +1,6 @@
 <template>
 <view class="chooseImageTips">
-    <view :class="{'~show':chooseShow}" class="~cu-modal ~bottom-modal"  catchtap="hideModal">
+    <view :class="{'~show':chooseShow}" class="cu-modal ~cu-modal ~bottom-modal"  catchtap="hideModal">
         <view class="~cu-dialog cu-dialog ">
             <view class="g_ct">
                 <view class="u_tt ~font_26 ~color999">
diff --git a/src/components/uploadPic.wpy b/src/components/uploadPic.wpy
index 4acfbf8..29a5813 100644
--- a/src/components/uploadPic.wpy
+++ b/src/components/uploadPic.wpy
@@ -97,7 +97,7 @@ wepy.component({
             for (let item of res.tempFiles) {
               console.log(item, '====')
               let type = item.fileType == 'video' ? 'video' : 'img'
-                vm.uploadFile(item.tempFilePath, type, item.tempFilePath, index++)
+                vm.uploadFile(item.tempFilePath, type, res.tempFiles, index++)
             }
           },
           fail: () => {
diff --git a/src/components/userTitle.wpy b/src/components/userTitle.wpy
index b4e3e6a..9dfb9e1 100644
--- a/src/components/userTitle.wpy
+++ b/src/components/userTitle.wpy
@@ -7,11 +7,12 @@
             <view class="m_userAva" style="position: relative;display: inline-block;margin-right:20rpx;">
               <image class="userinfo-avatar ff" src="{{Image}}" mode="aspectFill" />
               <block v-if="user.photo">
-                <view class="mask font_22 f-fcc" v-if="user.is_photo_audited==0">审核中</view>
-                <view class="mask font_22 f-fcc" v-if="user.is_photo_audited==-1">未通过</view>
+                  {{user.is_photo_audited}}
+                <view class="mask ~font_22 ~f-fcc" v-if="user.is_photo_audited==2">审核中</view>
+                <view class="mask ~font_22 ~f-fcc" v-if="user.is_photo_audited==0">未通过</view>
               </block>
               <block v-else>
-                <view class="mask font_22">上传头像</view>
+                <view class="mask ~font_22">上传头像</view>
               </block>
             </view>
           </view>
diff --git a/src/components/wepy-image-cropper.wpy b/src/components/wepy-image-cropper.wpy
index b90c0c2..40f2ea4 100644
--- a/src/components/wepy-image-cropper.wpy
+++ b/src/components/wepy-image-cropper.wpy
@@ -333,7 +333,7 @@
     methods: {
       _draw(callback) {
         console.log(this.imgSrc)
-        if (!this.imgSrc) return
+        if (!this.imgSrc || !this.ctx) return
         let draw = () => {
           // 图片实际大小
           let img_width = this.img_width * this.scale * this.export_scale
@@ -350,7 +350,7 @@
           })
         }
         console.log(this.ctx, 'this.ctx=333')
-        if (this.ctx.width != this.width || this.ctx.height != this.height) {
+        if (this.ctx && (this.ctx.width != this.width || this.ctx.height != this.height)) {
           // 优化拖动裁剪框，所以必须把宽高设置放在离用户触发渲染最近的地方
           this._canvas_height = this.height
           this._canvas_width = this.width
diff --git a/src/components/wepy-image-cropperV2.wpy b/src/components/wepy-image-cropperV2.wpy
deleted file mode 100644
index 8f76cff..0000000
--- a/src/components/wepy-image-cropperV2.wpy
+++ /dev/null
@@ -1,1320 +0,0 @@
-<template>
-    <view class="image-cropper" catchtouchmove="_preventTouchMove">
-        <view class="main" id="main_bc" @touchend="_cutTouchEnd" @touchstart="_cutTouchStart" @touchmove="_cutTouchMove">
-            <view class="content">
-                <view class="content_top bg_gray {{_flag_bright? '':'bg_black'}}"
-                      style="height:{{cut_top}}px;transition-property:{{_cut_animation?'':'background'}}"></view>
-                <view class="content_middle" style="height:{{height}}px;">
-                    <view class="content_middle_left bg_gray {{_flag_bright? '':'bg_black'}}"
-                          style="width:{{cut_left}}px;transition-property:{{_cut_animation?'':'background'}}"></view>
-                    <view class="content_middle_middle"
-                          style="width:{{width}}px;height:{{height}}px;transition-duration: .3s;transition-property:{{_cut_animation?'':'background'}};">
-                        <view class="border border-top-left" style="background: {{borderColor}}"></view>
-                        <view class="border border-top-right" style="background: {{borderColor}}"></view>
-                        <view class="border border-right-top" style="background: {{borderColor}}"></view>
-                        <view class="border border-right-bottom" style="background: {{borderColor}}"></view>
-                        <view class="border border-bottom-right" style="background: {{borderColor}}"></view>
-                        <view class="border border-bottom-left" style="background: {{borderColor}}"></view>
-                        <view class="border border-left-bottom" style="background: {{borderColor}}"></view>
-                        <view class="border border-left-top" style="background: {{borderColor}}"></view>
-                    </view>
-                    <view class="content_middle_right bg_gray {{_flag_bright? '':'bg_black'}}"
-                          style="transition-property:{{_cut_animation?'':'background'}}"></view>
-                </view>
-                <view class="content_bottom bg_gray {{_flag_bright?'':'bg_black'}}"
-                      style="transition-property:{{_cut_animation?'':'background'}}"></view>
-            </view>
-            <image @load="imageLoad" bindtouchstart="_start" bindtouchmove="_move" bindtouchend="_end"
-                  style="width:{{img_width ? img_width + 'px' : 'auto'}};height:{{img_height ? img_height + 'px' : 'auto'}};top:{{tanTop}};left:{{tanLeft}};transform:translate3d({{tanTop=='50%'?'-'+tanTop:_img_left-img_width/2+'px'}},{{tanLeft=='50%'?'-'+tanLeft:_img_top-img_height/2+'px'}},0) scale({{scale}}) rotate({{angle}}deg);transition-duration:{{_cut_animation?.4:0}}s;"
-                  class="img"
-                  :src="imgSrc"></image>
-        </view>
-        <canvas id="myCanvas" disable-scroll="true"
-                style="width:{{_canvas_width * export_scale}}px;height:{{_canvas_height * export_scale}}px;left:{{canvas_left}}px;top:{{canvas_top}}px" type="2d"
-                class="image-cropper-canvas"></canvas>
-    </view>
-  <view class="main-box">
-    <view class="main-cancel ~flo_l ~font_30 ~text-center" @tap.stop="chooseimage">选择图片</view>
-    <view class="main-save ~flo_r ~font_30 ~text-center" @tap.stop="saveUpdate">确定</view>
-  </view>
-  <chooseImageTips :chooseShow.sync="chooseShow" @hideCut.user="hideCut" @imgSrcCut.user="imgSrcCut"></chooseImageTips>
-</template>
-<script>
-  import wepy from '@wepy/core'
-  wepy.component({
-    // config = {
-    //   component: true
-    // }
-    // components = {chooseImageTips}
-    props: {
-      /**
-       * 图片路径
-       */
-      imgSrc: {
-        type: String
-      },
-      /**
-       * 裁剪框颜色
-       */
-      borderColor: {
-        type: String,
-        default: 'white'
-      },
-      /**
-       * 裁剪框高度
-       */
-      height: {
-        type: Number,
-        default: 200
-      },
-      /**
-       * 裁剪框宽度
-       */
-      width: {
-        type: Number,
-        default: 200
-      },
-      /**
-       * 裁剪框最小尺寸
-       */
-      min_width: {
-        type: Number,
-        default: 100
-      },
-      min_height: {
-        type: Number,
-        default: 100
-      },
-      /**
-       * 裁剪框最大尺寸
-       */
-      max_width: {
-        type: Number,
-        default: 300
-      },
-      'max_height': {
-        type: Number,
-        default: 300
-      },
-      /**
-       * 裁剪框禁止拖动
-       */
-      disable_width: {
-        type: Boolean,
-        default: false
-      },
-      disable_height: {
-        type: Boolean,
-        default: false
-      },
-      /**
-       * 锁定裁剪框比例
-       */
-      disable_ratio: {
-        type: Boolean,
-        default: false
-      },
-      /**
-       * 生成的图片尺寸相对剪裁框的比例
-       */
-      export_scale: {
-        type: Number,
-        default: 1
-      },
-      /**
-       * 生成的图片质量0-1
-       */
-      quality: {
-        type: Number,
-        default: 0
-      },
-      cut_top: {
-        type: Number,
-        default: 212
-      },
-      cut_left: {
-        type: Number,
-        default: 37
-      },
-      /**
-       * canvas上边距（不设置默认不显示）
-       */
-      canvas_top: {
-        type: Number,
-        default: null
-      },
-      /**
-       * canvas左边距（不设置默认不显示）
-       */
-      canvas_left: {
-        type: Number,
-        default: null
-      },
-      /**
-       * 图片宽度
-       */
-      img_width: {
-        type: Number,
-        default: null
-      },
-      /**
-       * 图片高度
-       */
-      img_height: {
-        type: Number,
-        default: null
-      },
-      /**
-       * 图片缩放比
-       */
-      scale: {
-        type: Number,
-        default: 1
-      },
-      /**
-       * 图片旋转角度
-       */
-      angle: {
-        type: Number,
-        default: 0
-      },
-      /**
-       * 判断是否是新图片
-       */
-      newPic: {
-        type: Number,
-        default: 0
-      },
-      /**
-       * 最小缩放比
-       */
-      min_scale: {
-        type: Number,
-        default: 0.5
-      },
-      /**
-       * 最大缩放比
-       */
-      max_scale: {
-        type: Number,
-        default: 2
-      },
-      /**
-       * 是否禁用旋转
-       */
-      disable_rotate: {
-        type: Boolean,
-        default: false
-      },
-      /**
-       * 是否限制移动范围(剪裁框只能在图片内)
-       */
-      limit_move: {
-        type: Boolean,
-        default: false
-      }
-    },
-    data: {
-      el: 'image-cropper', // 暂时无用
-      info: wx.getSystemInfoSync(),
-      MOVE_THROTTLE: null, // 触摸移动节流settimeout
-      MOVE_THROTTLE_FLAG: true, // 节流标识
-      INIT_IMGWIDTH: 0, // 图片设置尺寸,此值不变（记录最初设定的尺寸）
-      INIT_IMGHEIGHT: 0, // 图片设置尺寸,此值不变（记录最初设定的尺寸）
-      TIME_BG: null, // 背景变暗延时函数
-      TIME_CUT_CENTER: null,
-      _touch_img_relative: [{
-        x: 0,
-        y: 0
-      }], // 鼠标和图片中心的相对位置
-      _flag_cut_touch: false, // 是否是拖动裁剪框
-      _hypotenuse_length: 0, // 双指触摸时斜边长度
-      _flag_img_endtouch: false, // 是否结束触摸
-      _flag_bright: true, // 背景是否亮
-      _canvas_overflow: true, // canvas缩略图是否在屏幕外面
-      _canvas_width: 200,
-      _canvas_height: 200,
-      origin_x: 0.5, // 图片旋转中心
-      origin_y: 0.5, // 图片旋转中心
-      _cut_animation: false, // 是否开启图片和裁剪框过渡
-      _img_top: wx.getSystemInfoSync().windowHeight / 2, // 图片上边距
-      _img_left: wx.getSystemInfoSync().windowWidth / 2, // 图片左边距
-      chooseShow: false,
-      tanTop: '50%',
-      tanLeft: '50%'
-
-    },
-    watch: {
-      // 监听截取框宽高变化
-      width(newV, oldV) {
-        if (newV < this.min_width) {
-          this.width = this.min_width
-        }
-        this._computeCutSize()
-      },
-      height(newV, oldV) {
-        if (newV < this.min_height) {
-          this.height = this.min_height
-        }
-        this._computeCutSize()
-      },
-      angle(newV, oldV) {
-        // 停止居中裁剪框，继续修改图片位置
-        this._moveStop()
-        if (this.limit_move) {
-          if (this.angle % 90) {
-            this.angle = Math.round(this.angle / 90) * 90
-          }
-        }
-      },
-      _cut_animation(newV, oldV) {
-        // 开启过渡300毫秒之后自动关闭
-        clearTimeout(this._cut_animation_time)
-        if (newV) {
-          this._cut_animation_time = setTimeout(() => {
-            this._cut_animation = false
-          }, 300)
-        }
-      },
-      limit_move(newV) {
-        if (newV) {
-          if (this.angle % 90) {
-            this.angle = Math.round(this.angle / 90) * 90
-          }
-          this._imgMarginDetectionScale()
-          !this._canvas_overflow && this._draw()
-        }
-      },
-      canvas_top() {
-        this._canvasDetectionPosition()
-      },
-      canvas_left() {
-        this._canvasDetectionPosition()
-      },
-      imgSrc(e) {
-        this.pushImg()
-      },
-      cut_top() {
-        this._cutDetectionPosition()
-        if (this.limit_move) {
-          !this._canvas_overflow && this._draw()
-        }
-      },
-      cut_left() {
-        this._cutDetectionPosition()
-        if (this.limit_move) {
-          !this._canvas_overflow && this._draw()
-        }
-      }
-    },
-    ready() {
-      this.info = wx.getSystemInfoSync()
-      this.INIT_IMGWIDTH = this.img_width
-      this.INIT_IMGHEIGHT = this.img_height
-      this._canvas_height = this.height
-      this._canvas_width = this.width
-        console.log('--9988')
-      setTimeout(() => {
-          this._initCanvas()
-      }, 1000)
-      this.imgSrc && (this.imgSrc = this.imgSrc)
-      // 根据开发者设置的图片目标尺寸计算实际尺寸
-      this._initImageSize()
-      // 设置裁剪框大小>设置图片尺寸>绘制canvas
-      this._computeCutSize()
-      // 检查裁剪框是否在范围内
-      this._cutDetectionPosition()
-      // 检查canvas是否在范围内
-      this._canvasDetectionPosition()
-      this.setCutCenter()
-      this.$emit('load', {
-        cropper: this
-      })
-    },
-    // 渲染
-    methods: {
-      _draw(callback) {
-        console.log(this.imgSrc)
-        if (!this.imgSrc) return
-        let draw = () => {
-          // 图片实际大小
-          let img_width = this.img_width * this.scale * this.export_scale
-          let img_height = this.img_height * this.scale * this.export_scale
-          // canvas和图片的相对距离
-          var xpos = this._img_left - this.cut_left
-          var ypos = this._img_top - this.cut_top
-          // 旋转画布
-          this.ctx.translate(xpos * this.export_scale, ypos * this.export_scale)
-          this.ctx.rotate(this.angle * Math.PI / 180)
-          this.ctx.drawImage(this.imgSrc, -img_width / 2, -img_height / 2, img_width, img_height)
-          this.ctx.draw(false, () => {
-            callback && callback()
-          })
-        }
-        console.log(this.ctx, 'this.ctx=333')
-        if (this.ctx.width != this.width || this.ctx.height != this.height) {
-          // 优化拖动裁剪框，所以必须把宽高设置放在离用户触发渲染最近的地方
-          this._canvas_height = this.height
-          this._canvas_width = this.width
-          draw()
-          this._canvas_height = this.height
-          this._canvas_width = this.width
-        } else {
-          draw()
-        }
-      },
-
-      chooseimage() {
-        let vm = this
-        vm.chooseShow = true
-        vm.newPic = 1
-        // wx.chooseImage({
-        //   count: 1,
-        //   // sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        //   sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
-        //   sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
-        //   success: (res) => {
-        //     vm.imgSrc = res.tempFilePaths[0]
-        //     console.log(vm.imgSrc)
-        //   }
-        // })
-      },
-        saveUpdate(event) {
-        // 生成图片并回调
-         this._initCanvas()
-        let vm = this
-        console.log(this.imgSrc, '//')
-        if (!this.imgSrc) return
-        if (vm.newPic == 0) {
-          console.log('222')
-          vm.$emit('saveCut', {
-            url: this.imgSrc
-          })
-          return
-        }
-        let draw = () => {
-          // 图片实际大小
-          let img_width = this.img_width * this.scale * this.export_scale
-          let img_height = this.img_height * this.scale * this.export_scale
-          // canvas和图片的相对距离
-          var xpos = this._img_left - this.cut_left
-          var ypos = this._img_top - this.cut_top
-          // 旋转画布
-            vm.ctx.translate(xpos * vm.export_scale, ypos * vm.export_scale)
-            vm.ctx.rotate(this.angle * Math.PI / 180)
-            vm.ctx.drawImage(vm.imgSrc, -img_width / 2, -img_height / 2, img_width, img_height)
-          console.log(vm.ctx, '333')
-            vm.ctx.draw(false, () => {
-            console.log('444')
-            wx.canvasToTempFilePath({
-              width: vm.width * vm.export_scale,
-              height: Math.round(vm.height * vm.export_scale),
-              destWidth: vm.width * vm.export_scale,
-              destHeight: Math.round(vm.height) * vm.export_scale,
-              fileType: 'png',
-              quality: vm.quality,
-              canvasId: vm.el,
-              success: (res) => {
-                console.log(res.tempFilePath, '///')
-                vm.$emit('saveCut', {
-                  url: res.tempFilePath,
-                  width: vm.width * vm.export_scale,
-                  height: vm.height * vm.export_scale
-                })
-              }
-            }, vm)
-          })
-        }
-        if (vm.ctx.width != vm.width || vm.ctx.height != vm.height) {
-          // 优化拖动裁剪框，所以必须把宽高设置放在离用户触发渲染最近的地方
-            vm._canvas_height = vm.height
-            vm._canvas_width = vm.width
-          draw()
-            vm._canvas_height = vm.height
-            vm._canvas_width = vm.width
-        } else {
-          draw()
-        }
-      },
-      _preventTouchMove(event) {
-      },
-      // 裁剪框处理
-      _cutTouchMove(e) {
-        if (this._flag_cut_touch && this.MOVE_THROTTLE_FLAG) {
-          // if (this.disable_ratio && (this.disable_width || this.disable_height)) return
-          // 节流
-          this.MOVE_THROTTLE_FLAG = false
-          this._move_throttle()
-          let width = this.width,
-            height = this.height,
-            cut_top = this.cut_top,
-            cut_left = this.cut_left,
-            size_correct = () => {
-              width = width <= this.max_width ? width >= this.min_width ? width : this.min_width : this.max_width
-              height = height <= this.max_height ? height >= this.min_height ? height : this.min_height : this.max_height
-            },
-            size_inspect = () => {
-              if ((width > this.max_width || width < this.min_width || height > this.max_height || height < this.min_height) && this.disable_ratio) {
-                size_correct()
-                return false
-              } else {
-                size_correct()
-                return true
-              }
-            }
-          height = this.CUT_START.height + ((this.CUT_START.corner > 1 && this.CUT_START.corner < 4 ? 1 : -1) * (this.CUT_START.y - e.touches[0].clientY))
-          switch (this.CUT_START.corner) {
-            case 1:
-              width = this.CUT_START.width + this.CUT_START.x - e.touches[0].clientX
-              if (this.disable_ratio) {
-                height = width / (this.width / this.height)
-              }
-              if (!size_inspect()) return
-              cut_left = this.CUT_START.cut_left - (width - this.CUT_START.width)
-              break
-            case 2:
-              width = this.CUT_START.width + this.CUT_START.x - e.touches[0].clientX
-              if (this.disable_ratio) {
-                height = width / (this.width / this.height)
-              }
-              if (!size_inspect()) return
-              cut_top = this.CUT_START.cut_top - (height - this.CUT_START.height)
-              cut_left = this.CUT_START.cut_left - (width - this.CUT_START.width)
-              break
-            case 3:
-              width = this.CUT_START.width - this.CUT_START.x + e.touches[0].clientX
-              if (this.disable_ratio) {
-                height = width / (this.width / this.height)
-              }
-              if (!size_inspect()) return
-              cut_top = this.CUT_START.cut_top - (height - this.CUT_START.height)
-              break
-            case 4:
-              width = this.CUT_START.width - this.CUT_START.x + e.touches[0].clientX
-              if (this.disable_ratio) {
-                height = width / (this.width / this.height)
-              }
-              if (!size_inspect()) return
-              break
-          }
-          if (!this.disable_width && !this.disable_height) {
-            this.width = width
-            this.cut_left = cut_left
-            this.height = height
-            this.cut_top = cut_top
-          } else if (!this.disable_width) {
-            this.width = width
-            this.cut_left = cut_left
-          } else if (!this.disable_height) {
-            this.height = height
-            this.cut_top = cut_top
-          }
-          this._imgMarginDetectionScale()
-        }
-      },
-      _cutTouchStart(e) {
-        let currentX = e.touches[0].clientX
-        let currentY = e.touches[0].clientY
-        let cutbox_top4 = this.cut_top + this.height - 30
-        let cutbox_bottom4 = this.cut_top + this.height + 20
-        let cutbox_left4 = this.cut_left + this.width - 30
-        let cutbox_right4 = this.cut_left + this.width + 30
-
-        let cutbox_top3 = this.cut_top - 30
-        let cutbox_bottom3 = this.cut_top + 30
-        let cutbox_left3 = this.cut_left + this.width - 30
-        let cutbox_right3 = this.cut_left + this.width + 30
-
-        let cutbox_top2 = this.cut_top - 30
-        let cutbox_bottom2 = this.cut_top + 30
-        let cutbox_left2 = this.cut_left - 30
-        let cutbox_right2 = this.cut_left + 30
-
-        let cutbox_top1 = this.cut_top + this.height - 30
-        let cutbox_bottom1 = this.cut_top + this.height + 30
-        let cutbox_left1 = this.cut_left - 30
-        let cutbox_right1 = this.cut_left + 30
-        if (currentX > cutbox_left4 && currentX < cutbox_right4 && currentY > cutbox_top4 && currentY < cutbox_bottom4) {
-          this._moveDuring()
-          this._flag_cut_touch = true
-          this._flag_img_endtouch = true
-          this.CUT_START = {
-            width: this.width,
-            height: this.height,
-            x: currentX,
-            y: currentY,
-            corner: 4
-          }
-        } else if (currentX > cutbox_left3 && currentX < cutbox_right3 && currentY > cutbox_top3 && currentY < cutbox_bottom3) {
-          this._moveDuring()
-          this._flag_cut_touch = true
-          this._flag_img_endtouch = true
-          this.CUT_START = {
-            width: this.width,
-            height: this.height,
-            x: currentX,
-            y: currentY,
-            cut_top: this.cut_top,
-            cut_left: this.cut_left,
-            corner: 3
-          }
-        } else if (currentX > cutbox_left2 && currentX < cutbox_right2 && currentY > cutbox_top2 && currentY < cutbox_bottom2) {
-          this._moveDuring()
-          this._flag_cut_touch = true
-          this._flag_img_endtouch = true
-          this.CUT_START = {
-            width: this.width,
-            height: this.height,
-            cut_top: this.cut_top,
-            cut_left: this.cut_left,
-            x: currentX,
-            y: currentY,
-            corner: 2
-          }
-        } else if (currentX > cutbox_left1 && currentX < cutbox_right1 && currentY > cutbox_top1 && currentY < cutbox_bottom1) {
-          this._moveDuring()
-          this._flag_cut_touch = true
-          this._flag_img_endtouch = true
-          this.CUT_START = {
-            width: this.width,
-            height: this.height,
-            cut_top: this.cut_top,
-            cut_left: this.cut_left,
-            x: currentX,
-            y: currentY,
-            corner: 1
-          }
-        }
-      },
-      _cutTouchEnd(e) {
-        this._moveStop()
-        this._flag_cut_touch = false
-        // console.log(e,'_cutTouchEnd;;;')
-      },
-      // 点击中间剪裁框处理
-      _click(event) {
-        console.log(event)
-        if (!this.imgSrc) {
-          // 调起上传
-          this.chooseimage()
-          return
-        }
-        this._draw(() => {
-          let x = event.detail ? event.detail.x : event.touches[0].clientX
-          let y = event.detail ? event.detail.y : event.touches[0].clientY
-          if ((x >= this.cut_left && x <= (this.cut_left + this.width)) && (y >= this.cut_top && y <= (this.cut_top + this.height))) {
-            // 生成图片并回调
-            wx.canvasToTempFilePath({
-              width: this.width * this.export_scale,
-              height: Math.round(this.height * this.export_scale),
-              destWidth: this.width * this.export_scale,
-              destHeight: Math.round(this.height) * this.export_scale,
-              fileType: 'png',
-              quality: this.quality,
-              canvasId: this.el,
-              success: (res) => {
-                this.$emit('tapcut', {
-                  url: res.tempFilePath,
-                  width: this.width * this.export_scale,
-                  height: this.height * this.export_scale
-                })
-              }
-            }, this)
-          }
-        })
-      },
-
-      imageLoad(e) {
-        this.$emit('imageload', this.imageObject)
-        wx.hideLoading() // 重置图片角度、缩放、位置
-        this.imgReset()
-        setTimeout(() => {
-        }, 100)
-      },
-      // 开始触摸
-      _start(event) {
-        this._flag_img_endtouch = false
-        if (event.touches.length == 1) {
-          // 单指拖动
-          this._touch_img_relative[0] = {
-            x: (event.touches[0].clientX - this._img_left),
-            y: (event.touches[0].clientY - this._img_top)
-          }
-        } else {
-          // 双指放大
-          let width = Math.abs(event.touches[0].clientX - event.touches[1].clientX)
-          let height = Math.abs(event.touches[0].clientY - event.touches[1].clientY)
-          this._touch_img_relative = [{
-            x: (event.touches[0].clientX - this._img_left),
-            y: (event.touches[0].clientY - this._img_top)
-          }, {
-            x: (event.touches[1].clientX - this._img_left),
-            y: (event.touches[1].clientY - this._img_top)
-          }]
-          this._hypotenuse_length = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2))
-        }
-        !this._canvas_overflow && this._draw()
-      },
-      _move(event) {
-        // console.log('asssssss',event)
-        if (this._flag_img_endtouch || !this.MOVE_THROTTLE_FLAG) return
-        this.MOVE_THROTTLE_FLAG = false
-        this._move_throttle()
-        this._moveDuring()
-        if (event.touches.length == 1) {
-          // 单指拖动
-          let left = (event.touches[0].clientX - this._touch_img_relative[0].x),
-            top = (event.touches[0].clientY - this._touch_img_relative[0].y)
-          // 图像边缘检测,防止截取到空白
-          this._img_left = left
-          this._img_top = top
-          this._imgMarginDetectionPosition()
-          this._img_left = this._img_left
-          this._img_top = this._img_top
-        } else {
-          // 双指放大
-          let width = (Math.abs(event.touches[0].clientX - event.touches[1].clientX)),
-            height = (Math.abs(event.touches[0].clientY - event.touches[1].clientY)),
-            hypotenuse = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2)),
-            scale = this.scale * (hypotenuse / this._hypotenuse_length),
-            current_deg = 0
-          scale = scale <= this.min_scale ? this.min_scale : scale
-          scale = scale >= this.max_scale ? this.max_scale : scale
-          // 图像边缘检测,防止截取到空白
-          this.scale = scale
-          this._imgMarginDetectionScale()
-          // 双指旋转(如果没禁用旋转)
-          let _touch_img_relative = [{
-            x: (event.touches[0].clientX - this._img_left),
-            y: (event.touches[0].clientY - this._img_top)
-          }, {
-            x: (event.touches[1].clientX - this._img_left),
-            y: (event.touches[1].clientY - this._img_top)
-          }]
-          if (!this.disable_rotate) {
-            let first_atan = 180 / Math.PI * Math.atan2(_touch_img_relative[0].y, _touch_img_relative[0].x)
-            let first_atan_old = 180 / Math.PI * Math.atan2(this._touch_img_relative[0].y, this._touch_img_relative[0].x)
-            let second_atan = 180 / Math.PI * Math.atan2(_touch_img_relative[1].y, _touch_img_relative[1].x)
-            let second_atan_old = 180 / Math.PI * Math.atan2(this._touch_img_relative[1].y, this._touch_img_relative[1].x)
-            // 当前旋转的角度
-            let first_deg = first_atan - first_atan_old,
-              second_deg = second_atan - second_atan_old
-            if (first_deg != 0) {
-              current_deg = first_deg
-            } else if (second_deg != 0) {
-              current_deg = second_deg
-            }
-          }
-          this._touch_img_relative = _touch_img_relative
-          this._hypotenuse_length = Math.sqrt(Math.pow(width, 2) + Math.pow(height, 2))
-
-          this.angle = this.angle + current_deg
-          this.scale = this.scale
-        }
-        !this._canvas_overflow && this._draw()
-      },
-      // 结束操作
-      _end(event) {
-        this._flag_img_endtouch = true
-        this._moveStop()
-        // console.log(event)
-      },
-      hideCut(e) {
-        this.chooseShow = e.chooseShow
-      },
-      imgSrcCut(e) {
-        this.imgSrc = e.imgSrc
-      },
-      /**
-       * 上传图片
-       */
-      upload() {
-        let that = this
-        wx.chooseImage({
-          count: 1,
-          sizeType: ['original', 'compressed'],
-          sourceType: ['album', 'camera'],
-          success(res) {
-            const tempFilePaths = res.tempFilePaths[0]
-            console.log('Img Temp Paths: ' + tempFilePaths)
-            that.pushImg(tempFilePaths)
-            wx.showLoading({
-              title: '加载中...'
-            })
-          }
-        })
-      },
-      /**
-       * 返回图片信息
-       */
-      getImg(getCallback) {
-        this._draw(() => {
-          wx.canvasToTempFilePath({
-            width: this.width * this.export_scale,
-            height: Math.round(this.height * this.export_scale),
-            destWidth: this.width * this.export_scale,
-            destHeight: Math.round(this.height) * this.export_scale,
-            fileType: 'png',
-            quality: this.quality,
-            canvasId: this.el,
-            success: (res) => {
-              getCallback({
-                url: res.tempFilePath,
-                width: this.width * this.export_scale,
-                height: this.height * this.export_scale
-              })
-            }
-          }, this)
-        })
-      },
-      /**
-       * 设置图片动画
-       * {
-       *    x:10,//图片在原有基础上向下移动10px
-       *    y:10,//图片在原有基础上向右移动10px
-       *    angle:10,//图片在原有基础上旋转10deg
-       *    scale:0.5,//图片在原有基础上增加0.5倍
-       * }
-       */
-      setTransform(transform) {
-        if (!transform) return
-        if (!this.disable_rotate) {
-          this.angle = transform.angle ? this.angle + transform.angle : this.angle
-        }
-        var scale = this.scale
-        if (transform.scale) {
-          scale = this.scale + transform.scale
-          scale = scale <= this.min_scale ? this.min_scale : scale
-          scale = scale >= this.max_scale ? this.max_scale : scale
-        }
-        this.scale = scale
-        let cutX = this.cut_left
-        let cutY = this.cut_top
-        if (transform.cutX) {
-          this.cut_left = cutX + transform.cutX
-        }
-        if (transform.cutY) {
-          this.cut_top = cutY + transform.cutY
-        }
-        this._img_top = transform.y ? this._img_top + transform.y : this._img_top
-        this._img_left = transform.x ? this._img_left + transform.x : this._img_left
-        // 图像边缘检测,防止截取到空白
-        this._imgMarginDetectionScale()
-        // 停止居中裁剪框，继续修改图片位置
-        this._moveDuring()
-        this.scale = this.scale
-        this._img_top = this._img_top
-        this._img_left = this._img_left
-
-        !this._canvas_overflow && this._draw()
-        // 可以居中裁剪框了
-        this._moveStop()// 结束操作
-      },
-      /**
-       * 设置剪裁框尺寸
-       */
-      setCutSize(w, h) {
-        this.width = w
-        this.height = h
-        this._computeCutSize()
-      },
-      /**
-       * 设置剪裁框和图片居中
-       */
-      setCutCenter() {
-        let cut_top = (this.info.windowHeight - this.height) * 0.5
-        let cut_left = (this.info.windowWidth - this.width) * 0.5
-        // 顺序不能变
-        this._img_top = this._img_top - this.cut_top + cut_top
-        this.cut_top = cut_top
-        this._img_left = this._img_left - this.cut_left + cut_left
-        this.cut_left = cut_left
-      },
-      _setCutCenter() {
-        let cut_top = (this.info.windowHeight - this.height) * 0.5
-        let cut_left = (this.info.windowWidth - this.width) * 0.5
-        this.cut_top = cut_top
-        this.cut_left = cut_left
-      },
-      /**
-       * 设置剪裁框宽度-即将废弃
-       */
-      setWidth(width) {
-        this.width = width
-        this._computeCutSize()
-      },
-      /**
-       * 设置剪裁框高度-即将废弃
-       */
-      setHeight(height) {
-        this.height = height
-        this._computeCutSize()
-      },
-      /**
-       * 是否锁定旋转
-       */
-      setDisableRotate(value) {
-        this.disable_rotate = value
-      },
-      /**
-       * 是否限制移动
-       */
-      setLimitMove(value) {
-        this._cut_animation = true
-        this.limit_move = !!value
-      },
-      /**
-       * 初始化图片，包括位置、大小、旋转角度
-       */
-      imgReset() {
-        this.scale = 1
-        this.angle = 0
-        this.tanLeft = 0
-        this.tanTop = 0
-        this._img_top = wx.getSystemInfoSync().windowHeight / 2
-        this._img_left = wx.getSystemInfoSync().windowWidth / 2
-      },
-      /**
-       * 加载（更换）图片
-       */
-      pushImg(src) {
-        console.log('pushing img: ' + src)
-        if (src) {
-          this.imgSrc = src
-          // 发现是手动赋值直接返回，交给watch处理
-          return
-        }
-
-        wx.getImageInfo({
-          src: this.imgSrc,
-          success: (res) => {
-            console.log('----------------------', res)
-            this.imageObject = res
-            // 图片非本地路径需要换成本地路径
-            if (this.imgSrc.search(/tmp/) == -1) {
-              this.imgSrc = res.path
-            }
-            // 计算最后图片尺寸
-            this._imgComputeSize()
-            if (this.limit_move) {
-              // 限制移动，不留空白处理
-              this._imgMarginDetectionScale()
-            }
-            this._draw()
-          },
-          fail: (err) => {
-            this.imgSrc = ''
-            console.log(err)
-          }
-        })
-      },
-      /**
-       * 设置图片放大缩小
-       */
-      setScale(scale) {
-        if (!scale) return
-        this.scale = scale
-        !this._canvas_overflow && this._draw()
-      },
-      /**
-       * 设置图片旋转角度
-       */
-      setAngle(angle) {
-        if (!angle) return
-        this._cut_animation = true
-        this.angle = angle
-        this._imgMarginDetectionScale()
-        !this._canvas_overflow && this._draw()
-      },
-      _initCanvas() {
-        // 初始化canvas
-        // if (!this.ctx) {
-          this.ctx = wx.createCanvasContext('image-cropper', this)
-        // }
-          let vm = this
-          console.log(wx.createSelectorQuery().select('#image-croppervvv').fields({ node: true, size: true }), '00887867667')
-          // wx.createSelectorQuery()
-          //   .select('#myCanvas') // 在 WXML 中填入的 id
-          //   .node(({ node: canvas }) => {
-          //       console.log('0009999')
-          //       const context = canvas.getContext('2d')
-          //   })
-          //   .exec()
-          wx.createSelectorQuery()
-            .select('#myCanvas') // 在 WXML 中填入的 id
-            .fields({ node: true, size: true })
-            .exec((res) => {
-                console.log(res, 'res===')
-                // Canvas 对象
-                vm.canvas = res[0].node
-                // Canvas 画布的实际绘制宽高
-                const renderWidth = res[0].width
-                const renderHeight = res[0].height
-                // Canvas 绘制上下文
-                vm.ctx = vm.canvas.getContext('2d')
-
-                // 初始化画布大小
-                const dpr = wx.getWindowInfo().pixelRatio
-                vm.canvas.width = renderWidth * dpr
-                vm.canvas.height = renderHeight * dpr
-                vm.ctx.scale(dpr, dpr)
-            })
-      },
-
-      /**
-       * 根据开发者设置的图片目标尺寸计算实际尺寸
-       */
-      _initImageSize() {
-        // 处理宽高特殊单位 %>px
-        if (this.INIT_IMGWIDTH && typeof this.INIT_IMGWIDTH === 'string' && this.INIT_IMGWIDTH.indexOf('%') != -1) {
-          let width = this.INIT_IMGWIDTH.replace('%', '')
-          this.INIT_IMGWIDTH = this.img_width = this.info.windowWidth / 100 * width
-        }
-        if (this.INIT_IMGHEIGHT && typeof this.INIT_IMGHEIGHT === 'string' && this.INIT_IMGHEIGHT.indexOf('%') != -1) {
-          let height = this.img_height.replace('%', '')
-          this.INIT_IMGHEIGHT = this.img_height = this.info.windowHeight / 100 * height
-        }
-      },
-      /**
-       * 检测剪裁框位置是否在允许的范围内(屏幕内)
-       */
-      _cutDetectionPosition() {
-        let _cutDetectionPositionTop = () => {
-          // 检测上边距是否在范围内
-          if (this.cut_top < 0) {
-            this.cut_top = 0
-          }
-          if (this.cut_top > this.info.windowHeight - this.height) {
-            this.cut_top = this.info.windowHeight - this.height
-          }
-        }, _cutDetectionPositionLeft = () => {
-          // 检测左边距是否在范围内
-          if (this.cut_left < 0) {
-            this.cut_left = 0
-          }
-          if (this.cut_left > this.info.windowWidth - this.width) {
-            this.cut_left = this.info.windowWidth - this.width
-          }
-        }
-        // 裁剪框坐标处理（如果只写一个参数则另一个默认为0，都不写默认居中）
-        if (this.cut_top == null && this.cut_left == null) {
-          this._setCutCenter()
-        } else if (this.cut_top != null && this.cut_left != null) {
-          _cutDetectionPositionTop()
-          _cutDetectionPositionLeft()
-        } else if (this.cut_top != null && this.cut_left == null) {
-          _cutDetectionPositionTop()
-          this.cut_left = (this.info.windowWidth - this.width) / 2
-        } else if (this.cut_top == null && this.cut_left != null) {
-          _cutDetectionPositionLeft()
-          this.cut_top = (this.info.windowHeight - this.height) / 2
-        }
-      },
-      /**
-       * 检测canvas位置是否在允许的范围内(屏幕内)如果在屏幕外则不开启实时渲染
-       * 如果只写一个参数则另一个默认为0，都不写默认超出屏幕外
-       */
-      _canvasDetectionPosition() {
-        if (this.canvas_top == null && this.canvas_left == null) {
-          this._canvas_overflow = false
-          this.canvas_top = -5000
-          this.canvas_left = -5000
-        } else if (this.canvas_top != null && this.canvas_left != null) {
-          if (this.canvas_top < -this.height || this.canvas_top > this.info.windowHeight) {
-            this._canvas_overflow = true
-          } else {
-            this._canvas_overflow = false
-          }
-        } else if (this.canvas_top != null && this.canvas_left == null) {
-          this.canvas_left = 0
-        } else if (this.canvas_top == null && this.canvas_left != null) {
-          this.canvas_top = 0
-          if (this.canvas_left < -this.width || this.canvas_left > this.info.windowWidth) {
-            this._canvas_overflow = true
-          } else {
-            this._canvas_overflow = false
-          }
-        }
-      },
-      /**
-       * 图片边缘检测-位置
-       */
-      _imgMarginDetectionPosition(scale) {
-        if (!this.limit_move) return
-        let left = this._img_left
-        let top = this._img_top
-        var scaleV2 = scale || this.scale
-        let img_width = this.img_width
-        let img_height = this.img_height
-        if (this.angle / 90 % 2) {
-          img_width = this.img_height
-          img_height = this.img_width
-        }
-        left = this.cut_left + img_width * scaleV2 / 2 >= left ? left : this.cut_left + img_width * scaleV2 / 2
-        left = this.cut_left + this.width - img_width * scaleV2 / 2 <= left ? left : this.cut_left + this.width - img_width * scaleV2 / 2
-        top = this.cut_top + img_height * scaleV2 / 2 >= top ? top : this.cut_top + img_height * scaleV2 / 2
-        top = this.cut_top + this.height - img_height * scaleV2 / 2 <= top ? top : this.cut_top + this.height - img_height * scaleV2 / 2
-        this._img_left = left
-        this._img_top = top
-        this.scale = scaleV2
-      },
-      /**
-       * 图片边缘检测-缩放
-       */
-      _imgMarginDetectionScale() {
-        if (!this.limit_move) return
-        let scale = this.scale
-        let img_width = this.img_width
-        let img_height = this.img_height
-        if (this.angle / 90 % 2) {
-          img_width = this.img_height
-          img_height = this.img_width
-        }
-        if (img_width * scale < this.width) {
-          scale = this.width / img_width
-        }
-        if (img_height * scale < this.height) {
-          scale = Math.max(scale, this.height / img_height)
-        }
-        this._imgMarginDetectionPosition(scale)
-      },
-      /**
-       * 计算图片尺寸
-       */
-      _imgComputeSize() {
-        let img_width = this.img_width,
-          img_height = this.img_height
-        if (!this.INIT_IMGHEIGHT && !this.INIT_IMGWIDTH) {
-          // 默认按图片最小边 = 对应裁剪框尺寸
-          img_width = this.imageObject.width
-          img_height = this.imageObject.height
-          if (img_width / img_height > this.width / this.height) {
-            img_height = this.height
-            img_width = this.imageObject.width / this.imageObject.height * img_height
-          } else {
-            img_width = this.width
-            img_height = this.imageObject.height / this.imageObject.width * img_width
-          }
-        } else if (this.INIT_IMGHEIGHT && !this.INIT_IMGWIDTH) {
-          img_width = this.imageObject.width / this.imageObject.height * this.INIT_IMGHEIGHT
-        } else if (!this.INIT_IMGHEIGHT && this.INIT_IMGWIDTH) {
-          img_height = this.imageObject.height / this.imageObject.width * this.INIT_IMGWIDTH
-        }
-        console.log(img_width)
-        console.log(img_height)
-        this.img_width = img_width
-        this.img_height = img_height
-      },
-      // 改变截取框大小
-      _computeCutSize() {
-        if (this.width > this.info.windowWidth) {
-          this.width = his.info.windowWidth
-        } else if (this.width + this.cut_left > this.info.windowWidth) {
-          this.cut_left = this.info.windowWidth - this.cut_left
-        }
-        if (this.height > this.info.windowHeight) {
-          this.height = this.info.windowHeight
-        } else if (this.height + this.cut_top > this.info.windowHeight) {
-          this.cut_top = this.info.windowHeight - this.cut_top
-        }
-        !this._canvas_overflow && this._draw()
-      },
-
-      _move_throttle() {
-        // 安卓需要节流
-        if (this.info.platform == 'android') {
-          clearTimeout(this.MOVE_THROTTLE)
-          this.MOVE_THROTTLE = setTimeout(() => {
-            this.MOVE_THROTTLE_FLAG = true
-          }, 1000 / 40)
-          return this.MOVE_THROTTLE_FLAG
-        } else {
-          this.MOVE_THROTTLE_FLAG = true
-        }
-      },
-
-      // 停止移动时需要做的操作
-      _moveStop() {
-        // 清空之前的自动居中延迟函数并添加最新的
-        clearTimeout(this.TIME_CUT_CENTER)
-        this.TIME_CUT_CENTER = setTimeout(() => {
-          // 动画启动
-          if (!this._cut_animation) {
-            this._cut_animation = true
-          }
-          this.setCutCenter()
-        }, 1000)
-        // 清空之前的背景变化延迟函数并添加最新的
-        clearTimeout(this.TIME_BG)
-        this.TIME_BG = setTimeout(() => {
-          if (this._flag_bright) {
-            this._flag_bright = false
-          }
-        }, 2000)
-      },
-      // 移动中
-      _moveDuring() {
-        // 清空之前的自动居中延迟函数
-        clearTimeout(this.TIME_CUT_CENTER)
-        // 清空之前的背景变化延迟函数
-        clearTimeout(this.TIME_BG)
-        // 高亮背景
-        if (!this._flag_bright) {
-          this._flag_bright = true
-        }
-      }
-    }
-})
-</script>
-<style lang="less">
-  .main-box{
-    width: 100%;
-    height: 10vh;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    z-index: 999999;
-    padding: 0 10vw;
-    .main-cancel,.main-save{
-      background: #d1d1d1;
-      padding: 8rpx 0;
-      width: 200rpx;
-      border-radius: 6rpx;
-      color: #D92553;
-    }
-    .main-save{
-      color: white;
-      background: #D92553;
-    }
-  }
-  .image-cropper{
-    background:rgba(14, 13, 13,.8);
-    position: fixed;
-    top:0;
-    left:0;
-    width:100vw;
-    height:100vh;
-    z-index: 1;
-  }
-  .main{
-    position: absolute;
-    width:100vw;
-    height:100vh;
-    overflow: hidden;
-  }
-  .content{
-    z-index: 9;
-    position: absolute;
-    width:100vw;
-    height:100vh;
-    display: flex;
-    flex-direction:column;
-    pointer-events:none;
-  }
-  .bg_black{
-    background: rgba(0, 0, 0, 0.8)!important;
-  }
-  .bg_gray{
-    background: rgba(0, 0, 0, 0.45);
-    transition-duration: .35s;
-  }
-  .content>.content_top{
-    pointer-events:none;
-  }
-  .content>.content_middle{
-    display: flex;
-    height: 200px;
-    width:100%;
-  }
-  .content_middle_middle{
-    width:200px;
-    box-sizing:border-box;
-    position: relative;
-    transition-duration: .3s;
-  }
-  .content_middle_right{
-    flex: auto;
-  }
-  .content>.content_bottom{
-    flex: auto;
-  }
-  .image-cropper .img{
-    z-index: 2;
-    top:0;
-    left:0;
-    position: absolute;
-    border:none;
-    width:100%;
-    backface-visibility: hidden;
-    transform-origin:center;
-  }
-  .image-cropper-canvas{
-    position: fixed;
-    background: white;
-    width:150px;
-    height:150px;
-    z-index: 10;
-    top:-200%;
-    pointer-events:none;
-  }
-  .border{
-    background: white;
-    pointer-events:auto;
-    position:absolute;
-  }
-  .border-top-left{
-    left:-2.5px;
-    top:-2.5px;
-    height:2.5px;
-    width:33rpx;
-  }
-  .border-top-right{
-    right:-2.5px;
-    top:-2.5px;
-    height:2.5px;
-    width:33rpx;
-  }
-  .border-right-top{
-    top:-1px;
-    width:2.5px;
-    height:30rpx;
-    right:-2.5px;
-  }
-  .border-right-bottom{
-    width:2.5px;
-    height:30rpx;
-    right:-2.5px;
-    bottom:-1px;
-  }
-  .border-bottom-left{
-    height:2.5px;
-    width:33rpx;
-    bottom:-2.5px;
-    left:-2.5px;
-  }
-  .border-bottom-right{
-    height:2.5px;
-    width:33rpx;
-    bottom:-2.5px;
-    right:-2.5px;
-  }
-  .border-left-top{
-    top:-1px;
-    width:2.5px;
-    height:30rpx;
-    left:-2.5px;
-  }
-  .border-left-bottom{
-    width:2.5px;
-    height:30rpx;
-    left:-2.5px;
-    bottom:-1px;
-  }
-</style>
-<config>
-  {
-  usingComponents: {
-  chooseImageTips: '~@/components/chooseImageTips',
-  }
-  }
-</config>
diff --git a/src/mixins/https.js b/src/mixins/https.js
index 6817fbe..3810024 100644
--- a/src/mixins/https.js
+++ b/src/mixins/https.js
@@ -95,7 +95,7 @@ export default {
               wx.removeStorageSync('formId')
               resolve({statusCode, ...data})
             } else if (data.code === 1) {
-              resolve({statusCode, ...data})
+              // resolve({statusCode, ...data})
               console.error(data.message)
               // console.log(this.$app.$options.globalData)
               if (this.$is == 'pages/service/GroupChatPage' && data.message.includes('已断开连接')) {
diff --git a/src/pages/home/registration.wpy b/src/pages/home/registration.wpy
index c75a412..bad45cb 100644
--- a/src/pages/home/registration.wpy
+++ b/src/pages/home/registration.wpy
@@ -244,6 +244,21 @@ wepy.page({
     unionid: '',
     enterprise: ''
   },
+    onShow(e) {
+        console.log(e, 'e===')
+        if (e && e.photo) {
+            this.photo = e.photo
+        }
+        console.log(this.photo, '===')
+    },
+    onLoad() {
+        let vm = this
+        let timestamp = Date.parse(new Date())
+        let date = new Date(timestamp)
+        let Y = date.getFullYear()
+        vm.endDate = `${Y - 12}-01-01`
+        vm.beginData = `${Y - 120}-01-01`
+    },
   methods: {
       hideCut(e) {
           wx.showTabBar({
@@ -253,7 +268,15 @@ wepy.page({
       },
     complete() {
       let vm = this
-        console.log(vm.photo, 'vm.photo==')
+        console.log(this.photo, vm.photo, 'vm.photo==')
+        if (!vm.photo && wx.getStorageSync('baseImage')) {
+            vm.photo = wx.getStorageSync('baseImage')
+            wx.removeStorageSync('baseImage')
+        }
+        if (!vm.photo) {
+            return vm.$showToast('请上传你的头像')
+        }
+        console.log(vm.photo, 'vm.photo=')
       if (!vm.name) {
         return vm.$showToast('请输入昵称')
       } else if (vm.name.length < 2 || vm.name.length > 10) {
@@ -262,15 +285,13 @@ wepy.page({
       if (vm.name.includes('福恋')) {
         return vm.$showToast('请勿输入带“福恋”关键字的昵称！')
       }
-      if (vm.photo == '') {
-        return vm.$showToast('请上传你的头像')
-      }
+
       if (!vm.sex) {
         return vm.$showToast('请选择你的性别')
       }
-      if (!vm.mobile) {
-        return vm.$showToast('请选择绑定手机号')
-      }
+      // if (!vm.mobile) {
+      //   return vm.$showToast('请选择绑定手机号')
+      // }
       if (!vm.birthday) {
         return vm.$showToast('请选择你的生日')
       }
@@ -287,7 +308,7 @@ wepy.page({
       let data = {
         photo: vm.photo,
         nickname: vm.name,
-        mobile: vm.mobile,
+        mobile: vm.mobile || '15813393343',
         sex: vm.sex === '男' ? 1 : 2,
         belief: vm.belief,
         state: vm.emotion,
@@ -345,15 +366,7 @@ wepy.page({
         })
       }
     },
-    // 选择的图片和取消功能
-    changeVal(data) {
-        console.log(data, 'data=2222')
-      let vm = this
-      if (data) {
-        vm.photo = data[0].filePath
-      }
-      vm.chooseShow = false
-    },
+
     // 关闭上传头像弹窗
     closeUploadPic() {
       let vm = this
@@ -369,20 +382,8 @@ wepy.page({
       vm.displayCity = e.city.replace(/市/g, '')
       vm.address = {country: e.country, province: e.province, city: e.city}
     }
-  },
-  onShow(e) {
-      if (e && e.photo) {
-          this.photo = e.photo
-      }
-  },
-  onLoad() {
-    let vm = this
-    let timestamp = Date.parse(new Date())
-    let date = new Date(timestamp)
-    let Y = date.getFullYear()
-    vm.endDate = `${Y - 12}-01-01`
-    vm.beginData = `${Y - 120}-01-01`
   }
+
 })
 </script>
 <config>
diff --git a/src/pages/tabBar/user.wpy b/src/pages/tabBar/user.wpy
index 6e899c9..38a9973 100644
--- a/src/pages/tabBar/user.wpy
+++ b/src/pages/tabBar/user.wpy
@@ -114,7 +114,7 @@
     <view :class="{'show':modalName=='auditModal'}" class="cu-modal">
       <view class="audit_photo_box">
         <view class="cancel_icon_box" @tap="hideModal">
-          <view class="font_family icon-off white font_48"></view>
+          <view style="font-size: 24px" class="font_family cuIcon-roundclose white "></view>
         </view>
         <view class="m_photo">
           <view class="audit_avatar_box">
@@ -138,7 +138,7 @@
                src="https://image.fulllinkai.com/202204/14/2c8b0665f901bd2e3b1b7afafd0629c3.png"
                mode="widthFix"></image>
         <view class="cancel_icon_box" @tap="hideModal">
-          <view class="font_family icon-off white font_48"></view>
+          <view style="font-size: 24px" class="font_family cuIcon-roundclose white "></view>
         </view>
         <view class="m_photo f-fcc">
           <view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">更换头像将重新审核，确定仍要更换成为未认证状态吗？
@@ -151,13 +151,13 @@
       </view>
     </view>
     <view :class="{'show':modalName=='isExclusiveService'}" class="cu-modal">
-      <view class="audit_photo_box colorfff" style="border-radius: 32rpx;padding: 22rpx;">
+      <view class="audit_photo_box bg_f" style="border-radius: 32rpx;padding: 22rpx;">
         <view class="font_32 bold color-333" style="padding-top:38rpx;">联系专属客服</view>
         <image style="width: 240rpx;height: 240rpx;margin: 40rpx;"
                src="{{exclusiveService}}" show-menu-by-longpress="true"
                mode="widthFix"></image>
         <view class="cancel_icon_box" @tap="hideModal">
-          <view class="font_family icon-off white font_48"></view>
+          <view style="font-size: 24px" class="font_family cuIcon-roundclose white "></view>
         </view>
         <view class="m_photo f-fcc">
           <view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">长按识别二维码，联系客服
@@ -166,13 +166,12 @@
       </view>
     </view>
   </view>
-  <block v-show="posterConfig">
+  <block v-if="posterConfig">
     <!--      生成海报-->
-    <poster type="2d" id="poster" ref="poster" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig}}"
-            bind:success="onPosterSuccess">
-    </poster>
+      <poster type="2d" id="poster" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig}}" bind:success="onPosterSuccess" bind:fail="onPosterFail">
+      </poster>
     <!--        分享微信卡片-->
-    <poster type="2d" id="posterV1" ref="posterV1" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig1}}"
+    <poster type="2d" id="posterV1" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig1}}"
             bind:success="onPosterSuccessWx" >
     </poster>
   </block>
@@ -186,6 +185,7 @@
   <loginTips :tokenShow.sync="tokenShow" @loginCut.user="loginCut"></loginTips>
 
   <chooseImageTips :chooseShow.sync="chooseShow" :jumpString.sync="jumpString" :photo.sync="user.photo" @hideCut.user="hideCut"></chooseImageTips>
+    <loginDialog :loginShow="loginShow" @hiddenLogin="hiddenLogin"></loginDialog>
 </template>
 
 <script>
@@ -195,7 +195,6 @@
   import {service} from '../../config.js'
 
   const app = getApp().$wepy.$options
-  // import shareComponent from '../../components/shareComponent'
   import {getPhoneNumber} from '../../utils/util'
 
   wepy.page({
@@ -418,26 +417,27 @@
       let url = `/pages/home/information?id=${fromUserID}&from_openid=${openid}&share_user_id=${fromUserID}&from_user_id=${fromUserID}`
       // let url = 'pages/tabBar/welcome?from_openid=' + openid + '&from_user_id=' + fromUserID
       console.log(url)
-      // console.log(that.shareCanvasImg, '分享海报')
-      // return {
-      //   title: that.title,
-      //   path: url,
-      //   imageUrl: that.shareCanvasImg,
-      //   success: function (res) {
-      //     wx.showToast({
-      //       title: '转发成功',
-      //       icon: 'success',
-      //       duration: 1500
-      //     })
-      //     var shareTickets = res.shareTickets
-      //     if (shareTickets.length == 0) {
-      //       return false
-      //     }
-      //   },
-      //   fail: function (res) {
-      //     // 转发失败
-      //   }
-      // }
+      console.log(that.shareCanvasImg, '分享海报')
+      console.log(that.title, 'title')
+      return {
+        title: `我是"${that.user.nickname}"，这是我的小程序卡片`,
+        path: url,
+        imageUrl: that.shareCanvasImg,
+        success: function (res) {
+          wx.showToast({
+            title: '转发成功',
+            icon: 'success',
+            duration: 1500
+          })
+          var shareTickets = res.shareTickets
+          if (shareTickets.length == 0) {
+            return false
+          }
+        },
+        fail: function (res) {
+          // 转发失败
+        }
+      }
     },
 
     onLoad(e) {
@@ -456,27 +456,6 @@
       }
     },
 
-    // getUid() {
-    //     let that = this
-    //     that.$get({
-    //         url: service.account,
-    //         data: {
-    //             openid: wx.getStorageSync('openid')
-    //         }
-    //     }, {
-    //         success: ({
-    //             code,
-    //             data
-    //         }) => {
-    //             // console.log(data)
-    //             that.extraData = {
-    //                 'uid': data.uid
-    //             }
-    //             that.$apply()
-    //         }
-    //     })
-    // }
-
     methods: {
       // getorderDetail() {
       //     let that = this
@@ -545,7 +524,7 @@
           if (!wx.getStorageSync('mobile')) {
             vm.isShowIphoneBtn = true
           }
-            if (data.is_complete_profile != 1) {
+            if (!data.is_complete_profile) {
                 this.modalName = 'ModalEdit'
                 return
             }
@@ -576,54 +555,55 @@
         // var recordTime = String(parseFloat(new Date(repTime).getTime()) / 1000)
         // self.UID = recordTime.substring(recordTime.length - 5) + String(data.id)
         wx.setStorageSync('UID', self.UID)
-        self.shareConfig.images[1].url = data.user_share_qrcode || 'https://local-pictures.oss-cn-shenzhen.aliyuncs.com/202409/12/1726111703932.img'
-        // self.posterConfig = self.shareConfig
-        //     console.log(self.posterConfig, '333===0999')
-        // // self.$nextTick(() => {
-        //   setTimeout(() => {
-        //       console.log(self.$wx.selectComponent('#poster'), self.$refs.poster, '---99')
-        //     self.$wx.selectComponent('#poster').onCreate(true)
-        //       console.log('9878733')
-        //   }, 500)
-        // // })
-        // // 小程序分享
-        // self.title = `我是"${data.user.nickname}"，这是我的小程序卡片`
-        // if (data.user.photo || data.user.avatar) {
-        //   let year = '', city = '', degree = '', industry_sub = ''
-        //   if (data.profile_courtship.birthday) {
-        //     year = data.profile_courtship.birthday.slice(2, 4) + '年'
-        //   }
-        //   if (data.profile_courtship.city) {
-        //     city = data.profile_courtship.city
-        //   }
-        //   if (data.profile_courtship.degree) {
-        //     degree = data.profile_courtship.degree
-        //   }
-        //   if (data.industry_sub) {
-        //     industry_sub = data.industry_sub
-        //   }
-        //   console.log(year, city, degree, industry_sub)
-        //   self.shareConfig1.texts[0].text = `${year} | ${city}`
-        //   self.shareConfig1.texts[1].text = `${degree} | ${industry_sub}`
-        //   self.shareConfig1.images[0].url = data.photo || data.avatar
-        //   self.posterConfig1 = self.shareConfig1
-        //   self.$nextTick(() => {
-        //     setTimeout(() => {
-        //       self.$wx.selectComponent('#posterV1').onCreate(true, self.$wx)
-        //     }, 100)
-        //   })
-        // } else {
-        //   // 重新获取分享码
-        //   self.$showToast('分享图片获取失败')
-        // }
+        self.shareConfig.images[1].url = data.share_qrcode
+        self.posterConfig = self.shareConfig
+            console.log(self.posterConfig, '333===0999')
+            self.$nextTick(() => {
+                setTimeout(() => {
+                    self.$wx.selectComponent('#poster').onCreate(true, self)
+                }, 100)
+            })
+        // 小程序分享
+        self.title = `我是"${data.user.nickname}"，这是我的小程序卡片`
+            console.log(self.title, 'title===')
+        if (data.user.photo || data.user.avatar) {
+          let year = '', city = '', degree = '', industry_sub = ''
+          if (data.birthday) {
+            year = data.birthday.slice(2, 4) + '年'
+          }
+          if (data.city) {
+            city = data.city
+          }
+          if (data.degree) {
+            degree = data.degree
+          }
+          if (data.industry_sub) {
+            industry_sub = data.industry_sub
+          }
+          console.log(year, city, degree, industry_sub)
+          self.shareConfig1.texts[0].text = `${year} | ${city}`
+          self.shareConfig1.texts[1].text = `${degree} | ${industry_sub}`
+          self.shareConfig1.images[0].url = data.user.photo || data.user.avatar
+          self.posterConfig1 = self.shareConfig1
+          self.$nextTick(() => {
+            setTimeout(() => {
+                console.log(self.posterConfig1, 'posterConfig1=')
+              self.$wx.selectComponent('#posterV1').onCreate(true, self)
+            }, 100)
+          })
+        } else {
+          // 重新获取分享码
+          self.$showToast('分享图片获取失败')
+        }
         console.log(self.posterConfig1, '7777')
         this.init = true
         this.user = data.user
         this.user.rank_id = data.rank_profile.rank_id
+        this.user.deadline = data.rank_profile.deadline
         // this.user.card_num = data.approve_profile.card_num
         this.user.is_approved = data.approve_profile.is_approved
         this.user.is_real_approved = data.approve_profile.is_real_approved
-        this.user.is_photo_audited = data.approve_profile.is_photo_audited
+        this.user.is_photo_audited = data.is_photo_audited
         // this.user.name = data.approve_profile.name
         this.listCount = {
           friend_count: data.friend_count,
@@ -631,6 +611,7 @@
           follow_count: data.follow_count,
           preview_count: data.preview_count
         }
+        console.log(this.user, 'user===')
         // this.is_profile = data.is_other_profile
         this.is_photo_audited = data.approve_profile.is_photo_audited
         this.title = `我是"${data.nickname}"，这是我的小程序卡片`
@@ -638,7 +619,7 @@
           wx.setStorageSync('my_qrcode', data.my_qrcode)
         }
         wx.setStorageSync('type', data.type)
-    })
+        })
       },
 
       getServiceCode(urlV2) {
@@ -735,6 +716,11 @@
         console.log(url, text)
         let titles = ['好友', '关注', '粉丝', '访客'], {is_base_info} = app.globalData,
           vm = this, {id} = wx.getStorageSync('userInfo')
+          // 校验是否完成注册资料
+          // if (!vm.$signInVerify()) {
+          //     vm.loginShow = true
+          //     return
+          // }
         if (titles.includes(text) && !is_base_info) {
           vm.showVisitorModel = true
             return
@@ -786,21 +772,25 @@
           url: `/pages/party/SpellGroupOrder?order_id=${id}`
         })
       },
-      loginDialogShow() {
-        let vm = this
-        wepy.$instance.pageLogin().then((data) => {
-          vm.token = data.token
-          vm.loginShow = false
-          vm.page = 1
-          vm.onShow()
-        })
-      }
-    },
-    events: {
-      'modalValue': (value) => { // 搜索返回值
-        this.loginShow = true
-      }
+        hiddenLogin() {
+            let vm = this
+            vm.loginShow = false
+        }
+      // loginDialogShow() {
+      //   let vm = this
+      //   wepy.$instance.pageLogin().then((data) => {
+      //     vm.token = data.token
+      //     vm.loginShow = false
+      //     vm.page = 1
+      //     vm.onShow()
+      //   })
+      // }
     }
+    // events: {
+    //   'modalValue': (value) => { // 搜索返回值
+    //     this.loginShow = true
+    //   }
+    // }
   })
 </script>
 
@@ -1499,7 +1489,8 @@
   loginTips: '~@/components/loginTips',
   chooseImageTips: '~@/components/chooseImageTips',
   shareComponent: '~@/components/shareComponent',
-  poster: "plugin://FL-plugin/poster"
+  poster: "plugin://FL-plugin/poster",
+    loginDialog: '~@/components/loginDialog',
   }
   }
 </config>
diff --git a/src/pages/users/ImageCropper.wpy b/src/pages/users/ImageCropper.wpy
index f9b1daa..8b9537a 100644
--- a/src/pages/users/ImageCropper.wpy
+++ b/src/pages/users/ImageCropper.wpy
@@ -96,8 +96,12 @@
                                     prevPage = pages[pages.length - 2]
                                 }
                                 if (prevPage) {
-                                    prevPage.setData({photo: photo})
-                                    prevPage.onShow({photo: photo})
+                                    let dataV1 = prevPage.data.photo
+                                    console.log(dataV1, '34===')
+                                    dataV1 = photo
+                                    prevPage.setData({photo: dataV1})
+                                    prevPage.onShow({photo: dataV1})
+                                    wx.setStorageSync('baseImage', dataV1)
                                 }
                                 wx.navigateBack({
                                     delta: 1
@@ -156,7 +160,7 @@
         let data = {
           photo: path
         }
-        this.$put({url: `${service.user}/photo`, data}).then(({code, data}) => {
+        this.$put({url: `${service.host}/user/register/profile`, data}).then(({code, data}) => {
             this.$Toast_success('上传成功')
             this.$gotoBack(1)
         }).finally(() => {
diff --git a/src/pages/users/artificial.wpy b/src/pages/users/artificial.wpy
index 86d3e0b..d391969 100644
--- a/src/pages/users/artificial.wpy
+++ b/src/pages/users/artificial.wpy
@@ -14,7 +14,7 @@
     </view>
   </view>
   <view style="height: {{navHeight}}px"></view>
-  <view v-if="is_real_approved == -1" style="height: 112rpx"></view>
+  <view v-if="is_real_approved == 0" style="height: 112rpx"></view>
   <view class="artificialBox">
     <view class="shootingText font_30 bold">请拍摄上传手持身份证照</view>
     <view>
@@ -24,7 +24,7 @@
           <view class="auditIconBox">
             <image class="auditIcon" src="https://images.ufutx.com/202104/12/c8a405728facde60462c5530fc9813a9.png" mode="widthFix"></image>
             <view class="font_30" v-if="is_real_approved == 2">正在审核中</view>
-            <view class="font_30" v-if="is_real_approved == -1">审核失败，请重新上传</view>
+            <view class="font_30" v-if="is_real_approved == 0">审核失败，请重新上传</view>
           </view>
         </block>
       </view>
@@ -38,7 +38,7 @@
               <view class="auditIconBox">
                 <image class="auditIcon" src="https://images.ufutx.com/202104/12/c8a405728facde60462c5530fc9813a9.png" mode="widthFix"></image>
                 <view class="font_24" v-if="is_real_approved == 2">正在审核中</view>
-                <view class="font_24" v-if="is_real_approved == -1">审核失败，请重新上传</view>
+                <view class="font_24" v-if="is_real_approved == 0">审核失败，请重新上传</view>
               </view>
             </view>
           </view>
@@ -50,7 +50,7 @@
               <view class="auditIconBox">
                 <image class="auditIcon" src="https://images.ufutx.com/202104/12/c8a405728facde60462c5530fc9813a9.png" mode="widthFix"></image>
                 <view class="font_24" v-if="is_real_approved == 2">正在审核中</view>
-                <view class="font_24" v-if="is_real_approved == -1">审核失败，请重新上传</view>
+                <view class="font_24" v-if="is_real_approved == 0">审核失败，请重新上传</view>
               </view>
             </view>
           </view>
@@ -68,7 +68,7 @@
     </view>
     <view class="submitButton font_30 {{showSubmit?'actionSubmit':''}}" @tap="request" v-if="!audit">提交认证</view>
     <view class="submitButton font_30 {{againShow?'actionSubmit':''}}" @tap="request" v-if="audit && is_real_approved != 1">重新提交</view>
-    <view class="font_30 text-center" style="color: #f33b6c;padding-top: 30rpx;padding-bottom: 40rpx;" @tap="redirectTo('/pages/users/realName')" v-if="audit && is_real_approved == -1">人脸识别</view>
+    <view class="font_30 text-center" style="color: #f33b6c;padding-top: 30rpx;padding-bottom: 40rpx;" @tap="redirectTo('/pages/users/realName')" v-if="audit && is_real_approved == 0">人脸识别</view>
     <view :class="{'show':modalName=='showAudit' }" class="cu-modal ">
       <view class="audit_box">
         <image class="audit_icon" src="https://images.ufutx.com/202101/21/be17739e07f9bb0de1c629dc0b84a505.png" mode="widthFix"></image>
@@ -79,7 +79,7 @@
       </view>
     </view>
   </view>
-  <view v-if="is_real_approved == -1" class="m_top_tips" style="margin-top: {{navHeight}}px;">{{approve_history_body_reason}}</view>
+  <view v-if="is_real_approved == 0" class="m_top_tips" style="margin-top: {{navHeight}}px;">{{approve_history_body_reason}}</view>
 </template>
 
 <script>
@@ -262,9 +262,13 @@
         request() {
             let that = this,
               data = {
-                  chat_user_id: that.chat_user_id,
-                  photos: JSON.stringify(that.photo),
-                  from_user_id: wx.getStorageSync('from_user_id') ? wx.getStorageSync('from_user_id') : ''
+                  photos: that.photo
+              }
+              if (wx.getStorageSync('from_user_id')) {
+                  data.from_user_id = wx.getStorageSync('from_user_id')
+              }
+              if (that.chat_user_id) {
+                  data.chat_user_id = that.chat_user_id
               }
             if (that.showSubmit || that.againShow) {
                 if (!that.nodata) {
diff --git a/src/pages/users/blacklist.wpy b/src/pages/users/blacklist.wpy
index 8465289..863798c 100644
--- a/src/pages/users/blacklist.wpy
+++ b/src/pages/users/blacklist.wpy
@@ -24,6 +24,7 @@
               </view>
           </view>
           <view class="clearfloat"></view>
+      </view>
     </view>
     <pageScroll></pageScroll>
     <block v-if="loading">
diff --git a/src/pages/users/exclusiveService.wpy b/src/pages/users/exclusiveService.wpy
index 6eb01b7..799cd42 100644
--- a/src/pages/users/exclusiveService.wpy
+++ b/src/pages/users/exclusiveService.wpy
@@ -25,7 +25,7 @@
              src="{{exclusiveService}}" show-menu-by-longpress="true"
              mode="widthFix"></image>
       <view class="cancel_icon_box" @tap="hideModal">
-        <view class="font_family icon-off white font_48"></view>
+        <view style="font-size: 24px" class="font_family cuIcon-roundclose white"></view>
       </view>
       <view class="m_photo f-fcc">
         <view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">长按识别二维码，联系客服
diff --git a/src/pages/users/friendlist.wpy b/src/pages/users/friendlist.wpy
index fe0cd70..2b157cf 100644
--- a/src/pages/users/friendlist.wpy
+++ b/src/pages/users/friendlist.wpy
@@ -249,7 +249,7 @@ wepy.page({
                 content: '是否确认删除该好友',
                 success: function (res) {
                     if (res.confirm) {
-                        than.$delete({url: service.addFriend + '/' + id}).then(({code, data}) => {
+                        than.$delete({url: service.host + '/friend/user/' + id}).then(({code, data}) => {
                                 than.$showToast('删除成功')
                                 than.list.splice(index, 1)
                                 if (than.list.length == 0) {
diff --git a/src/pages/users/logout.wpy b/src/pages/users/logout.wpy
index 72d911f..2244020 100644
--- a/src/pages/users/logout.wpy
+++ b/src/pages/users/logout.wpy
@@ -26,7 +26,7 @@
     <view class="audit_photo_box">
       <view class="cancel_icon_box" @tap="hideModal1">
         <!-- <image src="https://images.ufutx.com/202012/21/7bc531d74f41cce95ede5582232fd2f3.png" mode="widthFix" class="cancel_icon"></image> -->
-        <view class="font_family icon-off white font_48"></view>
+        <view style="font-size: 24px" class="font_family cuIcon-roundclose white"></view>
       </view>
       <view style="text-align: center">
         <view class="_bgModal">
diff --git a/src/pages/users/myCertification.wpy b/src/pages/users/myCertification.wpy
index 143b419..fd6ba58 100644
--- a/src/pages/users/myCertification.wpy
+++ b/src/pages/users/myCertification.wpy
@@ -24,8 +24,8 @@
         </block>
         <block v-if="!state">
           <view class="certification_button flo_r">
-            <view class="jump_button text-center font_28" v-if="is_real_approved==0">去认证</view>
-            <block v-if="is_real_approved==-1">
+            <view class="jump_button text-center font_28" v-if="is_real_approved==3">去认证</view>
+            <block v-if="is_real_approved==0">
               <view class="jump_button text-center font_28" style="width: 152rpx">重新认证</view>
               <image class="failure_icon" src="https://images.ufutx.com/202101/20/a42a33b3d6c901685adc8c2b8bedf7b4.png" mode="widthFix"></image>
             </block>
@@ -43,8 +43,8 @@
         </block>
         <block v-else>
           <view class="certification_button flo_r">
-            <view class="jump_button text-center font_28" v-if="stateV2 == 0">去认证</view>
-            <view class="audit_state_box" v-if="stateV2 != 0">
+            <view class="jump_button text-center font_28" v-if="stateV2 == 3">去认证</view>
+            <view class="audit_state_box" v-if="stateV2 != 3">
               <image class="audit_icon" src="https://images.ufutx.com/202101/20/3be02213104c9adba8ae30feb779d873.png" mode="widthFix"></image>
               <span class="font_28 color-999">审核中</span>
             </view>
diff --git a/src/pages/users/myDynamic.wpy b/src/pages/users/myDynamic.wpy
index 15ae8fc..d2cc20d 100644
--- a/src/pages/users/myDynamic.wpy
+++ b/src/pages/users/myDynamic.wpy
@@ -1,7 +1,7 @@
 <template>
     <view class="myDynamic" style="height: 100vh;">
         <scroll-view scroll-y  refresher-enabled="{{true}}" style="height: 100vh;" refresher-triggered="{{triggered}}" bindrefresherpulling="onPulling" bindrefresherrefresh="onRefresh" bindscrolltolower="handleScroll" lower-threshold="50">
-<!--            <dynamicList ref="dynamicList" :dataList.sync="list" :gifurl.sync="gifurl" :_index.sync="_index" :modalName.sync="modalName" :del.sync="del"></dynamicList>-->
+            <dynamicList :dynamicList="dynamicList" @changeSelect="changeSelect" :from="'dynamic'"></dynamicList>
             <view v-if="hideMessage" class="text-center">
                 <view class="font_28 m_empty">
                 <image src="https://images.ufutx.com/202106/18/c0a2445b889165f29c14ff13a5eaa752.png" mode="aspectFit"></image>
@@ -13,8 +13,8 @@
         <view class="cu-modal bottom-modal {{modalName=='delete'?'show':''}}" @tap="hideModal">
             <view class="cu-dialog dialog" style="border-radius: 30rpx 30rpx 0rpx 0rpx;padding-bottom: 50rpx;">
                 <view @tap="deleteV2">删除</view>
-                <view @tap="conceal" v-if="admin == 1">隐藏动态</view>
-                <view @tap="hotdt" v-if="admin == 1">设置为热门动态</view>
+<!--                <view @tap="conceal" v-if="admin == 1">隐藏动态</view>-->
+<!--                <view @tap="hotdt" v-if="admin == 1">设置为热门动态</view>-->
                 <view @tap="hideModal">取消</view>
             </view>
         </view>
@@ -27,11 +27,11 @@
   import https from '../../mixins/https'
   import base from '../../mixins/base'
   import utils from '../../utils/util'
-
+  import {commentTimeHandle} from '../../mixins/plugins'
   wepy.page({
     mixins: [base, https],
     data: {
-      list: [],
+        dynamicList: [],
       user_id: '',
       token: '',
       gifurl: 'https://images.ufutx.com/202106/11/54f9a1a03d1575597c94de63caebde8c.gif',
@@ -42,8 +42,7 @@
       collectionMessage: false,
       page: 1,
       modalName: '',
-      del: '',
-      dynamicList: null
+      del: ''
     },
 
     computed: {},
@@ -64,25 +63,6 @@
 
     },
 
-    onPulling() {
-      this.triggered = true
-    },
-
-    onRefresh() {
-      this.collectionMessage = false
-      this.noMoreShow = false
-      this.hideMessage = false
-      this.list = []
-      this.page = 1
-      this.getPageData()
-    },
-
-    handleScroll() {
-      if (this.collectionMessage) return
-      this.page += 1
-      this.getPageData()
-    },
-
     onPullDownRefresh() {
       this.getPageData()
     },
@@ -91,50 +71,74 @@
 
     },
     methods: {
+        onPulling() {
+            this.triggered = true
+        },
+        onRefresh() {
+            this.collectionMessage = false
+            this.noMoreShow = false
+            this.hideMessage = false
+            this.page = 1
+            this.getPageData()
+        },
+
+        handleScroll() {
+            if (this.collectionMessage) return
+            this.page += 1
+            this.getPageData()
+        },
       // 初始化页面数据
       getPageData() {
-        let _this = this
-        _this.$get({
-          url: `${service.moments}`,
+        let vm = this
+          vm.$get({
+          url: `${service.host}/moment/list/user`,
           data: {
-            page: _this.page,
-            user_id: _this.user_id
+            page: vm.page
           }
         }).then(({code, data}) => {
-            _this.triggered = false
-            if (data.data.length == 0 && _this.page == 1) {
-              _this.hideMessage = true
-              return
+            if (code === 0) {
+                console.log(data, 'data===')
+                if (data.data && data.data.length > 0) {
+                    data.data.forEach((item, index) => {
+                        item.create_time = commentTimeHandle(item.create_time)
+                        let sty = typeof (item.photos)
+                        if (sty == 'string') {
+                            item.photos = JSON.parse(item.photos)
+                        }
+                        // if ((item.is_audited == 0 || item.is_audited == -1) && item.is_self == 0) {
+                        //     data.data.splice(index--, 1)
+                        // }
+                    })
+                }
+                if (vm.dynamicList.length === 0 || vm.page === 1) {
+                    vm.dynamicList = data.data
+                } else {
+                    data.data.map(function (item) {
+                        vm.dynamicList.push(item)
+                    })
+                }
+                if (vm.dynamicList.length == 0) {
+                    vm.hideMessage = true
+                }
+                if (vm.dynamicList.length < 15 || data.data.length < 15) {
+                    vm.noMoreShow = true
+                }
+                console.log(vm.dynamicList, 'dynamicList=')
+                setTimeout(() => {
+                    vm.loading = true
+                    vm.triggered = false
+                }, 500)
             }
-            if (data.data.length == 0 && _this.page != 1) {
-              _this.noMoreShow = true
-              _this.collectionMessage = true
-              return
-            }
-            if (_this.list.length != 0 && _this.page == 1) return
-            data.data.forEach((ele, index) => {
-              let phs = ele.photos
-              ele.created_at = utils.commentTimeHandle(ele.created_at)
-              let sty = typeof (ele.photos)
-              if (sty == 'string') {
-                ele.photos = JSON.parse(ele.photos)
-              }
-              if (ele.is_audited == 0 && ele.is_self == 0) {
-                data.data.splice(index--, 1)
-              } else if (ele.is_audited == -1 && ele.is_self == 0) {
-                data.data.splice(index--, 1)
-              }
-              for (var i = 0; i < ele.photos.length; i++) {
-                ele.photos[i] = ele.photos[i].replace(/\(/g, '%28').replace(/\)/g, '%29').replace(' ', '%20')
-              }
-            })
-            _this.list = [..._this.list, ...data.data]
-            // this.$refs.dynamicList.textAll
         })
       },
+        changeSelect(e, index) {
+            console.log(e, index, '333===')
+            this.del = e.id
+            this.modalName = 'delete'
+        },
       deleteV2() {
         let vm = this
-        let url = `${service.moments}` + '/' + this.del
+        let url = `${service.host}` + '/moment/' + this.del + '/delete'
         vm.$showLoading('加载中')
         vm.$delete({
           url: url,
@@ -211,7 +215,7 @@ page {
   backgroundColorTop: '#f2f2f2',
   backgroundColorBottom: '#f2f2f2',
   usingComponents: {
-<!--  dynamicList: '~@/components/dynamicList',-->
+  dynamicList: '~@/components/dynamicList',
   }
   }
 </config>
diff --git a/src/pages/users/setTing.wpy b/src/pages/users/setTing.wpy
index b448289..0c1d4c3 100644
--- a/src/pages/users/setTing.wpy
+++ b/src/pages/users/setTing.wpy
@@ -52,19 +52,6 @@
                 </block>
             </block>
         </view>
-        <block v-if="posterConfig">
-            <!--      生成海报-->
-            <poster type="2d" id="poster" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig}}"
-                    bind:success="onPosterSuccess">
-            </poster>
-            <!--        分享微信卡片-->
-            <poster ref="poster1" type="2d" id="poster1" hide-loading="{{false}}" preload="{{false}}" config="{{posterConfig1}}"
-                    bind:success="onPosterSuccessWx" >
-            </poster>
-        </block>
-        <block v-if="!hide && posterConfig">
-            <shareComponent :hide.sync="hide" :shareImage.sync="invite_pic"></shareComponent>
-        </block>
     </view>
     <UnlockingDialog :modalName="unlockIngModalName" @unlockingCut="unlockingCut"></UnlockingDialog>
 </template>
@@ -87,81 +74,6 @@
         rankData: {
           rank_id: 0
         },
-      posterConfig: {},
-      shareConfig: {
-        width: 750,
-        height: 1334,
-        backgroundColor: '#fff',
-        debug: false,
-        texts: [],
-        images: [
-          {
-            url: 'https://image.fulllinkai.com/202206/20/57903775df70bd3f6ebde1b7ad00d159.png',
-            width: 750,
-            height: 1334,
-            y: 0,
-            x: 0
-          },
-          {
-            url: '',
-            width: 176,
-            height: 176,
-            y: 1102,
-            x: 84
-          }
-        ]
-      },
-      posterConfig1: null,
-      shareConfig1: {
-        width: 420,
-        height: 336,
-        backgroundColor: '#fff',
-        debug: false,
-        texts: [
-          {
-            x: 20,
-            y: 248 + 26,
-            lineHeight: 22,
-            width: 200,
-            text: '',
-            fontSize: 26,
-            color: '#fff',
-            zIndex: 99
-          }, {
-            x: 20,
-            y: 288 + 26,
-            width: 200,
-            lineHeight: 22,
-            text: '',
-            fontSize: 26,
-            color: '#fff',
-            zIndex: 99
-          }
-        ],
-        images: [
-          {
-            url: '',
-            width: 420,
-            height: 336,
-            y: 0,
-            x: 0
-          },
-          {
-            url: 'https://image.fulllinkai.com/202206/20/be5b39dde1ad4720893b2e3c52b4480d.png',
-            width: 420,
-            height: 100,
-            y: 236,
-            x: 0
-          },
-          {
-            url: 'https://image.fulllinkai.com/202206/20/bd732960011f55fed0e5e7d623118494.png',
-            width: 136,
-            height: 40,
-            y: 276,
-            x: 264
-          }
-        ]
-      },
       deadline: '',
       title: '',
       phoneNumber: '',
@@ -197,11 +109,6 @@
             type: 'navigateTo',
             path: '/pages/users/groupList'
           },
-          // {
-          //   title: '分享我的卡片',
-          //   type: 'modal',
-          //   path: ''
-          // },
           {
             title: '授权设置',
             type: 'navigateTo',
@@ -224,11 +131,7 @@
           }
         ],
         [
-          // {
-          //   title: '每日推荐提醒',
-          //   type: 'navigateTo',
-          //   path: ''
-          // },
+
           {
             title: '聊天消息提醒',
             type: 'navigateTo',
@@ -239,11 +142,7 @@
             type: 'navigateTo',
             path: ''
           }
-          // {
-          //   title: '夸夸我',
-          //   type: 'navigateTo',
-          //   path: ''
-          // }
+
         ],
         [
           {
@@ -267,67 +166,7 @@
       ]
     },
     watch: {
-      // user() {
-      //   console.log(this.user.type)
-      //   for (let item of this.StateList) {
-      //     if (item.type == this.user.type) {
-      //       item.active = true
-      //       this.StateText = item.title
-      //     } else {
-      //       item.active = false
-      //     }
-      //   }
-      //   this.user.deadline = this.user.deadline ? this.user.deadline.split(' ')[0] : ''
-      //   console.log(this.user.deadline)
-      //   this.Image = this.user.avatar
-      //   if (this.user.deadline != null) {
-      //     this.deadline = this.user.deadline
-      //   } else {
-      //     this.deadline = ''
-      //   }
-      // },
-      // pic() {
-      //   console.log(this.pic)
-      // },
-      // phoneNumber(mebile) {
-      //   console.log(mebile)
-      //   let reg = /^(\d{3})\d*(\d{4})$/
-      //   this.phoneNumber = mebile.replace(reg, '$1****$2')
-      // }
-    },
 
-    onShareAppMessage(res) {
-      let that = this
-      let openid = wx.getStorageSync('openid')
-      let fromUserID = wx.getStorageSync('user_id')
-        let type = wx.getStorageSync('type')
-        let url = ''
-        if (type === 'marriage') {
-            url = `/pages/home/informationV2?id=${fromUserID}&from_openid=${openid}&share_user_id=${fromUserID}&from_user_id=${fromUserID}`
-        } else {
-            url = `/pages/home/information?id=${fromUserID}&from_openid=${openid}&share_user_id=${fromUserID}&from_user_id=${fromUserID}`
-        }
-      console.log(url)
-      console.log(that.shareCanvasImg, '分享海报')
-      return {
-        title: that.title,
-        path: url,
-        imageUrl: that.shareCanvasImg,
-        success: function (res) {
-          wx.showToast({
-            title: '转发成功',
-            icon: 'success',
-            duration: 1500
-          })
-          var shareTickets = res.shareTickets
-          if (shareTickets.length == 0) {
-            return false
-          }
-        },
-        fail: function (res) {
-          // 转发失败
-        }
-      }
     },
     onShow() {
       this.versions = app.globalData.versions
@@ -336,7 +175,6 @@
     onLoad() {
       this.system = app.globalData.systemInfo.system.split(' ')[0]
     },
-
     methods: {
         vipData() {
             this.$get({url: service.host + '/user/center'}).then(({code, data}) => {
@@ -349,58 +187,7 @@
                     this.init = true
                     this.user = data
                     this.phoneNumber = wx.getStorageSync('mobile')
-                    let vm = this,
-                      my_qrcode = wx.getStorageSync('my_qrcode')
-                    // if (my_qrcode) {
-                    //     vm.shareConfig.images[1].url = my_qrcode
-                    //     setTimeout(() => {
-                    //         vm.posterConfig = vm.shareConfig
-                    //         vm.$wxpage.selectComponent('#poster').onCreate(true)
-                    //     }, 500)
-                    // }
-                    // this.title = `我是"${data.nickname}"，这是我的小程序卡片`
-                    // if (data.photo || data.avatar) {
-                    //     let year = '', city = '', degree = '', industry_sub = ''
-                    //     if (data.profile_courtship.birthday) {
-                    //         year = data.profile_courtship.birthday.slice(2, 4) + '年'
-                    //     }
-                    //     if (data.profile_courtship.city) {
-                    //         city = data.profile_courtship.city
-                    //     }
-                    //     if (data.profile_courtship.degree) {
-                    //         degree = data.profile_courtship.degree
-                    //     }
-                    //     if (data.industry_sub) {
-                    //         industry_sub = data.industry_sub
-                    //     }
-                    //     console.log(year, city, degree, industry_sub)
-                    //     vm.shareConfig1.texts[0].text = `${year} | ${city}`
-                    //     vm.shareConfig1.texts[1].text = `${degree} | ${industry_sub}`
-                    //     vm.shareConfig1.images[0].url = data.photo || data.avatar
-                    //     setTimeout(() => {
-                    //         vm.posterConfig1 = vm.shareConfig1
-                    //         // vm.$refs.poster1.onCreate(true)
-                    //     }, 500)
-                    // }
-                    // if (data.type == 'marriage') {
-                    //     this.list.splice(4)
-                    //     this.listV2 = [
-                    //         {
-                    //             icon: 'http://images.ufutx.com/201906/06/d9c45bb3869b616189ac0723887928ad.png',
-                    //             title: '分享给好友',
-                    //             type: 'navigateTo',
-                    //             subhead: '获得更多的祝福',
-                    //             path: '/pages/users/myShare'
-                    //         },
-                    //         {
-                    //             icon: 'http://images.ufutx.com/201906/06/0059f55a19360df71f84b8d90d265f54.png',
-                    //             title: '使用反馈',
-                    //             type: 'navigateTo',
-                    //             subhead: '共同维护福恋',
-                    //             path: '/pages/users/feedback'
-                    //         }
-                    //     ]
-                    // }
+                    let vm = this
                 vm.vipData()
                     wx.setStorageSync('type', data.type)
             })
@@ -503,10 +290,10 @@
 
       goto(url, title) {
         console.log(this.hide, 'url====')
-        if (title == '分享我的卡片') {
-          this.hide = false
-          return
-        }
+        // if (title == '分享我的卡片') {
+        //   this.hide = false
+        //   return
+        // }
         if (title == '授权设置') {
           wx.openSetting({
             success(res) {
diff --git a/src/pages/users/unmarriV2.wpy b/src/pages/users/unmarriV2.wpy
index 502c30c..3f6ae33 100644
--- a/src/pages/users/unmarriV2.wpy
+++ b/src/pages/users/unmarriV2.wpy
@@ -889,7 +889,7 @@
         <view class="audit_photo_box bg_f" style="border-radius: 32rpx;padding: 22rpx;">
             <image style="width: 380rpx;height: auto;margin: 22rpx;" src="https://image.fulllinkai.com/202204/14/2c8b0665f901bd2e3b1b7afafd0629c3.png" mode="widthFix"></image>
             <view class="cancel_icon_box" @tap="hideModalV2">
-                <view class="font_family icon-off white font_48" style="font-size: 52rpx;"></view>
+                <view class="font_family cuIcon-roundclose white" style="font-size: 52rpx;"></view>
             </view>
             <view class="m_photo f-fcc">
                 <view class="reason_prompt font_32 color333" style="width: 90%;font-weight: 400;">更换头像将重新审核，确定仍要更换成为未认证状态吗？</view>
@@ -1198,7 +1198,6 @@
                 let vm = this
                 if (!vm.mylibs.can_get_daily_rank) {
                     vm.modalName = 'prompt'
-
                     return
                 }
                 vm.$showLoading('领取中...')
diff --git a/src/pages/users/upgradeVIP.wpy b/src/pages/users/upgradeVIP.wpy
index 49b42ea..bdf46fb 100644
--- a/src/pages/users/upgradeVIP.wpy
+++ b/src/pages/users/upgradeVIP.wpy
@@ -17,7 +17,7 @@
       </block>
     </view>
     <view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; ">
-      {{user.rank_deadline?user.rank_deadline+'到期':'未激活'}}
+      {{user.deadline?user.deadline+'到期':'未激活'}}
     </view>
     <swiper class="card-swiper" circular="true"  bindchange="cardSwiper">
       <swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}"  @tap="showFn(index)">
@@ -351,8 +351,8 @@
         let data = {}
           data = {
             sub_rank_id: this.payData.payId,
-            chat_user_id: this.chat_user_id,
-            share_type: this.share_type,
+            // chat_user_id: this.chat_user_id,
+            // share_type: this.share_type,
             pay_type: this.wxPayShow
           }
         that.$post({url: url, data}).then(({code, data}) => {
diff --git a/src/pages/users/upgradeVIP2.wpy b/src/pages/users/upgradeVIP2.wpy
index 79105c3..6b8bb19 100644
--- a/src/pages/users/upgradeVIP2.wpy
+++ b/src/pages/users/upgradeVIP2.wpy
@@ -17,7 +17,7 @@
       </block>
     </view>
     <view class="font_24 white flo_l" style="color: #f7e4ad;width: 70%; ">
-      {{user.rank_deadline?user.rank_deadline+'到期':'未开通'}}
+      {{user.deadline?user.deadline+'到期':'未开通'}}
     </view>
     <swiper class="card-swiper" circular="true" previous-margin="1px" bindchange="cardSwiper" current="{{cardCur}}">
       <swiper-item v-for="(item,index) in rankList" :key="index" class="{{cardCur==index?'cur':''}}" @tap="showFn(index)">
@@ -333,10 +333,10 @@
         this.cardCur = e.$wx.detail.current
         this.shareText = this.rankList[e.$wx.detail.current].title
         this.sharePic = this.rankList[e.$wx.detail.current].pic
-        if (this.active == 1) {
+        // if (this.active == 1) {
           console.log(this.cardCur)
           this.specialVIP = this.rankList[this.cardCur]
-        }
+        // }
         clearTimeout(this.timeID)
         this.timeID = setTimeout(() => {
           this.shareId = this.rankList[this.cardCur].id
@@ -396,20 +396,20 @@
         that.modalName = ''
         that.$showLoading('支付中...')
         let data = {}
-        if (that.active == 1) {
+        // if (that.active == 1) {
           data = {
-            chat_user_id: this.chat_user_id,
-            other_user_id: this.other_user_id,
+            // chat_user_id: this.chat_user_id,
+            // other_user_id: this.other_user_id,
             pay_type: this.wxPayShow
           }
-        } else {
-          data = {
-            sub_rank_id: this.payData.payId,
-            chat_user_id: this.chat_user_id,
-            other_user_id: this.other_user_id,
-            pay_type: this.wxPayShow
-          }
-        }
+        // } else {
+        //   data = {
+        //     sub_rank_id: this.payData.payId,
+        //     chat_user_id: this.chat_user_id,
+        //     other_user_id: this.other_user_id,
+        //     pay_type: this.wxPayShow
+        //   }
+        // }
         that.$post({url: url, data}).then(({code, data}) => {
             that.trade_no = data.trade_no
             if (data.wx_pay.length == 0) {