修改banner

b32fc85c · mamingqun · 7e803579 · b32fc85c · b32fc85c · b32fc85c
Commit b32fc85c authored Jan 27, 2019 by mamingqun
16 changed files
--- a/src/components/CardPrize.vue
+++ b/src/components/CardPrize.vue
@@ -21,8 +21,8 @@
                    <div class="infoBox">
                        <div class="title">《{{item.desc}}》</div>
                        <div class="miaoshu">{{item.memo}}</div>
-                        <div class="time">{{item.image_time}}</div>
+                        <!-- <div class="time">{{item.image_time}}</div>
-                        <div class="location">{{item.image_address}}</div>
+                        <div class="location">{{item.image_address}}</div> -->
                    </div>
                </router-link>
            </li>

--- a/src/components/Description.vue
+++ b/src/components/Description.vue
@@ -6,10 +6,9 @@
            <div class="contentBox">
                <div class="shuomingTitle"></div>
                <div class="text1">
-                    <p
+                    <p>以“春节回家”为主题方向，有奖征集与万达人和万达粉丝们春节回家过年相关的摄影作品。</p>
-                        class="dingwei"
+                    <p>反映春运返乡道路上的艰难与劳顿，回家后的放松与惬意，亲人团聚时刻的幸福和笑脸，传递亲人、爱人、朋友、同窗、战友等不同情感的动人瞬间和情感故事。</p>
-                    >以“回家”为主题方向，有奖征集万达人和万达粉丝们春节回家过年相关的摄影作品。反映春运返乡道路上的艰难与劳顿，回家后的放松与惬意，亲人团聚时刻的幸福和笑脸，传递亲人、爱人、朋友、同窗、战友等不同情感的动人瞬间和情感故事。投稿作品要求立意鲜明、形象生动、情感真切，有较强的视觉表现力。</p>
+                    <p>投稿作品要求立意鲜明、形象生动、情感真切，有较强的视觉表现力。</p>
-                    <!-- <p>月赛参与方式：关注“丹寨万达小镇”公众号，点击导航菜单“摄影月赛”即可参与！</p> -->
                </div>
                <div class="text5">
                    <div class="title"></div>
@@ -204,7 +203,7 @@ export default {
        }
        .text1 {
-            height: 355px;
+            height: 555px;
            background: url("~@/pages/index/assets/images/shuoming/text1.png")
                no-repeat center;
            background-size: 100% auto;
@@ -213,6 +212,13 @@ export default {
            padding-right: 40px;
            padding-top: 55px;
            margin-bottom: 47px;
+            p {
+                line-height: 48px;
+                text-indent: 2em;
+                text-align: justify;
+                margin-bottom: 8px;
+            }
        }
        p {

--- a/src/components/Fuceng.vue
+++ b/src/components/Fuceng.vue
@@ -3,7 +3,7 @@
        <div class="fucengBox">
            <div class="content">
                <div class="title">最美万达摄影月赛·春节回家</div>
-                <p>以“春节回家”为主题方向，<span class='jiacu'>有奖征集</span>万达人和万达粉丝们春节回家过年相关的 <span class='jiacu'>摄影作品</span>。</p>
+                <p>以“春节回家”为主题方向，<span class='jiacu'>有奖征集</span>与万达人和万达粉丝们春节回家过年相关的<span class='jiacu'>摄影作品</span>。</p>
                <p>反映春运返乡道路上的艰难与劳顿，回家后的放松与惬意，亲人团聚时刻的幸福和笑脸，传递亲人、爱人、朋友、同窗、战友等不同情感的动人瞬间和情感故事。</p>
                <p>投稿作品要求立意鲜明、形象生动、情感真切，有较强的视觉表现力。</p>
            </div>
@@ -76,11 +76,11 @@ export default {
            }
            p{
-                font-size: 30px;
+                font-size: 28px;
-                line-height: 50px;
+                line-height: 43px;
                color: #002663;
                text-align: justify;
-                // margin-bottom: 10px;
+                margin-bottom: 15px;
            }
        }
@@ -92,6 +92,7 @@ export default {
            left: 50%;
            transform: translate(-50%, 0);
            // background: red;
+            z-index: 100000;
        }
    }
 }

--- a/src/modules/js/api.js
+++ b/src/modules/js/api.js
-// api地址
-var server = 'http://web-comment.canskj.cn/new';
-var extra = '8';
-//包装的地址
-var wrapHref = 'http://web-comment.canskj.cn/home/contest/h5/8';
-//首页地址
-var indexHref = 'http://web-comment.iyunfish.cn/home/contest/h5/8';
-// 个人中心地址
-var userCenterHref = 'http://web-comment.iyunfish.cn/home/contest/h5/newuser/8';
-var shareImg = 'http://web-comment.iyunfish.cn/home/contest/h5/static/share.jpg';
 // // api地址
-// var server = 'http://wd-h5.iyunfish.com/new';
+// var server = 'http://web-comment.canskj.cn/new';
 // var extra = '8';
 // //包装的地址
