谁是舞王

src/main/java/com/thmodel/jooq/tables/Memberinfo.java

@@ -43,7 +43,7 @@ import org.jooq.impl.TableImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class Memberinfo extends TableImpl<MemberinfoRecord> {
 
-    private static final long serialVersionUID = -1865616130;
+    private static final long serialVersionUID = -349879476;
 
     /**
      * The reference instance of <code>thmodel.memberinfo</code>
@@ -309,9 +309,9 @@ public class Memberinfo extends TableImpl<MemberinfoRecord> {
     public final TableField<MemberinfoRecord, BigDecimal> SHARE_RATIO_SERVICE = createField("share_ratio_service", org.jooq.impl.SQLDataType.DECIMAL(18, 4).defaultValue(org.jooq.impl.DSL.inline("10.0000", org.jooq.impl.SQLDataType.DECIMAL)), this, "");
 
     /**
-     * The column <code>thmodel.memberinfo.broker_ratio_git</code>.
+     * The column <code>thmodel.memberinfo.broker_ratio_gift</code>.
      */
-    public final TableField<MemberinfoRecord, BigDecimal> BROKER_RATIO_GIT = createField("broker_ratio_git", org.jooq.impl.SQLDataType.DECIMAL(18, 4).defaultValue(org.jooq.impl.DSL.inline("10.0000", org.jooq.impl.SQLDataType.DECIMAL)), this, "");
+    public final TableField<MemberinfoRecord, BigDecimal> BROKER_RATIO_GIFT = createField("broker_ratio_gift", org.jooq.impl.SQLDataType.DECIMAL(18, 4).defaultValue(org.jooq.impl.DSL.inline("10.0000", org.jooq.impl.SQLDataType.DECIMAL)), this, "");
 
     /**
      * The column <code>thmodel.memberinfo.broker_ratio_video</code>.

src/main/java/com/thmodel/jooq/tables/records/MemberinfoRecord.java

@@ -28,7 +28,7 @@ import org.jooq.impl.UpdatableRecordImpl;
 @SuppressWarnings({ "all", "unchecked", "rawtypes" })
 public class MemberinfoRecord extends UpdatableRecordImpl<MemberinfoRecord> {
 
-    private static final long serialVersionUID = -1350285515;
+    private static final long serialVersionUID = -1351004201;
 
     /**
      * Setter for <code>thmodel.memberinfo.PK</code>.
@@ -731,16 +731,16 @@ public class MemberinfoRecord extends UpdatableRecordImpl<MemberinfoRecord> {
     }
 
     /**
-     * Setter for <code>thmodel.memberinfo.broker_ratio_git</code>.
+     * Setter for <code>thmodel.memberinfo.broker_ratio_gift</code>.
      */
-    public void setBrokerRatioGit(BigDecimal value) {
+    public void setBrokerRatioGift(BigDecimal value) {
         set(50, value);
     }
 
     /**
-     * Getter for <code>thmodel.memberinfo.broker_ratio_git</code>.
+     * Getter for <code>thmodel.memberinfo.broker_ratio_gift</code>.
      */
-    public BigDecimal getBrokerRatioGit() {
+    public BigDecimal getBrokerRatioGift() {
         return (BigDecimal) get(50);
     }
 
@@ -854,7 +854,7 @@ public class MemberinfoRecord extends UpdatableRecordImpl<MemberinfoRecord> {
     /**
      * Create a detached, initialised MemberinfoRecord
      */
-    public MemberinfoRecord(Integer pk, Integer membtype, Integer membclass, String qrcode, String tel, String pass, String paypass, String pet, String hphoto, String photo, Integer area, String age, String id, Integer islive, Timestamp mdate, String token, Integer acc, Timestamp lastsign, Integer signdays, Integer introducerpk, String identify, String idA, String idB, String idC, String wid, BigDecimal coinA, BigDecimal coinIr, BigDecimal coinIv, BigDecimal coinIs, BigDecimal coinIrr, BigDecimal coinIvv, BigDecimal coinIss, BigDecimal coinIll, BigDecimal coinI, BigDecimal coinOr, BigDecimal coinOv, BigDecimal coinOs, BigDecimal coinOm, BigDecimal coinO, BigDecimal coinOi, BigDecimal coinOp, String phone, BigDecimal coinIrrr, BigDecimal coinIrrrm, BigDecimal incomeRatioGift, BigDecimal incomeRatioVideo, BigDecimal incomeRatioService, BigDecimal shareRatioGift, BigDecimal shareRatioVideo, BigDecimal shareRatioService, BigDecimal brokerRatioGit, BigDecimal brokerRatioVideo, BigDecimal brokerRatioService, BigDecimal coinShare, Integer canChat, String ip, String uuid) {
+    public MemberinfoRecord(Integer pk, Integer membtype, Integer membclass, String qrcode, String tel, String pass, String paypass, String pet, String hphoto, String photo, Integer area, String age, String id, Integer islive, Timestamp mdate, String token, Integer acc, Timestamp lastsign, Integer signdays, Integer introducerpk, String identify, String idA, String idB, String idC, String wid, BigDecimal coinA, BigDecimal coinIr, BigDecimal coinIv, BigDecimal coinIs, BigDecimal coinIrr, BigDecimal coinIvv, BigDecimal coinIss, BigDecimal coinIll, BigDecimal coinI, BigDecimal coinOr, BigDecimal coinOv, BigDecimal coinOs, BigDecimal coinOm, BigDecimal coinO, BigDecimal coinOi, BigDecimal coinOp, String phone, BigDecimal coinIrrr, BigDecimal coinIrrrm, BigDecimal incomeRatioGift, BigDecimal incomeRatioVideo, BigDecimal incomeRatioService, BigDecimal shareRatioGift, BigDecimal shareRatioVideo, BigDecimal shareRatioService, BigDecimal brokerRatioGift, BigDecimal brokerRatioVideo, BigDecimal brokerRatioService, BigDecimal coinShare, Integer canChat, String ip, String uuid) {
         super(Memberinfo.MEMBERINFO);
 
         set(0, pk);
@@ -907,7 +907,7 @@ public class MemberinfoRecord extends UpdatableRecordImpl<MemberinfoRecord> {
         set(47, shareRatioGift);
         set(48, shareRatioVideo);
         set(49, shareRatioService);
-        set(50, brokerRatioGit);
+        set(50, brokerRatioGift);
         set(51, brokerRatioVideo);
         set(52, brokerRatioService);
         set(53, coinShare);

src/main/webapp/dancer/activityDetail.jsp

@@ -175,13 +175,13 @@
 <script>
     new Vue({
         el: '#app',
-        data() {
+        data: function() {
             return {
                 tabList: ['介绍', '规则', '奖品'],
                 nowTab: 0
             }
         },
-        mounted() {
+        mounted: function() {
 
         },
         methods: {

src/main/webapp/dancer/brandDetail.jsp

@@ -1,14 +1,25 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: 15293
-  Date: 2018/12/26
-  Time: 11:41
-  To change this template use File | Settings | File Templates.
---%>
+<%@ page import="org.jooq.DSLContext" %>
+<%@ page import="com.thmodel.util.JspUtils" %>
+<%@ page import="org.jooq.impl.DSL" %>
+<%@ page import="com.thmodel.dbconnection.DbConnection" %>
+<%@ page import="static com.thmodel.jooq.Tables.ADS" %>
+<%@ page import="org.jooq.Record" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    int id = JspUtils.getInt(request, "id");
+    DSLContext ctx = DSL.using(DbConnection.getPara("MySQLURL"));
+    Record record = ctx.select().from(ADS).where(ADS.ID.equal(id)).fetchAny();
+    String name = "", detail = "";
+    if (record != null) {
+        name = record.get(ADS.NAME);
+        detail = record.get(ADS.DETAIL);
+    }
+    ctx.close();
+%>
 <html>
 <head>
-    <title>品牌详情</title>
+    <title><%=name%>
+    </title>
     <jsp:include page="meta.jsp"/>
     <style>
         .container {
@@ -22,82 +33,37 @@
             overflow: auto;
             background: rgba(255, 255, 255, 1);
             border-radius: 12px 12px 0 0;
-            margin: 0 20px;
+            margin: 15px 20px 0 20px;
             padding: 20px 15px;
             display: flex;
             flex-direction: column;
         }
 
-        .titleSe {
-            margin-top: 20px;
-            font-size: 16px;
-            font-weight: bold;
-            color: rgba(0, 0, 0, 1);
-            line-height: 22px;
-
-        }
-
-        .message {
-            font-size: 13px;
-            color: rgba(51, 51, 51, 1);
-            line-height: 18px;
-            margin-top: 10px;
-        }
-
-        img{
-            width:305px;
-            border-radius:8px;
+        img {
+            width: 100%;
+            height: auto;
+            border-radius: 8px;
+            margin: 15px 0;
         }
     </style>
 </head>
 <body>
 <div class="container" id="app">
-    <template>
-        <tabber :tab-list="tabList" :now-tab="nowTab" :tab-width="70" @choose-tab="chooseTab"></tabber>
-        <div class="content">
-            <img src="http://bpic.588ku.com/illus_pic/18/11/13/93fbb8053a6c5cf84a9db61df763dc40.jpg" alt="">
+    <div class="content">
+        <%=detail%>
+        <%--<template v-for="item in 100">--%>
+        <%--<div class="titleSe">--%>
+        <%--二级标题--%>
+        <%--</div>--%>
 
-            <template v-for="item in 100">
-                <div class="titleSe">
-                    二级标题
-                </div>
-
-                <div class="message">
-                    1:详细文字内容详细文字内容，详细文字内容详细文字。内容详细文字内容详细文字内
-                </div>
-                <div class="message">
-                    1:详细文字内容详细文字内容，详细文字内容详细文字。内容详细文字内容详细文字内
-                </div>
-            </template>
-        </div>
-
-    </template>
+        <%--<div class="message">--%>
+        <%--1:详细文字内容详细文字内容，详细文字内容详细文字。内容详细文字内容详细文字内--%>
+        <%--</div>--%>
+        <%--<div class="message">--%>
+        <%--1:详细文字内容详细文字内容，详细文字内容详细文字。内容详细文字内容详细文字内--%>
+        <%--</div>--%>
+        <%--</template>--%>
+    </div>
 </div>
 </body>
-<jsp:include page="component/tabber.jsp"/>
-<script>
-    new Vue({
-        el: '#app',
-        data() {
-            return {
-                tabList: ['介绍', '规则', '奖品'],
-                nowTab: 0,
-            }
-        },
-        mounted() {
-
-        },
-        methods: {
-            chooseTab(index) {
-                this.nowTab = index
-
-
-                var list = []
-            }
-        },
-        components: {
-            'tabber': tabContent
-        },
-    })
-</script>
 </html>

src/main/webapp/dancer/component/tabber.jsp

@@ -69,7 +69,7 @@
             </div>
         </div>`,
         methods:{
-            chooseTab(index){
+            chooseTab: function(index){
                 this.$emit('choose-tab',index)
             }
         }

src/main/webapp/dancer/corp.jsp

@@ -100,26 +100,24 @@
 <script>
     new Vue({
         el: '#app',
-        data() {
+        data: function () {
             return {
                 tabList: ['介绍', '规则', '奖品'],
                 nowTab: 0
             }
         },
-        mounted() {
+        mounted: function () {
 
         },
         methods: {
-            chooseTab(index) {
-                this.nowTab = index
-
-
+            chooseTab: function (index) {
+                this.nowTab = index;
                 var list = []
             }
         },
         components: {
             'tabber': tabContent
-        },
+        }
     })
 </script>
 </html>

src/main/webapp/dancer/index.jsp

@@ -386,10 +386,10 @@
             </div>
             <div class="swiper-wrapper" style="height: auto;">
                 <swiper class="swiper" :options="swiperOption" :style="{height:bannerHeight}">
-                    <%--<swiper-slide v-for="item in ads" class="swiper-slide"--%>
-                    <%--:style="{backgroundImage: 'url(${pageContext.request.contextPath}/'+item.pic+')'}"></swiper-slide>--%>
-                    <swiper-slide class="swiper-slide"
+                    <swiper-slide class="swiper-slide" key="contact"
                                   style="background-image: url('${pageContext.request.contextPath}/image/dancer/img_guanming.png')"></swiper-slide>
+                    <swiper-slide v-for="item in ads" :key="item.id" class="swiper-slide"
+                                  :style="{backgroundImage: 'url(${pageContext.request.contextPath}/'+item.pic+')'}"></swiper-slide>
                 </swiper>
                 <div class="swiper-pagination"></div>
             </div>
@@ -464,11 +464,12 @@
     Vue.use(window.VueAwesomeSwiper);
     new Vue({
         el: '#app',
-        data() {
+        data: function () {
             var self = this;
             return {
                 ads: <%=ads%>,
                 swiperOption: {
+                    initialSlide: 0,
                     autoplay: true,
                     loop: true,
                     direction: 'horizontal',
@@ -480,9 +481,12 @@
                         type: 'bullets'
                     },
                     on: {
-                        click: function (e) {
-                            window.location = '${pageContext.request.contextPath}/dancer/corp.jsp';
-                            // self.clickBanner()
+                        tap: function () {
+                            if (this.realIndex === 0) {
+                                window.location.href = 'corp.jsp';
+                            } else {
+                                window.location.href = 'brandDetail.jsp?id=' + self.ads[this.realIndex - 1].id;
+                            }
                         }
                     }
                 },
@@ -498,14 +502,7 @@
                 showDialog: false
             }
         },
-        mounted() {
-            var mySwiper = new Swiper('.swiper-container', {
-                autoplay: true,//可选选项，自动滑动
-                pagination: {
-                    el: '.swiper-pagination',
-                    clickable: true
-                }
-            });
+        mounted: function () {
             this.getJoinPlayer()
         },
         components: {
@@ -537,7 +534,7 @@
             }
         },
         methods: {
-            getJoinPlayer() {
+            getJoinPlayer: function () {
                 if (!this.joinFlag) {
                     return
                 }
@@ -561,9 +558,9 @@
                     }.bind(this)
                 })
             },
-            getNot() {
+            getNot: function () {
             },
-            menu() {
+            menu: function () {
                 if ($('#app').scrollTop() + $('#app').height() + 50 >= document.getElementById('app').scrollHeight) {
                     if (this.joinFlag) {
                         this.currentPage++;

src/main/webapp/dancer/modelDetail.jsp

@@ -843,9 +843,12 @@
                         type: 'bullets'
                     },
                     on: {
-                        click: function (e) {
-                            window.location = '${pageContext.request.contextPath}/dancer/corp.jsp';
-                            // self.clickBanner()
+                        tap: function () {
+                            if (this.realIndex === 0) {
+                                window.location = '${pageContext.request.contextPath}/dancer/corp.jsp';
+                            } else {
+                                window.location.href = 'brandDetail.jsp?id=' + self.ads[this.realIndex - 1].id;
+                            }
                         }
                     }
                 },
@@ -977,9 +980,6 @@
                     })
                 }
             },
-            clickBanner: function () {
-                this.showDialog = true
-            },
             call: function () {
                 window.location.href = "tel:17768144625";
                 this.showDialog = false

src/main/webapp/dancer/rankingList.jsp

@@ -121,7 +121,7 @@
 <script>
     new Vue({
         el: '#app',
-        data() {
+        data: function () {
             return {
                 tabList: ['个人', '战队'],
                 nowTab: 0,
@@ -129,18 +129,18 @@
                 myInfo: ${myInfo}
             }
         },
-        mounted() {
+        mounted: function () {
 
         },
         methods: {
-            chooseTab(index) {
+            chooseTab: function (index) {
                 this.nowTab = index
             }
         },
         components: {
             'tabber': tabContent,
             'ranking-item': rankingItem
-        },
+        }
     })
 </script>
 </html>

src/main/webapp/dancer/search.jsp

@@ -271,7 +271,7 @@
 <script>
     new Vue({
         el: '#app',
-        data() {
+        data: function () {
             return {
                 searchVal: "",
                 isFocus: false,
@@ -280,7 +280,7 @@
                 resultList: []
             }
         },
-        mounted() {
+        mounted: function () {
             this.getHistory()
         },
         components: {
@@ -294,12 +294,12 @@
                 window.location.href = '${pageContext.request.contextPath}/dancer/modelDetail.jsp?modelpk=' + item.modelpk
                     + '&memberpk=<%=memberpk%>&activitypk=<%=activitypk%>';
             },
-            getHistory() {
+            getHistory: function () {
                 var history = localStorage['thmodelDancerHistory'] == null ? [] : JSON.parse(localStorage['thmodelDancerHistory']);
 
                 this.history = history;
             },
-            addHistory(str) {
+            addHistory: function (str) {
                 var history = localStorage['thmodelDancerHistory'] == null ? [] : JSON.parse(localStorage['thmodelDancerHistory']);
                 if (history.indexOf(str) == -1) {
                     history.splice(0, 0, str);
@@ -308,7 +308,7 @@
                 this.getHistory();
 
             },
-            clearout() {
+            clearout: function () {
                 var con;
                 con = confirm("确定要清除浏览数据吗?"); //在页面上弹出对话框
                 if (con == true) {
@@ -317,7 +317,7 @@
                 }
 
             },
-            inputEvent(e) {
+            inputEvent: function (e) {
                 if (e.keyCode == 13) {
                     if (!this.searchVal) {
                         alert('搜索内容不能为空!');
@@ -327,7 +327,7 @@
                     this.getSearch(this.searchVal)
                 }
             },
-            getSearch(keyword) {
+            getSearch: function (keyword) {
                 this.showHistory = false;
                 this.searchVal = keyword;
                 $.get({