Merge branch 'feature/3.2.0' of http://60.205.190.38:9000/wuhao/wxmini into feature/3.2.0

pages/piano/musicscore/musicscore.js

@@ -10,7 +10,7 @@ Page({
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '曲谱', //导航栏 中间的标题
     },
-    
+
     topList: [{
       name: "图片4",
       image: "./../../../img/min.png",
@@ -33,6 +33,14 @@ Page({
 
   },
 
+  ///上传曲谱
+  upload: function (e) {
+
+  },
+
+  ///保存曲谱
+  save: function (e) {},
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/piano/musicscore/musicscore.wxml

@@ -11,6 +11,14 @@
           <view>{{item.name}}</view>
         </view>
       </view>
+      <view class="action_public center_public">
+        <view bind:tap="upload" class="action">上传曲谱</view>
+      </view>
     </view>
+
+  </view>
+
+  <view class="action_public bottom_public">
+    <view bind:tap="save" class="action">保存曲谱</view>
   </view>
 </view>

pages/piano/musicscore/musicscore.wxss

@@ -29,6 +29,45 @@
   padding: 40rpx 0;
   font-size: 30rpx;
 }
+
 .top_image {
   height: 20vw;
+}
+
+.action_public {
+  display: flex;
+}
+
+.center_public {
+  width: 50vw;
+  margin-left: 30rpx;
+  justify-content: start;
+}
+
+.bottom_public {
+  position: fixed;
+  bottom: 54rpx;
+  width: 100vw;
+  justify-content: center;
+}
+
+/* .bottom_public {
+
+} */
+
+.action_public>view {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 520rpx;
+  height: 80rpx;
+  background: #999999;
+  border-radius: 45rpx;
+  font-size: 36rpx;
+  font-weight: 400;
+  color: #FFFFFF;
+}
+
+.action_public>view.action {
+  background: #6547A3;
 }