评价待测

pages/order/detail/index.js

@@ -42,11 +42,13 @@ Page({
     imType: 'order',
   },
   handleInit(event) {
+    console.log(event, 666555)
     const {
       status
     } = event.detail;
   },
   handleSuccess(event) {
+    console.log(event, 676767)
     const {
       result
     } = event.detail;

pages/order/detail/index.ttml

@@ -49,11 +49,11 @@
       <text class="icon icon-bj"></text>
       <view class="name">修改信息</view>
     </view> -->
-    <view class="icon-tab" tt:if="{{info.orderStatus == 1 && info.waitPayResult!=1}}"
+    <!-- <view class="icon-tab" tt:if="{{info.orderStatus == 1 && info.waitPayResult!=1}}"
       data-presellStatus="{{query.presellStatus}}" bindtap="cancelOrder">
       <text class="icon icon-cancel-order"></text>
       <view class="name">{{query.presellStatus ==2?'取消支付':'取消订单'}}</view>
-    </view>
+    </view> -->
     <!-- <view class="icon-tab"
       tt:if="{{info.orderStatus==2&&info.atype=='0'?false:true&&info.comment && info.comment != ''&&info.comment.modified == 0}}"
       data-index="1" bindtap="actEvaluate">
@@ -69,13 +69,13 @@
     <!-- 完成支付 -->
     <button class="button button-warn share-group" tt:if="{{info.orderStatus == 1}}" bindtap="goPay">继续支付</button>
     <!-- 活动评价 -->
-    <button class="button button-warn share-group"
+    <!-- <button class="button button-warn share-group"
       tt:elif="{{info.waitComment == 1&&info.orderStatus!=3&&info.orderStatus!=4&&(query.otype==0||query.otype==3)}}"
-      bindtap="actEvaluate">{{info.atype==1?'商品':'活动'}}评价</button>
+      bindtap="actEvaluate">{{info.atype==1?'商品':'活动'}}评价</button> -->
     <!-- todo: -->
-    <!-- <rate-button order-id="xxx" bind:init="handleInit" bind:success="handleSuccess"
-      class="button button-warn share-group" style="width: 310rpx;" /> -->
-
+    <rate-button tt:if="{{info.waitComment == 1||info.waitComment == 2}}" order-id="{{info.outTradeNo}}"
+      bind:init="handleInit" bind:success="handleSuccess" class="button button-warn share-group"
+      style="width: 310rpx;" />
     <!-- 追加评价 -->
     <!-- <button class="button button-warn share-group"
       tt:elif="{{info.comment&&info.comment.additional == 0&&(query.otype==0||query.otype==3)}}"
@@ -112,10 +112,12 @@
         <view class="listTitle">{{info.title}}</view>
         <text class="font12 black">
           {{info.atype == 0 ? '场次':'颜色'}}：{{info.sessionName}}
-          {{info.atype == 0 ? (info.military==1?'排':'套餐'):'尺寸'}}：<block tt:for="{{info.meals}}" tt:for-index="index"
-            tt:for-item="infoName" tt:key="index">{{infoName.policyName}}<text
+          {{info.atype == 0 ? (info.military==1?'排':'套餐'):'尺寸'}}：<block tt:if="{{info.sessionName!='暂不选择'}}"
+            tt:for="{{info.meals}}" tt:for-index="index" tt:for-item="infoName" tt:key="index">
+            {{infoName.policyName}}<text
               tt:if="{{info.military==1}}">（{{info.campSex==0?'仅女生可报':(info.campSex==1?'仅男生可报':'不限性别')}}）</text>({{infoName.num}})
           </block>
+          <block tt:if="{{info.sessionName=='暂不选择'}}">暂不选择</block>
         </text>
       </view>
     </navigator>
@@ -172,31 +174,31 @@
         <view class="cell-title">备注</view>
         <view class="cell-value">{{info.remark}}</view>
       </view>
-      <view class="cell" tt:if="{{info.orderStatus == 2 && info.agreementUrl}}">
+      <!-- <view class="cell" tt:if="{{info.orderStatus == 2 && info.agreementUrl}}">
         <view class="cell-title">旅游电子合同</view>
         <view class="cell-value">
           <button plain size="mini" type="warn" data-type="电子合同" bindtap="lookContract" data-url="{{info.agreementUrl}}"
             class="button button-radius contract button-warn button-border">点击查看</button>
         </view>
-      </view>
+      </view> -->
 
 
       <!-- tt:if="{{info.travelPlanUrl!=null}}" -->
-      <view class="cell" tt:if="{{info.travelPlanUrl!=null}}">
+      <!-- <view class="cell" tt:if="{{info.travelPlanUrl!=null}}">
         <view class="cell-title">行程单</view>
         <view class="cell-value">
           <button plain size="mini" type="warn" data-type="行程单" bindtap="lookContract" data-url="{{info.travelPlanUrl}}"
             class="button button-radius contract">点击查看</button>
         </view>
-      </view>
-      <navigator class="cell ceill-link scan" hover-class="none"
+      </view> -->
+      <!-- <navigator class="cell ceill-link scan" hover-class="none"
         url="/pages/order/groupQrcode/index?orderid={{info.orderid}}"
         tt:if="{{info.orderStatus == 2 && info.sessionQrcode}}">
         <view class="cell-title">扫码加入活动群</view>
         <view class="cell-value">
           <text class="qrCode"></text>
         </view>
-      </navigator>
+      </navigator> -->
       <view class="cell" tt:if="{{info.canRefund && info.atype == 1}}">
         <view class="cell-title">申请退款</view>
         <view class="cell-value">
@@ -276,8 +278,8 @@
         <button size="mini" class="button refund button-plain-gray button-radius"
           tt:if="{{(item.status == 1 || item.status == 15)&& item.canRefund}}" bindtap="refund"
           data-password="{{item.password}}" data-status="{{item.status}}" data-index="{{index}}">申请退款</button>
-        <button size="mini" class="button cancelRefund button-plain-gray button-radius" tt:if="{{item.status == 6}}"
-          bindtap="cancelRefund" data-password="{{item.password}}">取消退款</button>
+        <!-- <button size="mini" class="button cancelRefund button-plain-gray button-radius" tt:if="{{item.status == 6}}"
+          bindtap="cancelRefund" data-password="{{item.password}}">取消退款</button> -->
         <!-- <button size="mini" class="button refund button-plain-gray button-radius" tt:if="{{item.changeStatus!=2}}"
           data-status="{{item.changeStatus}}" data-oid="{{item.oid}}"
           bindtap="changeMeals">{{item.changeStatus==0?'更换场次':'申请中'}}</button> -->
@@ -286,10 +288,10 @@
         <!-- <button size="mini" plain type="warn" class="button button-radius" tt:if="{{info.isManyDay == 1 && item.status == 1}}" bindtap="trip" data-refundpwd="{{item.password}}">补充营员信息</button> -->
         <button size="mini" type="warn" bindtap="scheduling" data-pendingStatus="2" data-oid="{{item.oid}}"
           data-optionId="{{item.optionId}}" class="button refund button-plain-gray button-radius"
-          tt:if="{{info.sessionName=='暂不选择'&&info.idcardCount<info.num}}">选择排期</button>
+          tt:if="{{info.sessionName=='暂不选择'&&info.idcardCount<info.num&&item.status==1}}">选择排期</button>
         <button size="mini" type="warn" bindtap="scheduling" data-pendingStatus="1" data-oid="{{item.oid}}"
           data-optionId="{{item.optionId}}" class="button refund button-plain-gray button-radius"
-          tt:if="{{info.sessionName!='暂不选择'&&info.idcardCount<info.num}}">添加出行人</button>
+          tt:if="{{info.sessionName!='暂不选择'&&info.idcardCount<info.num&&item.status==1}}">添加出行人</button>
       </view>
     </view>
   </view>

pages/order/index/order.ttml

@@ -30,8 +30,8 @@
 <view class="content">
   <view class="order-card white-bg" tt:for="{{list}}" tt:key="unique">
     <view style="padding:  20rpx 20rpx 0 20rpx ;">
-      <view class="orderItemTop">活动开始时间：{{item.startTime}} <text class="red" style="float: right;"
-          tt:if="{{!(item.status == 13 && item.needPayBalance==1)}}">{{item.statusDesc}}</text>
+      <view class="orderItemTop">活动开始时间：{{item.startTime=='3000-01-01'?'待定':item.startTime}} <text class="red"
+          style="float: right;" tt:if="{{!(item.status == 13 && item.needPayBalance==1)}}">{{item.statusDesc}}</text>
       </view>
       <navigator class="order-card-main" hover-class="none"
         url="/pages/order/detail/index?orderid={{item.orderid}}&otype={{queryData.otype}}&presellStatus={{item.presellStatus}}">
@@ -98,9 +98,9 @@
           <!-- <text class="badge--fixed" tt:if="{{item.atype == 0}}">+50~100</text> -->
         </button>
       </block>
-      <button plain size="mini" type="warn" class="button button-radius cancel-refund"
+      <!-- <button plain size="mini" type="warn" class="button button-radius cancel-refund"
         tt:elif="{{item.status == 4 || item.status == 5}}" bindtap="cancelRefund"
-        data-orderid="{{item.orderid}}">取消退款</button>
+        data-orderid="{{item.orderid}}">取消退款</button> -->
       <block tt:elif="{{item.status == 15}}"><text>正在积极候补中，关注服务号可第一时间收到候补结果</text>
         <navigator class="ceill-link"
           url="/pages/public/swiper/web?url=https://mp.weixin.qq.com/s/MEg6m2PXpNLrBDAet7sfug&title=宝贝走天下"> <button

pages/order/refund/refund.js

@@ -489,7 +489,7 @@ Page({
           }, ],
           callbackData: {
             reason_type: that.data.reasonIndex,
-            reason: that.data.defaultText,
+            reason: that.data.reason ? that.data.reason : that.data.defaultText,
             oid: that.data.oid,
           }, // 透传数据，开发者自定义字段 非必传
           success: successRes => {
@@ -497,7 +497,8 @@ Page({
               mask: true
             });
             console.log('申请退款成功', successRes, '参数',
-              'itemOrderId:', res.data.itemOrderList[0].itemOrderId, 'reason:', that.data.defaultText
+              'itemOrderId:', res.data.itemOrderList[0].itemOrderId,
+              'reason:', that.data.defaultText
             );
           },
           fail: errRes => {

pages/order/success/index.js

@@ -58,20 +58,20 @@ Page({
       presellStatus = '';
     // 定义跳转订单详情页链接
     let link = '/pages/order/detail/index?orderid=' + this.data.orderid;
-    // link = link+'&otype=' + (that.data.btype==0 || that.data.btype == 2)?2:1;
-    if (that.data.btype == 0 || that.data.btype == 2 || that.data.btype == 3) {
-      link = link + '&otype=2';
-    } else {
-      link = link + '&otype=1';
-    }
-    if (that.data.presellOpen != '' && that.data.presellStatus == '') {
-      presellStatus = that.data.presellOpen != 0 ? 1 : 0;
-      link = link + '&presellStatus=' + presellStatus;
+    link = link + '&otype=0' + '&presellStatus=0'
+    // if (that.data.btype == 0 || that.data.btype == 2 || that.data.btype == 3) {
+    //   link = link + '&otype=2';
+    // } else {
+    //   link = link + '&otype=1';
+    // }
+    // if (that.data.presellOpen != '' && that.data.presellStatus == '') {
+    //   presellStatus = that.data.presellOpen != 0 ? 1 : 0;
+    //   link = link + '&presellStatus=' + presellStatus;
 
-    } else if (that.data.presellStatus != '' && that.data.presellOpen == '') {
-      presellStatus = that.data.presellStatus == 1 || that.data.presellStatus == 2 ? 2 : 0;
-      link = link + '&presellStatus=' + presellStatus;
-    }
+    // } else if (that.data.presellStatus != '' && that.data.presellOpen == '') {
+    //   presellStatus = that.data.presellStatus == 1 || that.data.presellStatus == 2 ? 2 : 0;
+    //   link = link + '&presellStatus=' + presellStatus;
+    // }
     that.setData({
       link
     });
@@ -79,7 +79,7 @@ Page({
       func: "v2/order/detail",
       data: {
         "orderid": that.data.orderid,
-        // "otype":0,
+        "otype": 0,
         presellStatus: 0
       }
     }, function (res) {

project.config.json

@@ -57,8 +57,7 @@
     },
     "condition": {
         "miniprogram": {
-            "list": [
-                {
+            "list": [{
                     "name": "扫码进入",
                     "pathName": "pages/activeDetail/activeDetail",
                     "query": "scene=563af444e0084366be1904ce117f04f6",
@@ -241,5 +240,13 @@
             ]
         }
     },
+    "ttPlugins": {
+        "dependencies": {
+            "microapp-trade-plugin": {
+                "version": "1.2.8",
+                "isDynamic": true
+            }
+        }
+    },
     "douyinProjectType": "convert"
-}
+}