diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..25e7fbf --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.github/workflows/ merge=ours diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..c6fd208 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,27 @@ +name: Build and Deploy (dev branch) +on: + push: + branches: + - dev +jobs: + build-and-deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2.3.1 + with: + persist-credentials: false + + - name: Install and Build + run: | + npm install + npm run build + + - name: Deploy + uses: JamesIves/github-pages-deploy-action@3.7.1 + with: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BRANCH: dev-pages + FOLDER: dist + CLEAN: true + diff --git a/src/assets/s.png b/src/assets/s.png deleted file mode 100644 index 3e26a42..0000000 Binary files a/src/assets/s.png and /dev/null differ diff --git a/src/layout/toolBar/index.vue b/src/layout/toolBar/index.vue index dcfe9c4..4fd18c0 100644 --- a/src/layout/toolBar/index.vue +++ b/src/layout/toolBar/index.vue @@ -143,7 +143,7 @@ export default { url: reader.result, name: file.name.slice(-10) }); - self.$emit("events", "insert", self.imgList); //似乎没有意义 + self.$emit("events", "insert", self.imgList); }, false ); diff --git a/src/layout/trackBlock/index.vue b/src/layout/trackBlock/index.vue index 86e4303..2266d67 100644 --- a/src/layout/trackBlock/index.vue +++ b/src/layout/trackBlock/index.vue @@ -31,8 +31,10 @@ >