Browse Source

Merge branch 'dxj'

dxj
杜贤金 1 year ago
parent
commit
6e0a49ac3e
  1. 1
      src/components/AppNoviceBenefit/index.vue
  2. 52
      src/components/AppRecharge/index.vue
  3. 28
      src/components/AppRoleDefault/index.vue
  4. 2
      src/components/AppTaskMenuList/index.vue
  5. 12
      src/components/AppUserInfo/index.vue
  6. 29
      src/views/login/index.vue
  7. 92
      src/views/task/components/BasicTask/index.vue
  8. 2
      src/views/task/components/DailyTask/index.vue
  9. 2
      src/views/task/components/HisTory/index.vue
  10. 14
      src/views/task/components/InviteForm/index.vue
  11. 2
      src/views/task/components/NoviceTask/index.vue
  12. 2
      src/views/task/components/OtherTask/index.vue
  13. 50
      src/views/task/components/TaskList/index.vue

1
src/components/AppNoviceBenefit/index.vue

@ -74,7 +74,6 @@ function handleClose() {
background: linear-gradient(180deg, #ffa733 0%, #df5413 100%);
border-radius: 40px;
font-size: 14px;
font-family: PingFang-SC, PingFang-SC;
font-weight: bold;
color: #ffffff;
letter-spacing: 2px;

52
src/components/AppRecharge/index.vue

@ -441,7 +441,7 @@ function separator(num: number | string) {
background: #fbe6c4;
border-radius: 4px;
font-size: 12px;
font-family: PingFang-SC, PingFang-SC;
letter-spacing: 1px;
color: #a16242;
}
@ -499,9 +499,7 @@ function separator(num: number | string) {
}
.smallname {
font-size: 14px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #212a4b;
line-height: 25px;
@ -525,7 +523,7 @@ function separator(num: number | string) {
padding-top: 17px;
&-left {
font-size: 17px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 600;
color: #fffaf6;
padding-left: 40px;
@ -533,9 +531,7 @@ function separator(num: number | string) {
}
&-right {
font-size: 14px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #78d6fe;
line-height: 22px;
@ -575,9 +571,7 @@ function separator(num: number | string) {
}
&-bottom {
font-size: 12px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #fcf9f6;
line-height: 20px;
@ -604,7 +598,7 @@ function separator(num: number | string) {
height: 100%;
.freeprice {
font-size: 15px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 800;
color: #ffffff;
padding-left: 20px;
@ -612,7 +606,7 @@ function separator(num: number | string) {
}
.newprice {
font-size: 30px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 800;
color: #70d2ff;
letter-spacing: 4px;
@ -621,9 +615,7 @@ function separator(num: number | string) {
}
.oldprice {
font-size: 13px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #ffffff;
text-decoration: line-through;
@ -638,9 +630,7 @@ function separator(num: number | string) {
.year {
flex: 1;
font-size: 10px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #78d6fe;
letter-spacing: 1px;
@ -665,7 +655,7 @@ function separator(num: number | string) {
)
1 1;
font-size: 18px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 800;
color: #212a4b;
line-height: 50px;
@ -718,7 +708,7 @@ function separator(num: number | string) {
cursor: pointer;
background-color: #fff2e1;
font-size: 14px;
font-family: PingFang-SC, PingFang-SC;
font-weight: bold;
color: #6b2d01;
letter-spacing: 2px;
@ -802,7 +792,7 @@ function separator(num: number | string) {
align-items: center;
.dotnum {
font-size: 20px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 800;
color: #6b2d01;
letter-spacing: 1px;
@ -816,9 +806,7 @@ function separator(num: number | string) {
font-size: 12px;
text-align: center;
padding-left: 5px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #ffffff;
line-height: 20px;
@ -826,9 +814,7 @@ function separator(num: number | string) {
}
.deadline {
font-size: 12px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #d39764;
}
@ -840,9 +826,7 @@ function separator(num: number | string) {
justify-content: space-between;
font-size: 12px;
padding: 5px 0;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #6b2d01;
line-height: 20px;
@ -854,7 +838,7 @@ function separator(num: number | string) {
align-items: flex-end;
.nowprice {
font-size: 27px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 800;
color: #6b2d01;
@ -863,9 +847,7 @@ function separator(num: number | string) {
.oldprice {
margin-left: 10px;
font-size: 14px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #b38d6a;
padding-bottom: 5px;

28
src/components/AppRoleDefault/index.vue

@ -118,9 +118,7 @@ function handleChange(index: number) {
overflow: auto;
.title {
font-size: 16px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 600;
color: #141515;
}
@ -177,27 +175,21 @@ function handleChange(index: number) {
align-items: center;
.rolename {
font-size: 15px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 600;
color: #253351;
}
.name {
margin-left: 30px;
font-size: 13px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #253351;
}
}
.explain {
font-size: 11px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #335d91;
line-height: 25px;
@ -214,9 +206,7 @@ function handleChange(index: number) {
color: white;
line-height: 30px;
font-size: 14px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 500;
}
}
@ -229,9 +219,7 @@ function handleChange(index: number) {
max-height: 50vh;
.title {
font-size: 16px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 600;
color: #141515;
}
@ -246,9 +234,7 @@ function handleChange(index: number) {
margin: 0 11px;
padding: 4px 8px;
font-size: 13px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 500;
display: inline-block;

2
src/components/AppTaskMenuList/index.vue

@ -75,7 +75,7 @@ function handleClick(index: number, task: string) {
position: relative;
.title {
font-size: 13px;
font-family: PingFang-SC, PingFang-SC;
font-weight: bold;
line-height: 20px;
margin: 0;

12
src/components/AppUserInfo/index.vue

@ -87,9 +87,7 @@ function separator(num: number | string) {
}
.dot-num {
font-size: 12px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #000000;
padding-left: 4px;
@ -109,9 +107,7 @@ function separator(num: number | string) {
border-radius: 13px;
font-size: 12px;
text-align: center;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #ffffff;
line-height: 20px;
@ -133,9 +129,7 @@ function separator(num: number | string) {
}
.accumulativename {
font-size: 12px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #000000;
}

29
src/views/login/index.vue

@ -248,7 +248,7 @@ function timer() {
left: 10%;
.welcome {
font-size: 50px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 300;
color: #ffffff;
@ -257,14 +257,14 @@ function timer() {
.zh {
font-size: 26px;
padding-top: 20px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 400;
color: #ffffff;
letter-spacing: 5px;
}
.en {
font-size: 13px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 400;
color: #77a4ff;
line-height: 22px;
@ -282,6 +282,7 @@ function timer() {
align-items: center;
letter-spacing: 0.2em;
backdrop-filter: blur(50px);
-webkit-backdrop-filter: blur(50px);
position: absolute;
top: 0;
right: 2%;
@ -316,9 +317,7 @@ function timer() {
margin-bottom: 30px;
color: #505458;
font-size: 19px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 500;
color: #141515;
}
@ -335,9 +334,7 @@ function timer() {
width: 100%;
text-align: center;
font-size: 13px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #6e7382;
padding-top: 20px;
@ -390,7 +387,7 @@ function timer() {
left: 10%;
.welcome {
font-size: 50px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 300;
color: #ffffff;
@ -399,14 +396,14 @@ function timer() {
.zh {
font-size: 26px;
padding-top: 20px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 400;
color: #ffffff;
letter-spacing: 5px;
}
.en {
font-size: 13px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 400;
color: #77a4ff;
line-height: 22px;
@ -458,9 +455,7 @@ function timer() {
margin-bottom: 30px;
color: #505458;
font-size: 19px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 500;
color: #141515;
}
@ -477,9 +472,7 @@ function timer() {
width: 100%;
text-align: center;
font-size: 13px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #6e7382;
padding-top: 20px;

92
src/views/task/components/BasicTask/index.vue

@ -204,7 +204,7 @@ function handleInvite() {
width: 95%;
.title {
font-size: 14px;
font-family: PingFang-SC, PingFang-SC;
font-weight: bold;
color: #000000;
line-height: 22px;
@ -225,7 +225,6 @@ function handleInvite() {
justify-content: space-between;
.login-day {
font-size: 19px;
font-family: PingFang-SC, PingFang-SC;
color: #ffffff;
line-height: 33px;
letter-spacing: 2px;
@ -244,10 +243,8 @@ function handleInvite() {
}
.historyName {
padding-left: 5px;
font-size: 11px;
font-family:
PingFangSC,
PingFang SC;
font-size: 12px;
font-weight: 400;
color: #ffffff;
margin-top: -2px;
@ -268,9 +265,7 @@ function handleInvite() {
text-align: center;
background-color: #ffffff;
font-size: 12px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #4670e3;
border-top-left-radius: 6px;
@ -279,23 +274,20 @@ function handleInvite() {
&::after {
content: '';
position: absolute;
top: 0;
left: 10px;
width: 96%;
height: 100%;
background-color: inherit;
transform: skewX(35deg); /* 可调整此值以改变倾斜的程度 */
transform-origin: 100% 0;
z-index: -1;
right: -30px;
width: 0;
height: 0;
z-index: 1;
border-top: 0px solid transparent;
border-right: 30px solid transparent;
border-bottom: 50px solid #ffffff;
}
}
.ten {
width: 70%;
padding: 3px 0;
font-size: 12px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #ffffff;
padding-left: 30px;
@ -303,7 +295,7 @@ function handleInvite() {
}
.sign-box {
width: 100%;
height: 100px;
background-color: #ffffff;
border-top-right-radius: 6px;
border-bottom-right-radius: 6px;
@ -312,24 +304,21 @@ function handleInvite() {
align-items: center;
justify-content: space-around;
.sign {
padding: 20px 0 15px;
.sign-photo {
width: 50px;
height: 64px;
position: relative;
.count {
font-size: 10px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 500;
font-size: 12px;
color: #ff9b00;
text-align: center;
font-weight: bold;
padding-top: 5px;
}
}
.sign-day {
text-align: center;
font-size: 10px;
font-family: PingFang-SC, PingFang-SC;
font-size: 13px;
font-weight: bold;
color: #888c90;
padding-top: 5px;
@ -340,12 +329,8 @@ function handleInvite() {
width: 100%;
height: 15px;
background: linear-gradient(180deg, #ffb33d 0%, #ff9b00 100%);
border-radius: 11px;
font-size: 11px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
border-radius: 12px;
font-size: 12px;
color: #ffffff;
line-height: 15px;
text-align: center;
@ -358,7 +343,7 @@ function handleInvite() {
width: 100%;
padding: 20px 14px;
background-color: aliceblue;
background-color: #edf3ff;
border-radius: 15px;
.earn-points {
.title-box {
@ -372,10 +357,6 @@ function handleInvite() {
.name {
padding: 0 7px;
font-size: 14px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 500;
color: #000000;
line-height: 22px;
font-weight: bold;
@ -386,10 +367,9 @@ function handleInvite() {
margin-top: 15px;
width: 100%;
height: 150px;
background-color: #ffffff;
border-radius: 4px;
padding: 0 10px;
padding: 0 15px;
.earn-list {
width: 100%;
display: flex;
@ -405,29 +385,20 @@ function handleInvite() {
width: 60%;
.name {
font-size: 13px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 500;
font-weight: bolder;
color: #000000;
letter-spacing: 1px;
}
.accomplish {
font-size: 11px;
font-family:
PingFangSC,
PingFang SC;
font-size: 12px;
font-weight: 400;
color: #f7b606;
padding-left: 10px;
}
.unfinished {
font-size: 11px;
font-family:
PingFangSC,
PingFang SC;
font-size: 12px;
font-weight: 400;
color: #888c90;
padding-left: 10px;
@ -449,26 +420,21 @@ function handleInvite() {
}
.add-dot-num {
font-size: 12px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #f7b500;
padding-left: 3px;
}
.add-dot-btn {
border-radius: 16px;
font-size: 11px;
font-family:
PingFangSC,
PingFang SC;
font-size: 12px;
font-weight: 400;
line-height: 20px;
letter-spacing: 1px;
text-align: center;
padding: 2px 5px;
&.accomplish {
width: 48px;
background: linear-gradient(
90deg,
#b5ceff 0%,
@ -477,7 +443,6 @@ function handleInvite() {
color: #ffffff;
}
&.unfinished {
width: 48px;
background: #ffffff;
border: 1px solid #cdcdcd;
line-height: 18px;
@ -485,7 +450,6 @@ function handleInvite() {
cursor: pointer;
}
&.invite {
width: 47px;
background: linear-gradient(
90deg,
#6fa3ff 0%,

2
src/views/task/components/DailyTask/index.vue

@ -32,7 +32,7 @@ onMounted(() => {
width: 95%;
.title {
font-size: 14px;
font-family: PingFang-SC, PingFang-SC;
font-weight: bold;
color: #000000;
line-height: 22px;

2
src/views/task/components/HisTory/index.vue

@ -193,7 +193,7 @@ const getCellTypeClass = function (value: { $D: number }) {
}
.count {
font-size: 9px;
font-family: PingFang-SC, PingFang-SC;
font-weight: 500;
color: #ff9b00;
text-align: center;

14
src/views/task/components/InviteForm/index.vue

@ -136,9 +136,7 @@ const code = ref('你好啊')
text-align: center;
font-size: 13px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #ffffff;
@ -154,7 +152,7 @@ const code = ref('你好啊')
justify-content: space-around;
.i-name {
font-size: 14px;
font-family: PingFang-SC, PingFang-SC;
font-weight: bold;
color: #000000;
letter-spacing: 1px;
@ -166,9 +164,7 @@ const code = ref('你好啊')
border-radius: 4px;
border: 1px solid #dddddd;
font-size: 13px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #888c90;
letter-spacing: 1px;
@ -181,9 +177,7 @@ const code = ref('你好啊')
background: #4670e3;
border-radius: 4px;
font-size: 13px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #ffffff;
letter-spacing: 1px;

2
src/views/task/components/NoviceTask/index.vue

@ -31,7 +31,7 @@ onMounted(() => {
width: 95%;
.title {
font-size: 14px;
font-family: PingFang-SC, PingFang-SC;
font-weight: bold;
color: #000000;
line-height: 22px;

2
src/views/task/components/OtherTask/index.vue

@ -32,7 +32,7 @@ onMounted(() => {
width: 95%;
.title {
font-size: 14px;
font-family: PingFang-SC, PingFang-SC;
font-weight: bold;
color: #000000;
line-height: 22px;

50
src/views/task/components/TaskList/index.vue

@ -123,7 +123,6 @@ const dynamicStyle = computed(() => {
width: 95%;
.title {
font-size: 14px;
font-family: PingFang-SC, PingFang-SC;
font-weight: bold;
color: #000000;
line-height: 22px;
@ -140,27 +139,17 @@ const dynamicStyle = computed(() => {
padding: 12px 40px;
.left {
font-size: 14px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #4670e3;
letter-spacing: 1px;
}
.right {
font-size: 14px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #888c90;
letter-spacing: 1px;
}
}
.content {
width: 95%;
width: 98%;
background-color: #fff;
margin: 0 auto;
overflow: hidden;
@ -170,12 +159,11 @@ const dynamicStyle = computed(() => {
position: relative;
.earn-list-box {
width: 100%;
padding: 0 10px;
.earn-list {
width: 100%;
display: flex;
justify-content: space-between;
padding: 10px 0;
padding: 10px 0 10px 40px;
border-bottom: 1px solid #ededed;
&:last-child {
border: 0;
@ -185,31 +173,19 @@ const dynamicStyle = computed(() => {
align-items: center;
width: 85%;
.name {
font-size: 13px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 500;
font-size: 14px;
color: #000000;
letter-spacing: 1px;
}
.accomplish {
font-size: 11px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
font-size: 12px;
color: #f7b606;
padding-left: 10px;
}
.unfinished {
font-size: 11px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
font-size: 12px;
color: #888c90;
padding-left: 10px;
}
@ -229,21 +205,15 @@ const dynamicStyle = computed(() => {
}
.add-dot-num {
font-size: 12px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
color: #f7b500;
padding-left: 3px;
}
.add-dot-btn {
width: 50px;
width: 55px;
border-radius: 16px;
font-size: 11px;
font-family:
PingFangSC,
PingFang SC;
font-weight: 400;
font-size: 12px;
line-height: 20px;
letter-spacing: 1px;
text-align: center;

Loading…
Cancel
Save