Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

official_frontend/src/router/index.js

@@ -142,6 +142,19 @@ export const constantRoutes = [
     ]
   },
 
+  {
+    path: '/vipProduct',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: 'vipProduct',
+        component: () => import('@/views/vipproduct/vip'),
+        meta: { title: '会员产品', icon: 'vip' }
+      }
+    ]
+  },
+
   {
     path: '/comment',
     component: Layout,

official_frontend/src/views/product/product.vue

@@ -10,7 +10,7 @@
                 </template>
             </el-table-column>
             <el-table-column prop="title" label="产品名称" width="150"></el-table-column>
-            <el-table-column prop="introduction" label="产品类型">
+            <el-table-column prop="introduction" label="产品类型" width="150">
                 <template slot-scope="scope">
                     <span v-if="scope.row.type == 0">塑料产品</span>
                     <span v-else-if="scope.row.type == 1">物联网产品</span>
@@ -23,7 +23,7 @@
                 </template>
             </el-table-column>
             <el-table-column prop="introduction" label="产品描述"></el-table-column>
-            <el-table-column prop="address" label="产品地址" width="300"></el-table-column>
+            <!-- <el-table-column prop="address" label="产品地址" width="300"></el-table-column> -->
             <el-table-column label="操作" width="180">
                 <template slot-scope="scope">
                     <el-button size="small" @click="openDialog(true, scope.$index)" :loading="loading">编辑</el-button>
@@ -52,9 +52,9 @@
                 <el-form-item label="产品描述" prop="introduction">
                     <el-input v-model="cooperationsForm.introduction" placeholder="请输入产品描述" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="产品地址" prop="type">
+                <!-- <el-form-item label="产品地址" prop="type">
                     <el-input v-model="cooperationsForm.address" placeholder="请输入产品地址" clearable></el-input>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <el-upload ref="upload" action="customize" :http-request="uploadDiscardFile" :limit="1" :before-remove="beforeRemove">
                         <el-button size="small" type="primary" :loading="loading">上传一张图片</el-button>
@@ -89,7 +89,7 @@
                 rules: {
                     title: [{ required: true, message: "请输入产品名称", trigger: "blur" }],
                     introduction: [{ required: true, message: "请输入产品描述", trigger: "blur"}],
-                    address: [{ required: true, message: "请输入产品地址", trigger: "blur"}],
+                    // address: [{ required: true, message: "请输入产品地址", trigger: "blur"}],
                     type: [{ required: true, message: "请选择产品类型", trigger: "change" }]
                 }
             };

official_frontend/src/views/vipproduct/vip.vue

