图片编辑页面bug修复

.gitignore

@@ -0,0 +1 @@
+.DS_Store

ymhZjz/miniprogram_npm/color-picker/color-picker.wxss

@@ -1,7 +1,7 @@
 .dialog {
   visibility: hidden;
   opacity: 0;
-  transition: all 0.3s;
+  /* transition: all 0.3s; */
 }
 
 .dialog_show {

ymhZjz/pages/edit/index.js

@@ -14,6 +14,20 @@ let twoPoint = {
 import Dialog from '@vant/weapp/dialog/dialog'
 Page({
   data: {
+    backColor: [
+      //蓝色
+      {color: "#438edb", style: "background-color:#438edb"},
+      //白色
+      {color: "#ffffff", style: "background-color:#ffffff"},
+      //红色
+      {color: "#ff0000", style: "background-color:#ff0000"},
+      //浅蓝色
+      {color: "#66b5f2", style: "background-color:#66b5f2"},
+      //绿色
+      {color: "#07c160", style: "background-color:#07c160"},
+      //黄色
+      {color: "#ffc300", style: "background-color:#ffc300"}
+    ],
     imageData: {},
     showScale: 480 / 295,
     width: 0,
@@ -260,7 +274,6 @@ Page({
     });
   },
 
-
   // 解决用户拒绝相册问题
   checkq() {
     wx.getSetting({

ymhZjz/pages/edit/index.wxml

@@ -1,44 +1,31 @@
 <view class="container">
   <view class="photo-edit-content">
-    <view class="canvas-view" style="background-color:#fff;width: 240.0px;height: 336px">
-      <image class="nowx_mask" style="width: 292px;left: 120px;top: 164px;transform: translate(-50%, -50%) scale(1) rotate(0deg);z-index: 99;height: 163.52px" src="./images/wmark.png" mode="widthFix"></image>
-      <image style="width: 240.0px;height: 336px;left: 120.0px;top: 164.0px;transform: translate(-50%, -50%) scale(1) rotate(0deg)" class="people-photo" src="{{imageData.cimg}}" bindload="bindload" catchtouchstart="touchstart" catchtouchmove="touchmove" catchtouchend="touchend"></image>
+    <view class="canvas-view">
+      <image class="nowx_mask" style="width: 292px;left: 120px;top: 100px;transform: translate(-50%, -50%) scale(1) rotate(0deg);z-index: 99;height: 163.52px;position: relative;" src="./images/wmark.png" mode="widthFix"></image>
+      <image class="people-photo" src="{{imageData.cimg}}" bindload="bindload" catchtouchstart="touchstart" catchtouchmove="touchmove" catchtouchend="touchend"></image>
+      <!-- <movable-view direction="all" out-of-bounds class="frontImg">
+        <image class="nowx_mask"  src="./images/tie1.png" mode="widthFix"></image>
+      </movable-view> -->
     </view>
   </view>
   <view class="imgOpt">
     <van-tabs active="{{ active }}" bind:click="clickTab" color="#2c2c2c">
       <van-tab title="背景" name="1">
         <view class="colors">
-          <!-- 蓝色背景 -->
-          <view bindtap="toggleBg" data-color="#438edb" class="color" style="background-color:#438edb">
-            <view class="icon_select"></view>
-          </view>
-          <!-- 白色背景 -->
-          <view bindtap="toggleBg" data-color="#ffffff" class="color" style="background-color:#ffffff">
-            <view class="icon_select"></view>
-          </view>
-          <!-- 红色背景 -->
-          <view bindtap="toggleBg" data-color="#ff0000" class="color" style="background-color:#ff0000">
-            <view class="icon_select"></view>
-          </view>
-          <!-- 浅蓝色背景 -->
-          <view bindtap="toggleBg" data-color="#66b5f2" class="color" style="background-color:#66b5f2">
-            <view class="icon_select"></view>
-          </view>
-          <!-- 绿色背景 -->
-          <view bindtap="toggleBg" data-color="#07c160" class="color" style="background-color:#07c160">
-            <view class="icon_select"></view>
-          </view>
-          <!-- 黄色背景 -->
-          <view bindtap="toggleBg" data-color="#ffc300" class="color" style="background-color:#ffc300">
+          <view bindtap="toggleBg" wx:for="{{backColor}}" wx:key="*this" data-color="{{item.color}}" class="color" style="{{item.style}}">
             <view class="icon_select"></view>
           </view>
+          
           <!-- 自定义颜色选项 -->
-          <view bindtap="toPick" data-color="custom" class="color custom" style="display: flex; align-items: center; justify-content: center;">
+          <view bindtap="toPick" data-color="custom" class="color custom">
             <view class="custom-bg" style="background-color: #2c2c2c;width: 100%;height: 100%;font-size: 12px;color: #fff; margin:0 auto;line-height: 12vw;text-align: center;">自定义</view>
           </view>
         </view>
       </van-tab>
+      <!-- <van-tab title="男装" name="2">
+      </van-tab>
+      <van-tab title="女装" name="2">
+      </van-tab> -->
     </van-tabs>
 
     <view class="download-view">

ymhZjz/pages/edit/index.wxss

@@ -66,17 +66,23 @@
 
 .container .photo-edit-content .canvas-view {
   position: relative;
-  width: 100%;
-  height: 300px;
   margin: 0 auto;
   box-sizing: content-box;
   overflow: hidden;
+  background-color:#fff;
+  width: 240.0px;
+  height: 336px
 }
 
 .container .photo-edit-content .canvas-view .people-photo {
   position: absolute;
   width: 100%;
   transform-origin: center center;
+  width: 240.0px;
+  height: 336px;
+  left: 120.0px;
+  top: 164.0px;
+  transform: translate(-50%, -50%) scale(1) rotate(0deg);
 }
 
 .download-view {
@@ -178,9 +184,20 @@
 }
 
 .nowx_mask {
-  margin: auto;
-  position: absolute;
   bottom: 0;
-  left: 0;
-  right: 0;
+}
+
+.van-tab__pane {
+  overflow: hidden;
+}
+
+.frontImg {
+  top:30px;
+  left:70px;
+}
+
+.custom {
+  display: flex; 
+  align-items: center; 
+  justify-content: center;
 }

ymhZjz/pages/humanMatting/index.js

@@ -11,7 +11,6 @@ Page({
   },
 
   chooseImg() {
-    console.log(1111)
     if (wx.getStorageSync("token") == "") {
       wx.navigateTo({
         url: '/pages/login/index',