wxd / MShopWeApp

Commit 1a687fc35f292472f9f8fcf74e2f6fcd6dcefae2

Authored by DESKTOP-QHAFKU5\iceling
1 parent 27471549

评价图片显示，点击，微信预约提交判断版本

Inline Side-by-side
Showing 9 changed files with 95 additions and 45 deletions
pages/user/my_service/appment_main.js
  View file @1a687fc
... ... @@ -124,7 +124,6 @@ Page({
124 124 'content-type': 'application/json'
125 125 }, // 设置请求的 header
126 126 success: function(res) {
127   - console.log("真正提交1111111",res.data);
128 127 th.setData({
129 128 is_sub: 0
130 129 })
... ... @@ -209,7 +208,7 @@ Page({
209 208 if (store == "") {
210 209 getApp().my_warnning("请选择服务门店", 0, th);
211 210 th.setData({
212   - is_sub:0
  211 + is_sub: 0
213 212 })
214 213 th.settime();
215 214 return false;
... ... @@ -220,45 +219,88 @@ Page({
220 219 })
221 220 th.settime();
222 221 return false;
223   - } else if (time==undefined || time=='') {
  222 + } else if (time == undefined || time == '') {
224 223 getApp().my_warnning("请选择预约时间", 0, th);
225 224 th.setData({
226 225 is_sub: 0
227 226 })
228 227 th.settime();
229 228 return false;
230   - }else{
231   - //获取模版id
232   - getApp().request.promiseGet(temp_url, {
233   - data: {
234   - store_id: a.stoid,
235   - typeid: "1011"
236   - }
237   - }).then(res => {
  229 + } else {
  230 + var version ="";
  231 + //判断微信版本是否达到预约成功订阅的要求
  232 + wx.getSystemInfo({
  233 + success(res) {
  234 + version = res.version;
  235 + }
  236 + })
238 237 wx.showLoading({
239 238 title: '加载中',
240 239 })
241   - if (res.data.code == 0 && res.data.data.pageData.length > 0) {
242   - template_id = res.data.data.pageData[0].template_id;
243   - // //授权订阅
244   - wx.requestSubscribeMessage({
245   - tmplIds: [template_id],
246   - success(res) {
247   - console.log("成功的回调222222", res);
248   - th.success();
249   - },
250   - fail(res) {
251   - console.log("失败的回调1111111", res.data);
  240 + if (th.ver(version, '7.0.4') >= 0) {
  241 + //获取模版id
  242 + getApp().request.promiseGet(temp_url, {
  243 + data: {
  244 + store_id: a.stoid,
  245 + typeid: "1011"
  246 + }
  247 + }).then(res => {
  248 + if (res.data.code == 0 && res.data.data.pageData.length > 0) {
  249 + template_id = res.data.data.pageData[0].template_id;
  250 + // //授权订阅
  251 + wx.requestSubscribeMessage({
  252 + tmplIds: [template_id],
  253 + success(res) {
  254 + th.success();
  255 + },
  256 + fail(res) {
  257 + th.success();
  258 + }
  259 + })
  260 + } else {
252 261 th.success();
253 262 }
254 263 })
255 264 } else {
256   - console.log("接口调用失败0000000", res.data);
257   - th.success();
  265 + // 如果希望用户在最新版本的客户端上体验您的小程序，可以这样子提示
  266 + wx.showModal({
  267 + title: '提示',
  268 + content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。'
  269 + })
  270 + th.setData({
  271 + is_sub: 0
  272 + })
258 273 }
259   - })
  274 +
260 275 }
261 276 },
  277 + //版本判断
  278 + ver:function(v1,v2){
  279 + v1 = v1.split('.')
  280 + v2 = v2.split('.')
  281 + var num1 = "" ;
  282 + var num2 = "";
  283 + var len = Math.max(v1.length, v2.length)
  284 +
  285 + while (v1.length < len) {
  286 + v1.push('0')
  287 + }
  288 + while (v2.length < len) {
  289 + v2.push('0')
  290 + }
  291 +
  292 + for (let i = 0; i < len; i++) {
  293 + num1 = parseInt(v1[i])
  294 + num2 = parseInt(v2[i])
  295 +
  296 + if (num1 > num2) {
  297 + return 1
  298 + } else if (num1 < num2) {
  299 + return -1
  300 + }
  301 + }
  302 + return 0
  303 + },
262 304 goto: function(e) {
263 305 var th = this;
264 306 th.setData({
... ...
pages/user/my_service/appment_main.wxml
  View file @1a687fc
... ... @@ -36,7 +36,7 @@
36 36 <view class="beauticians abs" wx:if="{{beautician}}">
37 37 <!-- 到时候要做判断如果是index==循环的最后一个则把下边线去掉:(beaclone去掉的css) -->
38 38 <view class="beautician flex-vertical fs26" wx:for="{{beautician_list}}" bindtap="choice_beautician" data-baaindex="{{key}}" wx:for-index="key">
39   - <view>{{item.StaffName}}</view>
  39 + <view class="StaffName ellipsis-1">{{item.StaffName}}</view>
40 40 </view>
41 41 <view>
42 42 </view>
... ...
pages/user/my_service/appment_main.wxss
  View file @1a687fc
... ... @@ -14,7 +14,9 @@
14 14 font-size: 26rpx;
15 15 color: rgb(142, 142, 142);
16 16 }
17   -
  17 +.StaffName{
  18 + max-width: 350rpx;
  19 +}
18 20 .angler {
19 21 transform: rotate(227deg);
20 22 margin-bottom: 0rpx;
... ...
pages/user/my_service/beauty_deta.js
  View file @1a687fc
... ... @@ -82,8 +82,6 @@ Page({
82 82 // var date = myDate.getHours(); //获取当前小时数(0-23);
83 83 let str = myDate.toTimeString(); //"10:55:24 GMT+0800 (中国标准时间)"
84 84 let date = str.substring(0, 8); // '10:55:24'
85   -
86   - // console.log("当前时间", date);
87 85 th.setData({
88 86 hours: date
89 87 });
... ...
pages/user/my_service/cosmetology_list.js
  View file @1a687fc
... ... @@ -74,6 +74,7 @@ Page({
74 74 if (_Img != undefined) {
75 75 var _errObj = {};
76 76 _errObj[_errImg] = "/miniapp/images/no-head.jpg";
  77 + console.log(_errObj,"zzzzzzz");
77 78 this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
78 79 }
79 80 },
... ...
pages/user/my_service/cosmetology_list.wxml
  View file @1a687fc
... ... @@ -8,7 +8,7 @@
8 8 <!-- 个人属性 -->
9 9 <view class="flex-vertical-between">
10 10 <view class="flex-vertical">
11   - <image class="portrait" src="{{item.PhotoUrl==''?iurl+defimgurl:item.PhotoUrl}}" lazy-load="true" data-errorimg="cosmetology_list[{{index}}].PhotoUrl" binderror="bind_bnerr1" data-img="{{item.PhotoUrl}}"></image>
  11 + <image class="portrait" src="{{item.PhotoUrl==''?iurl+defimgurl:item.PhotoUrl}}" lazy-load="true" data-errorimg="cosmetology_list[{{index}}].PhotoUrl" binderror="bind_bnerr1" data-img="cosmetology_list[{{index}}].PhotoUrl"></image>
12 12 <view>
13 13 <!-- 用户名 -->
14 14 <view class="UserName ellipsis-1 fs32">{{item.StaffName}}</view>
... ...
pages/user/my_service/tment_eval.js
  View file @1a687fc
1   -var e = getApp(),
  1 + var e = getApp(),
2 2 a = e.globalData.setting,
3 3 os = a,
4 4 t = e.request,
... ... @@ -63,13 +63,14 @@ Page({
63 63 })
64 64 },
65 65 //图片失败，默认图片
66   - bind_bnerr1: function(e) {
  66 + bind_bnerr1: function (e) {
  67 + var th = this;
67 68 var _errImg = e.target.dataset.errorimg;
68 69 var _Img = e.target.dataset.img;
69 70 if (_Img != undefined) {
70 71 var _errObj = {};
71 72 _errObj[_errImg] = "/miniapp/images/no-head.jpg";
72   - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  73 + th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
73 74 }
74 75 },
75 76 //选择标签
... ... @@ -106,7 +107,7 @@ Page({
106 107 var data = res.data.data.pageData;
107 108 var arrangeTime = data[0].ArrangeTime;
108 109 th.setData({
109   - beautician: data[0],
  110 + beautician: data,
110 111 arrangeTime: arrangeTime
111 112 })
112 113 } else {
... ... @@ -129,7 +130,7 @@ Page({
129 130 stars_index: res.data.data.Star-1,
130 131 labels: res.data.data.EvaluationList,
131 132 proposal: res.data.data.Remark,
132   - EvaluateDatetime: res.data.data.WriteTime.substring(0, 19)
  133 + EvaluateDatetime: res.data.data.EvaluateDatetime.substring(0, 19)
133 134 })
134 135 } else {
135 136 getApp().my_warnning(res.data.msg, 0, th);
... ... @@ -198,12 +199,14 @@ Page({
198 199 },
199 200 //图片失败，默认图片
200 201 bind_bnerr1: function(e) {
  202 + var th = this;
201 203 var _errImg = e.target.dataset.errorimg;
202 204 var _Img = e.target.dataset.img;
203 205 if (_Img != undefined) {
  206 +
204 207 var _errObj = {};
205   - _errObj[_errImg] = "/miniapp/images/no-head.jpg";
206   - this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
  208 + _errObj[_errImg] = th.data.iurl+"/miniapp/images/no-head.jpg";
  209 + th.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
207 210 }
208 211 },
209 212 /**
... ...
pages/user/my_service/tment_eval.wxml
  View file @1a687fc
1   -<view class="container">
  1 +<view class="container" wx:for="{{beautician}}" wx:if="{{index<1}}" wx:for-item="it">
2 2  
3 3 <!-- 头像 -->
4 4 <view class="flex-center head">
5   - <image class="headimg" src="{{beautician.PhotoUrl==''?iurl+defimgurl:beautician.PhotoUrl}}" lazy-load="true" data-errorimg="{{beautician.PhotoUrl}}" binderror="bind_bnerr1" data-img="{{beautician.PhotoUrl}}"></image>
  5 +
  6 + <image class="headimg" src="{{it.PhotoUrl==''?iurl+defimgurl:it.PhotoUrl}}" lazy-load="true" data-errorimg="beautician[{{index}}].PhotoUrl" binderror="bind_bnerr1" data-img="beautician[{{index}}].PhotoUrl"></image>
6 7 </view>
7 8  
8   - <!-- 姓名 -->
  9 + <!-- 姓名 -->
9 10 <view class="flex-level item">
10 11 <view class="itemlf flex-level-right">
11 12 <view class="fs32">服务美容师：</view>
12 13 </view>
13   - <view class="itemlr fs30 ellipsis-1">{{beautician.BeauticianName}}</view>
  14 + <view class="itemlr fs30 ellipsis-1">{{it.BeauticianName}}</view>
14 15 </view>
15 16  
16 17 <!-- 项目 -->
17 18 <view class="flex-center item">
18 19 <view class="itemlf fs32 flex-level-right">服务项目：</view>
19   - <view class="itemlr fs30 ellipsis-1">{{beautician.StorageName}}</view>
  20 + <view class="itemlr fs30 ellipsis-1">{{it.ServiceName}}</view>
20 21 </view>
21 22  
22 23 <!-- 时间 -->
23 24 <view class="flex-center item">
24 25 <view class="itemlf fs32 flex-level-right">服务时间：</view>
25   - <view class="itemlr fs30">{{arrangeTime}}</view>
  26 + <view class="itemlr fs30">{{it.WriteTime}}</view>
26 27 </view>
27 28  
28 29 <!-- 评价时间 -->
... ... @@ -85,8 +86,8 @@
85 86 </view>
86 87 </block>
87 88 </view>
88   -<navigator wx:if="{{is_evaluate==0}}" class="Subs fs32 flex-center" bindtap="evaluate_save">
89   - <view class="Submission flex-center">
  89 +<navigator wx:if="{{is_evaluate==0}}" class="Subs fs32 flex-center">
  90 + <view class="Submission flex-center" bindtap="evaluate_save">
90 91 <view>确认提交</view>
91 92 </view>
92 93 </navigator>
... ...
pages/user/my_service/tment_order_list.js
  View file @1a687fc
... ... @@ -101,6 +101,9 @@ Page({
101 101 var arr1 = th.data.tm_order_list;
102 102 var arr2 = res.data.data.pageData;
103 103 var arr3 = [...arr1, ...arr2];
  104 + for(var i = 0;i<arr3.length;i++){
  105 + arr3[i].ArrangeTime = arr3[i].ArrangeTime.substring(0, 16);
  106 + }
104 107 var ismore = 0;
105 108 if (arr3.length == res.data.data.total) ismore = 1
106 109 th.setData({
... ...