@@ -0,0 +1,258 @@
+<template>
+    <div class="app-container">
+        <el-button size="small" type="primary" @click="openDialog(false, null)" :loading="loading">添加</el-button>
+        <el-table :data="cooperations" style="width: 100%">
+            <el-table-column type="index" width="50"></el-table-column>
+            <el-table-column label="产品图片" width="200">
+                <template slot-scope="scope">
+                    <el-image :src="scope.row.imageUrl"></el-image>
+                    <!--  style="width: 200px; height: 200px" -->
+                </template>
+            </el-table-column>
+            <el-table-column prop="title" label="产品名称" width="150"></el-table-column>
+            <!-- <el-table-column prop="introduction" label="产品类型">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.type == 0">塑料产品</span>
+                    <span v-else-if="scope.row.type == 1">物联网产品</span>
+                    <span v-else-if="scope.row.type == 2">成品</span>
+                    <span v-else-if="scope.row.type == 3">3D打印及检测服务</span>
+                    <span v-else-if="scope.row.type == 4">模具和加工设备能力</span>
+                    <span v-else-if="scope.row.type == 5">专利和政府政策服务</span>
+                    <span v-else-if="scope.row.type == 6">融资服务</span>
+                    <span v-else>未知</span>
+                </template>
+            </el-table-column> -->
+            <el-table-column prop="introduction" label="产品描述"></el-table-column>
+            <el-table-column prop="address" label="产品地址" width="300"></el-table-column>
+            <el-table-column label="操作" width="180">
+                <template slot-scope="scope">
+                    <el-button size="small" @click="openDialog(true, scope.$index)" :loading="loading">编辑</el-button>
+                    <el-button size="small" type="danger" @click="deleteCooperation(scope.row.id)" :loading="loading">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 添加和编辑的dialog -->
+        <el-dialog title="会员产品" :visible.sync="addDialogVisible" width="500px">
+            <el-form ref="form" :model="cooperationsForm" :rules="rules" label-width="80px">
+                <el-form-item label="产品名称" prop="title">
+                    <el-input v-model="cooperationsForm.title" placeholder="请输入产品名称" clearable></el-input>
+                </el-form-item>
+                <!-- <el-form-item label="产品类型" prop="type">
+                    <el-select v-model="cooperationsForm.type" placeholder="请选择产品类型" style="width:380px">
+                        <el-option label="塑料产品" :value="0"></el-option>
+                        <el-option label="物联网产品" :value="1"></el-option>
+                        <el-option label="成品" :value="2"></el-option>
+                        <el-option label="3D打印及检测服务" :value="3"></el-option>
+                        <el-option label="模具和加工设备能力" :value="4"></el-option>
+                        <el-option label="专利和政府政策服务" :value="5"></el-option>
+                        <el-option label="融资服务" :value="6"></el-option>
+                    </el-select>
+                </el-form-item> -->
+                <el-form-item label="产品描述" prop="introduction">
+                    <el-input v-model="cooperationsForm.introduction" placeholder="请输入产品描述" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="产品网址" prop="address">
+                    <el-input v-model="cooperationsForm.address" placeholder="请输入产品网址" clearable></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-upload ref="upload" action="customize" :http-request="uploadDiscardFile" :limit="1" :before-remove="beforeRemove">
+                        <el-button size="small" type="primary" :loading="loading">上传一张图片</el-button>
+                    </el-upload>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="addDialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="addCooperation()" :loading="loading">提交</el-button>
+            </span>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    import request from "@/utils/request";
+    export default {
+        data() {
+            return {
+                editing: false,
+                loading: false,
+                addDialogVisible: false,
+                cooperations: [],
+                cooperationsForm: {
+                    id: null,
+                    title: null,
+                    introduction: null,
+                    // type: null,
+                    address: null,
+                    image: null
+                },
+                rules: {
+                    title: [{ required: true, message: "请输入产品名称", trigger: "blur" }],
+                    introduction: [{ required: true, message: "请输入产品描述", trigger: "blur"}],
+                    address: [{ required: true, message: "请输入产品网址", trigger: "blur"}],
+                    // type: [{ required: true, message: "请选择产品类型", trigger: "change" }]
+                }
+            };
+        },
+        methods: {
+            //打开对话框
+            openDialog(isEdit, index) {
+                this.editing = isEdit;
+                if (this.editing) {
+                    this.cooperationsForm.id = this.cooperations[index].id;
+                    this.cooperationsForm.title = this.cooperations[index].title;
+                    this.cooperationsForm.introduction = this.cooperations[index].introduction;
+                    // this.cooperationsForm.type = this.cooperations[index].type;
+                    this.cooperationsForm.address = this.cooperations[index].address;
+                    this.cooperationsForm.image = null;
+                } else {
+                    this.cooperationsForm.id = null;
+                    this.cooperationsForm.title = "";
+                    this.cooperationsForm.introduction = "";
+                    // this.cooperationsForm.type = 0;
+                    this.cooperationsForm.address = "";
+                    this.cooperationsForm.image = null;
+                }
+                this.addDialogVisible = true;
+            },
+
+            //获取合作信息
+            getCooperations() {
+                this.loading = true;
+                request({
+                    url: "/vip-products/list",
+                    method: "post",
+                    params: {pageIndex:1,pageSize: 9999999}
+                })
+                .then(response => {
+                    this.cooperations = response.data.records;
+                    this.loading = false;
+                })
+                .catch(error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                    this.loading = false;
+                });
+            },
+
+            //删除合作信息
+            deleteCooperation(id) {
+                request({
+                    url: "/vip-products/delete",
+                    method: "post",
+                    params: { id: id }
+                })
+                .then(response => {
+                    this.$message({
+                        message: "删除成功",
+                        type: "success"
+                    });
+                    this.getCooperations();
+                    this.addDialogVisible = false;
+                    this.loading = false;
+                })
+                .catch(error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                    this.loading = false;
+                });
+            },
+
+            //添加/编辑合作信息
+            addCooperation() {
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+                        this.loading = true;
+                        var form = new FormData();
+                        form.append("title", this.cooperationsForm.title);
+                        form.append("introduction", this.cooperationsForm.introduction);
+                        // form.append("type", this.cooperationsForm.type);
+                        form.append("address", this.cooperationsForm.address);
+                        //新增记录 并且 没有图片时
+                        if (this.cooperationsForm.image == null && this.editing == false) {
+                            //如果没上传文件的话
+                            this.loading =false;
+                            this.$message({
+                                message: "尚未上传图片",
+                                type: "error"
+                            });
+                            return;
+                            //有图片时
+                        } else if (this.cooperationsForm.image != null) {
+                            form.append("file", this.cooperationsForm.image);
+                        }
+                        if (this.cooperationsForm.id != null) {
+                            form.append("id", this.cooperationsForm.id);
+                        }
+                        request({
+                            url: "/vip-products/insertOrUpdate",
+                            method: "post",
+                            data: form
+                        })
+                        .then(response => {
+                            this.$refs.upload.clearFiles();
+                            this.getCooperations();
+                            this.addDialogVisible = false;
+                            this.loading = false;
+                            this.$message({
+                                message: "添加成功",
+                                type: "success"
+                            });
+                        })
+                        .catch(error => {
+                            this.$message({
+                                message: error,
+                                type: "error"
+                            });
+                            this.loading = false;
+                        });
+                    }
+                });
+            },
+
+            //切换置顶
+            switchSticky(id) {
+                request({
+                    url: "/cooperations/switchCooperationSticky",
+                    method: "post",
+                    params: { id: id }
+                })
+                .then(response => {
+                    this.$message({
+                        message: "操作成功",
+                        type: "success"
+                    });
+                    this.getCooperations();
+                })
+                .catch(error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
+            },
+
+            //文件上传的部分操作
+            uploadDiscardFile(params) {
+                this.cooperationsForm.image = params.file;
+                return false;
+            },
+
+            //文件上传的移除操作
+            beforeRemove(params) {
+                this.cooperationsForm.image = null;
+            }
+        },
+        mounted() {
+            this.getCooperations();
+        }
+    };
+</script>
+
+<style scoped>
+</style>
+

