diff --git a/package-lock.json b/package-lock.json
index dba5f70..017ea77 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,29 +1,8 @@
{
"name": "package.json",
"version": "7.15.1",
- "lockfileVersion": 2,
+ "lockfileVersion": 1,
"requires": true,
- "packages": {
- "": {
- "name": "package.json",
- "version": "7.15.1",
- "license": "ISC",
- "dependencies": {
- "@vant/area-data": "^1.1.1",
- "@vant/weapp": "^1.6.9"
- }
- },
- "node_modules/@vant/area-data": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@vant/area-data/-/area-data-1.1.1.tgz",
- "integrity": "sha512-MmXTuSh6YYWSvC112iK2/rZhEfe+3vfh6G9TD1sOTOrtw+H9bAnw8ZOiHdkL6hTUCXV+AJEDbFyFsNLpJxqkoA=="
- },
- "node_modules/@vant/weapp": {
- "version": "1.6.9",
- "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.6.9.tgz",
- "integrity": "sha512-d7hvWjs1cjlM4PjEAhBhbtdejqcltbIptw4/qfDC1RZUp+t7eYEDX/aRUZgtPAwTnipRXJPOyQIdf8K9jYUI/g=="
- }
- },
"dependencies": {
"@vant/area-data": {
"version": "1.1.1",
@@ -31,9 +10,14 @@
"integrity": "sha512-MmXTuSh6YYWSvC112iK2/rZhEfe+3vfh6G9TD1sOTOrtw+H9bAnw8ZOiHdkL6hTUCXV+AJEDbFyFsNLpJxqkoA=="
},
"@vant/weapp": {
- "version": "1.6.9",
- "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.6.9.tgz",
- "integrity": "sha512-d7hvWjs1cjlM4PjEAhBhbtdejqcltbIptw4/qfDC1RZUp+t7eYEDX/aRUZgtPAwTnipRXJPOyQIdf8K9jYUI/g=="
+ "version": "1.9.2",
+ "resolved": "https://registry.npmjs.org/@vant/weapp/-/weapp-1.9.2.tgz",
+ "integrity": "sha512-brz1JLiXZev4u6cQFyDrGX5xddOHKwKUDgfbUrpqMcpW+dliV4oXMtkDt0rRNfYcEHyfewbvW9O+aas6KJUJYw=="
+ },
+ "vant-weapp": {
+ "version": "0.5.29",
+ "resolved": "https://registry.npmjs.org/vant-weapp/-/vant-weapp-0.5.29.tgz",
+ "integrity": "sha512-RMc0Ga914XFwspw2WuOMU8bOHlIkua8X1DoQ/KPnGQzjwT1uEL4S7W186EmaHF1wN2krB9BVd0LdRRt39dGh6Q=="
}
}
}
diff --git a/package.json b/package.json
index e78e5a3..c80e6f9 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
"license": "ISC",
"dependencies": {
"@vant/area-data": "^1.1.1",
- "@vant/weapp": "^1.6.9"
+ "@vant/weapp": "^1.9.2",
+ "vant-weapp": "^0.5.29"
}
}
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 824bc67..9ed3ac3 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -190,6 +190,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ console.log("sss")
if (!getApp().globalData.city_id) {
// 默认北京写法
//location_city("beijing").then(res=>{
@@ -236,6 +237,13 @@ Page({
// url: '/pages/index/index/index'
// })
wx.stopPullDownRefresh()
+ this.setData({
+ show_list: [
+ { sort_type: '1', list: 'newMake', page: '1', has_more: 'false' },
+ { sort_type: '2', list: 'newMake', page: '1', has_more: 'false' },
+ { sort_type: '3', list: 'newMake', page: '1', has_more: 'false' },
+ ]
+ })
this.refresh_info(getApp().globalData.city_id)
},
diff --git a/pages/opera/IP_detail/IP_detail.wxml b/pages/opera/IP_detail/IP_detail.wxml
index 90cdf5e..4205f02 100644
--- a/pages/opera/IP_detail/IP_detail.wxml
+++ b/pages/opera/IP_detail/IP_detail.wxml
@@ -76,8 +76,10 @@
{{item.theater_name}}
-
- ¥{{item.lowest_price}}起
+ ¥{{item.lowest_price}}起 -->
+
\ No newline at end of file
diff --git a/pages/opera/IP_detail/IP_detail.wxss b/pages/opera/IP_detail/IP_detail.wxss
index 7916066..f82df3a 100644
--- a/pages/opera/IP_detail/IP_detail.wxss
+++ b/pages/opera/IP_detail/IP_detail.wxss
@@ -1,15 +1,15 @@
-
-.front{
- background-color: #fff;
- margin-bottom: 20rpx;
- padding: 20rpx 0;
- display: flex;
- flex-direction: column;
- align-items: center;
+.front {
+ background-color: #fff;
+ margin-bottom: 20rpx;
+ padding: 20rpx 0;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
}
-.front .title{
- font-size: 32rpx;
-font-weight: bold;
+
+.front .title {
+ font-size: 32rpx;
+ font-weight: bold;
}
.van-popup{
height: 1000rpx;
@@ -20,81 +20,87 @@ font-weight: bold;
width: 100%;
justify-content: space-between;
}
+
._row button::after {
- border: none !important;
- padding: 0 !important;
- margin: 0 !important;
+ border: none !important;
+ padding: 0 !important;
+ margin: 0 !important;
}
._row button {
- background-color: transparent !important;
- padding: 0 !important;
- line-height: inherit !important;
- margin: 0 !important;
- width: auto !important;
- font-weight: 500 !important;
- border-radius: none !important;
+ background-color: transparent !important;
+ padding: 0 !important;
+ line-height: inherit !important;
+ margin: 0 !important;
+ width: auto !important;
+ font-weight: 500 !important;
+ border-radius: none !important;
}
-._block{
- background: #fff;
- margin-bottom: 20rpx;
+._block {
+ background: #fff;
+ margin-bottom: 20rpx;
}
-._block ._title{
- display: flex;
- align-items: center;
- font-size: 32rpx;
-font-weight: bold;
-color: #181818;
-padding: 30rpx;
+
+._block ._title {
+ display: flex;
+ align-items: center;
+ font-size: 32rpx;
+ font-weight: bold;
+ color: #181818;
+ padding: 30rpx;
}
-._block ._title ._icon{
- width: 8rpx;
- height: 36rpx;
- background: #FF446B;
- border-radius: 4rpx;
- margin: 0 20rpx 0 0;
+
+._block ._title ._icon {
+ width: 8rpx;
+ height: 36rpx;
+ background: #FF446B;
+ border-radius: 4rpx;
+ margin: 0 20rpx 0 0;
}
-._block ._flex{
- display: flex;
- white-space: nowrap;
- margin: 0 30rpx;
- width: 690rpx;
+
+._block ._flex {
+ display: flex;
+ white-space: nowrap;
+ margin: 0 30rpx;
+ width: 690rpx;
}
-._block ._text{ padding: 0 48rpx 30rpx 68rpx;
- font-size: 28rpx;
- color: #363636;
+
+._block ._text {
+ padding: 0 48rpx 30rpx 68rpx;
+ font-size: 28rpx;
+ color: #363636;
}
- ._block ._flex ._img{
- border-radius: 8rpx;
- width: 540rpx;
- height: 360rpx;
- margin: 0 10rpx;
+._block ._flex ._img {
+ border-radius: 8rpx;
+ width: 540rpx;
+ height: 360rpx;
+ margin: 0 10rpx;
}
-._block .img1{
-margin: 0 30rpx;
-display: flex;
-flex-direction: column;
+._block .img1 {
+ margin: 0 30rpx;
+ display: flex;
+ flex-direction: column;
}
-._block .img1 .img1_list{
- width: 690rpx;
- vertical-align: top;
- margin-top: -1rpx;
+._block .img1 .img1_list {
+ width: 690rpx;
+ vertical-align: top;
+ margin-top: -1rpx;
}
-._block .img1 .roll{
- text-align: center;
- margin: 20rpx 0;
- font-size: 24rpx;
- color: #1394F2;
+._block .img1 .roll {
+ text-align: center;
+ margin: 20rpx 0;
+ font-size: 24rpx;
+ color: #1394F2;
}
-._bottom{
+._bottom {
display: flex;
align-items: center;
position: fixed;
@@ -104,60 +110,77 @@ flex-direction: column;
background: #FFFFFF;
box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.2);
}
-._tip{
- font-size: 28rpx;
-color: #181818;
-flex: 1;
+._tip {
+ font-size: 28rpx;
+
+ color: #181818;
+ flex: 1;
margin: 0 40rpx;
}
- ._button{
- margin: 0 40rpx;
+._button {
+
+ margin: 0 40rpx;
}
-.disabled_{
- background: #D0D0D0 !important;
+
+.disabled_ {
+ background: #D0D0D0 !important;
}
-.pop_title{
- font-size: 32rpx;
-display: flex;
-justify-content: center;
-font-weight: bold;
-margin: 30rpx;
+.pop_title {
+ font-size: 32rpx;
+ display: flex;
+ justify-content: center;
+ font-weight: bold;
+ margin: 30rpx;
}
-.pop_row{
- display: flex;
+
+.pop_row {
+ display: flex;
}
-._month{
- font-size: 24rpx;
-color: #181818;
-margin: 5rpx 10rpx 0 20rpx;
-width: 42rpx;
-white-space: nowrap;
+
+._month {
+ font-size: 24rpx;
+ color: #181818;
+ margin: 5rpx 10rpx 0 20rpx;
+ width: 42rpx;
+ white-space: nowrap;
}
-._city{
- font-size: 28rpx;
-font-weight: bold;
-color: #181818;
-display: flex;
+
+._city {
+ font-size: 28rpx;
+ font-weight: bold;
+ color: #181818;
+ display: flex;
flex-direction: column;
align-items: center;
margin: 3rpx 10rpx 0 10rpx;
}
-.dot{
- width: 4rpx;
- height: 4rpx;
- background: #D8D8D8;
- margin: 5rpx;
- border-radius: 50%;
+
+.dot {
+ width: 4rpx;
+ height: 4rpx;
+ background: #D8D8D8;
+ margin: 5rpx;
+ border-radius: 50%;
}
-._content{
- flex: 1;
+
+._content {
+ flex: 1;
margin: 0 10rpx;
font-size: 24rpx;
-color: #181818;
+ color: #181818;
}
+
.pop_button{
+ width: 128rpx;
+height: 44rpx;
+line-height: 44rpx;
+background: linear-gradient(90deg, #FF4284 0%, #FF1D42 100%);
+border-radius: 44rpx;
+font-size: 20rpx;
+color: #FFFFFF;
margin: 0 20rpx 0 20rpx;
}
+