Merge branch 'master' of http://git.qiniu1314.com/cmy/zhuangxiuAdmin

.env.dev

@@ -1,5 +1,5 @@
 # 环境
-VITE_NODE_ENV=production
+VITE_NODE_ENV=development
 
 # 接口前缀
 VITE_API_BASE_PATH=

.env.pro

@@ -20,7 +20,7 @@ VITE_SOURCEMAP=false
 VITE_OUT_DIR=dist-pro
 
 # 标题
-VITE_APP_TITLE=ElementAdmin
+VITE_APP_TITLE=七牛数字
 
 # 是否包分析
 VITE_USE_BUNDLE_ANALYZER=true
@@ -29,7 +29,7 @@ VITE_USE_BUNDLE_ANALYZER=true
 VITE_USE_ALL_ELEMENT_PLUS_STYLE=false
 
 # 是否开启mock
-VITE_USE_MOCK=true
+VITE_USE_MOCK=false
 
 # 是否切割css
 VITE_USE_CSS_SPLIT=true

README.md

@@ -1,4 +1,4 @@
-<div align="center"> <a href="https://github.com/kailong321200875/vue-element-plus-admin"> <img width="100" src="./public/logo.png"> </a> <br> <br>
+<div align="center"> <a href="https://github.com/kailong321200875/vue-element-plus-admin"> <img width="100" src="./public/image/logo.png"> </a> <br> <br>
 
 [![license](https://img.shields.io/github/license/kailong321200875/vue-element-plus-admin.svg)](LICENSE) [![repo-size](https://img.shields.io/github/repo-size/kailong321200875/vue-element-plus-admin.svg)](repo-size) [![last-commit](https://img.shields.io/github/last-commit/kailong321200875/vue-element-plus-admin.svg)](last-commit) [![stars](https://img.shields.io/github/stars/kailong321200875/vue-element-plus-admin.svg)](stars) [![forks](https://img.shields.io/github/forks/kailong321200875/vue-element-plus-admin.svg)](forks) [![release](https://img.shields.io/github/release/kailong321200875/vue-element-plus-admin.svg)](release) [![watchers](https://img.shields.io/github/watchers/kailong321200875/vue-element-plus-admin.svg)](watchers)
 

README.zh-CN.md

@@ -1,4 +1,4 @@
-<div align="center"> <a href="https://github.com/kailong321200875/vue-element-plus-admin"> <img width="100" src="./public/logo.png"> </a> <br> <br>
+<div align="center"> <a href="https://github.com/kailong321200875/vue-element-plus-admin"> <img width="100" src="./public/image/logo.png"> </a> <br> <br>
 
 [![license](https://img.shields.io/github/license/kailong321200875/vue-element-plus-admin.svg)](LICENSE) [![repo-size](https://img.shields.io/github/repo-size/kailong321200875/vue-element-plus-admin.svg)](repo-size) [![last-commit](https://img.shields.io/github/last-commit/kailong321200875/vue-element-plus-admin.svg)](last-commit) [![stars](https://img.shields.io/github/stars/kailong321200875/vue-element-plus-admin.svg)](stars) [![forks](https://img.shields.io/github/forks/kailong321200875/vue-element-plus-admin.svg)](forks) [![release](https://img.shields.io/github/release/kailong321200875/vue-element-plus-admin.svg)](release) [![watchers](https://img.shields.io/github/watchers/kailong321200875/vue-element-plus-admin.svg)](watchers)
 

index.html

@@ -127,7 +127,7 @@
       <div class="app-loading">
         <div class="app-loading-wrap">
           <div class="app-loading-title">
-            <img src="/logo.png" class="app-loading-logo" alt="Logo" />
+            <img src="/image/logo.png" class="app-loading-logo" alt="Logo" />
             <div class="app-loading-title"><%= title %></div>
           </div>
           <div class="app-loading-item">

src/api/system/admin/index.ts

@@ -67,7 +67,11 @@ export const getCity = (params: { pid: number; type: string }): Promise<IRespons
   return request.get({ url: `${REQUEST_BASE}/city`, params })
 }
 export const getMapSearch = (params: mapSearch): Promise<IResponse> => {
-  return request.get({ url: `/qqmap/place/v1/suggestion`, params })
+  let url = `http://apis.map.qq.com/ws/place/v1/suggestion`
+  if (import.meta.env.VITE_NODE_ENV == 'development') {
+    url = `/qqmap/place/v1/suggestion`
+  }
+  return request.get({ url, params })
 }
 export const getConfigKey = (key: string): Promise<IResponse> => {
   return request.get({ url: `${REQUEST_BASE}/sys_config`, params: { key } })

src/components/Editor/src/Editor.vue

@@ -6,9 +6,8 @@ import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
 import { ElMessage } from 'element-plus'
 import { useLocaleStore } from '@/store/modules/locale'
-import { useUserStoreWithOut } from '@/store/modules/user'
 import { REQUEST_BASE } from '@/constants'
-
+import { useUserStoreWithOut } from '@/store/modules/user'
 const userStore = useUserStoreWithOut()
 const localeStore = useLocaleStore()
 
@@ -126,13 +125,6 @@ onBeforeUnmount(() => {
 
 const getEditorRef = async (): Promise<IDomEditor> => {
   await nextTick()
-  // const editor = unref(editorRef.value)
-  // if (!editor) {
-  //   console.error('editorRef is null')
-  //   throw new Error('editorRef is null')
-  // }
-  // const toolbar = DomEditor.getToolbar(editor)
-  // console.log(toolbar)
   return unref(editorRef.value) as IDomEditor
 }
 

src/views/Goods/edit/add.vue

@@ -58,6 +58,52 @@ const attrs_value = reactive<
   ot_price: 0,
   cost: 0
 })
+
+const loadingData = ref(false)
+onMounted(async () => {
+  if (params.type == 'add') {
+    pageTitle.value = '添加商品'
+  } else if (params.type == 'edit') {
+    pageTitle.value = '编辑商品'
+    try {
+      const res = await getProductDetail(params.id)
+      const data = res.data.storeInfo
+      // console.log(data.cate_ids, 'res')
+      formData.id = data.id
+      formData.name = data.name
+      formData.video_open = data.video_open
+      formData.video_link = data.video_link
+      formData.slider_image = data.slider_image
+      formData.image = data.image
+      formData.keyword = data.keyword.split(',')
+      formData.cate_ids = data.cate_ids.map((re) => parseInt(re))
+      formData.postage = data.postage
+      formData.temp_id = data.temp_id
+      formData.unit_name = data.unit_name
+      formData.sales = data.sales
+      formData.ficti = data.ficti
+      formData.spec_type = data.spec_type
+      formData.is_show = data.is_show
+      formData.attrs = data.attrs
+      formData.attrs_value = res.data.productValue.map((e) => e)
+      formData.sort = data.sort
+      formData.description = data.description
+      // 判断是否单规格
+      if (formData.spec_type == 0) {
+        const values = res.data.productValue[0]
+        // console.log(values, 'values')
+        attrs_value.cost = values.cost
+        attrs_value.price = values.price
+        attrs_value.ot_price = values.ot_price
+        attrs_value.stock = values.stock
+        attrs_value.suk = values.suk
+        attrs_value.image = [values.image]
+      }
+    } catch (error) {
+      console.log(error, 'error')
+    }
+  }
+})
 const validateField = (field, errorMessage) => {
   return {
     message: errorMessage,
@@ -214,51 +260,6 @@ const save = async (formEl: FormInstance | undefined) => {
   }
 }
 
-const loadingData = ref(false)
-onMounted(async () => {
-  if (params.type == 'add') {
-    pageTitle.value = '添加商品'
-  } else if (params.type == 'edit') {
-    pageTitle.value = '编辑商品'
-    try {
-      const res = await getProductDetail(params.id)
-      const data = res.data.storeInfo
-      // console.log(data.cate_ids, 'res')
-      formData.id = data.id
-      formData.name = data.name
-      formData.video_open = data.video_open
-      formData.video_link = data.video_link
-      formData.slider_image = data.slider_image
-      formData.image = data.image
-      formData.keyword = data.keyword
-      formData.cate_ids = data.cate_ids.map((re) => parseInt(re))
-      formData.postage = data.postage
-      formData.temp_id = data.temp_id
-      formData.unit_name = data.unit_name
-      formData.sales = data.sales
-      formData.ficti = data.ficti
-      formData.spec_type = data.spec_type
-      formData.is_show = data.is_show
-      formData.attrs = data.attrs
-      formData.attrs_value = res.data.productValue.map((e) => e)
-      formData.sort = data.sort
-      formData.description = data.description
-      // 判断是否单规格
-      if (formData.spec_type == 0) {
-        const values = res.data.productValue[0]
-        // console.log(values, 'values')
-        attrs_value.cost = values.cost
-        attrs_value.price = values.price
-        attrs_value.ot_price = values.ot_price
-        attrs_value.stock = values.stock
-        attrs_value.suk = values.suk
-        attrs_value.image = [values.image]
-      }
-    } catch (error) {
-      console.log(error, 'error')
-    }
-  }
-})
 const backList = () => {
   push('/goods/list')
 }

src/views/Store/list/index.vue

@@ -269,8 +269,8 @@ const save = async () => {
   const write = unref(writeRef)
   const formData = await write?.submit()
   if (formData) {
-    let arr: string[] = []
-    for (let key in formData.slide_images) {
+    const arr: string[] = []
+    for (const key in formData.slide_images) {
       arr.push(formData.slide_images[key] || '')
     }
     const data: any = {

vite.config.ts

@@ -154,11 +154,11 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
           changeOrigin: true
           // rewrite: (path) => path.replace(/^\//, '')
         },
-        '/uploads': {
-          target: 'https://zhuangxiu.qiniu1314.com',
-          changeOrigin: true
-          // rewrite: (path) => path.replace(/^\//, '')
-        },
+        // '/uploads': {
+        //   target: 'https://zhuangxiu.qiniu1314.com',
+        //   changeOrigin: true
+        //   // rewrite: (path) => path.replace(/^\//, '')
+        // },
         '/qqmap': {
           target: 'http://apis.map.qq.com',
           changeOrigin: true,