- + + + + + + {{item.menu_name}} + + + + + - + - + bindchange="changeBannerIndex" data-keyname="ztBannerIndex"> + @@ -66,26 +77,26 @@ - + - + - + - + - {{item.title}} - + {{item.title}} + {{item.price/100}} @@ -100,13 +111,14 @@ - - - {{item.title}} - - {{item.price/100}} + + + {{item.title}} + + {{item.price/100}} + - + @@ -115,23 +127,26 @@ bindchange="changeBannerIndex" data-keyname="XPathBannerIndex"> - + + + - + - + - + + @@ -142,14 +157,14 @@ - + 更多 - + @@ -158,11 +173,11 @@ - + - + @@ -179,11 +194,11 @@ - + - + @@ -201,20 +216,20 @@ - + - + - - + + - + @@ -222,11 +237,11 @@ - + - + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index b8441ef..d572713 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -80,6 +80,7 @@ page { .top-icons { display: flex; padding:0 20rpx; + align-items: center; } .top-icon-item { margin-bottom: 20rpx; @@ -101,9 +102,19 @@ page { width: 100rpx; height: 100rpx; display: block; + transition: all 0.2s; /* margin: 0 auto; */ /* margin-bottom: 10rpx; */ } +/* 金刚区滚动效果 */ +.top-icon-item.active{ + height: 160rpx !important; + margin-bottom: 0; +} +.top-icon-item.active image{ + height: 130rpx; + width: 130rpx; +} .content-box { margin: 0 25rpx; @@ -181,6 +192,7 @@ page { .season-hot .season-item image{ width: 100%; height: 200rpx; + border-top-right-radius: 14rpx; } .season-hot .season-item .hot-cover-img{ position: absolute; @@ -188,6 +200,7 @@ page { left: 0; width: 100%; height: 100%; + border-radius: 0; } .xsth-more { @@ -223,20 +236,20 @@ page { border-radius: 0rpx; overflow: hidden; position: relative; - background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png"); - background-size: 100% 100%; - padding: 3rpx; + /* background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/90645448ce9a82c91916543bc6c4935c.png"); + background-size: 100% 100%; */ + /* padding: 3rpx; */ } .xpth-banner-swiper{ height: 100%; - border-radius: 20rpx; + /* border-radius: 20rpx; */ overflow: hidden; } .xpth-banner image { flex: 1; height: 100%; width: 100%; - border-radius: 20rpx; + /* border-radius: 20rpx; */ } .xpth-banner-dot-list{ position: absolute; @@ -262,37 +275,42 @@ page { .xpth-item { border-radius: 20rpx; height: 153rpx; + width: 100%; display: flex; margin-bottom: 13rpx; - background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png"); - background-size: 100% 100%; - padding: 1rpx; + /* background-image: url("https://static.ticket.sz-trip.com/uploads/20250526/ed62e372f9c8874f9b50b40f70982202.png"); */ + background: white; + position: relative; + } + .xpth-product .cover-image{ + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } .xpth-item:last-child { margin-bottom: 0; } /* 元旦修改新增样式 */ - .xpth-item image { - /* width: 160rpx; - height: 160rpx; - background: #FFE7C0; - border-radius: 15rpx 0 0 15rpx; */ + .xpth-item .prod-img { width: 157rpx; - height: 154rpx; - /* background: #72707D; */ + height: 100%; border-radius: 20rpx; - /* margin-right: 15.33rpx; */ flex-shrink: 0; } /* 元旦修改新增样式 */ .xpth-item-content { - width: 100%; + width: 220rpx; + flex: 1; display: flex; flex-direction: column; justify-content: space-around; /* background: #FBECDE; */ - padding-left: 15.33rpx; + padding:0 14rpx; border-radius: 0 15rpx 15rpx 0; + background: white; + box-sizing: border-box; } /* 元旦修改新增样式 */ .xpth-item-title { @@ -301,7 +319,6 @@ page { font-family: PingFang SC; font-weight: 500; color: #333333; - margin-right: 18rpx; /* height: 80rpx; */ } @@ -310,7 +327,6 @@ page { display: flex; justify-content: space-between; align-items: center; - padding-right: 13.33rpx; } /* 元旦修改新增样式 */ .xpth-item-price { @@ -623,7 +639,7 @@ page { .other-plats image { width: 153.33rpx; display: block; - height: 146.67rpx; + height: 111.33rpx; margin-bottom: 15rpx; } @@ -871,3 +887,19 @@ page { height: 0; color: transparent; } + +.xpth-cover{ + width: 255rpx; + height: 95rpx; + background: rgba(255, 255, 255, 0.8); + font-weight: 500; + font-size: 24rpx; + color: #333333; + position: absolute; + bottom: 8rpx; + left: 9rpx; + right: 9rpx; + border-radius: 13rpx; + padding: 15rpx 10rpx; + box-sizing: border-box; +} \ No newline at end of file diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml index d1cf870..99e2af9 100644 --- a/pages/list/activitynew/index.wxml +++ b/pages/list/activitynew/index.wxml @@ -85,7 +85,7 @@ --> - + 热映 影院 diff --git a/pages/order/components/contact/index.js b/pages/order/components/contact/index.js index 5871ac1..27a8afe 100644 --- a/pages/order/components/contact/index.js +++ b/pages/order/components/contact/index.js @@ -97,6 +97,7 @@ Component({ this.setData({ phone:res.data.mobile }) + console.log('setLinkman',this.properties.is_authentication) this.triggerEvent("setLinkman",{phone:this.data.phone}) } }) diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index 67b9896..04c5c89 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -226,6 +226,7 @@ Page({ this.setData({ phone:e.detail.phone }) + console.log('setphone', e.detail.phone) }else { console.log(e); let linkmanList = e.detail; diff --git a/pages/pbService/aiHelpYou/index.js b/pages/pbService/aiHelpYou/index.js index cfca763..0937865 100644 --- a/pages/pbService/aiHelpYou/index.js +++ b/pages/pbService/aiHelpYou/index.js @@ -63,6 +63,7 @@ Page({ }, setUrl (url) { + console.log(url) this.setData({ webUrl:url }) diff --git a/project.private.config.json b/project.private.config.json index 33ab55d..f0e8b11 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -6,6 +6,20 @@ "condition": { "miniprogram": { "list": [ + { + "name": "subPackages/feiyiNew/CGCIndex/index", + "pathName": "subPackages/feiyiNew/index", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "subPackages/index/index", + "pathName": "subPackages/indexGQ/index", + "query": "", + "launchMode": "default", + "scene": null + }, { "name": "subPackages/password/setting/setting", "pathName": "subPackages/password/setting/setting", @@ -34,13 +48,6 @@ "launchMode": "default", "scene": null }, - { - "name": "subPackages/feiyiNew/CGCIndex/index", - "pathName": "subPackages/feiyiNew/CGCIndex/index", - "query": "", - "launchMode": "default", - "scene": null - }, { "name": "subPackageCheckPoint/pages/index/index", "pathName": "subPackageCheckPoint/pages/index/index", @@ -62,13 +69,6 @@ "launchMode": "default", "scene": null }, - { - "name": "subPackages/index/index", - "pathName": "subPackages/index/index", - "query": "", - "launchMode": "default", - "scene": null - }, { "name": "首页", "pathName": "subPackages/indexGQ/index", diff --git a/subPackages/feiyiNew/CGCIndex/index.js b/subPackages/feiyiNew/CGCIndex/index.js index 45cdd70..7b669cc 100644 --- a/subPackages/feiyiNew/CGCIndex/index.js +++ b/subPackages/feiyiNew/CGCIndex/index.js @@ -54,11 +54,11 @@ Page({ getBanner: function() { // 大banner - commonApi._post("adv/getAdv", {position: 0,type_id: 3}).then(res => { + commonApi._post("adv/getAdv", {position: 7,type_id: 3}).then(res => { this.setData({banner: res.data || []}) }) // 分类旁的广告 - commonApi._post("adv/getAdv", { position: 1,type_id: 3}).then(res => { + commonApi._post("adv/getAdv", { position: 8,type_id: 3}).then(res => { this.setData({xiaobanner: res.data || [] }) }) }, @@ -154,8 +154,8 @@ Page({ commonApi._post("travels/getList", { page_no: 0, page_num: 4, - // type_key: 'feiyishouzha', - type_key: 'someArt', + type_key: 'feiyishouzha', + // type_key: 'someArt', }).then(res => { if (res) { this.setData({handwrittenList: res.data.rows || [] }) @@ -168,8 +168,8 @@ Page({ commonApi._post("multimedia/media_list", { limit: 1, page: 1, - class_id: 139, - // class_id: 140, + // class_id: 139, + class_id: 140, type: 1, }).then(res => { if (res) { @@ -194,15 +194,16 @@ Page({ this.setData({hotIndex: index}) let param = { apiUrl: 'product/get_product_by_tag', - limit: 10,offset: 0,tag_id: 363, - // tag_id: 642 + limit: 100,offset: 0, + // tag_id: 363, + tag_id: 642 } if (index == 1) { param = { apiUrl: "multimedia/media_list", limit: 100,page: 1,type: 1, - class_id: 139, - // class_id: 141, + // class_id: 139, + class_id: 141, } } diff --git a/subPackages/feiyiNew/CGCIndex/index.wxml b/subPackages/feiyiNew/CGCIndex/index.wxml index d1674c1..e115fe9 100644 --- a/subPackages/feiyiNew/CGCIndex/index.wxml +++ b/subPackages/feiyiNew/CGCIndex/index.wxml @@ -21,7 +21,7 @@ - + @@ -50,7 +50,7 @@ mode="" style="width: 59rpx;height: 20rpx;" bind:tap="goMoreList" data-url="{{'/subPackages/feiyiNew/CGCTime/index'}}"> - @@ -67,8 +67,14 @@ - + + + + + {{item.title}} + + diff --git a/subPackages/feiyiNew/CGCIndex/index.wxss b/subPackages/feiyiNew/CGCIndex/index.wxss index 57d088e..b51fa78 100644 --- a/subPackages/feiyiNew/CGCIndex/index.wxss +++ b/subPackages/feiyiNew/CGCIndex/index.wxss @@ -81,7 +81,7 @@ page{ position: relative; margin-top: 20rpx; } -.time-box .play { +.play { position: absolute; top: 0; bottom: 0; diff --git a/subPackages/feiyiNew/CGCLetter/index.js b/subPackages/feiyiNew/CGCLetter/index.js index a12c51d..0674e48 100644 --- a/subPackages/feiyiNew/CGCLetter/index.js +++ b/subPackages/feiyiNew/CGCLetter/index.js @@ -45,10 +45,12 @@ Page({ commonApi._post("travels/getList", { page_no: this.data.page_no, page_num: 10, - // type_key: 'feiyishouzha', - type_key: 'someArt', + type_key: 'feiyishouzha', + // type_key: 'someArt', }).then(res => { + if (res) { + this.data.page_no++ this.setData({list:list.concat(res.data.rows||[])}) if (res.data.rows.length<10) { this.data.haveMore = false @@ -59,7 +61,7 @@ Page({ // 获取头图 getHeaderImg: function () { commonApi._post("multimedia/detail", {id: 2360}).then(res=>{ - if (res) { + if (res &&res.data &&res.data.head_img) { this.setData({headImg: res.data.head_img}) } }) diff --git a/subPackages/feiyiNew/CGCLetter/index.wxml b/subPackages/feiyiNew/CGCLetter/index.wxml index 0415012..d60b25e 100644 --- a/subPackages/feiyiNew/CGCLetter/index.wxml +++ b/subPackages/feiyiNew/CGCLetter/index.wxml @@ -13,8 +13,8 @@ {{item.subtitle}} - - {{item.nickname}} + diff --git a/subPackages/feiyiNew/CGCTime/index.js b/subPackages/feiyiNew/CGCTime/index.js index 71e0002..3f2269b 100644 --- a/subPackages/feiyiNew/CGCTime/index.js +++ b/subPackages/feiyiNew/CGCTime/index.js @@ -39,11 +39,12 @@ Page({ commonApi._post("multimedia/media_list", { limit: 10, page: this.data.page_no, - class_id: 139, - // class_id: 140, + // class_id: 139, + class_id: 140, type: 1, }).then(res => { if (res) { + this.data.page_no++ this.setData({list:list.concat(res.data.data||[])}) if (res.data.data.length<10) { this.data.haveMore = false diff --git a/subPackages/feiyiNew/CGCTime/index.wxml b/subPackages/feiyiNew/CGCTime/index.wxml index d60bb26..875140f 100644 --- a/subPackages/feiyiNew/CGCTime/index.wxml +++ b/subPackages/feiyiNew/CGCTime/index.wxml @@ -6,12 +6,12 @@ - + - - + {{item.title}} diff --git a/subPackages/feiyiNew/index.js b/subPackages/feiyiNew/index.js index 25e3d01..8402dc5 100644 --- a/subPackages/feiyiNew/index.js +++ b/subPackages/feiyiNew/index.js @@ -393,7 +393,8 @@ Page({ // 获取左侧二级分类 getType() { commonApi._post("product/tag_list",{ - pid:5, //父标签的ID + // pid:645, //父标签的ID + pid: 5, }).then(res=>{ this.setData({ typeList:res.data diff --git a/subPackages/postSearch/index.js b/subPackages/postSearch/index.js index 55ce67b..2f9224d 100644 --- a/subPackages/postSearch/index.js +++ b/subPackages/postSearch/index.js @@ -40,6 +40,7 @@ Page({ type='1' } else { id = '5' + // id = '645' type='2' } this.setData({