website/src/main/resources/templates/about.html

@@ -56,7 +56,7 @@
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active">
+                            <li class="nav-item dropdown active aboutUs">
                                 <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -253,7 +253,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -261,14 +261,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/apply.html

@@ -56,8 +56,8 @@
                             <li class="nav-item dropdown menu-large"><a href="product">公司优势 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown dropdown"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item menu-large">
+                            <li class="nav-item dropdown active"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                            <li class="nav-item dropdown menu-large aboutUs">
                                 <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -66,7 +66,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -132,7 +132,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -140,14 +140,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/case.html

@@ -56,7 +56,7 @@
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown active"><a href="case">成功案例 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large">
+                            <li class="nav-item dropdown menu-large aboutUs">
                                 <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -103,7 +103,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -111,14 +111,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/caseDetail.html

@@ -56,7 +56,7 @@
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown active"><a href="case">成功案例 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large">
+                            <li class="nav-item dropdown menu-large aboutUs">
                                 <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -79,6 +79,10 @@
                             <div class="col-md-12">
                                 <div class="heading">
                                     <h2 th:text="${detail.title}"></h2>
+                                    <div class="getMore">
+                                        <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                        <p>了解更多</p>
+                                    </div>
                                 </div>
                                 <p class="lead no-mb" th:text="${detail.introduction}"></p>
                             </div>
