diff --git a/pages/index/index.js b/pages/index/index.js
index 88032db..a6c88e5 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -121,6 +121,12 @@ Page({
})
this.getVideoPrize()
},
+ goFeiyi: function () {
+ app.globalData.weburl = 'https://m.cloud.sz-trip.com/mlgCoupon'
+ wx.navigateTo({
+ url:"/pages/pbService/web/index"
+ })
+ },
onTabItemTap: function (e) {
console.log(e, 99999999)
},
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 1384ddf..f8c490f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -52,7 +52,7 @@
场馆预约
-
非遗专卖
diff --git a/pages/info/postProductInfo/index.js b/pages/info/postProductInfo/index.js
index cf996ad..5da8ee5 100644
--- a/pages/info/postProductInfo/index.js
+++ b/pages/info/postProductInfo/index.js
@@ -117,7 +117,7 @@ Page({
})
})
- commonApi._post("product/get_product_by_type", {
+ commonApi._post("search/product_recommend", {
offset: 0,
limit: 6,
rand: true,
@@ -203,13 +203,18 @@ Page({
query.select("#box1").boundingClientRect() //选择toViewid获取位置信息
query.select("#box2").boundingClientRect() //选择toViewid获取位置信息
query.select("#box3").boundingClientRect() //选择toViewid获取位置信息
+ query.select("#box4").boundingClientRect() //选择toViewid获取位置信息
let minHeight = that.data.fixed ? (110 * ratio + height) : topHeight;
query.exec(function (res) {
- if (res[2].top < minHeight) {
+ if (res[3].top < minHeight) {
+ that.setData({
+ type: 4
+ })
+ } else if (res[2].top < minHeight) {
that.setData({
type: 3
})
- } else if (res[1].top < minHeight) {
+ }else if (res[1].top < minHeight) {
that.setData({
type: 2
})
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 2c9a219..fb79d30 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -35,6 +35,7 @@
+
@@ -49,8 +50,7 @@
预订须知
-
-
+
游客点评{{info.rate}}分
@@ -86,7 +86,7 @@
查看全部点评
-
+
@@ -105,6 +105,8 @@
+
+
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index bd1b85f..f1f5005 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -228,9 +228,11 @@ page {
}
.box {
- margin: 20rpx;
- background: white;
- border-radius: 13rpx;
+ /* margin: 20rpx; */
+ /* background: white; */
+ /* border-radius: 13rpx; */
+ background: #f2f2f2;
+ padding: 20rpx;
}
.box-top {
@@ -240,6 +242,8 @@ page {
color: #000;
font-size: 35rpx;
padding: 0 20rpx;
+ background: #fff;
+ border-radius: 13rpx 13rpx 0 0;
}
.box-top .iconfont {
@@ -253,6 +257,8 @@ page {
padding: 40rpx 0;
font-size: 23rpx;
color: #333;
+ background: #fff;
+ border-radius: 0 0 13rpx 13rpx;
}
.empty-btn {
@@ -275,9 +281,11 @@ page {
}
.product-comment {
- margin: 0 20rpx;
+ /* margin: 0 20rpx; */
border-bottom: 1rpx solid #ccc;
- padding: 33rpx 0;
+ /* padding: 33rpx 0; */
+ padding: 33rpx 20rpx;
+ background: #fff;
}
.product-comment-top {
@@ -320,11 +328,14 @@ page {
.more-comment-btn {
line-height: 93rpx;
- margin-right: 20rpx;
+ /* margin-right: 20rpx; */
text-align: right;
color: #999;
font-size: 27rpx;
font-weight: 500;
+ padding-right: 20rpx;
+ background: #fff;
+ border-radius: 0 0 13rpx 13rpx;
}
.more-comment-btn .iconfont {
diff --git a/pages/order/comment/index.js b/pages/order/comment/index.js
index 5fa253d..dbf3c12 100644
--- a/pages/order/comment/index.js
+++ b/pages/order/comment/index.js
@@ -1,5 +1,6 @@
// pages/order/comment/index.js
import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
Page({
/**
@@ -10,7 +11,8 @@ Page({
imgs: [],
upImgs:[],
checked:false,
- rate:0
+ rate:0,
+ tjList: [], //推荐商品列表
},
/**
@@ -43,6 +45,24 @@ Page({
info: res.data
})
})
+ commonApi._post("search/product_recommend", {
+ offset: 0,
+ limit: 6,
+ rand: true,
+ type: 'post'
+ }).then(res => {
+ try {
+ this.setData({
+ tjList: res.data.list
+ })
+ } catch (error) {
+ console.log(error);
+ }
+ })
+ },
+ gotoDetail:function(e){
+ let item = e.currentTarget.dataset.item;
+ util.gotoDetail(item)
},
changeStar: function (e) {
wx.showLoading({
diff --git a/pages/order/comment/index.wxml b/pages/order/comment/index.wxml
index 646d050..3f59adc 100644
--- a/pages/order/comment/index.wxml
+++ b/pages/order/comment/index.wxml
@@ -35,4 +35,22 @@
-提交
\ No newline at end of file
+提交
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+ {{item.price/100}}
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/order/comment/index.wxss b/pages/order/comment/index.wxss
index df3f7b3..66bfbb7 100644
--- a/pages/order/comment/index.wxss
+++ b/pages/order/comment/index.wxss
@@ -1,6 +1,7 @@
/* pages/order/comment/index.wxss */
page{
background-color: #FBF8FB;
+ padding-bottom: 50rpx;
}
.product-box {
padding: 0 30rpx 10rpx 30rpx;
@@ -71,7 +72,9 @@ page{
height: 210rpx;
}
.btn {
- width: 360rpx;
+ margin: 0 30rpx;
+ margin-bottom: 79rpx;
+ /* width: 360rpx; */
line-height: 80rpx;
text-align: center;
color: #fff;
@@ -79,10 +82,10 @@ page{
font-size: 30rpx;
font-weight: 500;
border-radius: 40rpx;
- position: fixed;
+ /* position: fixed;
bottom: 40rpx;
left: 50%;
- margin-left: -180rpx;
+ margin-left: -180rpx; */
}
/* 图片 */
@@ -147,3 +150,83 @@ page{
checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
color:#fff;
}
+ .proad{
+ margin: 20rpx;
+ }
+ .proad-title{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 14rpx;
+ }
+ .proad-title image{
+ width: 292rpx;
+ height: 34rpx;
+ }
+ .pro-list{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ flex-wrap: wrap;
+ }
+ .proitem{
+ width: 335rpx;
+ background: #FFFFFF;
+ border-radius: 13rpx;
+ margin-top: 26.67rpx;
+ box-shadow: 0rpx 2rpx 11rpx 0rpx rgba(201,201,201,0.3);
+ }
+ .item-hd {
+ width: 335rpx;
+ height: 278rpx;
+ }
+ .item-hd image{
+ width: 100%;
+ height: 100%;
+ border-radius: 13rpx 13rpx 0px 0px;
+ }
+ .item-bm{
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ height: 120rpx;
+ padding: 13rpx 14rpx;
+ text-align: left;
+ }
+ .protitle{
+ font-size: 28rpx;
+ font-family: PingFang SC;
+ font-weight: bold;
+ color: #000000;
+ }
+ .pro-price{
+ color: #D10000;
+ font-weight: bold;
+ font-size: 36rpx;
+ }
+ .pro-price:before {
+ display: inline-block;
+ content:"¥";
+ color: #D62828;
+ font-size: 20rpx;
+ }
+
+ .pro-price:after {
+ display: inline-block;
+ content:'起';
+ color: #999999;
+ font-size: 10px;
+ }
+ .proitem image:nth-child(1) {
+ display: block;
+ width: 100%;
+ border-radius: 13rpx 13rpx 0 0;
+ }
+ .text-overflowRows {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ -webkit-line-clamp: 2;
+ word-break: break-all;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ }
diff --git a/pages/order/payresult/index.js b/pages/order/payresult/index.js
index b39042a..cc73a61 100644
--- a/pages/order/payresult/index.js
+++ b/pages/order/payresult/index.js
@@ -8,7 +8,8 @@ Page({
*/
data: {
tid:null,
- info:null
+ info:null,
+ tjList: [], //推荐商品列表
},
/**
@@ -27,6 +28,24 @@ Page({
})
console.log(res)
})
+ commonApi._post("search/product_recommend", {
+ offset: 0,
+ limit: 6,
+ rand: true,
+ type: 'post'
+ }).then(res => {
+ try {
+ this.setData({
+ tjList: res.data.list
+ })
+ } catch (error) {
+ console.log(error);
+ }
+ })
+ },
+ gotoDetail:function(e){
+ let item = e.currentTarget.dataset.item;
+ util.gotoDetail(item)
},
gotoOrderList:function(){
if(!this.data.info) return;
diff --git a/pages/order/payresult/index.wxml b/pages/order/payresult/index.wxml
index cd55a1e..ea70e50 100644
--- a/pages/order/payresult/index.wxml
+++ b/pages/order/payresult/index.wxml
@@ -1,7 +1,26 @@
-
+
+
订单正在处理中
具体出票/发货状态
将会通过短信/订单状态进行通知
-查看订单
\ No newline at end of file
+查看订单
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+ {{item.price/100}}
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/order/payresult/index.wxss b/pages/order/payresult/index.wxss
index 90fb22e..70fcc42 100644
--- a/pages/order/payresult/index.wxss
+++ b/pages/order/payresult/index.wxss
@@ -13,12 +13,15 @@
margin: 0 auto;
font-size: 36rpx;
font-weight: 500;
- margin-top: 200rpx;
+ margin-top: 76.67rpx;
+ margin-bottom: 79.33rpx;
+ /* margin-top: 200rpx; */
}
page {
text-align: center;
color: #999;
font-size: 32rpx;
+ padding-bottom: 50rpx;
}
.order-tip {
color: #009944;
@@ -26,4 +29,89 @@ page {
font-weight: 500;
margin-top: 30rpx;
margin-bottom: 50rpx;
+}
+.gou {
+ width: 180.13rpx;
+ height: 180.13rpx;
+ margin-top: 40rpx;
+}
+.proad{
+ margin: 20rpx;
+}
+.proad-title{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-bottom: 14rpx;
+}
+.proad-title image{
+ width: 292rpx;
+ height: 34rpx;
+}
+.pro-list{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ flex-wrap: wrap;
+}
+.proitem{
+ width: 335rpx;
+ background: #FFFFFF;
+ border-radius: 13rpx;
+ margin-top: 26.67rpx;
+ box-shadow: 0rpx 2rpx 11rpx 0rpx rgba(201,201,201,0.3);
+}
+.item-hd {
+ width: 335rpx;
+ height: 278rpx;
+}
+.item-hd image{
+ width: 100%;
+ height: 100%;
+ border-radius: 13rpx 13rpx 0px 0px;
+}
+.item-bm{
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ height: 120rpx;
+ padding: 13rpx 14rpx;
+ text-align: left;
+}
+.protitle{
+ font-size: 28rpx;
+ font-family: PingFang SC;
+ font-weight: bold;
+ color: #000000;
+}
+.pro-price{
+ color: #D10000;
+ font-weight: bold;
+ font-size: 36rpx;
+}
+.pro-price:before {
+ display: inline-block;
+ content:"¥";
+ color: #D62828;
+ font-size: 20rpx;
+}
+
+.pro-price:after {
+ display: inline-block;
+ content:'起';
+ color: #999999;
+ font-size: 10px;
+}
+.proitem image:nth-child(1) {
+ display: block;
+ width: 100%;
+ border-radius: 13rpx 13rpx 0 0;
+}
+.text-overflowRows {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ -webkit-line-clamp: 2;
+ word-break: break-all;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 8749612..71b8843 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -67,6 +67,20 @@
"query": "",
"launchMode": "default",
"scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/order/payresult/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/order/comment/index",
+ "query": "id=82342309051435565877",
+ "launchMode": "default",
+ "scene": null
}
]
}