xt / xcx-book · Commits

Go to a project

Commit 44b27b049cc82999dc025b9219fd4c05d450a324

Authored by vking
1 parent 1b3d73a9
build: skipped

GetSellerPreferentialDocking

Inline Side-by-side
Showing 10 changed files with 216 additions and 27 deletions
@@ -288,4 +288,21 @@ image{ @@ -288,4 +288,21 @@ image{
288 background-image: url("http://nosqn.colorcun.com/timg.gif"); 288 background-image: url("http://nosqn.colorcun.com/timg.gif");
289 width:96rpx; 289 width:96rpx;
290 height:96rpx; 290 height:96rpx;
291 -}  
  291 +}
  292 +
  293 +.close-x{
  294 + width:28rpx;
  295 + height:29rpx;
  296 + background-size: 100% 100%;
  297 + background-image: url("http://nosqn.colorcun.com/sellerbaobao/close.png");
  298 + position: relative;
  299 +}
  300 +.close-x:after{
  301 + width: 120rpx;
  302 + height: 120rpx;
  303 + position: absolute;
  304 + top:-50rpx;
  305 + left:-50rpx;
  306 + content: "";
  307 + display: block;
  308 +}
  1 +// pack-book/components/book/PreferentialDocking/index.js
  2 +import util from '../../../../utils/util'
  3 +import App from '../../../../utils/api';
  4 +Component({
  5 + /**
  6 + * 组件的属性列表
  7 + */
  8 + properties: {
  9 + sid:String,
  10 + },
  11 + /**
  12 + * 组件的初始数据
  13 + */
  14 + data: {
  15 + hide:true,
  16 + detail:null,
  17 + },
  18 + attached(){
  19 + this.getPreferentialDocking()
  20 + },
  21 + /**
  22 + * 组件的方法列表
  23 + */
  24 + methods: {
  25 + getPreferentialDocking(){
  26 + App.Customer.GetSellerPreferentialDocking({sid:this.data.sid}).then(res=>{
  27 + if(res.data){
  28 + this.setData({
  29 + detail:res.data,
  30 + })
  31 + }
  32 + })
  33 + },
  34 + show(){
  35 + if(!this.data.detail) return util.toast('没有优惠对接信息','none')
  36 + this.setData({
  37 + hide:false,
  38 + })
  39 + },
  40 + hide(){
  41 + this.setData({
  42 + hide:true,
  43 + })
  44 + },
  45 + call(e){
  46 + wx.makePhoneCall({
  47 + phoneNumber: util.attr(e,'phone')
  48 + })
  49 + },
  50 + }
  51 +})
  1 +{
  2 + "component": true,
  3 + "usingComponents": {}
  4 +}
  1 +<!--pack-book/components/book/PreferentialDocking/index.wxml-->
  2 +<view class="mask" wx:if="{{!hide}}" bindtap="hide">
  3 + <view class="dialog" catchtap="catchtap">
  4 + <view class="header flex-lr" bindtap="hide">
  5 + <view class="close-x" style="background: none;"></view>
  6 + <view class="title">优惠对接人相关信息</view>
  7 + <view class="close-x"></view>
  8 + </view>
  9 + <view class="content">
  10 + <view class="block">
  11 + <view class="title-tip">已对接优惠</view>
  12 + <view class="infos">
  13 + <text>{{detail.preferential}}</text>
  14 + </view>
  15 + </view>
  16 + <view class="block">
  17 + <view class="title-tip">公司洽谈人</view>
  18 + <view class="infos" bindtap="call" data-phone="{{detail.negotiators_phone}}">
  19 + <view class="dot">洽谈人姓名：{{detail.negotiators}}</view>
  20 + <view class="dot">洽谈时间：{{detail.negotiators_time}}</view>
  21 + <view class="dot flex-lr">
  22 + 洽谈人电话：{{detail.negotiators_phone}}
  23 + <view class="phone"></view>
  24 + </view>
  25 + </view>
  26 + </view>
  27 + <view class="block">
  28 + <view class="title-tip">餐厅优惠对接人</view>
  29 + <view class="infos" bindtap="call" data-phone="{{detail.meet_phone}}">
  30 + <view class="dot">对接人姓名：{{detail.meet_people}}</view>
  31 + <view class="dot flex-lr">
  32 + 对接人电话：{{detail.meet_phone}}
  33 + <view class="phone"></view>
  34 + </view>
  35 + </view>
  36 + </view>
  37 + </view>
  38 + </view>
  39 +</view>
  40 +<view bindtap="show">
  41 + <slot></slot>
  42 +</view>
  43 +
  1 +/* pack-book/components/book/PreferentialDocking/index.wxss */
  2 +@import "../../../../app.wxss";
  3 +.mask{
  4 + z-index: 99999;
  5 +}
  6 +.dialog{
  7 + width: 100%;
  8 + background: #FFFFFF;
  9 + border-radius: 40rpx 40rpx 0rpx 0rpx;
  10 + position: fixed;
  11 + bottom: 0;
  12 + box-sizing: border-box;
  13 + padding: 40rpx 40rpx 60rpx;
  14 + max-height: 1000rpx;
  15 + overflow-y: auto;
  16 +}
  17 +.header{
  18 + margin-bottom: 30rpx;
  19 +}
  20 +.title{
  21 + height: 44rpx;
  22 + font-size: 32rpx;
  23 + font-family: PingFangSC-Medium, PingFang SC;
  24 + font-weight: 500;
  25 + color: #353535;
  26 + line-height: 44rpx;
  27 +}
  28 +.block{
  29 + text-align: left;
  30 + padding: 30rpx 0;
  31 + border-bottom: 2rpx solid #F5F5F5;
  32 +}
  33 +.block:last-child{
  34 + border-bottom-width:0 ;
  35 +}
  36 +.title-tip{
  37 + height: 42rpx;
  38 + font-size: 30rpx;
  39 + font-family: PingFangSC-Regular, PingFang SC;
  40 + font-weight: 400;
  41 + color: #999999;
  42 + line-height: 42rpx;
  43 + margin-bottom: 20rpx;
  44 +}
  45 +.infos{
  46 + font-size: 28rpx;
  47 + font-family: PingFangSC-Medium, PingFang SC;
  48 + font-weight: 500;
  49 + color: #353535;
  50 + line-height: 50rpx;
  51 + box-sizing: border-box;
  52 + padding-left: 40rpx;
  53 +}
  54 +.infos .dot{
  55 + line-height: 50rpx;
  56 +}
  57 +.phone{
  58 + background-image: url("http://nosqn.colorcun.com/phone-h.png");
  59 + width: 41rpx;
  60 + height: 38rpx;
  61 + background-size: 100% 100%;
  62 +}
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 "nav":"/components/nav/nav", 10 "nav":"/components/nav/nav",
11 "a2l":"/components/tips/add-to-lite", 11 "a2l":"/components/tips/add-to-lite",
12 "formids":"/components/formids/formids", 12 "formids":"/components/formids/formids",
  13 + "PreferentialDocking":"../../components/book/PreferentialDocking/index",