@@ -100,7 +104,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -108,14 +112,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/css/custom.css

@@ -11,11 +11,11 @@ footer.main-footer a {
     text-transform:none;
 }
 
-#navigation > ul li:last-child {
+#navigation > ul li.aboutUs {
     position: relative;
 }
 
-#navbar .menu-large:last-child {
+#navbar .menu-large.aboutUs {
     position: relative!important;
 }
 
@@ -45,7 +45,21 @@ footer.main-footer a {
     z-index: 9999;
 }
 
-#navigation > ul li:last-child:hover .qrcode {
+.heading {
+    position: relative;
+}
+
+.getMore {
+    position: absolute;
+    right: 0;
+    top: -2rem;
+}
+
+.getMore img {
+    width:4.2rem;
+}
+
+#navigation > ul li.aboutUs:hover .qrcode {
     display: block;
 }
 

website/src/main/resources/templates/goods.html

@@ -56,7 +56,7 @@
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown active"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large">
+                            <li class="nav-item dropdown menu-large aboutUs">
                                 <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -79,37 +79,178 @@
                         <div class="heading">
                             <h2>公司产品</h2>
                         </div>
-                        <div class="row mb-4">
-                            <!--<div class="col-lg-4 col-md-6" th:each="item : ${case}">-->
-                                <!--<div class="box-image-text">-->
-                                    <!--<div class="image"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">-->
-                                        <!--<div class="overlay d-flex align-items-center justify-content-center">-->
-                                            <!--<a th:href="@{'caseDetail?id='+${item.id}}" class="btn btn-template-outlined-white">-->
-                                                <!--<i class="fa fa-chain"> </i> 详情-->
-                                            <!--</a>-->
-                                        <!--</div>-->
-                                    <!--</div>-->
-                                    <!--<div class="content">-->
-                                        <!--<h4><a th:href="@{'caseDetail?id='+${item.id}}" th:text="${item.title}">Print</a></h4>-->
-                                        <!--<p th:text="${item.introduction}">shewing do an</p>-->
-                                    <!--</div>-->
-                                <!--</div>-->
-                            <!--</div>-->
-                            <div class="col-lg-4 col-md-6" th:each="item:${companyProducts}">
-                                <div class="box-image-text">
-                                    <div class="image"><img th:src= "${{item.imageUrl}}" src="./" alt="..." class="img-fluid">
-                                        <div class="overlay d-flex align-items-center justify-content-center">
-                                            <a class="btn btn-template-outlined-white" th:href="@{'apply?id='+${item.id}}">
-                                                <i class="fa fa-video-camera"> </i> 获取产品展示
-                                            </a>
+<!--                        <div class="row mb-4">-->
+<!--                            <div class="col-lg-4 col-md-6" th:each="item:${companyProducts}">-->
+<!--                                <div class="box-image-text">-->
+<!--                                    <div class="image"><img th:src= "${{item.imageUrl}}" src="./" alt="..." class="img-fluid">-->
+<!--                                        <div class="overlay d-flex align-items-center justify-content-center">-->
+<!--                                            <a class="btn btn-template-outlined-white" th:href="@{'apply?id='+${item.id}}">-->
+<!--                                                <i class="fa fa-video-camera"> </i> 获取产品展示-->
+<!--                                            </a>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                    <div class="content">-->
+<!--&lt;!&ndash;                                        <h4><a th:href="${{item.address}}" target="_blank" th:text="${{item.title}}"></a></h4>&ndash;&gt;-->
+<!--                                        <p th:text="${{item.introduction}}"></p>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
+                        <div style="padding: 0 0.5rem">
+                            <!-- type 0 -->
+                            <div style="border-left: 2px solid #467fbf;padding-left: 1rem;">
+                                <h4>塑料产品</h4>
+                            </div>
+                            <div class="row mb-4">
+                                <div class="col-lg-4 col-md-6" th:each="item:${companyProducts}" th:if="${item.type}==0">
+                                    <div class="box-image-text">
+                                        <div class="image"><img th:src= "${{item.imageUrl}}" src="./" alt="..." class="img-fluid">
+                                            <div class="overlay d-flex align-items-center justify-content-center">
+                                                <a class="btn btn-template-outlined-white" th:href="@{'apply?id='+${item.id}}">
+                                                    <i class="fa fa-video-camera"> </i> 获取产品展示
+                                                </a>
+                                            </div>
+                                        </div>
+                                        <div class="content">
+                                            <h4><a th:text="${{item.title}}"></a></h4>
+                                            <p th:text="${{item.introduction}}"></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- type 0 end -->
+                            <!-- type 1 -->
+                            <div style="border-left: 2px solid #467fbf;padding-left: 1rem;">
+                                <h4>物联网产品</h4>
+                            </div>
+                            <div class="row mb-4">
+                                <div class="col-lg-4 col-md-6" th:each="item:${companyProducts}" th:if="${item.type}==1">
+                                    <div class="box-image-text">
+                                        <div class="image"><img th:src= "${{item.imageUrl}}" src="./" alt="..." class="img-fluid">
+                                            <div class="overlay d-flex align-items-center justify-content-center">
+                                                <a class="btn btn-template-outlined-white" th:href="@{'apply?id='+${item.id}}">
+                                                    <i class="fa fa-video-camera"> </i> 获取产品展示
+                                                </a>
+                                            </div>
+                                        </div>
+                                        <div class="content">
+                                            <h4><a th:text="${{item.title}}"></a></h4>
+                                            <p th:text="${{item.introduction}}"></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- type 1 end -->
+                            <!-- type 2 -->
+                            <div style="border-left: 2px solid #467fbf;padding-left: 1rem;">
+                                <h4>成品</h4>
+                            </div>
+                            <div class="row mb-4">
+                                <div class="col-lg-4 col-md-6" th:each="item:${companyProducts}" th:if="${item.type}==2">
+                                    <div class="box-image-text">
+                                        <div class="image"><img th:src= "${{item.imageUrl}}" src="./" alt="..." class="img-fluid">
+                                            <div class="overlay d-flex align-items-center justify-content-center">
+                                                <a class="btn btn-template-outlined-white" th:href="@{'apply?id='+${item.id}}">
+                                                    <i class="fa fa-video-camera"> </i> 获取产品展示
+                                                </a>
+                                            </div>
+                                        </div>
+                                        <div class="content">
+                                            <h4><a th:text="${{item.title}}"></a></h4>
+                                            <p th:text="${{item.introduction}}"></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- type 2 end -->
+                            <!-- type 3 -->
+                            <div style="border-left: 2px solid #467fbf;padding-left: 1rem;">
+                                <h4>3D打印及检测服务</h4>
+                            </div>
+                            <div class="row mb-4">
+                                <div class="col-lg-4 col-md-6" th:each="item:${companyProducts}" th:if="${item.type}==3">
+                                    <div class="box-image-text">
+                                        <div class="image"><img th:src= "${{item.imageUrl}}" src="./" alt="..." class="img-fluid">
+                                            <div class="overlay d-flex align-items-center justify-content-center">
+                                                <a class="btn btn-template-outlined-white" th:href="@{'apply?id='+${item.id}}">
+                                                    <i class="fa fa-video-camera"> </i> 获取产品展示
+                                                </a>
+                                            </div>
+                                        </div>
+                                        <div class="content">
+                                            <h4><a th:text="${{item.title}}"></a></h4>
+                                            <p th:text="${{item.introduction}}"></p>
                                         </div>
                                     </div>
