预订

vking
1 parent bafa1fc0
Showing 16 changed files with 34 additions and 34 deletions
components/reserve/seller-box-transverse-cview/seller-box.js
components/reserve/seller-box-transverse/seller-box.js
components/reserve/seller-box/seller-box.js
components/reserve/seller-box/seller-box.wxml
components/seller-card/seller-card.js
pack-book/components/book/board/board.js
pack-book/components/book/list/list.js
pack-book/pages/book/b_addnew.js
pack-book/pages/book/b_addnew.wxss
pack-book/pages/book/b_detail.js
pack-book/pages/book/b_index.js
pack-book/pages/book/b_info.js
pages/me/setting.wxml
pages/reserve/detail.wxml
project.config.json
utils/api.url.js
--- a/components/reserve/seller-box-transverse-cview/seller-box.js
View file @34ce49e
+++ b/components/reserve/seller-box-transverse-cview/seller-box.js
View file @34ce49e
@@ -90,7 +90,7 @@ Component({
         }
       } else {
-        util.toast('请打电话预定', 'none');
+        util.toast('请打电话预订', 'none');
       }
     },
     lookLocation: function () {
--- a/components/reserve/seller-box-transverse/seller-box.js
View file @34ce49e
+++ b/components/reserve/seller-box-transverse/seller-box.js
View file @34ce49e
@@ -89,7 +89,7 @@ Component({
               }
           }else{
-              util.toast('请打电话预定','none');
+              util.toast('请打电话预订','none');
           }
       },
       lookLocation:function(){
--- a/components/reserve/seller-box/seller-box.js
View file @34ce49e
+++ b/components/reserve/seller-box/seller-box.js
View file @34ce49e
@@ -50,7 +50,7 @@ Component({
                   phoneNumber:this.data.seller.phone
               })
           }else{
-              util.toast('请打电话预定','none');
+              util.toast('请打电话预订','none');
           }
       },
       lookLocation:function(){
--- a/components/reserve/seller-box/seller-box.wxml
View file @34ce49e
+++ b/components/reserve/seller-box/seller-box.wxml
View file @34ce49e
@@ -34,7 +34,7 @@
                     style="color:{{opt.cancelColor}};">在线预订</button>
             <button class="button-none oncall"
                     bindtap="tapButton" data-type="oncall"
-                    style="color:{{opt.confirmColor}};">电话预定</button>
+                    style="color:{{opt.confirmColor}};">电话预订</button>
         </cover-view>
     </cover-view>
 </cover-view>
--- a/components/seller-card/seller-card.js
View file @34ce49e
+++ b/components/seller-card/seller-card.js
View file @34ce49e
@@ -82,7 +82,7 @@ Component({
             }
             if(this.data.hasShowStatus){
                 let ns=new Date()/1000
-              obj.showStatusStr='已预定'
+              obj.showStatusStr='已预订'
               if(this.data.detail.status==4){
                 obj.showStatusStr='已取消'
               }else if(this.data.detail.status>=2 || ns>this.data.detail.ddate){
--- a/pack-book/components/book/board/board.js
View file @34ce49e
+++ b/pack-book/components/book/board/board.js
View file @34ce49e
@@ -27,7 +27,7 @@ Component({
       type:String,
       value:'',
     },
-    ddate:{ //带入预定时间 time1-time2
+    ddate:{ //带入预订时间 time1-time2
       type:String,
       value:'',
     },
--- a/pack-book/components/book/list/list.js
View file @34ce49e
+++ b/pack-book/components/book/list/list.js
View file @34ce49e
 var util = require('../../../../utils/util.js')
 var uri=require('../../../../utils/uri.js');
-const reserveStatus=['待确认','已预定','就餐中','已完成','已取消'];
+const reserveStatus=['待确认','已预订','就餐中','已完成','已取消'];
 Component({
     properties:{
         item:{
--- a/pack-book/pages/book/b_addnew.js
View file @34ce49e
+++ b/pack-book/pages/book/b_addnew.js
View file @34ce49e
@@ -672,7 +672,7 @@ Page({
     })
   },
   /**
-   * 快速预定初始化
+   * 快速预订初始化
    * tid
    * tname
    * ddate
--- a/pack-book/pages/book/b_addnew.wxss
View file @34ce49e
+++ b/pack-book/pages/book/b_addnew.wxss
View file @34ce49e
@@ -169,7 +169,7 @@
 /**
-预定人信息
+预订人信息
  */
 .book-info{
   width:100%;
--- a/pack-book/pages/book/b_detail.js
View file @34ce49e
+++ b/pack-book/pages/book/b_detail.js
View file @34ce49e
@@ -12,7 +12,7 @@ Page({
   tpls:TP.tpls(),
   enter_params:{},
     onLoad:async function (opt) {
-        util.setBarTitle('预定详情');
+        util.setBarTitle('预订详情');
         console.log(opt)
         this.getDetail(opt.id);
         wx.showShareMenu({
--- a/pack-book/pages/book/b_index.js
View file @34ce49e
+++ b/pack-book/pages/book/b_index.js
View file @34ce49e
@@ -70,7 +70,7 @@ Page({
           timePickerArray: timePickerArray,
           speciallist:speciallist,
         })
-        //util.setBarTitle('预定本');
+        //util.setBarTitle('预订本');
         this.indexOpt=opt;
       this.ReservesCountDay(util.unixtoTime(d,'YYYY-MM-DD'));
       this.ReservesCountMonth(util.unixtoTime(d,'YYYY-MM'));
--- a/pack-book/pages/book/b_info.js
View file @34ce49e
+++ b/pack-book/pages/book/b_info.js
View file @34ce49e
@@ -205,7 +205,7 @@ Page({
     },
     formsubmit:async function(){
         wx.showLoading({
-            title:'正在预定',
+            title:'正在预订',
             mask:true
         });
         console.log(this.data.time)
--- a/pages/me/setting.wxml
View file @34ce49e
+++ b/pages/me/setting.wxml
View file @34ce49e
@@ -39,7 +39,7 @@
         <view class="item flex-lr">
             <view class="item-label">备注信息</view>
             <view class="Medium">
-                <input class="cusdem input" placeholder="请填写预定需求"
+                <input class="cusdem input" placeholder="请填写预订需求"
                        bindinput="changeInput"
                        data-key="cusdem"
                        value="{{user.cusdem}}"
--- a/pages/reserve/detail.wxml
View file @34ce49e
+++ b/pages/reserve/detail.wxml
View file @34ce49e
@@ -154,10 +154,10 @@
     </view>
     <view class="reserve">
         <formids class="flex-vc" bindclick="reserve" id="reserve-button">
-            <view class="text">电话预定</view>
+            <view class="text">电话预订</view>
         </formids>
     </view>
 </view>
-<as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone">拨打电话预定</as>
+<as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone">拨打电话预订</as>
 <getpos bindpos="onpos" id="getpos"></getpos>
 <discount id="discount" seller="{{seller}}" bindhide="discountHide" bindshow="discountShow"></discount>
--- a/project.config.json
View file @34ce49e
+++ b/project.config.json
View file @34ce49e
@@ -49,7 +49,7 @@
 			"list": [
 				{
 					"id": 0,
-					"name": "预定本-商家1",
+					"name": "预订本-商家1",
 					"pathName": "pack-book/pages/book/b_index",
 					"query": "seller_id=1&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
 					"scene": "1001"
@@ -161,28 +161,28 @@
 				},
 				{
 					"id": -1,
-					"name": "预定本-添加预定",
+					"name": "预订本-添加预订",
 					"pathName": "pack-book/pages/book/b_addnew",
 					"query": "seller_id=1&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
 					"scene": "1001"
 				},
 				{
 					"id": 15,
-					"name": "预定本详情",
+					"name": "预订本详情",
 					"pathName": "pack-book/pages/book/b_detail",
 					"query": "id=1762",
 					"scene": "1001"
 				},
 				{
 					"id": 16,
-					"name": "预定本-发短信",
+					"name": "预订本-发短信",
 					"pathName": "pack-book/pages/book/b_sms",
 					"query": "id=6541",
 					"scene": null
 				},
 				{
 					"id": 17,
-					"name": "预定本-编辑预定信息",
+					"name": "预订本-编辑预订信息",
 					"pathName": "pack-book/pages/book/b_addnew",
 					"query": "id=2745",
 					"scene": 1001
@@ -201,7 +201,7 @@
 				},
 				{
 					"id": -1,
-					"name": "预定本-选择桌子",
+					"name": "预订本-选择桌子",
 					"pathName": "pack-book/pages/book/b_desk",
 					"query": "rdate=1540339200-1540346400&tid=0&pnum=6&checked_tids=&rid=",
 					"scene": "1001"
@@ -214,28 +214,28 @@
 				},
 				{
 					"id": 21,
-					"name": "预定本-80商家",
+					"name": "预订本-80商家",
 					"pathName": "pack-book/pages/book/b_index",
 					"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=762",
 					"scene": "1001"
 				},
 				{
 					"id": -1,
-					"name": "预定本-设置",
+					"name": "预订本-设置",
 					"pathName": "pack-book/pages/book/setting/index",
 					"query": "",
 					"scene": "1001"
 				},
 				{
 					"id": -1,
-					"name": "预定本-设置-短信管理",
+					"name": "预订本-设置-短信管理",
 					"pathName": "pack-book/pages/book/setting/sms",
 					"query": "",
 					"scene": "1001"
 				},
 				{
 					"id": -1,
-					"name": "预定本-设置-短信充值",
+					"name": "预订本-设置-短信充值",
 					"pathName": "pack-book/pages/book/setting/sms_buy",
 					"query": "",
 					"scene": "1001"
@@ -339,7 +339,7 @@
 				},
 				{
 					"id": 38,
-					"name": "预定商家2",
+					"name": "预订商家2",
 					"pathName": "pack-book/pages/book/b_index",
 					"query": "seller_id=1&manage_id=1902&seller_openid=oGefL4uTmdsQn214CFZTVlHAfhnQ",
 					"scene": "1001"
--- a/utils/api.url.js
View file @34ce49e
+++ b/utils/api.url.js
View file @34ce49e
@@ -8,12 +8,12 @@ export default {
     alias: 'App.TestManagement.TestReal', //真实接口名称，默认为空
   },
-  //预定信息详情
+  //预订信息详情
   'App.Reserve.Detail': {
     cachetime: 30,
   },
-  //建立预定关系
+  //建立预订关系
   'App.Reserve.SetRelaOpenid': {
     cachetime: -1,
   },
@@ -51,7 +51,7 @@ export default {
   //手机号搜索
   'App.Reserve.GetReserveUser': null,
-  //预定列表
+  //预订列表
   'App.Reserve.GetReserveList': {
     silence: false,
   },
@@ -67,7 +67,7 @@ export default {
     cachetime: 60,
   },
-  // 修改当前预定状态 0：待确认，1：已定座，2：确认到店，3：用餐完成
+  // 修改当前预订状态 0：待确认，1：已定座，2：确认到店，3：用餐完成
   'App.Reserve.SetReserveStatus': {
     silence: false,
   },
@@ -119,9 +119,9 @@ export default {
     alias:'App.SendSMS.SmsBatchSend',
     silence: false,
   },
-  //统计某个商家某天预定总数
+  //统计某个商家某天预订总数
   'App.Reserve.ReservesCountDay':null,
-  //统计某个商家某月预定总数
+  //统计某个商家某月预订总数
   'App.Reserve.ReservesCountMonth':{
     cachetime: 300,
   },
@@ -215,7 +215,7 @@ export default {
   //邀请函详情
   'App.Invitation.Detail':null,
-  //客户经理、预定人、受邀人信息建立
+  //客户经理、预订人、受邀人信息建立
   'App.Invitation.SetInvitationRel':{
     //cachetime: -1,
     openid:'inviting',
@@ -231,7 +231,7 @@ export default {
     openid:'openid',
   },
-  //根据客户经理openid 获取当前用户预定列表
+  //根据客户经理openid 获取当前用户预订列表
   'App.Invitation.InvitationList':{
     openid:'openid',
   },