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

src/api/basicdata/basicdataBrandCategory.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/logpm-basicdata/basicdataBrandCategory/list',
+    url: '/api/logpm-basicdata/basicdataBrandCategory/page',
     method: 'get',
     params: {
       ...params,

src/option/basicdata/ThreePartyMallManagement.js

@@ -69,6 +69,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'createTime',
+    label: '创建时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: '',
     label: '操作',

src/option/basicdata/basicdataBrandCategory.js

@@ -186,6 +186,17 @@ export default {
       ]
     },
     {
+      label: "品类名称",
+      prop: "name",
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      addDisplay: true,
+      editDisplay: true,
+      viewDisplay: true,
+      hide: true,
       label: "品类名称",
       prop: "categoryId",
       type: 'tree',
@@ -213,7 +224,7 @@ export default {
 
         }
         if (level == 0) {
-          axios.get(`/api/logpm-basicdata/basicdataCategory/lazy-tree?parentId=1`).then(res => {
+          axios.get(`/api/logpm-basicdata/basicdataCategory/lazy-tree?parentId=1`).then(res => {  
             list = res.data.data;
             callback()
           })
@@ -238,7 +249,6 @@ export default {
           callback()
         }
       }
-
     },
     {
       label: "标识",

src/page/login/index.vue

@@ -14,9 +14,9 @@
           <img src="https://www.v6g.cn/IMAGE/left.png" />
         </div> -->
         <!-- 本地图片 -->
-        <!-- <img src="../../../public/img/indexbg.png" /> -->
+        <img src="../../../public/img/indexbg.png" />
         <!-- 线上图片 -->
-        <img src="https://www.v6g.cn/IMAGE/indexbg.png" />
+        <!-- <img src="https://www.v6g.cn/IMAGE/indexbg.png" /> -->
         <!-- <p class="title">{{ $t('login.info') }}</p> -->
 
         <!-- <img class="img" src="/img/logo.png" alt="" /> -->
@@ -241,18 +241,17 @@ export default {
 }
 
 
-.login-left {
+// .login-left {
   /* 新增 */
-    box-sizing: border-box !important;
-    border: 1px solid #ebebeb !important;
-    background: #ffffff5c;
-    box-shadow: -1px -5px 8px #00000003;
-    backdrop-filter: blur(6px);
+    // box-sizing: border-box !important;
+    // border: 1px solid #ebebeb !important;
+    // background: #ffffff5c;
+    // box-shadow: -1px -5px 8px #00000003;
+    // backdrop-filter: blur(6px);
+  // img {
+  //   width: 78%;
+  //   height: 100%;
+  // }
 
-  img {
-    width: 78%;
-    height: 100%;
-  }
-
-}
+// }
 </style>

src/page/login/userlogin.vue

@@ -300,7 +300,7 @@ export default {
         if (data.success && data.data.tenantId) {
           this.tenantMode = false;
           this.loginForm.tenantId = data.data.tenantId;
-          // this.$parent.$refs.login.style.backgroundImage = `url(${data.data.backgroundUrl})`;//背景图
+          this.$parent.$refs.login.style.backgroundImage = `url(${data.data.backgroundUrl})`;//背景图
         }
       });
     },

src/styles/login.scss

@@ -5,15 +5,15 @@
   width: 100%;
   height: 100%;
   margin: 0 auto;
-  // background-image: url('/img/bg/bg.jpg');
-  background-image: url('https://www.v6g.cn/IMAGE/kg2.png');
+  background-image: url('/img/bg/bg.jpg');
+  // background-image: url('https://www.v6g.cn/IMAGE/kg2.png');
   background-size: 100% 100%;
 }
 
 .login-weaper {
   margin: 0 auto;
   width: 1000px;
-  // box-shadow: 1px 1px 4px #d9d9d9;
+  box-shadow: 1px 1px 4px #d9d9d9;
 
   .el-input-group__append {
     border: none;

src/views/basicdata/brand/basicClient.vue

@@ -255,7 +255,7 @@
                 </template>
               </el-cascader>
             </el-form-item>
-            <el-form-item label="详细地址" prop="detailedly">
+            <el-form-item label="详细地址">
               <el-input v-model.trim="form.detailedly" placeholder="请填写详细地址" style="width: 100%" />
             </el-form-item>
             <el-form-item label="默认付款方式" prop="defaultPaymentMethods">
@@ -1876,6 +1876,6 @@ export default {
   position: absolute;
 }
 :deep(.el-select__wrapper){
-  width: 120px;
+  width: 100%;
 }
 </style>

src/views/basicdata/brand/basicdataBrandCategory.vue

@@ -98,6 +98,7 @@
         });
       },
       rowUpdate(row, index, done, loading) {
+        console.log(row,'row');
         update(row).then(() => {
           this.onLoad(this.page);
           this.$message({
@@ -156,8 +157,8 @@
             categoryId,
         } = this.query;
         let values = {
-            brandId_like: brandId,
-            categoryId_like: categoryId,
+            brandName: brandId,
+            name: categoryId,
         };
         this.$confirm("是否导出数据?", "提示", {
           confirmButtonText: "确定",
@@ -214,15 +215,18 @@
         } = this.query;
 
         let values = {
-            brandId_like: brandId,
-            categoryId_like: categoryId,
+          brandName: brandId,
+          name: categoryId,
         };
 
         getList(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;
+   
           this.page.total = data.total;
           this.data = data.records;
           this.loading = false;
+          console.log(this.data,'');
+          
           this.selectionClear();
         });
       }