-                                    <div class="content">
-<!--                                        <h4><a th:href="${{item.address}}" target="_blank" th:text="${{item.title}}"></a></h4>-->
-                                        <p th:text="${{item.introduction}}"></p>
+                                </div>
+                            </div>
+                            <!-- type 3 end -->
+                            <!-- type 4 -->
+                            <div style="border-left: 2px solid #467fbf;padding-left: 1rem;">
+                                <h4>模具和加工设备能力</h4>
+                            </div>
+                            <div class="row mb-4">
+                                <div class="col-lg-4 col-md-6" th:each="item:${companyProducts}" th:if="${item.type}==4">
+                                    <div class="box-image-text">
+                                        <div class="image"><img th:src= "${{item.imageUrl}}" src="./" alt="..." class="img-fluid">
+                                            <div class="overlay d-flex align-items-center justify-content-center">
+                                                <a class="btn btn-template-outlined-white" th:href="@{'apply?id='+${item.id}}">
+                                                    <i class="fa fa-video-camera"> </i> 获取产品展示
+                                                </a>
+                                            </div>
+                                        </div>
+                                        <div class="content">
+                                            <h4><a th:text="${{item.title}}"></a></h4>
+                                            <p th:text="${{item.introduction}}"></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- type 4 end -->
+                            <!-- type 5 -->
+                            <div style="border-left: 2px solid #467fbf;padding-left: 1rem;">
+                                <h4>专利和政府政策服务</h4>
+                            </div>
+                            <div class="row mb-4">
+                                <div class="col-lg-4 col-md-6" th:each="item:${companyProducts}" th:if="${item.type}==5">
+                                    <div class="box-image-text">
+                                        <div class="image"><img th:src= "${{item.imageUrl}}" src="./" alt="..." class="img-fluid">
+                                            <div class="overlay d-flex align-items-center justify-content-center">
+                                                <a class="btn btn-template-outlined-white" th:href="@{'apply?id='+${item.id}}">
+                                                    <i class="fa fa-video-camera"> </i> 获取产品展示
+                                                </a>
+                                            </div>
+                                        </div>
+                                        <div class="content">
+                                            <h4><a th:text="${{item.title}}"></a></h4>
+                                            <p th:text="${{item.introduction}}"></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- type 5 end -->
+                            <!-- type 6 -->
+                            <div style="border-left: 2px solid #467fbf;padding-left: 1rem;">
+                                <h4>融资服务</h4>
+                            </div>
+                            <div class="row mb-4">
+                                <div class="col-lg-4 col-md-6" th:each="item:${companyProducts}" th:if="${item.type}==6">
+                                    <div class="box-image-text">
+                                        <div class="image"><img th:src= "${{item.imageUrl}}" src="./" alt="..." class="img-fluid">
+                                            <div class="overlay d-flex align-items-center justify-content-center">
+                                                <a class="btn btn-template-outlined-white" th:href="@{'apply?id='+${item.id}}">
+                                                    <i class="fa fa-video-camera"> </i> 获取产品展示
+                                                </a>
+                                            </div>
+                                        </div>
+                                        <div class="content">
+                                            <h4><a th:text="${{item.title}}"></a></h4>
+                                            <p th:text="${{item.introduction}}"></p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
+                            <!-- type 6 end -->
                         </div>
                     </section>
                 </div>
