13404089107
2025-02-28 df1f4631abc4c6f929abe4abc548f316c48ecb95
咸宁新增迭代
14个文件已添加
21个文件已修改
883 ■■■■■ 已修改文件
app.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app.json 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
components/pal-pay/pal-pay.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
img/actCan.png 补丁 | 查看 | 原始文档 | blame | 历史
img/btn-img.png 补丁 | 查看 | 原始文档 | blame | 历史
img/cander.png 补丁 | 查看 | 原始文档 | blame | 历史
img/message.png 补丁 | 查看 | 原始文档 | blame | 历史
img/right.png 补丁 | 查看 | 原始文档 | blame | 历史
img/tip.png 补丁 | 查看 | 原始文档 | blame | 历史
pages/carDown/carDown.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/closeTip/closeTip.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/coupon/coupon.js 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/coupon/coupon.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/coupon/coupon.wxss 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/coupon/giveList/giveList.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/coupon/giveList/giveList.wxss 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.js 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/home/home.wxml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/index.js 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/invite/invite.js 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/invite/invite.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/invite/invite.wxml 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/invite/invite.wxss 141 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/inviteRecord/inviteRecord.js 171 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/inviteRecord/inviteRecord.json 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/inviteRecord/inviteRecord.wxml 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/inviteRecord/inviteRecord.wxss 188 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/myTrip/myTrip.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/myTrip/myTrip.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/myinfo/myinfo.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/same-city/same-city.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/waiting/useCoun/useCoun.wxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/waiting/waiting.wxml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
project.private.config.json 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
utils/ajax.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app.js
@@ -4,7 +4,7 @@
// const apiHost = 'https://okyueche.com:443/user'
// const apiHost = 'http://120.220.4.138:9591/user'
const apiHost = 'https://xn95128.cn/user'
// const apiHost = 'http://192.168.110.34:7777/user'
// const apiHost = 'http://192.168.110.64:7777/user'
// const apiHost = 'http://221.182.45.100:7777/user'
@@ -33,7 +33,7 @@
     initSocket() {
      let that = this;
      that.globalData.localSocket = wx.connectSocket({
        url: "ws://192.168.110.34:9978",
        // url: "ws://192.168.110.34:9978",
        // url: "ws://221.182.45.100:9978", 
        // url: "ws://221.182.45.100:900",
@@ -470,7 +470,7 @@
    cityName:wx.getStorageSync('cityName')||'',
    userLatitude:wx.getStorageSync('latitude')||'',
    userLongitude:wx.getStorageSync('longitude')||'',
    // Url:'http://192.168.110.34:7777/user',
    // Url:'http://192.168.110.64:7777/user',
    // Url:'http://221.182.45.100:7777/user',
    // Url:'http://39.108.148.228:80/user',
    // Url:'https://okyueche.com:443/user',
app.json
@@ -87,7 +87,9 @@
    "pages/home/integral/integral",
    "pages/home/integral/integral-info/integral-info",
    "pages/home/integral/intergral-user/intergral-user",
    "pages/home/integral/integral-jl/integral-jl"
    "pages/home/integral/integral-jl/integral-jl",
    "pages/invite/invite",
    "pages/inviteRecord/inviteRecord"
  ],
  "permission": {
    "scope.userLocation": {
components/pal-pay/pal-pay.js
@@ -63,7 +63,7 @@
    showNumCoun:true,//优惠券
    payStyle: [
      { name: "微信支付", checked: true },
      { name: "充值余额", checked: false ,money:'0可用'}
      // { name: "充值余额", checked: false ,money:'0可用'}
    ],
    icon: {
      normal: "../../img/icon_raidobutton.png",
img/actCan.png
img/btn-img.png
img/cander.png
img/message.png
img/right.png
img/tip.png
pages/carDown/carDown.wxml
@@ -101,12 +101,12 @@
            <image src="../../img/icon_close.png" catchtap="onClose"></image>
        </view>
        <view class="van_money car_monery">¥{{money||0}}</view>
        <!-- <view class="van_card" catchtap="getCou">
        <view class="van_card" catchtap="getCou">
            <view class="van_card_title">优惠券</view>
            <image src="../../img/icon_nav_open.png"></image>
            <view class="van_card_num" hidden="{{!showNumCoun}}">{{queryBalance.coupon==0?'0张可用券':'您有'+queryBalance.coupon+'张优惠券'}}</view>
            <view class="van_card_num" hidden="{{showNumCoun}}">{{moneyDown==""?'您有'+queryBalance.coupon+'张优惠券':'-'+moneyDown+'元'}}</view>
        </view> -->
        </view>
        <view class="select-item">
            <van-radio-group value="{{cancelOriginal}}" bind:change="onChange">
                <van-cell-group>
pages/closeTip/closeTip.wxml
@@ -60,12 +60,12 @@
            <image src="../../img/icon_close.png" catchtap="onClose"></image>
        </view>
        <view class="van_money car_monery">¥{{driveT.cancelPayMoney||0}}</view>
        <!-- <view class="van_card" catchtap="getCou">
        <view class="van_card" catchtap="getCou">
            <view class="van_card_title">优惠券</view>
            <image src="../../img/icon_nav_open.png"></image>
            <view class="van_card_num" hidden="{{!showNumCoun}}">{{queryBalance.coupon==0?'暂无可用券':'您有'+queryBalance.coupon+'张优惠券'}}</view>
            <view class="van_card_num" hidden="{{showNumCoun}}">{{moneyDown==""?'您有'+queryBalance.coupon+'张优惠券':'-'+moneyDown+'元'}}</view>
        </view> -->
        </view>
        <view class="select-item">
            <van-radio-group value="{{cancelOriginal}}" bind:change="onChange">
                <van-cell-group>
pages/coupon/coupon.js
@@ -16,7 +16,6 @@
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {
    this.getCoupon()
    this.setContainerHeight()
  },
  onChange(e){
@@ -50,6 +49,14 @@
          couponList : Data
        })
      }
      if(this.data.pageNum == 1&&res.data.data.length==0){
        this.setData({
          couponList:[]
        })
      }
      //停止刷新
      wx.stopPullDownRefresh();
    })
  },
  //导航栏高度
