diff --git a/app.js b/app.js
index 0274368..9dc828e 100644
--- a/app.js
+++ b/app.js
@@ -61,7 +61,9 @@ App({
"REFUND":"已退款",
"COMPLETED":"已完成",
"EXPIRED":"已过期/已失效",
- "REFUNDING":"退款中"
+ "REFUNDING":"退款中" ,
+ "TICKET_ERROR":"出票失败",
+ "REFUND_FAIL":"退订失败"
},
orderState:{
"UNPAID":"待付款",
@@ -78,7 +80,9 @@ App({
"REFUND":"已退款",
"COMPLETED":"已完成",
// "EXPIRED":"已过期/已失效",
- "REFUNDING":"退款中"
+ "REFUNDING":"退款中" ,
+ 'REFUND_REFUSE':'退款拒绝',
+ 'REFUND_ERROR':'退款异常'
},
codeState:['未使用','已使用','已失效','已取消'],
weburl:"",
diff --git a/app.json b/app.json
index db81e94..16a00cb 100644
--- a/app.json
+++ b/app.json
@@ -59,6 +59,7 @@
"pages/user/likes/index",
"pages/user/email/index",
"pages/list/feiyi/index",
+ "pages/list/haoxing/index",
"pages/list/food/index",
"pages/list/techan/index",
"pages/list/museum/index",
@@ -115,7 +116,7 @@
"window":{
"backgroundTextStyle":"light",
"navigationBarBackgroundColor": "#fff",
- "navigationBarTitleText": "苏州文化旅游总入口",
+ "navigationBarTitleText": "君到苏州",
"navigationBarTextStyle":"black",
"navigationStyle":"custom"
},
diff --git a/app.wxss b/app.wxss
index b0b8b4f..115f3a6 100644
--- a/app.wxss
+++ b/app.wxss
@@ -34,6 +34,7 @@ page{
max-height: 60%;
background: white;
border-radius: 12rpx;
+ overflow-y: auto;
}
/* 一部分list的分类需要加蓝色的圆圈可以用这个类名 */
.common-types {
diff --git a/images/place3.jpg b/images/place3.jpg
new file mode 100644
index 0000000..2c6200e
Binary files /dev/null and b/images/place3.jpg differ
diff --git a/pages/index/index.json b/pages/index/index.json
index db066e2..7c4437e 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -1,5 +1,6 @@
{
"usingComponents": {
- "common-image":"/pages/component/commonImage/index"
+ "common-image":"/pages/component/commonImage/index",
+ "title":"/pages/component/TitleHeader"
}
}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 991f9bc..b761f55 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,4 +1,5 @@
+
@@ -7,7 +8,7 @@
-
+
{{weather.max_temp}}°
{{weather.weather}}
@@ -62,22 +63,33 @@
-
- 限时特惠超值商品限时抢购
-
+
+ 限时特惠超值商品限时抢购
+
-
{{saleProduct.sku.product.title+saleProduct.sku.sku_name}}
¥{{saleProduct.price/100}}起
+
+
+
+
+
+
+ 限时特惠
+ 正在赶来
+
+ 敬请期待
+
+
-
- 精品线路精品线路精心挑选
-
+
+ 精品线路精品线路精心挑选
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 9b21d88..250b44d 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -458,4 +458,7 @@
color: #fff;
letter-spacing: 3rpx;
font-weight: 500;
+}
+.title-header .icon-fanhui1 {
+ display: none;
}
\ No newline at end of file
diff --git a/pages/info/foodInfo/index.wxml b/pages/info/foodInfo/index.wxml
index 2451d2b..603b3f1 100644
--- a/pages/info/foodInfo/index.wxml
+++ b/pages/info/foodInfo/index.wxml
@@ -1,5 +1,5 @@
-
+
diff --git a/pages/info/postProductInfo/index.wxml b/pages/info/postProductInfo/index.wxml
index 4cac547..47b89ee 100644
--- a/pages/info/postProductInfo/index.wxml
+++ b/pages/info/postProductInfo/index.wxml
@@ -117,6 +117,7 @@
{{producNum}}
+
{{skuFlag=='cart'?'确认':'立即购买'}}
diff --git a/pages/info/postProductInfo/index.wxss b/pages/info/postProductInfo/index.wxss
index 7f13a66..c267513 100644
--- a/pages/info/postProductInfo/index.wxss
+++ b/pages/info/postProductInfo/index.wxss
@@ -484,6 +484,10 @@ page {
display: flex;
align-items: center;
justify-content: center;
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: 0;
}
.mask-btn {
width: 670rpx;
diff --git a/pages/list/activity/index.wxml b/pages/list/activity/index.wxml
index 657db05..eb040be 100644
--- a/pages/list/activity/index.wxml
+++ b/pages/list/activity/index.wxml
@@ -41,7 +41,7 @@
{{item.source?item.source:""}}
-
+
diff --git a/pages/list/haoxing/index.js b/pages/list/haoxing/index.js
new file mode 100644
index 0000000..4f81f23
--- /dev/null
+++ b/pages/list/haoxing/index.js
@@ -0,0 +1,93 @@
+// pages/list/haoxing/index.js
+import commonApi from "../../../utils/https/common"
+import util from "../../../utils/util"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ list:[],
+ keywords:''
+ },
+ getList:function(){
+ let service="product/get_product_by_tag",data = {
+ tag_id:"21",
+ title:this.data.keywords,
+ offset:0,
+ limit:1000
+ };
+ commonApi._post(service,data).then(res=>{
+ this.setData({
+ list:res.data.list
+ })
+ })
+ },
+ search:function(e){
+ this.setData(e.detail);
+ this.setData({
+ list:[]
+ })
+ this.getList();
+ },
+ gotoDetail:function(e){
+ let item = e.currentTarget.dataset.item;
+ util.gotoDetail(item)
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad: function (options) {
+ this.getList()
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide: function () {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload: function () {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh: function () {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom: function () {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage: function () {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/list/haoxing/index.json b/pages/list/haoxing/index.json
new file mode 100644
index 0000000..9f79876
--- /dev/null
+++ b/pages/list/haoxing/index.json
@@ -0,0 +1,5 @@
+{
+ "usingComponents": {
+ "search":"/pages/component/SearchHeader"
+ }
+}
\ No newline at end of file
diff --git a/pages/list/haoxing/index.wxml b/pages/list/haoxing/index.wxml
new file mode 100644
index 0000000..da41277
--- /dev/null
+++ b/pages/list/haoxing/index.wxml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.price/100}}/
+ 立即购买
+
+
+
\ No newline at end of file
diff --git a/pages/list/haoxing/index.wxss b/pages/list/haoxing/index.wxss
new file mode 100644
index 0000000..d41be1e
--- /dev/null
+++ b/pages/list/haoxing/index.wxss
@@ -0,0 +1,66 @@
+/* pages/list/haoxing/index.wxss */
+page {
+ background: #E3345F;
+}
+.topimg {
+ display: block;
+ width: 100%;
+ position: relative;
+ z-index: 0;
+}
+.content {
+ padding: 30rpx 17rpx;
+ position: relative;
+ z-index: 1;
+}
+.product-item {
+ padding: 14rpx 13rpx;
+ background: white;
+ border-radius: 20rpx;
+ padding-bottom: 0;
+ margin-top: 20rpx;
+}
+.product-item image {
+ position: static;
+ height: 294rpx;
+ border-radius: 13rpx;
+}
+.product-bottom {
+ margin: 0 20rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 87rpx;
+}
+.product-bottom text {
+ font-weight: bold;
+ font-size: 39rpx;
+ color: #000;
+ flex: 1;
+ margin-right: 20rpx;
+}
+.product-bottom .price {
+ color: #D4362D;
+ font-size: 39rpx;
+ margin-right: 10rpx;
+ flex-shrink: 0;
+}
+.product-bottom .price::before {
+ content: "¥";
+ font-size: 24rpx;
+}
+.product-bottom .price::after {
+ content: "起";
+ margin-left: 4rpx;
+ font-size: 24rpx;
+}
+.btn {
+ width: 160rpx;
+ line-height: 54rpx;
+ flex-shrink: 0;
+ background: #D4362D;
+ border-radius: 13rpx;
+ text-align: center;
+ color: #fff;
+ font-size: 32rpx;
+}
\ No newline at end of file
diff --git a/pages/map/index.js b/pages/map/index.js
index f0b496d..a116f49 100644
--- a/pages/map/index.js
+++ b/pages/map/index.js
@@ -75,7 +75,7 @@ Page({
url: '/pages/pbService/wbdw/info/index?id='+this.data.info.info.id,
})
}
- else if(this.data.info.info.type=='restaurant'){
+ else if(this.data.info.info.type=='restaurant' || this.data.info.info.type=='tenscenic'){
wx.navigateTo({
url: '/pages/info/foodInfo/index?id='+this.data.info.info.id,
})
@@ -116,7 +116,7 @@ Page({
},
getList:function(){
this.mapCtx = wx.createMapContext("map");
- let types = ['','scenic','venue','post','restaurant','relic','show','cinema'],that = this;
+ let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema'],that = this;
this.mapCtx.getRegion({
type: 'gcj02',
success: function(res) {
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index 3207c49..d29026f 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -30,14 +30,14 @@
文物
-
+
diff --git a/pages/map/index.wxss b/pages/map/index.wxss
index 6956214..bfaad9a 100644
--- a/pages/map/index.wxss
+++ b/pages/map/index.wxss
@@ -33,7 +33,7 @@
position: fixed;
margin-top: 60rpx;
right: 0;
- width: 105rpx;
+ /* width: 105rpx; */
background: #FFFFFF;
border-radius: 20rpx 0px 0px 20rpx;
font-size: 27rpx;
@@ -48,10 +48,11 @@
text-align: center;
}
.right-menu-item.active {
- background: #0B898E;
+ background: #0A9947;
color: #fff;
margin: 0;
- border-color: #0B898E;
+ padding: 0 10rpx;
+ border-color: #0A9947;
}
.right-menu-item.active+view {
border-top: none;
@@ -72,11 +73,11 @@
background: #00B3C8;
border-color: #00B3C8;
}
-.right-menus .right-menu-item:nth-child(6).active {
+.right-menus .right-menu-item:nth-child(7).active {
background: #EB3C70;
border-color: #EB3C70;
}
-.right-menus .right-menu-item:nth-child(7).active {
+.right-menus .right-menu-item:nth-child(6).active {
background: #9342CB;
border-color: #9342CB;
}
diff --git a/pages/order/card/index.wxml b/pages/order/card/index.wxml
index 9319cb8..e5f4b16 100644
--- a/pages/order/card/index.wxml
+++ b/pages/order/card/index.wxml
@@ -13,6 +13,8 @@
+
+
请选择充值金额
@@ -31,8 +33,7 @@
-
-
+
运费
diff --git a/pages/order/hotel/index.js b/pages/order/hotel/index.js
index d3f8800..6831c8a 100644
--- a/pages/order/hotel/index.js
+++ b/pages/order/hotel/index.js
@@ -62,11 +62,10 @@ Page({
end_date:CtripHotelCart.endDate,
start_date:CtripHotelCart.startDate
}).then(res=>{
- res.data.splice(0,1);
+ res.data.splice(1,1);
this.setData({
priceInfo:res.data
})
- console.log(res)
})
},
inputTel:function(e){
@@ -285,6 +284,13 @@ Page({
})
return false;
}
+ if(!this.data.tel){
+ wx.showToast({
+ title: '请填写手机号',
+ icon:"none"
+ })
+ return false;
+ }
let selectLinkman = [];
customerName.map(item=>{
selectLinkman.push(item.name);
diff --git a/pages/order/hotel/index.wxml b/pages/order/hotel/index.wxml
index fe10e3f..e82be48 100644
--- a/pages/order/hotel/index.wxml
+++ b/pages/order/hotel/index.wxml
@@ -100,6 +100,7 @@
-{{coupon.activity.money/100}}
+
@@ -116,7 +117,7 @@
{{item.name}}
手机号 {{item.tel}}
- 身份证 {{item.id_number}}
+ {{item.title}} {{item.id_number}}
diff --git a/pages/order/hotel/index.wxss b/pages/order/hotel/index.wxss
index bb102fe..765c9a1 100644
--- a/pages/order/hotel/index.wxss
+++ b/pages/order/hotel/index.wxss
@@ -195,6 +195,7 @@ page {
width: 100%;
max-height: 60%;
min-height: 30%;
+ overflow-y: auto;
}
.mask-title {
text-align: center;
@@ -415,6 +416,7 @@ page {
width: 700rpx;
padding: 0 25rpx;
background: #F7F7F7;
+ overflow-y: auto;
}
.btns {
display: flex;
diff --git a/pages/order/postOrder/index.wxml b/pages/order/postOrder/index.wxml
index db1942a..fe39bbb 100644
--- a/pages/order/postOrder/index.wxml
+++ b/pages/order/postOrder/index.wxml
@@ -2,7 +2,7 @@
-
+
订单金额:¥{{((price - (coupon?coupon.activity.money:0))>0?(price - (coupon?coupon.activity.money:0)):0)/100}}
@@ -42,7 +49,7 @@
取消
确定
- 添加出行人
+ 添加出行人
diff --git a/pages/order/roadOrder/index.wxss b/pages/order/roadOrder/index.wxss
index 65b17fb..916a21f 100644
--- a/pages/order/roadOrder/index.wxss
+++ b/pages/order/roadOrder/index.wxss
@@ -132,6 +132,7 @@ page {
width: 700rpx;
padding: 0 25rpx;
background: #F7F7F7;
+ overflow-y: auto;
}
.btns {
display: flex;
@@ -148,7 +149,6 @@ page {
border-radius: 40rpx;
font-size: 29rpx;
color: #000;
- margin-bottom: 24rpx;
}
.fixed-bottom .order-all-price text {
flex: 1;
diff --git a/pages/pbService/bus/lineinfo/index.js b/pages/pbService/bus/lineinfo/index.js
index b41601e..1bd0eec 100644
--- a/pages/pbService/bus/lineinfo/index.js
+++ b/pages/pbService/bus/lineinfo/index.js
@@ -10,7 +10,8 @@ Page({
id:null,
start:[],
end:[],
- now:null
+ now:null,
+ busNum:0
},
/**
@@ -26,8 +27,15 @@ Page({
commonApi._post("pbservice/Publicbus/busLineDetail",{
line_id:this.data.id
}).then(res=>{
+ let num = 0;
+ res.data.StandInfo.map(item=>{
+ if(item.BusInfo){
+ num++;
+ }
+ })
this.setData({
- info:res.data
+ info:res.data,
+ busNum:num
})
})
},
diff --git a/pages/pbService/bus/lineinfo/index.wxml b/pages/pbService/bus/lineinfo/index.wxml
index 2f76643..398652c 100644
--- a/pages/pbService/bus/lineinfo/index.wxml
+++ b/pages/pbService/bus/lineinfo/index.wxml
@@ -1,7 +1,7 @@
- {{info.LName}}路(4辆正在行驶)
+ {{info.LName}}路({{busNum}}辆正在行驶)
{{info.LDirection}}
首:{{info.LFStdFTime}} 末:{{info.LFStdETime}}
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index d80077e..d20584c 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -24,10 +24,10 @@
交通出行
-
+
停车场
diff --git a/pages/pbService/sceneComfort/index.js b/pages/pbService/sceneComfort/index.js
index cfc1294..fd4ef17 100644
--- a/pages/pbService/sceneComfort/index.js
+++ b/pages/pbService/sceneComfort/index.js
@@ -18,7 +18,10 @@ Page({
keywords:"",
areaObj:{},
comfortObj:{},
- searchText:""
+ searchText:"",
+ sceneLevel:[],
+ sceneLevelIndex:-1,
+ sceneLevelObj:{}
},
/**
@@ -54,6 +57,20 @@ Page({
areaObj:areaObj
})
})
+ commonApi._post("pbservice/Comfort/getSceneLevel").then(res=>{
+ console.log(res)
+ let sceneLevelObj = {};
+ res.data.map(item=>{
+ sceneLevelObj[item.level] = item.name;
+ })
+ res.data.unshift({
+ name:"不选择"
+ })
+ this.setData({
+ sceneLevel:res.data,
+ sceneLevelObj:sceneLevelObj
+ })
+ })
this.getList();
},
changeArea:function(e){
@@ -74,6 +91,15 @@ Page({
})
this.getList()
},
+ changeSceneLevel:function(e){
+ this.setData({
+ sceneLevelIndex:e.detail.value,
+ list:[],
+ pageNo:1,
+ total:1
+ })
+ this.getList()
+ },
getList:function(){
if(this.data.total<=this.data.list.length) return;
commonApi._post("pbservice/Comfort/getComfort",{
@@ -81,7 +107,8 @@ Page({
comfort_level:this.data.comfortIndex>0?this.data.comfortLevel[this.data.comfortIndex].level:null,
area_key:this.data.areaIndex>0?this.data.areas[this.data.areaIndex].area_code:null,
page_no:this.data.pageNo,
- page_num:10
+ page_num:10,
+ scene_level:this.data.sceneLevelIndex>0?this.data.sceneLevel[this.data.sceneLevelIndex].level:null
}).then(res=>{
this.setData({
list:this.data.list.concat(res.data.rows),
diff --git a/pages/pbService/sceneComfort/index.wxml b/pages/pbService/sceneComfort/index.wxml
index e2a2d37..1289851 100644
--- a/pages/pbService/sceneComfort/index.wxml
+++ b/pages/pbService/sceneComfort/index.wxml
@@ -7,6 +7,12 @@
搜索
+
+
+ {{sceneLevelIndex>0?sceneLevel[sceneLevelIndex].name:"景区等级"}}
+
+
+
{{comfortIndex>0?comfortLevel[comfortIndex].desc:"舒适度"}}
@@ -31,8 +37,8 @@
{{areaObj[item.area]}}
-
+
+ {{sceneLevelObj[item.scene_level]}}
diff --git a/pages/pbService/sceneComfort/index.wxss b/pages/pbService/sceneComfort/index.wxss
index b2ce37a..2c9491d 100644
--- a/pages/pbService/sceneComfort/index.wxss
+++ b/pages/pbService/sceneComfort/index.wxss
@@ -100,7 +100,6 @@ page {
justify-content: space-between;
margin-top: 30rpx;
margin-bottom: 20rpx;
- padding: 0 100rpx;
}
.picker .iconfont {
font-size: 16rpx;
diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml
index 497fbdc..51dc5f0 100644
--- a/pages/search/list/index.wxml
+++ b/pages/search/list/index.wxml
@@ -1,10 +1,10 @@
-
+
- 搜索1
+ 搜索
{{item.name}}
diff --git a/pages/user/order/hotelOrderInfo/index.wxml b/pages/user/order/hotelOrderInfo/index.wxml
index b0be99c..a0a4671 100644
--- a/pages/user/order/hotelOrderInfo/index.wxml
+++ b/pages/user/order/hotelOrderInfo/index.wxml
@@ -52,6 +52,7 @@
{{info.order_product_list[0].sku_name}} {{info.order_product_list[0].order_product_extend.days}}晚
+ 房间数:{{info.order_product_list[0].product_num}}间
{{info.order_product_list[0].order_product_extend.start_date_text}}{{info.order_product_list[0].order_product_extend.days}}晚{{info.order_product_list[0].order_product_extend.end_date_text}}
{{info.order_product_list[0].sku_model.bed_type}} | {{info.order_product_list[0].sku_model.breakfast}} | {{info.order_product_list[0].sku_model.area}} | {{info.order_product_list[0].sku_model.max_room_num}}人入住
diff --git a/pages/user/order/list.js b/pages/user/order/list.js
index 8c0ce03..be603e6 100644
--- a/pages/user/order/list.js
+++ b/pages/user/order/list.js
@@ -85,6 +85,10 @@ Page({
let item = e.currentTarget.dataset.item;
util.gotoOrder(item)
},
+ gotoProductDetail:function(e){
+ let item = e.currentTarget.dataset.item;
+ util.orderMoreTime({order_product_list:[item]})
+ },
changeType:function(e){
let type = e.currentTarget.dataset.type;
this.setData({
diff --git a/pages/user/order/list.wxml b/pages/user/order/list.wxml
index 7d5271b..d1fdd29 100644
--- a/pages/user/order/list.wxml
+++ b/pages/user/order/list.wxml
@@ -23,7 +23,7 @@
订单号:{{item.order_id}}
{{orderState[item.state]}}
-
+
{{item.product_model=='movie'?item.product_title:(item.product_title+item.sku_name)}}
diff --git a/pages/user/order/museumOrderInfo/index.wxml b/pages/user/order/museumOrderInfo/index.wxml
index becc8f2..d661487 100644
--- a/pages/user/order/museumOrderInfo/index.wxml
+++ b/pages/user/order/museumOrderInfo/index.wxml
@@ -67,10 +67,18 @@
- 订单信息
-
- 姓名:{{(index!=0?'、':'')+item.name}}
+ 出行人信息
+
+
+ 姓名:{{item.name}}
+
+
+ {{item.title}}:{{item.id_number}}
+
+
+
+ 订单信息
订单编号:{{info.order_id}}
diff --git a/pages/user/order/postOrderInfo/index.js b/pages/user/order/postOrderInfo/index.js
index 1d01bdf..5861a7e 100644
--- a/pages/user/order/postOrderInfo/index.js
+++ b/pages/user/order/postOrderInfo/index.js
@@ -11,6 +11,7 @@ Page({
data: {
info:null,
orderState:app.globalData.orderState,
+ productState:app.globalData.productState,
product_model:null,
isRefund:false,
feeInfoFlag:false,
diff --git a/pages/user/order/postOrderInfo/index.wxml b/pages/user/order/postOrderInfo/index.wxml
index 607ba79..7a3029b 100644
--- a/pages/user/order/postOrderInfo/index.wxml
+++ b/pages/user/order/postOrderInfo/index.wxml
@@ -14,17 +14,21 @@
-
-
- {{item.product_title}}
- {{item.sku_name}}
-
-
- ¥ {{item.product_price/100}}
- x{{item.product_num}}
+
+
+
+ {{item.product_title}}
+ {{item.sku_name}}
+
+
+ ¥ {{item.product_price/100}}
+ x{{item.product_num}}
+
+ 邮费:{{item.post_fee==0?'包邮':('¥'+item.post_fee/100)}} 实付:¥{{item.paid_money/100}}
+ {{productState[item.state]}}
-
+
商品总价
¥{{info.total_money/100}}
diff --git a/pages/user/order/postOrderInfo/index.wxss b/pages/user/order/postOrderInfo/index.wxss
index aae5492..4e93140 100644
--- a/pages/user/order/postOrderInfo/index.wxss
+++ b/pages/user/order/postOrderInfo/index.wxss
@@ -23,13 +23,23 @@ page {
margin: 20rpx 30rpx;
}
.product-info {
- display: flex;
- justify-content: space-between;
color: #333;
font-size: 24rpx;
padding-bottom: 20rpx;
- /* border-bottom: 1rpx solid #d8d8d8; */
- margin-bottom: 10rpx;
+ border-bottom: 1rpx solid #d8d8d8;
+ margin-bottom: 20rpx;
+}
+.product-info-top {
+ display: flex;
+ justify-content: space-between;
+}
+.product-price,.product-state {
+ text-align: right;
+ color: #666;
+}
+.product-state {
+ margin-top: 10rpx;
+ color: #0B898E;
}
.product-info image {
width: 140rpx;
diff --git a/project.config.json b/project.config.json
index 7322a96..67e12fa 100644
--- a/project.config.json
+++ b/project.config.json
@@ -67,9 +67,10 @@
"scene": null
},
{
- "id": -1,
- "name": "景区舒适度",
- "pathName": "pages/pbService/sceneComfort/index",
+ "id": 1,
+ "name": "好行",
+ "pathName": "pages/list/haoxing/index",
+ "query": "",
"scene": null
}
]