@jx3box/jx3box-common-ui 6.6.5 → 6.6.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. package/assets/css/header.less +247 -59
  2. package/assets/css/left-sidebar.less +90 -94
  3. package/assets/data/box2.json +0 -117
  4. package/assets/img/header/bell.svg +1 -0
  5. package/assets/img/header/coin.svg +1 -0
  6. package/assets/img/header/edit.svg +1 -0
  7. package/assets/img/header/manage.svg +1 -0
  8. package/assets/img/header/send.svg +56 -0
  9. package/assets/img/header/vip.svg +1 -0
  10. package/assets/js/utils.js +28 -0
  11. package/index.js +1 -1
  12. package/package.json +3 -3
  13. package/service/thx.js +5 -0
  14. package/src/App.vue +29 -117
  15. package/src/Header.vue +7 -2
  16. package/src/LeftSidebar.vue +14 -12
  17. package/src/header/gameSwitch.vue +227 -0
  18. package/src/header/user.vue +179 -66
  19. package/src/interact/batchReward.vue +152 -0
  20. package/src/single/Thx.vue +35 -46
package/assets/data/box2.json CHANGED
@@ -602,122 +602,5 @@
602
602
  ]
603
603
  }
604
604
  ]
605
- },
606
- {
607
- "name": "用户",
608
- "icon": "",
609
- "children": [
610
- {
611
- "name": "账号",
612
- "children": [
613
- {
614
- "name": "注册/登录账号",
615
- "href": "/account/",
616
- "client": "std",
617
- "status": true,
618
- "hasMark": false,
619
- "markcls": "ishot"
620
- },
621
- {
622
- "name": "资料设置",
623
- "href": "/dashboard/profile",
624
- "client": "all",
625
- "status": true,
626
- "hasMark": false,
627
- "markcls": "ishot"
628
- },
629
- {
630
- "name": "亲友/黑名单",
631
- "href": "/dashboard/privacy",
632
- "client": "all",
633
- "status": true,
634
- "hasMark": true,
635
- "markcls": "ishot"
636
- },
637
- {
638
- "name": "反馈中心",
639
- "href": "/dashboard/feedback",
640
- "client": "all",
641
- "status": true,
642
- "hasMark": false,
643
- "markcls": "ishot"
644
- },
645
- {
646
- "name": "申请签约",
647
- "href": "/dashboard/cooperation",
648
- "client": "all",
649
- "status": true,
650
- "hasMark": false,
651
- "markcls": "ishot"
652
- },
653
- {
654
- "name": "注销账号",
655
- "href": "/dashboard/feedback/erase",
656
- "client": "all",
657
- "status": true,
658
- "hasMark": false,
659
- "markcls": "ishot"
660
- }
661
- ]
662
- },
663
- {
664
- "name": "资产",
665
- "children": [
666
- {
667
- "name": "盒币兑换",
668
- "href": "/dashboard/boxcoin",
669
- "client": "std",
670
- "status": true,
671
- "hasMark": false,
672
- "markcls": "ishot"
673
- },
674
- {
675
- "name": "金箔提现",
676
- "href": "/dashboard/cny",
677
- "client": "all",
678
- "status": true,
679
- "hasMark": false,
680
- "markcls": "ishot"
681
- },
682
- {
683
- "name": "银铛兑换",
684
- "href": "/dashboard/points",
685
- "client": "all",
686
- "status": true,
687
- "hasMark": false,
688
- "markcls": "ishot"
689
- },
690
- {
691
- "name": "卡密/激活码",
692
- "href": "/dashboard/card",
693
- "client": "all",
694
- "status": true,
695
- "hasMark": false,
696
- "markcls": "ishot"
697
- }
698
- ]
699
- },
700
- {
701
- "name": "增值服务",
702
- "children": [
703
- {
704
- "name": "付费版账号",
705
- "href": "/vip/premium/?from=header_box",
706
- "client": "std",
707
- "status": true,
708
- "hasMark": false,
709
- "markcls": "ishot"
710
- },
711
- {
712
- "name": "积分商城",
713
- "href": "/vip/mall/",
714
- "client": "all",
715
- "status": true,
716
- "hasMark": false,
717
- "markcls": "ishot"
718
- }
719
- ]
720
- }
721
- ]
722
605
  }
