移包

WXD-SEASON\season
1 parent f5c8ab23
Showing 14 changed files with 385 additions and 17 deletions
app.json
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
packageC/pages/presell/cart/cart.wxml
pages/order/refund_order/refund_order.js → packageG/pages/order/refund_order/refund_order.js
pages/order/refund_order/refund_order.json → packageG/pages/order/refund_order/refund_order.json
pages/order/refund_order/refund_order.wxml → packageG/pages/order/refund_order/refund_order.wxml
pages/order/refund_order/refund_order.wxss → packageG/pages/order/refund_order/refund_order.wxss
packageG/pages/user/my_service/hist_service.js
packageG/pages/user/my_service/hist_service.json
packageG/pages/user/my_service/hist_service.wxml
packageG/pages/user/my_service/hist_service.wxss
pages/user/my_service/i_service.wxml
pages/user/order_detail/order_detail.wxml
pages/user/order_list/order_list.wxml
@@ -6,8 +6,6 @@
         "pages/cart/cart4/cart4",
         "pages/goods/goodsInfo/goodsInfo",
         "pages/goods/goodsList/goodsList",
-
-        "pages/order/refund_order/refund_order",
         "pages/payment/payment/payment",
         "pages/user/index/index",
         "pages/user/order_list/order_list",
@@ -28,7 +26,7 @@
         "pages/user/my_service/i_service",
-        "pages/user/my_service/hist_service",
+       
         "pages/user/my_service/tment_details",
         "pages/user/my_service/tment_eval",
@@ -250,7 +248,9 @@
               "pages/user/my_service/appment_main",
               "pages/user/my_service/cosmetology_list",
               "pages/user/my_service/beauty_deta",
-              "pages/user/my_service/tment_order_list"
+              "pages/user/my_service/tment_order_list",
+              "pages/user/my_service/hist_service",
+              "pages/order/refund_order/refund_order"
           ]
       }
     ],
@@ -191,12 +191,12 @@
           <!---has_rt部分退---->
          <!-- <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
-                          <navigator class="tips-btn" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
-                          <navigator class="tips-btn" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
+                          <navigator class="tips-btn" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
+                          <navigator class="tips-btn" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
          </block>
          <block wx:else>
                           <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
-                          <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}"  url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
+                          <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}"  url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
                                      url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
@@ -416,12 +416,12 @@
         <!-- 服务卡项的不能申请退款 -->
         <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && !is_fwk}}">
-            <navigator class="tips-btn2" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
-            <navigator class="tips-btn2" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
+            <navigator class="tips-btn2" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
+            <navigator class="tips-btn2" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
         </block>
         <block wx:else>
             <view class="tips-btn2" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
-            <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}"  url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
+            <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}"  url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
             <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
                        url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
         </block>
+var e = getApp(),
+  a = e.globalData.setting,
+  os = a,
+  t = e.request,
+  d = e.globalData;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    iurl: a.imghost,
+    isPickerShow: false,
+    isPickerRender: false,
+    startTime: "",
+    endTime: "",
+    pickerConfig: {
+      endDate: true,
+      column: "",
+      dateLimit: true,
+      initStartTime: "2019-01-01 12:32:44",
+      initEndTime: "2019-12-01 12:32:44",
+      limitStartTime: "1917-05-06 12:32:44",
+      limitEndTime: "2055-05-06 12:32:44"
+    },
+    hist_List: [], //服务项目列表
+    is_service_read: 0,
+    curpage: 1, //当前分页数
+    pageSize: 15, //页大小
+    total: 0,
+    ismore: 0, //是否加载完毕
+    is_screen: 0, //是否通过筛选来选择历史服务
+    is_reset: 0, //是否重复点击
+    is_nav: 1, //是否显示导航栏
+  },
+  pickerShow: function() {
+    this.setData({
+      isPickerShow: true,
+      isPickerRender: true,
+      chartHide: true
+    });
+  },
+  pickerHide: function() {
+    var th = this;
+    th.setData({
+      isPickerShow: false,
+      chartHide: false
+    });
+  },
+  //--选择时间--
+  setPickerTime: function(val) {
+    let data = val.detail,
+      gl_data = getApp().globalData,
+      th = this;
+    th.setData({
+      startTime: data.startTime,
+      endTime: data.endTime,
+      val: 0,
+      distance: 0,
+      hist_List: [],
+      curpage: 1,
+      is_screen: 1,
+      is_nav: 1
+    });
+    th.query_hist();
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+    var th = this;
+    th.query_hist();
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {},
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function() {
+    var th = this;
+    if (th.data.total <= th.data.pageSize) return false;
+    if (th.data.ismore) return false;
+
+    wx.showLoading({
+      title: '加载中...',
+    })
+    th.query_hist();
+  },
+  //重置历史服务数据
+  his_reset: function() {
+    var th = this;
+    var is_reset = th.data.is_reset;
+    if (is_reset == 0) {
+      th.setData({
+        hist_List: [],
+        curpage: 1,
+        is_service_read: 0,
+        is_screen: 1,
+        is_reset: 1,
+        startTime: "",
+        endTime: "",
+        is_nav: 1
+      })
+      th.query_hist();
+    }
+  },
+  query_hist: function() {
+
+    var th = this;
+    var startTime = th.data.startTime.substring(0, 10); //开始
+    var endTime = th.data.endTime.substring(0, 10); //结束
+    var url = "/api/weshop/marketing/reservation/history/reservation/page";
+    getApp().request.promiseGet(url, {
+      data: {
+        storeId: a.stoid,
+        userId: d.user_id,
+        beginDate: startTime,
+        endDate: endTime,
+        page: th.data.curpage,
+        pageSize: th.data.pageSize
+      }
+    }).then(res => {
+      wx.hideLoading();
+      th.setData({
+        is_reset: 0
+      })
+      if (res.data.code == 0) {
+        th.data.curpage++;
+        var arr1 = th.data.hist_List;
+        var arr2 = res.data.data.pageData;
+        var arr3 = [...arr1, ...arr2];
+        var ismore = 0;
+        if (arr3.length == res.data.total) ismore = 1
+        th.setData({
+          hist_List: arr3,
+          total: res.data.data.total,
+          ismore: ismore,
+          is_service_read: 1,
+        }), wx.stopPullDownRefresh(); //停止下拉刷新
+      } else {
+        th.setData({
+          is_service_read: 1,
+          is_screen: 0,
+          ismore: 1
+        })
+        if (startTime!="") {
+            th.setData({
+              total:0
+            })
+        }
+      }
+    })
+  }
+})
 \ No newline at end of file