-// var wrapHref = 'http://wd-h5.bdideal.com/home/contest/h5/8';
+// var wrapHref = 'http://web-comment.canskj.cn/home/contest/h5/8';
 // //首页地址
-// var indexHref = 'http://wd-h5.iyunfish.com/home/contest/h5/8';
+// var indexHref = 'http://web-comment.iyunfish.cn/home/contest/h5/8';
 // // 个人中心地址
-// var userCenterHref = 'http://wd-h5.iyunfish.com/home/contest/h5/newuser/8';
+// var userCenterHref = 'http://web-comment.iyunfish.cn/home/contest/h5/newuser/8';
+// var shareImg = 'http://web-comment.iyunfish.cn/home/contest/h5/static/share.jpg';
+// api地址
+var server = 'http://wd-h5.iyunfish.com/new';
+var extra = '8';
+//包装的地址
+var wrapHref = 'http://wd-h5.bdideal.com/home/contest/h5/8';
+//首页地址
+var indexHref = 'http://wd-h5.iyunfish.com/home/contest/h5/8';
+// 个人中心地址
+var userCenterHref = 'http://wd-h5.iyunfish.com/home/contest/h5/newuser/8';
-// var shareImg = 'http://wd-h5.iyunfish.com/home/contest/h5/static/share.jpg';
+var shareImg = 'http://wd-h5.iyunfish.com/home/contest/h5/static/share.jpg';

--- a/src/pages/index/Shouye.vue
+++ b/src/pages/index/Shouye.vue
@@ -114,8 +114,8 @@
        <div class="wangqiList"></div>
        <a v-show="tabActive !== 3" :href="userCenter" class="user"></a>
        <mt-actionsheet :actions="wangqiTitle" v-model="wangqiList"></mt-actionsheet>
-        <!-- <Fuceng v-if="fucengButton=== 'close'?false:true"></Fuceng> -->
+        <Fuceng v-if="fucengButton=== 'close'?false:true"></Fuceng>
-        <Fuceng></Fuceng>
+        <!-- <Fuceng></Fuceng> -->
    </div>
 </template>

--- a/src/pages/index/assets/images/indexBanner.jpg
+++ b/src/pages/index/assets/images/indexBanner.jpg
--- a/src/pages/index/assets/images/indexBanner11.jpg
+++ b/src/pages/index/assets/images/indexBanner11.jpg
--- a/src/pages/index/assets/images/shuoming/text1.png
+++ b/src/pages/index/assets/images/shuoming/text1.png
--- a/src/pages/index/assets/images/shuoming/text111.png
+++ b/src/pages/index/assets/images/shuoming/text111.png
--- a/src/pages/user/Address.vue
+++ b/src/pages/user/Address.vue
@@ -150,7 +150,7 @@ export default {
        color: #333;
        font-size: 30px;
        line-height: 45px;
-        padding-left: 20px;
+        // padding-left: 20px;
        padding-top: 100px;
        p{

--- a/src/pages/user/App.vue
+++ b/src/pages/user/App.vue
@@ -50,25 +50,25 @@ export default {
        // this.hiddenBar();
    },
    mounted() {
-        // var tar_userinfo = localStorage.getItem('tar_userinfo');
+        var tar_userinfo = localStorage.getItem('tar_userinfo');
-        // if (tar_userinfo) {
+        if (tar_userinfo) {
-        //     var tar_openid = localStorage.getItem('tar-uuid-129831');
+            var tar_openid = localStorage.getItem('tar-uuid-129831');
-        //     tar.init({
+            tar.init({
-        //         tar_debug: !1,
+                tar_debug: !1,
-        //         tar_token: "3fcfe0ef160eb53266161898524e1708",
+                tar_token: "3fcfe0ef160eb53266161898524e1708",
-        //         tar_tid: "129831",
+                tar_tid: "129831",
-        //         tar_userinfo: [{
+                tar_userinfo: [{
-        //             openid: tar_openid                }]
+                    openid: tar_openid                }]
-        //     })
+            })
-        // } else {
+        } else {
-        //     tar.init({
+            tar.init({
-        //         tar_debug: !1,
+                tar_debug: !1,
-        //         tar_token: "3fcfe0ef160eb53266161898524e1708",
+                tar_token: "3fcfe0ef160eb53266161898524e1708",
-        //         tar_tid: "129831",
+                tar_tid: "129831",
-        //         tar_scope: "snsapi_base",
+                tar_scope: "snsapi_base",
-        //         tar_appid: "wxfa065f3046ad9c21"
+                tar_appid: "wxfa065f3046ad9c21"
-        //     })
+            })
-        // }
+        }
    },
    methods: {
        hiddenBar() {

--- a/万达回家1.25.20.10正式.zip
+++ b/万达回家1.25.20.10正式.zip
--- a/万达回家1.25.20.25正式.zip
+++ b/万达回家1.25.20.25正式.zip
--- a/14.17万达回家正式.zip
+++ b/14.17万达回家正式.zip
--- a/万达回家20.42正式.zip
+++ b/万达回家20.42正式.zip
--- a/万达回家测试.zip
+++ b/万达回家测试.zip