13 "showModal":"/components/showModal/showModal" 14 "showModal":"/components/showModal/showModal"
14 } 15 }
15 } 16 }
@@ -209,47 +209,50 @@ @@ -209,47 +209,50 @@
209 <!--操作在线预订--> 209 <!--操作在线预订-->
210 <view class="notice-opt" wx:if="{{bookInfo.status==0}}"> 210 <view class="notice-opt" wx:if="{{bookInfo.status==0}}">
211 <block wx:if="{{isAdmin}}"> 211 <block wx:if="{{isAdmin}}">
212 - <view class="notice-button-border font34r flex-lr">  
213 - <view> 212 + <view class="notice-button-border font34r flex-lr bg-blue">
  213 + <view class="item">
214 <formids bindclick="easyCall" data-key="jdmans">联系接单人</formids> 214 <formids bindclick="easyCall" data-key="jdmans">联系接单人</formids>
215 </view> 215 </view>
216 - <view> 216 + <view class="item">
217 <formids bindclick="easyCall" data-key="seller">联系商家</formids> 217 <formids bindclick="easyCall" data-key="seller">联系商家</formids>
218 </view> 218 </view>
219 - <view> 219 + <view class="item">
220 <formids bindclick="easyCall" data-key="customer">联系顾客</formids> 220 <formids bindclick="easyCall" data-key="customer">联系顾客</formids>
221 </view> 221 </view>
222 </view> 222 </view>
223 <view class="notice-button-border font34r flex-lr"> 223 <view class="notice-button-border font34r flex-lr">
224 - <view> 224 + <view class="item">
  225 + <PreferentialDocking sid="{{bookInfo.sid}}">优惠对接人</PreferentialDocking>
  226 + </view>
  227 + <view class="item">
225 <formids bindclick="refuseOrder">拒绝订单</formids> 228 <formids bindclick="refuseOrder">拒绝订单</formids>
226 </view> 229 </view>
227 - <view> 230 + <view class="item">
228 <formids bindclick="arrangeOrder">安排包间</formids> 231 <formids bindclick="arrangeOrder">安排包间</formids>
229 </view> 232 </view>
230 </view> 233 </view>
231 </block> 234 </block>
232 <block wx:elif="{{hasCallPhone}}"> 235 <block wx:elif="{{hasCallPhone}}">
233 - <view class="notice-button-border font34r flex-lr">  
234 - <view> 236 + <view class="notice-button-border font34r flex-lr bg-blue">
  237 + <view class="item">
235 <formids bindclick="arrangeOrder">安排包间</formids> 238 <formids bindclick="arrangeOrder">安排包间</formids>
236 </view> 239 </view>
237 </view> 240 </view>
238 <view class="notice-button-border font34r flex-lr"> 241 <view class="notice-button-border font34r flex-lr">
239 - <view> 242 + <view class="item">
240 <formids bindclick="refuseOrder">拒绝订单</formids> 243 <formids bindclick="refuseOrder">拒绝订单</formids>
241 </view> 244 </view>
242 - <view> 245 + <view class="item">
243 <formids bindclick="easyCall" data-key="customer">联系顾客</formids> 246 <formids bindclick="easyCall" data-key="customer">联系顾客</formids>
244 </view> 247 </view>
245 </view> 248 </view>
246 </block> 249 </block>
247 <block wx:else=""> 250 <block wx:else="">
248 - <view class="notice-button-border font34r flex-lr">  
249 - <view> 251 + <view class="notice-button-border font34r flex-lr bg-blue">
  252 + <view class="item">