+{
+  "navigationBarTitleText": "历史预约",
+  "usingComponents": {
+    "timePicker": "/components/timePicker/timePicker",
+    "warn": "/components/long_warn/long_warn"
+  }
+}
 \ No newline at end of file
+<view class="{{isPickerRender==true?'container':''}}">
+  <!-- 点击方法 -->
+  <view class="exption flex-vertical-between fs28" wx:if="{{is_nav || hist_List.length>0}}">
+    <view class="flex">
+      共使用
+      <view class="count">{{total}}</view>
+      次服务
+    </view>
+    <view class="flex">
+      <view class="Resetfram flex-center" bindtap="his_reset">
+        <view class="Reset">重置</view>
+        <image class="Resetsub" src="{{iurl}}/miniapp/images/reset.png"></image>
+      </view>
+      <view class="flex-center" bindtap='pickerShow'>
+        <view>筛选</view>
+        <view wx:if="{{true}}" class="box"></view>
+      </view>
+    </view>
+  </view>
+
+  <!-- 总的服务列表 -->
+  <view class="items">
+    <!-- 单个 -->
+    <view class="item flex-vertical-between" wx:for="{{hist_List}}">
+      <!-- left -->
+      <view>
+        <view class="flex fs28">
+          <view class="itemName ellipsis-1">{{item.ServiceName==''?'匿名':item.ServiceName}}</view>
+          <block wx:if="{{item.State==1 || item.State==4}}">
+            <view>(服务美容师：</view>
+          </block>
+          <block wx:else>
+            <view>(预约美容师：</view>
+          </block>
+          <view class="itemUsna ellipsis-1">{{item.BeauticianName}}</view>
+          )
+        </view>
+        <view class="fs24">{{item.ArrangeTime}}</view>
+      </view>
+      <!-- right -->
+      <view class="serState fs32">
+        <view wx:if="{{item.State==0}}" >
+        <navigator url="/packageG/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}">
+          <view>未服务</view>
+        <view>更改时间</view>
+        </navigator>
+        </view>
+        <view wx:if="{{item.State==1}}">已服务</view>
+        <view wx:if="{{item.State==2}}">已过期</view>
+        <view wx:if="{{item.State==3}}">已取消</view>
+        <view wx:if="{{item.State==4}}">已评价</view>
+      </view>
+    </view>
+    <!-- 没有数据 -->
+    <!-- 加载完毕并且数据大于=页大小 -->
+    <view class="After_all flex-center" wx:if="{{ismore && hist_List.length>=pageSize}}">
+      <view class="Line"></view>
+      <view class="end fs26 xc-black">到底了</view>
+      <view class="Line"></view>
+    </view>
+  </view>
+</view>
+<view wx:if="{{hist_List.length<1 && startTime!=''}}" class="flex-center fs26 slot">
+  <view>该时间段无预约记录</view>
+</view>
+<!-- 无历史服务 -->
+<view class="empty_order" wx:if="{{hist_List.length<1 && is_service_read && startTime==''}}">
+  <view class="flex-level">
+    <image src="{{iurl}}miniapp/images/yyservice/no_history.png"></image>
+  </view>
+  <view class="flex-level fs30 xc-ash">暂无服务记录</view>
+  <view class="flex-level">
+    <navigator url="/pages/user/my_service/i_service">
+      <view class="flex-center fs32 white">前往使用</view>
+    </navigator>
+  </view>
+</view>
+
+
+<!-- 引用时间主键 -->
+<timePicker pickerShow="{{isPickerShow}}" id="picker" wx:if="{{isPickerRender}}" bind:hidePicker="pickerHide" bind:setPickerTime="setPickerTime" config="{{pickerConfig}}"></timePicker>
+<warn id="warn"></warn>
 \ No newline at end of file
+page {
+  height: 100%;
+}
+
+.box {
+  width: 0px;
+  height: 0px;
+  margin-left: 15rpx;
+  border-top: 11rpx solid rgba(0, 0, 0, 0);
+  border-right: 10rpx solid rgba(0, 0, 0, 0);
+  border-left: 10rpx solid rgba(0, 0, 0, 0);
+  display: inline-block;
+  margin-bottom: 10rpx;
+  color: red;
+  transform: rotate(0deg);
+  border-bottom: 18rpx solid rgb(153, 153, 153);
+}
+
+.exption {
+  padding: 0rpx 45rpx;
+  background-color: rgb(238, 238, 238);
+  height: 70rpx;
+  color: rgb(153, 153, 153);
+  position: fixed;
+  top:0rpx;
+  left: 0rpx;
+  width: 660rpx;
+}
+
+.count {
+  margin: 0rpx 5rpx;
+}
+
+.Resetfram {
+  margin-right: 40rpx;
+}
+
+.Reset {
+  margin-right: 5rpx;
+}
+
+.Resetsub {
+  width: 30rpx;
+  height: 30rpx;
+}
+.items{
+  margin-top: 70rpx;
+}
+.item {
+  margin: 0rpx 25rpx;
+  padding: 0rpx 20rpx;
+  height: 100rpx;
+  border-bottom: 1rpx solid rgb(242, 242, 242);
+}
+
+.itemName {
+  margin-right: 10rpx;
+  max-width: 130rpx;
+}
+
+.itemUsna {
+  max-width: 150rpx;
+}
+
+.serState {
+  color: rgb(255, 82, 125);
+  text-align: right;
+}
+
+.container {
+  position: fixed;
+  width: 100%;
+  top: 0rpx;
+}
+
+/* 无历史服务 */
+
+.empty_order {
+  height: 100%;
+  background-color: rgb(238, 238, 238);
+}
+
+.empty_order image {
+  width: 329rpx;
+  height: 229rpx;
+  margin-top: 202rpx;
+}
+
+.empty_order .xc-ash {
+  margin-top: 10rpx;
+  font-weight: 600px;
+}
+
+.empty_order navigator {
+  margin-top: 65rpx;
+  border-radius: 40rpx;
+}
+
+.empty_order navigator view {
+  width: 247rpx;
+  height: 65rpx;
+  background-color: rgb(255, 72, 72);
+  border-radius: 40rpx;
+}
+
+.After_all {
+  height: 80rpx;
+}
+
+.After_all .Line {
+  border-top: 3rpx solid rgb(0, 0, 0);
+  width: 130rpx;
+}
+
+.After_all .end {
+  margin: 0rpx 15rpx;
+}
+.slot{
+  color: rgb(153, 153, 153);
+  height:300rpx;
+  width:100%;
+}
 \ No newline at end of file
@@ -5,7 +5,7 @@
   <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"/>
 	<view class="flex jc_sb pd20">
 		<navigator class="fs26 white" url="/packageA/pages/service_record/service_record">服务记录</navigator>
-		<navigator class="fs26 white" url="/pages/user/my_service/hist_service">历史预约</navigator>
+		<navigator class="fs26 white" url="/packageG/pages/user/my_service/hist_service">历史预约</navigator>
 	</view>
 </view>
@@ -183,12 +183,12 @@
           <!---has_rt部分退---->
          <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
-                          <navigator class="tips-btn" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
-                          <navigator class="tips-btn" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
+                          <navigator class="tips-btn" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
+                          <navigator class="tips-btn" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
          </block>
          <block wx:else>
                           <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}"  bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view>
-                          <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}"  url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
+                          <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}"  url="/packageG/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
                                      url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
         </block>
@@ -253,12 +253,12 @@
 	          <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
 	          <!---has_rt部分退---->
 	          <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1 && !(item.order_goods[0].prom_type==9)}}">
-	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==0&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
-	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
+	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==0&&item.pay_status==1) && !item.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
+	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
 	          </block>
 	          <block wx:else>
 	            <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2  && item.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}" data-index="{{index}}">删除订单</view>
-	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
+	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/packageG/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>
 	            <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
 	          </block>