Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/infra/file.js

@@ -21,6 +21,7 @@ export function uploadFile(data) {
   return request({
     url: '/infra/file/upload',
     method: 'post',
+    timeout: 60000,
     data: data
   })
 }

src/router/index.js

@@ -4,7 +4,6 @@ import Router from 'vue-router'
 import Layout from '@/layout'
 
 Vue.use(Router)
-
 /**
  * Note: 路由配置项
  *
@@ -256,7 +255,7 @@ export const constantRoutes = [
         path: '/customerCommissionInfo/:dictId(\\d+)/:id(\\d+)?',
         component: (resolve) => require(['@/views/ecw/customerCommissionInfo/index'], resolve),
         name: 'customerCommissionInfo',
-        meta: {title: '佣金设置', icon: '', activeMenu: '/customer/customerCommissionInfo'},
+        meta: {title: '佣金设置', titleEn:'Commission settings', icon: '', activeMenu: '/customer/customerCommissionInfo'},
         props: true,
       },
       {
@@ -264,27 +263,27 @@ export const constantRoutes = [
         component: (resolve) => import('@/views/ecw/customer/edit'),
         props: true,
         name: 'customerEdit',
-        meta: {title: '编辑客户', icon: ''}
+        meta: {title:'编辑客户',titleEn:'Edit Customer', icon: ''}
       },
       {
         path: 'add-edit/:customerId(\\d+)',
         component: (resolve) => import('@/views/ecw/customer/edit'),
         props: true,
         name: 'customerEdit',
-        meta: {title: '新建客户', icon: ''}
+        meta: {title: '新建客户',titleEn:'New customer', icon: ''}
       },{
         path: 'perfect/:customerId(\\d+)',
         component: (resolve) => import('@/views/ecw/customer/edit'),
         props: true,
         name: 'perfect',
-        meta: {title: '完善客户', icon: ''}
+        meta: {title: '完善客户',titleEn:'Perfect customers', icon: ''}
       },
       {
         path: 'query/:customerId(\\d+)',
         component: (resolve) => import('@/views/ecw/customer/query'),
         props: true,
         name: 'customerQuery',
-        meta: {title: '客户详情', icon: '', activeMenu: '/customer/customer'}
+        meta: {title: '客户详情',titleEn:'Customer details', icon: '', activeMenu: '/customer/customer'}
       }
     ]
   },
@@ -299,7 +298,7 @@ export const constantRoutes = [
         component: (resolve) => import('@/views/ecw/order/special'),
         props: true,
         name: 'order-special',
-        meta: {title: '订单特价申请', icon: '', activeMenu: '/order/index'}
+        meta: {title: '订单特价申请',titleEn:'Order special price application', icon: '', activeMenu: '/order/index'}
       },
       /* {
         path: 'discount/:orderItemId(\\d+)',
@@ -342,7 +341,7 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/ecw/order/associatedOrder'],resolve),
         props: true,
         name: 'associatedOrder',
-        meta: {title: '关联订单', icon: '', activeMenu: '/order/associatedOrder',noCache:true,}
+        meta: {title: '关联订单',titleEn:'Associated order', icon: '', activeMenu: '/order/associatedOrder',noCache:true,}
       },
       {
         path: 'add-associated-order/:orderId(\\d+)',
@@ -351,6 +350,7 @@ export const constantRoutes = [
         name:'addAssociatedOrder',
         meta:{
           title:'添加关联订单',
+          titleEn:'Add associated order',
           icon:'',
           activeMenu:'/order/addAssociatedOrder',
           noCache:true,
@@ -363,6 +363,7 @@ export const constantRoutes = [
         props: true,
         meta: {
           title: '订单互斥',
+          titleEn:'Orders are mutually exclusive',
           icon:'',
           activeMenu: '/order/mutexOrder',
           noCache: true,
@@ -374,6 +375,7 @@ export const constantRoutes = [
         props: true,
         meta:{
           title: '未加入互斥',
+          titleEn:'Mutual exclusion is not added',
           icon:'',
           activeMenu: '/order/notMutexOrder',
           noCache: true,
@@ -386,6 +388,7 @@ export const constantRoutes = [
         props: true,
         meta:{
           title:'调拨出仓',
+          titleEn:'Transfer out of warehouse',
           icon:'',
           activeMenu:'order/transferWarehousing',
           noCache:true,
@@ -398,6 +401,7 @@ export const constantRoutes = [
         props: true,
         meta:{
           title:'调拨到仓',
+          titleEn:'Transfer to warehouse',
           icon:'',
           activeMenu:'order/transferToWarehouse',
           noCache:true,

src/views/system/version/index.vue

@@ -101,7 +101,7 @@
         </el-form-item>
 
         <el-form-item v-if="linkType==2">
-          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+          <el-upload action="#" :http-request="requestUpload" :show-file-list="true" :before-upload="beforeUpload">
             <el-button size="small">{{ $t('上传') }}<i class="el-icon-upload el-icon--right"></i>
             </el-button>
           </el-upload>
@@ -223,6 +223,7 @@ export default {
     },
     /** 表单重置 */
     reset() {
+      this.linkType = 1;
       this.form = {
         id: undefined,
         appUrl: undefined,
@@ -230,7 +231,6 @@ export default {
         appVersion: undefined,
         versionCode: undefined,
         forceUpdate: undefined,
-        linkType:1,
         desp: undefined,
       };
       this.resetForm("form");
@@ -251,6 +251,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      // console.log(this.form);
       this.title = "添加app版本管理";
     },
     /** 修改按钮操作 */
@@ -259,7 +260,7 @@ export default {
       const id = row.id;
       getVersion(id).then(response => {
         this.form = response.data;
-        this.form.linkType = 1;
+        this.linkType = 1;
         this.open = true;
         this.title = "修改app版本管理";
       });
@@ -308,8 +309,9 @@ export default {
       // } else {
         //上传
         let formData = new FormData();
+        // console.log(file);
         formData.append("file", file);
-        formData.append("path", this.uuid());
+        formData.append("path", this.uuid() + "/" + file.name);
         uploadFile(formData).then(response => {
           this.$set(this.form, 'appUrl', response.data);
           // this.form.img = response.data;