@@ -118,7 +259,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -126,14 +267,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/index.html

@@ -59,7 +59,7 @@
                         <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                         <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                         <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                        <li class="nav-item dropdown">
+                        <li class="nav-item dropdown menu-large aboutUs">
                             <a href="about.html">关于我们 <b class="caret"></b></a>
                             <div class="qrcode">
                                 <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -68,7 +68,7 @@
                         </li>
                         <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                         <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                        <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                        <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                     </ul>
                 </div>
             </div>
@@ -273,7 +273,7 @@
     <footer class="main-footer">
         <div class="container">
             <div class="row">
-                <div class="col-lg-3">
+                <div class="col-lg-6">
                     <h4 class="h6">联系我们</h4>
                     <p class="text-uppercase">
                         <br>电话: 400-1086-011
@@ -281,14 +281,6 @@
                         <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                     </p>
                 </div>
-                <div class="col-lg-3">
-                    <h4 class="h6">塑维产品</h4>
-                    <p class="text-uppercase">
-                        <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                        <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                        <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                    </p>
-                </div>
                 <div class="col-lg-6 bottom-code">
                     <ul class="list-inline photo-stream">
                         <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/job1.html

@@ -56,7 +56,7 @@
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active">
+                            <li class="nav-item dropdown active aboutUs">
                                 <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -97,7 +97,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -105,14 +105,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/job2.html