250 <formids bindclick="refuseOrder">拒绝订单</formids> 253 <formids bindclick="refuseOrder">拒绝订单</formids>
251 </view> 254 </view>
252 - <view> 255 + <view class="item">
253 <formids bindclick="arrangeOrder">安排包间</formids> 256 <formids bindclick="arrangeOrder">安排包间</formids>
254 </view> 257 </view>
255 </view> 258 </view>
@@ -112,14 +112,14 @@ view{ @@ -112,14 +112,14 @@ view{
112 margin:20rpx auto 0; 112 margin:20rpx auto 0;
113 color: #199095; 113 color: #199095;
114 } 114 }
115 -.notice-button-border view{ 115 +.notice-button-border .item{
116 width: 100%; 116 width: 100%;
117 border-right: 2rpx solid #199095; 117 border-right: 2rpx solid #199095;
118 text-align: center; 118 text-align: center;
119 height: 50rpx; 119 height: 50rpx;
120 line-height: 50rpx; 120 line-height: 50rpx;
121 } 121 }
122 -.notice-button-border view:last-child{ 122 +.notice-button-border .item:last-child{
123 border-right-width: 0; 123 border-right-width: 0;
124 } 124 }
125 .reserve-status-tip{ 125 .reserve-status-tip{
@@ -128,7 +128,6 @@ view{ @@ -128,7 +128,6 @@ view{
128 right:240rpx; 128 right:240rpx;
129 width: 82rpx; 129 width: 82rpx;
130 height: 52rpx; 130 height: 52rpx;
131 - z-index: 2;  
132 } 131 }
133 .reserve-status-tip .text{ 132 .reserve-status-tip .text{
134 font-weight: bold; 133 font-weight: bold;
@@ -154,4 +153,11 @@ view{ @@ -154,4 +153,11 @@ view{
154 top:-30rpx; 153 top:-30rpx;
155 left:0rpx; 154 left:0rpx;
156 z-index: 2; 155 z-index: 2;
157 -}  
  156 +}
  157 +.bg-blue{
  158 + background-color: #199095;
  159 + color: #FEFEFE;
  160 +}
  161 +.bg-blue .item{
  162 + border-right-color: #FEFEFE;
  163 +}
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 "checkSiteMap": true, 18 "checkSiteMap": true,
19 "uploadWithSourceMap": true, 19 "uploadWithSourceMap": true,
20 "useMultiFrameRuntime": false, 20 "useMultiFrameRuntime": false,
  21 + "useApiHook": false,
21 "babelSetting": { 22 "babelSetting": {
22 "ignore": [], 23 "ignore": [],
23 "disablePlugins": [], 24 "disablePlugins": [],
@@ -72,23 +73,23 @@ @@ -72,23 +73,23 @@
72 } 73 }
73 }, 74 },
74 "condition": { 75 "condition": {
75 - "search": { 76 + "plugin": {
76 "current": -1, 77 "current": -1,
77 "list": [] 78 "list": []
78 }, 79 },
79 - "conversation": {  
80 - "current": -1, 80 + "game": {
  81 + "currentL": -1,
81 "list": [] 82 "list": []
82 }, 83 },
83 - "plugin": { 84 + "gamePlugin": {
84 "current": -1, 85 "current": -1,
85 "list": [] 86 "list": []
86 }, 87 },
87 - "game": {  
88 - "currentL": -1, 88 + "search": {
  89 + "current": -1,
89 "list": [] 90 "list": []
90 }, 91 },
91 - "gamePlugin": { 92 + "conversation": {
92 "current": -1, 93 "current": -1,
93 "list": [] 94 "list": []
94 }, 95 },
@@ -536,7 +537,7 @@ @@ -536,7 +537,7 @@
536 "id": 59, 537 "id": 59,
537 "name": "pack-book/pages/book/b_detail", 538 "name": "pack-book/pages/book/b_detail",
538 "pathName": "pack-book/pages/book/b_detail", 539 "pathName": "pack-book/pages/book/b_detail",
539 - "query": "id=105664", 540 + "query": "id=118236",
540 "scene": null 541 "scene": null
541 }, 542 },
542 { 543 {
@@ -494,7 +494,8 @@ export default { @@ -494,7 +494,8 @@ export default {
494 openid:'openid', 494 openid:'openid',
495 silence: false, 495 silence: false,
496 }, 496 },
497 - 497 + //获取商家优惠对接人信息
  498 + 'App.Customer.GetSellerPreferentialDocking':null,
498 //接单人，获得商家设置的接单人列表 499 //接单人，获得商家设置的接单人列表
499 'App.Customer.GetReceptionists':null, 500 'App.Customer.GetReceptionists':null,
500 } 501 }