旧预订本路径修改

pengye
1 parent e1a9a737
Showing 9 changed files with 126 additions and 16 deletions
miniprogram/pack-book/components/book/tabBar/tabBar.wxml
miniprogram/pack-book/pages/book/setting/index.js
miniprogram/pack-book/pages/book/setting/index.wxml
miniprogram/pack-cookbook/pages/cart_new.js
miniprogram/pages/customer/index.js
miniprogram/pages/manager-invitation/setting/index.js
miniprogram/pages/me/index.js
miniprogram/utils/api.url.js
miniprogram/utils/util.js
--- a/miniprogram/pack-book/components/book/tabBar/tabBar.wxml
View file @b3bb288
+++ b/miniprogram/pack-book/components/book/tabBar/tabBar.wxml
View file @b3bb288
 <!--components/book/tabBar/tabBar.wxml-->
 <view class="tabBar flex-cc" >
     <block wx:if="{{!tabsHidden}}">
-        <formids wx:if="{{hasEditorFlag}}" class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/b_addnew">
+        <!-- <formids wx:if="{{hasEditorFlag}}" class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/b_addnew">
             <view class="flex-vc {{pi=='b_addnew'?'checked':''}}" >
                 <view class="icon reserve"></view>
                 <view class="text">订座</view>
@@ -24,6 +24,12 @@
                 <view class="icon board"></view>
                 <view class="text">桌位</view>
             </view>
+        </formids> -->
+        <formids class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/reservation/reservation">
+            <view class="flex-vc {{pi=='reservation'?'checked':''}}">
+                <view class="icon order"></view>
+                <view class="text">预订本</view>
+            </view>
         </formids>
         <formids class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/setting/index">
             <view class="flex-vc {{pi=='index'?'checked':''}}">
--- a/miniprogram/pack-book/pages/book/setting/index.js
View file @b3bb288
+++ b/miniprogram/pack-book/pages/book/setting/index.js
View file @b3bb288
@@ -23,6 +23,12 @@ Page({
         seller: res.data.seller,
         user: res.data.seller_user
       })