723
606
  ]
package/assets/img/header/bell.svg ADDED
@@ -0,0 +1 @@
1
+ <svg fill="#ffffff" enable-background="new 0 0 32 32" height="512" viewBox="0 0 32 32" width="512" xmlns="http://www.w3.org/2000/svg"><g id="Layer_2"><path d="m27.943 22.07-.601-1c-.779-1.298-1.191-2.784-1.191-4.298v-5.52c0-5.598-4.553-10.152-10.151-10.152s-10.151 4.554-10.151 10.151v5.52c0 1.514-.412 3-1.191 4.298l-.601 1.001c-.485.809-.498 1.781-.033 2.603.465.821 1.305 1.311 2.249 1.311h19.455c.943 0 1.784-.49 2.249-1.311.464-.821.451-1.794-.034-2.603zm-1.533 1.716c-.068.12-.27.398-.682.398h-19.456c-.413 0-.614-.278-.682-.398-.068-.119-.202-.436.01-.789l.601-1c.947-1.578 1.448-3.384 1.448-5.225v-5.52c-.001-4.606 3.746-8.352 8.351-8.352s8.352 3.747 8.352 8.352v5.52c0 1.84.5 3.647 1.448 5.225l.601 1c.211.353.077.67.009.789z"/><path d="m19.087 27.758c-.657.84-1.811 1.342-3.087 1.342s-2.43-.502-3.087-1.342c-.307-.391-.873-.46-1.264-.154s-.46.872-.154 1.264c.995 1.272 2.68 2.032 4.505 2.032s3.51-.76 4.505-2.033c.306-.392.237-.958-.154-1.264-.391-.305-.957-.235-1.264.155z"/></g></svg>
package/assets/img/header/coin.svg ADDED
@@ -0,0 +1 @@
1
+ <svg fill="none" height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path d="m12 22c-5.523 0-10-4.477-10-10s4.477-10 10-10 10 4.477 10 10-4.477 10-10 10zm0-2c2.1217 0 4.1566-.8429 5.6569-2.3431 1.5002-1.5003 2.3431-3.5352 2.3431-5.6569 0-2.12173-.8429-4.15656-2.3431-5.65685-1.5003-1.5003-3.5352-2.34315-5.6569-2.34315-2.12173 0-4.15656.84285-5.65685 2.34315-1.5003 1.50029-2.34315 3.53512-2.34315 5.65685 0 2.1217.84285 4.1566 2.34315 5.6569 1.50029 1.5002 3.53512 2.3431 5.65685 2.3431zm0-12.95 4.95 4.95-4.95 4.95-4.95-4.95zm0 2.829-2.121 2.121 2.121 2.121 2.121-2.121z" fill="rgb(0,0,0)"/></svg>
package/assets/img/header/edit.svg ADDED
@@ -0,0 +1 @@
1
+ <svg height="15px" viewBox="0 -1 401.52289 401" width="15px" xmlns="http://www.w3.org/2000/svg"><path d="m370.589844 250.972656c-5.523438 0-10 4.476563-10 10v88.789063c-.019532 16.5625-13.4375 29.984375-30 30h-280.589844c-16.5625-.015625-29.980469-13.4375-30-30v-260.589844c.019531-16.558594 13.4375-29.980469 30-30h88.789062c5.523438 0 10-4.476563 10-10 0-5.519531-4.476562-10-10-10h-88.789062c-27.601562.03125-49.96875 22.398437-50 50v260.59375c.03125 27.601563 22.398438 49.96875 50 50h280.589844c27.601562-.03125 49.96875-22.398437 50-50v-88.792969c0-5.523437-4.476563-10-10-10zm0 0"/><path d="m376.628906 13.441406c-17.574218-17.574218-46.066406-17.574218-63.640625 0l-178.40625 178.40625c-1.222656 1.222656-2.105469 2.738282-2.566406 4.402344l-23.460937 84.699219c-.964844 3.472656.015624 7.191406 2.5625 9.742187 2.550781 2.546875 6.269531 3.527344 9.742187 2.566406l84.699219-23.464843c1.664062-.460938 3.179687-1.34375 4.402344-2.566407l178.402343-178.410156c17.546875-17.585937 17.546875-46.054687 0-63.640625zm-220.257812 184.90625 146.011718-146.015625 47.089844 47.089844-146.015625 146.015625zm-9.40625 18.875 37.621094 37.625-52.039063 14.417969zm227.257812-142.546875-10.605468 10.605469-47.09375-47.09375 10.609374-10.605469c9.761719-9.761719 25.589844-9.761719 35.351563 0l11.738281 11.734375c9.746094 9.773438 9.746094 25.589844 0 35.359375zm0 0"/></svg>
package/assets/img/header/manage.svg ADDED
@@ -0,0 +1 @@
1
+ <svg t="1674922277276" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8703" width="18" height="18"><path d="M224 423.84V231.744l192-0.096 0.096 192.096L224 423.84z m192.096-256.096H223.904A64 64 0 0 0 160 231.68v192.192a64 64 0 0 0 63.904 63.904h192.192A64 64 0 0 0 480 423.84V231.68a64 64 0 0 0-63.904-63.904zM224 807.84v-192.096l192-0.096 0.096 192.096L224 807.84z m192.096-256.096H223.904A64 64 0 0 0 160 615.68v192.192a64 64 0 0 0 63.904 63.904h192.192A64 64 0 0 0 480 807.84V615.68a64 64 0 0 0-63.904-63.904zM704.064 463.616l-135.84-135.84 135.712-135.84 135.904 135.744-135.776 135.936z m181.024-181.024l-135.904-135.904a64 64 0 0 0-90.368 0L522.912 282.56a63.456 63.456 0 0 0-18.656 45.056 63.456 63.456 0 0 0 18.656 45.312l135.904 135.936a63.904 63.904 0 0 0 90.368-0.032l135.904-135.904a63.936 63.936 0 0 0 0-90.368zM608 807.84v-192.096l192-0.096 0.096 192.096-192.096 0.096z m192.096-256.096h-192.192A64 64 0 0 0 544 615.68v192.192a64 64 0 0 0 63.904 63.904h192.192A64 64 0 0 0 864 807.84V615.68a64 64 0 0 0-63.904-63.904z" fill="#fff" p-id="8704"></path></svg>
package/assets/img/header/send.svg ADDED
@@ -0,0 +1,56 @@
1
+ <?xml version="1.0" encoding="iso-8859-1"?>
2
+ <!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
3
+ <svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
4
+ viewBox="0 0 367.92 367.92" style="enable-background:new 0 0 367.92 367.92;" xml:space="preserve" fill="#ffffff" width="16px" height="16px">
5
+ <g>
6
+ <g>
7
+ <g>
8
+ <path d="M367.851,6.944c-0.056-0.424-0.12-0.832-0.248-1.248c-0.136-0.456-0.32-0.872-0.528-1.296
9
+ c-0.112-0.232-0.152-0.48-0.288-0.704c-0.088-0.144-0.232-0.24-0.336-0.376c-0.264-0.368-0.576-0.688-0.904-1.016
10
+ c-0.328-0.328-0.656-0.632-1.032-0.896c-0.136-0.096-0.224-0.232-0.36-0.312c-0.224-0.136-0.472-0.168-0.704-0.28
11
+ c-0.44-0.216-0.872-0.4-1.336-0.536c-0.392-0.104-0.776-0.16-1.176-0.208c-0.472-0.056-0.928-0.088-1.4-0.064
12
+ c-0.44,0.024-0.864,0.112-1.296,0.216c-0.272,0.064-0.552,0.04-0.824,0.136l-352,120c-3.184,1.072-5.352,4.04-5.416,7.408
13
+ c-0.064,3.368,1.984,6.416,5.136,7.624l164.456,63.192l71.064,164.512c1.272,2.936,4.168,4.824,7.344,4.824
14
+ c0.136,0,0.264,0,0.4-0.008c3.336-0.168,6.208-2.384,7.224-5.56l112-352c0.08-0.248,0.056-0.504,0.104-0.76
15
+ c0.096-0.448,0.168-0.88,0.184-1.336C367.931,7.808,367.907,7.384,367.851,6.944z M31.475,128.368L330.011,26.592
16
+ L173.619,182.984L31.475,128.368z M246.859,337.112l-61.76-142.976L342.403,36.824L246.859,337.112z"/>
17
+ <path d="M125.659,242.264c-3.128-3.128-8.184-3.128-11.312,0l-112,112c-3.128,3.128-3.128,8.184,0,11.312
18
+ c1.56,1.56,3.608,2.344,5.656,2.344s4.096-0.784,5.656-2.344l112-112C128.787,250.448,128.787,245.392,125.659,242.264z"/>
19
+ <path d="M146.347,298.264l-56,56c-3.128,3.128-3.128,8.184,0,11.312c1.56,1.56,3.608,2.344,5.656,2.344
20
+ c2.048,0,4.096-0.784,5.656-2.344l56-56c3.128-3.128,3.128-8.184,0-11.312C154.531,295.136,149.475,295.136,146.347,298.264z"/>
21
+ <path d="M8.003,279.92c2.048,0,4.096-0.784,5.656-2.344l56-56c3.128-3.128,3.128-8.184,0-11.312
22
+ c-3.128-3.128-8.184-3.128-11.312,0l-56,56c-3.128,3.128-3.128,8.184,0,11.312C3.907,279.136,5.955,279.92,8.003,279.92z"/>
23
+ </g>
24
+ </g>
25
+ </g>
26
+ <g>
27
+ </g>
28
+ <g>
29
+ </g>
30
+ <g>
31
+ </g>
32
+ <g>
33
+ </g>
34
+ <g>
35
+ </g>
36
+ <g>
37
+ </g>
38
+ <g>
39
+ </g>
40
+ <g>
41
+ </g>
42
+ <g>
43
+ </g>
44
+ <g>
45
+ </g>
46
+ <g>
47
+ </g>
48
+ <g>
49
+ </g>
50
+ <g>
51
+ </g>
52
+ <g>
53
+ </g>
54
+ <g>
55
+ </g>
56
+ </svg>
package/assets/img/header/vip.svg ADDED
@@ -0,0 +1 @@
1
+ <svg t="1674921978278" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4292" width="16" height="16"><path d="M844.89 85.33H179.11L0 436.6l512 502.07 512-502.07L844.89 85.33zM106.34 419.67l126.77-248.64h557.77l126.77 248.64L512 817.46 106.34 419.67z" fill="#fff" p-id="4293"></path><path d="M512 603.21L324.41 419.26l-61.8 60.6L512 724.42l249.39-244.56-61.8-60.6z" fill="#fff" p-id="4294"></path></svg>
package/assets/js/utils.js ADDED
@@ -0,0 +1,28 @@
1
+ import { Notification } from 'element-ui';
2
+ // 复制
3
+ export function copyText(text){
4
+ if (window.navigator.clipboard) {
5
+ window.navigator.clipboard.writeText(text).then(function() {
6
+ Notification.success({
7
+ title: '复制成功',
8
+ });
9
+ console.log('Async: Copying to clipboard was successful!');
10
+ }, function(err) {
11
+ console.error('Async: Could not copy text: ', err);
12
+ });
13
+ } else {
14
+ var textArea = document.createElement("textarea");
15
+ textArea.value = text;
16
+ document.body.appendChild(textArea);
17
+ textArea.focus();
18
+ textArea.select();
19
+ try {
20
+ var successful = document.execCommand('copy');
21
+ var msg = successful ? 'successful' : 'unsuccessful';
22
+ console.log('Fallback: Copying text command was ' + msg);
23
+ } catch (err) {
24
+ console.error('Fallback: Oops, unable to copy', err);
25
+ }
26
+ document.body.removeChild(textArea);
27
+ }
28
+ }
package/index.js CHANGED
@@ -46,7 +46,7 @@ const components = {
46
46
  RightSideMsg,
47
47
  Author,
48
48
  Avatar,
49
-
49
+
50
50
  Thx,
51
51
  Like,
52
52
  Down,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jx3box/jx3box-common-ui",
3
- "version": "6.6.5",
3
+ "version": "6.6.8",
4
4
  "description": "JX3BOX UI",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -30,10 +30,10 @@
30
30
  "last 2 versions"
31
31
  ],
