wujj 5 år sedan
förälder
incheckning
7ac1d387ae

+ 7 - 2
pom.xml

@@ -38,9 +38,14 @@
 		<dependency>
 			<groupId>net.mingsoft</groupId>
 			<artifactId>ms-mpeople</artifactId>
-			<version>1.0.13-SNAPSHOT</version>
+			<version>1.0.13</version>
 		</dependency>
-		
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-upgrader</artifactId>
+			<version>1.0.14</version>
+		</dependency>
+
 	</dependencies>
 	<build>
 		<finalName>ms-mcms</finalName>

+ 2 - 2
src/main/webapp/static/ms-admin/5.0.0/css/login.css

@@ -173,7 +173,7 @@ textarea::-webkit-input-placeholder {
 }
 .login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content .el-input__inner,
 .login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content .el-input {
-  width: 110px;
+  width: 97px;
 }
 .login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content > img {
   width: 66px;
@@ -183,7 +183,7 @@ textarea::-webkit-input-placeholder {
 .login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content p {
   display: flex;
   justify-content: space-between;
-  line-height: 1;
+  line-height: 17px;
   flex-direction: column;
   margin: 0;
 }

+ 286 - 7
src/main/webapp/templets/1/default/index.htm

@@ -1,7 +1,286 @@
-{ms:channel ref=one}
-[field.typetitle/]
-    {ms:arclist refs=one}
-        [field.title/]<br>
-        [field.author/]<br>
-    {/ms:arclist}
-{/ms:channel}
+<!DOCTYPE html>
+<html>
+<head>
+    <#include "head-file.htm">
+    <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
+    <script type="text/javascript" src="{ms:global.host/}/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
+    <script>
+        var ms = {
+            base:"http://store.mingsoft.net"
+        }
+    </script>
+    <script src="http://store.mingsoft.net/api/ms.web.mstore.js"></script>
+</head>
+
+<body>
+<#include "head.htm">
+<!-- <div class="ms-banner">
+    <img src="./images/banner.jpg">
+</div> -->
+<div id="indexVue">
+    <div id="banner_tabs" class="flexslider">
+        <ul class="slides">
+            <template v-for="banner in bannerList">
+                <li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
+                    <p class="banner_tit animated fadeInLeft">铭飞MS平台</p>
+                    <p class="banner_des animated fadeInRight">MCms系统永久完整开源</p>
+                </li>
+                <li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
+                    <p class="banner_tit animated fadeInLeft">MStore</p>
+                    <p class="banner_des animated fadeInRight">丰富强大的功能插件、海量精美的行业模板</p>
+                </li>
+                <li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
+                    <p class="banner_tit animated fadeInLeft">优质的服务体验</p>
+                    <p class="banner_des animated fadeInRight">人工远程协助服务、永久享受更新升级</p>
+                </li>
+            </template>
+        </ul>
+        <ul class="flex-direction-nav">
+            <li>
+                <a class="flex-prev" href="javascript:;">Previous</a>
+            </li>
+            <li>
+                <a class="flex-next" href="javascript:;">Next</a>
+            </li>
+        </ul>
+    </div>
+    <div class="ms-content-index">
+        <div class="ms-content-template">
+            <div>
+                <ul class="nav nav-tabs ms-index-tabs" role="tablist">
+                    <li role="presentation" class="active">
+                        <a href="#model" aria-controls="model" role="tab" data-toggle="tab">模板</a>
+                    </li>
+                    <li role="presentation">
+                        <a href="#plug" aria-controls="plug" role="tab" data-toggle="tab">插件</a>
+                    </li>
+                </ul>
+                <div class="ms-content-all">
+                    <div class="tab-content">
+                        <div role="tabpanel" class="tab-pane active" id="model">
+                            <div style="display: none;" class="ms-loading" v-show="!loading">
+                                <img src="{ms:global.host/}/{ms:global.style/}/images/loading.gif" />
+                            </div>
+                            <div class="ms-model-content" style="display: none;" v-show="loading">
+                                <template v-for="model in modelList">
+                                    <div class="ms-model-list">
+                                        <a class="ms-model-img" :href="model.upgraderVersionUrl" target="_blank">
+                                            <img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://store.mingsoft.net/'+model.upgraderVersionImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
+                                        </a>
+                                        <div class="ms-model-mobile-img" v-if="model.upgraderVersionMobileImg != '' && model.upgraderVersionMobileImg != undefined" style="background: url({ms:global.host/}/{ms:global.style/}/images/mobile.png)">
+                                            <div>
+                                                <img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://store.mingsoft.net/'+model.upgraderVersionMobileImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
+                                            </div>
+                                        </div>
+                                        <div class="ms-model-info">
+                                            <span v-text="model.upgraderVersionName"></span>
+                                            <img class="ms-model-info-img" :src="model.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
+                                            <img :src="'{ms:global.host/}/{ms:global.style/}/images/level-'+model.upgraderVersionStart+'.png'" />
+                                            <div class="ms-model-type">模板</div>
+                                        </div>
+                                    </div>
+                                </template>
+                                <div class="ms-model-list" style="display: none;" v-show="loading">
+                                    <div class="ms-model-more">
+                                        <div onclick="window.open('http://store.mingsoft.net/mstoreShow.do')">查看更多</div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div role="tabpanel" class="tab-pane" id="plug">
+                            <div class="ms-model-content" style="display: none;" v-show="loading">
+                                <template v-for="pulg in pulgList">
+                                    <div class="ms-model-list">
+                                        <a class="ms-model-img" :href="pulg.upgraderVersionUrl" target="_blank">
+                                            <img :src="'http://store.mingsoft.net/'+pulg.upgraderVersionImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
+                                        </a>
+                                        <div class="ms-model-info">
+                                            <span v-text="pulg.upgraderVersionName"></span>
+                                            <img class="ms-model-info-img" :src="pulg.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
+                                            <img :src="'{ms:global.host/}/{ms:global.style/}/images/level-'+pulg.upgraderVersionStart+'.png'" />
+                                            <div class="ms-model-type">插件</div>
+                                        </div>
+                                    </div>
+                                </template>
+                                <div class="ms-model-list" style="display: none;" v-show="loading">
+                                    <div class="ms-model-more">
+                                        <div onclick="window.open('http://store.mingsoft.net/mstoreShow.do')">查看更多</div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="ms-content-case">
+            <div class="ms-content-case-mian">
+                <div class="ms-content-case-title">
+                    <div class="ms-content-case-title-words">网站案例</div>
+                    <div class="ms-content-case-more">
+                        <a href='{ms:global.url/}/149/index.html'>MORE>></a>
+                    </div>
+                </div>
+                <div class="ms-content-case-list">
+                    {ms:arclist typeid=149 size=6}
+                    <div class="ms-content-main-case">
+                        <div class="ms-content-main-case-img">
+                            <img src="{ms:global.host/}[field.litpic/]">
+                        </div>
+                        <div class="ms-content-main-case-explain">
+                            <div class="ms-content-main-case-title">[field.title/]</div>
+                            <div class="ms-content-main-case-content">
+
+                                <p class="ms-content-main-case-written">
+                                    [field.content/]
+                                </p>
+                            </div>
+                            <div class="ms-content-main-case-click">
+                                <a target="_blank" href="[field.source/]">点击查看</a>
+                            </div>
+                        </div>
+                    </div>
+                    {/ms:arclist}
+                </div>
+            </div>
+        </div>
+        <div class="ms-content-product">
+            <div class="ms-content-product-main">
+                <div class="ms-content-product-title">
+                    <div class="ms-content-product-title-words">产品方向</div>
+                </div>
+                <div class="ms-content-product-list">
+                    <ul class="ms-content-product-list-ul">
+                        <li>
+                            <div class="ms-content-product-list-img">
+                                <a target="_blank" href="http://www.mingsoft.net/html/1/5523/index.html">
+                                    <img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu1.png"></a>
+                            </div>
+                            <div class="ms-content-product-list-content">
+                                <div class="ms-content-product-list-content-title">
+                                    <a target="_blank" href="http://www.mingsoft.net/html/1/5523/index.html">铭飞建站系统MCMS</a></div>
+                                <div class="ms-content-product-list-content-describe">纯Java开发,MCMS支持PC与MOBILE皮肤定制,同时使用MS团队移动JS插件,支持站群。</div></div>
+                        </li>
+                        <li>
+                            <div class="ms-content-product-list-img">
+                                <a target="_blank" href="http://www.mingsoft.net/html/1/5524/index.html">
+                                    <img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu2.jpg"></a>
+                            </div>
+                            <div class="ms-content-product-list-content">
+                                <div class="ms-content-product-list-content-title">
+                                    <a target="_blank" href="http://www.mingsoft.net/html/1/5524/index.html">移动互联网</a></div>
+                                <div class="ms-content-product-list-content-describe">重新定义移动开发,快速、开放、高性能,数据无缝对接,超过500个模块api 接口,方便实现各种应用。</div></div>
+                        </li>
+                        <li>
+                            <div class="ms-content-product-list-img">
+                                <a target="_blank" href="http://www.mingsoft.net/html/1/5526/index.html">
+                                    <img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu3.jpg"></a>
+                            </div>
+                            <div class="ms-content-product-list-content">
+                                <div class="ms-content-product-list-content-title">
+                                    <a target="_blank" href="http://www.mingsoft.net/html/1/5526/index.html">铭飞物联网</a></div>
+                                <div class="ms-content-product-list-content-describe">MS+物联网,让生产企业真正掌握企业命脉,实现互联网+生产,给企业插上信息化翅膀,共享、共荣大数据时代</div></div>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="ms-content-news">
+            <div class="ms-content-news-main">
+                <div class="ms-content-news-main-title">
+                    <div class="ms-content-news-main-title-words">公司动态</div>
+                    <div class="ms-content-news-main-title-more">
+                        <a href='{ms:global.url/}/59/index.html'>MORE>></a>
+                    </div>
+                </div>
+                <div class="ms-content-news-main-img-text">
+                    {ms:arclist typeid=59 size=1}
+                    <img src="{ms:global.host/}[field.litpic/]">
+                    {/ms:arclist}
+                    <ul class="ms-content-news-main-ul">
+                        {ms:arclist typeid=59 size=6}
+                        <li>
+                            <a href="{ms:global.url/}[field.link/]">
+                                <div class="ms-content-news-main-li-title">
+                                    <!-- <span class="ms-content-news-main-li-span">·</span> -->
+                                    <span class="">[field.title/]</span>
+                                </div>
+                                <div class="ms-content-news-main-li-time">[field.date?string("yyyy-mm-dd")/]</div>
+                            </a>
+                        </li>
+                        {/ms:arclist}
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<#include "footer.htm">
+</body>
+</html>
+<script type="text/javascript">
+    var index = new Vue({
+        el: "#indexVue",
+        data: {
+            bannerList: ['01', '02', '03', '04', '05'], //幻灯片列表
+            modelList: [], //模板列表
+            pulgList: [], //插件列表
+            loading: false, //加载状态
+        },
+        methods: {
+            query: function(data, type) {
+                var target = this;
+                ms.web.mstore.list(data, function(json) {
+                    if(type == 'model') {
+                        target.modelList = json.list;
+                    } else {
+                        target.pulgList = json.list;
+                        target.loading = true;
+                    }
+                });
+            },
+            imgMover: function() {
+                var _this = event.target;
+                var ms_top = ($(_this).height()) - 275;
+                if(ms_top < 0) {
+                    ms_top = 0;
+                }
+                $(_this).stop(true);
+                $(_this).animate({
+                    "top": -(ms_top)
+                }, 2500);
+            },
+            imgMout: function() {
+                var _this = event.target;
+                $(_this).stop(true);
+                $(_this).animate({
+                    "top": 0
+                }, 2500);
+            },
+        },
+        mounted: function() {
+            var data = "upgraderVersionType=2&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=5&pageNo=1";
+            this.query(data, 'model');
+            var data = "upgraderVersionType=1&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=5&pageNo=1";
+            this.query(data, 'pulg');
+            /*幻灯*/
+            setTimeout(function() {
+                var bannerSlider = new Slider($('#banner_tabs'), {
+                    time: 5000,
+                    delay: 400,
+                    event: 'hover',
+                    auto: true,
+                    mode: 'fade',
+                    controller: $('#bannerCtrl'),
+                    activeControllerCls: 'active'
+                });
+                $('#banner_tabs .flex-prev').click(function() {
+                    bannerSlider.prev()
+                });
+                $('#banner_tabs .flex-next').click(function() {
+                    bannerSlider.next()
+                });
+            }, 300)
+        },
+    })
+</script>