一卡游

app.js

@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest187? true : false;
+      data.isTest = data.isTest188? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件

pages/info/sceneProductInfo/index.wxml

@@ -131,7 +131,7 @@
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content1">
       <view class="iconfont icon-close" bindtap="hideDate"></view>
-      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}" endDays="{{30}}"></date>
       <view class="bottom-box">
         <view>
           合计: <text class="totalPrice">{{showPrice/100}}</text>

pages/order/components/date/index.js

@@ -19,6 +19,11 @@ Component({
     isTeam: {
       type: Number,
       default: 0
+    },
+    // 日期结束天数
+    endDays: {
+        type: Number,
+        value: 60
     }
   },
 
@@ -53,7 +58,7 @@ Component({
         skuName
       })
       // 在组件实例进入页面节点树时执行
-      let product = app.globalData.product, today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + 60 * 24 * 60 * 60 * 1000));
+      let product = app.globalData.product, today = util.formatDate(new Date()), end_date = util.formatDate(new Date(new Date().getTime() + this.properties.endDays * 24 * 60 * 60 * 1000));
       if (product.product.title.indexOf("苏州博物馆") != -1) {
         this.setData({
           isSzMuseum: true

pages/order/scene/index.wxml

@@ -135,7 +135,7 @@
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content2">
       <view class="iconfont icon-close" bindtap="hideDate"></view>
-      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}"></date>
+      <date wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime" product="{{product}}" endDays="{{30}}"></date>
       <view class="bottom-box">
         <view>
           合计: <text class="totalPrice">{{price}}</text>

pages/user/order/movieOrderInfo/index.wxml

@@ -48,7 +48,7 @@
     <view class="price">{{info.paid_money/100}}</view>
   </view>
   <view class="btns" style="border-top:1rpx solid #ccc" wx:if="{{info.state!='CLOSED'}}">
-    <navigator url="/pages/list/movieticket/index" class="btn">再次购买</navigator>
+    <!-- <navigator url="/pages/list/movieticket/index" class="btn">再次购买</navigator> -->
     <navigator url="../refundInfo/index?id={{info.order_id}}" class="btn" wx:if="{{isRefund}}">退款详情</navigator>
     <view class="btn" wx:if="{{info.state=='PAID'}}" bindtap="refund">取消订单</view>
     <view class="btn" wx:if="{{info.state=='UNPAID'}}" bindtap="close">取消订单</view>

project.private.config.json

@@ -6,6 +6,13 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/user/order/movieOrderInfo/index",
+          "pathName": "pages/user/order/movieOrderInfo/index",
+          "query": "id=46022504271632102675",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "subPackages/indexGQ/index",
           "pathName": "subPackages/index/index",

subPackages/goods/oneCardTour/info/index.wxml

@@ -65,17 +65,18 @@
   
   <view class="scroll-content">
     <view class="com-flex sku-info-type-container">
-        <view class="sku-info-type {{activeItemIndex==0?'active':''}}" bind:tap="changeActiveIndex" data-index="0">年卡权益</view>
+        <view class="sku-info-type {{activeItemIndex==0?'active':''}}" bind:tap="changeActiveIndex" data-index="0">使用说明</view>
-        <view class="sku-info-type {{activeItemIndex==1?'active':''}}" bind:tap="changeActiveIndex" data-index="1">合作景区</view>
+        <view class="sku-info-type {{activeItemIndex==1?'active':''}}" bind:tap="changeActiveIndex" data-index="1">年卡权益</view>
-        <view class="sku-info-type {{activeItemIndex==2?'active':''}}" bind:tap="changeActiveIndex" data-index="2">使用说明</view>
+        <view class="sku-info-type {{activeItemIndex==2?'active':''}}" bind:tap="changeActiveIndex" data-index="2">合作景区</view>
     </view>
 
     <view style="padding:0 30rpx 30rpx;">
-        <rich-text wx:if="{{activeItemIndex==0}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.detailinfo)}}"></rich-text>
+        <rich-text wx:if="{{activeItemIndex==0}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.expenseinfo)}}"></rich-text>
 
-        <rich-text wx:if="{{activeItemIndex==1}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.bookinfo)}}"></rich-text>
+        <rich-text wx:if="{{activeItemIndex==1}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.detailinfo)}}"></rich-text>
+
+        <rich-text wx:if="{{activeItemIndex==2}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.bookinfo)}}"></rich-text>
 
-        <rich-text wx:if="{{activeItemIndex==2}}" class="details" nodes="{{tool.formateRichText(activeItem.sku_model.expenseinfo)}}"></rich-text>
 
     </view>
   </view>

utils/util.js

@@ -350,9 +350,10 @@ const orderMoreTime = function(item){
           return
     }
     else if(info.product_model=='movie'){
-      wx.navigateTo({
+    //   wx.navigateTo({
-        url: '/pages/list/movieticket/index',
+    //     url: '/pages/list/movieticket/index',
-      })
+    //   })
+        goMovieList()
     }
     else if(info.product_model=='activity'){
       wx.navigateTo({