32
32
  "dependencies": {
33
- "@jx3box/jx3box-comment-ui": "^1.7.6",
33
+ "@jx3box/jx3box-comment-ui": "^1.7.8",
34
34
  "@jx3box/jx3box-common": "^7.6.2",
35
35
  "@jx3box/jx3box-data": "^3.0.3",
36
- "@jx3box/jx3box-editor": "^1.6.3",
36
+ "@jx3box/jx3box-editor": "^1.6.9",
37
37
  "axios": "^0.26.1",
38
38
  "dayjs": "^1.11.0",
39
39
  "element-ui": "^2.13.2",
package/service/thx.js CHANGED
@@ -42,6 +42,10 @@ function checkGiftStatus(accessUserId){
42
42
  return $pay().get(`/api/cny/consume/user-charge/to/${accessUserId}/check-status`)
43
43
  }
44
44
 
45
+ function batchReward(articleType,count,data){
46
+ return $pay().post(`/api/inspire/batch/article/${articleType}/coins/${count}`, data);
47
+ }
48
+
45
49
  export {
46
50
  getPostBoxcoinRecords,
47
51
  grantBoxcoin,
@@ -52,4 +56,5 @@ export {
52
56
  sendCny,
53
57
  checkCnyStatus,
54
58
  checkGiftStatus,
59
+ batchReward,
55
60
  };
package/src/App.vue CHANGED
@@ -1,42 +1,19 @@
1
1
  <template>
2
2
  <div class="container-page">
3
3
  <Header></Header>
4
- <Breadcrumb
5
- name="频道名称"
6
- slug="slug"
7
- root="/slug"
8
- :publishEnable="true"
9
- :feedbackEnable="true"
10
- :adminEnable="true"
11
- >
12
- <img
13
- slot="logo"
14
- svg-inline
15
- src="../assets/img/jx3.svg"
16
- />
4
+ <Breadcrumb name="频道名称" slug="slug" root="/slug" :publishEnable="true" :feedbackEnable="true" :adminEnable="true">
5
+ <img slot="logo" svg-inline src="../assets/img/jx3.svg" />
17
6
  bread info
18
7
  </Breadcrumb>
19
8
 
20
9
  <LeftSidebar :open="true" :uid="8">
21
- <LeftSideToggle :mobileOnly="true"/>
22
- <Author
23
- :author="author"
24
- :uid="8"
25
- />
10
+ <LeftSideToggle :mobileOnly="true" />
11
+ <Author :author="author" :uid="8" />
26
12
  </LeftSidebar>
27
13
 
28
- <Main
29
- :withoutLeft="false"
30
- :withoutRight="false"
31
- >
32
- <el-tabs
33
- v-model="tab"
34
- type="card"
35
- >
36
- <el-tab-pane
37
- label="CMS作品"
38
- name="post"
39
- >
14
+ <Main :withoutLeft="false" :withoutRight="false">
15
+ <el-tabs v-model="tab" type="card">
16
+ <el-tab-pane label="CMS作品" name="post">
40
17
  <el-radio-group v-model="post_id">
41
18
  <el-radio label="41346">临时测试</el-radio>
42
19
  <el-radio label="35605">Markdown</el-radio>
@@ -45,66 +22,23 @@
45
22
  <el-radio label="30582">小册和联合创作者</el-radio>
46
23
  <el-radio label="31129">无小册和联合创作者</el-radio>
47
24
  </el-radio-group>
48
- <singlebox
49
- :post="post"
50
- @extendUpdate="updateExtend"
51
- />
25
+ <singlebox :post="post" @extendUpdate="updateExtend" />
52
26
  </el-tab-pane>
53
- <el-tab-pane
54
- label="通用组件"
55
- name="widget"
56
- >
27
+ <el-tab-pane label="通用组件" name="widget">
57
28
  <PostHeader :post="post" />
58
- <Creators
59
- :postId="30432"
60
- style="margin-bottom: 10px"
61
- />
62
- <Collection
63
- :id="59"
64
- :defaultVisible="true"
65
- />
66
- <UserPop
67
- title="添加用户"
68
- v-model="visible"
69
- @confirm="addUser"
70
- />
29
+ <Creators :postId="30432" style="margin-bottom: 10px" />
30
+ <Collection :id="59" :defaultVisible="true" />
31
+ <UserPop title="添加用户" v-model="visible" @confirm="addUser" />
71
32
  <el-button @click="visible = true">用户POP</el-button>
72
-
73
- <Thx
74
- :postId="23865"
75
- postType="bbs"
76
- postTitle="bbs23865的标题"
77
- :userId="7"
78
- :adminBoxcoinEnable="true"
79
- :userBoxcoinEnable="true"
80
- />
81
-
33
+ <Thx :postId="23865" postType="bbs" postTitle="bbs23865的标题" type="batchReward" :userId="7"
34
+ :adminBoxcoinEnable="true" :userBoxcoinEnable="true"
35
+ :items="[{ user_id: 10, article_id: '11111', article_type: '' }]" />
82
36
  <hr />
83
-
84
- <Like
85
- mode="heart"
86
- :count="100"
87
- :showCount="true"
88
- />
89
- <Down
90
- :count="100"
91
- :showCount="true"
92
- />
93
- <Mark
94
- label="KEY"
95
- value="VALUE"
96
- BGL="#000"
97
- BGR="#F39"
98
- />
99
- <Fav
100
- post-id="90"
101
- post-type="jx3dat"
102
- post-title="jx3dat测试标题"
103
- />
104
- <Feed
105
- post-id="90"
106
- post-type="jx3dat"
107
- />
37
+ <Like mode="heart" :count="100" :showCount="true" />
38
+ <Down :count="100" :showCount="true" />
39
+ <Mark label="KEY" value="VALUE" BGL="#000" BGR="#F39" />
40
+ <Fav post-id="90" post-type="jx3dat" post-title="jx3dat测试标题" />
41
+ <Feed post-id="90" post-type="jx3dat" />
108
42
  <Print title="传入标题" />
109
43
  <QRcode />
110
44
  <Sharing />
@@ -114,24 +48,15 @@
114
48
  <markBy />
115
49
  <menuBy :data="['test1', 'test2']" />
116
50
  <orderBy />
117
- <tagBy
118
- :data="['PVE', 'PVX']"
119
- :type="tag"
120
- />
51
+ <tagBy :data="['PVE', 'PVX']" :type="tag" />
121
52
  <clientBy type="" />
122
53
  <zlpBy />
123
54
 
124
55
  <hr />
125
- <uploadImage
126
- v-model="upload"
127
- info="非必选。首页海报尺寸1100*300（推荐2200*600支持高分屏），最大20M。"
128
- ></uploadImage>
56
+ <uploadImage v-model="upload" info="非必选。首页海报尺寸1100*300（推荐2200*600支持高分屏），最大20M。"></uploadImage>
129
57
  <AuthorMedal :author-id="8"></AuthorMedal>
130
58
  </el-tab-pane>
131
- <el-tab-pane
132
- label="百科组件"
133
- name="wiki"
134
- >
59
+ <el-tab-pane label="百科组件" name="wiki">
135
60
  <WikiPanel :wiki-post="wikiPost">
136
61
  <template slot="head-title">
137
62
  <i class="el-icon-location-information"></i>
@@ -148,22 +73,13 @@
148
73
  </WikiPanel>
149
74
  <hr />
150
75
 
151
- <WikiRevisions
152
- type="achievement"
153
- source-id="2996"
154
- />
76
+ <WikiRevisions type="achievement" source-id="2996" />
155
77
  <hr />
156
78
 
157
- <WikiComments
158
- type="achievement"
159
- source-id="2996"
160
- />
79
+ <WikiComments type="achievement" source-id="2996" />
161
80
  <hr />
162
81
  </el-tab-pane>
163
- <el-tab-pane
164
- label="头像"
165
- name="avatar"
166
- >
82
+ <el-tab-pane label="头像" name="avatar">
167
83
  <el-radio-group v-model="avatar_size">
168
84
  <el-radio label="xxs">xxs-36/48</el-radio>
169
85
  <el-radio label="xs">xs-48/68</el-radio>
@@ -173,12 +89,8 @@
173
89
  <el-radio label="xl">xl-150/210</el-radio>
174
90
  </el-radio-group>
175
91
  <div style="padding:60px;background-color: #e3e3e3;">
176
- <Avatar
177
- :id="8"
178
- url="https://console.cnyixun.com/upload/avatar/2022/3/2/8_9860765.png"
179
- :size="avatar_size"
180
- frame="moon_1"
181
- />
92
+ <Avatar :id="8" url="https://console.cnyixun.com/upload/avatar/2022/3/2/8_9860765.png" :size="avatar_size"
93
+ frame="moon_1" />
182
94
  </div>
183
95
  </el-tab-pane>
184
96
  </el-tabs>
@@ -349,6 +261,6 @@ export default {
349
261
 
350
262
  <style lang="less">
351
263
  body {
352
- padding-top: 0;
264
+ padding-top: 0;
353
265
  }
354
266
  </style>
package/src/Header.vue CHANGED
@@ -10,7 +10,10 @@
10
10
  <header-logo />
11
11
 
12
12
  <!-- origin -->
13
- <clientSwitch :defaultValue="client" />
13
+ <!-- <clientSwitch :defaultValue="client" /> -->
14
+
15
+ <!-- game -->
16
+ <gameSwitch />
14
17
 
15
18
  <!-- search -->
16
19
  <header-search :client="client" />
@@ -38,6 +41,7 @@ import search from "./header/search.vue";
38
41
  import nav from "./header/nav.vue";
39
42
  import user from "./header/user.vue";
40
43
  import Box from "../src/Box2.vue";
44
+ import gameSwitch from "./header/gameSwitch.vue";
41
45
 
42
46
  export default {
43
47
  name: "Header",
@@ -82,11 +86,12 @@ export default {
82
86
  mounted: function () {},
83
87
  components: {
84
88
  "header-logo": logo,
85
- clientSwitch,
89
+ // clientSwitch,
86
90
  "header-search": search,
87
91
  "header-nav": nav,
88
92
  "header-user": user,
89
93
  Box,
94
+ gameSwitch,
90
95
  },
91
96
  };
92
97
  </script>
package/src/LeftSidebar.vue CHANGED
@@ -88,7 +88,7 @@ export default {
88
88
  this.setDecoration(JSON.parse(decoration_sidebar))
89
89
  return;
90
90
  }
91
- getDecoration({using:1,user_id:this.user_id}).then(data=>{
91
+ getDecoration({using:1,user_id:this.user_id,type:'sidebar'}).then(data=>{
92
92
  let res=data.data.data
93
93
  if(res.length==0){
94
94
  //空 则为无主题，不再加载接口，界面设No
@@ -96,17 +96,19 @@ export default {
96
96
  this.bg =""
97
97
  return;
98
98
  }
99
- let decoration=res.filter(val => {
100
- return val.type === 'sidebar'
101
- })
102
- if(decoration.length>0){
103
- sessionStorage.setItem('decoration_sidebar'+this.user_id,JSON.stringify(decoration[0]))
104
- this.setDecoration(decoration[0])
105
- }else{
106
- //空 则为无主题，不再加载接口，界面设No
107
- sessionStorage.setItem('decoration_sidebar'+this.user_id,'no')
108
- this.bg =""
109
- }
99
+ sessionStorage.setItem('decoration_sidebar'+this.user_id,JSON.stringify(res[0]))
100
+ this.setDecoration(res[0])
101
+ // let decoration=res.filter(val => {
102
+ // return val.type === 'sidebar'
103
+ // })
104
+ // if(decoration.length>0){
105
+
106
+ // this.setDecoration(decoration[0])
107
+ // }else{
108
+ // //空 则为无主题，不再加载接口，界面设No
109
+ // sessionStorage.setItem('decoration_sidebar'+this.user_id,'no')
110
+ // this.bg =""
111
+ // }
110
112
  })
111
113
  },
112
114
  setDecoration(decoration_sidebar){