wxd / MShopWeApp

Commit 5bf0c2a1f541b05dc287f99c7fce2d9dc5551fe0

Authored by DESKTOP-QHAFKU5\iceling
1 parent 840f6982

界面兼容优化

Inline Side-by-side
Showing 18 changed files with 130 additions and 114 deletions
app.wxss
  View file @5bf0c2a
... ... @@ -50,6 +50,13 @@ button {
50 50 -webkit-box-orient: vertical;
51 51 -webkit-line-clamp: 3;
52 52 }
  53 +.ellipsis-4 {
  54 + overflow: hidden;
  55 + text-overflow: ellipsis;
  56 + display: -webkit-box;
  57 + -webkit-box-orient: vertical;
  58 + -webkit-line-clamp: 4;
  59 +}
53 60  
54 61 .pd-bg-fff {
55 62 padding: 0 30rpx;
... ...
components/nav_b/nav_b.wxml
  View file @5bf0c2a
1   -
2 1 <view class="box_main {{isopen==1?'box_isopen':''}}" >
3 2 <view class="dian" bindtap="open_box">
4 3 <image src="{{iurl}}/miniapp/images/sheng_lue.png" ></image>
... ...
components/nav_b/nav_b.wxss
  View file @5bf0c2a
1   -.box_main{
2   - width:80rpx;
3   - height:80rpx;
4   - background:#272636;
5   - transition:width 0.8s;
6   - -moz-transition:width 0.8s; /* Firefox 4 */
7   - -webkit-transition:width 0.8s; /* Safari and Chrome */
8   - -o-transition:width 0.8s; /* Opera */
9   - border-radius:50rpx ;
10   - position: fixed;
11   - right: 10rpx;
12   - bottom:300rpx;
13   - overflow: hidden;
14   - z-index: 111;
15   -}
16   -
17   -.box_isopen{
18   - width: 420rpx;
19   -}
20   -
21   -.box_main .dian{
  1 +.box_main {
  2 + width: 80rpx;
  3 + height: 80rpx;
  4 + background: #272636;
  5 + transition: width 0.8s;
  6 + -moz-transition: width 0.8s; /* Firefox 4 */
  7 + -webkit-transition: width 0.8s; /* Safari and Chrome */
  8 + -o-transition: width 0.8s; /* Opera */
  9 + border-radius: 50rpx;
  10 + position: fixed;
  11 + right: 10rpx;
  12 + bottom: 650rpx;
  13 + overflow: hidden;
  14 + z-index: 4;
  15 +}
  16 +
  17 +.box_isopen {
  18 + width: 420rpx;
  19 +}
  20 +
  21 +.box_main .dian {
22 22 text-align: center;
23   -width: 50rpx;
24   -height: 50rpx;
25   -color: #ffff;
26   -font-size: 50rpx;
27   -background: none;
28   -
  23 + width: 80rpx;
  24 + height: 80rpx;
  25 + color: #ffff;
  26 + font-size: 50rpx;
  27 + background: none;
29 28 }
30 29  
31   -.box_main .dian image{
  30 +.box_main .dian image {
32 31 width: 60rpx;
33   -height: 20rpx;
34   -margin: 30rpx 0 0 10rpx;
  32 + height: 20rpx;
35 33 }
36 34  
37   -.box_main.box_isopen .dian{
38   - display: none;
  35 +.box_main.box_isopen .dian {
  36 + display: none;
39 37 }
40 38  
41   -.box_main .cl_list{
42   - display: none;
  39 +.box_main .cl_list {
  40 + display: none;
43 41 }
44 42  
45   -.box_main.box_isopen .cl_list{
46   - display: block;
47   - margin-left: 20rpx;
  43 +.box_main.box_isopen .cl_list {
  44 + display: block;
  45 + margin-left: 20rpx;
48 46 }
49 47  
50   -.box_main .cl_list .item{
51   - display: inline-block;
52   - width:100rpx;
53   - height:80rpx;
54   - text-align: center;
55   - line-height: 80rpx;
56   - color: #fff;
57   - vertical-align: top;
58   - font-size: 32rpx;
59   -
  48 +.box_main .cl_list .item {
  49 + display: inline-block;
  50 + width: 100rpx;
  51 + height: 80rpx;
  52 + text-align: center;
  53 + line-height: 80rpx;
  54 + color: #fff;
  55 + vertical-align: top;
  56 + font-size: 32rpx;
60 57 }
61 58  
62   -.box_main .cl_list .item.big{
  59 +.box_main .cl_list .item.big {
63 60 font-size: 70rpx;
64   -line-height: 70rpx;
65   -
  61 + line-height: 70rpx;
66 62 }
67   -
... ...
pages/user/my_service/appment_main.js
  View file @5bf0c2a
... ... @@ -263,6 +263,7 @@ Page({
263 263 var itemId = th.data.itemId; //服务id
264 264 var url = "/api/weshop/marketing/reservation/storage/page";
265 265 var key_word = th.data.key_word;
  266 + key_word = key_word.replace(/\s+/g, "");
266 267 getApp().request.promiseGet(url, {
267 268 data: {
268 269 storeId: a.stoid,
... ... @@ -288,6 +289,11 @@ Page({
288 289 ismore: ismore,
289 290 is_service_read: 1,
290 291 }), wx.stopPullDownRefresh(); //停止下拉刷新
  292 + if (key_word != "" && res.data.data.pageData.length < 1) {
  293 + th.setData({
  294 + is_search: 1
  295 + })
  296 + }
291 297 } else {
292 298 getApp().my_warnning(res.data.msg, 0, th);
293 299 }
... ... @@ -376,11 +382,6 @@ Page({
376 382 title: '加载中',
377 383 })
378 384 th.query_store();
379   - if (store_list.length < 1) {
380   - th.setData({
381   - is_search: 1
382   - })
383   - }
384 385 },
385 386 //美容师预约跳转页面
386 387 nav_bea: function() {
... ...
pages/user/my_service/appment_main.wxml
  View file @5bf0c2a
... ... @@ -93,12 +93,6 @@
93 93 </button>
94 94 </form>
95 95 </view>
96   - <!-- <block wx:if="{{false}}">
97   - <view class="subSuccess fs36">
98   - <image class="Success" src="{{iurl}}/miniapp/images/yyservice/Success.png"></image>
99   - <view>预约成功</view>
100   - </view>
101   - </block> -->
102 96 </view>
103 97  
104 98 </view>
... ... @@ -135,7 +129,7 @@
135 129 </view>
136 130 </view>
137 131 <!-- 通过搜索的时候没有找到的提示语 -->
138   - <view wx:if="{{store_list.length<1 && is_search}}" class="flex-center fs28 notstore">
  132 + <view wx:if="{{store_list.length<1 && is_search==1}}" class="flex-center fs28 notstore">
139 133 <view>没有找到{{key_word}}门店</view>
140 134 </view>
141 135  
... ...
pages/user/my_service/appment_main.wxss
  View file @5bf0c2a
... ... @@ -136,7 +136,7 @@ button {
136 136 }
137 137  
138 138 .beautician {
139   - height: 60rpx;
  139 + height: 70rpx;
140 140 border-bottom: 2rpx solid rgb(238, 238, 238);
141 141 padding-left: 25rpx;
142 142 }
... ... @@ -218,7 +218,7 @@ button {
218 218 }
219 219  
220 220 .stores {
221   - height: 520rpx;
  221 + height: 500rpx;
222 222 overflow-y: scroll;
223 223 }
224 224  
... ... @@ -234,8 +234,8 @@ button {
234 234 }
235 235  
236 236 .circular {
237   - width: 36rpx;
238   - height: 36rpx;
  237 + width: 37rpx;
  238 + height: 37rpx;
239 239 border-radius: 50%;
240 240 border: 2rpx solid rgb(52, 52, 52);
241 241 margin: 0rpx 15rpx;
... ...
pages/user/my_service/beauty_deta.js
  View file @5bf0c2a
... ... @@ -290,28 +290,27 @@ Page({
290 290 }
291 291 }).then(res => {
292 292 if (res.data.code == 0) {
293   - if (res.data.data[0].GroupHour!=undefined){
294   - if (res.data.data[0].GroupHour.length > 11) {
295   - getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
296   - }
297   - }
298 293 var hours = th.data.hours;
299   -
300 294 var time_list = res.data.data;
301 295 var time = th.data.time;
302 296 var date_id = th
303 297 var new_time = [];
304   - var date = th.data.hours;
  298 + var date = th.data.hours.substring(0,2);
305 299  
306 300 //不等于空就是有可以预约的时间
307 301 if (time_list != null) {
  302 + if (res.data.data[0].GroupHour != undefined) {
  303 + if (res.data.data[0].GroupHour.length > 11) {
  304 + getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
  305 + }
  306 + }
308 307 //循环固定和可预约的时间
309 308 for (var i = 0; i < time.length; i++) {
310 309 for (var ii = 0; ii < time_list.length; ii++) {
311 310 //判断固定的时间和可以预约的时间
312 311 if (time[i] == time_list[ii].GroupHour.substring(0, 5)) {
313 312 var date_id = th.data.date_id;
314   - if (date >= time_list[ii].GroupHour.substring(0, 2) && date_id == 0) {
  313 + if (date > time_list[ii].GroupHour.substring(0, 2) && date_id == 0) {
315 314 new_time[i] = "";
316 315 break;
317 316 } else {
... ...
pages/user/my_service/beauty_deta.wxml
  View file @5bf0c2a
... ... @@ -4,17 +4,24 @@
4 4 <view class="comments">
5 5 <!-- 个人信息 -->
6 6 <view class="Personal">
  7 +
7 8 <view class="name fs36 ellipsis-1">{{name}}</view>
8   - <image class="head" src="{{head_img==''?iurl+defimgurl:head_img}}" data-errorimg="{{head_img}}" binderror="bind_bnerr1" data-img="{{head_img}}" data-src="{{head_img}}"></image>
9 9  
10   - <view class="introduce fs26">
11   - <block wx:if="{{comment!=''}}">
12   - {{comment}}
13   - </block>
14   - <block wx:else>
15   - 暂无介绍
16   - </block>
  10 + <view class="ellipsis-4" style="width:100%">
  11 + <view style="overflow:hidden;">
  12 + <image class="head" src="{{head_img==''?iurl+defimgurl:head_img}}" data-errorimg="{{head_img}}" binderror="bind_bnerr1" data-img="{{head_img}}" data-src="{{head_img}}"></image>
  13 + <view class="introduce fs26">
  14 + <block wx:if="{{comment!=''}}">
  15 + {{comment}}
  16 + </block>
  17 + <block wx:else>
  18 + 暂无介绍
  19 + </block>
  20 + </view>
  21 + <view style="clear:both"></view>
  22 + </view>
17 23 </view>
  24 +
18 25 </view>
19 26  
20 27 <view>
... ... @@ -28,7 +35,7 @@
28 35 </view>
29 36 </block>
30 37 <block wx:else>
31   - <view class="scroll-item-h bd {{index==date_id?'chbd':''}}" bindtap="check_date" data-dateid="{{index}}">
  38 + <view class="scroll-item-h bd {{index==date_id?'chbd':''}}" bindtap="check_date" data-dateid="{{index}}">
32 39 <view>{{weeks[index]}}(约满)</view>
33 40 <view>{{item.time}}</view>
34 41 </view>
... ...
pages/user/my_service/beauty_deta.wxss
  View file @5bf0c2a
... ... @@ -10,6 +10,7 @@
10 10 width: 100%;
11 11 height: 270rpx;
12 12 background-color: rgb(214, 1, 33);
  13 +
13 14 }
14 15  
15 16 .comments {
... ...
pages/user/my_service/cosmetology_list.js
  View file @5bf0c2a
... ... @@ -61,7 +61,6 @@ Page({
61 61 is_cosmetology_read:1
62 62 }), wx.stopPullDownRefresh(); //停止下拉刷新
63 63 } else {
64   - getApp().my_warnning(res.data.msg, 0, th);
65 64 th.setData({
66 65 is_cosmetology_read:1
67 66 })
... ...
pages/user/my_service/cosmetology_list.wxml
  View file @5bf0c2a
... ... @@ -44,13 +44,13 @@
44 44 </view>
45 45 </block>
46 46 <block wx:else>
47   - <view>暂无对自己的介绍</view>
  47 + <view>暂无介绍</view>
48 48 </block>
49 49 </view>
50 50 </view>
51 51 <!-- 没有数据 -->
52 52 <!-- 加载完毕并且数据大于=页大小 -->
53   - <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=pageSize}}">
  53 + <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=4}}">
54 54 <view class="Line"></view>
55 55 <view class="end fs26 xc-black">到底了</view>
56 56 <view class="Line"></view>
... ...
pages/user/my_service/hist_service.js
  View file @5bf0c2a
... ... @@ -30,8 +30,8 @@ Page({
30 30 total: 0,
31 31 ismore: 0, //是否加载完毕
32 32 is_screen: 0, //是否通过筛选来选择历史服务
33   - is_reset:0,//是否重复点击
34   - is_nav:1,//是否显示导航栏
  33 + is_reset: 0, //是否重复点击
  34 + is_nav: 1, //是否显示导航栏
35 35 },
36 36 pickerShow: function() {
37 37 this.setData({
... ... @@ -59,7 +59,8 @@ Page({
59 59 distance: 0,
60 60 hist_List: [],
61 61 curpage: 1,
62   - is_screen: 1
  62 + is_screen: 1,
  63 + is_nav: 1
63 64 });
64 65 th.query_hist();
65 66 },
... ... @@ -80,28 +81,28 @@ Page({
80 81 */
81 82 onReachBottom: function() {
82 83 var th = this;
83   - if (th.data.total <= th.data.pageSize) return;
84   - if (th.data.ismore) return;
  84 + if (th.data.total <= th.data.pageSize) return false;
  85 + if (th.data.ismore) return false;
85 86  
86 87 wx.showLoading({
87 88 title: '加载中...',
88 89 })
89   - th.query_service();
  90 + th.query_hist();
90 91 },
91 92 //重置历史服务数据
92 93 his_reset: function() {
93 94 var th = this;
94 95 var is_reset = th.data.is_reset;
95   - console.log("22"+is_reset);
96   - if (is_reset==0){
  96 + if (is_reset == 0) {
97 97 th.setData({
98 98 hist_List: [],
99 99 curpage: 1,
100 100 is_service_read: 0,
101 101 is_screen: 1,
102   - is_reset:1,
  102 + is_reset: 1,
103 103 startTime: "",
104 104 endTime: "",
  105 + is_nav: 1
105 106 })
106 107 th.query_hist();
107 108 }
... ... @@ -140,14 +141,14 @@ Page({
140 141 is_service_read: 1,
141 142 }), wx.stopPullDownRefresh(); //停止下拉刷新
142 143 } else {
143   - th.setData({
144   - is_service_read:1,
145   - is_screen:0,
146   - total:0
147   - })
148   - if (startTime == "") {
  144 + th.setData({
  145 + is_service_read: 1,
  146 + is_screen: 0,
  147 + ismore: 1
  148 + })
  149 + if (startTime!="") {
149 150 th.setData({
150   - is_nav:0
  151 + total:0
151 152 })
152 153 }
153 154 }
... ...
pages/user/my_service/hist_service.wxml
  View file @5bf0c2a
... ... @@ -19,7 +19,7 @@
19 19 </view>
20 20  
21 21 <!-- 总的服务列表 -->
22   - <view>
  22 + <view class="items">
23 23 <!-- 单个 -->
24 24 <view class="item flex-vertical-between" wx:for="{{hist_List}}">
25 25 <!-- left -->
... ...
pages/user/my_service/hist_service.wxss
  View file @5bf0c2a
... ... @@ -21,6 +21,10 @@ page {
21 21 background-color: rgb(238, 238, 238);
22 22 height: 70rpx;
23 23 color: rgb(153, 153, 153);
  24 + position: fixed;
  25 + top:0rpx;
  26 + left: 0rpx;
  27 + width: 660rpx;
24 28 }
25 29  
26 30 .count {
... ... @@ -39,7 +43,9 @@ page {
39 43 width: 30rpx;
40 44 height: 30rpx;
41 45 }
42   -
  46 +.items{
  47 + margin-top: 70rpx;
  48 +}
43 49 .item {
44 50 margin: 0rpx 25rpx;
45 51 padding: 0rpx 20rpx;
... ... @@ -49,7 +55,7 @@ page {
49 55  
50 56 .itemName {
51 57 margin-right: 10rpx;
52   - width: 130rpx;
  58 + max-width: 130rpx;
53 59 }
54 60  
55 61 .itemUsna {
... ...
pages/user/my_service/tment_details.wxml
  View file @5bf0c2a
... ... @@ -13,12 +13,12 @@
13 13 <view class="fs30">
14 14 <view class="items lf">
15 15 <!-- 预约订单 -->
16   - <view class="flex-vertical bmt" bindtap="code_show" data-order_sn="{{number}}">
  16 + <view class="flex-vertical bmt" bindtap="code_show" data-order_sn="{{number}}" wx:if="{{item.State==0}}">
17 17 <view class="flex-vertical ai-bas">
18 18 <view class="name">预约订单:</view>
19 19 <view class="ellipsis-1 value">{{number}}</view>
20 20 </view>
21   - <image wx:if="{{item.State==0}}" src="{{iurl}}miniapp/images/order/code.png" class="code"></image>
  21 + <image src="{{iurl}}miniapp/images/order/code.png" class="code"></image>
22 22 </view>
23 23  
24 24 <!-- 预约门店 -->
... ...
pages/user/my_service/tment_eval.wxml
  View file @5bf0c2a
... ... @@ -7,9 +7,8 @@
7 7  
8 8 <!-- 姓名 -->
9 9 <view class="flex-level item">
10   - <view class="itemlf flex-vertical-between">
11   - <view class="fs32">美容师</view>
12   - <view> ：</view>
  10 + <view class="itemlf flex-level-right">
  11 + <view class="fs32">美容师：</view>
13 12 </view>
14 13 <view class="itemlr fs30 ellipsis-1">{{beautician.BeauticianName}}</view>
15 14 </view>
... ...
pages/user/my_service/tment_order_list.wxml
  View file @5bf0c2a
... ... @@ -5,7 +5,7 @@
5 5 <view>{{item.name}}</view>
6 6 </view>
7 7 </view>
8   - <view wx:if="{{true}}">
  8 + <view class="itemMax">
9 9 <!-- 预约项目 -->
10 10 <view wx:for="{{tm_order_list}}">
11 11 <!-- 商品编号和状态 -->
... ... @@ -82,7 +82,7 @@
82 82 <view class="flex-level">
83 83 <image src="{{iurl}}miniapp/images/order/empty_order.png" lazy-load="true"></image>
84 84 </view>
85   - <view class="flex-level fs30 xc-ash">暂无预约记录</view>
  85 + <view class="flex-level fs30 xc-ash">无预约记录</view>
86 86 <view class="flex-level">
87 87 <navigator url="/pages/user/my_service/i_service" bindtap="goto">
88 88 <view class="flex-center fs32 white">立即预约</view>
... ...
pages/user/my_service/tment_order_list.wxss
  View file @5bf0c2a
... ... @@ -10,6 +10,12 @@ page {
10 10 border-top: 3rpx solid rgb(221, 221, 221);
11 11 display: flex;
12 12 justify-content: space-between;
  13 + position: fixed;
  14 + background-color: rgb(255,255,255);
  15 + width:696rpx;
  16 +}
  17 +.itemMax{
  18 + margin-top: 93rpx;
13 19 }
14 20  
15 21 .type-box {
... ... @@ -137,5 +143,7 @@ page {
137 143 }
138 144 .base{
139 145 display: flex;
  146 + height: 38rpx;
  147 + line-height: 38rpx;
140 148 align-items: baseline;
141 149 }
142 150 \ No newline at end of file
... ...