Merge branch 'dev-cbd' into dev

assets/css/common.css

@@ -2,7 +2,7 @@
   --fontColor: #515151;
   --mainWidth: 1000px;
   --mainColor: #0093fd;
-  --linkColor: #308EFF;
+  --linkColor: #308eff;
   font-size: 14px;
 }
 
@@ -109,7 +109,7 @@ a {
 
 body {
   line-height: 1;
-  background: #F4F5F9;
+  background: #f4f5f9;
 }
 
 ol,
@@ -126,7 +126,7 @@ blockquote:before,
 blockquote:after,
 q:before,
 q:after {
-  content: '';
+  content: "";
   content: none;
 }
 
@@ -150,14 +150,13 @@ button {
 }
 
 sub {
-  font-size: .6em;
+  font-size: 0.6em;
 }
 
 img {
   max-width: 100%;
 }
 
-
 .flex {
   display: flex;
 }
@@ -289,11 +288,11 @@ img {
 }
 
 .app__fc_grey {
-  color: rgba(153, 153, 153, 1)
+  color: rgba(153, 153, 153, 1);
 }
 
 .app__fc_b {
-  color: #629eff
+  color: #629eff;
 }
 
 .app__fz_10 {
@@ -340,13 +339,12 @@ img {
   font-size: 20px;
 }
 
-
 .app__tg_c {
   text-align: center;
 }
 
 .app__bd_g {
-  border: 1px solid #ddd
+  border: 1px solid #ddd;
 }
 
 /* common empty */
@@ -374,7 +372,6 @@ img {
   color: #999999;
 }
 
-
 .text-line-1 {
   display: -webkit-box;
   word-break: break-all;
@@ -383,3 +380,9 @@ img {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+
+* {
+  font-family: "SF Pro SC", "HanHei SC", "SF Pro Text", "Myriad Set Pro",
+    "SF Pro Icons", "PingFang SC", "Helvetica Neue", "Helvetica", "Arial",
+    sans-serif;
+}

assets/css/developer/index.scss

@@ -8,20 +8,18 @@
 .block {
   padding: 24px;
   background: #fff;
-  border-radius: 8px;
+  // border-radius: 6px;
   margin-bottom: 20px;
 }
 .title {
   font-size: 20px;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
+  font-weight: 400;
   color: #0b121a;
   line-height: 28px;
 }
 .tips {
   margin-top: 2px;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #828c99;
   line-height: 21px;
@@ -66,12 +64,11 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  border-radius: 8px;
+  border-radius: 4px;
 
   font-size: 16px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  border: 1px solid #ced3d9;
+  border: 1px solid rgba(0, 0, 0, 0.05);
   background: #ffffff;
   color: #0b121a;
   &.line {
@@ -95,7 +92,6 @@
   text-align: center;
 
   font-size: 13px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #828c99;
   line-height: 18px;
@@ -125,7 +121,7 @@
   height: 116px;
   background: #ffffff;
   border-radius: 16px;
-  border: 1px solid #ebeced;
+  border: 1px solid rgba(0, 0, 0, 0.05);
 
   box-sizing: border-box;
   padding: 16px 16px 0;
@@ -141,23 +137,28 @@
   overflow: hidden;
 }
 
+.developer-order-title-area-wrap {
+  display: flex;
+  align-items: center;
+}
 .developer-order-title-area {
   display: flex;
   align-items: center;
+  justify-content: space-between;
 }
+
 .developer-order-tips {
-  margin-top: 8px;
+  margin-top: 15px;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #4b5d73;
   line-height: 20px;
 }
 .developer-order-icon {
-  width: 32px;
-  height: 32px;
+  width: 24px;
+  height: 24px;
   margin-right: 10px;
-  background-position: 50% 50%;
+  background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
 }
@@ -170,8 +171,7 @@
 
 .developer-order-title {
   font-size: 16px;
-  font-family: PingFangSC-Medium, PingFang SC;
-  font-weight: 500;
+  font-weight: 400;
   color: #0b121a;
   line-height: 22px;
   margin-right: 16px;
@@ -179,7 +179,6 @@
 
 .developer-order-link {
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #308eff;
   line-height: 20px;
@@ -211,7 +210,6 @@
   margin-bottom: 12px;
 
   font-size: 16px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #0b121a;
   line-height: 22px;
@@ -271,6 +269,8 @@
   width: 48px;
   height: 48px;
   margin-right: 6px;
+  border-radius: 50px;
+  background-color: rgba(0, 0, 0, 0.05);
   img {
     width: 48px;
     height: 48px;
@@ -286,14 +286,12 @@
 }
 .developer-user-name {
   font-size: 16px;
-  font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
   color: #0b121a;
   line-height: 22px;
 }
 .developer-user-level {
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #828c99;
   line-height: 20px;
@@ -302,10 +300,11 @@
 .user-title {
   margin-top: 30px;
   font-size: 16px;
-  font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
   color: #0b121a;
   line-height: 22px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+  padding-bottom: 10px;
 }
 
 .developer-work-list {
@@ -319,16 +318,15 @@
   cursor: pointer;
 }
 .developer-work-count {
-  font-size: 16px;
-  font-family: PingFangSC-Medium, PingFang SC;
+  font-size: 18px;
   font-weight: 500;
   color: #0b121a;
-  line-height: 22px;
+  line-height: 25px;
+  padding: 0 15px;
 }
 
 .developer-work-tips {
   font-size: 13px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #828c99;
   line-height: 18px;
@@ -349,12 +347,12 @@
   cursor: pointer;
 }
 .developer-setting-icon {
-  width: 22px;
-  height: 22px;
+  width: 18px;
+  height: 18px;
   margin-right: 5px;
   background-repeat: no-repeat;
   background-position: 50% 50%;
-  background-size: 100% auto;
+  background-size: contain;
 }
 .setting-icon {
   background-image: url("~@/assets/img/developer/setting.png");
@@ -365,7 +363,6 @@
 
 .developer-setting-tips {
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #0b111a;
   line-height: 21px;
@@ -388,7 +385,7 @@
   align-items: center;
   p {
     font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
+
     font-weight: 400;
     color: #828c99;
     line-height: 20px;
@@ -413,7 +410,6 @@
 .developer-reward-count {
   margin-top: 8px;
   font-size: 20px;
-  font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
   color: #0b121a;
   line-height: 28px;
@@ -427,7 +423,6 @@
   width: 50%;
   float: left;
   font-size: 13px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #828c99;
   line-height: 18px;
@@ -435,7 +430,7 @@
   span {
     margin-left: 6px;
     font-size: 16px;
-    font-family: PingFangSC-Regular, PingFang SC;
+
     font-weight: 400;
     color: #0b121a;
     line-height: 22px;
@@ -456,8 +451,7 @@
   align-items: center;
   justify-content: center;
 
-  font-size: 16px;
-  font-family: PingFangSC-Regular, PingFang SC;
+  font-size: 14px;
   font-weight: 400;
   color: #0b121a;
   cursor: pointer;
@@ -500,13 +494,13 @@
 
 .developer-tab {
   background-color: #fff;
-  border-radius: 8px;
+  // border-radius: 8px;
 }
 
 .developer-tab-title-list {
   display: flex;
   position: relative;
-  border-bottom: 1px solid #ebeced;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 }
 
 .developer-tab-title-item {
@@ -518,7 +512,6 @@
   align-items: center;
 
   font-size: 16px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #4b5d73;
 
@@ -526,7 +519,6 @@
   transition: all 0.5s;
   &.cur {
     font-size: 16px;
-    font-family: PingFangSC-Medium, PingFang SC;
     font-weight: 500;
     color: #0b121a;
   }
@@ -550,7 +542,6 @@
   margin-left: 24px;
   padding-left: 24px;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #828c99;
   background: url("~@/assets/img/developer/notice.png") no-repeat left 50%;
@@ -561,7 +552,6 @@
   margin-top: 24px;
   padding-left: 24px;
   padding-right: 24px;
-  
 }
 
 .dynamic-empty {
@@ -574,7 +564,7 @@
     margin-top: 24px;
     text-align: center;
     font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
+
     font-weight: 400;
     color: #828c99;
     line-height: 21px;
@@ -583,7 +573,7 @@
 
 .developer-dynamic-item {
   margin-bottom: 41px;
-  border-bottom: 1px solid #ebeced;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
   &:nth-last-child(1) {
     border-bottom: none;
   }
@@ -616,7 +606,6 @@
 
 .dynamic-user-nickname {
   font-size: 14px;
-  font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
   color: #0b121a;
   line-height: 20px;
@@ -634,14 +623,12 @@
   text-align: center;
   line-height: 16px;
   font-size: 10px;
-  font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
   color: #ffffff;
 }
 
 .dynamic-job {
   font-size: 12px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #828c99;
   line-height: 17px;
@@ -655,7 +642,6 @@
 .dynamic-title {
   margin-top: 12px;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #0b111a;
   line-height: 21px;
@@ -674,7 +660,6 @@
   line-height: 23px;
 
   font-size: 12px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #288bff;
 }
@@ -710,7 +695,7 @@
 .dynamic-link-content {
   a {
     font-size: 14px;
-    font-family: PingFangSC-Regular, PingFang SC;
+
     font-weight: 400;
     color: #0b111a;
     line-height: 21px;
@@ -733,29 +718,27 @@
   cursor: pointer;
 
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #333333;
   line-height: 20px;
 }
 
-
-.dynamic-icon{
+.dynamic-icon {
   display: inline-block;
-  width:20px;
-  height:20px;
-  background-position: 50% 50%;
+  width: 18px;
+  height: 18px;
+  background-position: center;
   background-repeat: no-repeat;
-  background-size:20px auto;
-  margin-right: 6px;;
+  background-size: contain;
+  margin-right: 6px;
 }
 
-.icon-share{
-  background-image: url('~@/assets/img/developer/ic_ community_share@2x.png');
+.icon-share {
+  background-image: url("~@/assets/img/developer/ic_ community_share@2x.png");
+}
+.icon-comment {
+  background-image: url("~@/assets/img/developer/ic_ community_comment@2x.png");
 }
-.icon-comment{
-  background-image: url('~@/assets/img/developer/ic_ community_comment@2x.png');
+.icon-like {
+  background-image: url("~@/assets/img/developer/ic_ community_praise_s@2x.png");
 }
-.icon-like{
-  background-image: url('~@/assets/img/developer/ic_ community_praise_s@2x.png');
-}

package.json

@@ -21,7 +21,6 @@
     "@nuxt/typescript-runtime": "^1.0.0",
     "@nuxtjs/axios": "^5.3.6",
     "@nuxtjs/proxy": "^1.3.1",
-
     "@nuxtjs/router": "^1.5.0",
     "aliyun-upload-vod": "^1.0.5",
     "babel-plugin-component": "^1.1.1",