@jx3box/jx3box-common-ui 5.9.8 → 6.0.1

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 (5) hide show
  1. package/assets/css/thx.less +5 -1
  2. package/package.json +2 -2
  3. package/src/author/AuthorFollow.vue +16 -14
  4. package/src/interact/boxcoin_records.vue +3 -2
  5. package/src/single/Thx.vue +1 -1
package/assets/css/thx.less CHANGED
@@ -179,6 +179,10 @@
179
179
  color:#f00;
180
180
  }
181
181
  }
182
+ .u-client{
183
+ margin-left:5px;
184
+ color:#09f;
185
+ }
182
186
  }
183
187
 
184
188
  @media screen and (max-width:@phone){
@@ -197,4 +201,4 @@
197
201
  .none;
198
202
  }
199
203
  }
200
- }
204
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jx3box/jx3box-common-ui",
3
- "version": "5.9.8",
3
+ "version": "6.0.1",
4
4
  "description": "JX3BOX UI",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -33,7 +33,7 @@
33
33
  "@jx3box/jx3box-comment-ui": "^1.7.0",
34
34
  "@jx3box/jx3box-common": "^7.3.5",
35
35
  "@jx3box/jx3box-data": "^1.10.2",
36
- "@jx3box/jx3box-editor": "^1.4.0",
36
+ "@jx3box/jx3box-editor": "^1.4.3",
37
37
  "axios": "^0.26.1",
38
38
  "dayjs": "^1.11.0",
39
39
  "element-ui": "^2.13.2",
package/src/author/AuthorFollow.vue CHANGED
@@ -125,28 +125,30 @@ export default {
125
125
  </script>
126
126
 
127
127
  <style lang="less">
128
- .u-follow {
129
- }
130
128
  .u-unfollow-btn {
131
- margin-right: 10px;
129
+ &.el-button {
130
+ margin-right: 10px;
131
+ }
132
132
  }
133
133
  .u-follow-popover {
134
- min-width: 100px;
135
- padding: 0;
136
- margin: 0;
137
- .u-action-list {
138
- .u-action-item {
139
- text-align: center;
140
- cursor: pointer;
141
- padding: 12px 15px;
142
- &:hover {
143
- background: rgb(248,248,251);
134
+ &.el-popover {
135
+ min-width: 100px;
136
+ padding: 0;
137
+ margin: 0;
138
+ .u-action-list {
139
+ .u-action-item {
140
+ text-align: center;
141
+ cursor: pointer;
142
+ padding: 12px 15px;
143
+ &:hover {
144
+ background: rgb(248,248,251);
145
+ }
144
146
  }
145
147
  }
146
148
  }
147
149
  }
148
150
  .u-follow-count{
149
- color:#ffdea8;
151
+ color:#fff;
150
152
  margin-left:5px;
151
153
  }
152
154
  </style>
package/src/interact/boxcoin_records.vue CHANGED
@@ -43,7 +43,8 @@
43
43
  </span>
44
44
  <span class="u-meta u-remark">{{item.remark}}</span>
45
45
  <time class="u-meta u-time">{{showTime(item.created_at)}}</time>
46
- <span class="u-delete" v-if="isSuperAdmin && !item.is_user_gift" @click="recovery(item,i)">
46
+ <span class="u-client" v-if="isSuperAdmin">{{item.client}}</span>
47
+ <span class="u-delete" v-if="isSuperAdmin" @click="recovery(item,i)">
47
48
  <i class="el-icon-delete"></i>撤销
48
49
  </span>
49
50
  </li>
@@ -89,7 +90,7 @@ export default {
89
90
  return {
90
91
  pageSize: this.per,
91
92
  pageIndex: this.page,
92
- client : this.postClient,
93
+ //client : this.postClient,
93
94
  };
94
95
  },
95
96
  },
package/src/single/Thx.vue CHANGED
@@ -4,7 +4,7 @@
4
4
  <boxcoin-admin :postId="postId" :postType="postType" v-if="hasRight && adminBoxcoinEnable && boxcoin_enable" :userId="userId" :max="admin_max" :min="admin_min" :own="admin_left" :total="admin_total" :points="admin_points" :authors="authors" @updateRecord="updateRecord" :client="client" />
5
5
  <Like :postId="postId" :postType="postType"></Like>
6
6
  <fav :postId="postId" :postType="postType" :postTitle="postTitle"></fav>
7
- <boxcoin-user :postId="postId" :postType="postType" :boxcoin="boxcoin" :userId="userId" :own="user_left" :points="user_points" :authors="authors" v-if="userBoxcoinEnable && boxcoin_enable" @updateRecord="updateRecord" />
7
+ <boxcoin-user :postId="postId" :postType="postType" :boxcoin="boxcoin" :userId="userId" :own="user_left" :points="user_points" :authors="authors" v-if="userBoxcoinEnable && boxcoin_enable" @updateRecord="updateRecord" :client="client" />
8
8
  <Share :postId="postId" :postType="postType" :client="client" />
9
9
  </div>
10
10
  <div class="w-thx-records">