Browse Source

Merge branch 'deploy' of chelingzhu-web/zxyj-admin-html into master

lilei 4 năm trước cách đây
mục cha
commit
19cb2f623f

+ 1 - 1
src/components/UploadFile/index.vue

@@ -65,7 +65,7 @@ export default {
       type: Object,
       default: function () {
         return {
-          savePathType: 'ali' // 存储类型 local 服务器本地,ali 阿里云
+          savePathType: 'web' // 存储类型 local 服务器本地,ali 阿里云, web
         }
       }
     }

+ 1 - 1
src/components/WEeditor/editor.vue

@@ -93,7 +93,7 @@
       this.editor.customConfig.uploadImgServer = process.env.VUE_APP_API_BASE_URL + '/upload'
       this.editor.customConfig.uploadFileName = 'file'
       this.editor.customConfig.uploadImgParams = {
-          savePathType: 'ali'
+          savePathType: 'web'
       }
       this.editor.customConfig.uploadImgHooks = {
           before: function (xhr, editor, files) {

+ 8 - 7
src/views/businessManage/partnerManage/partnerManage.vue

@@ -237,12 +237,13 @@ export default {
           light: '#ffffff'
         }
       }
-	  const url = 'officialPartnerNo=' + item.officialPartnerNo + '&codeType=hexiao'
-	  _this.shName = item.name
+      const url = 'officialPartnerNo=' + item.encryptedPartnerNo + '&codeType=hexiao'
+      _this.shName = item.name
+      console.log(item.encryptedPartnerNo)
       if (url) {
         QRCode.toDataURL(url, opts, function (err, url) {
           _this.qrCode = url
-		  _this.isQrCodeModal = true
+          _this.isQrCodeModal = true
         })
       }
     },
@@ -259,10 +260,10 @@ export default {
     //  },
     //  下载二维码
     downloadCode (item) {
-	  const link = document.createElement('a')
-	  link.href = this.qrCode
-	  link.download = this.shName + '.png'
-	  link.click()
+      const link = document.createElement('a')
+      link.href = this.qrCode
+      link.download = this.shName + '.png'
+      link.click()
     }
   }
 }

+ 1 - 1
src/views/businessManage/userManage/userManage.vue

@@ -59,7 +59,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="userList-openModal" v-hasPermission="'B_userManage_add'">新增</a-button>
+      <a-button type="primary" icon="plus" @click="openModal" id="userList-openModal" v-hasPermission="'B_userManage_add'" style="margin-top: 18px;">新增</a-button>
     </div>
 
     <s-table

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.104:8301/gc-admin/',
-        target: 'https://lese.test.sxzxyj.net/gc-admin/',
+        target: 'http://192.168.16.102:8301/gc-admin/',
+        // target: 'https://lese.test.sxzxyj.net/gc-admin/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {