Feature/scope

.gitignore

@@ -9,3 +9,4 @@ npm-debug.log.*
 thumbs.db
 !.gitkeep
 .idea/*
+.history

README.md

@@ -13,7 +13,7 @@ https://www.bilibili.com/video/av89568075
 
 #### 本项目需要配合  
 服务端： https://github.com/iamdarcy/hioshop-server  
-微信小程序：https://github.com/iamdarcy/hioshop-miniprogram
+微信..小程序：https://github.com/iamdarcy/hioshop-miniprogram
 
 线上demo：http://hiolabs.com/demo/#/login  
 用户名：hiolabs  

package.json

@@ -3,14 +3,15 @@
   "version": "0.0.0",
   "author": "sligxl@163.com",
   "description": "An electron-vue project",
-  "license": null,
+  "license": "GPL",
   "main": "./dist/electron/main.js",
   "scripts": {
     "build": "node .electron-vue/build.js && electron-builder",
     "build:dir": "node .electron-vue/build.js && electron-builder --dir",
     "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
     "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
     "dev": "node .electron-vue/dev-runner.js",
+    "dev:online": "cross-env NODE_ENV=online node .electron-vue/dev-runner.js  ",
     "pack": "npm run pack:main && npm run pack:renderer",
     "pack:main": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.main.config.js",
     "pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",

src/main/index.dev.js

@@ -8,7 +8,7 @@
 /* eslint-disable */
 
 // Set environment for development
-process.env.NODE_ENV = 'development'
+process.env.NODE_ENV = process.env.NODE_ENV || 'development'
 
 // Install `electron-debug` with `devtron`
 require('electron-debug')({ showDevTools: true })

src/main/index.js

@@ -9,7 +9,7 @@ if (process.env.NODE_ENV !== 'development') {
 }
 
 let mainWindow
-const winURL = process.env.NODE_ENV === 'development'
+const winURL = process.env.NODE_ENV === 'development' || 'online'
   ? `http://localhost:9080`
   : `file://${__dirname}/index.html`
 

src/renderer/components/Ad/AdAddPage.vue

@@ -15,9 +15,11 @@
                 <el-form ref="infoForm" :rules="infoRules" :model="infoForm" label-width="120px">
                     <el-form-item label="广告图片" prop="image_url">
                         <img v-if="infoForm.image_url" :src="infoForm.image_url" class="image-show">
+                        {{fileList}}
                         <el-upload
                                 class="upload-demo"
                                 name="file"
+                                :headers="{'X-Nideshop-Token': Token}"
                                 :action="qiniuZone"
                                 :on-remove="adRemove"
                                 :before-remove="beforeAdRemove"
@@ -48,13 +50,13 @@
                             <el-table :data="chooseRelateGoods" stripe style="width: 100%">
                                 <el-table-column prop="id" label="id" width="100"></el-table-column>
                                 <el-table-column prop="list_pic_url" label="商品图片" width="120">
-                                    <template scope="scope">
+                                    <template slot-scope="scope">
                                         <img :src="scope.row.list_pic_url" alt="" style="width: 40px;height: 40px">
                                     </template>
                                 </el-table-column>
                                 <el-table-column prop="name" label="商品名称" width="300px"></el-table-column>
                                 <el-table-column label="操作">
-                                    <template scope="scope">
+                                    <template slot-scope="scope">
                                         <el-button
                                                 size="small"
                                                 type="danger"
@@ -226,8 +228,7 @@
                 });
             },
             handleUploadImageSuccess(res, file) {
-                let url = this.url;
-                this.infoForm.image_url = url + res.key;
+                this.infoForm.image_url = res.data
             },
             getInfo() {
                 if (this.infoForm.id <= 0) {
@@ -253,7 +254,11 @@
                 })
             }
         },
-        components: {},
+        computed: {
+            Token() {
+                return localStorage.getItem('token')
+            }
+        },
         mounted() {
             this.infoForm.id = this.$route.query.id || 0;
             this.getInfo();