// 1 year ago
parent
commit
a88ce0f2c3

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

@@ -19,13 +19,13 @@
             <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: 32rpx;">360°</text>
+            <text style="color: #fff;font-size: 32rpx;">180°</text>
         </view>
 
         <view class="btnContainer">
             <text style="color: #fff;font-size: 34rpx;" bindtap="_cancelCut">取消</text>
             <!--    <text style="color: #fff;font-size: 16px;text-align:center;align-self: center;" bindtap="_imgRestore">还原</text> -->
-            <text style="color: #fff;font-size: 34rpx;" bindtap="_confirmCut">裁剪</text>
+            <text style="color: #fff;font-size: 34rpx;" bindtap="_confirmCut">确定</text>
         </view>
 
     </view>

+ 5 - 3
pages/activityDet/index.less

@@ -21,17 +21,19 @@
             display: flex;
             align-items: center;
             z-index: 3;
+            font-size: 0rpx;
 
             .text {
                 min-width: 80rpx;
                 color: white;
                 padding: 0rpx 4rpx;
                 z-index: 0rpx;
+                border-radius: 14rpx;
                 border: 2rpx solid white;
             }
 
             image {
-                width: 22rpx;
+                width: 24rpx;
                 height: 24rpx;
                 z-index: 1;
             }
@@ -41,7 +43,7 @@
                 background-color: white;
                 border-radius: 50%;
                 margin-left: 6rpx;
-                padding: 2rpx 12rpx;
+                padding: 12rpx 12rpx;
             }
         }
 
@@ -121,7 +123,7 @@
 
             .countBox {
                 width: 12rpx;
-                padding:6rpx 10rpx;
+                padding: 6rpx 10rpx;
                 border-radius: 10rpx;
                 margin: 0rpx 4rpx;
                 color: white;

+ 4 - 2
pages/activityDet/index.wxss

@@ -20,16 +20,18 @@
   display: flex;
   align-items: center;
   z-index: 3;
+  font-size: 0rpx;
 }
 .activityDet .header .toBox .text {
   min-width: 80rpx;
   color: white;
   padding: 0rpx 4rpx;
   z-index: 0rpx;
+  border-radius: 14rpx;
   border: 2rpx solid white;
 }
 .activityDet .header .toBox image {
-  width: 22rpx;
+  width: 24rpx;
   height: 24rpx;
   z-index: 1;
 }
@@ -38,7 +40,7 @@
   background-color: white;
   border-radius: 50%;
   margin-left: 6rpx;
-  padding: 2rpx 12rpx;
+  padding: 12rpx 12rpx;
 }
 .activityDet .header .avatar {
   position: absolute;

+ 2 - 1
pages/activityList/index.json

@@ -1,4 +1,5 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "音乐贺卡制作"
+    "navigationBarTitleText": "音乐贺卡制作",
+    "enablePullDownRefresh": false
 }

+ 1 - 5
pages/index/index.wxml

@@ -53,15 +53,11 @@
             <image src="http://reader-wx.ai160.com/images/reader/card/banner.png" bindtap="goToCard">
             </image>
         </swiper-item>
-       <!--  <swiper-item>
+        <!--  <swiper-item>
             <image src="http://reader-wx.ai160.com/images/reader/activity/ad.jpg" bindtap="goToActivity">
             </image>
         </swiper-item> -->
         <swiper-item>
-            <image src="http://reader-wx.ai160.com/images/reader/activity/banner.jpg">
-            </image>
-        </swiper-item>
-        <swiper-item>
             <image src="https://reader-wx.ai160.com/images/reader/activity/guide.jpg"></image>
         </swiper-item>
     </swiper>