xt / xcx-book · Commits

Go to a project

Commit 0ef02bc432e571daa1556b1185b968821491822a

Authored by wangfan
2 parents 3c2b887f 00cfdade
build: skipped

Merge remote-tracking branch 'remotes/origin/master' into online-reserve 

# Conflicts:
#	project.config.json
#	utils/api.url.js
Inline Side-by-side
Showing 10 changed files with 94 additions and 38 deletions
... ... @@ -3,7 +3,7 @@
.nav-main{
position:fixed;
width: 100%;
z-index: 1;
z-index: 10;
}
.nav{
font-size: 30rpx;
... ...
... ... @@ -150,12 +150,10 @@
bindconfirm="selectedValue"
data-key="phone"
value="{{form.phone}}" style="color:{{reminder ? '#E14553' : '#353535'}};width:{{reminder ? 400 : 680}}rpx;" cursor-spacing="260"/>
<block wx:if="{{reminder}}">
<view class="flex-rr" style="height:100rpx;">
<view style="color:#E14553;" class="font28r">{{reminder}}</view>
<image src="http://qn.colorcun.com/custom/lite-yd/image/name-have.png" class="phone-reminder"></image>
</view>
</block>
<view bindtap="selectedValue" data-key="time" data-value="{{form.time}}" data-display="block" style="color:#199095">
<view style="font-size: 34rpx;height: 100rpx;line-height: 100rpx;" wx:if="{{hasUseDefDtime && form.time>0}}">{{defDtime[form.time]}}</view>
<view style="font-size: 34rpx;height: 100rpx;line-height: 100rpx;" wx:else="">{{timePickerArray[form.time][timePickerIndex[form.time]]}}</view>
</view>
<block wx:if="{{searchlist}}">
<searchList searchlist="{{searchlist}}" bind:selectphone="selectphone"></searchList>
</block>
... ... @@ -177,18 +175,17 @@
</block>
</view>
</view>
<view class="book-info-single" bindtap="selectedValue" data-key="time" data-value="{{form.time}}" data-display="block">
<view style="font-size: 34rpx;height: 100rpx;line-height: 100rpx;" wx:if="{{hasUseDefDtime && form.time>0}}">{{defDtime[form.time]}}</view>
<view style="font-size: 34rpx;height: 100rpx;line-height: 100rpx;" wx:else="">{{timePickerArray[form.time][timePickerIndex[form.time]]}}</view>
</view>
<view class="book-info-single">
<input placeholder="客户的要求（25字以内，选填）" placeholder-class="gray-font font34r" class="black-font font34r" maxlength="25" value="{{form.cusdem}}"
<view class="book-info-single flex-lr">
<input placeholder="客户要求（25字以内，选填）" placeholder-class="gray-font font34r" class="black-font font34r" maxlength="25" value="{{form.cusdem}}"
bindinput="selectedValue"
bindconfirm="selectedValue"
bindfocus="inputFocus"
bindblur="inputFocus"
data-key="cusdem"/>
<view class="CustomRemarkMore flex-rr">
<view bindtap="CustomRemarkMore">快速备注</view>
</view>
</view>
<view wx:if="{{CustomRemark.length>0}}" class="book-info-single last" style="padding-top: 14rpx; height: 60rpx;">
<view class="flex-lr CustomRemark">
... ... @@ -200,13 +197,10 @@
data-value="{{item.often_use}}">{{item.often_use}}</view>
</view>
</view>
<view class="CustomRemarkMore flex-rr">
<view class="CustomRemarkItem" style="margin-bottom: 0" bindtap="CustomRemarkMore">更多</view>
</view>
</view>
</view>
</view>
<view class="page-full submit" style="background-color: #fefefe;">
<view class="page-full submit">
<view class="confirm-button white-font flex-vc font34r {{buttonhide==false ? 'confirm-button-active' : ''}}" bindtap="{{buttonhide==false ? 'formsubmit' : ''}}">确定</view>
</view>
</view>
... ...
... ... @@ -174,7 +174,7 @@
.book-info{
width:100%;
padding-top:20rpx;
margin:0 auto;
margin:0 auto 300rpx;
}
.book-info-single{
width:100%;
... ... @@ -216,8 +216,13 @@
提交按钮
*/
.submit{
padding-top: 18rpx;
padding-bottom: 174rpx;
position: fixed;
bottom: 120rpx;
left: 0;
right: 0;
height: 150rpx;
background-color: #fefefe;
z-index: 10;
}
.confirm-button{
width:680rpx;
... ... @@ -289,6 +294,9 @@
}
.CustomRemarkMore{
width: 200rpx;
min-width: 200rpx;
color:#199095;
font-size: 30rpx;
}
.CustomRemarkItem{
height: 48rpx;
... ...
... ... @@ -13,6 +13,7 @@ Page({
data: {
list:[],
hasMore:true,
hasSalesman:false,
},
/**
... ... @@ -21,6 +22,11 @@ Page({
enter_params: {},
onLoad: function (options) {
this.enter_params = util.cache('enter_params');
App.Reserve.SellerInfo(this.enter_params).then(res=>{
this.setData({
hasSalesman:res.data.hasSalesman==1
})
})
this.seller_id=options.seller_id||this.enter_params.seller_id;
this.getMembers();
},
... ... @@ -80,4 +86,15 @@ Page({
this.setData(obj)
})
},
sendSalesmanMsg(e){
let openid=util.attr(e,'openid')
App.Reserve.OperationalMessagePush({
openid:openid
}).then(res=>{
if(res.ret!=200){
return util.toast(res.msg,'none')
}
util.toast('已发送')
})
},
})
\ No newline at end of file
... ...
<!--pages/book/setting/index.wxml-->
<nav id="nav" backgroundColor="#199095" color="#fefefe">我的客户</nav>
<view class="page">
<view class="pages">
<block wx:if="{{list.length>0}}">
<view class="row flex-lr" wx:for="{{list}}" wx:key="list.key" >
<view class="flex-ll">
... ... @@ -9,8 +9,9 @@
</view>
<view class="nickname">{{item.nickname||''}}</view>
</view>
<view class="flex-rr">
<!--view class="more"></view-->
<view class="flex-rr optmsg" wx:if="{{hasSalesman}}" bindtap="sendSalesmanMsg" data-openid="{{item.openid}}">
<view>发送消息</view>
<view class="more"></view>
</view>
</view>
</block>
... ...
... ... @@ -3,10 +3,11 @@
http://qn.colorcun.com/custom/lite-yd/image/icon-zk.png
http://qn.colorcun.com/custom/lite-yd/image/icon-cz.png
*/
.page{
.pages{
width: 90%;
margin: 0 auto;
margin: 0 auto 50rpx;
color: #353535;
overflow-y: auto;
}
.row{
font-size: 34rpx;
... ... @@ -48,4 +49,8 @@ http://qn.colorcun.com/custom/lite-yd/image/icon-cz.png
.nickname{
margin-left: 40rpx;
font-size: 34rpx;
}
.optmsg{
font-size: 30rpx;
color:#199095;
}
\ No newline at end of file
... ...
... ... @@ -17,15 +17,32 @@ Page({
defineremark:util.trim(e.detail.value)
})
},
//选择常用备注
taplabel:function(e){
var _target=e.currentTarget.dataset;
var mylabel=this.data.mylabel;
console.log(_target.id,_target.type);
this.setlabel(_target.id,_target.type);
var oftenlabel=0,alllabel=this.data.alllabel;
alllabel.forEach(function(v,i){
if(v.often_use!=''){
oftenlabel++;
}
})
if(_target.type=='often'){
this.setlabel(_target.id,_target.type);
}else{
if(oftenlabel<10){
this.setlabel(_target.id,_target.type);
}else{
wx.showToast({
title:'最多可添加10个',
icon:'none',
duration:2000
})
}
}
},
getlabellist:function(){
App.User.GetCustomRemark({
uid:util.cache('enter_params')['manager_id']
uid:util.cache('enter_params')['manage_id']
}).then(res=>{
console.log(res)
this.setData({
... ... @@ -38,7 +55,7 @@ Page({
},
setlabel:function(id,flag){
App.User.GetCustomRemark({
uid:util.cache('enter_params')['manager_id'],
uid:util.cache('enter_params')['manage_id'],
kid:id,
flag:flag,
}).then(res=>{
... ... @@ -60,7 +77,7 @@ Page({
//添加自定义标签
addlabel:function(custom){
App.User.AddCustomRemark({
uid:util.cache('enter_params')['manager_id'],
uid:util.cache('enter_params')['manage_id'],
custom:custom,
}).then(res=>{
console.log(res)
... ... @@ -69,6 +86,15 @@ Page({
defineremark:null,
})
this.getlabellist();
}else{
this.setData({
defineremark:null,
})
wx.showToast({
title:'最多可添加20个备注',
icon:'none',
duration:2000
})
}
})
},
... ...
<nav id="nav">常用备注</nav>
<view class="cut"></view>
<view class="label">
<view class="label-title black-font font30r smooth" style="padding-bottom:40rpx;">我的常用备注</view>
<view class="label-title black-font font30r smooth" style="padding-bottom:40rpx;">我的常用备注<text class="font24r smooth gray-deep-font">（最多添加10个）</text></view>
<view class="label-list flex-rs me-label-list">
<block wx:for="{{alllabel}}">
<block wx:if="{{item.often_use!=''}}">
... ... @@ -13,7 +13,7 @@
</block>
<view style="min-width:176rpx;"><input class="black-font flex-cc font28r smooth label-input flex-cc" placeholder="添加备注" maxlength="10" style="width:{{defineremark && defineremark.length>4 ? (defineremark.length-4)*28+160 : 160}}rpx;" value="{{defineremark}}" bindinput="inputremark" focus="{{focus}}" cursor-spacing="160" bindblur="addinputlabel" placeholder-style="color:#999;font-size:28rpx;text-align:center;"/></view>
</view>
<view class="label-title black-font font30r smooth">所有备注</view>
<view class="label-title black-font font30r smooth">所有备注<text class="font24r smooth gray-deep-font">（最多添加20个）</text></view>
<view class="label-list flex-rs">
<block wx:for="{{alllabel}}">
<view class="label-single flex-cc font28r smooth {{item.often_use!='' ? 'bg_green white-font' : 'all-label green-font'}}" data-id="{{item.id}}" data-type="{{item.often_use!='' ? 'often' : 'custom'}}" bindtap="taplabel" style="margin:0 16rpx 20rpx 0;">{{item.custom}}</view>
... ...
... ... @@ -31,7 +31,7 @@
"list": []
},
"miniprogram": {
"current": 32,
"current": 21,
"list": [
{
"id": 0,
... ... @@ -201,8 +201,8 @@
"id": 21,
"name": "预定本-80商家",
"pathName": "pages/book/b_index",
"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=762",
"scene": "1001"
"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=763",
"scene": 1001
},
{
"id": -1,
... ...
... ... @@ -150,13 +150,18 @@ export default {
/**crm**/
'App.Reserve.Members':null,
//常用备注
'App.User.GetCustomRemark':null,
//添加备注
'App.User.AddCustomRemark':null,
//运营发送消息demo
'App.Reserve.OperationalMessagePush':{
silence: false,
},
//顾客端配置信息、菜系
'App.Reserve.GetCustomerConfig':{
cachetime: 1800,
... ...