+      let role_name = res.data.seller_user.role_name;
+      let sellerInfo = util.cache('sellerInfo')
+      util.cache('sellerInfo',{
+          ...sellerInfo,
+          role_name
+      })
     })
     PubSub.on(
       'flushNewCustomer',
--- a/miniprogram/pack-book/pages/book/setting/index.wxml
View file @b3bb288
+++ b/miniprogram/pack-book/pages/book/setting/index.wxml
View file @b3bb288
@@ -19,15 +19,15 @@
             </view>
         </view>
     </formids>
-    <formids url="/pack-book/pages/book/smsbatch/index">
+    <!-- <formids url="/pack-book/pages/book/smsbatch/index">
         <view class="row flex-lr" style="padding-top: 34rpx;">
             <view>短信营销</view>
             <view class="flex-rr">
                 <view class="more"></view>
             </view>
         </view>
-    </formids>
-    <formids url="/pack-book/pages/book/crm/index">
+    </formids> -->
+    <!-- <formids url="/pack-book/pages/book/crm/index">
         <view class="row flex-lr" style="padding-top: 34rpx;">
             <view>我的客户</view>
             <view class="flex-rr">
@@ -35,23 +35,23 @@
                 <view class="more"></view>
             </view>
         </view>
-    </formids>
-	<formids url="/pack-book/pages/book/remark/index">
+    </formids> -->
+	<!-- <formids url="/pack-book/pages/book/remark/index">
 		<view class="row flex-lr" style="padding-top: 34rpx;">
 			<view>常用备注</view>
 			<view class="flex-rr">
 				<view class="more"></view>
 			</view>
 		</view>
-	</formids>
-	<formids url="/pack-book/pages/book/roomtype/roomtype">
+	</formids> -->
+	<!-- <formids url="/pack-book/pages/book/roomtype/roomtype">
 		<view class="row flex-lr" style="padding-top: 34rpx;">
 			<view>在线预订包间置满</view>
 			<view class="flex-rr">
 				<view class="more"></view>
 			</view>
 		</view>
-	</formids>
+	</formids> -->
     <formids url="/pages/customer/index?islove=customer">
         <view class="row flex-lr" style="padding-top: 34rpx;">
             <view>切换到顾客模式</view>
@@ -60,14 +60,14 @@
             </view>
         </view>
     </formids>
-    <formids url="/pages/manager-invitation/index">
+    <!-- <formids url="/pages/manager-invitation/index">
         <view class="row flex-lr" style="padding-top: 34rpx;">
             <view>切换到客户经理模式</view>
             <view class="flex-rr">
                 <view class="more"></view>
             </view>
         </view>
-    </formids>
+    </formids> -->
 </view>
 <tabBar bindNewCustomer="NewCustomer" id="tabBar"></tabBar>
 <share id="share" seller_id="{{seller.id}}" hasSellerShare="{{true}}"></share>
--- a/miniprogram/pack-cookbook/pages/cart_new.js
View file @b3bb288
+++ b/miniprogram/pack-cookbook/pages/cart_new.js
View file @b3bb288
@@ -104,7 +104,7 @@ Page({
         let year1 = ddateStr.getFullYear();
         let month1 = ddateStr.getMonth() + 1;
         let day1 = ddateStr.getDate();
-        let day2 = year1 + '-' + (month1 < 10 ? '0' + month1 : month1) + '-' + day1;
+        let day2 = year1 + '-' + (month1 < 10 ? '0' + month1 : month1) + '-' + (day1 < 10 ? '0' + day1 : day1);
         App.Seller.getMealSectionByDay({
             sellerid: reserev.sid,
             day: day2,
--- a/miniprogram/pages/customer/index.js
View file @b3bb288
+++ b/miniprogram/pages/customer/index.js
View file @b3bb288
@@ -33,7 +33,7 @@ Page({
     }
     if (opt.act == 'tobook') {//消息跳入运营处理预订
       delete opt.act
-      return this.redirectTo({url: util.http_build_query(opt, '/pack-book/pages/book/b_index')});
+      return this.redirectTo({url: util.http_build_query(opt, '/pack-book/pages/reservation/reservation')});
     }
     mta.Page.init({
       "appID": "500667280",
@@ -80,9 +80,11 @@ Page({
     let opt = this.options
     let usi=this.usi
     if (usi.data.seller.flag) {//商户
+        util.cache('sellerid',usi.data.data.seller_id)
       //获得商户数据
       //this.enter_params=await this.SellerForOpenid(opt.openid);
       this.enter_params = usi.data.data;
+        util.cache('enter_params',this.enter_params)
     }
     if (usi.data.invitation.flag) {//已是客户经理
       this.isInvitation = true;
@@ -190,7 +192,7 @@ Page({
       if (this.enter_params && this.islove != 'customer' && this.islove != 'invitation') {
         //商户且未手动切换到顾客端或客户经理
         wx.reLaunch({
-          url: util.http_build_query(this.enter_params, '/pack-book/pages/book/b_index')
+          url: util.http_build_query(this.enter_params, '/pack-book/pages/reservation/reservation')
         })
         return;
       }
--- a/miniprogram/pages/manager-invitation/setting/index.js
View file @b3bb288
+++ b/miniprogram/pages/manager-invitation/setting/index.js
View file @b3bb288
@@ -66,7 +66,7 @@ Page({
         })
         util.cache('islove','book');
         wx.reLaunch({
-          url:util.http_build_query(res.data,'/pack-book/pages/book/b_index')
+          url:util.http_build_query(res.data,'/pack-book/pages/reservation/reservation')
         })
       }else{
         this.setData({
--- a/miniprogram/pages/me/index.js
View file @b3bb288
+++ b/miniprogram/pages/me/index.js
View file @b3bb288
@@ -94,8 +94,9 @@ Page({
           hasSellerBook:res.data,
         })
         util.cache('islove','book');
+        util.cache('enter_params',res.data);
         wx.reLaunch({
-          url:util.http_build_query(res.data,'/pack-book/pages/book/b_index')
+          url:util.http_build_query(res.data,'/pack-book/pages/reservation/reservation')
         })
       }else{
         this.setData({
--- a/miniprogram/utils/api.url.js
View file @b3bb288
+++ b/miniprogram/utils/api.url.js
View file @b3bb288
@@ -797,4 +797,88 @@ export default {
     alias:'App.Seller.getMealSectionByDay',
     cachetime: 0,
   },
+  
+  //获取商家桌位列表及对应预订数据
+  'App.Reserve.GetTableListOrReserve':{
+    alias:'Android.Reserve.GetTableListOrReserve',
+    openid:'openid',
+    cachetime: 0,
+  },
+
+  //隐藏订单日期配置列表
+  'App.Seller.GetSellerHideConf':{
+    openid:'openid',
+  },
+  
+  //预订详情所需数据集合
+  'App.Reserve.GetReserveDetailDataSet':{
+    alias:'Android.Reserve.GetReserveDetailDataSet',
+    cachetime: 0,
+  },
+  
+  //预订详情所需其他附属信息
+  'App.Reserve.GetReserveDetailRelationData':{
+    alias:'Android.Reserve.GetReserveDetailRelationData',
+    cachetime: 0,
+  },
+  
+  //店员列表
+  'App.Seller.GetAuthUserLists':{
+  },
+  
+  //编辑订单附加信息
+  'App.Reserve.UpReserveInfo':{
+  },
+  
+  //获取用餐类型
+  'App.Seller.GetReserveTypeField':{
+  },
+  
+  //设置订单服务经理
+  'App.Reserve.SetServeUidByRid':{
+  },
+  
+  //创建收定金
+  'App.Reserve.CreateReserveDeposit':{
+  },
+  
+  //删除定金
+  'App.Reserve.DelReserveDepositByid':{
+  },
+  
+  //创建核餐
+  'App.Reserve.CreateReserveRecheck':{
+  },
+
+  //获取账号服务类型
+  'App.Seller.GetSellerUserAccountType':{
+  },
+
+  //获取商家信息
+  'App.Seller.GetSellerById':{
+  },
+  
+  //设置预定状态
+  'App.Customer.SetReserveStatus':{
+    alias:'Android.Customer.SetReserveStatus',
+    cachetime: 0,
+  },
+
+  //取消订单设置定金走向
+  'App.Reserve.SetReserveDeposit':{
+  },
+
+  //发送预订短信
+  'App.SendSMS.WxSendSms':{
+  },
+
+  
+  //录入订座信息
+  'App.Reserve.SetReserveInfo':{
+    alias:'Android.Reserve.SetReserveInfo',
+    cachetime: 0,
+  },
+
+  
+  
 }
--- a/miniprogram/utils/util.js
View file @b3bb288
+++ b/miniprogram/utils/util.js
View file @b3bb288
@@ -269,6 +269,16 @@ function throttle(fn, gapTime) {
         }
     }
 }
+let roles = {
+    cancel: ['管理员', '前台'],//取消预订
+    edit: ['管理员', '前台'],//变更预订
+    sending: ['管理员', '前台'],//发送短信
+    arrival: ['管理员', '店长', '前台', '迎宾'],//到店
+    leave: ['管理员', '店长', '前台', '迎宾'],//离店
+    addBanquet: ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],//创建宴会
+    addBook: ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],//新建预订
+    depositNuclearMeal: ['管理员', '店长', '客户经理', '收银员', '服务员', '前台'],//核餐和订金
+}
 module.exports = {
   formatTime: formatTime,
   unixtoTime: unixtoTime,
@@ -281,6 +291,7 @@ module.exports = {
   uploadFile,
   deletelUpload,
   throttle,
+  roles,
   cgi: function (act) {
     return uri.HOST__LINE + act   //正式
     //return uri.HOST__TEST+act     //测试