联调

components/activity/sku.js

@@ -557,17 +557,33 @@ Component({
           this.data.initialSku.selectedNum = val;
           break;
       }
-      if (parseInt(this.data.initialSku.selectedNum) > this.data.sku.stock_num) {
-        util.showTips("库存不足");
-        this.data.initialSku.selectedNum = this.data.sku.stock_num;
-      }
-      if ((type == 'minus' || type == 'modfiy') && (parseInt(this.data.initialSku.selectedNum) < this.data.sku.minT || util.isEmpty(this.data.initialSku.selectedNum))) {
-        util.showTips("至少选择" + this.data.sku.minT + "件");
-        this.data.initialSku.selectedNum = this.data.sku.minT;
-      }
-      if ((type == 'plus' || type == 'modfiy') && parseInt(this.data.initialSku.selectedNum) > this.data.sku.maxT) {
-        util.showTips("最大只能购买" + this.data.sku.maxT + "件");
-        this.data.initialSku.selectedNum = this.data.sku.maxT;
+      // 不选择排期 和默认项比较
+      if (this.data.checkScheduling == 1) {
+        if (parseInt(this.data.initialSku.selectedNum) > this.data.defaultPackage[0].stock_num) {
+          util.showTips("库存不足");
+          this.data.initialSku.selectedNum = this.data.defaultPackage[0].actnum;
+        }
+        if ((type == 'minus' || type == 'modfiy') && (parseInt(this.data.initialSku.selectedNum) < this.data.defaultPackage[0].minT || util.isEmpty(this.data.initialSku.selectedNum))) {
+          util.showTips("至少选择" + this.data.defaultPackage[0].minT + "件");
+          this.data.initialSku.selectedNum = this.data.defaultPackage[0].minT;
+        }
+        if ((type == 'plus' || type == 'modfiy') && parseInt(this.data.initialSku.selectedNum) > this.data.defaultPackage[0].maxT) {
+          util.showTips("最大只能购买" + this.data.defaultPackage[0].maxT + "件");
+          this.data.initialSku.selectedNum = this.data.defaultPackage[0].maxT;
+        }
+      } else {
+        if (parseInt(this.data.initialSku.selectedNum) > this.data.sku.stock_num) {
+          util.showTips("库存不足");
+          this.data.initialSku.selectedNum = this.data.sku.stock_num;
+        }
+        if ((type == 'minus' || type == 'modfiy') && (parseInt(this.data.initialSku.selectedNum) < this.data.sku.minT || util.isEmpty(this.data.initialSku.selectedNum))) {
+          util.showTips("至少选择" + this.data.sku.minT + "件");
+          this.data.initialSku.selectedNum = this.data.sku.minT;
+        }
+        if ((type == 'plus' || type == 'modfiy') && parseInt(this.data.initialSku.selectedNum) > this.data.sku.maxT) {
+          util.showTips("最大只能购买" + this.data.sku.maxT + "件");
+          this.data.initialSku.selectedNum = this.data.sku.maxT;
+        }
       }
       this.setData({
         initialSku: this.data.initialSku
@@ -665,7 +681,8 @@ Component({
         method: "POST",
         load: true
       }, function (data) {
-        // console.log(data.data,67676767)
+        data.data = JSON.parse(data.data)
+        console.log(data.data, 67676767)
         if (data.code == 0) {
           let totalPrice = that.data.initialSku.selectedNum * that.data.defaultPackage[0].price * 100
           // console.log('商品数', that.data.initialSku.selectedNum, '价格', that.data.defaultPackage[0].price, '总价', totalPrice)
@@ -699,13 +716,12 @@ Component({
             },
             goodsPage: {
               path: "/pages/order/success/index",
-              // todo:orderid不对
               params: {
-                orderid: data.data
+                orderid: data.data.orderid
               },
             },
             callbackData: {
-              out_order_no: data.data
+              out_order_no: data.data.outTradeNo
             }, // 透传数据，开发者自定义字段 非必传
             tradeOption: {
               life_trade_flag: 0 // 0：非融合链路（默认值）  1：走融合链路（标准融合/完全融合）
@@ -716,9 +732,9 @@ Component({
                 outOrderNo
               } = res;
               console.log("success res", res);
-              console.log("orderId", orderId, "outOrderNo", outOrderNo);
+              console.log("orderId", orderId,data.data.orderId, "outOrderNo", outOrderNo);
               tt.navigateTo({
-                url: '/pages/order/success/index?orderid=' + orderId
+                url: '/pages/order/success/index?orderid=' + data.data.orderId
               });
               this.setData({
                 orderId,

components/activity/sku.ttml

@@ -8,7 +8,7 @@
       <checkbox checked="{{checkeduseCoin}}" color="#ee3a43" />仅显示可用宝贝币的场次
     </checkbox-group>
     <!-- 补缴费用说明 -->
-    <!-- wx:if="{{orderInfo.dayBeforeStart}}" -->
+    <!-- tt:if="{{orderInfo.dayBeforeStart}}" -->
     <!-- <view tt:if="{{orderInfo}}">
       <view class="modular modular-pad" tt:if="{{orderInfo.refundRule!=5}}">
         <view class="modal-title">补缴费用</view>

components/cashCoupon/index.ttml

@@ -5,7 +5,7 @@
   </view>
   <view class='box'>
     <view class='box-overflow'>
-      <view class='voucher-list white-bg' wx:for="{{vouchers}}" wx:key="*this">
+      <view class='voucher-list white-bg' tt:for="{{vouchers}}" tt:key="*this">
         <view class='price'>
           <text class='font12'>￥</text>{{item.price}}
         </view>

components/photoList/index.ttml

@@ -50,7 +50,7 @@
   </view>
 </scroll-view>
 
-<!-- <block wx:if="{{!selectMore}}"> -->
+<!-- <block tt:if="{{!selectMore}}"> -->
 <slot name="bottomBtn" tt:if="{{!selectMore}}"></slot>
 <!-- </block> -->
 <view class="btn-bottom" tt:else>

pages/account/cards/index.ttml

@@ -12,7 +12,7 @@
     <view class="label">购买信息</view>
   </view>
 </view>
-<!-- <view class="tab-bar white-bg" wx:if="{{isSelected}}">
+<!-- <view class="tab-bar white-bg" tt:if="{{isSelected}}">
   <view class="tab-item {{ctype == 0 ? 'active' : ''}}" data-index="0" bindtap="setTabbar">
     <view class="label">儿童单飞信息</view>
   </view>

pages/account/coin/cash.ttml

@@ -4,8 +4,8 @@
   <view class="content-box content-pad">
     <view class="font12 cash-text rule-text-line">
       <view class="font16">- 提现说明 -</view>
-      <view wx:if="{{info.scale<1}}">满{{info.minprice}}可提现，<text class="red">只按{{info.scale*100}}%提现</text>，建议您购买活动</view>
-      <view wx:else>可抵扣活动，满100元可提现。</view>
+      <view tt:if="{{info.scale<1}}">满{{info.minprice}}可提现，<text class="red">只按{{info.scale*100}}%提现</text>，建议您购买活动</view>
+      <view tt:else>可抵扣活动，满100元可提现。</view>
     </view>
     <view class='list-block'>
       <view class='item-content'>
@@ -15,7 +15,7 @@
         </view>
         <view class='item-after'>元</view>
       </view>
-      <view class='item-content' wx:if="{{info.scale<1}}">
+      <view class='item-content' tt:if="{{info.scale<1}}">
         <view class='item-title label'>折后金额：</view>
         <view class='item-input red'>{{okPriceText}}</view>
       </view>
@@ -26,7 +26,7 @@
           <label class="radio"><radio value="2" color="#EE3A43" checked="{{payType == 2 ? true:false}}"/>银行卡</label>
         </radio-group>
       </view>
-      <block wx:if="{{payType == 0}}">
+      <block tt:if="{{payType == 0}}">
         <view class='item-content'>
           <view class='item-title label'>支付宝姓名：</view>
           <view class='item-input'>
@@ -40,7 +40,7 @@
           </view>
         </view>
       </block>
-      <block wx:else>
+      <block tt:else>
         <view class='item-content'>
           <view class='item-title label'>姓名：</view>
           <view class='item-input'>

pages/account/monetaryCenter/index.ttml

@@ -48,7 +48,7 @@
       </view>
       <view class="type-item">
         <view class="type-item-box {{defaultLevel==3?'act_privilege':''}}" data-index="3" bindtap="checkOptions">
-          <!-- <text class='icon icon-lock font16 position-icon 'wx:if="{{initialSwipe<1}}"></text> -->
+          <!-- <text class='icon icon-lock font16 position-icon 'tt:if="{{initialSwipe<1}}"></text> -->
           <text class='icon icon-vip-privilege' style="line-height: .8;"></text>
           <view class="type-item-name">抢购特权</view>
         </view>

pages/account/setting/index.js

@@ -6,11 +6,14 @@ Page({
     userInfo: app.globalData.userInfo
   },
   onShow() {
-    this.setData({ userInfo: app.globalData.userInfo });
+    this.setData({
+      userInfo: app.globalData.userInfo
+    });
     this.isRecomCode();
   },
   isRecomCode() {
-    let that = this,userInfo = app.globalData.userInfo;
+    let that = this,
+      userInfo = app.globalData.userInfo;
     util.ajax({
       func: "user/inviter/code",
       load: false
@@ -18,7 +21,9 @@ Page({
       if (res.code == 0) {
         userInfo.recomCode = !util.isEmpty(res.data.inviterCode) ? res.data.inviterCode : userInfo.recomCode;
         tt.setStorageSync("WXuserInfo", userInfo);
-        that.setData({ isRecomClick: res.data.show == 0 && util.isEmpty(res.data.inviterCode) ? 0 : 1 });
+        that.setData({
+          isRecomClick: res.data.show == 0 && util.isEmpty(res.data.inviterCode) ? 0 : 1
+        });
       }
     });
   },
@@ -35,11 +40,12 @@ Page({
               tt.removeStorageSync("WXuserInfo");
               tt.removeStorageSync("nps");
               app.globalData.userInfo = null;
-              tt.redirectTo({
+              console.log(676676)
+              tt.reLaunch({
                 url: '/pages/home/account'
               });
             } else
-            util.showTips(res.reason);
+              util.showTips(res.reason);
           });
         }
       }

pages/account/setting/index.ttml

@@ -8,7 +8,7 @@
     </view>
   </view>
 
-  <!-- <view class="septal-top-line" wx:if="{{userInfo && isRecomClick == 1}}">
+  <!-- <view class="septal-top-line" tt:if="{{userInfo && isRecomClick == 1}}">
     <view class="cell ceill-link cell-media" data-url="/pages/home/referre?type=account" bindtap='navigatorURl'>
       <view class="cell-value">邀请我的人</view>
     </view>

pages/growup/findPhoto/index.ttml

@@ -14,7 +14,7 @@
     <scroll-view class="scroll-view_H" scroll-x="true">
       <image tt:for="{{faceResult}}" tt:key="index" src="{{item.imageUrl||'../../../images/login.png'}}" mode class="headPhoto {{faceResultIndex==index?'checked':''}}" bindtap="headCheck" data-index="{{index}}" />
     </scroll-view>
-    <!-- <view class="noData" wx:else></view> -->
+    <!-- <view class="noData" tt:else></view> -->
   </view>
   <view slot='photoListContent'>
     <checkbox-group bindchange="checkboxChange" class="checkbox" tt:if="{{photoData&&photoData.length>0}}">
@@ -22,7 +22,7 @@
     </checkbox-group>
     <view class="noData" tt:if="{{(!faceResult||faceResult.length==0)&&(imgList&&imgList.length>0)}}">未搜索到照片，请重新上传一张单人正脸照～</view>
     <view class="noData" tt:elif="{{(!photoData||photoData.length==0)&&(imgList&&imgList.length>0)}}">未找到照片，请换张照片重试～</view>
-    <!-- <view slot='bottomBtn' class="btn-bottom" wx:if="{{imgList&&imgList.length>0}}">
+    <!-- <view slot='bottomBtn' class="btn-bottom" tt:if="{{imgList&&imgList.length>0}}">
       <view class="refreshBtn" bindtap="getLatestResults">获取最新结果</view>
     </view> -->
   </view>

pages/growup/take/take.ttml

@@ -116,10 +116,10 @@
     <view class="expression">{{info.expression}}</view>
   </view>
   <!-- <view class='mTop5 font14 content' bindlongtap='copy' data-type="s_expression">
-    <view wx:for-items="{{info.expressionList}}" wx:key="*this" class='mTop5'>
+    <view tt:for-items="{{info.expressionList}}" tt:key="*this" class='mTop5'>
       <text class='red'>{{item.deadline}}：</text>{{item.expression}}
     </view>
-    <view class='mTop5'><text class='red' wx:if="{{info.s_expression}}">总结：</text>{{info.s_expression}}</view>
+    <view class='mTop5'><text class='red' tt:if="{{info.s_expression}}">总结：</text>{{info.s_expression}}</view>
   </view> -->
 </view>
 <view class='noData' tt:else><text class="icon icon-info"></text><text>暂无记录\n有问题请联系宝大大！</text></view>

pages/home/account.ttml

@@ -29,10 +29,10 @@
     </view>
     <view class="accont-nologin" tt:else>
       <text class='icon icon-info'></text>
-      <button bindgetphonenumber='getPhoneNumber' open-type="getPhoneNumber" class="middle">点击登录 / 注册</button>
+      <button bindgetphonenumber='getPhoneNumber' open-type="getPhoneNumber" class="middle">授权手机号快捷登录</button>
     </view>
   </view>
-  <!-- <view class="red user-b row-flex" wx:if="{{userInfo}}">
+  <!-- <view class="red user-b row-flex" tt:if="{{userInfo}}">
     <view class="col-8 link">
       <view class="font14 fontWei">享折扣</view>
       <view class='label font12'>宝贝币当钱用</view>
@@ -65,7 +65,7 @@
       style="width: 100%;"></image>
   </navigator>
 </view>
-<!-- <view class='wallet-box white-bg' wx:if="{{isWallet == 1 && userInfo['roleType'] == 'normal'}}">
+<!-- <view class='wallet-box white-bg' tt:if="{{isWallet == 1 && userInfo['roleType'] == 'normal'}}">
     <view class='label' data-url="/pages/account/coin/index" bindtap='navigatorURl'>
       <view class="font18 {{stat.refreshCoin == 1 ? 'info':''}}">
         <text class="red ">{{userInfo ? userInfo.coin : "0.00"}}</text>
@@ -81,11 +81,11 @@
       <text class="font12">邀请用户</text>
     </view>
 </view> -->
-<!-- <view class='account-icon septal-top-line account-icon-five' wx:if="{{userInfo['roleType'] == 'sharer' || userInfo['roleType'] == 'organ'}}">
+<!-- <view class='account-icon septal-top-line account-icon-five' tt:if="{{userInfo['roleType'] == 'sharer' || userInfo['roleType'] == 'organ'}}">
   <view class="title-wrap" data-url="/pages/sharingHome/index?{{userInfo['roleType'] == 'sharer'?('shareStatus='+stat.shareStatus):('organStatus='+stat.organStatus)}}" bindtap='navigatorURl'>
     <view class="title title-link">
       {{userInfo['roleType'] == 'sharer' ? '分享家中心' : '机构中心'}}
-      <text class="gray share-status" wx:if="{{(userInfo['roleType'] == 'sharer' && stat.shareStatus==2)||(userInfo['roleType'] == 'organ' && stat.organStatus==2)}}">已停用</text>
+      <text class="gray share-status" tt:if="{{(userInfo['roleType'] == 'sharer' && stat.shareStatus==2)||(userInfo['roleType'] == 'organ' && stat.organStatus==2)}}">已停用</text>
     </view>
   </view>
   <view class="row-flex">
@@ -250,7 +250,7 @@
   </view>
 </view>
 <!-- <view class="septal-top-line setting-line">
-  <view class="cell ceill-link cell-media" wx:if="{{(userInfo.roleType == 'sharer' && stat.shareStatus!=2) || (userInfo.roleType == 'organ' && stat.organStatus!=2)}}" data-url="/pages/account/invite/index" bindtap='navigatorURl'>
+  <view class="cell ceill-link cell-media" tt:if="{{(userInfo.roleType == 'sharer' && stat.shareStatus!=2) || (userInfo.roleType == 'organ' && stat.organStatus!=2)}}" data-url="/pages/account/invite/index" bindtap='navigatorURl'>
     <view class="cell-value">
       <text class='icon icon-bill'></text>
       <text class="middlee">邀请海报</text>

pages/home/referre.ttml

@@ -20,7 +20,7 @@
     </view>
     <view class="center mTop20{{info.roleType == 'sharer' || info.roleType == 'organ' ? '' : ' buttons-row'}}" style="{{info.roleType == 'sharer' || info.roleType == 'organ' ? 'align-items:flex-end':''}}" tt:if="{{userInfo.recomCode.length <= 0}}">
       <button class="button button-radius button-big button-warn s-button" bindtap='submit'>确定领取</button>
-      <!-- <view bindtap='back' class="mTop240 font14" wx:if="{{type != 'account' && (info.roleType == 'sharer' || info.roleType == 'organ')}}">不领跳过 </view> -->
+      <!-- <view bindtap='back' class="mTop240 font14" tt:if="{{type != 'account' && (info.roleType == 'sharer' || info.roleType == 'organ')}}">不领跳过 </view> -->
     </view>
   </view>
 </view>
@@ -31,7 +31,7 @@
   </view>
   <view class='box'>
     <view class='box-overflow'>
-      <view class='voucher-list white-bg' wx:for="{{vouchers}}" wx:key="*this">
+      <view class='voucher-list white-bg' tt:for="{{vouchers}}" tt:key="*this">
         <view class='price'>
           <text class='font12'>￥</text>{{item.price}}
         </view>

pages/order/detail/index.js

@@ -34,6 +34,7 @@ Page({
     selectIsShow: false, //更多下拉框是否显示
     toHome: false, //去首页
     IMShow: false,
+    pendingStatus: 0,
     orderId: '',
     // 客服抖音号 todo:
     imId: 'Haimli',
@@ -555,21 +556,19 @@ Page({
     });
   },
   goPay() {
-    let that = this,
-      btype = 0;
-    util.WXPay({
-      orderid: this.data.info.orderid,
-      btype: that.data.query.presellStatus == 2 ? 0 : that.data.query.presellStatus
-    }, this.data.info.aid, this.data.info.title).then(function () {
-
-      that.data.query.otype = 2;
-      that.setData({
-        query: that.data.query
-      });
-      that.getData();
-    }, function (msg) {
-      utils.showTips(msg);
-    });
+    let that = this;
+    console.log('付款');
+    util.TTPay(this.data.info.outTradeNo)
+      .then(res => {
+        that.data.query.otype = 2;
+        that.setData({
+          query: that.data.query
+        });
+        that.getData();
+      })
+      .catch(err => {
+        util.showTips(err.errMsg);
+      })
   },
   trip(e) {
     let datas = this.data.info;
@@ -582,13 +581,20 @@ Page({
     });
   },
   scheduling(e) {
-    let oid = e.currentTarget.dataset.oid,
-      optionId = e.currentTarget.dataset.optionid;
-    tt.navigateTo({
-      url: '/pages/order/scheduling/scheduling?oid=' + oid + '&optionId=' + optionId
-    });
+    console.log(e)
+    this.setData({
+      IMShow: true,
+      pendingStatus: e.target.dataset.pendingstatus
+    })
   },
   refund(e) {
+    if (this.data.info.sessionName != '暂不选择') {
+      this.setData({
+        IMShow: true,
+        pendingStatus: 3
+      })
+      return
+    }
     console.log(e);
     let index = e.currentTarget.dataset.index;
     let datas = this.data.info,

pages/order/detail/index.ttml

@@ -8,10 +8,9 @@
 <view class="bottom">
   <!-- 底部左侧按钮组 -->
   <view class="bottom-left" id="bottom-left">
-    <view tt:if="{{info.orderStatus==2&&info.atype=='0'}}" class="icon-tab" bindtap="showMore">
+    <!-- <view tt:if="{{info.orderStatus==2&&info.atype=='0'}}" class="icon-tab" bindtap="showMore">
       <view class="more" id="more">
-        <!-- 上拉框 -->
-        <!-- class="{{((info.verifyStatus!==1&&!info.comment && info.comment == ''&&info.comment.modified !== 0)||(!info.comment && info.comment == ''&&info.comment.modified !== 0))?'select_box':'select_boxTwo select_boxThr'}}" -->
+        上拉框
         <view class="selectBorder" tt:if="{{selectIsShow}}">
           <view tt:if="{{info.orderStatus==2&&info.timeEnd==1}}" class="select_one" bindtap="invoicing">申请开票</view>
           <view tt:if="{{info.orderStatus==2&&info.timeEnd==1}}" class="div"></view>
@@ -34,43 +33,41 @@
           alt />
         <view class="name">更多</view>
       </view>
-    </view>
+    </view> -->
     <view class='icon-tab' bindtap="jumpPage">
       <text class="icon icon-home"></text>
       <view class="name">首页</view>
     </view>
     <!-- 客服 -->
-    <button tt:if="{{info.orderStatus==2&&info.atype=='0'?false:true}}" open-type="im" data-im-id="{{ imId }}"
-      data-im-type="{{imType}}" data-biz-line="{{lineType}}" data-goods-id="{{datas.aid}}" bindim="imCallback"
-      class="shareBtn ">
+    <button open-type="im" data-im-id="{{ imId }}" data-im-type="{{imType}}" data-biz-line="{{lineType}}"
+      data-goods-id="{{datas.aid}}" bindim="imCallback" class="shareBtn ">
       <text class="icon icon-cus-service"></text>
       <text class="name">客服</text> </button>
-    <view class="icon-tab"
+    <!-- <view class="icon-tab"
       tt:if="{{info.atype!='1' && info.orderStatus==2 && info.detailStopUpdate!=1 && ( info.waitComment!=2 ||(info.comment.additional == 1 && info.comment.modified == 1))}}"
       bindtap="editOrderDetail">
       <text class="icon icon-bj"></text>
       <view class="name">修改信息</view>
-    </view>
+    </view> -->
     <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 class="icon-tab"
+    <!-- <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">
       <text class="icon icon-bj"></text>
       <view class="name">修改评价</view>
-    </view>
+    </view> -->
   </view>
   <!--—— 底部右侧按钮 ——-->
   <view class="bottom-right">
     <!-- 填写退货单号 -->
-    <button tt:if="{{info.atype==1&&info.orderStatus==3&&info.subOrders[0].status==6}}"
-      class="button button-warn share-group" bindtap="showAddressPopup">填写退货单号</button>
+    <!-- <button tt:if="{{info.atype==1&&info.orderStatus==3&&info.subOrders[0].status==6}}"
+      class="button button-warn share-group" bindtap="showAddressPopup">填写退货单号</button> -->
     <!-- 完成支付 -->
-    <button class="button button-warn share-group" tt:elif="{{info.orderStatus == 1&& info.waitPayResult != 1}}"
-      bindtap="goPay">继续支付</button>
+    <button class="button button-warn share-group" tt:if="{{info.orderStatus == 1}}" bindtap="goPay">继续支付</button>
     <!-- 活动评价 -->
     <button class="button button-warn share-group"
       tt:elif="{{info.waitComment == 1&&info.orderStatus!=3&&info.orderStatus!=4&&(query.otype==0||query.otype==3)}}"
@@ -88,22 +85,23 @@
       tt:elif="{{info.comment.additional == 1 && info.comment.additionalComment.modified == 0&&(query.otype==0||query.otype==3)}}"
       bindtap="editEvaluate">修改追评</button> -->
     <!-- 支付尾款 -->
-    <button type="warn" tt:elif="{{info.atype == 0 && info.orderStatus ==4 && info.needPayBalance==1}}"
+    <!-- <button type="warn" tt:elif="{{info.atype == 0 && info.orderStatus ==4 && info.needPayBalance==1}}"
       class="button button-warn share-group" data-aid="{{info.aid}}" data-orderid="{{query.orderid}}"
       data-presellStatus="{{query.presellStatus}}" data-otype="{{query.otype}}" data-campSex="{{info.campSex}}"
-      data-military="{{info.military}}" bindtap="jumpBalancePayment">支付尾款</button>
+      data-military="{{info.military}}" bindtap="jumpBalancePayment">支付尾款</button> -->
     <!-- 分享拼团 -->
-    <button class="button button-warn share-group"
+    <!-- <button class="button button-warn share-group"
       tt:elif="{{info.orderStatus == 2 && info.groupinfo && info.groupinfo.groupbook == 1 && !info.groupinfo.groupid && query.otype != '3'}}"
-      open-type="share">分享拼团</button>
+      open-type="share">分享拼团</button> -->
     <!-- 邀请拼团 -->
-    <button class="button button-warn share-group"
+    <!-- <button class="button button-warn share-group"
       tt:elif="{{info.groupinfo && info.groupinfo.discount&&info.groupinfo.groupbook==1&&info.groupinfo.gstatus == 0 && query.otype != '3'}}"
-      data-invitefbtn="1" bindtap="inviteGroup">邀请拼团</button>
+      data-invitefbtn="1" bindtap="inviteGroup">邀请拼团</button> -->
     <!-- 邀请好友参加 -->
-    <!-- <button class="button button-warn share-group" wx:elif="{{info.atype==0&& info.timeContrast&& info.waitComment != 1 &&((info.groupinfo.groupbook != 1 || (info.groupinfo.groupbook == 1 && info.orderStatus==6)) && (info.orderStatus==2 || (info.orderStatus==4&& info.needPayBalance!=1) || info.orderStatus==6))}}" bindtap="inviteGroup" data-invitefbtn="0">邀请好友</button> -->
-    <button class="button button-warn share-group" tt:elif="{{info.orderStatus != 3&&info.timeContrast}}"
-      bindtap="inviteGroup" data-invitefbtn="0">邀请好友</button>
+    <!-- <button class="button button-warn share-group" tt:elif="{{info.atype==0&& info.timeContrast&& info.waitComment != 1 &&((info.groupinfo.groupbook != 1 || (info.groupinfo.groupbook == 1 && info.orderStatus==6)) && (info.orderStatus==2 || (info.orderStatus==4&& info.needPayBalance!=1) || info.orderStatus==6))}}" bindtap="inviteGroup" data-invitefbtn="0">邀请好友</button> -->
+    <!-- <button class="button button-warn share-group" tt:elif="{{info.orderStatus != 3&&info.timeContrast}}"
+      bindtap="inviteGroup" data-invitefbtn="0">邀请好友</button> -->
+    <button class="button button-warn share-group" tt:else bindtap="inviteGroup" data-invitefbtn="0"></button>
   </view>
 </view>
 <view class="content" style="padding-bottom: 90rpx;">
@@ -178,12 +176,12 @@
         <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>
+            class="button button-radius contract button-warn button-border">点击查看</button>
         </view>
       </view>
 
 
-      <!-- wx:if="{{info.travelPlanUrl!=null}}" -->
+      <!-- tt:if="{{info.travelPlanUrl!=null}}" -->
       <view class="cell" tt:if="{{info.travelPlanUrl!=null}}">
         <view class="cell-title">行程单</view>
         <view class="cell-value">
@@ -257,7 +255,7 @@
 
   <view class="content-box-pad white-bg mTop10" tt:if="{{info.atype == 0}}">
     <view class="order-title order-title-line order-title-button">消费码</view>
-    <!-- <button type="warn" wx:if="{{info.orderStatus ==4 && info.needPayBalance==1}}" size="mini" class="button button-radius" data-aid="{{info.aid}}" data-orderid="{{query.orderid}}" data-presellStatus="{{query.presellStatus}}" data-otype="{{query.otype}}" data-campSex="{{info.campSex}}" data-military="{{info.military}}" plain bindtap="jumpBalancePayment">支付尾款</button> -->
+    <!-- <button type="warn" tt:if="{{info.orderStatus ==4 && info.needPayBalance==1}}" size="mini" class="button button-radius" data-aid="{{info.aid}}" data-orderid="{{query.orderid}}" data-presellStatus="{{query.presellStatus}}" data-otype="{{query.otype}}" data-campSex="{{info.campSex}}" data-military="{{info.military}}" plain bindtap="jumpBalancePayment">支付尾款</button> -->
     <view class="sub-order" tt:for="{{info.subOrders}}" tt:key="index">
       <view class="sub-order-password {{item.status == 1 ? ' link':''}}" bindtap="qrcode" data-status="{{item.status}}"
         data-password="{{item.password}}">
@@ -273,20 +271,25 @@
       </view>
       <view class="sub-order-footer mTop10 right"
         tt:if="{{item.status == 15 || item.status == 1 || item.status == 6 || info.isManyDay == 1 || item.changeStatus!=2}}">
-        <!-- wx:if="{{(item.status == 1 || item.status == 15) && item.canRefund}}" -->
+        <!-- tt:if="{{(item.status == 1 || item.status == 15) && item.canRefund}}" -->
+        <!-- 已选择排期不可退款 -->
         <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 refund button-plain-gray button-radius" tt:if="{{item.changeStatus!=2}}"
+        <!-- <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>
+          bindtap="changeMeals">{{item.changeStatus==0?'更换场次':'申请中'}}</button> -->
         <button plain size="mini" type="warn" bindtap="lookContract" data-url="{{item.noticeUrl}}"
           class="button button-radius" tt:if="{{item.noticeUrl}}">营前须知</button>
-        <!-- <button size="mini" plain type="warn" class="button button-radius" wx:if="{{info.isManyDay == 1 && item.status == 1}}" bindtap="trip" data-refundpwd="{{item.password}}">补充营员信息</button> -->
-        <button size="mini" type="warn" bindtap="scheduling" data-oid="{{item.oid}}" data-optionId="{{item.optionId}}"
-          class="button button-radius button-warn" tt:if="{{item.optionId && item.showSchedule==1}}">选择排期</button>
+        <!-- <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>
+        <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>
       </view>
     </view>
   </view>
@@ -336,7 +339,7 @@
     </view>
   </view>
 
-  <!-- <view class="content-box-pad white-bg mTop10" wx:if="{{info.expList && info.expList.length > 0}}">
+  <!-- <view class="content-box-pad white-bg mTop10" tt:if="{{info.expList && info.expList.length > 0}}">
     <view class="order-title order-title-line">营员包裹信息</view>
   </view> -->
 
@@ -398,7 +401,9 @@
 <noticePopup show="{{IMShow}}">
   <view class="popupContent">
     <view class="contentText">
-      <view class="num font14" style="margin: 40rpx 0;">已预约消费码无法申请退款，请联系客服进行处理～</view>
+      <view class="num font14" style="margin: 40rpx 0;" tt:if="{{pendingStatus==1}}">请联系客服进行出行人的添加～</view>
+      <view class="num font14" style="margin: 40rpx 0;" tt:elif="{{pendingStatus==2}}">请联系客服进行排期选择～</view>
+      <view class="num font14" style="margin: 40rpx 0;" tt:else>已预约消费码无法申请退款，请联系客服进行处理～</view>
       <block>
         <view class="flex" style="display: flex;width: 100%;">
           <view class="button button-plain-gray  button-big btnSize" bindtap="cleanIMShow"> 取消

pages/order/detail/index.ttss

@@ -686,9 +686,9 @@
 }
 
 
-.button {
+/* .button {
   border-radius: 20rpx;
-}
+} */
 
 .btnSize {
   width: 30%;

pages/order/editOrderDetail/index.ttml

@@ -106,7 +106,7 @@
               <view class="red"><text class="codeDetail" bindtap="certificates"><text class="icon icon-alternate red"></text>证件要求</text></view>
             </view>
             <view class="aImage">
-              <!-- <view wx:if="{{Passporturl==''}}" class="add" bindtap="upPassport"></view> -->
+              <!-- <view tt:if="{{Passporturl==''}}" class="add" bindtap="upPassport"></view> -->
               <view class="addBox" data-index="{{index}}" bindtap="upPassport">
                 <view tt:if="{{item.passport==''||item.passport==null}}" class="addIcon passIcon">
                   <text></text>
@@ -131,7 +131,7 @@
             <view class="childId" tt:if="{{documentType==0}}">
               <view class="childID_left">
                 <view class="childOne">
-                  <!-- <view wx:if="{{positive==''}}" class="addId" bindtap="upId"></view> -->
+                  <!-- <view tt:if="{{positive==''}}" class="addId" bindtap="upId"></view> -->
                   <view class="icon" data-index="{{index}}" tt:if="{{item.idCardFront==null||item.idCardFront==''}}" bindtap="upId">
                     <view class="addIcon passIcon area">
                       <text></text>
@@ -144,7 +144,7 @@
                   <view class="idDesc">儿童身份证正面</view>
                 </view>
                 <view class="childOne2">
-                  <!-- <view class="addId" wx:if="{{otherSide==''}}" bindtap="upsideID">
+                  <!-- <view class="addId" tt:if="{{otherSide==''}}" bindtap="upsideID">
       </view> -->
                   <view class="icon" data-index="{{index}}" tt:if="{{item.idCardBack==null||item.idCardBack==''}}" bindtap="upsideID">
                     <view class="addIcon passIcon area">

pages/order/feedback/index.ttml

@@ -69,7 +69,7 @@
         </view>
       </view>
     </view>
-    <!-- <view class="comment-btn" bindtap="jumpPage" wx:if="{{info.waitComment == 1 ||(info.waitComment == 2&&info.comment.additional==0)}}">立即评价</view> -->
+    <!-- <view class="comment-btn" bindtap="jumpPage" tt:if="{{info.waitComment == 1 ||(info.waitComment == 2&&info.comment.additional==0)}}">立即评价</view> -->
     <button class="comment-btn" tt:if="{{info.waitComment == 0||info.waitComment==1&&info.orderStatus!=3&&info.orderStatus!=4}}" bindtap="actEvaluate">立即评价</button>
     <!-- <button class="comment-btn" bindtap="actEvaluate">立即评价~</button> -->
     <!-- 追加评价 -->

pages/order/index/order.js

@@ -37,6 +37,13 @@ Page({
       IMShow: false
     })
   },
+  showIm(e) {
+    console.log(e)
+    this.setData({
+      IMShow: true,
+      pendingStatus: e.target.dataset.pendingstatus
+    })
+  },
   onLoad(options) {
     console.log(options);
     this.data.queryData.otype = options.otype || 0;
@@ -173,45 +180,15 @@ Page({
   },
   // 立即支付（支付尾款） --待付款状态
   pay(e) {
-    // let that = this;
+    let that = this;
     console.log(e, '付款');
-    tt.continueToPay({
-      orderId: '', // 内部订单号
-      outOrderNo: e.target.dataset.orderid, // 外部订单号 2个订单号必填一个
-      success: (res) => {
-        const {
-          orderId,
-          outOrderNo
-        } = res;
-        console.log("success res", res);
-        console.log("orderId", orderId, "outOrderNo", outOrderNo);
-      },
-      fail: (res) => {
-        const {
-          orderId,
-          outOrderNo,
-          errNo,
-          errMsg,
-          errLogId
-        } = res;
-        if (errLogId) {
-          console.log("查询订单信息失败", errNo, errMsg, errLogId);
-        }
-        if (orderId || outOrderNo) {
-          console.log("支付失败", errNo, errMsg, orderId, outOrderNo);
-        }
-      },
-    });
-
-    // let presellstatus = e.currentTarget.dataset.presellstatus;
-    // util.WXPay({
-    //   orderid: e.target.dataset.orderid,
-    //   btype: presellstatus == 2 ? 0 : presellstatus
-    // }, that.data.aid, that.data.title).then(function () {
-    //   that.getList(false);
-    // }, function (res) {
-    //   if (res.code != 0) util.showTips(res.reason);
-    // });
+    util.TTPay(e.target.dataset.outtradeno)
+      .then(res => {
+        that.getList(false);
+      })
+      .catch(err => {
+        util.showTips(err.errMsg);
+      })
   },
   errorImg(e) {
     this.data.list[e.currentTarget.dataset.index].logo = "/images/noimg.png";

pages/order/index/order.ttml

@@ -41,9 +41,9 @@
           <text class="font12 black">
             {{item.atype == 0 ? '场次':'颜色'}}：{{item.sessionName}}
             {{item.atype == 0 ? (item.military == 1?'排':'套餐'):'尺寸'}}：<block tt:for="{{item.meals}}" tt:for-index="i"
-              tt:for-item="itemName" tt:key="i">{{item.sessionName=='暂不选择'?'暂不选择':itemName.policyName}} <text
-                tt:if="{{item.military == 1}}">（{{item.campSex==0?'仅女生可报':(item.campSex==1?'仅男生可报':'不限性别')}}）</text>
-              <text wx:if="{{item.sessionName!='暂不选择}}">({{itemName.num}})</text>
+              tt:for-item="itemName" tt:key="i">{{item.sessionName=='暂不选择'?'暂不选择':itemName.policyName}}
+              <text tt:if="{{item.military == 1}}">（{{item.campSex==0?'仅女生可报':(item.campSex==1?'仅男生可报':'不限性别')}}）</text>
+              <text tt:if="{{item.sessionName!='暂不选择'}}">({{itemName.num}})</text>
             </block>
             <text class="r-float red">￥<text class="font16">{{item.price}}</text></text>
           </text>
@@ -56,8 +56,9 @@
       <!-- <button size="mini" class="button button-plain-gray button-radius"
         tt:if="{{item.status==1 && item.presellStatus != 2 && item.waitPayResult!=1}}" bindtap="cancelOrder"
         data-orderid="{{item.orderid}}">取消订单</button> -->
+
       <button plain size="mini" type="warn" class="button button-radius"
-        tt:if="{{item.status==1 && item.waitPayResult!=1}}" bindtap="pay" data-orderid="{{item.orderid}}"
+        tt:if="{{item.status==1 && item.waitPayResult!=1}}" bindtap="pay" data-outTradeNo="{{item.outTradeNo}}"
         data-presellStatus="{{item.presellStatus}}" data-status="item.status">{{item.presellStatus == 0 ?
         '我要付款':(item.presellStatus == 2 ? '支付尾款':'支付预付金')}}</button>
       <block tt:elif="{{item.status == 13 }}">
@@ -78,24 +79,23 @@
           </navigator>
         </block>
       </block>
-      <block
-        tt:elif="{{(item.groupbook == 1 &&  item.status == 2 && (item.presellStatus == 0||item.presellStatus == 2)) || (item.groupbook == 1 && item.status == 13 && item.needPayBalance==0)}}">
+      <!-- 待参加 -->
+      <block tt:elif="{{item.status == 2&&item.idcardCount<item.num }}">
+        <button plain size="mini" type="warn" class="button button-radius invite-group"
+          tt:if="{{item.sessionName != '暂不选择'&&item.idcardCount<item.num}}" data-info="{{item}}"
+          data-title="{{item.atitle}}" data-aid="{{item.aid}}" data-sid="{{item.sid}}" data-orderid="{{item.orderid}}"
+          data-logo="{{item.logo}}" data-pendingStatus="1" bindtap="showIm">添加出行人</button>
         <button plain size="mini" type="warn" class="button button-radius invite-group"
-          tt:if="{{(item.groupbook == 1 &&  item.status == 2 && (item.presellStatus == 0||item.presellStatus == 2)) || (item.groupbook == 1 && item.status == 13 && item.needPayBalance==0)}}"
-          data-info="{{item}}" data-title="{{item.atitle}}" data-aid="{{item.aid}}" data-sid="{{item.sid}}"
-          data-orderid="{{item.orderid}}" data-logo="{{item.logo}}" data-inviteFbtn="1"
-          bindtap="inviteGroup">添加出行人</button>
+          tt:elif="{{item.sessionName == '暂不选择'&&item.idcardCount<item.num}}" data-info="{{item}}"
+          data-title="{{item.atitle}}" data-aid="{{item.aid}}" data-sid="{{item.sid}}" data-orderid="{{item.orderid}}"
+          data-logo="{{item.logo}}" data-status="{{item.status}}" data-pendingStatus="2" bindtap="showIm">选择排期</button>
       </block>
-      <button plain size="mini" type="warn" class="button button-radius invite-group"
-        tt:elif="{{item.atype==0&& item.timeContrast &&item.groupbook != 1 && (item.status == 2  && (item.presellStatus == 0||item.presellStatus == 2) || (item.status == 13 && item.needPayBalance==0))}}"
-        data-info="{{item}}" data-title="{{item.atitle}}" data-aid="{{item.aid}}" data-sid="{{item.sid}}"
-        data-orderid="{{item.orderid}}" data-logo="{{item.logo}}" data-status="{{item.status}}" data-inviteFbtn="0"
-        bindtap="inviteGroup">选择排期</button>
+
       <block tt:elif="{{item.status == 3}}">
         <text tt:if="{{item.atype == 0}}">评价后可随机获得50～100枚宝贝币</text>
         <button bindtap="comment" data-orderid="{{item.orderid}}" plain size="mini" type="warn"
           class="button button-radius comment" tt:if="{{item.status == 3}}">立即评价
-          <!-- <text class="badge--fixed" wx:if="{{item.atype == 0}}">+50~100</text> -->
+          <!-- <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"
@@ -115,13 +115,13 @@
 <view class='noData' hidden='{{list.length > 0}}'><text class="icon icon-info"></text><text>~没有相关订单~</text></view>
 <view class='load-more' hidden="{{loadMore}}">下面没有了哦</view>
 <!-- 底部悬浮关注服务号 -->
-<bottomSuspension></bottomSuspension>
+<!-- <bottomSuspension></bottomSuspension> -->
 
 <!-- 弹窗 -->
 <noticePopup show="{{IMShow}}">
   <view class="popupContent">
     <view class="contentText">
-      <view class="num" style="margin: 40rpx 0;">{{pendingStatus?'请联系客服进行排期选择～':'请联系客服进行出行人的添加～'}}</view>
+      <view class="num" style="margin: 40rpx 0;">{{pendingStatus!=1?'请联系客服进行排期选择～':'请联系客服进行出行人的添加～'}}</view>
       <block>
         <view class="flex" style="display: flex;width: 100%;">
           <view class="button button-plain-gray  button-big btnSize" bindtap="cleanIMShow"> 取消

pages/order/index/order.ttss

@@ -133,6 +133,17 @@
   font-size: 20rpx;
 }
 
+.button::after {
+  border: none;
+}
+
+.button {
+  background-color: #fff;
+  color: #ee3a43;
+  border: 1px solid #ee3a43;
+  border-radius: 40rpx !important;
+}
+
 navigator {
   display: flex;
   align-items: center;

pages/order/invoicingDetail/index.ttml

@@ -44,21 +44,21 @@
   <!-- 公司名称 -->
   <view class="invoicType">
     <view class="type">公司名称</view>
-    <!-- wx:if="{{invoiceDetail.status==1||invoiceDetail.status==2}}" -->
+    <!-- tt:if="{{invoiceDetail.status==1||invoiceDetail.status==2}}" -->
     <view class="typeInfo">{{invoiceOneDetail.company}}</view>
-    <!-- <input wx:if="{{invoiceDetail.status!==2}}" bindinput="bindinput" data-type="email" class="typeInput" type="text" value="{{invoiceOneDetail.company?invoiceOneDetail.company:''}}" placeholder="请填写电子邮箱" placeholder-style="font-size:22rpx;color: #959595;" /> -->
+    <!-- <input tt:if="{{invoiceDetail.status!==2}}" bindinput="bindinput" data-type="email" class="typeInput" type="text" value="{{invoiceOneDetail.company?invoiceOneDetail.company:''}}" placeholder="请填写电子邮箱" placeholder-style="font-size:22rpx;color: #959595;" /> -->
   </view>
   <!-- 税号 -->
   <view class="invoicType">
     <view class="type">税号</view>
     <view class="typeInfo">{{invoiceOneDetail.dutyNumber}}</view>
-    <!-- <input wx:if="{{invoiceDetail.status!==2}}" bindinput="bindinput" data-type="email" class="typeInput" type="text" value="{{invoiceOneDetail.dutyNumber?invoiceOneDetail.dutyNumber:''}}" placeholder="请填写税号" placeholder-style="font-size:22rpx;color: #959595;" /> -->
+    <!-- <input tt:if="{{invoiceDetail.status!==2}}" bindinput="bindinput" data-type="email" class="typeInput" type="text" value="{{invoiceOneDetail.dutyNumber?invoiceOneDetail.dutyNumber:''}}" placeholder="请填写税号" placeholder-style="font-size:22rpx;color: #959595;" /> -->
   </view>
   <!-- 接收邮箱 -->
   <view class="invoicEmail">
     <view class="type">接收邮箱</view>
     <view class="typeInfo">{{invoiceOneDetail.email}}</view>
-    <!-- <input wx:if="{{invoiceDetail.status==2}}" bindinput="bindinput" data-type="email" class="typeInput" type="text" value="{{invoiceOneDetail.email?invoiceOneDetail.email:''}}" placeholder="请填写邮箱" placeholder-style="font-size:22rpx;color: #959595;" /> -->
+    <!-- <input tt:if="{{invoiceDetail.status==2}}" bindinput="bindinput" data-type="email" class="typeInput" type="text" value="{{invoiceOneDetail.email?invoiceOneDetail.email:''}}" placeholder="请填写邮箱" placeholder-style="font-size:22rpx;color: #959595;" /> -->
   </view>
 </view>
 

pages/order/refund/refund.js

@@ -16,7 +16,7 @@ Page({
     groupId: '',
     reasonList: [],
     reasonIndex: 0,
-    default: "请选择 >",
+    defaultText: "请选择 >",
     // 控制sku
     showSku: false,
     refundShow: false,
@@ -250,7 +250,7 @@ Page({
           that.updateTime();
         }
       } else
-      util.showTips(res.reason);
+        util.showTips(res.reason);
     });
   },
   // 默认评价弹窗
@@ -345,14 +345,7 @@ Page({
 
 
   },
-  onShow() {
-
-    // if (this.data.atype != "1") {
-    //   this.OrderInfo();
-    //   this.getData1();
-    // }
-
-  },
+  onShow() {},
   // 切换退款原因
   changeReason(e) {
     console.log(e.detail.value);
@@ -369,7 +362,7 @@ Page({
     this.data.reasonIndex = e.detail.value;
     this.setData({
       reasonIndex: this.data.reasonIndex,
-      default: this.data.reasonList[this.data.reasonIndex]
+      defaultText: this.data.reasonList[this.data.reasonIndex]
     });
   },
   getData() {
@@ -385,19 +378,20 @@ Page({
     }, function (res) {
       if (res.code == 0) {
         let reasonData = [];
-        if (res.data.atype == '1') {//电商
+        if (res.data.atype == '1') { //电商
           reasonData = [{
-            type: 5,
-            txt: '不喜欢/不想要'
-          },
-          {
-            type: 6,
-            txt: '质量问题'
-          },
-          {
-            type: 0,
-            txt: '其他原因'
-          }];
+              type: 5,
+              txt: '不喜欢/不想要'
+            },
+            {
+              type: 6,
+              txt: '质量问题'
+            },
+            {
+              type: 0,
+              txt: '其他原因'
+            }
+          ];
 
         } else {
           if (that.data.status == 15) {
@@ -407,21 +401,22 @@ Page({
             }], current = 4;
           } else {
             reasonData = [{
-              type: 1,
-              txt: '行程有变'
-            },
-            {
-              type: 2,
-              txt: '买多了/买错了'
-            },
-            {
-              type: 3,
-              txt: '孩子突发身体原因'
-            },
-            {
-              type: 0,
-              txt: '其他原因'
-            }];
+                type: 1,
+                txt: '行程有变'
+              },
+              {
+                type: 2,
+                txt: '买多了/买错了'
+              },
+              {
+                type: 3,
+                txt: '孩子突发身体原因'
+              },
+              {
+                type: 0,
+                txt: '其他原因'
+              }
+            ];
 
 
           }
@@ -430,16 +425,14 @@ Page({
           console.log(item);
           that.data.reasonList.push(item.txt);
         });
-        if (reasonData.length == 1) {
-          that.data.default = "候补退款";
-        }
+
         that.setData({
-          default: that.data.default,
           datas: res.data,
           reasonData,
           current: reasonData[0].type,
           reasonList: that.data.reasonList
         });
+        console.log(that.data.defaultText, 7)
       }
     });
   },
@@ -468,150 +461,58 @@ Page({
   },
   refundRequest() {
     let that = this,
-      reason = this.data.reason,
       current = this.data.current;
-    console.log(current);
-    let type = 0;
-    if (this.data.default == "行程有变") {
-      type = 1;
-    } else if (this.data.default == "买多了/买错了") {
-      type = 2;
-    } else if (this.data.default == "孩子突发身体原因") {
-      type = 3;
-    } else if (this.data.default == "其他原因") {
-      type = 0;
-
-    } else if (this.data.default == "候补退款") {
-      type = 4;
-    } else if (this.data.default == "质量问题") {
-      type = 6;
-    } else if (this.data.default == "不喜欢/不想要") {
-      type = 5;
-    }
-    if (this.data.default == "请选择 >" || type == -1) {
+    console.log(current, 78787);
+    if (this.data.defaultText == "请选择 >") {
       util.showTips("请选择退款原因");
       return false;
     }
-    if (this.data.showtext == true && util.isEmpty(reason)) {
+    if (this.data.showtext == true && util.isEmpty(this.data.reason)) {
       util.showTips("请填写退款原因");
       return false;
     }
-    if (current == 0 && reason == '') {
-      util.showTips('请输入退款原因。');
-      return false;
-    }
-    if (this.data.dayBeforeStart <= 0) {
-      util.showTips("活动已开始，无法提交退款申请");
-      tt.navigateBack({
-        delta: 1
-      });
-      return;
-    }
-    if (this.data.current == 1 && this.data.orderInfo.overdue == 1) {
-      if (util.isEmpty(this.data.AlipayNum)) {
-        util.showTips("支付宝户号不能为空");
-        return;
-      }
-      if (util.isEmpty(this.data.accountNum)) {
-        util.showTips("支付宝账号不能为空");
-        return;
-      }
-    } else if (this.data.current == 2 && this.data.orderInfo.overdue == 1) {
-      if (util.isEmpty(this.data.carName)) {
-        util.showTips("卡户名不能为空");
-        return;
-      }
-      if (util.isEmpty(this.data.bankName)) {
-        util.showTips("银行名称不能为空");
-        return;
-      }
-      if (util.isEmpty(this.data.BankcardNo)) {
-        util.showTips("银行卡号不能为空");
-        return;
-      }
-      if (util.isEmpty(this.data.Bankofdeposit)) {
-        util.showTips("开户行不能为空");
-        return;
-      }
-    }
-    let desc = "";
-    if (this.data.current == 1) {
-      desc = "支付宝";
-    } else if (this.data.current == 2) {
-      desc = "银行卡";
-    }
-    console.log(that.data.orderInfo);
     util.ajax({
-      func: "order/commit_refund",
+      func: "tiktok/order/preRefund/detail",
       data: {
-        "reasonType": type,
-        "reason": reason,
-        "orderid": that.data.orderid,
-        "password": that.data.refundpwd || "",
-        "type": '0',
-        "priceInfo": that.data.orderInfo,
-
-        "receiveAccount": that.data.orderInfo.overdue == 0 ? '' : that.data.current == 1 ? "支付宝" + "    " + that.data.AlipayNum + "    " + that.data.accountNum : "银行卡" + "    " + that.data.carName + "    " + that.data.bankName + "    " + that.data.BankcardNo + "    " + that.data.Bankofdeposit
-      },
-      method: "POST",
-      load: true,
-      title: '提交中'
+        "oid": that.data.oid
+      }
     }, function (res) {
       console.log(res);
       if (res.code == 0) {
-        tt.setStorageSync('_REFUND_', 'REFUND');
-        that.setData({
-          refundBack: res.reason,
-          mask: true
-        });
-      } else if (res.code == -10) {
-        tt.showModal({
-          title: "提示",
-          content: res.reason,
-          success(res) {
-            if (res.confirm) {
-              tt.navigateBack({
-                delta: 1
-              });
-            } else if (res.cancel) {
-              console.log('用户点击取消');
-            }
-          }
-        });
-      } else if (res.code == -11) {
-        tt.showModal({
-          title: "提示",
-          content: res.reason,
-          showCancel: false,
-          success: function (res) {
-            if (res.confirm) {
-              that.onLoad({
-                index: that.data.index,
-                oid: that.data.oid,
-                refundpwd: that.data.refundpwd,
-                orderid: that.data.orderid,
-                status: that.data.refundStatus,
-                groupId: that.data.groupid || ''
-              });
-              // that.onReady()
-            }
-          }
+        tt.applyRefund({
+          refundInfo: {
+            reason: [this.data.defaultText], // 退款理由 必填
+            note: this.data.reason, // 备注 非必填
+          },
+          outOrderNo: this.data.datas.outTradeNo, // 外部订单号 必填
+          itemOrderList: [res.data],
+          success: res => {
+            that.setData({
+              mask: true
+            });
+            const {
+              orderId,
+              outOrderNo,
+              refundId
+            } = res;
+            console.log('申请退款成功');
+            console.log('orderId', orderId, 'outRefundNo', outRefundNo, 'refundId', refundId);
+          },
+          fail: res => {
+            const {
+              errNo,
+              errMsg,
+              errLogId
+            } = res;
+            util.showTips(errMsg);
+            console.log('申请失败', errNo, errMsg, errLogId);
+          },
         });
       } else {
-        tt.showModal({
-          title: "提示",
-          content: res.reason,
-          showCancel: false,
-          success: function (res) {
-            if (res.confirm) {
-              tt.navigateBack({
-                delta: 1
-              });
-            }
-          }
-        });
+        util.showTips(res.reason);
       }
     });
+
   },
   onReady() {
 

pages/order/refund/refund.ttml

@@ -16,7 +16,7 @@
     <view class="reason">
       <view>退款原因：</view>
       <picker bindchange="changeReason" value="{{reasonIndex}}" range="{{reasonList}}">
-        <view class="grey">{{default}}</view>
+        <view class="grey">{{defaultText}}</view>
       </picker>
     </view>
     <textarea tt:if="{{showtext == true }}" class="textarea" bindinput="confirm" placeholder="请填写原因"></textarea>

pages/order/scratch/scratch.ttml

@@ -23,7 +23,7 @@
 		</view>
 	</view>
 	<!-- <view class="scarTit">每次活动评价后获得一次刮奖机会</view>
-	<view class="scratch" wx:if="{{isGet}}">
+	<view class="scratch" tt:if="{{isGet}}">
 		<image class="column img-one" src="/images/1.png"></image>
 		<image class="column img-two" src="/images/2.png"></image>
 		<view class="column prize">
@@ -35,7 +35,7 @@
 	        bindtouchstart="touchStart"
 	        bindtouchmove="touchMove"
 	        bindtouchend="touchEnd"
-	        wx:if="{{flag}}">
+	        tt:if="{{flag}}">
 	    </canvas>
 	</view> -->
 </view>

pages/product/Previous/index.ttml

@@ -15,7 +15,7 @@
 
 <view class="image_box">
   <view tt:if="{{isshare==1&&scrollTop < 120}}" bindtap='backHome' class='icon-home backHome'></view>
-  <!-- wx:if="{{scrollTop <320}}" -->
+  <!-- tt:if="{{scrollTop <320}}" -->
   <view tt:if="{{isshare==0&&scrollTop < 120}}" class='leftBack' bindtap="backJT"></view>
   <image class="{{scrollTop > 100 ? 'unxiangqi':'xiangqi'}} TopImage" src="{{topImgText.historyBgImage}}" mode="widthFix"></image>
   <view class="title">
@@ -41,7 +41,7 @@
       <!-- 图片 -->
       <image mode="aspectFill" bindtap="previewImage" data-index="{{index}}" tt:if="{{item.type==4}}" data-imgurl="{{item.logo}}" class="image" src="{{item.logo}}?x-oss-process=image/resize,m_fill,w_400,h_400"></image>
       <view tt:if="{{item.type==3||item.type==2}}" class="{{[index%15==0?'icon icon-video-play iconAdd2':'icon icon-video-play iconAdd']}}"></view>
-      <!-- <image wx:if="{{item.type==4}}" class="{{[index%15==0?'lfImg':'img']}}" src="https://img.bbztx.com/image_test/upload/thumbs/20230227/logo/1677472021719085091.png" mode="" /> -->
+      <!-- <image tt:if="{{item.type==4}}" class="{{[index%15==0?'lfImg':'img']}}" src="https://img.bbztx.com/image_test/upload/thumbs/20230227/logo/1677472021719085091.png" mode="" /> -->
     </view>
     <view class="box"></view>
   </view>

pages/product/activity/index.ttml

@@ -91,7 +91,7 @@
           <image src="{{datas.logo}}" class="slide-image" width="355" height="150" />
         </swiper-item>
       </block>
-      <!-- <view class="act-tip" wx:if="{{userInfo.roleType=='sharer'&& userInfo.shareStatus==1&&datas.shareCommission>0}}">邀约好友报名 最高可赚{{datas.shareCommission}}元</view> -->
+      <!-- <view class="act-tip" tt:if="{{userInfo.roleType=='sharer'&& userInfo.shareStatus==1&&datas.shareCommission>0}}">邀约好友报名 最高可赚{{datas.shareCommission}}元</view> -->
     </swiper>
     <view class="product-info-line" style="{{datas.qptype == 1 ? 'padding:0':''}}">
       <!-- 拼团 -->
@@ -309,7 +309,7 @@
         <image mode="aspectFill" bindtap="actPreviewImage" data-index="{{index}}" data-imgurl="{{item.logo}}"
           class="bottom_li" src="{{item.logo}}" tt:if="{{item.type==4}}"></image>
         <view tt:if="{{item.type==3||item.type==2}}" class="icon icon-video-play iconAdd"></view>
-        <!-- <image wx:if="{{item.type==4}}" class="img" src="https://img.bbztx.com/image_test/upload/202302/imgicon.png" mode="" /> -->
+        <!-- <image tt:if="{{item.type==4}}" class="img" src="https://img.bbztx.com/image_test/upload/202302/imgicon.png" mode="" /> -->
       </view>
     </view>
   </view>

pages/product/component/goodsSku.ttml

@@ -4,8 +4,8 @@
   <!-- <view class="sku-header">
     <view class="sku-header__goods-info">
       <view class="sku__goods-name ellipsis">{{info.title}}</view>
-      <view class="sku__goods-price" wx:if="{{presellOpen==0}}">￥{{sku.price}}</view>
-      <view wx:if="{{presellOpen != 0}}">
+      <view class="sku__goods-price" tt:if="{{presellOpen==0}}">￥{{sku.price}}</view>
+      <view tt:if="{{presellOpen != 0}}">
         <view>预付金：<text class="sku__goods-price">￥{{sku.presellPrice}}</text></view>
         <view>活动价：<text class="sku__goods-price">￥{{sku.price}}</text></view>
       </view>
@@ -39,7 +39,7 @@
           <view class="stepper__plus {{initialSku.selectedNum>=sku.stock_num?'stepper__plus__diabled':(initialSku.selectedNum >= sku.maxT?'stepper__plus__diabled':'')}}" data-type="plus" bindtap="quantity"></view>
         </view>
       </view>
-      <!-- <view class="van-sku__quota" wx:if="{{sku.maxT <= sku.quota}}">每人限购{{sku.maxT}}件</view> -->
+      <!-- <view class="van-sku__quota" tt:if="{{sku.maxT <= sku.quota}}">每人限购{{sku.maxT}}件</view> -->
       <view class="van-sku__quota">
         <view class="sku-price">￥{{sku.price}}</view>
       </view>

pages/product/goods/detail.ttml

@@ -11,10 +11,10 @@
   <button class="button button-white" bindtap="chat">
     <text class="middle icon-chat font20 red"></text><text class="middle"> 咨询</text>
   </button>
-  <view class="button button-warn" bindtap="goPay" wx:if="{{datas.status == 0 && datas.canbuy == 0}}">立即购买</view>
-  <view class="button disabled" wx:if="{{datas.status == 0 && datas.canbuy != 0}}">立即购买</view>
-  <view class="button disabled" wx:if="{{datas.status == 2}}">已满额</view>
-  <view class="button disabled" wx:if="{{datas.status == 3}}">已下架</view>
+  <view class="button button-warn" bindtap="goPay" tt:if="{{datas.status == 0 && datas.canbuy == 0}}">立即购买</view>
+  <view class="button disabled" tt:if="{{datas.status == 0 && datas.canbuy != 0}}">立即购买</view>
+  <view class="button disabled" tt:if="{{datas.status == 2}}">已满额</view>
+  <view class="button disabled" tt:if="{{datas.status == 3}}">已下架</view>
 </view> -->
 <!-- 底部按钮 -->
 <view class="barOnBottom ">

pages/product/goods/index.ttml

@@ -21,7 +21,7 @@
 		<goodList list="{{dataList}}" updateLoading="{{updateLoading}}" goodsTypeId="{{typeTid}}" isAllLoaded="{{isHideLoadMore}}"></goodList>
 	</scroll-view>
 </view>
-<!-- <view class='load-more' wx:if="{{isHideLoadMore}}">下面没有了哦</view> -->
+<!-- <view class='load-more' tt:if="{{isHideLoadMore}}">下面没有了哦</view> -->
 <navigator class="common_fix common_home" tt:if="{{currentPages == 1}}" open-type="reLaunch" url="/pages/home/index" hover-class="none">
 	<text class="icon icon-home"></text>
 </navigator>

pages/sharingHome/shareCash.ttml

@@ -4,9 +4,9 @@
   <view class="content-box content-pad">
     <view class="font12 cash-text rule-text-line">
       <view class="font16">- 提现说明 -</view>
-      <view class="font14 m-top5" wx:if="{{info.userRoleType=='sharer'}}">满<text class="red">{{info.maxCashCoin}}元</text>可提现，满<text class="red">{{info.maxUseCoin}}元</text>购买活动可抵扣</view>
-      <view wx:else>可抵扣活动，满<text class="red">{{info.organCashCoin}}</text>元可提现。</view>
-      <view class="font14 m-top5" wx:if="{{info.userRoleType == 'sharer'}}">每月累计提现超<text class="red">800元</text>，需扣除20%个人所得税</view>
+      <view class="font14 m-top5" tt:if="{{info.userRoleType=='sharer'}}">满<text class="red">{{info.maxCashCoin}}元</text>可提现，满<text class="red">{{info.maxUseCoin}}元</text>购买活动可抵扣</view>
+      <view tt:else>可抵扣活动，满<text class="red">{{info.organCashCoin}}</text>元可提现。</view>
+      <view class="font14 m-top5" tt:if="{{info.userRoleType == 'sharer'}}">每月累计提现超<text class="red">800元</text>，需扣除20%个人所得税</view>
     </view>
     <view class='list-block'>
       <view class='item-content'>
@@ -23,7 +23,7 @@
           <label class="radio"><radio value="2" color="#EE3A43" checked="{{payType == 2 ? true:false}}"/>银行卡</label>
         </radio-group>
       </view>
-      <block wx:if="{{payType == 0}}">
+      <block tt:if="{{payType == 0}}">
         <view class='item-content'>
           <view class='item-title label'>支付宝姓名：</view>
           <view class='item-input'>
@@ -43,7 +43,7 @@
           </view>
         </view>
       </block>
-      <block wx:else>
+      <block tt:else>
         <view class='item-content'>
           <view class='item-title label'>姓名：</view>
           <view class='item-input'>

pages/turntable/hairpin/index.ttml

@@ -5,8 +5,8 @@
     请上传真实发圈截图，请勿虚假上传，一经查实，取消抽奖资格。若有疑问请联系客服。
   </view>
   <view class="body">
-    <view class="add_btn" wx:if="{{!picture}}" bindtap="selectPic">+</view>
-    <view class="pictureView" wx:else>
+    <view class="add_btn" tt:if="{{!picture}}" bindtap="selectPic">+</view>
+    <view class="pictureView" tt:else>
       <view class="deleteIcon" bindtap="deletPic">X</view>
       <image src="{{picture}}" mode="widthFix"></image>
     </view>

static/font.ttss

@@ -200,7 +200,7 @@
   content: "\e96b";
   color: #ee3a43;
 }
-.icon-wx::before {
+.icon-tt::before {
   content: "\e96c";
   color: #01913a;
 }

utils/util.js

@@ -178,7 +178,9 @@ module.exports = {
     return new Promise(function (resolve, reject) {
       that.ajax({
         func: 'v2/user/stat',
-        data:{tiktokOrder:1},
+        data: {
+          tiktokOrder: 1
+        },
         load: false
       }, (res) => {
         if (res.code == 0) {
@@ -199,14 +201,15 @@ module.exports = {
       tt.navigateTo({
         url: url
       });
-    } else {
-      // 静默登录
-      this.silentLogin().then((res) => {
-        tt.navigateTo({
-          url: url
-        });
-      });
     }
+    // else {
+    //   // 静默登录
+    //   this.silentLogin().then((res) => {
+    //     tt.navigateTo({
+    //       url: url
+    //     });
+    //   });
+    // }
   },
   isTimeLeng(val) {
     var s = val.toString();
@@ -271,38 +274,38 @@ module.exports = {
       do {
         c1 = base64DecodeChars[str.charCodeAt(i++) & 0xff];
       } while (
-      i < len && c1 == -1);
+        i < len && c1 == -1);
       if (c1 == -1)
-      break;
+        break;
       /* c2 */
       do {
         c2 = base64DecodeChars[str.charCodeAt(i++) & 0xff];
       } while (
-      i < len && c2 == -1);
+        i < len && c2 == -1);
       if (c2 == -1)
-      break;
+        break;
       out += String.fromCharCode(c1 << 2 | (c2 & 0x30) >> 4);
       /* c3 */
       do {
         c3 = str.charCodeAt(i++) & 0xff;
         if (c3 == 61)
-        return out;
+          return out;
         c3 = base64DecodeChars[c3];
       } while (
-      i < len && c3 == -1);
+        i < len && c3 == -1);
       if (c3 == -1)
-      break;
+        break;
       out += String.fromCharCode((c2 & 0XF) << 4 | (c3 & 0x3C) >> 2);
       /* c4 */
       do {
         c4 = str.charCodeAt(i++) & 0xff;
         if (c4 == 61)
-        return out;
+          return out;
         c4 = base64DecodeChars[c4];
       } while (
-      i < len && c4 == -1);
+        i < len && c4 == -1);
       if (c4 == -1)
-      break;
+        break;
       out += String.fromCharCode((c3 & 0x03) << 6 | c4);
     }
     return this.utf8to16(out);
@@ -367,8 +370,8 @@ module.exports = {
     isFormat = isFormat != undefined ? isFormat : true;
     // date = new Date(date.replace(/-/g, "/"));
     date = typeof date == "string" ?
-    new Date(date.replace(/-/g, "/")) :
-    new Date(date);
+      new Date(date.replace(/-/g, "/")) :
+      new Date(date);
     var format = format || "yyyy-MM-dd hh:mm:ss",
       o = {
         "M+": date.getMonth() + 1,
@@ -490,7 +493,7 @@ module.exports = {
     format = format || "yyyy-MM-dd";
     return this.formatDate(this.formatUnixtimestamp(new Date().getTime()), format, false);
   },
-  datedifference: function (sDate1, sDate2, compareSec) {//compareSec  ——是否比较至秒级 true-是  -false 否
+  datedifference: function (sDate1, sDate2, compareSec) { //compareSec  ——是否比较至秒级 true-是  -false 否
     var dateSpan, tempDate, iDays;
     sDate1 = Date.parse(sDate1);
     sDate2 = Date.parse(sDate2);
@@ -506,7 +509,7 @@ module.exports = {
   isObjEmpty: function (obj) {
     for (var prop in obj) {
       if (obj.hasOwnProperty(prop))
-      return false;
+        return false;
     }
     return true;
   },
@@ -618,7 +621,7 @@ module.exports = {
     return "成人";
   },
   getAge: function (strBirthday) {
-    var returnAge,strBirthdayArr = strBirthday.split("-"),
+    var returnAge, strBirthdayArr = strBirthday.split("-"),
       birthYear = strBirthdayArr[0],
       birthMonth = strBirthdayArr[1],
       birthDay = strBirthdayArr[2],
@@ -730,7 +733,7 @@ module.exports = {
             });
           }, 1000);
         } else
-        that.showTips(res.reason);
+          that.showTips(res.reason);
       });
     });
   },
@@ -774,122 +777,36 @@ module.exports = {
     }
   },
   // 微信支付
-  WXPay(data, aid, title, alone, method) {
-    let that = this,
-      app = getApp(),
-      userInfo = app.globalData.userInfo;
-    data.applet = '1';
-    data.tradeType = 'JSAPI';
-    data.openid = userInfo.socialUid;
-    console.log(data);
+  TTPay(outOrderNo) {
     return new Promise(function (resolve, reject) {
-      that.ajax({
-        func: "weixin/npre", //获取微信支付所需信息
-        data: data,
-        load: true,
-        title: '请求中'
-        // method:'POST'
-      }, function (res) {
-        if (res.code == 0) {
-          let datas = res.data;
-          tt.requestPayment({
-            'timeStamp': datas.timestamp,
-            'nonceStr': datas.nonce_str,
-            'package': datas.package,
-            'signType': datas.signType,
-            'paySign': datas.sign,
-            'success': function (result) {
-              that.payResultWait(datas.orderid);
-              tt.reportAnalytics('order_pay', {
-                aid: aid,
-                title: title
-              });
-              resolve({
-                orderid: datas.orderid,
-                tradeChannelWeixin: res.tradeChannelWeixin,
-                btype: data.btype
-              });
-              //CMBC --民生支付
-            },
-            'fail': function (result) {
-              tt.showModal({
-                title: '提示',
-                content: '订单有5分钟的支付时间，超时后将自动取消订单，确定暂不支付？',
-                confirmText: '继续支付',
-                cancelText: '暂不支付',
-                confirmColor: '#ee3a43',
-                success: function (res) {
-                  if (res.confirm) {
-                    data.orderid = datas.orderid;
-                    if (data.btype == 2) {
-                      data.btype = 0;
-                    }
-                    that.WXPay(data, aid, title, alone).then((orderid) => {
-                      var pages = getCurrentPages();
-                      var currentPage = pages[pages.length - 2];
-                      if (currentPage.route == "pages/product/activity/index" || currentPage.route == "pages/order/index/order" || currentPage.route == "pages/order/detail/index") {
-                        let info = [];
-                        info.push('orderid=' + orderid);
-                        info.push('alone=' + alone);
-                        info.push('btype=' + data.btype);
-                        if (data.btype == 1) {
-                          info.push('presellOpen=' + method);
-                        } else if (data.btype == 2) {
-                          info.push('presellStatus=' + method);
-                        } else {
-                          info.push('presellOpen=' + method);
-                        }
-                        // wx.navigateTo({
-                        //   url: '/pages/order/success/index?orderid=' + orderid + '&alone=' + alone + '&presellOpen='+method+'&btype='+data.btype
-                        // });
-                        tt.navigateTo({
-                          url: '/pages/order/success/index?' + info.join('&')
-                        });
-                      }
-                    });
-                  } else if (res.cancel) {
-                    // if(!that.isEmpty(data.orderid)){
-                    //   that.ajax({
-                    //     func: 'order/pay/cancel',
-                    //     data: { "oldOrderid": data.orderid, "orderid": datas.orderid },
-                    //     load: false
-                    //   }, function (res) {
-                    //     reject(res);
-                    //   });
-                    // }else {
-                    //   reject(res);
-                    // }
-                    var pages = getCurrentPages();
-                    var currentPage = pages[pages.length - 1];
-                    if (currentPage.route == "pages/product/buy/index") {
-                      let info = 'orderid=' + datas.orderid + '&otype=1';
-                      if (data.btype == 1) {
-                        info = method == 0 ? info + '&presellStatus=0' : info + '&presellStatus=1';
-                      } else if (data.btype == 2) {
-                        info = info + '&presellStatus=' + method;
-                      } else if (data.btype == 0) {
-                        info = info + '&presellStatus=0';
-                      } else if (data.btype == 3) {
-                        info = info + '&presellStatus=0';
-                      }
-                      tt.navigateTo({
-                        url: '/pages/order/detail/index?' + info
-                      });
-                    }
-                    if (currentPage.route == 'pages/product/balancePayment/balancePayment') {
-                      let info = 'orderid=' + datas.orderid + '&otype=1' + '&presellStatus=2';
-                      tt.navigateTo({
-                        url: '/pages/order/detail/index?' + info
-                      });
-                    }
-                  }
-                }
-              });
-            }
-          });
-        } else {
+      tt.continueToPay({
+        orderId: '', // 内部订单号
+        outOrderNo: outOrderNo, // 外部订单号 2个订单号必填一个
+        success: (res) => {
+          const {
+            orderId,
+            outOrderNo
+          } = res;
+          console.log("success res", res);
+          console.log("orderId", orderId, "outOrderNo", outOrderNo);
+          resolve();
+        },
+        fail: (res) => {
+          const {
+            orderId,
+            outOrderNo,
+            errNo,
+            errMsg,
+            errLogId
+          } = res;
           reject(res);
-        }
+          if (errLogId) {
+            console.log("查询订单信息失败", errNo, errMsg, errLogId);
+          }
+          if (orderId || outOrderNo) {
+            console.log("支付失败", errNo, errMsg, orderId, outOrderNo);
+          }
+        },
       });
     });
   },
@@ -900,7 +817,7 @@ module.exports = {
     options.load = typeof options.load == "undefined" ? false : options.load;
     options.title = typeof options.title == "undefined" ? false : options.title;
     options.method = typeof options.method == "undefined" ? "GET" : options.method;
-    if (options.load && options.title) {//评价相关接口调用弹窗避免重复调用
+    if (options.load && options.title) { //评价相关接口调用弹窗避免重复调用
       tt.showLoading({
         title: options.title,
         mask: true
@@ -1039,54 +956,6 @@ module.exports = {
 
     });
 
-    // wx.getLocation({
-    //   type: 'wgs84',
-    //   success: function (res) {
-    //     var myAmapFun = new self.amapFile.AMapWX({
-    //       key: "4048819e3a45aa1cbac417a4e45f44aa"
-    //     }); //  oldKey —— bae2697f5d1a1e5db9dd855e7cd083bf
-    //     myAmapFun.getRegeo({
-    //       location: res.longitude + ',' + res.latitude,
-    //       success: function (data) {
-    //         data[0]['regeocodeData']['addressComponent']['latitude'] = res.latitude;
-    //         data[0]['regeocodeData']['addressComponent']['longitude'] = res.longitude;
-    //         if (typeof (data[0]['regeocodeData']['addressComponent']['city']) == "object") {
-    //           data[0]['regeocodeData']['addressComponent']['city'] = data[0]['regeocodeData']['addressComponent']['city'].join("");
-    //         }
-    //         data[0]['regeocodeData']['addressComponent']['city'] = self.isEmpty(data[0]['regeocodeData']['addressComponent']['city']) ? data[0]['regeocodeData']['addressComponent']['province'] : data[0]['regeocodeData']['addressComponent']['city'];
-    //         data[0]['regeocodeData']['addressComponent']['city'] = data[0]['regeocodeData']['addressComponent']['city'].replace("市", "");
-    //         self.businessCity().then(function (citys) {
-    //           console.log(88888,citys,data)
-
-    //           let getCity = wx.getStorageSync("city") || {};
-    //           if (citys.includes(data[0]['regeocodeData']['addressComponent']['city']) || !self.isObjEmpty(getCity)) {
-    //             if (!self.isObjEmpty(getCity) && type == undefined) data[0]['regeocodeData']['addressComponent'] = getCity;
-    //             typeof (callback) == "function" ? callback({
-    //               code: 0,
-    //               data: data[0]['regeocodeData']['addressComponent'],
-    //               msg: "省市获取成功。"
-    //             }) : "";
-    //           } else {
-    //             typeof (callback) == "function" ? callback({
-    //               code: 2,
-    //               data: data[0]['regeocodeData']['addressComponent'],
-    //               msg: "省市获取失败。"
-    //             }) : "";
-    //           }
-    //         });
-    //       },
-    //     });
-    //   },
-    //   fail: function (info) {
-    //     typeof (callback) == "function" ? callback({
-    //       code: 1,
-    //       data: {
-    //         city: "未知城市"
-    //       },
-    //       msg: "省市获取失败。"
-    //     }) : "";
-    //   }
-    // });
   },
   // 支付成功后调用（不做回调处理）
   payResultWait(orderid) {
@@ -1204,7 +1073,7 @@ module.exports = {
     return new Promise(function (resolve, reject) {
       that.loadCity(function (res) {
         let city = app.globalData.city;
-        if (res.code == 0) {//获取地址成功
+        if (res.code == 0) { //获取地址成功
           app.globalData.locationCity = res.data.city;
           if (!that.isObjEmpty(city) && res.data.city != city.city && app.globalData.path == 'pages/index/index') {
             tt.hideLoading();
@@ -1227,8 +1096,8 @@ module.exports = {
             tt.setStorageSync("city", app.globalData.city);
             resolve(true);
           }
-        } else if (res.code == 1 || res.code == 2) {//获取地址失败
-          if (that.isObjEmpty(city) || res.code == 2) {//全局地址为空
+        } else if (res.code == 1 || res.code == 2) { //获取地址失败
+          if (that.isObjEmpty(city) || res.code == 2) { //全局地址为空
             var e = getCurrentPages(),
               url = e.length <= 0 ? "/pages/index/index" : "/" + e[e.length - 1].route;
             reject('reject');
@@ -1237,7 +1106,7 @@ module.exports = {
             tt.redirectTo({
               url: '/pages/city/list?query=selectCity&url=' + url
             });
-          } else {//全局地址city['city']存在
+          } else { //全局地址city['city']存在
             resolve(true);
           }
         }
@@ -1255,7 +1124,7 @@ module.exports = {
           let it = {};
           it.version = "applet_v1.0.0";
           it.code = res.code;
-          console.log(res.code,'code')
+          console.log(res.code, 'code')
           it.target = 'app';
           that.ajax({
             func: "v2/login/douyin/applet_login",