xt / xcx-book · Commits

Go to a project

Commit 6508e3a7650155b37dec162af55dc30ad375bfff

Authored by yiren
1 parent 5a205caf
build: skipped

客户经理字段修改及样式修改

Inline Side-by-side
Showing 3 changed files with 59 additions and 28 deletions
@@ -14,6 +14,7 @@ Page({ @@ -14,6 +14,7 @@ Page({
14 }, 14 },
15 tableNum:0, 15 tableNum:0,
16 detail:{}, 16 detail:{},
  17 + staffinfo:{},
17 between: false, 18 between: false,
18 is_display:true, 19 is_display:true,
19 id: null, 20 id: null,
@@ -77,21 +78,25 @@ Page({ @@ -77,21 +78,25 @@ Page({
77 onShow: function () { 78 onShow: function () {
78 }, 79 },
79 cli() { 80 cli() {
80 - wx.setClipboardData({  
81 - data: this.data.reserve.manager_wechat,  
82 - success(res) {  
83 - wx.getClipboardData({  
84 - success(res) {  
85 - console.log(res.data) // data  
86 - }  
87 - })  
88 - }  
89 - }) 81 + if(this.data.staffinfo.wechat){
  82 + wx.setClipboardData({
  83 + data: this.data.staffinfo.wechat,
  84 + success(res) {
  85 + wx.getClipboardData({
  86 + success(res) {
  87 + console.log(res.data) // data
  88 + }
  89 + })
  90 + }
  91 + })
  92 + }else{
  93 + console.log('无微信号')
  94 + }
90 }, 95 },
91 call() { 96 call() {
92 wx.reportMonitor('1012', 1) 97 wx.reportMonitor('1012', 1)
93 wx.makePhoneCall({ 98 wx.makePhoneCall({
94 - phoneNumber: this.data.reserve.manager_phone 99 + phoneNumber: this.data.staffinfo.phone
95 }) 100 })
96 }, 101 },
97 looklocation: function () { 102 looklocation: function () {
@@ -163,11 +168,26 @@ Page({ @@ -163,11 +168,26 @@ Page({
163 console.log('reserevreserevreserevreserevreserev',reserev); 168 console.log('reserevreserevreserevreserevreserev',reserev);
164 console.log('sellersellersellerseller',this.data.seller); 169 console.log('sellersellersellerseller',this.data.seller);
165 console.log('detaildetaildetaildetail',this.data.detail); 170 console.log('detaildetaildetaildetail',this.data.detail);
166 - this.getSellerTemplateConfFun(reserev.sid); 171 + setTimeout(() => {
  172 + this.getSellerTemplateConfFun(reserev.sid);
  173 + this.getstaffinfo(res.data.uid)
  174 + }, 0);
167 }).catch(res=>{ 175 }).catch(res=>{
168 console.log(res,'详情请求失败'); 176 console.log(res,'详情请求失败');
169 }) 177 })
170 }, 178 },
  179 + getstaffinfo(uid){
  180 + console.log('Baseinfo__uid',uid);
  181 + console.log('sellerid',this.data.detail.seller.id);
  182 + App.Activity.GetCustomerActivityBaseinfo({sellerid:this.data.detail.seller.id,uid}).then((json)=>{
  183 + if(json.ret==200){
  184 + console.log('staffinfostaffinfostaffinfo',json.data)
  185 + this.setData({
  186 + staffinfo:json.data
  187 + })
  188 + }
  189 + })
  190 + },
171 cookbook() { 191 cookbook() {
172 if (this.data.detail.order && this.data.detail.order.cookbooklist.length > 0) { 192 if (this.data.detail.order && this.data.detail.order.cookbooklist.length > 0) {
173 wx.navigateTo({ 193 wx.navigateTo({
@@ -47,16 +47,16 @@ @@ -47,16 +47,16 @@
47 <view class="welcome"> 47 <view class="welcome">
48 欢迎垂询，恭候光临！ 48 欢迎垂询，恭候光临！
49 </view> 49 </view>
50 - <block wx:if="{{detail.sid!='677' && reserve && reserve.swich_manager=='1' && reserve.manager_phone && reserve.manager_wechat}}"> 50 + <block wx:if="{{detail.sid!='677' && staffinfo && reserve.swich_manager=='1'}}">
51 <view class="handleInfo"> 51 <view class="handleInfo">
52 - <image wx:if="{{reserve && reserve.manager_image}}" src="{{reserve.manager_image}}" class="headerimg" mode="aspectFill"></image>  
53 - <view class="handle">  
54 - <text>专属服务：{{reserve.manager_phone}}</text>  
55 - <text>服务电话：{{reserve.manager_wechat}}</text> 52 + <image wx:if="{{staffinfo && staffinfo.photo}}" src="{{staffinfo.photo}}" class="headerimg" mode="aspectFill"></image>
  53 + <view class="handle handlePhone">
  54 + <view>专属服务：{{staffinfo.name}}</view>
  55 + <view>服务电话：{{staffinfo.phone}}</view>
56 </view> 56 </view>
57 <view class="handle"> 57 <view class="handle">
58 - <view class="font22r brownFont" bindtap="call">拨打电话</view>  
59 - <view class="font22r brownFont" bindtap="cli">复制微信号</view> 58 + <view wx:if="{{staffinfo.phone}}" class="font22r brownFont" bindtap="call">拨打电话</view>
  59 + <view wx:if="{{staffinfo.wechat}}" class="font22r brownFont" bindtap="cli">复制微信号</view>
60 </view> 60 </view>
61 </view> 61 </view>
62 </block> 62 </block>
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 <view class="shopName"> 91 <view class="shopName">
92 {{seller.name?seller.name:reserve .seller_name}} 92 {{seller.name?seller.name:reserve .seller_name}}
93 </view> 93 </view>
94 - <view class="labelBox"> 94 + <view class="labelBox labelBox2">
95 <view class="line"> 95 <view class="line">
96 </view> 96 </view>
97 <text class="label">{{store.introduce}} 97 <text class="label">{{store.introduce}}
@@ -132,10 +132,10 @@ @@ -132,10 +132,10 @@
132 <view class="shopName"> 132 <view class="shopName">
133 {{chef.chef_name}} 133 {{chef.chef_name}}
134 </view> 134 </view>
135 - <view class="labelBox labelBox1"> 135 + <view class="labelBox labelBox2">
136 <text class="label" >{{chef.introduce}} 136 <text class="label" >{{chef.introduce}}
137 </text> 137 </text>
138 - <view class="line"> 138 + <view class="line line1">
139 </view> 139 </view>
140 </view> 140 </view>
141 </view> 141 </view>
@@ -157,8 +157,12 @@ @@ -157,8 +157,12 @@
157 font-family: PingFang SC; 157 font-family: PingFang SC;
158 font-weight: 500; 158 font-weight: 500;
159 font-size: 24rpx; 159 font-size: 24rpx;
  160 + height: 110rpx;
  161 + justify-content: space-between;
  162 +}
  163 +.handlePhone{
  164 + height: 100rpx;
160 } 165 }
161 -  
162 .brownFont { 166 .brownFont {
163 padding: 4rpx 16rpx; 167 padding: 4rpx 16rpx;
164 color: #0143A3; 168 color: #0143A3;
@@ -168,13 +172,15 @@ @@ -168,13 +172,15 @@
168 } 172 }
169 173
170 .brownFont:nth-of-type(1) { 174 .brownFont:nth-of-type(1) {
171 - margin-bottom: 30rpx; 175 + margin-bottom: 22rpx;
172 } 176 }
173 177
174 .handle text { 178 .handle text {
175 margin-bottom: 20rpx; 179 margin-bottom: 20rpx;
176 } 180 }
177 - 181 +.handle text:nth-of-type(2){
  182 + margin-bottom: 0;
  183 +}
178 .positioning { 184 .positioning {
179 margin: 16rpx 26rpx; 185 margin: 16rpx 26rpx;
180 display: flex; 186 display: flex;
@@ -269,7 +275,7 @@ @@ -269,7 +275,7 @@
269 color: #ffffff; 275 color: #ffffff;
270 font-family: FangSong; 276 font-family: FangSong;
271 font-size: 20rpx; 277 font-size: 20rpx;
272 - height: 400rpx; 278 + max-height: 400rpx;
273 overflow: hidden; 279 overflow: hidden;
274 white-space: pre-line; 280 white-space: pre-line;
275 word-wrap: break-word; 281 word-wrap: break-word;
@@ -279,8 +285,11 @@ @@ -279,8 +285,11 @@
279 display: -webkit-box; 285 display: -webkit-box;
280 -webkit-box-orient: vertical; 286 -webkit-box-orient: vertical;
281 -webkit-line-clamp: 10; 287 -webkit-line-clamp: 10;
  288 + padding-left: 20rpx;
  289 +}
  290 +.labelBox2 .label {
  291 + height: 400rpx;
282 } 292 }
283 -  
284 .labelBox .styleLabel { 293 .labelBox .styleLabel {
285 color: #999999; 294 color: #999999;
286 } 295 }
@@ -296,7 +305,9 @@ @@ -296,7 +305,9 @@
296 .labelBox1 .line { 305 .labelBox1 .line {
297 margin: 0 0 0 16rpx; 306 margin: 0 0 0 16rpx;
298 } 307 }
299 - 308 +.labelBox .line1{
  309 + margin: 0 0 0 16rpx;
  310 +}
300 .IntroductionItems image { 311 .IntroductionItems image {
301 width: 100%; 312 width: 100%;
302 display: block; 313 display: block;