diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index c852edb..b074660 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -2,12 +2,21 @@
+
+ 1/2
+ 视频
+ 图片
+ 款式
+
+
+
+ show-mute-btn="{{true}}" show-background-playback-button="{{false}}"
+ show-progress="{{false}}">
@@ -25,14 +34,16 @@
-
-
-
{{info.price/100}}¥{{info.market_price/100}}
-
已售{{info.sales_number||0}}份
-
-
- {{info.title}}
-
+
+
+ {{info.price/100}}优惠前¥{{info.market_price/100}}
+ 已售{{info.sales_number>1000?"1000+":(info.sales_number||0)}}
+
+
+
+
+ {{info.title}}
+
+
+
+ {{item}}
-
+
{{info.scene_name}}
@@ -65,15 +81,7 @@
-
- {{info.title}}
- {{info.subtitle}}
-
- {{item}}
-
- ¥{{info.price/100}}起
-
-
+
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 89f1a60..8e4e39d 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -7,89 +7,64 @@ page {
width: 100%;
height: 750rpx;
}
-
-.swiper image,
-.swiper video {
+.swiper image,.swiper video {
height: 750rpx;
display: block;
width: 100%;
}
+.swiper-bottom{
+ position: absolute;
+ /* top: 750rpx; */
+ margin-top: 694rpx;
+ right: 0;
+ width: fit-content;
+ height: 56rpx;
+ line-height: 56rpx;
+ background: rgba(1, 0, 0, 0.6);
+ border-radius: 13rpx 0 0 13rpx;
+ display: flex;
+ font-weight: 500;
+ font-size: 24rpx;
+ color: rgba(255,255,255,0.5);
+ z-index: 10;
+ padding: 0 5rpx;
+ overflow: hidden;
+}
+.swiper-bottom-item{
+ padding: 0 14rpx;
+}
+.swiper-bottom-item.active{
+ color: #fff;
+}
.top-info {
- border-radius: 20rpx 20rpx 0 0;
background: white;
position: relative;
z-index: 1;
- padding: 20rpx 40rpx;
}
.top-info .title {
- font-size: 32rpx;
- font-weight: 500;
- color: #000;
-}
-
-.top-info .subtitle {
- color: #666;
- font-size: 27rpx;
- margin-top: 20rpx;
+ font-weight: bold;
+ font-size: 33rpx;
+ color: #000000;
}
.tags-box {
- margin-top: 10rpx;
display: flex;
align-items: center;
+ font-weight: 500;
+ font-size: 25rpx;
color: #0B898E;
- font-size: 27rpx;
- height: 50rpx;
}
.tags-box .tag {
- position: relative;
- line-height: 20rpx;
- font-size: 20rpx;
- font-weight: 500;
- line-height: 50rpx;
- margin-right: 10rpx;
-}
-
-.tags-box .tag .line {
- content: "1";
- display: block;
- font-size: 0;
- position: absolute;
- left: 0;
- right: 0;
- background: #DAF3E9;
- height: 8rpx;
- top: 30rpx;
- z-index: -1;
-}
-
-.tags-price {
- flex: 1;
- text-align: right;
- color: #D62828;
-}
-
-.tags-price text:nth-child(1) {
- font-size: 27rpx;
-}
-
-.tags-price text:nth-child(2) {
- font-size: 40rpx;
- font-weight: bold;
-}
-
-.tags-price text:nth-child(3) {
- font-size: 20rpx;
- color: #999999;
- margin-left: 4rpx;
-}
-
-.tags-box .iconfont {
- margin-left: 4rpx;
- font-size: 24rpx;
+ margin-top: 27rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ margin-right: 15rpx;
+ padding: 0 14rpx;
+ background: rgba(11, 137, 142, 0.1);
+ border-radius: 4rpx;
}
.address-box {
@@ -982,8 +957,9 @@ height: 133rpx;
.wineScene-price-container {
width: 750rpx;
height: 100rpx;
- background: linear-gradient(-90deg,#FF413B, #FFAB2E);
- border-radius: 20rpx 20rpx 0rpx 0rpx;
+ /* background: linear-gradient(-90deg,#FF413B, #FFAB2E); */
+ background: #FD3856;
+ /* border-radius: 20rpx 20rpx 0rpx 0rpx; */
display: flex;
align-items: center;
justify-content: space-between;
@@ -995,13 +971,13 @@ height: 133rpx;
.wineScene-price-container .wineSecne-price {
font-weight: bold;
- font-size: 36rpx;
+ font-size: 48rpx;
color: #FFFFFF;
}
.wineScene-price-container .wineSecne-money {
font-size: 24rpx;
font-weight: 500;
- text-decoration-line: line-through;
+ /* text-decoration-line: line-through; */
padding-left: 14rpx;
}
.wineScene-price-container .wineSecne-price::before {
diff --git a/pages/info/roadInfo/index.js b/pages/info/roadInfo/index.js
index 1fab188..e213db5 100644
--- a/pages/info/roadInfo/index.js
+++ b/pages/info/roadInfo/index.js
@@ -165,11 +165,11 @@ Page({
order: function () {
// todo 判断组合产品
// if (this.data.info.is_compose == 1) {
- // if (true) {
- // // 打开规格弹窗
- // this.setData({skuFlag: true})
- // return
- // }
+ if (true) {
+ // 打开规格弹窗
+ this.setData({skuFlag: true})
+ return
+ }
commonApi.user_post('wx/get_user_keep', {
@@ -213,11 +213,13 @@ Page({
// 组合产品获取购买的sku
getComposeSku () {
commonApi.user_post("product/get_sku_compose_list", {
- sku_id: "190720"
+ // sku_id: "190720"
+ sku_id: "190740"
}).then(res => {
if (res&&Array.isArray(res.data)&&res.data.length>0) {
res.data.forEach(v => {
- v.sku.is_compose = 1
+ v.sku.is_compose = 1;
+ v.num = this.data.producNum;
});
util.orderByShoppingCart(res.data,app)
}
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index b82804d..5725af7 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -827,10 +827,6 @@ Page({
console.log(app.globalData.product);
console.log(ticket_type);
- // todo 判断是否组合产品
- // this.getComposeSku()
- // return
-
if (ticket_type != 2) {
let today = util.formatDate(new Date()),
@@ -1035,17 +1031,6 @@ Page({
})
},
- // 组合产品获取购买的sku
- getComposeSku () {
- commonApi.user_post("product/get_sku_compose_list", {
- sku_id: "190720"
- }).then(res => {
- if (res&&Array.isArray(res.data)&&res.data.length>0) {
- util.orderByShoppingCart(res.data,app)
- }
- })
- },
-
/**
* 生命周期函数--监听页面初次渲染完成
*/
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 06a8275..e674c20 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -40,10 +40,10 @@
{{product.sku.price/100}}
-
-
+
+
{{productNum}}
-
+
diff --git a/project.config.json b/project.config.json
index 1241058..744f8a8 100644
--- a/project.config.json
+++ b/project.config.json
@@ -54,60 +54,39 @@
"ignoreUploadUnusedFiles": true
},
"compileType": "miniprogram",
- "libVersion": "2.14.0",
+ "libVersion": "3.8.9",
"appid": "wx4bb7b6050831f585",
"projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
"condition": {
- "search": {
- "list": []
- },
- "conversation": {
- "list": []
- },
- "plugin": {
- "list": []
- },
- "game": {
- "currentL": -1,
- "list": []
- },
- "gamePlugin": {
- "list": []
- },
"miniprogram": {
"list": [
{
- "id": 0,
"name": "pages/user/bindtel/index",
"pathName": "pages/user/bindtel/index",
"query": "id=0000000000LINELINEINFO18082257199008",
"scene": null
},
{
- "id": 1,
"name": "好行",
"pathName": "pages/list/haoxing/index",
"query": "",
"scene": null
},
{
- "id": 2,
"name": "pages/list/activitynew/index",
"pathName": "pages/list/activitynew/index",
"query": "id=0000000000LINELINEINFO18082257199008",
"scene": null
},
{
- "id": -1,
"name": "微旅行",
"pathName": "pages/list/minitrip/index",
"query": "",
"scene": null
},
{
- "id": -1,
"name": "一日游",
"pathName": "pages/list/oneday/index",
"query": "",
diff --git a/subPackages/gwcOrder/index.wxml b/subPackages/gwcOrder/index.wxml
index 977d332..a258067 100644
--- a/subPackages/gwcOrder/index.wxml
+++ b/subPackages/gwcOrder/index.wxml
@@ -16,9 +16,9 @@
{{product && product.isGroup!=1?'购票数量':'预约人数'}}
-
+
{{productNum}}
-
+
diff --git a/utils/util.js b/utils/util.js
index 1609034..c441416 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -578,6 +578,7 @@ const orderByShoppingCart = function (listData, app) {
app.globalData.couponInfo = null;
let list = listData, product = [], product1 = []
list.map(item => {
+ item.num = item.num || 1;
// item.product.type="post";
if (item.product.type == 'post') {
product.push({