Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/config/website.js

@@ -52,7 +52,7 @@ export default {
   // 第三方系统授权地址
   authUrl: 'http://localhost/blade-auth/oauth/render',
   // 报表设计器地址(cloud端口为8108,boot端口为80)
-  reportUrl: 'http://192.168.2.101:8108/ureport',
+  reportUrl: 'http://8.137.14.82:8108/ureport',
   // 单点登录系统认证(blade-auth服务的地)
   ssoUrl: 'http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=',
   // 单点登录回调地址(Saber服务的登录界面地址)

src/page/login/userlogin.vue

@@ -107,15 +107,15 @@ export default {
       tenantMode: this.website.tenantMode,
       loginForm: {
         //租户ID
-        tenantId: '000000',
+        tenantId: '627683',
         //部门ID
         deptId: '',
         //角色ID
         roleId: '',
         //用户名
-        username: 'admin',
+        username: '',
         //密码
-        password: 'admin',
+        password: '',
         //账号类型
         type: 'account',
         //验证码的值

src/router/views/index.js

@@ -1047,18 +1047,18 @@ export default [
   //     },
   //   ],
   // },
-  {
-    path: '/distribution/signfor/devtmp',
-    component: Layout,
-    redirect: '/distribution/signfor/devtmp',
-    children: [
-      {
-        path: '/distribution/signfor/devtmp',
-        name: '签收明细重构',
-        component: () => import('@/views/distribution/signfor/devtmp.vue'),
-      },
-    ],
-  },
+  // {
+  //   path: '/distribution/signfor/devtmp',
+  //   component: Layout,
+  //   redirect: '/distribution/signfor/devtmp',
+  //   children: [
+  //     {
+  //       path: '/distribution/signfor/devtmp',
+  //       name: '签收明细重构',
+  //       component: () => import('@/views/distribution/signfor/devtmp.vue'),
+  //     },
+  //   ],
+  // },
   // {
   //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
   //   component: Layout,

src/views/basicdata/brand/basicClient.vue

@@ -995,15 +995,11 @@ export default {
       });
     },
     uploadSuccess(fileList) {
-      console.log('123123123', fileList);
-      // this.form.fileName =
-      // this.$set(row, 'imageCos', fileList);
       if (this.title == '编辑') {
         this.bianji = true;
       }
     },
     handleRemove(file) {
-      console.log('3333333', file);
       let id1 = this.fileList.findIndex(item => {
         if (item.id == file.url) {
           return true;
@@ -1013,7 +1009,6 @@ export default {
       console.log('fileList', this.fileList);
     },
     handleCo(file, fileList) {
-      // console.log('3333333',file, fileList);
       this.showImgViewer = false;
     },
     //文件上传前的一些业务需要的校验
@@ -1031,13 +1026,13 @@ export default {
       }
     },
     handlePreview(file) {
-      console.log('111111', file);
+
       this.imgPreviewUrl[0] = file.response.data.link;
-      // this.imgPreviewUrl[0] = file.url;
-      // this.imgPreviewUrl[0] = this.$api + file.response.data.id
+
       this.showImgViewer = true;
 
       console.log('-=-=sc上传', this.fileList);
+
     },
     handleExceed(files, fileList) {
       this.$message.warning(

vite.config.js

@@ -16,14 +16,12 @@ export default ({ mode, command }) => {
           // hy
           // target: 'http://192.168.10.48:8888',
           // lmy
-          // target: 'http://192.168.10.123:8889', 
-          // caoge
+          // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
-          // cyz
           // target: 'http://192.168.10.75:8777',
           // tjj
-          target: 'http://192.168.10.29:13000',
-          // target: 'http://test.api.huitongys.com',
+          // target: 'http://192.168.10.29:13000',
+          target: 'http://test.api.huitongys.com',
           // target: 'http://h5uapi.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),