修改

src/views/ucurrency/Index.vue

@@ -1,11 +1,41 @@
 <template>
-    <div class="u-currency" style="padding:26px 40px;display:flex;">
+    <div class="u-currency" >
        <div class="myubi">
+           <div class="ubi-hear">
+               <h6>我的U币:367</h6><span>U币规则 <i class="el-icon-arrow-right"></i> </span>
+                <el-button>导出记录</el-button>
+           </div>
+           <div class="Ubi-hist">
+               <h6>U币历史记录</h6><span>（最多保留近7天的记录）</span>
+           </div>
           <div class="my-Recording">
             <h3>5月31日</h3>
             <div class="Recording-info">
-              <div>发布笔记</div>
+              <div class="info-tit">发布笔记</div>
-              <div><img src="" alt=""> +5</div>
+              <div class="info-Gold"><img src="../../../public/images/Uimg.png" alt=""> +5</div>
+            </div>
+              <div class="Recording-info">
+              <div class="info-tit">回答问题</div>
+              <div class="info-Gold"><img src="../../../public/images/Uimg.png" alt=""> +5</div>
+            </div>
+              <div class="Recording-info">
+              <div class="info-tit">意见反馈</div>
+              <div class="info-Gold"><img src="../../../public/images/Uimg.png" alt=""> +5</div>
+            </div>
+          </div>
+           <div class="my-Recording">
+            <h3>5月29日</h3>
+            <div class="Recording-info">
+              <div class="info-tit">发布笔记</div>
+              <div class="info-Gold"><img src="../../../public/images/Uimg.png" alt=""> +5</div>
+            </div>
+              <div class="Recording-info">
+              <div class="info-tit">回答问题</div>
+              <div class="info-Gold"><img src="../../../public/images/Uimg.png" alt=""> +5</div>
+            </div>
+              <div class="Recording-info">
+              <div class="info-tit">意见反馈</div>
+              <div class="info-Gold"><img src="../../../public/images/Uimg.png" alt=""> +5</div>
             </div>
           </div>
        </div>
@@ -113,31 +143,90 @@
       </div>
     </div>
   </template>
-  
+
-  <script>
+<script>
-      export default{
+   
-          data(){
+</script>
-              return{
+<style lang="scss" scoped>
-  
+     .Recording-info{
-              }
+         margin-top: 12px;
-          },
+         height: 45px;
-      methods:{
+         border-bottom: 1px solid #ddd;
-       
+        .info-tit{
-       }
+            float: left;
+            font-size: 14px;
+            font-weight: 400;
+            color: #333333;
+            line-height: 40px;
+        }
+        .info-Gold{
+            float: right;
+            font-size: 18px;
+            color: #333333;
+            font-weight: 400;
+            line-height: 40px;
+            img{
+                width: 54px;
+                height: 32px;
+                vertical-align: middle;
+            }
+        }
+     }
+      .Ubi-hist{
+          margin-top: 15px;
+          h6{
+              font-size: 16px;
+              font-weight: 600;
+              color: #333333;
+              margin: 0;
+              float: left;
+          }
+          span{
+              font-size: 14px;
+              font-weight: 600;
+              color: #999999;
+          }
       }
-  </script>
+      .u-currency{
-  
+          padding:26px 40px;
-  <style lang="scss" scoped>
+          display:flex;
+      }
+    .ubi-hear{
+        height: 40px;
+        button{
+            width: 140px;
+            height: 40px;
+            border-radius: 2px;
+            border: 1px solid rgba(153,153,153,0.35);
+            float: right;
+        }
+        span{
+            font-size: 14px;
+            font-weight: 400;
+            color: #333333;
+            line-height: 40px;
+        }
+        h6{
+            margin: 0;
+            margin-right: 18px;
+            line-height: 40px;
+            float: left;
+            color: #333333;
+            font-size: 18px;
+            font-weight: 600;
+        }
+    }
     .myubi{
       flex: 1;
+      margin-right: 107px;
     }
     .omit{
-  padding-left: 20px;
+        padding-left: 20px;
-  div{
+        div{
-      font-size: 30px;
+            font-size: 30px;
-      line-height: 10px;
+            line-height: 10px;
-      color: #D8D8D8;
+            color: #D8D8D8;
-  }
+        }
 }
     .exp-table{
       width: 100%;
@@ -145,7 +234,6 @@
       .table-hear{
          display: flex;
         div{
-        //  margin-right: 13%;
          min-width: 90px;
          font-size: 14px;
          font-weight: 400;
@@ -160,7 +248,7 @@
           text-align: right;
           margin-right: 0;
           text-align: center;
-      }
+        }
       }
      
      
@@ -228,7 +316,7 @@
 }
 .tab-rank{
    
-    // text-align: center;
+    
     img{
          width: 40px;
          height: 40px;
@@ -309,10 +397,10 @@
              z-index: 999;
          }
      }
-     
 
   }
 }
+
     
   </style>
   

src/views/user/Noteedit.vue

@@ -16,9 +16,9 @@
             </div>
          </div>
          <div class="edit-footer">
-            <el-radio v-model="editdata.openType" label="9">公开</el-radio>
+            <el-radio v-model="editdata.openType" :label="9">公开</el-radio>
-           <el-radio v-model="editdata.openType" label="1">私密</el-radio>
+           <el-radio v-model="editdata.openType" :label="1">私密</el-radio>
-            <el-button plain>取消</el-button>
+            <el-button @click="comeback">取消</el-button>
             <el-button type="primary" @click="savedata" >确定</el-button>
          </div>
       </div>
@@ -56,22 +56,32 @@ export default {
    data () {
       return {
         radio: '1',
-        editdata:{},
+        editdata:{
+
+        },
         histId:'',
         histdata:[],
+        id:'',
       };
     },
     mounted(){
-        let id = this.$route.query.id;
+         this.id = this.$route.query.id;
-        apiNote.detail(id).then(res=>{
+       this.notedetail()
-           let that = this;
-           that.editdata = res.result
-           that.histId = res.result.id
-           this.hist();
-        })
         
     },
     methods:{
+       comeback(){
+          this.$router.go (-1);
+       },
+       notedetail(){
+           apiNote.detail(this.id).then(res=>{
+           let that = this;
+           that.editdata = res.result
+           console.log(res.result)
+           that.histId = res.result.id
+           that.hist();
+        })
+       },
        restore(item){
           apiNote.restore(item.id).then(res=>{
              console.loh(res)
@@ -91,7 +101,11 @@ export default {
 
        savedata(){
           apiNote.update(this.editdata).then(res=>{
-
+              this.notedetail()
+               this.$message({
+                  message: '编辑成功',
+                  type: 'success'
+               });
           })
        }
     }