Browse Source

feat: 升级版本v3.1.0;tailwindcss添加class

tall
wally 4 years ago
parent
commit
9ef05e16f6
  1. 2
      .env.development
  2. 2
      .env.production
  3. 3
      CHANGELOG.md
  4. 2
      package.json
  5. 379
      src/common/styles/tailwind.scss
  6. 18
      src/components/PrettyExchange/PrettyExchange.vue
  7. 7
      src/components/Projects/ProjectItem.vue
  8. 16
      src/components/Projects/Projects.vue
  9. 8
      src/components/Upload/Upload.vue
  10. 4
      src/manifest.json
  11. 2
      src/uni.scss

2
.env.development

@ -3,4 +3,4 @@ VUE_APP_BASE_URL=https://test.tall.wiki
VUE_APP_API_URL=https://test.tall.wiki/gateway VUE_APP_API_URL=https://test.tall.wiki/gateway
VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws
VUE_APP_PROJECT_PATH=https://test.tall.wiki/tall-project VUE_APP_PROJECT_PATH=https://test.tall.wiki/tall-project
VUE_APP_VERSION=v3.0.1 VUE_APP_VERSION=v3.1.0

2
.env.production

@ -3,4 +3,4 @@ VUE_APP_BASE_URL=https://www.tall.wiki
VUE_APP_API_URL=https://www.tall.wiki/gateway VUE_APP_API_URL=https://www.tall.wiki/gateway
VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws
VUE_APP_PROJECT_PATH=https://www.tall.wiki/tall-project VUE_APP_PROJECT_PATH=https://www.tall.wiki/tall-project
VUE_APP_VERSION=v3.0.1 VUE_APP_VERSION=v3.1.0

3
CHANGELOG.md

@ -1,4 +1,4 @@
# 0.1.0 (2021-08-30) # 0.1.0 (2021-08-31)
### 🌟 新功能 ### 🌟 新功能
范围|描述|commitId 范围|描述|commitId
@ -207,6 +207,7 @@
范围|描述|commitId 范围|描述|commitId
--|--|-- --|--|--
- | api 封装 | 8dcb8a2 - | api 封装 | 8dcb8a2
- | dart-sass替换node-sass;删除多余的uni平台包 | 519f28b
- | env host修改 | a79a4a5 - | env host修改 | a79a4a5
- | merge globals | b0957cc - | merge globals | b0957cc
- | merge wrr | 5ccc7a5 - | merge wrr | 5ccc7a5

2
package.json

@ -35,7 +35,6 @@
"dayjs": "^1.10.6", "dayjs": "^1.10.6",
"flyio": "^0.6.2", "flyio": "^0.6.2",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"node-sass": "npm:dart-sass@^1.25.0",
"regenerator-runtime": "^0.12.1", "regenerator-runtime": "^0.12.1",
"uview-ui": "^1.8.4", "uview-ui": "^1.8.4",
"vue": "^2.6.11", "vue": "^2.6.11",
@ -81,6 +80,7 @@
"prettier": "^2.2.1", "prettier": "^2.2.1",
"puppeteer": "^10.2.0", "puppeteer": "^10.2.0",
"right-pad": "^1.0.1", "right-pad": "^1.0.1",
"sass": "^1.38.2",
"sass-loader": "^8.0.2", "sass-loader": "^8.0.2",
"vue-cli-plugin-commitlint": "~1.0.12", "vue-cli-plugin-commitlint": "~1.0.12",
"vue-template-compiler": "^2.6.11" "vue-template-compiler": "^2.6.11"

379
src/common/styles/tailwind.scss

