From 48fa7adea6ab278f790bfee92270e0d284ebe445 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Sun, 29 Dec 2019 11:05:45 +0800
Subject: [PATCH] =?UTF-8?q?yshop1.6.3=E6=96=B0=E5=A2=9E=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=8F=8A=E5=85=B6=E6=A8=A1=E6=9D=BF=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF,=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E8=AF=81=E4=B9=A6=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=89=8B=E6=9C=BA=E7=AB=AF=E7=AE=A1=E7=90=86=E7=AB=AF?=
 =?UTF-8?q?=E6=8B=92=E7=BB=9D=E9=80=80=E6=AC=BEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/file-upload/index.vue | 71 ++++++++++++++++++++++++++++
 src/views/wechat/config/pay.vue      | 12 +++--
 2 files changed, 78 insertions(+), 5 deletions(-)
 create mode 100644 src/components/file-upload/index.vue

diff --git a/src/components/file-upload/index.vue b/src/components/file-upload/index.vue
new file mode 100644
index 0000000..5c8883c
--- /dev/null
+++ b/src/components/file-upload/index.vue
@@ -0,0 +1,71 @@
+<template>
+  <div>
+    <el-upload
+      :action="fileUploadApi"
+      :headers="headers"
+      :on-remove="handleRemove"
+      :on-success="handleUploadSuccess"
+      :before-remove="beforeRemove"
+      :file-list="fileList"
+      multiple
+      :limit="1"
+      >
+      <el-button size="small" type="primary">点击上传</el-button>
+    </el-upload>
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { mapGetters } from 'vuex'
+export default {
+  data () {
+    return {
+      resourcesUrl: '',
+      headers: {
+        'Authorization': 'Bearer ' + getToken()
+      }
+    }
+  },
+  props: {
+    value: {
+      default: '',
+      type: String
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'fileUploadApi'
+    ]),
+    fileList () {
+      let res = []
+      if (this.value) {
+        // let fileArray = this.value.split(',')
+        // for (let i = 0; i < fileArray.length; i++) {
+        //   res.push({name: fileArray[i], url: this.resourcesUrl + fileArray[i], response: fileArray[i]})
+        // }
+        console.log("aaa"+this.value)
+        res.push({name: this.value, url: this.resourcesUrl + this.value, response: this.value})
+      }
+      this.$emit('input', this.value)
+      console.log("res"+res)
+      return res
+    }
+  },
+  methods: {
+    // 图片上传
+    handleUploadSuccess (response, file, fileList) {
+      this.$emit('input', file.response.data[0])
+    },
+    handleRemove (file, fileList) {
+      this.$emit('change', file)
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/views/wechat/config/pay.vue b/src/views/wechat/config/pay.vue
index 57eb582..ec8c799 100644
--- a/src/views/wechat/config/pay.vue
+++ b/src/views/wechat/config/pay.vue
@@ -10,13 +10,14 @@
       <el-form-item label="商户密钥" >
         <el-input v-model="form.wxpay_mchKey" style="width: 370px;" type="password" />
       </el-form-item>
+      <el-form-item label="微信证书" >
+        <file-upload v-model="form.wxpay_keyPath" style="width: 500px;"/>
+      </el-form-item>
       <el-form-item label="" >
         <el-button  type="primary" @click="doSubmit">提交</el-button>
       </el-form-item>
 
     </el-form>
-
-
   </div>
 </template>
 
@@ -25,10 +26,10 @@ import checkPermission from '@/utils/permission'
 import initData from '@/mixins/initData'
 import { del, add, get } from '@/api/yxSystemConfig'
 import eForm from './form'
-import picUpload from '@/components/pic-upload'
+import fileUpload from '@/components/file-upload'
 import { Message } from 'element-ui'
 export default {
-  components: { eForm, picUpload },
+  components: { eForm, fileUpload },
   mixins: [initData],
   data() {
     return {
@@ -36,7 +37,8 @@ export default {
       form: {
         wxpay_appId: '',
         wxpay_mchId: '',
-        wxpay_mchKey: ''
+        wxpay_mchKey: '',
+        wxpay_keyPath: ''
       },
       rules: {
       }