fix

.env.development

@@ -1,4 +1,5 @@
 # 请注意，所有的环境变量前需要加上VUE_APP_前缀，这是Vue CLI项目的要求
 
 # 设置API地址
-VUE_APP_BASE_API_URL=http://39.164.159.226:8100/
+# VUE_APP_BASE_API_URL=http://39.164.159.226:8100/
+VUE_APP_BASE_API_URL=http://192.168.1.15:8100/

.env.production

@@ -1,2 +1,2 @@
 # 设置API地址
-VUE_APP_BASE_API_URL=http://39.164.159.226:8100/
+VUE_APP_BASE_API_URL=/api/

src/views/admin/product.vue

@@ -162,9 +162,6 @@ let ruleForm = reactive<any>({
   name: '',
   nameContent: '',
   nameFile: [],
-  type: '',
-  typeContent: '',
-  typeFile: [],
 })
 let typeRuleForm = reactive<any>({
   id: 0,

src/views/home/home-activity.vue

@@ -22,12 +22,23 @@
         
         <div class="main-title" >
             {{activityDetails.title}}
-            <el-button @click="handleView" class="returnBtn" type="warning" link>返回首页</el-button>
+            <el-button @click="handleturn" class="returnBtn" type="warning" link>返回首页</el-button>
         </div>
         <div class="main-time">{{activityDetails.createTime.split(' ')[0]}}</div>
         <div class="main-content">
             <img :src="apiUrl+ Object.values(activityDetails.fileInfo)[0]" align="right" width="300" hspace="30" vspace="30">
-            {{activityDetails.content}}
+            <div style="text-indent: 2em;" 
+            v-for="(item,index) in activityDetails.content && activityDetails.content.split('\n')" 
+            :key="index">
+                {{item}}
+            </div>
+        </div>
+        <div class="main-img">
+            <el-row :gutter="20" style="width: 100%;">
+                <el-col :span="6" v-for="(item, index) in imgItemData" :key="index">
+                    <img class="img-item" :src="apiUrl+ Object.values(activityDetails.fileInfo)[0]">
+                </el-col>
+            </el-row>
         </div>
     </div>
 </template>
@@ -35,21 +46,32 @@
 <script setup name="HomeActivity">
     import { ref, onMounted } from 'vue'
     import request from '../../utils/request'
-    const apiUrl = ref('http://39.164.159.226:8100/')
+    const apiUrl = ref(process.env.VUE_APP_BASE_API_URL)
     const detailFlag = ref(false)
     const activityData = ref([])
     const activityDetails = ref({})
+    const imgItemData = ref([])
     onMounted(()=>{
         getList()
     })
     function getList() {
         request.get('/Activity/activity').then((res)=>{
-            res.data.length>0 ? (activityData.value = res.data) : (activityData.value = [])
+            activityData.value = []
+            if (res.data.length>0) {
+                activityData.value = res.data
+                // console.log(Object.values(activityDetails.value.fileInfo));
+                // imgItemData.value = Object.values(activityDetails.fileInfo)
+            }
         })
     }
     function handleView(item) {
         handleturn()
         activityDetails.value = item
+        imgItemData.value = []
+        Object.values(item.fileInfo).forEach((ele)=>{
+            imgItemData.value.push(ele)
+        })
+        console.log(imgItemData.value);
     }
     function handleturn() {
         detailFlag.value = !detailFlag.value
@@ -120,6 +142,17 @@
             width: 100%;
             font-size: 16px;
             line-height: 36px;
+            min-width: 360px;
+
+        }
+        .main-img{
+            width: 100%;
+            margin-top: 30px;
+            .img-item{
+                width: 100%;
+
+            }
+
         }
     }
 </style>

src/views/home/home-intro.vue

@@ -11,14 +11,7 @@
                 <div class="contetn-title">
                     <div class="titel-text1">{{introData.name}}</div>
                 </div>
-                <div class="content-text">
-                    <p v-html="introData.content">
-                        
-                    </p>
-                    
-
-
-                </div>
+                <div class="content-text" v-for="(item,index) in introData.content && introData.content.split('\n')" :key="index">{{item}}</div>
             </div>
             
         </div>
@@ -29,7 +22,7 @@
 <script setup name="HomeIntro">
     import { ref,onMounted } from 'vue' 
     import request from '../../utils/request'
-    const apiUrl = ref('http://39.164.159.226:8100/')
+    const apiUrl = ref(process.env.VUE_APP_BASE_API_URL)
     const resultUrl = ref('')
     const introData = ref({})
     onMounted(()=>{

src/views/home/home-longhair.vue

@@ -11,9 +11,6 @@
                     <div class="textTitle">
                         {{item.name}}
                     </div>
-                    <div class="textInfo">
-                        {{item.content}}
-                    </div>
                 </div>
             </el-col>
         </el-row>
@@ -39,8 +36,10 @@
                             <div class="titel-text1">{{productDetails.name}}</div>
                             <div class="titel-text2">{{productDetails.dateOfBirth}} </div>
                         </div>
-                        <div class="content-text">
-                            {{productDetails.content}}
+                        <div class="content-text" style="text-indent: 2em;" 
+                        v-for="(item,index) in productDetails.content && productDetails.content.split('\n')" 
+                        :key="index">
+                            {{item}}
                         </div>
                     </el-col>
                     <el-col :span="8" class="item-image">
@@ -54,7 +53,7 @@
 <script setup name="homeLonghair">
     import { ref, onMounted } from 'vue'
     import request from '../../utils/request'
-    const apiUrl = ref('http://39.164.159.226:8100/')
+    const apiUrl = ref(process.env.VUE_APP_BASE_API_URL)
     const detailFlag = ref(false)
     const productData = ref([])
     const productDataEnd = ref([])

src/views/home/home-main.vue

@@ -34,8 +34,10 @@
         <div class="main-content">
             <el-row :gutter="50" style="width: 100%;">
                 <el-col :span="16" class="item-content">
-                    <div class="content-text">
-                        {{mainDetails.content}}
+                    <div class="content-text" style="text-indent: 2em;" 
+                    v-for="(item,index) in mainDetails.content && mainDetails.content.split('\n')" 
+                    :key="index">
+                        {{item}}
                     </div>
                 </el-col>
                 <el-col :span="8" class="item-image">
@@ -49,7 +51,7 @@
 <script setup name="HomeMain">
     import { ref, onMounted } from 'vue'
     import request from '../../utils/request'
-    const apiUrl = ref('http://39.164.159.226:8100/')
+    const apiUrl = ref(process.env.VUE_APP_BASE_API_URL)
     const detailFlag = ref(false)
     const mainData = ref([])
     const mainDetails = ref({})

src/views/home/home-product.vue

@@ -14,14 +14,17 @@
                         {{productData.nameContent}}
                     </div>
                 </div>
-                <div class="item-model">
-                    <div class="model-title">{{productData.type}}</div>
-                    <div class="model-content">
-                        {{productData.typeContent}}
+                <div class="item-model" v-for="(item, index) in typeData" :key="index">
+                    <div class="model-title">{{item.type}}</div>
+                    <div class="model-content" style="text-indent: 2em;" 
+                        v-for="(itemChild,index) in item.typeContent && item.typeContent.split('\n')" 
+                        :key="index">
+                            {{itemChild}}
                     </div>
+
                     <div class="model-image">
                         <el-row :gutter="50">
-                            <el-col :span="12"  v-for="(val, key,index) in productData.typeFileInfo" :key="index">
+                            <el-col :span="12" v-for="(val, key,index) in item.typeFileInfo" :key="index">
                                 <el-image style="width: 100%; margin: 15px;" :src="apiUrl+val" fit="fill" />
                             </el-col>
                         </el-row>
@@ -40,6 +43,7 @@
     const route = useRoute()
     const apiUrl = process.env.VUE_APP_BASE_API_URL
     const productData = ref([])
+    const typeData = ref([])
     const productId = ref('')
     onBeforeRouteUpdate((res) => {
         productId.value = res.query.id
@@ -54,6 +58,16 @@
         request.get('/Product/product/'+productId.value).then((res)=>{
             if (res.data) {
                 productData.value = res.data
+                getType()
+            }
+        })
+    }
+    function getType() {
+        // /Type/type?productId=1
+        request.get('/Type/type?productId='+productId.value).then((res)=>{
+            if (res.data) {
+                typeData.value = res.data
+                console.log(typeData.value);
             }
         })
     }