// 1 年之前
父節點
當前提交
b3af25db19

+ 2 - 2
app.wxss

@@ -52,8 +52,8 @@ text {
   width: 375px;
   height: 300px;
   position: absolute;
-  /* left: -9999rpx;
-  top: -9999rpx; */
+  left: -9999rpx;
+  top: -9999rpx;
 }
 
 /* 转圈动画 */

+ 12 - 12
component/yeyouzi-cropper/yeyouzi-cropper.js

@@ -504,19 +504,19 @@ Component({
             })
         },
 
-        _rotateNinety() {
-            var r = this.data.imgRotate + 90 > 180 ? this.data.imgRotate - 270 : this.data.imgRotate + 90
-            this.setData({
-                imgRotate: r
-            })
-        },
+        /*  _rotateNinety() {
+             var r = this.data.imgRotate + 90 > 180 ? this.data.imgRotate - 270 : this.data.imgRotate + 90
+             this.setData({
+                 imgRotate: r
+             })
+         }, */
 
-        _imageMirror() {
-            var m = this.data.imgMirror == 180 ? 0 : 180
-            this.setData({
-                imgMirror: m,
-            })
-        },
+        /*   _imageMirror() {
+              var m = this.data.imgMirror == 180 ? 0 : 180
+              this.setData({
+                  imgMirror: m,
+              })
+          }, */
 
         /*   _imgRestore(){
             this.setData({

+ 4 - 4
component/yeyouzi-cropper/yeyouzi-cropper.wxml

@@ -14,12 +14,12 @@
 
     </view>
     <view class="settingContainer">
-        <view class="rotate" style="color: #fff;width: 100%;text-align: center;">{{imgRotate}}°</view>
+        <view class="rotate" style="color: #fff;width: 100%;text-align: center;">旋转{{imgRotate}}°</view>
         <view class="rotateContainer">
-            <text style="color: #fff;font-size: 20px;" bindtap="_imageMirror">⇌</text>
+            <text style="color: #fff;font-size: 32rpx;">-180°</text>
             <slider style="width: 100%;" min="-180" max="180" value="{{imgRotate}}" block-size="18px"
                 selected-color="#fff" bindchanging="_rotateChange"></slider>
-            <text style="color: #fff;font-size: 22px;" bindtap="_rotateNinety">⊙</text>
+            <text style="color: #fff;font-size: 32rpx;">360°</text>
         </view>
 
         <view class="btnContainer">
@@ -30,6 +30,6 @@
 
     </view>
 
-    <canvas type="2d" id="imgCanvas"class='imgCanvas'></canvas>
+    <canvas type="2d" id="imgCanvas" class='imgCanvas'></canvas>
 
 </view>

+ 2 - 2
component/yeyouzi-cropper/yeyouzi-cropper.wxss

@@ -40,8 +40,8 @@
     display: flex;
     flex-direction: row;
     align-items: center;
-    padding: 0 40rpx;
-    margin-bottom: 20rpx;
+    padding: 0px 40rpx;
+    margin-bottom: 190rpx;
 }
 
 .btnContainer {

+ 1 - 2
pages/activityDet/index.less

@@ -27,8 +27,7 @@
                 color: white;
                 padding: 0rpx 4rpx;
                 z-index: 0rpx;
-                border-bottom: 2rpx solid white;
-                // background-color: #00000040;
+                border: 2rpx solid white;
             }
 
             image {

+ 1 - 1
pages/activityDet/index.wxml

@@ -37,7 +37,7 @@
     <!-- 录制控制区域 -->
     <view class="btnsBox" wx:if="{{state!='after'}}">
         <image wx:if="{{state=='before'}}" src="http://reader-wx.ai160.com/images/reader/card/play_1.png" class="send"
-            bindtap="uploadActivity" />
+            bindtap="play" />
         <view class="recordingBox" wx:if="{{state=='process'}}">
             <image class="readingNow" src="/static/index/readingNow.gif" />
             <image src="http://reader-wx.ai160.com/images/reader/card/play_3.png" class="send" bindtap="play" />

+ 1 - 1
pages/activityDet/index.wxss

@@ -26,7 +26,7 @@
   color: white;
   padding: 0rpx 4rpx;
   z-index: 0rpx;
-  border-bottom: 2rpx solid white;
+  border: 2rpx solid white;
 }
 .activityDet .header .toBox image {
   width: 22rpx;

+ 3 - 3
pages/greeting/index.less

@@ -130,11 +130,11 @@
         position: fixed;
         left: 0px;
         bottom: 0px;
-        background-color: rgb(255, 255, 255);
+        background-color: #00C657;
 
         image {
-            width: 535rpx;
-            height: 88rpx;
+            width: 525rpx;
+            height: 49rpx;
         }
     }
 }

+ 1 - 1
pages/greeting/index.wxml

@@ -44,6 +44,6 @@
     </view>
   </view>
   <view class="footerBox">
-      <image src="http://reader-wx.ai160.com/images/reader/card/callback.png" bindtap="jumpIndex"/>
+      <image src="http://reader-wx.ai160.com/images/reader/card/callback-bg.png" bindtap="jumpIndex"/>
   </view>
 </view>

+ 3 - 3
pages/greeting/index.wxss

@@ -109,9 +109,9 @@
   position: fixed;
   left: 0px;
   bottom: 0px;
-  background-color: #ffffff;
+  background-color: #00C657;
 }
 .greetingBox .footerBox image {
-  width: 535rpx;
-  height: 88rpx;
+  width: 525rpx;
+  height: 49rpx;
 }