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

# Conflicts:
#	website/src/main/resources/application-prod.properties

official_backend/src/main/java/com/hssx/ysofficial/controller/CompanyProductsController.java

@@ -30,28 +30,26 @@ public class CompanyProductsController {
     /**
      * 公司产品的录入
      * 参数：
-     *  添加：title 产品名称 ，introduction 产品简介，address 产品地址,file上传的文件（非必传）
-     *  修改 id：产品id
-     * @return
+     * 添加：title 产品名称 ，introduction 产品简介，address 产品地址, type 产品类型, file上传的文件（非必传）
+     * 修改 id：产品id
      */
     @RequestMapping("/addAndUpdate")
-    public HttpRespMsg addAndUpdate(CompanyProducts CompanyProducts, @RequestParam(required = false)MultipartFile file) {
-        return companyProductsService.addAndUpdate(CompanyProducts,file);
+    public HttpRespMsg addAndUpdate(CompanyProducts CompanyProducts, @RequestParam(required = false) MultipartFile file) {
+        return companyProductsService.addAndUpdate(CompanyProducts, file);
     }
 
     /**
      * 公司产品删除
      * 参数：id:产品id
-     * @return
      */
     @RequestMapping("/del")
     public HttpRespMsg del(CompanyProducts companyProducts) {
         return companyProductsService.del(companyProducts);
     }
+
     /**
      * 公司产品列表
      * 参数：pageNum 当前页码，pageSize 每页条数
-     * @return
      */
     @RequestMapping("/companyProductsList")
     public HttpRespMsg companyProductsList(PageUtil page) {

official_backend/src/main/java/com/hssx/ysofficial/controller/CooperationsController.java

@@ -33,6 +33,13 @@ public class CooperationsController {
         return cooperationsService.getCooperations();
     }
 
+    /**
+     * 添加合作者
+     * name 合作者名称
+     * description 合作者描述
+     * type 合作者种类 0-研发机构类、1-材料供应商、2-设备合作商、3-系统授权商、4-孵化中心、5-平台合作单位
+     * multipartFile 合作者图片
+     */
     @RequestMapping("/addCooperation")
     public HttpRespMsg addCooperation(
             Cooperations cooperations,

official_backend/src/main/java/com/hssx/ysofficial/entity/CompanyProducts.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Reiskuchen
- * @since 2019-11-21
+ * @since 2020-02-04
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -62,6 +62,12 @@ public class CompanyProducts extends Model<CompanyProducts> {
     @TableField("sticky")
     private Integer sticky;
 
+    /**
+     * 产品种类 0-塑料产品 1-物联网产品 2-成品 3-3D打印及检测服务 4-模具和加工设备能力 5-专利和政府政策服务 6-融资服务
+     */
+    @TableField("type")
+    private Integer type;
+
 
     @Override
     protected Serializable pkVal() {

official_backend/src/main/java/com/hssx/ysofficial/service/impl/CooperationsServiceImpl.java

@@ -59,7 +59,7 @@ public class CooperationsServiceImpl extends ServiceImpl<CooperationsMapper, Coo
             cooperations.setImageUrl("/upload/" + storedFileName);
             cooperationsMapper.insert(cooperations);
         }else{
-            httpRespMsg.setError("lack of file or information");
+            httpRespMsg.setError("缺少数据");
         }
         return httpRespMsg;
     }

official_backend/src/main/java/com/hssx/ysofficial/utility/CodeGenerator.java

@@ -190,7 +190,7 @@ public class CodeGenerator {
         //单独生成逗号隔开
 //        strategy.setInclude("");
         //全生成
-        strategy.setInclude("online_application","company_products");//表名，多个英文逗号分割
+        strategy.setInclude("company_products");//表名，多个英文逗号分割
         //多个英文逗号隔开
 //        strategy.setInclude(scanner("user").split(","));
         strategy.setControllerMappingHyphenStyle(true);

official_backend/src/main/resources/application-prod.properties

@@ -9,7 +9,10 @@ server.connection-timeout=18000000s
 #Mybatis-plus
 mybatis-plus.type-aliases-package=com.hssx.ysofficial.entity/*
 mybatis-plus.mapper-locations=mapper/*.xml
-
+#mybatis-plus.global-config.db-config.id-type=auto
+mybatis-plus.global-config.db-config.select-strategy=not_empty
+mybatis-plus.global-config.db-config.update-strategy=not_empty
+mybatis-plus.global-config.db-config.insert-strategy=not_empty
 #Êý¾Ý¿â
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8

official_backend/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 #服务端配置
-server.port=8088
+server.port=8098
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 server.tomcat.max-http-post-size=-1
@@ -12,7 +12,7 @@ mybatis-plus.mapper-locations=mapper/*.xml
 #mybatis-plus.global-config.db-config.id-type=auto
 mybatis-plus.global-config.db-config.select-strategy=not_empty
 mybatis-plus.global-config.db-config.update-strategy=not_empty
-mybatis-plus.global-config.db-config.field-strategy=not_empty
+mybatis-plus.global-config.db-config.insert-strategy=not_empty
 #数据库
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://111.231.87.63:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
@@ -33,8 +33,8 @@ spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.resolve-lazily=false
 
 #文件上传路径
-#upload.path=D:/mould/upload/
-upload.path=E:/staticproject/website/upload
+upload.path=D:/mould/upload/
+#upload.path=E:/staticproject/website/upload
 
 #文件下载路径
 download.path=D:/mould/download/

official_backend/src/main/resources/mapper/CompanyProductsMapper.xml

@@ -10,11 +10,12 @@
         <result column="introduction" property="introduction" />
         <result column="address" property="address" />
         <result column="sticky" property="sticky" />
+        <result column="type" property="type" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, title, image_url, introduction, address, sticky
+        id, title, image_url, introduction, address, sticky, type
     </sql>
 
 </mapper>

official_frontend/src/router/index.js

@@ -57,7 +57,7 @@ export const constantRoutes = [
         path: '',
         name: 'Banner',
         component: () => import('@/views/index/banner'),
-        meta: { title: 'Banner图片', icon: 'form' }
+        meta: { title: 'Banner图片', icon: 'banner' }
       }
     ]
   },
@@ -70,7 +70,7 @@ export const constantRoutes = [
         path: '',
         name: 'Cooperation',
         component: () => import('@/views/cooperation/client'),
-        meta: { title: '合作伙伴', icon: 'form' }
+        meta: { title: '合作伙伴', icon: 'partner' }
       }
     ]
   },
@@ -83,7 +83,7 @@ export const constantRoutes = [
         path: '',
         name: 'Advantage',
         component: () => import('@/views/article/advantage'),
-        meta: { title: '公司优势', icon: 'form' }
+        meta: { title: '公司优势', icon: 'advantage' }
       }
     ]
   },
@@ -96,7 +96,7 @@ export const constantRoutes = [
         path: '',
         name: 'Case',
         component: () => import('@/views/article/case'),
-        meta: { title: '成功案例', icon: 'form' }
+        meta: { title: '成功案例', icon: 'case' }
       }
     ]
   },
@@ -137,7 +137,7 @@ export const constantRoutes = [
         path: '',
         name: 'product',
         component: () => import('@/views/product/product'),
-        meta: { title: '公司产品', icon: 'form' }
+        meta: { title: '公司产品', icon: 'product' }
       }
     ]
   },
@@ -150,7 +150,7 @@ export const constantRoutes = [
         path: '',
         name: 'Comment',
         component: () => import('@/views/comment/comment'),
-        meta: { title: '查看留言', icon: 'form' }
+        meta: { title: '查看留言', icon: 'comment' }
       }
     ]
   },
@@ -163,7 +163,7 @@ export const constantRoutes = [
         path: '',
         name: 'Comment',
         component: () => import('@/views/application/application'),
-        meta: { title: '查看申请', icon: 'form' }
+        meta: { title: '查看申请', icon: 'application' }
       }
     ]
   },

official_frontend/src/utils/request.js

@@ -7,8 +7,8 @@ import { getToken } from '@/utils/auth'
 const service = axios.create({
     // url = base url + request url
     // baseURL: process.env.VUE_APP_BASE_API,
-    baseURL: "http://111.231.87.63:8088",
-    // baseURL: "http://192.168.101.166:8088",
+    // baseURL: "http://111.231.87.63:8088",
+    baseURL: "http://192.168.5.184:8098",
     // withCredentials: true, // send cookies when cross-domain requests
     timeout: 5000 // request timeout
 })

official_frontend/src/views/application/application.vue

@@ -10,7 +10,7 @@
             <el-table-column prop="indate" label="时间" width="160"></el-table-column>
             <el-table-column label="操作" width="130">
                 <template slot-scope="scope">
-                    <el-button type="primary" v-if="scope.row.isPass == 0" @click="switchSticky(scope.row.id)">接收</el-button>
+                    <el-button size="small" type="primary" v-if="scope.row.isPass == 0" @click="switchSticky(scope.row.id)">接收</el-button>
                     <span v-else>已接收</span>
                 </template>
             </el-table-column>

official_frontend/src/views/article/advantage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" @click="goEdit()">修改</el-button>
+    <el-button size="small" type="primary" @click="goEdit()">修改</el-button>
     <div v-html="content">{{content}}</div>
   </div>
 </template>

official_frontend/src/views/article/case.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" @click="toNewCase()" :loading="loading">新增案例</el-button>
+    <el-button size="small" type="primary" @click="toNewCase()" :loading="loading">新增案例</el-button>
     <el-table :data="cases" style="width: 100%">
       <el-table-column type="index" width="50"></el-table-column>
       <el-table-column prop="title" label="标题"></el-table-column>
       <el-table-column label="操作" width="580">
         <template slot-scope="scope">
-          <el-button @click="switchPosition(scope.row.id, 1)" :disabled="scope.$index == 0">上移</el-button>
-          <el-button @click="switchPosition(scope.row.id, 0)" :disabled="scope.$index == cases.length - 1">下移</el-button>
-          <el-button v-if="scope.row.sticky == 0" @click="switchSticky(scope.row.id)">置顶</el-button>
-          <el-button v-else @click="switchSticky(scope.row.id)" type="primary">取消置顶</el-button>
-          <el-button @click="goView(scope.row.id)">预览</el-button>
-          <el-button @click="goEdit(scope.row.id)">编辑</el-button>
-          <el-button @click="deleteArticle(scope.row.id)" type="danger">删除</el-button>
+          <el-button size="small" @click="switchPosition(scope.row.id, 1)" :disabled="scope.$index == 0">上移</el-button>
+          <el-button size="small" @click="switchPosition(scope.row.id, 0)" :disabled="scope.$index == cases.length - 1">下移</el-button>
+          <el-button size="small" v-if="scope.row.sticky == 0" @click="switchSticky(scope.row.id)">置顶</el-button>
+          <el-button size="small" v-else @click="switchSticky(scope.row.id)" type="primary">取消置顶</el-button>
+          <el-button size="small" @click="goView(scope.row.id)">预览</el-button>
+          <el-button size="small" @click="goEdit(scope.row.id)">编辑</el-button>
+          <el-button size="small" @click="deleteArticle(scope.row.id)" type="danger">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

official_frontend/src/views/article/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" @click="goBack()">返回</el-button>
+    <el-button size="small" type="primary" @click="goBack()">返回</el-button>
     <div v-html="content">{{content}}</div>
   </div>
 </template>

official_frontend/src/views/article/tinymce.vue

@@ -9,6 +9,7 @@
           :disabled="titleEditable"
           style="width: 300px;"
         ></el-input>
+        <el-button style="float:right" :loading="loading" size="small" @click="backTo()">返回</el-button>
       </div>
       <div v-if="!titleEditable">
         <span>简介</span>
@@ -28,8 +29,8 @@
         <tinymce v-model="content" :height="500" />
       </div>
     </div>
-    <el-button :loading="loading" @click="uploadContent">提交</el-button>
-    <el-button :loading="loading" type="danger" @click="clear">清空</el-button>
+    <el-button :loading="loading" size="small" type="primary" @click="uploadContent">提交</el-button>
+    <el-button :loading="loading" size="small" type="danger" @click="clear">清空</el-button>
   </div>
 </template>
 
@@ -53,6 +54,9 @@ export default {
     };
   },
   methods: {
+      backTo(){
+          this.$router.go(-1);
+      },
     getContent() {
       if (this.editing) {
         request({

official_frontend/src/views/cooperation/client.vue

@@ -1,31 +1,33 @@
 <template>
   <div class="app-container">
-    <el-button type="primary" @click="openDialog(false, null)" :loading="loading">添加</el-button>
+    <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 style="width: 200px; height: 200px" :src="scope.row.imageUrl"></el-image>
+          <el-image :src="scope.row.imageUrl"></el-image>
+          <!-- style="width: 200px; height: 200px"  -->
         </template>
       </el-table-column>
       <el-table-column prop="name" label="名称" width="150"></el-table-column>
       <el-table-column prop="description" label="描述"></el-table-column>
-      <el-table-column label="类型" width="80">
+      <el-table-column label="类型" width="120">
         <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">芯片及PC版合作伙伴</span>
-          <span v-else-if="scope.row.type == 3">软件合作伙伴</span>
-          <span v-else-if="scope.row.type == 4">投融资服务机构</span>
-          <span v-else>未知</span>
+            <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">系统授权商</span>
+            <span v-else-if="scope.row.type == 4">孵化中心</span>
+            <span v-else-if="scope.row.type == 5">台合作单位</span>
+            <span v-else>未知</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="300">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.sticky == 0" @click="switchSticky(scope.row.id)">置顶</el-button>
-          <el-button v-else @click="switchSticky(scope.row.id)" type="primary">取消置顶</el-button>
-          <el-button @click="openDialog(true, scope.$index)" :loading="loading">编辑</el-button>
-          <el-button type="danger" @click="deleteCooperation(scope.row.id)" :loading="loading">删除</el-button>
+          <el-button size="small" v-if="scope.row.sticky == 0" @click="switchSticky(scope.row.id)">置顶</el-button>
+          <el-button size="small" v-else @click="switchSticky(scope.row.id)" type="primary">取消置顶</el-button>
+          <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>
@@ -40,12 +42,13 @@
           <el-input v-model="cooperationsForm.description" placeholder="请输入描述" clearable></el-input>
         </el-form-item>
         <el-form-item label="类型" prop="type">
-          <el-select v-model="cooperationsForm.type" placeholder="请选择类型">
-            <el-option label="联合开发" :value="0"></el-option>
+          <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="芯片及PC版合作伙伴" :value="2"></el-option>
-            <el-option label="软件合作伙伴" :value="3"></el-option>
-            <el-option label="投融资服务机构" :value="4"></el-option>
+            <el-option label="设备合作商" :value="2"></el-option>
+            <el-option label="系统授权商" :value="3"></el-option>
+            <el-option label="孵化中心" :value="4"></el-option>
+            <el-option label="台合作单位" :value="5"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -56,7 +59,7 @@
             :limit="1"
             :before-remove="beforeRemove"
           >
-            <el-button type="primary" :loading="loading">上传一张图片</el-button>
+            <el-button size="small" type="primary" :loading="loading">上传一张图片</el-button>
           </el-upload>
         </el-form-item>
       </el-form>

official_frontend/src/views/index/banner.vue

@@ -8,22 +8,22 @@
       multiple
       :limit="10"
     >
-      <el-button type="primary" :loading="uploading">上传banner图片</el-button>
+      <el-button size="small" type="primary" :loading="uploading">上传banner图片</el-button>
     </el-upload>
     <el-table :data="urlList" 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
-            style="width: 200px; height: 200px"
             :src="scope.row.url"
             :preview-src-list="urlList"
           ></el-image>
+          <!-- style="width: 200px; height: 200px" -->
         </template>
       </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button @click="deleteBannerPicture(scope.row.id)">删除</el-button>
+          <el-button size="small" @click="deleteBannerPicture(scope.row.id)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -38,7 +38,8 @@ export default {
       //上传状态
       uploading: false,
       //文件数组
-      urlList: []
+      urlList: [],
+      picList: [],
     };
   },
   methods: {
@@ -79,6 +80,11 @@ export default {
       })
         .then(response => {
           this.urlList = response.data.banner;
+          var list = response.data.banner;
+          this.picList = [];
+          for(var i in list) {
+              this.picList.push(list[i].url)
+          }
         })
         .catch(error => {
           console.log(error);

official_frontend/src/views/product/product.vue

@@ -1,20 +1,33 @@
 <template>
     <div class="app-container">
-        <el-button type="primary" @click="openDialog(false, null)" :loading="loading">添加</el-button>
+        <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 style="width: 200px; height: 200px" :src="scope.row.imageUrl"></el-image>
+                    <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 @click="openDialog(true, scope.$index)" :loading="loading">编辑</el-button>
-                    <el-button type="danger" @click="deleteCooperation(scope.row.id)" :loading="loading">删除</el-button>
+                    <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>
@@ -22,10 +35,21 @@
         <!-- 添加和编辑的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="name">
+                <el-form-item label="产品名称" prop="title">
                     <el-input v-model="cooperationsForm.title" placeholder="请输入产品名称" clearable></el-input>
                 </el-form-item>
-                <el-form-item label="产品描述" prop="description">
+                <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="type">
@@ -33,7 +57,7 @@
                 </el-form-item>
                 <el-form-item>
                     <el-upload ref="upload" action="customize" :http-request="uploadDiscardFile" :limit="1" :before-remove="beforeRemove">
-                        <el-button type="primary" :loading="loading">上传一张图片</el-button>
+                        <el-button size="small" type="primary" :loading="loading">上传一张图片</el-button>
                     </el-upload>
                 </el-form-item>
             </el-form>
@@ -58,13 +82,15 @@
                     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"}]
+                    address: [{ required: true, message: "请输入产品地址", trigger: "blur"}],
+                    type: [{ required: true, message: "请选择产品类型", trigger: "change" }]
                 }
             };
         },
@@ -76,12 +102,14 @@
                     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;
                 }
@@ -142,6 +170,7 @@
                         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) {

official_frontend/vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || 'vue Admin Template' // page title
+const name = defaultSettings.title || '云塑网官网后台' // page title
 
 // If your port is set to 80,
 // use administrator privileges to execute the command line.

website/src/main/java/com/hssx/website/controller/ArticleController.java

@@ -37,6 +37,7 @@ public class ArticleController {
     private CommentService commentService;
     @Autowired
     private OnlineApplicationService onlineApplicationService;
+
     @ApiOperation("案例")
     @GetMapping("/index")
     public String index(Model model) {
@@ -47,7 +48,6 @@ public class ArticleController {
     @ApiOperation("公司产品")
     @GetMapping("/goods")
     public String goods(Model model) {
-        System.out.println("开始加载接口");
         model = articleService.getGoodsList(model);
         return "goods";
     }
@@ -65,16 +65,18 @@ public class ArticleController {
     public HttpRespMsg addComment(Comment comment) {
         return commentService.saveCommit(comment);
     }
+
     @ApiOperation("在线申请")
     @PostMapping("/onlineApply")
     @ResponseBody
     public HttpRespMsg onlineApply(OnlineApplication onlineApplication) {
         onlineApplicationService.save(onlineApplication);
-        return  new HttpRespMsg();
+        return new HttpRespMsg();
     }
 
     /**
      * 参数：pageNum 当前页码，pageSize 每页条数
+     *
      * @param page
      * @return
      */
@@ -84,7 +86,5 @@ public class ArticleController {
     public HttpRespMsg onlineApplyList(PageUtil page) {
         return onlineApplicationService.getList(page);
     }
-
-
 }
 

website/src/main/java/com/hssx/website/controller/CompanyProductsController.java

@@ -0,0 +1,21 @@
+package com.hssx.website.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 第一个数据是公司优势 其他是案例 前端控制器
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2020-02-04
+ */
+@RestController
+@RequestMapping("/company-products")
+public class CompanyProductsController {
+
+}
+

website/src/main/java/com/hssx/website/entity/CompanyProducts.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-11-21
+ * @since 2020-02-04
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -60,6 +60,12 @@ public class CompanyProducts extends Model<CompanyProducts> {
     @TableField("sticky")
     private Integer sticky;
 
+    /**
+     * 产品种类 0-塑料产品 1-物联网产品 2-成品 3-3D打印及检测服务 4-模具和加工设备能力 5-专利和政府政策服务 6-融资服务
+     */
+    @TableField("type")
+    private Integer type;
+
 
     @Override
     protected Serializable pkVal() {

website/src/main/java/com/hssx/website/entity/Cooperations.java

@@ -28,7 +28,7 @@ public class Cooperations extends Model<Cooperations> {
     private String name;
 
     /**
-     * 合作者的描述
+     * 合作者描述
      */
     @TableField("description")
     private String description;
@@ -40,13 +40,13 @@ public class Cooperations extends Model<Cooperations> {
     private String imageUrl;
 
     /**
-     * 合作者种类: 学校或公司
+     * 合作者种类 0-研发机构类、1-材料供应商、2-设备合作商、3-系统授权商、4-孵化中心、5-平台合作单位
      */
     @TableField("type")
     private Integer type;
 
     /**
-     * 是否显示于首页 0为不显示 1为显示
+     * 是否显示于首页 0-不显示 1-显示
      */
     @TableField("sticky")
     private Integer sticky;

website/src/main/java/com/hssx/website/entity/vo/CooperationsVO.java

@@ -0,0 +1,9 @@
+package com.hssx.website.entity.vo;
+
+import com.hssx.website.entity.Cooperations;
+import lombok.Data;
+
+@Data
+public class CooperationsVO extends Cooperations {
+    private String typeName;
+}

website/src/main/java/com/hssx/website/service/ArticleService.java

@@ -6,7 +6,7 @@ import org.springframework.ui.Model;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author 吴涛涛

website/src/main/java/com/hssx/website/service/impl/ArticleServiceImpl.java

@@ -1,11 +1,10 @@
 package com.hssx.website.service.impl;
-import	java.lang.ref.Reference;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.website.entity.*;
 import com.hssx.website.mapper.*;
 import com.hssx.website.service.ArticleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 
@@ -14,7 +13,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 吴涛涛
@@ -52,7 +51,8 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
 
     @Override
     public Model getGoodsList(Model model) {
-        model.addAttribute("companyProducts",companyProductsMapper.selectList(new QueryWrapper<CompanyProducts>().orderByDesc("id")));
+        /*这里应该把产品类型分类返回了*/
+        model.addAttribute("companyProducts", companyProductsMapper.selectList(new QueryWrapper<CompanyProducts>().orderByDesc("id")));
         return model;
     }
 }

website/src/main/java/com/hssx/website/service/impl/UserServiceImpl.java

@@ -2,14 +2,19 @@ package com.hssx.website.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.website.entity.Article;
+import com.hssx.website.entity.Cooperations;
 import com.hssx.website.entity.User;
+import com.hssx.website.entity.vo.CooperationsVO;
 import com.hssx.website.mapper.*;
 import com.hssx.website.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -31,27 +36,66 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private CommentMapper commentMapper;
 
     @Override
-    public Model getAdvantage(Model model){
+    public Model getAdvantage(Model model) {
         model.addAttribute("advantage", articleMapper.selectOne(
                 new QueryWrapper<Article>().eq("type", "advantage")));
         return model;
     }
 
     @Override
-    public Model getCooperation(Model model){
-        model.addAttribute("partners", cooperationsMapper.selectList(new QueryWrapper<>()));
+    public Model getCooperation(Model model) {
+        List<Cooperations> list = cooperationsMapper.selectList(new QueryWrapper<>());
+        List<CooperationsVO> resultList = new ArrayList<>();
+        for (Cooperations cooperations : list) {
+            CooperationsVO cooperationsVO = new CooperationsVO();
+            BeanUtils.copyProperties(cooperations, cooperationsVO);
+            Integer type = cooperations.getType();
+            String typeName;
+            switch (type) {
+                case 0: {
+                    typeName = "研发机构类";
+                    break;
+                }
+                case 1: {
+                    typeName = "材料供应商";
+                    break;
+                }
+                case 2: {
+                    typeName = "设备合作商";
+                    break;
+                }
+                case 3: {
+                    typeName = "系统授权商";
+                    break;
+                }
+                case 4: {
+                    typeName = "孵化中心";
+                    break;
+                }
+                case 5: {
+                    typeName = "平台合作单位";
+                    break;
+                }
+                default: {
+                    typeName = "研发机构类";
+                }
+            }
+            cooperationsVO.setTypeName(typeName);
+            resultList.add(cooperationsVO);
+        }
+        model.addAttribute("partners", resultList);
         return model;
     }
 
     @Override
-    public Model getCase(Model model){
+    public Model getCase(Model model) {
         model.addAttribute("cases", articleMapper.selectList(new QueryWrapper<Article>()
                 .eq("type", "case").orderByAsc("position")));
         return model;
     }
 
     @Override
-    public Model getDetail(Model model, Integer id){
+    public Model getDetail(Model model, Integer id) {
         model.addAttribute("detail", articleMapper.selectById(id));
         return model;
     }

website/src/main/java/com/hssx/website/until/CodeGenerator.java

@@ -206,7 +206,7 @@ public class CodeGenerator {
         //此处user是表名，多个英文逗号分割
 //        strategy.setInclude("mould_down_packet");
 //        strategy.setExclude();//数据库表全生成
-        strategy.setInclude("online_application","company_products");//表名，多个英文逗号分割
+        strategy.setInclude("company_products");//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);
         //数据库表前缀，不配置这行的话，生成的类会带有T如:TUser,配置后即可将前缀去掉
 //        strategy.setTablePrefix("tb_");

website/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 # ####################################################################################################
 # ·þÎñ¶ËÅäÖÃ
-server.port=8098
+server.port=8099
 server.servlet.context-path=/
 server.tomcat.uri-encoding=UTF-8
 server.tomcat.max-http-post-size=-1
@@ -22,7 +22,7 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # ####################################################################################################
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_mould?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_website?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
 #spring.datasource.druid.test-on-borrow=true

website/src/main/resources/mapper/CompanyProductsMapper.xml

@@ -10,11 +10,12 @@
         <result column="introduction" property="introduction" />
         <result column="address" property="address" />
         <result column="sticky" property="sticky" />
+        <result column="type" property="type" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, title, image_url, introduction, address, sticky
+        id, title, image_url, introduction, address, sticky, type
     </sql>
 
 </mapper>

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

@@ -56,13 +56,16 @@
                             <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 active">
                                 <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>

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

@@ -64,6 +64,9 @@
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>

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

@@ -63,6 +63,9 @@
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>

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

@@ -63,6 +63,9 @@
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>

website/src/main/resources/templates/css/style.blue.css

@@ -762,7 +762,8 @@ header.nav-holder.sticky {
   /*font-size: 0.9rem;*/
   /*text-decoration: none;*/
   /*border-top: .3rem solid transparent;*/
-  margin: 0 1.6rem;
+  /*margin: 0 1.6rem;*/
+  margin: 0 1.1rem;
   padding: 0.6rem 0 0.2rem;
   color: #fff;
   font-weight: 600;

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

@@ -63,6 +63,9 @@
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>
@@ -74,7 +77,7 @@
                     <section class="bar">
                         <!-- Image box with hover-->
                         <div class="heading">
-                            <h2>成功案例</h2>
+                            <h2>公司产品</h2>
                         </div>
                         <div class="row mb-4">
                             <!--<div class="col-lg-4 col-md-6" th:each="item : ${case}">-->

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

@@ -66,6 +66,9 @@
                                 <div>请关注塑维公众号</div>
                             </div>
                         </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>
                     </ul>
                 </div>
             </div>

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

@@ -56,13 +56,16 @@
                             <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 active">
                                 <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>

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

@@ -56,13 +56,16 @@
                             <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 active">
                             <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>

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

@@ -56,13 +56,16 @@
                             <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 active">
                             <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>

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

@@ -56,13 +56,16 @@
                             <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 active">
                             <a href="about.html">关于我们 <b class="caret"></b></a>
                                 <div class="qrcode">
                                     <img src="img/qrCode.png" alt="..." class="img-fluid">
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>

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

@@ -1,4 +1,12 @@
 $(function () {
+    if(sessionStorage.isLogin != 1) {
+        $("#login").show();
+        $("#vip").hide();
+    } else {
+        $("#login").hide();
+        $("#vip").show();
+    }
+
     // ------------------------------------------------------- //
     // Navbar Sticky
     // ------------------------------------------------------ //
@@ -22,6 +30,27 @@ $(function () {
         }
     });
 
+
+    $('#userLogin').on('click', function (e) {
+        console.log(11111)
+        e.preventDefault();
+        if($("#accountNumber").val() == "") {
+            alert("请输入账号！")
+            return false;
+        }
+        if($("#passWord").val() == "") {
+            alert("请输入密码！")
+            return false;
+        }
+        if($("#accountNumber").val() == "demo" && $("#passWord").val() == "demo1234") {
+            sessionStorage.isLogin = 1;
+            location.href = "./vip.html"
+        } else {
+            alert("账号或密码错误！")
+            return false;
+        }
+    });
+
     // ------------------------------------------------------- //
     // Multi-level dropdown
     // ------------------------------------------------------ //

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

@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <title>塑维</title>
+        <meta name="keywords" content="MES,MES系统,MES软件,制造执行系统,生产管理系统,生产协同,制造协同,生产流程管理,精益制造,智能制造,生产数字化,制造信息化"/>
+        <meta name="description" content="塑维智造是一款云端制造协同系统，通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、智能决策四大亮点，帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程，实现数据驱动下的精益制造。"/>
+        <meta name="description" content="">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="robots" content="all,follow">
+        <!-- Bootstrap CSS-->
+        <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
+        <!-- Font Awesome CSS-->
+        <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
+        <!-- Google fonts - Roboto-->
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
+        <!-- Bootstrap Select-->
+        <link rel="stylesheet" href="vendor/bootstrap-select/css/bootstrap-select.min.css">
+        <!-- owl carousel-->
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.carousel.css">
+        <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.theme.default.css">
+        <!-- theme stylesheet-->
+        <link rel="stylesheet" href="css/style.blue.css" id="theme-stylesheet">
+        <!-- Custom stylesheet - for your changes-->
+        <link rel="stylesheet" href="css/custom.css">
+        <!-- Favicon and apple touch icons-->
+        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+        <!--<link rel="apple-touch-icon" href="img/apple-touch-icon.png">-->
+        <!--<link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon-57x57.png">-->
+        <!--<link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">-->
+        <!--<link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76x76.png">-->
+        <!--<link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">-->
+        <!--<link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png">-->
+        <!--<link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon-144x144.png">-->
+        <!--<link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152x152.png">-->
+        <!-- Tweaks for older IEs--><!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
+    </head>
+    <body>
+        <div id="all" class="about">
+            <!-- Navbar Start-->
+            <header class="nav-holder make-sticky">
+                <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
+                    <div class="container">
+                        <a href="index" class="navbar-brand home">
+                            <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
+                            <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
+                        </a>
+                        <button type="button" data-toggle="collapse" data-target="#navigation" class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i class="fa fa-align-justify"></i></button>
+                        <div id="navigation" class="navbar-collapse collapse">
+                            <ul class="nav navbar-nav ml-auto">
+                                <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
+                                <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 menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                                <li class="nav-item dropdown menu-large">
+                                    <a href="about.html">关于我们 <b class="caret"></b></a>
+                                    <div class="qrcode">
+                                        <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                        <div>请关注塑维公众号</div>
+                                    </div>
+                                </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>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </header>
+            <!-- Navbar End-->
+            <div id="content" class="form-apply">
+                <section class="bar bg-gray">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="heading text-center">
+                                <h2>会员登录</h2>
+                            </div>
+                        </div>
+                        <div class="col-md-8 mx-auto">
+                            <!--<form>-->
+                            <div class="row">
+                                <div class="col-sm-12">
+                                    <div class="form-group">
+                                        <label for="accountNumber">账号</label>
+                                        <input id="accountNumber" type="text" class="form-control" placeholder="请输入账号（必填）">
+                                    </div>
+                                </div>
+                                <div class="col-sm-12">
+                                    <div class="form-group">
+                                        <label for="passWord">密码</label>
+                                        <input id="passWord" type="password" class="form-control" placeholder="请输入密码（必填）">
+                                    </div>
+                                </div>
+                                <div class="col-sm-12 text-center">
+                                    <button id="userLogin" class="btn btn-template-outlined">
+                                        <i class="fa fa-sign-in"></i> 登录</button>
+                                </div>
+                            </div>
+                            <!--</form>-->
+                        </div>
+                    </div>
+                </section>
+            </div>
+            <!-- FOOTER -->
+            <footer class="main-footer">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-3">
+                            <h4 class="h6">联系我们</h4>
+                            <p class="text-uppercase">
+                                <br>电话: 400-1086-011
+                                <br>网址：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                                <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>
+                            </ul>
+                            <h4 class="h6">官方微信公众号</h4>
+                        </div>
+                    </div>
+                </div>
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-12 bottom-Copyright">
+                            Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
+                        </div>
+                    </div>
+                </div>
+            </footer>
+        </div>
+        <!-- Javascript files-->
+        <script src="vendor/jquery/jquery.min.js"></script>
+        <script src="vendor/popper.js/umd/popper.min.js"> </script>
+        <script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+        <script src="vendor/jquery.cookie/jquery.cookie.js"> </script>
+        <script src="vendor/waypoints/lib/jquery.waypoints.min.js"> </script>
+        <script src="vendor/jquery.counterup/jquery.counterup.min.js"> </script>
+        <script src="vendor/owl.carousel/owl.carousel.min.js"></script>
+        <script src="vendor/owl.carousel2.thumbs/owl.carousel2.thumbs.min.js"></script>
+        <script src="js/jquery.parallax-1.1.3.js"></script>
+        <script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
+        <script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
+        <script src="js/front.js"></script>
+    </body>
+</html>

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

@@ -63,6 +63,9 @@
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>
@@ -76,18 +79,115 @@
                         <div class="heading">
                             <h2>合作伙伴</h2>
                         </div>
-                        <div class="row mb-4">
-                            <div class="col-lg-2 col-md-6" th:each="item : ${partners}">
-                                <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 href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
+                        <!-- type 0 -->
+                        <div style="padding: 0 0.5rem">
+                            <div style="border-left: 2px solid #467fbf;padding-left: 1rem;">
+                                <h4>研发机构类</h4>
+                            </div>
+                            <div class="row mb-4">
+                                <div class="col-lg-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==0">
+                                    <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 href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
+                                        </div>
+                                        <div class="content">
+                                            <h4><span href="#" th:text="${item.name}">Print</span></h4>
+                                            <p th:text="${item.description}"></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-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==1">
+                                    <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 href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
+                                        </div>
+                                        <div class="content">
+                                            <h4><span href="#" th:text="${item.name}">Print</span></h4>
+                                            <p th:text="${item.description}"></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-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==2">
+                                    <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 href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
+                                        </div>
+                                        <div class="content">
+                                            <h4><span href="#" th:text="${item.name}">Print</span></h4>
+                                            <p th:text="${item.description}"></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- type 2 end -->
+                            <!-- type 3 -->
+                            <div style="border-left: 2px solid #467fbf;padding-left: 1rem;">
+                                <h4>系统授权商</h4>
+                            </div>
+                            <div class="row mb-4">
+                                <div class="col-lg-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==3">
+                                    <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 href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
+                                        </div>
+                                        <div class="content">
+                                            <h4><span href="#" th:text="${item.name}">Print</span></h4>
+                                            <p th:text="${item.description}"></p>
+                                        </div>
+                                    </div>
+                                </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-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==4">
+                                    <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 href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
+                                        </div>
+                                        <div class="content">
+                                            <h4><span href="#" th:text="${item.name}">Print</span></h4>
+                                            <p th:text="${item.description}"></p>
+                                        </div>
                                     </div>
-                                    <div class="content">
-                                        <h4><span href="#" th:text="${item.name}">Print</span></h4>
-                                        <p th:text="${item.description}"></p>
+                                </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-2 col-md-6" th:each="item : ${partners}" th:if=" ${item.type}==5">
+                                    <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 href="#" class="btn btn-template-outlined-white"><i class="fa fa-chain"> </i> Read More</a></div>-->
+                                        </div>
+                                        <div class="content">
+                                            <h4><span href="#" th:text="${item.name}">Print</span></h4>
+                                            <p th:text="${item.description}"></p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
+                            <!-- type 5 end -->
                         </div>
                     </section>
                 </div>

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

@@ -63,6 +63,9 @@
                                     <div>请关注塑维公众号</div>
                                 </div>
                             </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>
                         </ul>
                     </div>
                 </div>

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

@@ -0,0 +1,173 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>塑维</title>
+    <meta name="keywords" content="MES,MES系统,MES软件,制造执行系统,生产管理系统,生产协同,制造协同,生产流程管理,精益制造,智能制造,生产数字化,制造信息化"/>
+    <meta name="description" content="塑维智造是一款云端制造协同系统，通过数据和算法让生产更加高效。基于数据聚合、多角色协同、可视化分析、智能决策四大亮点，帮助企业缩短生产周期、降低库存积压、提升产能利用率、透明化制造流程，实现数据驱动下的精益制造。"/>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="robots" content="all,follow">
+    <!-- Bootstrap CSS-->
+    <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap.min.css">
+    <!-- Font Awesome CSS-->
+    <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
+    <!-- Google fonts - Roboto-->
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,700">
+    <!-- Bootstrap Select-->
+    <link rel="stylesheet" href="vendor/bootstrap-select/css/bootstrap-select.min.css">
+    <!-- owl carousel-->
+    <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.carousel.css">
+    <link rel="stylesheet" href="vendor/owl.carousel/assets/owl.theme.default.css">
+    <!-- theme stylesheet-->
+    <link rel="stylesheet" href="css/style.blue.css" id="theme-stylesheet">
+    <!-- Custom stylesheet - for your changes-->
+    <link rel="stylesheet" href="css/custom.css">
+    <!-- Favicon and apple touch icons-->
+    <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+    <!--<link rel="apple-touch-icon" href="img/apple-touch-icon.png">-->
+    <!--<link rel="apple-touch-icon" sizes="57x57" href="img/apple-touch-icon-57x57.png">-->
+    <!--<link rel="apple-touch-icon" sizes="72x72" href="img/apple-touch-icon-72x72.png">-->
+    <!--<link rel="apple-touch-icon" sizes="76x76" href="img/apple-touch-icon-76x76.png">-->
+    <!--<link rel="apple-touch-icon" sizes="114x114" href="img/apple-touch-icon-114x114.png">-->
+    <!--<link rel="apple-touch-icon" sizes="120x120" href="img/apple-touch-icon-120x120.png">-->
+    <!--<link rel="apple-touch-icon" sizes="144x144" href="img/apple-touch-icon-144x144.png">-->
+    <!--<link rel="apple-touch-icon" sizes="152x152" href="img/apple-touch-icon-152x152.png">-->
+    <!-- Tweaks for older IEs--><!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script><![endif]-->
+    <script>
+        if(sessionStorage.isLogin != 1) {
+            location.href = "./login.html"
+        }
+    </script>
+</head>
+<body>
+<div id="all" class="about">
+    <!-- Navbar Start-->
+    <header class="nav-holder make-sticky">
+        <div id="navbar" role="navigation" class="navbar navbar-expand-lg">
+            <div class="container">
+                <a href="index" class="navbar-brand home">
+                    <img src="img/logo.png" style="width:187px;" alt="Universal logo" class="d-none d-md-inline-block">
+                    <img src="img/logo-small.png" alt="Universal logo" class="d-inline-block d-md-none">
+                </a>
+                <button type="button" data-toggle="collapse" data-target="#navigation" class="navbar-toggler btn-template-outlined"><span class="sr-only">Toggle navigation</span><i class="fa fa-align-justify"></i></button>
+                <div id="navigation" class="navbar-collapse collapse">
+                    <ul class="nav navbar-nav ml-auto">
+                        <li class="nav-item dropdown menu-large"><a href="index">首页 <b class="caret"></b></a></li>
+                        <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 menu-large"><a href="goods">公司产品 <b class="caret"></b></a></li>
+                        <li class="nav-item dropdown menu-large">
+                            <a href="about.html">关于我们 <b class="caret"></b></a>
+                            <div class="qrcode">
+                                <img src="img/qrCode.png" alt="..." class="img-fluid">
+                                <div>请关注塑维公众号</div>
+                            </div>
+                        </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>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </header>
+    <!-- Navbar End-->
+    <div id="content">
+        <div class="container">
+            <section class="bar">
+                <!-- Image box with hover-->
+                <div class="heading">
+                    <h2>塑维产品</h2>
+                </div>
+                <div class="row mb-4">
+                    <div class="col-lg-4 col-md-6">
+                        <div class="box-image-text">
+                            <div class="image"><img src="./img/texture-bw.png" 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>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+    </div>
+    <!-- FOOTER -->
+    <footer class="main-footer">
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-3">
+                    <h4 class="h6">联系我们</h4>
+                    <p class="text-uppercase">
+                        <br>电话: 400-1086-011
+                        <br>网址：<a href="http://www.yunzhusu.net" target="_blank">www.yunzhusu.net</a>
+                        <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>
+                    </ul>
+                    <h4 class="h6">官方微信公众号</h4>
+                </div>
+            </div>
+        </div>
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-12 bottom-Copyright">
+                    Copyright © 1998 - 2019 Tencent. All Rights Reserved. 塑维公司 版权所有
+                </div>
+            </div>
+        </div>
+    </footer>
+</div>
+<!-- Javascript files-->
+<script src="vendor/jquery/jquery.min.js"></script>
+<script src="vendor/popper.js/umd/popper.min.js"> </script>
+<script src="vendor/bootstrap/js/bootstrap.min.js"></script>
+<script src="vendor/jquery.cookie/jquery.cookie.js"> </script>
+<script src="vendor/waypoints/lib/jquery.waypoints.min.js"> </script>
+<script src="vendor/jquery.counterup/jquery.counterup.min.js"> </script>
+<script src="vendor/owl.carousel/owl.carousel.min.js"></script>
+<script src="vendor/owl.carousel2.thumbs/owl.carousel2.thumbs.min.js"></script>
+<script src="js/jquery.parallax-1.1.3.js"></script>
+<script src="vendor/bootstrap-select/js/bootstrap-select.min.js"></script>
+<script src="vendor/jquery.scrollto/jquery.scrollTo.min.js"></script>
+<script src="js/front.js"></script>
+</body>
+</html>