@@ -56,7 +56,7 @@
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active">
+                            <li class="nav-item dropdown active aboutUs">
                             <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -97,7 +97,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -105,14 +105,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/job3.html

@@ -56,7 +56,7 @@
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active">
+                            <li class="nav-item dropdown active aboutUs">
                             <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -97,7 +97,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -105,14 +105,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/job4.html

@@ -56,7 +56,7 @@
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown active">
+                            <li class="nav-item dropdown active aboutUs">
                             <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -97,7 +97,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -105,14 +105,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/js/front.js

@@ -44,7 +44,7 @@ $(function () {
         }
         if($("#accountNumber").val() == "demo" && $("#passWord").val() == "demo1234") {
             sessionStorage.isLogin = 1;
-            location.href = "./vip.html"
+            location.href = "/vip"
         } else {
             alert("账号或密码错误！")
             return false;

website/src/main/resources/templates/login.html

@@ -56,7 +56,7 @@
                                 <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                                 <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                                 <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                                <li class="nav-item dropdown menu-large">
+                                <li class="nav-item dropdown menu-large aboutUs">
                                     <a href="about.html">关于我们 <b class="caret"></b></a>
                                     <div class="qrcode">
                                         <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                                 </li>
                                 <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                                 <li id="login" class="nav-item dropdown active"><a href="login.html">登录 <b class="caret"></b></a></li>
-                                <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                                <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                             </ul>
                         </div>
                     </div>
@@ -109,7 +109,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -117,14 +117,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/partner.html

@@ -56,7 +56,7 @@
                             <li class="nav-item dropdown active"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large">
+                            <li class="nav-item dropdown menu-large aboutUs">
                                 <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -79,8 +79,8 @@
                         <div class="heading">
                             <h2>合作伙伴</h2>
                         </div>
-                        <!-- type 0 -->
                         <div style="padding: 0 0.5rem">
+                            <!-- type 0 -->
                             <div style="border-left: 2px solid #467fbf;padding-left: 1rem;">
                                 <h4>研发机构类</h4>
                             </div>
@@ -196,7 +196,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -204,14 +204,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/product.html

@@ -56,7 +56,7 @@
                             <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                             <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                            <li class="nav-item dropdown menu-large">
+                            <li class="nav-item dropdown menu-large aboutUs">
                                 <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -65,7 +65,7 @@
                             </li>
                             <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                             <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                            <li id="vip" style="display: none;" class="nav-item dropdown menu-large"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                         </ul>
                     </div>
                 </div>
@@ -90,7 +90,7 @@
             <footer class="main-footer">
                 <div class="container">
                     <div class="row">
-                        <div class="col-lg-3">
+                        <div class="col-lg-6">
                             <h4 class="h6">联系我们</h4>
                             <p class="text-uppercase">
                                 <br>电话: 400-1086-011
@@ -98,14 +98,6 @@
                                 <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                             </p>
                         </div>
-                        <div class="col-lg-3">
-                            <h4 class="h6">塑维产品</h4>
-                            <p class="text-uppercase">
-                                <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                                <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                                <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                            </p>
-                        </div>
                         <div class="col-lg-6 bottom-code">
                             <ul class="list-inline photo-stream">
                                 <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>

website/src/main/resources/templates/vip.html

@@ -61,7 +61,7 @@
                         <li class="nav-item dropdown menu-large"><a href="partner">合作伙伴 <b class="caret"></b></a></li>
                         <li class="nav-item dropdown menu-large"><a href="case">成功案例 <b class="caret"></b></a></li>
                         <li class="nav-item dropdown menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
-                        <li class="nav-item dropdown menu-large">
+                        <li class="nav-item dropdown menu-large aboutUs">
                             <a href="about.html">关于我们 <b class="caret"></b></a>
                             <div class="qrcode">
                                 <img src="img/qrCode.png" alt="..." class="img-fluid">
@@ -70,7 +70,7 @@
                         </li>
                         <span style="border-left: 1px solid #fff;line-height: 1.5;"></span>
                         <li id="login" class="nav-item dropdown menu-large"><a href="login.html">登录 <b class="caret"></b></a></li>
-                        <li id="vip" style="display: none;" class="nav-item dropdown active"><a href="vip.html">会员入口 <b class="caret"></b></a></li>
+                        <li id="vip" style="display: none;" class="nav-item dropdown active"><a href="/vip">会员入口 <b class="caret"></b></a></li>
                     </ul>
                 </div>
             </div>
@@ -85,33 +85,12 @@
                     <h2>塑维产品</h2>
                 </div>
                 <div class="row mb-4">
-                    <div class="col-lg-4 col-md-6">
+                    <div class="col-lg-4 col-md-6" th:each="item:${vipProducts}">
                         <div class="box-image-text">
-                            <div class="image"><img src="./img/texture-bw.png" alt="..." class="img-fluid">
+                            <div class="image"><img th:src="${{item.imageUrl}}" alt="..." class="img-fluid">
                             </div>
                             <div class="content">
-                                <h4><a href="http://111.231.87.63:9098" target="_blank">云模</a></h4>
-                                <p><a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-lg-4 col-md-6">
-                        <div class="box-image-text">
-                            <div class="image"><img src="./img/texture-turquoise.png" alt="..." class="img-fluid">
-                            </div>
-                            <div class="content">
-                                <h4><a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">新永城智慧工厂</a></h4>
-                                <p><a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a></p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-lg-4 col-md-6">
-                        <div class="box-image-text">
-                            <div class="image"><img src="./img/texture-violet.png" alt="..." class="img-fluid">
-                            </div>
-                            <div class="content">
-                                <h4><a href="http://xyc.yunsu.cn/" target="_blank">上海交大智慧工厂</a></h4>
-                                <p><a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a></p>
+                                <h4><a th:href="${{item.address}}" target="_blank" th:text="${{item.title}}"></a></h4>
                             </div>
                         </div>
                     </div>
@@ -123,7 +102,7 @@
     <footer class="main-footer">
         <div class="container">
             <div class="row">
-                <div class="col-lg-3">
+                <div class="col-lg-6">
                     <h4 class="h6">联系我们</h4>
                     <p class="text-uppercase">
                         <br>电话: 400-1086-011
@@ -131,14 +110,6 @@
                         <br>地址: 南京市雨花台区郁金香路36号国泰科创大厦2楼
                     </p>
                 </div>
-                <div class="col-lg-3">
-                    <h4 class="h6">塑维产品</h4>
-                    <p class="text-uppercase">
-                        <br>云模：<a href="http://111.231.87.63:9098" target="_blank">www.yunsu.com</a>
-                        <br>新永城智慧工厂: <a href="http://xyc.yunsu.cn/MESIManufacturing/" target="_blank">xyc.yunsu.cn/MESIManufacturing</a>
-                        <br>上海交大智慧工厂: <a href="http://xyc.yunsu.cn/" target="_blank">xyc.yunsu.cn</a>
-                    </p>
-                </div>
                 <div class="col-lg-6 bottom-code">
                     <ul class="list-inline photo-stream">
                         <li class="list-inline-item"><a href="#"><img src="img/qrCode.png" alt="..." class="img-fluid"></a></li>