ソースを参照

fix(bugs): xiugaizhuti

tangning 3 年 前
コミット
08db5ec6d9

+ 1 - 0
src/api/product/model.ts

@@ -13,6 +13,7 @@ export interface addCategoryParams {
   parentId?: string;
   parentId?: string;
   wapBannerUrl?: string;
   wapBannerUrl?: string;
   sortOrder?: number;
   sortOrder?: number;
+  show?: number;
 }
 }
 export interface OrderListItem {
 export interface OrderListItem {
   id: number;
   id: number;

+ 6 - 4
src/views/product/drawer.data.ts

@@ -11,12 +11,12 @@ import { BrandListApi } from '/@/api/order/list';
 export const formSchema: FormSchema[] = [
 export const formSchema: FormSchema[] = [
   {
   {
     field: 'categoryId',
     field: 'categoryId',
-    label: '商品分类',
+    label: '商品分类dd',
     component: 'ApiTreeSelect',
     component: 'ApiTreeSelect',
     required: true,
     required: true,
     componentProps: {
     componentProps: {
       api: async () => {
       api: async () => {
-        const res = await categoryApi();
+        const res = await categoryApi({ show: 1 });
         const treeData = makeTree(res);
         const treeData = makeTree(res);
         return treeData;
         return treeData;
       },
       },
@@ -171,7 +171,8 @@ export const formSchema: FormSchema[] = [
     },
     },
     componentProps: {
     componentProps: {
       api: uploadApi,
       api: uploadApi,
-      maxNumber: 1,
+      maxSize: 5,
+      maxNumber: 5,
       afterFetch: function (data) {
       afterFetch: function (data) {
         Reflect.set(data, 'url', data.message);
         Reflect.set(data, 'url', data.message);
         return data;
         return data;
@@ -189,7 +190,8 @@ export const formSchema: FormSchema[] = [
     rules: [{ required: true, message: '请选择上传文件' }],
     rules: [{ required: true, message: '请选择上传文件' }],
     componentProps: {
     componentProps: {
       api: uploadApi,
       api: uploadApi,
-      maxNumber: 5,
+      maxSize: 5,
+      maxNumber: 1,
       afterFetch: function (data) {
       afterFetch: function (data) {
         Reflect.set(data, 'url', data.message);
         Reflect.set(data, 'url', data.message);
         console.log('setFieldsValue');
         console.log('setFieldsValue');

+ 4 - 2
src/views/product/productDrawer.vue

@@ -219,7 +219,9 @@
             isOnSale: res.isOnSale === 1,
             isOnSale: res.isOnSale === 1,
             listPicUrl:
             listPicUrl:
               res.listPicUrl && res.listPicUrl.split('#$#').map((ele) => ele.split('?')[0]),
               res.listPicUrl && res.listPicUrl.split('#$#').map((ele) => ele.split('?')[0]),
-            primaryPicUrl: res.primaryPicUrl && [encodeURI(res.primaryPicUrl.split('?')[0])],
+            primaryPicUrl:
+              res.primaryPicUrl && res.primaryPicUrl.split('#$#').map((ele) => ele.split('?')[0]),
+            // primaryPicUrl: res.primaryPicUrl && [encodeURI(res.primaryPicUrl.split('?')[0])],
             steamRoom: data.record?.steamRoom?.name,
             steamRoom: data.record?.steamRoom?.name,
           });
           });
         }
         }
@@ -279,7 +281,7 @@
           }
           }
           let subData = await requresApi({
           let subData = await requresApi({
             ...apiData,
             ...apiData,
-            primaryPicUrl: apiData.primaryPicUrl[0],
+            primaryPicUrl: apiData.primaryPicUrl.join('#$#'),
             listPicUrl: apiData.listPicUrl.join('#$#'),
             listPicUrl: apiData.listPicUrl.join('#$#'),
           });
           });
           console.log('setFieldsValue', subData);
           console.log('setFieldsValue', subData);

+ 8 - 7
src/views/scenes/liveDrawer.vue

@@ -232,9 +232,9 @@
             isLeaf: (record) => {
             isLeaf: (record) => {
               return !(record.levelType < 3);
               return !(record.levelType < 3);
             },
             },
-            onChange: (data, a, b, c, d, e, f) => {
+            onChange: (data) => {
               try {
               try {
-                console.log('data', data, 'a,b,c', a, b, c, d, e, f);
+                console.log('data', data);
                 let location: string[] = data;
                 let location: string[] = data;
                 // [a,b,c].map(ele => {
                 // [a,b,c].map(ele => {
                 //   return ele && ele.code
                 //   return ele && ele.code
@@ -408,19 +408,20 @@
               setDAta.province = ssqlist[0];
               setDAta.province = ssqlist[0];
               setDAta.city = ssqlist[1];
               setDAta.city = ssqlist[1];
               setDAta.district = ssqlist[2];
               setDAta.district = ssqlist[2];
-              setDAta.address = ssq[2];
+              setDAta.address = ssq[1];
               setDAta.location = ssqlist;
               setDAta.location = ssqlist;
               setDAta.picList = res.picList.split('#$#');
               setDAta.picList = res.picList.split('#$#');
               setDAta.appListPicUrl = [res.appListPicUrl];
               setDAta.appListPicUrl = [res.appListPicUrl];
               setDAta.introduceVideo = [res.introduceVideo];
               setDAta.introduceVideo = [res.introduceVideo];
-              defaultAddress.address = ssq[2];
+              defaultAddress.address = ssq[1];
               defaultAddress.province = ssqlist[0];
               defaultAddress.province = ssqlist[0];
               defaultAddress.city = ssqlist[1];
               defaultAddress.city = ssqlist[1];
               defaultAddress.district = ssqlist[2];
               defaultAddress.district = ssqlist[2];
               defaultAddress.location = ssqlist;
               defaultAddress.location = ssqlist;
+              defaultAddress.lng = res.longitude;
+              defaultAddress.lat = res.latitude;
               detailAddr.value = ssq[2];
               detailAddr.value = ssq[2];
             } catch (error) {}
             } catch (error) {}
-            console.log('defaultAddress', defaultAddress);
             myData.introduceVideoCover = res.introduceVideoCover;
             myData.introduceVideoCover = res.introduceVideoCover;
             myData.sceneUrl = res.sceneUrl;
             myData.sceneUrl = res.sceneUrl;
             await setFieldsValue({
             await setFieldsValue({
@@ -446,10 +447,10 @@
         // const geocoder = new AMap.Geocoder({});
         // const geocoder = new AMap.Geocoder({});
 
 
         const AMap = (window as any).AMap;
         const AMap = (window as any).AMap;
-
+        let center = [defaultAddress.lng, defaultAddress.lat];
         map = new AMap.Map(wrapEl, {
         map = new AMap.Map(wrapEl, {
           zoom: 18,
           zoom: 18,
-          center: [120.262337, 30.178285],
+          center: center,
           viewMode: '3D',
           viewMode: '3D',
           resizeEnable: true,
           resizeEnable: true,
           floorControl: true,
           floorControl: true,