移包1

WXD-SEASON\season
1 parent 1dea1780
Showing 30 changed files with 20 additions and 388 deletions
packageA/pages/my_service/tment_eval.js
packageA/pages/my_service/tment_order_list.wxml
packageA/pages/my_service2/tment_eval.js
packageA/pages/my_service2/tment_order_list.wxml
pages/payment/payment/payment.js → packageG/pages/payment/payment/payment.js
pages/payment/payment/payment.json → packageG/pages/payment/payment/payment.json
pages/payment/payment/payment.wxml → packageG/pages/payment/payment/payment.wxml
pages/payment/payment/payment.wxss → packageG/pages/payment/payment/payment.wxss
packageG/pages/user/my_service/appment_main.js
pages/cart/cart2_inte/cart2_inte.js → packageG/pages/user/my_service/tment_detail.js
pages/cart/cart2_inte/cart2_inte.json → packageG/pages/user/my_service/tment_detail.json
packageG/pages/user/my_service/tment_detail.wxml
packageG/pages/user/my_service/tment_detail.wxss
pages/user/my_service/tment_details.js → packageG/pages/user/my_service/tment_details.js
pages/user/my_service/tment_details.json → packageG/pages/user/my_service/tment_details.json
pages/user/my_service/tment_details.wxml → packageG/pages/user/my_service/tment_details.wxml
pages/user/my_service/tment_details.wxss → packageG/pages/user/my_service/tment_details.wxss
pages/user/my_service/tment_eval.js → packageG/pages/user/my_service/tment_eval.js
pages/user/my_service/tment_eval.json → packageG/pages/user/my_service/tment_eval.json
pages/user/my_service/tment_eval.wxml → packageG/pages/user/my_service/tment_eval.wxml
@@ -192,7 +192,7 @@ Page({
           var namber=th.data.number;
           setTimeout(function() {
             wx.redirectTo({
-              url: "/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1
+              url: "/packageG/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1
             });
           }, 2000);
         } else {
@@ -23,7 +23,7 @@
       </view>
       <!-- 项目属性 -->
-      <navigator class="items padding flex-vertical" url="/pages/user/my_service/tment_details?number={{item.Number}}">
+      <navigator class="items padding flex-vertical" url="/packageG/pages/user/my_service/tment_details?number={{item.Number}}">
         <view class="flex-center fs26">
           <view class="itemimage">
@@ -192,7 +192,7 @@ Page({
           var namber=th.data.number;
           setTimeout(function() {
             wx.redirectTo({
-              url: "/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1
+              url: "/packageG/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1
             });
           }, 2000);
         } else {
@@ -23,7 +23,7 @@
       </view>
       <!-- 项目属性 -->
-      <navigator class="items padding flex-vertical" url="/pages/user/my_service/tment_details?number={{item.Number}}">
+      <navigator class="items padding flex-vertical" url="/packageG/pages/user/my_service/tment_details?number={{item.Number}}">
         <view class="flex-center fs26">
           <view class="itemimage">
@@ -150,7 +150,7 @@ Page({
                 "keyword": res.data.data.Address
               }
             ],
-            "page": "/pages/user/my_service/tment_details?number=" + number,
+            "page": "/packageG/pages/user/my_service/tment_details?number=" + number,
             "storeId": a.stoid,
             "typeId": "1011",
             "userId": d.user_id
@@ -168,7 +168,7 @@ Page({
           })
           setTimeout(function() {
             wx.redirectTo({
-              url: "/pages/user/my_service/tment_details?number=" + number
+              url: "/packageG/pages/user/my_service/tment_details?number=" + number
             });
           }, 1000);
         } else {
-// pages/cart/cart2_inte/cart2_inte.js
+// packageG/packageG/pages/user/my_service/tment_detail.js
 Page({
   /**
+<!--packageG/packageG/pages/user/my_service/tment_detail.wxml-->
+<text>packageG/packageG/pages/user/my_service/tment_detail.wxml</text>
+/* packageG/packageG/pages/user/my_service/tment_detail.wxss */
 \ No newline at end of file
@@ -104,10 +104,10 @@
     <navigator wx:if="{{item.State==0}}" class="sub rb flex-center" url="/packageG/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}&VipId={{item.VipID}}">
       <view>更改时间</view>
     </navigator>
-    <navigator wx:if="{{item.State==1}}" class="sub rb flex-center" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}">
+    <navigator wx:if="{{item.State==1}}" class="sub rb flex-center" url="/packageG/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}">
       <view>发表评价</view>
     </navigator>
-    <navigator wx:if="{{item.State==4}}" class="sub rb flex-center" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}">
+    <navigator wx:if="{{item.State==4}}" class="sub rb flex-center" url="/packageG/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}">
       <view>查看评价</view>
     </navigator>
     <navigator wx:if="{{item.State==2 || item.State==3}}" class="sub rb flex-center" url="/packageG/pages/user/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}">
@@ -192,7 +192,7 @@ Page({
           var namber=th.data.number;
           setTimeout(function() {
             wx.redirectTo({
-              url: "/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1
+              url: "/packageG/pages/user/my_service/tment_eval?Number="+namber+"&evaluate="+1
             });
           }, 2000);
         } else {
@@ -23,7 +23,7 @@
       </view>
       <!-- 项目属性 -->
-      <navigator class="items padding flex-vertical" url="/pages/user/my_service/tment_details?number={{item.Number}}">
+      <navigator class="items padding flex-vertical" url="/packageG/pages/user/my_service/tment_details?number={{item.Number}}">
         <view class="flex-center fs26">
           <view class="itemimage">
@@ -68,12 +68,12 @@
           <view class="Unimportance flex-level" data-index="{{index}}" bindtap="cancel_tment">取消预约</view>
         </block>
         <block wx:else>
-          <navigator url="/pages/user/my_service/tment_details?number={{item.Number}}" class="Unimportance flex-level">查看详情</navigator>
+          <navigator url="/packageG/pages/user/my_service/tment_details?number={{item.Number}}" class="Unimportance flex-level">查看详情</navigator>
         </block>
         <navigator wx:if="{{item.State==0}}" class="important Unimportance flex-level" url="/packageG/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}">更改时间</navigator>
-        <navigator wx:if="{{item.State==1}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}" class="important Unimportance flex-level">发表评价</navigator>
+        <navigator wx:if="{{item.State==1}}" url="/packageG/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}" class="important Unimportance flex-level">发表评价</navigator>
         <navigator wx:if="{{item.State==2 || item.State==3}}" url="/packageG/pages/user/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}" class="important Unimportance flex-level">重新预约</navigator>
-        <navigator wx:if="{{item.State==4}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}" class="important Unimportance flex-level">评价详情</navigator>
+        <navigator wx:if="{{item.State==4}}" url="/packageG/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}" class="important Unimportance flex-level">评价详情</navigator>
       </view>
     </view>
     <view class="exactly flex-center fs26" wx:if="{{ismore && tm_order_list.length>=3}}">
-<!--pages/cart/cart2_inte/cart2_inte.wxml-->
-<text>pages/cart/cart2_inte/cart2_inte.wxml</text>
-/* pages/cart/cart2_inte/cart2_inte.wxss */
 \ No newline at end of file
@@ -95,7 +95,7 @@ Page({
         }else {
           wx.redirectTo({
-            url: "/pages/payment/payment/payment?order_sn=" + this.data.order.order_sn + "&order_amount=" + this.data.order.order_amount
+            url: "/packageG/pages/payment/payment/payment?order_sn=" + this.data.order.order_sn + "&order_amount=" + this.data.order.order_amount
           });
         }
     }
-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
@@ -129,7 +129,7 @@ Page({
           "继续使用",
           function() {
             my_confirm.open_cancel(0);
-            var deta_url = "/pages/user/my_service/tment_details?number=" + res.data.data.Number;
+            var deta_url = "/packageG/pages/user/my_service/tment_details?number=" + res.data.data.Number;
             wx.navigateTo({
               url: deta_url
             })
@@ -214,7 +214,7 @@ Page({
                "继续预约",
               function() {
                 my_confirm.open_cancel(0);
-                var deta_url = "/pages/user/my_service/tment_details?number=" + number;
+                var deta_url = "/packageG/pages/user/my_service/tment_details?number=" + number;
                 wx.navigateTo({
                   url: deta_url
                 })