@@ -112,7 +119,8 @@
   * 生命周期函数--监听页面显示
   */
  onShow: function () {
    this.data.pageNum = 1
    this.getCoupon()
  },
  /**
pages/coupon/coupon.wxml
@@ -14,7 +14,7 @@
                <van-swipe-cell bind:click="onClick" right-width="{{70}}">
                    <view class="coupon-item" id="coupon-item" wx:if="{{item.state==1}}" bindtouchmove="couponItemtouchmove">
                        <view class="coupon-img-container">
                            <image class="coupon_img" src="{{item.userType==0?'/img/bg_coupom_blue.png':item.userType==1?'../../img/bg_coupom_orange.png':item.userType==2?'../../img/bg_coupom_green.png':item.userType==3?'../../img/bg_coupom_red.png':''}}"></image>
                            <image class="coupon_img" src="{{item.userType==0?'/img/bg_coupom_blue.png':item.userType==2?'../../img/bg_coupom_orange.png':item.userType==1?'../../img/bg_coupom_green.png':item.userType==3?'../../img/bg_coupom_red.png':''}}"></image>
                            <view wx:if="{{item.type==2}}" class="fullmoney">满{{item.fullMoney}}元可用</view>
                            <view class="coupon-price">
                                <view>¥</view>
pages/coupon/coupon.wxss
@@ -33,12 +33,15 @@
}
.coupon-price {
  position: absolute;
  left: 5rpx;
  left: 0rpx;
  top: 50rpx;
  display: flex;
  color: #ffffff;
  align-items: baseline;
  z-index: 2;
  width: 154rpx;
  display: flex;
  justify-content: center;
}
pages/coupon/giveList/giveList.wxml
@@ -2,7 +2,7 @@
<view wx:key="index" style="margin-top:20rpx;" class="list">
    <view class="coupon-item " wx:for="{{couponList}}" data-index="{{index}}" id="coupon-item" catchtap="getIt" data-id="{{item.id}}">
        <view class="coupon-img-container">
            <image class="coupon_img" src="{{item.userType==0?'/img/bg_coupom_blue.png':item.userType==1?'/img/bg_coupom_orange.png':item.userType==2?'/img/bg_coupom_green.png':item.userType==3?'/img/bg_coupom_red.png':''}}"></image>
            <image class="coupon_img" src="{{item.userType==0?'/img/bg_coupom_blue.png':item.userType==2?'/img/bg_coupom_orange.png':item.userType==1?'/img/bg_coupom_green.png':item.userType==3?'/img/bg_coupom_red.png':''}}"></image>
            <!--优惠券的框框-->
            <view   class="white_radio"></view>
pages/coupon/giveList/giveList.wxss
@@ -8,8 +8,8 @@
.list {
  width: 100%;
  height: 100vh;
  background: rgba(243, 244, 245, 1);
  padding-bottom: 120rpx;
}
.ss {
@@ -17,7 +17,7 @@
}
.coupon-price {
  top: 70rpx;
  top: 45rpx;
}
.checkOk {
@@ -61,6 +61,6 @@
  z-index: 999;
}
.coupon-item:last-child {
/* .coupon-item:last-child {
  margin-bottom: 180rpx;
}
} */
pages/home/home.js
@@ -106,10 +106,10 @@
        name: "我的订单",
        imgSrc: "../../img/icon_me_order.png",
      },
      // {
      //   name: "优惠券",
      //   imgSrc: "../../img/icon_me_coupons.png",
      // },
      {
        name: "优惠券",
        imgSrc: "../../img/icon_me_coupons.png",
      },
      {
        name: "安全",
        imgSrc: "../../img/icon_me_safety.png",
@@ -209,6 +209,14 @@
    this.setData({
      payModel: this.data.changeModel,
      showModel: false,
    })
  },
