Merge pull request #61 from ZyqGitHub1/dev

Dev

Author: ZyqGitHub1

.travis.yml

@@ -47,6 +47,7 @@ script:
         -v ~/.cache/electron-builder:/root/.cache/electron-builder \
         electronuserland/builder:wine \
         /bin/bash -c "npm install && npm run electron:build -- --bundler builder --target linux"
+        ls dist/electron/Packaged/
       linux_file=`ls dist/electron/Packaged/ | grep '.AppImage$'`
       ./ossutil64 cp "dist/electron/Packaged/${linux_file}" "${BUCKET}/${linux_file}" -f
 
@@ -59,10 +60,14 @@ script:
         -v ~/.cache/electron-builder:/root/.cache/electron-builder \
         electronuserland/builder:wine \
         /bin/bash -c "npm install && npm run electron:build -- --bundler builder --target win"
-        win_file=`ls dist/electron/Packaged/ | grep '.zip$'`
-      ./ossutil64 cp "dist/electron/Packaged/${win_file}" "${BUCKET}/${win_file}" -f
+      ls dist/electron/Packaged/
+      for i in `ls dist/electron/Packaged/ | grep 'win.zip$'`;
+      do
+      ./ossutil64 cp "dist/electron/Packaged/$i" "${BUCKET}/$i" -f
+      done
     else
       npm run electron:build
+      ls dist/electron/Packaged/
       osx_file=`ls dist/electron/Packaged/ | grep '.dmg$'`
       ./ossutilmac64 cp "dist/electron/Packaged/${osx_file}" "${BUCKET}/${osx_file}" -f
     fi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "h-player",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "A Quasar Framework app",
   "productName": "h-player",
   "cordovaId": "org.cordova.quasar.app",
@@ -29,6 +29,7 @@
     "vue-i18n": "^8.14.1",
     "vue-navigation": "^1.1.4",
     "vue-rx": "^6.2.0",
+    "vuedraggable": "^2.23.0",
     "xml2js": "^0.4.22"
   },
   "devDependencies": {

quasar.conf.js

@@ -208,7 +208,15 @@ module.exports = function (ctx) {
           target: 'dmg',
         },
         win: {
-          target: 'zip',
+          target: [
+            {
+              target: 'zip',
+              arch: [
+                'x64',
+                'ia32',
+              ],
+            },
+          ],
         },
         linux: {
           target: 'AppImage',