@ -433,22 +433,6 @@
margin: 1px; margin: 1px;
} }
.m-0\.5 {
margin: 0.125rem;
}
.m-1\.5 {
margin: 0.375rem;
}
.m-2\.5 {
margin: 0.625rem;
}
.m-3\.5 {
margin: 0.875rem;
}
.-m-0 { .-m-0 {
margin: 0px; margin: 0px;
} }
@ -573,22 +557,6 @@
margin: -1px; margin: -1px;
} }
.-m-0\.5 {
margin: -0.125rem;
}
.-m-1\.5 {
margin: -0.375rem;
}
.-m-2\.5 {
margin: -0.625rem;
}
.-m-3\.5 {
margin: -0.875rem;
}
.mx-0 { .mx-0 {
margin-left: 0px; margin-left: 0px;
margin-right: 0px; margin-right: 0px;
@ -749,26 +717,6 @@
margin-right: 1px; margin-right: 1px;
} }
.mx-0\.5 {
margin-left: 0.125rem;
margin-right: 0.125rem;
}
.mx-1\.5 {
margin-left: 0.375rem;
margin-right: 0.375rem;
}
.mx-2\.5 {
margin-left: 0.625rem;
margin-right: 0.625rem;
}
.mx-3\.5 {
margin-left: 0.875rem;
margin-right: 0.875rem;
}
.-mx-0 { .-mx-0 {
margin-left: 0px; margin-left: 0px;
margin-right: 0px; margin-right: 0px;
@ -924,26 +872,6 @@
margin-right: -1px; margin-right: -1px;
} }
.-mx-0\.5 {
margin-left: -0.125rem;
margin-right: -0.125rem;
}
.-mx-1\.5 {
margin-left: -0.375rem;
margin-right: -0.375rem;
}
.-mx-2\.5 {
margin-left: -0.625rem;
margin-right: -0.625rem;
}
.-mx-3\.5 {
margin-left: -0.875rem;
margin-right: -0.875rem;
}
.my-0 { .my-0 {
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
@ -1104,26 +1032,6 @@
margin-bottom: 1px; margin-bottom: 1px;
} }
.my-0\.5 {
margin-top: 0.125rem;
margin-bottom: 0.125rem;
}
.my-1\.5 {
margin-top: 0.375rem;
margin-bottom: 0.375rem;
}
.my-2\.5 {
margin-top: 0.625rem;
margin-bottom: 0.625rem;
}
.my-3\.5 {
margin-top: 0.875rem;
margin-bottom: 0.875rem;
}
.-my-0 { .-my-0 {
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
@ -1279,26 +1187,6 @@
margin-bottom: -1px; margin-bottom: -1px;
} }
.-my-0\.5 {
margin-top: -0.125rem;
margin-bottom: -0.125rem;
}
.-my-1\.5 {
margin-top: -0.375rem;
margin-bottom: -0.375rem;
}
.-my-2\.5 {
margin-top: -0.625rem;
margin-bottom: -0.625rem;
}
.-my-3\.5 {
margin-top: -0.875rem;
margin-bottom: -0.875rem;
}
.mt-0 { .mt-0 {
margin-top: 0px; margin-top: 0px;
} }
@ -1427,22 +1315,6 @@
margin-top: 1px; margin-top: 1px;
} }
.mt-0\.5 {
margin-top: 0.125rem;
}
.mt-1\.5 {
margin-top: 0.375rem;
}
.mt-2\.5 {
margin-top: 0.625rem;
}
.mt-3\.5 {
margin-top: 0.875rem;
}
.-mt-0 { .-mt-0 {
margin-top: 0px; margin-top: 0px;
} }
@ -1567,22 +1439,6 @@
margin-top: -1px; margin-top: -1px;
} }
.-mt-0\.5 {
margin-top: -0.125rem;
}
.-mt-1\.5 {
margin-top: -0.375rem;
}
.-mt-2\.5 {
margin-top: -0.625rem;
}
.-mt-3\.5 {
margin-top: -0.875rem;
}
.mr-0 { .mr-0 {
margin-right: 0px; margin-right: 0px;
} }
@ -1711,22 +1567,6 @@
margin-right: 1px; margin-right: 1px;
} }
.mr-0\.5 {
margin-right: 0.125rem;
}
.mr-1\.5 {
margin-right: 0.375rem;
}
.mr-2\.5 {
margin-right: 0.625rem;
}
.mr-3\.5 {
margin-right: 0.875rem;
}
.-mr-0 { .-mr-0 {
margin-right: 0px; margin-right: 0px;
} }
@ -1851,22 +1691,6 @@
margin-right: -1px; margin-right: -1px;
} }
.-mr-0\.5 {
margin-right: -0.125rem;
}
.-mr-1\.5 {
margin-right: -0.375rem;
}
.-mr-2\.5 {
margin-right: -0.625rem;
}
.-mr-3\.5 {
margin-right: -0.875rem;
}
.mb-0 { .mb-0 {
margin-bottom: 0px; margin-bottom: 0px;
} }
@ -1995,22 +1819,6 @@
margin-bottom: 1px; margin-bottom: 1px;
} }
.mb-0\.5 {
margin-bottom: 0.125rem;
}
.mb-1\.5 {
margin-bottom: 0.375rem;
}
.mb-2\.5 {
margin-bottom: 0.625rem;
}
.mb-3\.5 {
margin-bottom: 0.875rem;
}
.-mb-0 { .-mb-0 {
margin-bottom: 0px; margin-bottom: 0px;
} }
@ -2135,22 +1943,6 @@
margin-bottom: -1px; margin-bottom: -1px;
} }
.-mb-0\.5 {
margin-bottom: -0.125rem;
}
.-mb-1\.5 {
margin-bottom: -0.375rem;
}
.-mb-2\.5 {
margin-bottom: -0.625rem;
}
.-mb-3\.5 {
margin-bottom: -0.875rem;
}
.ml-0 { .ml-0 {
margin-left: 0px; margin-left: 0px;
} }
@ -2279,22 +2071,6 @@
margin-left: 1px; margin-left: 1px;
} }
.ml-0\.5 {
margin-left: 0.125rem;
}
.ml-1\.5 {
margin-left: 0.375rem;
}
.ml-2\.5 {
margin-left: 0.625rem;
}
.ml-3\.5 {
margin-left: 0.875rem;
}
.-ml-0 { .-ml-0 {
margin-left: 0px; margin-left: 0px;
} }
@ -2419,22 +2195,6 @@
margin-left: -1px; margin-left: -1px;
} }
.-ml-0\.5 {
margin-left: -0.125rem;
}
.-ml-1\.5 {
margin-left: -0.375rem;
}
.-ml-2\.5 {
margin-left: -0.625rem;
}
.-ml-3\.5 {
margin-left: -0.875rem;
}
.box-border { .box-border {
box-sizing: border-box; box-sizing: border-box;
} }
@ -3085,22 +2845,6 @@
padding: 1px; padding: 1px;
} }
.p-0\.5 {
padding: 0.125rem;
}
.p-1\.5 {
padding: 0.375rem;
}
.p-2\.5 {
padding: 0.625rem;
}
.p-3\.5 {
padding: 0.875rem;
}
.px-0 { .px-0 {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; padding-right: 0px;
@ -3256,26 +3000,6 @@
padding-right: 1px; padding-right: 1px;
} }
.px-0\.5 {
padding-left: 0.125rem;
padding-right: 0.125rem;
}
.px-1\.5 {
padding-left: 0.375rem;
padding-right: 0.375rem;
}
.px-2\.5 {
padding-left: 0.625rem;
padding-right: 0.625rem;
}
.px-3\.5 {
padding-left: 0.875rem;
padding-right: 0.875rem;
}
.py-0 { .py-0 {
padding-top: 0px; padding-top: 0px;
padding-bottom: 0px; padding-bottom: 0px;
@ -3431,26 +3155,6 @@
padding-bottom: 1px; padding-bottom: 1px;
} }
.py-0\.5 {
padding-top: 0.125rem;
padding-bottom: 0.125rem;
}
.py-1\.5 {
padding-top: 0.375rem;
padding-bottom: 0.375rem;
}
.py-2\.5 {
padding-top: 0.625rem;
padding-bottom: 0.625rem;
}
.py-3\.5 {
padding-top: 0.875rem;
padding-bottom: 0.875rem;
}
.pt-0 { .pt-0 {
padding-top: 0px; padding-top: 0px;
} }
@ -3575,22 +3279,6 @@
padding-top: 1px; padding-top: 1px;
} }
.pt-0\.5 {
padding-top: 0.125rem;
}
.pt-1\.5 {
padding-top: 0.375rem;
}
.pt-2\.5 {
padding-top: 0.625rem;
}
.pt-3\.5 {
padding-top: 0.875rem;
}
.pr-0 { .pr-0 {
padding-right: 0px; padding-right: 0px;
} }
@ -3715,22 +3403,6 @@
padding-right: 1px; padding-right: 1px;
} }
.pr-0\.5 {
padding-right: 0.125rem;
}
.pr-1\.5 {
padding-right: 0.375rem;
}
.pr-2\.5 {
padding-right: 0.625rem;
}
.pr-3\.5 {
padding-right: 0.875rem;
}
.pb-0 { .pb-0 {
padding-bottom: 0px; padding-bottom: 0px;
} }
@ -3855,22 +3527,6 @@
padding-bottom: 1px; padding-bottom: 1px;
} }
.pb-0\.5 {
padding-bottom: 0.125rem;
}
.pb-1\.5 {
padding-bottom: 0.375rem;
}
.pb-2\.5 {
padding-bottom: 0.625rem;
}
.pb-3\.5 {
padding-bottom: 0.875rem;
}
.pl-0 { .pl-0 {
padding-left: 0px; padding-left: 0px;
} }
@ -3995,22 +3651,6 @@
padding-left: 1px; padding-left: 1px;
} }
.pl-0\.5 {
padding-left: 0.125rem;
}
.pl-1\.5 {
padding-left: 0.375rem;
}
.pl-2\.5 {
padding-left: 0.625rem;
}
.pl-3\.5 {
padding-left: 0.875rem;
}
.text-left { .text-left {
text-align: left; text-align: left;
} }
@ -4676,6 +4316,21 @@
.w-12 { .w-12 {
width: 3rem; width: 3rem;
} }
.w-full {
width: 100%;
}
.w-screen {
width: 100vw;
}
.w-min {
width: min-content;
}
.w-max {
width: max-content;
}
.h-12 { .h-12 {
height: 3rem; height: 3rem;
@ -4688,6 +4343,10 @@
--tw-bg-opacity: 1; --tw-bg-opacity: 1;
background-color: rgba(219, 234, 254, var(--tw-bg-opacity)); background-color: rgba(219, 234, 254, var(--tw-bg-opacity));
} }
.bg-blue-500 {
--tw-bg-opacity: 1;
background-color: rgba(59, 130, 246, var(--tw-bg-opacity));
}
.text-green-400 { .text-green-400 {
--tw-text-opacity: 1; --tw-text-opacity: 1;
color: rgba(52, 211, 153, var(--tw-text-opacity)); color: rgba(52, 211, 153, var(--tw-text-opacity));

18
src/components/PrettyExchange/PrettyExchange.vue

@ -1,15 +1,16 @@
<template> <template>
<view class> <view>
<scroll-view scroll-y="true" style="height: 80%"> <scroll-view scroll-y="true">
<view v-if="!changeEvent"> <view v-if="!changeEvent">
<view :id="'cu-' + index" :key="item.id" class="cu-item flex-col" v-for="(item, index) in itemList"> <view :id="'cu-' + index" :key="item.id" class="cu-item flex-col" v-for="(item, index) in itemList">
<project-item <ProjectItem
class="w-full"
:index="index" :index="index"
:item="item" :item="item"
:menuList="menuList" :menuList="menuList"
@chooseAction="chooseAction" @chooseAction="chooseAction"
@openSubProject="openSubProject" @openSubProject="openSubProject"
></project-item> />
</view> </view>
</view> </view>
<view v-else> <view v-else>
@ -113,8 +114,8 @@
</scroll-view> </scroll-view>
<!-- 移动悬浮 begin --> <!-- 移动悬浮 begin -->
<view v-if="showMoveImage"> <view v-if="showMoveImage">
<view :style="{ left: moveLeft + 'px', top: moveTop + 'px' }" class="cu-item" style="position: absolute"> <view :style="{ left: moveLeft + 'px', top: moveTop + 'px' }" class="cu-item absolute">
<project-item :item="moveItem"></project-item> <ProjectItem class="w-full" :item="moveItem" />
</view> </view>
</view> </view>
<!-- 移动悬浮 end --> <!-- 移动悬浮 end -->
@ -128,10 +129,7 @@ import { mapState, mapGetters, mapMutations } from 'vuex';
export default { export default {
components: { ProjectItem }, components: { ProjectItem },
name: 'exchange', name: 'exchange',
model: { model: { prop: 'showPop', event: 'change' },
prop: 'showPop',
event: 'change',
},
data() { data() {
return { return {

7
src/components/Projects/ProjectItem.vue

@ -115,14 +115,11 @@ export default {
computed: mapGetters('user', ['userId']), computed: mapGetters('user', ['userId']),
methods: { methods: {
/** //
* 打开项目
* @param {object} project 所点击的项目的信息
*/
openProject(project) { openProject(project) {
const { name, id, url } = project; const { name, id, url } = project;
url && (uni.$t.domain = url); url && (uni.$t.domain = url);
this.$u.route('pages/project/project', { this.$u.route('pages/project-webview/project-webview', {
u: this.userId, u: this.userId,
p: id, p: id,
pname: name, pname: name,

16
src/components/Projects/Projects.vue

@ -1,6 +1,6 @@
<template> <template>
<view class="py-3 mt-4 bg-white u-font-15"> <view class="py-3 mt-4 bg-white u-font-15">
<PrettyExchange @change="change"></PrettyExchange> <PrettyExchange @change="change" />
</view> </view>
</template> </template>
@ -23,7 +23,6 @@ export default {
arr.push(item.name); arr.push(item.name);
}); });
this.setProjectSort(projectIdList); this.setProjectSort(projectIdList);
console.log('arr: ', arr);
} else { } else {
this.setProjectRelation(options); this.setProjectRelation(options);
} }
@ -50,24 +49,13 @@ export default {
* @param { string } id 当前移动的项目的id * @param { string } id 当前移动的项目的id
* @param { string } parentId 父项目的id * @param { string } parentId 父项目的id
*/ */
openProject(project) {
const { name, id, url } = project;
url && (uni.$t.domain = url);
this.$u.route('pages/project-webview/project-webview', {
u: this.userId,
p: id,
pname: name,
url: encodeURIComponent(url),
});
},
async setProjectRelation(options) { async setProjectRelation(options) {
try { try {
const params = options; const params = options;
await this.$u.api.setProjectRelation(params); await this.$u.api.setProjectRelation(params);
this.$t.ui.showToast('排序修改成功'); this.$t.ui.showToast('排序修改成功');
} catch (error) { } catch (error) {
console.log('error: ', error); console.error('error: ', error);
this.$t.ui.showToast(error.msg || '排序修改失败'); this.$t.ui.showToast(error.msg || '排序修改失败');
} }
this.$emit('getProjects'); this.$emit('getProjects');

8
src/components/Upload/Upload.vue

@ -17,8 +17,9 @@ export default {
// WBS // WBS
// //
this.$emit('success'); this.$emit('success');
data.url && (uni.$t.domain = data.url);
setTimeout(() => { setTimeout(() => {
this.$u.route('/pages/project/project', { this.$u.route('/pages/project-webview/project-webview', {
u: this.userId, u: this.userId,
p: data.id, p: data.id,
pname: data.pname, pname: data.pname,
@ -39,9 +40,6 @@ export default {
right: 10px; right: 10px;
bottom: 0; bottom: 0;
transform: translate3d(0, 50%, 0); transform: translate3d(0, 50%, 0);
} color: $uni-color-primary !important;
::v-deep .uicon-plus {
color: theme('colors.blue.500') !important;
} }
</style> </style>

4
src/manifest.json

@ -66,7 +66,7 @@
"h5": { "h5": {
"router": { "router": {
"base": "/tall/v3.0.1" "base": "/tall/v3.1.0"
}, },
"title": "时物链条", "title": "时物链条",
"sdkConfigs": { "sdkConfigs": {
@ -74,7 +74,7 @@
}, },
"optimization": { "optimization": {
"treeShaking": { "treeShaking": {
"enable": true "enable": false
} }
} }
} }

2
src/uni.scss

@ -14,7 +14,7 @@
@import 'uview-ui/theme.scss'; @import 'uview-ui/theme.scss';
@import './common/styles/tailwind.scss'; @import './common/styles/tailwind.scss';
/* 颜色变量 */ /* 行为相关颜色 */ /* 颜色变量 */ /* 行为相关颜色 */
$uni-color-primary: #007aff; $uni-color-primary: #0284c7;
$uni-color-success: #4cd964; $uni-color-success: #4cd964;
$uni-color-warning: #f0ad4e; $uni-color-warning: #f0ad4e;
$uni-color-error: #dd524d; $uni-color-error: #dd524d;

Loading…
Cancel
Save