Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wechat_app into dev

src/project/fengdu/AppMine/AppMine.vue

@@ -69,12 +69,6 @@ export default {
     listGroup() {
       return [
         [
-          // {
-          //   icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiating.png",
-          //   label: "我的家庭",
-          //   path: "./myFamily",
-          //   type: 'idNumber'
-          // },
           {
             icon: "https://cdn.cunwuyun.cn/wxmp/mine/wodejiaxiang.png",
             label: "我的家乡",

src/project/fengdu/AppMine/myHarvestQR.vue

@@ -1,6 +1,25 @@
 <template>
   <div class="AppHarvestQR">
-    
+    <u-navbar :is-back="false" title="我的丰收码" title-color="#000" title-width="300" title-size="32" 
+    :background="backgroundNavbar" :title-bold="true"></u-navbar>
+    <div class="card">
+      <div class="myself">
+        <img class="avatar" src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="">
+        <div class="info">
+          <div class="name">百里守约</div>
+          <div class="area">百地社区</div>
+        </div>
+      </div>
+      <div class="qr">
+        <img src="https://cdn.cunwuyun.cn/dvcp/myFamily/tx.png" alt="">
+      </div>
+
+      <div class="my-qr">我的丰收码</div>
+
+      <div class="pic">
+        <img src="./img-zhuangshi.png" alt="">
+      </div>
+    </div>
   </div>
 </template>
 
@@ -8,20 +27,90 @@
 export default {
   name: "AppHarvestQR",
   appName: '丰收码',
+  customNavigation: true,
   data() {
     return {
-
+      backgroundNavbar: {
+        background: '#FFF'
+      }
     }
   },
   methods: {
 
   },
-  onShow() {},
+  onShow() {
+  },
 }
 </script>
 
 <style lang="scss" scoped>
 .AppHarvestQR {
+  padding: 32px;
+  box-sizing: border-box;
+  .card {
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    background: #FFF;
+    border-radius: 16px;
 
+    .myself {
+      padding: 72px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      .avatar {
+        width: 108px;
+        height: 108px;
+        border-radius: 16px;
+      }
+      .info {
+        width: calc(100% - 128px);
+        height: 100%;
+        .name {
+          color: #333333;
+          font-size: 34px;
+          font-weight: 500;
+          margin-top: 10px;
+        }
+        .area {
+          color: #999999;
+          font-size: 28px;
+          font-weight: 400;
+          margin-top: 10px;
+        }
+      }
+      
+    }
+
+    .qr {
+      margin: 10% auto 24px;
+      width: 542px;
+      height: 542px;
+      border-radius: 32px;
+      border: 8px solid #f6f5f8;
+      padding: 36px;
+      box-sizing: border-box;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    .my-qr {
+      color: #999999;
+      font-size: 32px;
+      font-weight: 400;
+      text-align: center;
+    }
+    .pic {
+      margin-top: 10%;
+      width: 100%;
+      height: 234px;
+      img {
+        width: 100%;
+        height: 234px;
+      }
+    }
+  }
 }
 </style>