From 7b6459a082e31b841730afbf82443d44cfeb40af Mon Sep 17 00:00:00 2001 From: GJW200011 <2399547226@qq.com> Date: Tue, 21 Dec 2021 15:26:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=20=E6=90=9C=E7=B4=A2search?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/search/search.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pages/index/search/search.js b/pages/index/search/search.js index 5f30368..f4d6ade 100644 --- a/pages/index/search/search.js +++ b/pages/index/search/search.js @@ -1,6 +1,6 @@ // pages/index/search/search.js import { - httpUtil,http, + httpUtil, http, location_city } from "../../../utils/util" Page({ @@ -11,16 +11,16 @@ Page({ data: {}, search_(keyword, city_id) { const search_his = wx.getStorageSync('search_his') || [] - if ((keyword && "undefined" !== keyword)||this.data.placeholder) { - if (!keyword ){ - keyword =this.data.placeholder + if ((keyword && "undefined" !== keyword) || this.data.placeholder) { + if (!keyword) { + keyword = this.data.placeholder } - for(var i=0; i { this.setData({ ip_info: res.ip_info, - cancel_noContWarn:true, + cancel_noContWarn: true, search_list: res.search_list, suggest_list: res.suggest_list }) @@ -101,10 +101,10 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - // 获取search关键词 - httpUtil("/api/v1/hot-search","get").then(res=>{ - this.setData({placeholder:res.keyword}) - }) + // 获取search关键词 + httpUtil("/api/v1/hot-search", "get").then(res => { + this.setData({ placeholder: res.keyword }) + }) let city_id if ('undefined' == options.city_id) { location_city().then(res => { From 56d14fe877576e90a9ad01067490dda3558b15ff Mon Sep 17 00:00:00 2001 From: GJW200011 <2399547226@qq.com> Date: Fri, 24 Dec 2021 15:30:09 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat=20=E7=A5=A8=E4=BB=B7=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/make_order/random_sit/random_sit.wxml | 21 +++++++++++++-------- pages/make_order/random_sit/random_sit.wxss | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/pages/make_order/random_sit/random_sit.wxml b/pages/make_order/random_sit/random_sit.wxml index 7385de7..731a60e 100644 --- a/pages/make_order/random_sit/random_sit.wxml +++ b/pages/make_order/random_sit/random_sit.wxml @@ -1,17 +1,22 @@ -{{_info.show_info.show_name}} -{{_info.show_info.city_name}}｜{{_info.show_info.theater_name}} -{{_info.show_info.show_date}} + {{_info.show_info.show_name}} + {{_info.show_info.city_name}}｜{{_info.show_info.theater_name}} + {{_info.show_info.show_date}} 《温馨提示：各票档分区，不对号入座，请确认后购买》 选择票档 - ¥{{item.price}} - - + + + ¥{{item.price}} + {{item.remark}} + + + + + - - \ No newline at end of file + \ No newline at end of file diff --git a/pages/make_order/random_sit/random_sit.wxss b/pages/make_order/random_sit/random_sit.wxss index baada27..0a80c8d 100644 --- a/pages/make_order/random_sit/random_sit.wxss +++ b/pages/make_order/random_sit/random_sit.wxss @@ -35,13 +35,24 @@ .sit_sel .selecter { display: flex; - justify-content: flex-start; + justify-content: space-between; align-items: center; line-height: 80rpx; } .sit_sel .selecter .price{ - width: 200rpx; + width: 300rpx; } .sit_sel .selecter .icon{ margin-left:60rpx; } +.sit_sel .selecter { + + font-size: 28rpx; +} +.disFix{ + display: flex; +} +.disNonetrue{ + visibility: hidden; + /* display: none; */ +} \ No newline at end of file From df30b1fcc36ff4b61acc0723b5cd1feda66a7ddf Mon Sep 17 00:00:00 2001 From: GJW200011 <2399547226@qq.com> Date: Sat, 25 Dec 2021 21:14:26 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix=20=E9=85=92=E5=90=A7=E7=A5=A8=E4=BB=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/make_order/random_sit/random_sit.wxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/make_order/random_sit/random_sit.wxml b/pages/make_order/random_sit/random_sit.wxml index 731a60e..fb60c55 100644 --- a/pages/make_order/random_sit/random_sit.wxml +++ b/pages/make_order/random_sit/random_sit.wxml @@ -5,7 +5,7 @@ - 《温馨提示：各票档分区，不对号入座，请确认后购买》 + 《温馨提示：各票档分区，请确认后购买》 选择票档 From 467e453027f20aff8ff188f7323a19c7dd9782a3 Mon Sep 17 00:00:00 2001 From: GJW200011 <2399547226@qq.com> Date: Tue, 28 Dec 2021 16:21:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat=20=E8=B7=A8=E5=B9=B4=E4=B8=93=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 +- config.js | 6 +- pages/special/straddlen/new_years.js | 256 +++++++++++++++++++++++++ pages/special/straddlen/new_years.json | 3 + pages/special/straddlen/new_years.wxml | 20 ++ pages/special/straddlen/new_years.wxss | 68 +++++++ project.config.json | 8 +- 7 files changed, 358 insertions(+), 6 deletions(-) create mode 100644 pages/special/straddlen/new_years.js create mode 100644 pages/special/straddlen/new_years.json create mode 100644 pages/special/straddlen/new_years.wxml create mode 100644 pages/special/straddlen/new_years.wxss diff --git a/app.json b/app.json index 193eafe..7c2092e 100644 --- a/app.json +++ b/app.json @@ -35,7 +35,8 @@ "pages/index/calendar/calendar", "pages/index/city/selectcity", "pages/opera/stage/stage_photo", - "pages/user/discount/answer_topic/answer_topic" + "pages/user/discount/answer_topic/answer_topic", + "pages/special/straddlen/new_years" ], "usingComponents": { "van-icon": "@vant/weapp/icon/index", diff --git a/config.js b/config.js index 0ecd237..0881a83 100644 --- a/config.js +++ b/config.js @@ -144,7 +144,11 @@ const router_list = [ { id: 36, router_name: "pages/user/discount/answer_topic/answer_topic" - }, + },//答题专题 + { + id: 37, + router_name: "pages/special/straddlen/new_years" + },//专题 ] module.exports = { router_list diff --git a/pages/special/straddlen/new_years.js b/pages/special/straddlen/new_years.js new file mode 100644 index 0000000..5a19e4e --- /dev/null +++ b/pages/special/straddlen/new_years.js @@ -0,0 +1,256 @@ +const app = getApp() +import { + http, + httpUtil, + login_check +} from '../../../utils/util' +import { + host +} from '../../../Gdata' +Page({ + + /** + * 页面的初始数据 + */ + data: { + straddlen_list: [ + + { + id: 1, + url: 'https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6ad5dd76ec9ccbf0d9d2160aa9df5baed8fd5236.jpg' + }, + { + id: 2, + url: 'https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6ad9b188ec9ccbf0d9d2160aa9df5baed8fd5236.jpg', + }, + { + id: 3, + url: 'https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6adc235bec9ccbf0d9d2160aa9df5baed8fd5236.jpg', + router_path: '/pages/opera/show/show_detail?cycle_id=4266' + }, + { + id: 4, + url: 'https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6adf10ecec9ccbf0d9d2160aa9df5baed8fd5236.jpg' + }, + { + id: 5, + url: "https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6ae147744ea45ce96dac01e01bd1272c5e0a212d.jpg", + router_path: '/pages/opera/show/show_detail?cycle_id=4191' + }, + { + id: 6, + url: "https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6ae3fe584ea45ce96dac01e01bd1272c5e0a212d.jpg", + + }, + { + id: 7, + url: "https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6ae5bfb74ea45ce96dac01e01bd1272c5e0a212d.jpg", + router_path: '/pages/opera/show/show_detail?cycle_id=4265' + }, + { + id: 8, + url: "https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6ae9b83c4ea45ce96dac01e01bd1272c5e0a212d.jpg", + }, + { + id: 9, + url: "https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6aeb107a4ea45ce96dac01e01bd1272c5e0a212d.jpg", + router_path: '/pages/opera/show/show_detail?cycle_id=4239' + }, + { + id: 10, + url: "https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6aee19f54ea45ce96dac01e01bd1272c5e0a212d.jpg", + }, + { + id: 11, + url: "https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6af04e4abcbc9f3782865f83b94490981e992789.jpg", + router_path: '/pages/opera/show/show_detail?cycle_id=4296' + }, + { + id: 12, + url: 'https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6af30d73bcbc9f3782865f83b94490981e992789.jpg' + }, + { + id: 13, + url: "https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6af47235bcbc9f3782865f83b94490981e992789.jpg", + router_path: '/pages/opera/show/show_detail?cycle_id=4276' + }, + { + id: 14, + url: 'https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6af7c267bcbc9f3782865f83b94490981e992789.jpg' + }, + { + id: 15, + url: "https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6af99dacbcbc9f3782865f83b94490981e992789.jpg", + router_path: '/pages/opera/show/show_detail?cycle_id=4301' + }, + { + id: 16, + url: 'https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6afd5a84bcbc9f3782865f83b94490981e992789.jpg' + }, + { + id: 17, + url: "https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6afec8efbcbc9f3782865f83b94490981e992789.jpg", + router_path: '/pages/opera/show/show_detail?cycle_id=4306' + }, + { + id: 18, + url: 'https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cac6b01ff896db52cca6602afb21f90def085ebe24c.jpg' + }, + ], + form_list: { + activity_id: 37, + name: '', + mobile: '', + content: '' + }, + input1_top: 100, + input2_top: 176, + + }, + onChange(e) { + // console.log(e.currentTarget.dataset.router); + + let url = e.currentTarget.dataset.router + if (!url) { + return + } + console.log(url); + wx.navigateTo({ + url + }) + }, + bindUserName(e) { + console.log(e, 'bindUserName'); + // let username=e.detail.value + this.data.form_list.name = e.detail.value + }, + bindNumber(e) { + console.log(e, 'bindNumber'); + this.data.form_list.mobile = e.detail.value + }, + bindOpinion(e) { + console.log(e, 'bindOpinion'); + this.data.form_list.content = e.detail.value + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + let iphone_width = app.globalData.screenWidth + console.log(iphone_width,'屏幕宽度'); + if (iphone_width <= 320) { + console.log(320); + this.setData({ + input1_top: 96, + input2_top: 166, + }) + }else if(iphone_width > 320&&iphone_width <= 375){ + console.log('320-375'); + this.setData({ + input1_top: 96, + input2_top: 172, + }) + }else if(iphone_width > 375&&iphone_width < 400){ + console.log('375-400'); + this.setData({ + input1_top: 102, + input2_top: 170, + }) + } + }, + onSubmit() { + if (!login_check()) { + return + } + let { name, mobile, content } = this.data.form_list + if (!name) { + wx.showToast({ + title: '请输入姓名', + icon: 'none', + mask: true + }) + return + } + if (!mobile) { + wx.showToast({ + title: '请填写手机号', + icon: 'none', + mask: true + }) + return + } + var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/; + if (!myreg.test(mobile)) { + wx.showToast({ + title: '手机号错误', + icon: 'none', + mask: true + }) + return + } + if (!content) { + wx.showToast({ + title: '请填写你想说的话', + icon: 'none', + mask: true + }) + return + } + http("/api/v1/topic-reply", "post", { ...this.data.form_list }).then(res => { + wx.showToast({ + title: '提交成功', + icon: 'none', + mask: true + }) + }) + // console.log(this.data.form_list, '111111'); + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/special/straddlen/new_years.json b/pages/special/straddlen/new_years.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/special/straddlen/new_years.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/special/straddlen/new_years.wxml b/pages/special/straddlen/new_years.wxml new file mode 100644 index 0000000..44ec7cd --- /dev/null +++ b/pages/special/straddlen/new_years.wxml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/special/straddlen/new_years.wxss b/pages/special/straddlen/new_years.wxss new file mode 100644 index 0000000..4a24ed0 --- /dev/null +++ b/pages/special/straddlen/new_years.wxss @@ -0,0 +1,68 @@ +/* pages/special/straddlen/new_years.wxss */ +.img image { + width: 100%; + display: block; + margin-top: -1rpx; +} + +.positRel { + position: relative; +} + +.input { + /* transform: rotate(-3deg); */ +} + +.input input { + font-size: 28rpx; + line-height: 28rpx; + /* border: 1px solid red; */ + height: 40rpx; +} + +.input.input1 { + width: 120rpx; + /* height: 75rpx; */ + /* margin-bottom: 38rpx; */ + /* margin-left: 68rpx; */ + text-align: center; + position: absolute; + left: 236rpx; + top: 100rpx; + transform: rotate(-3deg); +} + +.input.input2 { + width: 300rpx; + position: absolute; + left: 236rpx; + top: 175rpx; + /* padding-left: 10rpx; */ + transform: rotate(-3deg); + text-align: center; +} + +.input.input3 { + position: absolute; + left: 230rpx; + top: 330rpx; +} + +.text3 { + width: 330rpx; + height: 110rpx; + /* border: 1px solid red; */ + font-size: 28rpx; + line-height: 28rpx; + transform: rotate(-5deg); + +} + +.img .submit { + position: absolute; + right: 60rpx; + bottom: 270rpx; + width: 160rpx; + height: 80rpx; + z-index: 10; +} \ No newline at end of file diff --git a/project.config.json b/project.config.json index 291b5df..e765673 100644 --- a/project.config.json +++ b/project.config.json @@ -30,15 +30,15 @@ "outputPath": "" }, "enableEngineNative": false, - "bundle": false, "useIsolateContext": true, - "useCompilerModule": true, - "userConfirmedUseCompilerModuleSwitch": false, "userConfirmedBundleSwitch": false, "packNpmManually": false, "packNpmRelationList": [], "minifyWXSS": true, - "minifyWXML": true + "disableUseStrict": false, + "minifyWXML": true, + "showES6CompileOption": false, + "useCompilerPlugins": false }, "compileType": "miniprogram", "libVersion": "2.21.1", From 5a19a603d2b100d295abe4ef7049958f4c0e2be2 Mon Sep 17 00:00:00 2001 From: GJW200011 <2399547226@qq.com> Date: Tue, 28 Dec 2021 17:06:39 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix=20=E8=B7=A8=E5=B9=B4=E4=B8=93=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/special/straddlen/new_years.js | 7 ++++++- pages/special/straddlen/new_years.json | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pages/special/straddlen/new_years.js b/pages/special/straddlen/new_years.js index 5a19e4e..2418726 100644 --- a/pages/special/straddlen/new_years.js +++ b/pages/special/straddlen/new_years.js @@ -251,6 +251,11 @@ Page({ * 用户点击右上角分享 */ onShareAppMessage: function () { - + let title='开心麻花有笑跨年攻略' + let imageUrl='https://mahuaimage2.oss-cn-qingdao.aliyuncs.com/mini_app/video/61cad2bba6e2b2fc1d12ae96520a9bbc7181b00e43c8b.jpg' + return { //自定义转发内容 + title, + imageUrl //不设置此字段时，默认截取当前页面作为展示的图片 + } } }) \ No newline at end of file diff --git a/pages/special/straddlen/new_years.json b/pages/special/straddlen/new_years.json index 8835af0..92c0985 100644 --- a/pages/special/straddlen/new_years.json +++ b/pages/special/straddlen/new_years.json @@ -1,3 +1,4 @@ { - "usingComponents": {} + "usingComponents": {}, + "navigationBarTitleText":"开心麻花有笑跨年攻略" } \ No newline at end of file From 0a9e7a95db0d3aa3cc1d6c6a50005a33e70afb73 Mon Sep 17 00:00:00 2001 From: GJW200011 <2399547226@qq.com> Date: Wed, 29 Dec 2021 10:40:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix=20=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=AD=A3?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/special/straddlen/new_years.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/special/straddlen/new_years.js b/pages/special/straddlen/new_years.js index 2418726..e2b5b93 100644 --- a/pages/special/straddlen/new_years.js +++ b/pages/special/straddlen/new_years.js @@ -179,7 +179,7 @@ Page({ }) return } - var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/; + var myreg = /^1[3456789]\d{9}$/; if (!myreg.test(mobile)) { wx.showToast({ title: '手机号错误',