diff --git a/pages/culture/index.wxml b/pages/culture/index.wxml
index ebe1a87..f9e4564 100644
--- a/pages/culture/index.wxml
+++ b/pages/culture/index.wxml
@@ -29,8 +29,10 @@
{{item.name}}
- {{item.begin_date}}-{{item.end_date}}
+ {{item.activity_date}}-{{item.activity_end_date}}
+ {{item.activity_date}}
~
+ {{item.address}}
diff --git a/pages/group/mine/index.js b/pages/group/mine/index.js
index 8867874..55fb607 100644
--- a/pages/group/mine/index.js
+++ b/pages/group/mine/index.js
@@ -153,6 +153,18 @@ Page({
url: '/pages/info/orderInfo/index?id='+e.currentTarget.dataset.item.gpChildOrderNo,
})
},
+ refund(e){
+ wx.showModal({
+ title:"提示",
+ content:"确定申请退款吗?",
+ success:function(res){
+ if(res.confirm){
+ // todo
+ productApi.user_post({})
+ }
+ }
+ })
+ },
gotoPdd:function(){
let page = getCurrentPages();
if(page[page.length-2] && page[page.length-2].route && page[page.length-2].route.indexOf('pages/group/index')!=-1){
diff --git a/pages/group/mine/index.wxml b/pages/group/mine/index.wxml
index 583f97d..f1655b3 100644
--- a/pages/group/mine/index.wxml
+++ b/pages/group/mine/index.wxml
@@ -27,6 +27,9 @@
查看订单
+
我参与的
@@ -50,6 +53,9 @@
查看订单
+
diff --git a/pages/index/index.js b/pages/index/index.js
index 33d914b..90a8330 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -178,7 +178,9 @@ Page({
commonApi._post("product/get_product_by_tag",{
tag_id:17,
offset:0,
- limit:1
+ limit:1,
+ sort: 'price',
+ order: 'asc'
}).then(res=>{
if(res.data.list.length > 0){
let price = res.data.list[0].price
@@ -239,6 +241,13 @@ Page({
util.gotoDetail(item)
},
gotoPath:function(e){
+ if(e.currentTarget.dataset.title=='书香借阅'){
+ wx.navigateToMiniProgram({
+ appId: 'wx165d4f1727f6bdb0',
+ path:'pages/home/home'
+ })
+ return;
+ }
wx.navigateTo({
url: e.currentTarget.dataset.path,
})
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 724dcfa..3f3323c 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -94,7 +94,7 @@
- 精品线路四季苏州最是江南
+ 精品线路带你轻松玩转苏州
- 四季苏州
- 最是江南
+ 带你轻松
+ 玩转苏州
¥{{roadProduct.price?roadProduct.price/100:0}}起
diff --git a/pages/info/activityInfo/index.wxml b/pages/info/activityInfo/index.wxml
index c9d9a12..597d9b2 100644
--- a/pages/info/activityInfo/index.wxml
+++ b/pages/info/activityInfo/index.wxml
@@ -39,7 +39,8 @@
{{info.scene_data.title}}
- 查看 >>
+ 查看
+
{{info.scene_data.address}}
diff --git a/pages/info/activityInfo/index.wxss b/pages/info/activityInfo/index.wxss
index e4b81f2..c531df3 100644
--- a/pages/info/activityInfo/index.wxss
+++ b/pages/info/activityInfo/index.wxss
@@ -113,7 +113,7 @@
}
.scene-box image {
display: block;
- width: 120rpx;
+ width: 167rpx;
margin: 20rpx;
height: 100rpx;
flex-shrink: 0;
@@ -131,11 +131,13 @@
color: #0B898E;
justify-content: space-between;
align-items: center;
+ margin-top: 8rpx;
}
.scene-title {
color: #000;
font-size: 31rpx;
font-weight: 500;
+ flex: 1;
}
.scene-title-box view:nth-child(2){
flex-shrink: 0;
diff --git a/pages/list/sale/index.wxml b/pages/list/sale/index.wxml
index 2b35e0d..43f1465 100644
--- a/pages/list/sale/index.wxml
+++ b/pages/list/sale/index.wxml
@@ -1,6 +1,6 @@
-
+
- 限时特惠
+ 特惠新品
新品推荐
@@ -32,7 +32,7 @@
¥
{{item.price/100}}
- ¥{{item.sku.market_price/100}}
+
马上抢
即将开抢
@@ -54,7 +54,7 @@
¥
{{item.price/100}}
- ¥{{item.market_price/100}}
+
马上抢
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 27b5788..134c168 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -30,7 +30,7 @@
-
+
diff --git a/project.private.config.json b/project.private.config.json
index b3b1e72..ef3055e 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -13,8 +13,8 @@
"miniprogram": {
"list": [
{
- "name": "pages/index/index",
- "pathName": "pages/index/index",
+ "name": "pages/group/index",
+ "pathName": "pages/group/index",
"query": "authCode=2c290d21383ccd3350747bba95f306f0",
"scene": null
},