From 95b033d0fcc322a45049e73f5bf64735c78a8e12 Mon Sep 17 00:00:00 2001
From: nige <you@example.com>
Date: Tue, 25 Apr 2023 09:28:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E6=9C=9F=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                          | 2 +-
 pages/list/activitynew/index.js | 1 -
 pages/order/coupon/index.wxml   | 2 +-
 pages/order/movie/index.js      | 2 +-
 pages/user/coupon/index.wxml    | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app.js b/app.js
index 81893c1..70097da 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest73? true : false;
+      data.isTest = data.isTest74? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/list/activitynew/index.js b/pages/list/activitynew/index.js
index 604547e..acb4921 100644
--- a/pages/list/activitynew/index.js
+++ b/pages/list/activitynew/index.js
@@ -335,7 +335,6 @@ Page({
         url: '/pages/list/movieticket/list/info/index?id=' + item.third_id
       })
     } else if (this.data.type == 4) {
-      return
       wx.navigateTo({
         url: '/pages/list/movieticket/list/cinema/index?id=' + item.third_id
       })
diff --git a/pages/order/coupon/index.wxml b/pages/order/coupon/index.wxml
index 704ff1e..6ee7140 100644
--- a/pages/order/coupon/index.wxml
+++ b/pages/order/coupon/index.wxml
@@ -5,7 +5,7 @@
     <view class="money">{{item.activity.money/100}}</view>
     <view class="coupon-info">
       <view>满{{item.activity.mini_money/100}}元可用</view>
-      <view class="couon-date">{{item.activity.end_time}}到期</view>
+      <view class="couon-date" wx:if="{{item.end_time}}">{{item.end_time}}到期</view>
     </view>
     <view class="iconfont icon-{{item.selected?'gou':'quan'}}" bindtap="selectIt" data-index="{{index}}"></view>
   </view>
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index f33494f..efa2c54 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -28,7 +28,7 @@ Page({
     let product = app.globalData.product,price=0;
     product.info.selectSeatInfo = JSON.parse(options.selectSeatInfo)
     product.info.selectSeatInfo.seatPriceInfo.map(item=>{
-      price =price + Number(item.split('-')[1]) 
+      price =price +Math.ceil(Number(item.split('-')[1])*1.006 * 100) / 100
     })
     console.log(price);
     this.setData({
diff --git a/pages/user/coupon/index.wxml b/pages/user/coupon/index.wxml
index c5db573..8d46f82 100644
--- a/pages/user/coupon/index.wxml
+++ b/pages/user/coupon/index.wxml
@@ -12,7 +12,7 @@
     <view class="coupon-money">￥<text>{{item.activity.money/100}}</text></view>
   </view>
   <view class="coupon-tip"><text>使用条件：</text>满{{item.activity.mini_money/100}}元</view>
-  <view class="coupon-tip"><text>有效期：</text>{{item.activity.end_time}}</view>
+  <view class="coupon-tip"><text>有效期：</text>{{item.end_time}}</view>
   <view class="coupon-tip"><text>优惠码：</text>{{item.key}}</view>
   <view class="coupon-rule">
   <view bindtap="showRule" data-item="{{item}}">使用规则  <text class="iconfont icon-xia"></text></view>