//邀请有礼跳转
  shareGift(){
    wx.navigateTo({
      url: '/pages/invite/invite',
    })
  },
@@ -809,6 +817,7 @@
      showSwiperTop: false
    })
  },
  //获取广告
  getadver(adcode) {
    if (wx.getStorageSync('adcode') !== "") {
@@ -1008,6 +1017,19 @@
    //swiper
    //  app.getFloatStr(5)
    // this.show()
    console.log('shuju1111111111',options);
    if(options.scene){
      console.log(1111111111,);
      const uidMatch = options.scene.match(/uid%3D(\d+)/);
      const userTypeMatch = options.scene.match(/userType%3D(\d+)/);
      // 提取匹配到的值
      const uid = uidMatch ? uidMatch[1] : null;
      const userType = userTypeMatch ? userTypeMatch[1] : null;
      wx.setStorageSync('uid', uid)
      wx.setStorageSync('userType', userType)
    }
@@ -1943,6 +1965,7 @@
            userInfo: res.data.data,
          })
          wx.setStorageSync('myPhone', res.data.data.phone)
          wx.setStorageSync('userInfo', res.data.data)
          if (res.data.data.emergencyContactNumber !== '') {
            wx.setStorageSync('stepName', {
              emergencyContact: res.data.data.emergencyContact,
pages/home/home.wxml
@@ -395,6 +395,12 @@
        <image src="/img/icon_me_share.png" style="width:28rpx;height:28rpx;margin-right:30rpx;"></image>
        <view>分享</view>
      </button>
      <view class="item_user" catchtap="shareGift">
        <image src="../../img/message.png" style="width:34rpx;height:32rpx;margin-right:30rpx;"></image>
        <view>邀请有礼</view>
      </view>
    </view>
  </van-popup>
pages/index/index.js
@@ -61,29 +61,31 @@
  },
  //登录验证手机号正确性
  goLogin: function () {
    let uid = wx.getStorageSync('uid')?wx.getStorageSync('uid'):''
    let userType = wx.getStorageSync('userType')?wx.getStorageSync('userType'):''
    if (this.data.codeId == 1) {
      console.log(wx.getStorageSync('longitude'), wx.getStorageSync('latitude'))
      if (app.testPhone(this.data.getPhoneNumber) && this.data.checked == true && wx.getStorageSync('longitude') !== '' && wx.getStorageSync('latitude') !== '' && this.data.getCodeNum !== "") {
        if (this.data.getCodeNum !== '') {
          unit.post(app.globalData.Url + '/base/user/captchaLogin', {
              code: this.data.getCodeNum,
              phone: this.data.getPhoneNumber,
              registAreaCode: wx.getStorageSync('adcode')|| '370500',
              loginType: "Applets"
              loginType: "Applets",
              uid:uid,
              userType:userType,
            })
            .then((res) => {
              console.log(res)
              if (res.data.code == 200) {
                wx.setStorageSync('havePhone', true)
                wx.setStorageSync('phone',this.data.getPhoneNumber)
                wx.setStorageSync('token', res.data.data.token)
                wx.setStorageSync('userId', res.data.data.id)
                // this.setData({
                //   showPop: true
                // })
                wx.reLaunch({
                  url: '/pages/home/home?type=' + "2",
                this.setData({
                  showPop: true
                })
                // wx.reLaunch({
                //   url: '/pages/home/home?type=' + "2",
                // })
              } else {
                wx.showToast({
                  title: res.data.msg,
@@ -134,12 +136,12 @@
            // wx.redirectTo({
            //   url: '/pages/home/home',
            // })
            // this.setData({
            //   showPop: true
            // })
            wx.reLaunch({
              url: '/pages/home/home?type=' + "2",
            this.setData({
              showPop: true
            })
            // wx.reLaunch({
            //   url: '/pages/home/home?type=' + "2",
            // })
          } else {
            if (res.data.msg == "账号无效") {
              app.showToastSuccess("账号或密码错误", null, "none", 1500)
@@ -183,6 +185,8 @@
      return
    }
    console.log(e)
    let uid = wx.getStorageSync('uid')?wx.getStorageSync('uid'):''
    let userType = wx.getStorageSync('userType')?wx.getStorageSync('userType'):''
    wx.login({
      success: (res) => {
        console.log(res)
@@ -193,10 +197,11 @@
                  jscode: res.code,
                  registAreaCode: wx.getStorageSync('adcode') || '370500',
                  type: 2,
                  loginType: "Applets"
                  loginType: "Applets",
                  uid:uid,
                  userType:userType,
                })
                .then((res) => {
                  console.log(res)
                  if (res.data.code == 200) {
                    wx.setStorageSync('token', res.data.data.token)
                    wx.setStorageSync('userId', res.data.data.id)
pages/invite/invite.js
New file
@@ -0,0 +1,116 @@
// pages/invite/invite.js
const unit = require('../../utils/util')
const app = getApp()
Page({
  /**
   * 页面的初始数据
   */
  data: {
    userInfo:wx.getStorageSync('userInfo'),
    detail:{},
  },
  goRecord(){
    wx.navigateTo({
      url: '/pages/inviteRecord/inviteRecord',
    })
  },
  downLoadCode(){
    wx.downloadFile({
      url: this.data.detail.code,
      success(res) {
       if(res.statusCode ==200){
         let tempFilePath = res.tempFilePath;
              wx.saveImageToPhotosAlbum({
                filePath: tempFilePath,
                success (res) {
                  console.log('保存成功', res);
                },
                fail (err) {
                  if (err.errMsg === "saveImageToPhotosAlbum:fail cancel") {
                    console.log('用户取消保存');
                  } else {
                    console.log('保存失败', err);
                  }
                }
              });
       }else{
         wx.showToast({
           title: '下载失败',
           icon:'none'
         })
       }
      }
    })
  },
  /**
   * 生命周期函数--监听页面加载
   */
  onLoad(options) {
    unit.post(app.globalData.Url + "/api/user/getCode")
    .then((res) => {
      console.log('shuju',res);
     if(res.data.code==200){
       this.setData({
         detail:res.data.data
       })
     }
    })
  },
  /**
   * 生命周期函数--监听页面初次渲染完成
   */
  onReady() {
  },
  /**
   * 生命周期函数--监听页面显示
   */
  onShow() {
  },
  /**
   * 生命周期函数--监听页面隐藏
   */
  onHide() {
  },
  /**
   * 生命周期函数--监听页面卸载
   */
  onUnload() {
  },
  /**
   * 页面相关事件处理函数--监听用户下拉动作
   */
  onPullDownRefresh() {
  },
  /**
   * 页面上拉触底事件的处理函数
   */
  onReachBottom() {
  },
  /**
   * 用户点击右上角分享
   */
  onShareAppMessage() {
  }
})
pages/invite/invite.json
New file
@@ -0,0 +1,4 @@
{
  "usingComponents": {},
  "navigationBarTitleText":"邀请好友"
}
pages/invite/invite.wxml
New file
@@ -0,0 +1,32 @@
<!--pages/invite/invite.wxml-->
<view class="invite-page">
  <view class="top-img">
    <image src="../../img/tip.png" class="invite-icon" mode="aspectFit" />
  </view>
  <image src="https://jiayixing-bucket.oss-cn-beijing.aliyuncs.com/img/22d66ce3878d46918be16f884b67a30b.png" style="height: 100vh; width: 100vw;" mode="widthFix" />
  <view class="top-box">
    <image src="{{userInfo.avatar?userInfo.avatar:'../../img/icon_logo.png'}}" class="head-img" mode="aspectFill" />
    <view class="invite-tit">{{userInfo.nickName}}</view>
    <view class="invite-num">
      您已成功邀请<text class="text-num">{{detail.inviteNumber}}</text>位乘客
    </view>
    <view class="invite-label">
      加入咸宁95128出行平台
    </view>
  </view>
  <view class="erweima">
    <image src="{{detail.code}}" class="erweima-icon" mode="aspectFill" />
  </view>
  <view class="btns-box">
    <view class="btns" bindtap="downLoadCode">下载邀请码</view>
  </view>
  <view class="invite-record">
    <view class="record-btn" bindtap="goRecord">
      <view class="record-bttn" >邀请记录</view>
      <image src="../../img/btn-img.png" class="btn-img" mode="aspectFill" />
    </view>
  </view>
</view>
pages/invite/invite.wxss
New file
@@ -0,0 +1,141 @@
/* pages/invite/invite.wxss */
.invite-page {
  height: 100vh;
  width: 100%;
  position: relative;
}
.top-box {
  width: 100%;
  position: absolute;
  top: 157.69rpx;
  left: 0;
  display: flex;
  flex-direction: column;
  align-items: center;
  justify-content: center;
}
.invite-icon {
  width: 526.92rpx;
  height: 88.46rpx;
  margin-top: 46.15rpx;
}
.top-img {
  height: 157.69rpx;
  background-color: rgba(254, 248, 232, 1);
  display: flex;
  justify-content: center;
}
.head-img {
  width: 126.92rpx;
  height: 126.92rpx;
  border-radius: 50%;
  /* margin-top: 15.38rpx; */
}
.invite-tit {
  margin-top: 7.69rpx;
  font-family: PingFangSC, PingFang SC;
  font-weight: 500;
  font-size: 31rpx;
  color: #000000;
}
.invite-num {
  font-family: PingFang-SC, PingFang-SC;
  font-weight: 500;
  font-size: 27rpx;
  color: rgba(0, 0, 0, 0.8);
}
.invite-label {
  font-family: PingFang-SC, PingFang-SC;
  font-weight: 500;
  font-size: 27rpx;
  color: rgba(0, 0, 0, 0.8);
}
.text-num {
  color: rgba(255, 77, 48, 1);
  font-size: 38rpx;
  font-weight: 500;
  margin-left: 4rpx;
  margin-right: 4rpx;
}
.erweima-icon {
  width: 351.92rpx;
  height: 351.92rpx;
}
.erweima {
  position: absolute;
  top: 607.08rpx;
  left: 0;
  display: flex;
  width: 100%;
  justify-content: center;
}
.btns-box {
  width: 100%;
  top: 1055.77rpx;
  left: 0;
  position: absolute;
  display: flex;
  justify-content: center;
}
.btns {
  width: 192rpx;
  height: 77rpx;
  border-radius: 38rpx;
  border: 2rpx solid #FFFFFF;
  font-family: PingFangSC, PingFang SC;
  font-weight: 500;
  font-size: 27rpx;
  color: #FFFFFF;
  line-height: 38rpx;
  display: flex;
  justify-content: center;
  align-items: center;
}
.btn-img {
  width: 344.23rpx;
  height: 115.38rpx;
}
.invite-record {
  position: absolute;
  top: 1342.31rpx;
  left: 0;
  width: 100%;
  display: flex;
  justify-content: center;
}
.record-btn {
  position: relative;
}
.record-bttn {
  position: absolute;
  top: 0;
  left: 0;
  height: 105.38rpx;
  margin-left: 78.85rpx;
  display: flex;
  justify-content: center;
  align-items: center;
  font-family: PingFangSC, PingFang SC;
  font-weight: 600;
  font-size: 35rpx;
  color: #FF3918;
  line-height: 48rpx;
}
pages/inviteRecord/inviteRecord.js
New file
@@ -0,0 +1,171 @@
// pages/inviteRecord/inviteRecord.js
const unit = require('../../utils/util')
const app = getApp()
Page({
  /**
   * 页面的初始数据
   */
  data: {
    before:'开始日期',
    affter:'结束日期',
    beforeDate:'请选择',
    affterDate:'请选择',
    actChoose:1,
    currentDate: new Date().getTime(),
    minDate: new Date(2018,12,31).getTime(),
    maxDate: new Date(2100, 12, 31).getTime(),
    showDate:false,
    searchForm:{
      startTime:'',
      endTime:'',
      pageNum:1,
      size:10,
    },
    Data:[],
  },
  showDate(){
    this.setData({
      actChoose:1,
      showDate:true,
    })
  },
  getRecordList(){
    unit.post(app.globalData.Url + "/api/user/inviteList",{
      ...this.data.searchForm
    })
    .then((res) => {
      if (res.data.data.length > 0) {
        this.data.searchForm.pageNum = this.data.searchForm.pageNum + 1;
        //获取当前数据
        let Data = this.data.Data;
        //合并数据
        Data = Data.concat(res.data.data);
        this.setData({
          Data: Data
        })
      }
      if(this.data.searchForm.pageNum == 1&&res.data.data.length==0){
        console.log(11111111111111111);
        this.setData({
          Data:[]
        })
      }
      //停止刷新
      wx.stopPullDownRefresh();
    })
  },
  onInput(e){
    console.log('shuju',e);
    if(this.data.actChoose==1){
      this.setData({
        beforeDate:new Date(e.detail).getFullYear() + '/' + (new Date(e.detail).getMonth() + 1) + '/' + new Date(e.detail).getDate()
      })
    }else{
      this.setData({
        affterDate:new Date(e.detail).getFullYear() + '/' + (new Date(e.detail).getMonth() + 1) + '/' + new Date(e.detail).getDate()
      })
    }
  },
  cancelPop(){
    this.setData({
      showDate:false
    })
  },
  okPop(){
    if(!this.data.affterDate || this.data.affterDate=='请选择'){
      wx.showToast({
        title: '请选择结束日期',
        icon:'none'
      })
      return
    }
    this.setData({
      before:this.data.beforeDate,
      affter:this.data.affterDate,
      searchForm:{
        pageNum:1,
        size:10,
        startTime:this.data.beforeDate,
        endTime:this.data.affterDate,
        Data:[],
      },
      showDate:false,
    },()=>{
      this.getRecordList()
    })
  },
  focusBefore(){
    this.setData({
      actChoose:1
    })
  },
  focusAffter(){
    this.setData({
      actChoose:2
    })
  },
  /**
   * 生命周期函数--监听页面加载
   */
  onLoad(options) {
    this.getRecordList()
  },
  /**
   * 生命周期函数--监听页面初次渲染完成
   */
  onReady() {
  },
  /**
   * 生命周期函数--监听页面显示
   */
  onShow() {
  },
  /**
   * 生命周期函数--监听页面隐藏
   */
  onHide() {
  },
  /**
   * 生命周期函数--监听页面卸载
   */
  onUnload() {
  },
  /**
   * 页面相关事件处理函数--监听用户下拉动作
   */
  onPullDownRefresh() {
  },
  /**
   * 页面上拉触底事件的处理函数
   */
  onReachBottom() {
    this.getRecordList()
  },
  /**
   * 用户点击右上角分享
   */
  onShareAppMessage() {
  }
})
pages/inviteRecord/inviteRecord.json
New file
@@ -0,0 +1,5 @@
{
  "usingComponents": {},
  "navigationBarTitleText":"邀请记录",
  "backgroundColor": "#F3F4F5"
}
pages/inviteRecord/inviteRecord.wxml
New file
@@ -0,0 +1,48 @@
<!--pages/inviteRecord/inviteRecord.wxml-->
<view class="invite-record-page">
  <view class="date-select" bindtap="showDate">
    <view class="date-before flex1 {{before=='开始日期'&&'start-date'}}">{{before}}</view>
    <image src="../../img/right.png" class="right-icon" mode="aspectFill" />
    <view class="date-affter flex1 {{before=='开始日期'&&'end-date'}}">{{affter}}</view>
    <image src="../../img/cander.png" class="cander-icon" mode="aspectFill" />
  </view>
  <view class="list-box">
    <view class="list-item" wx:for="{{Data}}" wx:key="index" data-self="{{item}}" >
      <image src="{{item.avatar?item.avatar:'../../img/icon_logo.png'}}" class="head-icon" mode="aspectFill" />
      <view class="right-info">
        <view class="name">{{item.phone || ''}}</view>
        <view class="time">{{item.registerTime || ''}}</view>
      </view>
    </view>
  </view>
  <van-popup position="bottom" overlay="{{ true }}" show="{{showDate}}" bind:close="onClose">
    <view class="popup-content">
      <view class="popup-top">
        <view class="cancle-btn" bindtap="cancelPop">取消</view>
        <view class="cancle-btn" bindtap="okPop">确定</view>
      </view>
      <view class="popup-date">
        <view class="date-left flex1 {{beforeDate=='请选择'&&'date-choose'}} {{actChoose == 1&&'actTab'}}" bindtap="focusBefore">
          {{beforeDate}}
          <image src="../../img/actCan.png" class="act-ic" wx:if="{{actChoose == 1}}" mode="aspectFill" />
          <image src="../../img/cander.png" class="act-ic" wx:if="{{actChoose == 2}}" mode="aspectFill" />
        </view>
        <view class="line"></view>
        <view class="date-right flex1 {{affterDate=='请选择'&&'date-choose'}} {{actChoose == 2&&'actTab'}}" bindtap="focusAffter">
          {{affterDate}}
          <image src="../../img/actCan.png" class="act-ic" wx:if="{{actChoose == 2}}" mode="aspectFill" />
          <image src="../../img/cander.png" class="act-ic" wx:if="{{actChoose == 1}}" mode="aspectFill" />
        </view>
      </view>
      <van-datetime-picker show-toolbar="{{false}}" type="date" value="{{ currentDate }}" min-date="{{ minDate }}" max-date="{{ maxDate }}" bind:input="onInput" />
    </view>
  </van-popup>
</view>
pages/inviteRecord/inviteRecord.wxss
New file
@@ -0,0 +1,188 @@
/* pages/inviteRecord/inviteRecord.wxss */
page {
  background: #F3F4F5;
}
.invite-record-page {
  padding-top: 26.92rpx;
}
.date-select {
  width: calc(696rpx - 23.08rpx - 23.08rpx);
  height: 85rpx;
  background: #FFFFFF;
  border-radius: 8rpx;
  border: 2rpx solid #D9D9D9;
  margin: 0 auto;
  display: flex;
  align-items: center;
  padding: 0 23.08rpx;
  margin-bottom: 26.92rpx;
}
.right-icon {
  width: 30.77rpx;
  height: 30.77rpx;
  margin-right: 19.23rpx;
}
.cander-icon {
  width: 30.77rpx;
  height: 30.77rpx;
}
.flex1 {
  flex: 1;
}
.date-before {
  font-family: PingFangSC, PingFang SC;
  font-weight: 400;
  font-size: 27rpx;
  color: rgba(0, 0, 0, 0.8);
}
.date-affter {
  font-family: PingFangSC, PingFang SC;
  font-weight: 400;
  font-size: 27rpx;
  color: rgba(0, 0, 0, 0.8);
}
.start-date {
  color: rgba(0, 0, 0, 0.25);
}
.end-date {
  color: rgba(0, 0, 0, 0.25);
}
.head-icon {
  width: 96rpx;
  height: 96rpx;
  border-radius: 50%;
}
.list-item {
  width: 100%;
  margin-bottom: 11.54rpx;
  padding: 26.92rpx;
  background-color: #fff;
  display: flex;
  align-items: center;
}
.right-info {
  margin-left: 26.92rpx;
}
.name {
  font-family: PingFangSC, PingFang SC;
  font-weight: 600;
  font-size: 27rpx;
  color: #000000;
  line-height: 38rpx;
}
.time {
  font-family: PingFangSC, PingFang SC;
  font-weight: 400;
  font-size: 23rpx;
  color: #000000;
  line-height: 33rpx;
}
.popup-content {
  height: 712rpx;
  background: #FFFFFF;
  /* padding: 0 23.08rpx; */
}
.van-popup--bottom {
  width: 100vw !important;
  border-radius: unset !important;
}
.popup-top {
  display: flex;
  align-items: center;
  justify-content: space-between;
  border-bottom: 1rpx solid #E5E5E5;
  padding: 23.08rpx;
}
.cancle-btn {
  font-family: PingFangSC, PingFang SC;
  font-weight: 400;
  font-size: 30rpx;
  color: #4D8BFF;
  line-height: 42rpx;
  cursor: pointer;
}
.popup-date {
  margin-top: 25rpx;
  display: flex;
  padding: 0 23.08rpx;
  align-items: center;
}
.date-left {
  width: 311rpx;
  height: 64rpx;
  line-height: 64rpx;
  box-shadow: inset 0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1);
  border-radius: 8rpx;
  margin-right: 25rpx;
  padding-left: 25rpx;
  font-family: PingFangSC, PingFang SC;
  font-weight: 400;
  font-size: 28rpx;
  color: #333333;
  cursor: pointer;
  display: flex;
  align-items: center;
  justify-content: space-between;
  padding-right: 25rpx;
}
.line {
  width: 23rpx;
  height: 2rpx;
  background: #CCCCCC;
  margin-right: 25rpx;
}
.date-right {
  width: 311rpx;
  height: 64rpx;
  line-height: 64rpx;
  padding-left: 25rpx;
  box-shadow: inset 0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1);
  border-radius: 8rpx;
  font-family: PingFangSC, PingFang SC;
  font-weight: 400;
  font-size: 28rpx;
  color: #333333;
  cursor: pointer;
  display: flex;
  align-items: center;
  justify-content: space-between;
  padding-right: 25rpx;
}
.date-choose {
  color: rgba(0, 0, 0, 0.25);
}
.actTab {
  box-shadow: inset 0rpx 2rpx 6rpx 0rpx rgba(0, 0, 0, 0.1);
  border-radius: 8rpx;
  border: 1rpx solid #1677FF !important;
  color: #1677FF !important;
}
.act-ic{
  width: 32rpx;
  height: 32rpx;
}
pages/myTrip/myTrip.js
@@ -23,11 +23,11 @@
    Data: [],
    showPayVan: false, //支付弹窗
    payStyle: [
      {
        name: "充值余额",
        checked: false,
        money: '0元'
      },
      // {
      //   name: "充值余额",
      //   checked: false,
      //   money: '0元'
      // },
      {
        name: "微信支付",
        checked: true
pages/myTrip/myTrip.wxml
@@ -178,12 +178,12 @@
        <image src="../../img/icon_close.png" catchtap="onClose"></image>
    </view>
    <view class="van_money car_monery">¥{{money||0}}</view>
    <!-- <view class="van_card" catchtap="getCou">
    <view class="van_card" catchtap="getCou">
            <view class="van_card_title">优惠券</view>
            <image src="../../img/icon_nav_open.png"></image>
            <view class="van_card_num" hidden="{{!showNumCoun}}">{{queryBalance.coupon==0?'0张可用券':'您有'+queryBalance.coupon+'张优惠券'}}</view>
            <view class="van_card_num" hidden="{{showNumCoun}}">{{moneyDown==""?'您有'+queryBalance.coupon+'张优惠券':'-'+moneyDown+'元'}}</view>
        </view> -->
        </view>
    <view class="select-item">
        <van-radio-group value="{{cancelOriginal}}" bind:change="onChange">
            <van-cell-group>
pages/myinfo/myinfo.js
@@ -58,6 +58,9 @@
            url: 'https://xn95128.cn/user-server/upload/image',
            filePath: filePath,
            name: "file",
            header:{
              token:'Bearer ' + wx.getStorageSync('token')
            },
            formData: {
                key: fileName,
            },
pages/same-city/same-city.wxml
@@ -52,12 +52,12 @@
            <image src="../../img/icon_close.png" catchtap="onClose"></image>
        </view>
        <view class="van_money car_monery">¥{{money||0}}</view>
        <!-- <view class="van_card" catchtap="getCou">
        <view class="van_card" catchtap="getCou">
            <view class="van_card_title">优惠券</view>
            <image src="../../img/icon_nav_open.png"></image>
            <view class="van_card_num" hidden="{{!showNumCoun}}">{{queryBalance.coupon==0?'0张可用券':'您有'+queryBalance.coupon+'张优惠券'}}</view>
            <view class="van_card_num" hidden="{{showNumCoun}}">{{moneyDown==""?'您有'+queryBalance.coupon+'张优惠券':'-'+moneyDown+'元'}}</view>
        </view> -->
        </view>
        <view class="select-item">
            <van-radio-group value="{{cancelOriginal}}" bind:change="onChange">
                <van-cell-group>
pages/waiting/useCoun/useCoun.wxml
@@ -32,7 +32,7 @@
<view wx:key="index" wx:if="{{couponList.length>0}}" style="margin-top:20rpx;" class="list">
    <view class="coupon-item {{indexs==index?'active':''}}" wx:for="{{couponList}}" data-index="{{index}}" id="coupon-item" catchtap="getIt" data-money="{{item.money}}" data-id="{{item.id}}">
        <view class="coupon-img-container">
            <image class="coupon_img" src="{{item.userType==0?'/img/bg_coupom_blue.png':item.userType==1?'/img/bg_coupom_orange.png':item.userType==2?'/img/bg_coupom_green.png':item.userType==3?'/img/bg_coupom_red.png':''}}"></image>
            <image class="coupon_img" src="{{item.userType==0?'/img/bg_coupom_blue.png':item.userType==2?'/img/bg_coupom_orange.png':item.userType==1?'/img/bg_coupom_green.png':item.userType==3?'/img/bg_coupom_red.png':''}}"></image>
            <!--优惠券的框框-->
            <view   class="white_radio"></view>
            <image wx:if="{{indexs==index}}" src="../../../img/icon_raidobutton_selected.png" class="checkOk"></image>
pages/waiting/waiting.wxml
@@ -199,12 +199,12 @@
        <image src="../../img/icon_close.png" catchtap="onClose"></image>
      </view>
      <view class="van_money car_monery">¥{{money||0}}</view>
      <!-- <view class="van_card" catchtap="getCou">
      <view class="van_card" catchtap="getCou">
        <view class="van_card_title">优惠券</view>
        <image src="../../img/icon_nav_open.png"></image>
        <view class="van_card_num" hidden="{{!showNumCoun}}">{{queryBalance.coupon==0?'0张可用券':'您有'+queryBalance.coupon+'张优惠券'}}</view>
        <view class="van_card_num" hidden="{{showNumCoun}}">{{moneyDown==""?'您有'+queryBalance.coupon+'张优惠券':'-'+moneyDown+'元'}}</view>
      </view> -->
      </view>
      <view class="select-item">
        <van-radio-group value="{{cancelOriginal}}" bind:change="onChange">
          <van-cell-group>
project.private.config.json
@@ -35,6 +35,34 @@
          "query": "id=4338&orderType=2&onekey=0",
          "launchMode": "default",
          "scene": null
        },
        {
          "name": "",
          "pathName": "pages/invite/invite",
          "query": "",
          "launchMode": "default",
          "scene": null
        },
        {
          "name": "",
          "pathName": "pages/inviteRecord/inviteRecord",
          "query": "",
          "launchMode": "default",
          "scene": null
        },
        {
          "name": "",
          "pathName": "pages/coupon/coupon",
          "query": "",
          "launchMode": "default",
          "scene": null
        },
        {
          "name": "",
          "pathName": "pages/inviteRecord/inviteRecord",
          "query": "",
          "launchMode": "default",
          "scene": null
        }
      ]
    }
utils/ajax.js
@@ -91,7 +91,7 @@
const ajax = new Ajax({
  //  baseURL: 'http://192.168.0.49:81/api',
  // baseURL:"http://192.168.110.34:7777/user"
  // baseURL:"http://192.168.110.64:7777/user"
  // baseURL:"http://221.182.45.100:7777/user"
  // baseURL:"http://39.108.148.228:80/user"