ymy hai 1 ano
pai
achega
1338cd0a75

+ 3 - 2
src/benyun/utils/request.ts

@@ -81,7 +81,8 @@ service.interceptors.response.use((res:any) => {
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
+    let msg = errorCode[code] || res.data.msg || errorCode['default']
+    msg = msg && msg.length > 50 ? '系统异常' : msg;
     // 二进制数据则直接返回
     if(res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer'){
       return res.data
@@ -121,7 +122,7 @@ service.interceptors.response.use((res:any) => {
     }
   },
   (error:any) => {
-    console.log('err' + error)
+    // console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "后端接口连接异常";

+ 5 - 5
src/router/index.ts

@@ -19,11 +19,11 @@ export const constantRoutes: Array<any> = [
   //   // which is lazy-loaded when the route is visited.
   //   component: () => import(/* webpackChunkName: "about" */ '../views/AboutView.vue')
   // },
-  {
-    path: '/login',
-    component: () => import('../views/login.vue'),
-    hidden: true
-  },
+  // {
+  //   path: '/login',
+  //   component: () => import('../views/login.vue'),
+  //   hidden: true
+  // },
   // {
   //   path: '/register',
   //   component: () => import('@/views/register.vue'),

+ 1 - 1
src/views/oms/B2BOrder/components/batchbyOneModal.vue

@@ -36,7 +36,7 @@
         </div> -->
       </div>
       <div class="btn-box">
-        <div class="send-btn" @click="nextBtn" :class="{'stopBtn':stopHandle}" v-if="data.length > 1">确认,下一单</div>
+        <div class="send-btn" @click="nextBtn" :class="{'stopBtn':stopHandle}" v-if="data.length > 1">{{currentOrder + 1 == data.length ? '确认' : '确认,下一单'}}</div>
         <div class="send-btn" @click="btn" :class="{'stopBtn':stopHandle}">一键发货</div>
       </div>
       

+ 1 - 1
src/views/oms/B2BOrder/components/deliveryGoodsInfo.vue

@@ -202,7 +202,7 @@ export default class DeliveryGoodsInfo extends Vue {
         // }],
         tmsBusinessMan:[
           { required: true, message: '业务员不能为空!', trigger: 'blur' },
-          { min: 0, max: 5, message: '业务员名字不能超过10个字符!', trigger: 'blur' }
+          { min: 0, max: 10, message: '业务员名字不能超过10个字符!', trigger: 'blur' }
         ],
         tmsBusinessPhone:[{
           required: true, message: '业务员手机不能为空!', trigger: 'blur'