From f30ea9de1cc6f821cc5a21b1ba5e5d2760fedbc0 Mon Sep 17 00:00:00 2001
From: yvette <pypcwt@163.com>
Date: Wed, 17 Nov 2021 10:25:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/culture/index.wxml           |  4 +++-
 pages/culture/info/index.wxml      |  4 ++--
 pages/group/mine/index.js          | 12 ++++++++++++
 pages/group/mine/index.wxml        |  6 ++++++
 pages/index/index.js               | 11 ++++++++++-
 pages/index/index.wxml             |  6 +++---
 pages/info/activityInfo/index.wxml |  3 ++-
 pages/info/activityInfo/index.wxss |  4 +++-
 pages/list/sale/index.wxml         |  8 ++++----
 pages/pbService/index.wxml         |  2 +-
 project.private.config.json        |  4 ++--
 11 files changed, 48 insertions(+), 16 deletions(-)

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 @@
     <image src="{{item.cover}}" mode="aspectFill"></image>
     <view class="right-info">
       <view class="textOver2">{{item.name}}</view>
-      <view wx:if="{{item.begin_date || item.end_date}}" style="margin-bottom:5rpx;margin-top:3rpx">{{item.begin_date}}-{{item.end_date}}</view>
+      <view wx:if="{{item.activity_end_date && item.activity_date}}" style="margin-bottom:5rpx;margin-top:3rpx">{{item.activity_date}}-{{item.activity_end_date}}</view>
+      <view wx:elif="{{item.activity_date}}" style="margin-bottom:5rpx;margin-top:3rpx">{{item.activity_date}}</view>
       <view class="textOver" wx:else style="margin-bottom:5rpx;margin-top:3rpx;opacity:0">~  </view>
+      <view wx:if="{{item.address}}" style="margin-top:3rpx">{{item.address}}</view>
       <!-- <view class="info-bottom textOver">
         <view class="info-address textOver">{{item.supplier_name}}</view>
         <view class="info-btn" style="background:#999999" wx:if="{{item.is_act_end==1}}">已结束</view>
diff --git a/pages/culture/info/index.wxml b/pages/culture/info/index.wxml
index 02ce4bb..a2c3cbd 100644
--- a/pages/culture/info/index.wxml
+++ b/pages/culture/info/index.wxml
@@ -9,9 +9,9 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/activity/time.png" mode="widthFix"></image>
       <text>活动时间：{{info.begin_date}} ~ {{info.end_date}}</text>
     </view>
-    <view class="top-tip-box" wx:if="{{info.detail_address}}">
+    <view class="top-tip-box" wx:if="{{info.address}}">
       <image src="https://static.ticket.sz-trip.com/xcxImages/activity/location.png" mode="widthFix"></image>
-      <text>活动地点：{{info.detail_address}}</text>
+      <text>活动地点：{{info.address}}</text>
     </view>
   </view>
   <!-- <view class="tip-box" wx:if="{{info && info.is_can_booking!=1}}">本活动无需在线预约，可直接前往。更多详情请咨询活动主办方工作人员。</view> -->
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 @@
     <view class="item-bottom" wx:if="{{type==2}}">
       <view class="info-btn info-btn-new" catchtap="goOrder" data-item="{{item}}">查看订单</view>
     </view>
+    <!-- <view class="item-bottom" wx:else>
+      <view class="info-btn info-btn-new" catchtap="refund" data-item="{{item}}">退款</view>
+    </view> -->
   </view>
   <view class="list-title" wx:if="{{type==1 && list.joinList.length>0 || type==2 && over.joinList.length>0}}">我参与的</view>
   <view class="item" wx:for="{{type==1?list.joinList:over.joinList}}" bindtap="gotoDetail" data-item="{{item}}">
@@ -50,6 +53,9 @@
     <view class="item-bottom" wx:if="{{type==2}}">
       <view class="info-btn info-btn-new" catchtap="goOrder" data-item="{{item}}">查看订单</view>
     </view>
+    <!-- <view class="item-bottom" wx:else>
+      <view class="info-btn info-btn-new" catchtap="refund" data-item="{{item}}">退款</view>
+    </view> -->
   </view>
 </view>
 <view wx:if="{{list.joinList.length==0 && list.launchList.length==0 && type==1 || type==2 && over.joinList.length==0 && over.launchList.length==0}}" class="common-empty" style="z-index:-1">
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 @@
       </view>
     </view>
     <view class="sale-box" bindtap="gotoPath" data-title="精品线路" data-path="/pages/list/road/index">
-      <view class="sale-title"><text>精品线路</text>四季苏州最是江南</view>
+      <view class="sale-title"><text>精品线路</text>带你轻松玩转苏州</view>
       <view class="sale-product">
         <view class="sale-product-bg road-product-bg"></view>
         <common-image class="sale-img" width="173rpx" height="165rpx"
@@ -104,8 +104,8 @@
         </image>
         <view class="sale-info">
           <view class="sale-product-title textOver2">
-            <view>四季苏州</view>
-            <view>最是江南</view>
+            <view>带你轻松</view>
+            <view>玩转苏州</view>
           </view>
           <view class="sale-price" style="color:rgb(0, 153, 137)"  wx:if="{{roadProduct}}">￥{{roadProduct.price?roadProduct.price/100:0}}起</view>
         </view>
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 @@
   <view class="scene-info">
     <view class="scene-title-box">
       <view class="scene-title textOver">{{info.scene_data.title}}</view>
-      <view>查看 >></view>
+      <view>查看</view>
+      <image style="width:15rpx;margin:0;margin-left:8rpx" src="https://static.ticket.sz-trip.com/uploads/20211115/bce693953f019999dbc11ee16abf64bb.png" mode="widthFix"></image>
     </view>
     <view class="scene-address textOver2">{{info.scene_data.address}}</view>
     <!-- <view class="scene-btn">查看详情</view> -->
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 @@
-<title title="限时特惠"></title>
+<title title="特惠新品"></title>
 <view class="sale-types">
-  <view class="sale-type{{type==0?' active':''}}" bindtap="changeType" data-type="0">限时特惠</view>
+  <view class="sale-type{{type==0?' active':''}}" bindtap="changeType" data-type="0">特惠新品</view>
   <view class="sale-type{{type==1?' active':''}}" bindtap="changeType" data-type="1">新品推荐</view>
 </view>
 <view style="height:87rpx"></view>
@@ -32,7 +32,7 @@
           <view class="price">
             <text>￥</text>
             <text>{{item.price/100}}</text>
-            <text>￥{{item.sku.market_price/100}}</text>
+            <!-- <text>￥{{item.sku.market_price/100}}</text> -->
           </view>
           <view class="btn" wx:if="{{type==0}}">马上抢</view>
           <view class="btn" wx:else>即将开抢</view>
@@ -54,7 +54,7 @@
         <view class="price">
           <text>￥</text>
           <text>{{item.price/100}}</text>
-          <text>￥{{item.market_price/100}}</text>
+          <!-- <text>￥{{item.market_price/100}}</text> -->
         </view>
         <view class="btn">马上抢</view>
         <!-- <view class="btn" wx:else>即将开抢</view> -->
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 @@
     </view>
   </view>
 </view>
-<image class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211105/25d428dfba0641294c8457acd8966076.png" mode="widthFix"></image>
+<image class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211115/335a42385c9e15ece075980209b0643a.png" mode="widthFix"></image>
 <view class="pb-box">
   
   <!-- <view class="pb-title">交通出行</view> -->
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
         },