wxd / MShopWeApp

Commit 840f69828645e58a83c6abdedd08baf462ff6286

Authored by DESKTOP-QHAFKU5\iceling
1 parent 12ecf022

修改一些bug跟界面兼容性调整

Inline Side-by-side
Showing 14 changed files with 133 additions and 99 deletions
pages/user/my_service/appment_main.js
  View file @840f698
... ... @@ -85,6 +85,9 @@ Page({
85 85 //提交预约
86 86 sub_success: function(e) {
87 87 var th = this;
  88 + th.setData({
  89 + is_textea: 0
  90 + })
88 91 var formid = e.detail.formId; //发送预约成功模版信息
89 92 var store = th.data.store_name; //门店名称
90 93 var bea_name = th.data.beautician_name; //美容师名称
... ...
pages/user/my_service/hist_service.js
  View file @840f698
... ... @@ -145,6 +145,11 @@ Page({
145 145 is_screen:0,
146 146 total:0
147 147 })
  148 + if (startTime == "") {
  149 + th.setData({
  150 + is_nav:0
  151 + })
  152 + }
148 153 }
149 154 })
150 155 }
... ...
pages/user/my_service/i_service.js
  View file @840f698
... ... @@ -95,14 +95,18 @@ Page({
95 95 },
96 96 /*-- 打开服务项目 --*/
97 97 open_fw: function(e) {
  98 + wx.showLoading({
  99 + title: '加载中',
  100 + })
98 101 var th = this;
99 102 var nav_b = th.selectComponent("#nav_b"); //组件的id
  103 + nav_b.close_box();
100 104 var url = e.currentTarget.dataset.url;
101 105 var service_id = e.currentTarget.dataset.service_id; //服务id
102 106 var project_id = e.currentTarget.dataset.project_id;
103 107 var ind = e.currentTarget.dataset.ind;
104 108 var item = this.data.service_List[ind];
105   - var ewm = "^"+th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|TY01|";
  109 + var ewm = "^" + th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|TY01|";
106 110 var tt = th.format_time(1);
107 111 ewm = ewm + tt;
108 112 th.data.qr_code_object.val = ewm;
... ... @@ -115,6 +119,7 @@ Page({
115 119 userId: d.user_id
116 120 }
117 121 }).then(res => {
  122 + wx.hideLoading();
118 123 th.setData({
119 124 is_sub: 0
120 125 })
... ... @@ -123,21 +128,20 @@ Page({
123 128 my_confirm.open_cancel(1);
124 129 my_confirm.open(
125 130 "已有预约记录!",
126   - "继续使用",
127 131 "预约详情",
  132 + "继续使用",
128 133 function() {
129   - nav_b.close_box();
130   - my_confirm.open_cancel(0);
131   - qc_com.open(th.data.qr_code_object)
132   - },
133   - function() {
134   - nav_b.close_box();
135 134 my_confirm.open_cancel(0);
136 135 var deta_url = "/pages/user/my_service/tment_details?number=" + res.data.data.Number;
137 136 wx.navigateTo({
138 137 url: deta_url
139 138 })
  139 + },
  140 + function() {
  141 + my_confirm.open_cancel(0);
  142 + qc_com.open(th.data.qr_code_object)
140 143 }
  144 +
141 145 )
142 146  
143 147 } else {
... ... @@ -176,6 +180,7 @@ Page({
176 180 correcting: function(e) {
177 181 var th = this;
178 182 var nav_b = th.selectComponent("#nav_b"); //组件的id
  183 + nav_b.close_box();
179 184 wx.showLoading({
180 185 title: '加载中',
181 186 })
... ... @@ -205,10 +210,16 @@ Page({
205 210 my_confirm.open_cancel(1);
206 211 my_confirm.open(
207 212 "已有预约记录!",
208   - "继续预约",
209 213 "预约详情",
  214 + "继续预约",
210 215 function() {
211   - nav_b.close_box();
  216 + my_confirm.open_cancel(0);
  217 + var deta_url = "/pages/user/my_service/tment_details?number=" + number;
  218 + wx.navigateTo({
  219 + url: deta_url
  220 + })
  221 + },
  222 + function() {
212 223 my_confirm.open_cancel(0);
213 224 getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/sm/check", {
214 225 data: {
... ... @@ -226,18 +237,9 @@ Page({
226 237 getApp().my_warnning(res.data.msg, 0, th);
227 238 }
228 239 })
229   - },
230   - function() {
231   - nav_b.close_box();
232   - my_confirm.open_cancel(0);
233   - var deta_url = "/pages/user/my_service/tment_details?number=" + number;
234   - wx.navigateTo({
235   - url: deta_url
236   - })
237 240 }
238 241 )
239 242 } else {
240   - nav_b.close_box();
241 243 wx.navigateTo({
242 244 url: url,
243 245 })
... ...
pages/user/my_service/i_service.wxml
  View file @840f698
... ... @@ -44,7 +44,7 @@
44 44  
45 45 </view>
46 46  
47   - <view class="flex-center fs24 functionMax">
  47 + <view class="flex-center fs28 functionMax">
48 48 <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}" data-service_id="{{item.ServiceID}}">
49 49 <view>立即使用</view>
50 50 </view>
... ...
pages/user/my_service/i_service.wxss
  View file @840f698
... ... @@ -74,11 +74,13 @@ page {
74 74 .itemCount {
75 75 margin-bottom: 5rpx;
76 76 color: rgb(177, 177, 177);
  77 + align-items: baseline;
77 78 }
78 79  
79 80 .itemEffective {
80 81 margin-bottom: 30rpx;
81 82 color: rgb(177, 177, 177);
  83 + align-items: baseline;
82 84 }
83 85  
84 86 .functionMax {
... ... @@ -88,16 +90,16 @@ page {
88 90  
89 91 .Use {
90 92 width: 170rpx;
91   - height: 40rpx;
92   - line-height: 40rpx;
  93 + height: 50rpx;
  94 + line-height: 50rpx;
93 95 border-radius: 25rpx;
94 96 background-color: red;
95 97 }
96 98  
97 99 .appointment {
98 100 width: 115rpx;
99   - height: 40rpx;
100   - line-height: 40rpx;
  101 + height: 50rpx;
  102 + line-height: 50rpx;
101 103 border-radius: 25rpx;
102 104 margin-left: 20rpx;
103 105 }
... ...
pages/user/my_service/tment_details.js
  View file @840f698
... ... @@ -20,44 +20,48 @@ Page({
20 20 //取消预约
21 21 cancel_tment: function(e) {
22 22 var th = this;
23   - var index = e.currentTarget.dataset.index;
24   - var states = th.data.states;
25   - var tment_details = th.data.tment_details;
26   - var number = th.data.number;
27   - var json = {
28   - "number": number,
29   - "storeId": a.stoid,
30   - "states": states
31   - };
32   - var data = JSON.stringify(json);
33   - var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
34   - wx.request({
35   - url: url,
36   - data: data,
37   - method: 'put',
38   - header: {
39   - 'content-type': 'application/json'
40   - }, // 设置请求的 header
41   - success: function(res) {
42   - if (res.data.code == 0) {
43   - getApp().my_warnning("取消成功", 0, th);
44   - var id = th.data.activeCategoryId;
45   - if (id == 1) {
46   - tment_details.splice(index, 1);
47   - th.setData({
48   - tment_details: tment_details
49   - })
50   - } else {
51   - var start = 'tment_details[' + index + '].State';
52   - th.setData({
53   - [start]: 3
54   - })
  23 + var my_confirm = th.selectComponent("#my_confirm"); //组件的id
  24 + my_confirm.open(
  25 + "确定取消？",
  26 + "取消",
  27 + "确定",
  28 + function() {
  29 + my_confirm.open_cancel(0);
  30 + },
  31 + function() {
  32 + var index = e.currentTarget.dataset.index;
  33 + var states = th.data.states;
  34 + var tment_details = th.data.tment_details;
  35 + var number = th.data.number;
  36 + var json = {
  37 + "number": number,
  38 + "storeId": a.stoid,
  39 + "states": states
  40 + };
  41 + var data = JSON.stringify(json);
  42 + var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
  43 + wx.request({
  44 + url: url,
  45 + data: data,
  46 + method: 'put',
  47 + header: {
  48 + 'content-type': 'application/json'
  49 + }, // 设置请求的 header
  50 + success: function(res) {
  51 + my_confirm.open_cancel(0);
  52 + if (res.data.code == 0) {
  53 + getApp().my_warnning("取消成功", 0, th);
  54 + var start = 'tment_details[' + 0 + '].State';
  55 + th.setData({
  56 + [start]: 3
  57 + })
  58 + } else {
  59 + getApp().my_warnning(res.data.msg, 0, th);
  60 + }
55 61 }
56   - } else {
57   - getApp().my_warnning(res.data.msg, 0, th);
58   - }
  62 + })
59 63 }
60   - })
  64 + );
61 65  
62 66 },
63 67  
... ... @@ -85,8 +89,8 @@ Page({
85 89 wx.hideLoading();
86 90 if (res.data.code == 0) {
87 91 var data = res.data.data.pageData;
88   - var arrangeTime = data[0].ArrangeTime.substring(0, 11);
89   - var day = data[0].ArrangeTime.substring(11, 16);
  92 + var arrangeTime = data[0].ArrangeTime.substring(0, 11);
  93 + var day = data[0].ArrangeTime.substring(11, 16);
90 94 th.setData({
91 95 tment_details: data,
92 96 arrangeTime: arrangeTime,
... ... @@ -98,9 +102,17 @@ Page({
98 102 }
99 103 })
100 104 },
  105 + close: function() {
  106 + var th = this;
  107 + var nav_b = th.selectComponent("#nav_b"); //组件的id
  108 + nav_b.close_box();
  109 + },
101 110 //显示核销码
102 111 code_show: function(e) {
103 112 var th = this;
  113 + th.close();
  114 + var nav_b = th.selectComponent("#nav_b"); //组件的id
  115 + nav_b.close_box();
104 116 //--获取成功的时候--
105 117 var no = e.currentTarget.dataset.order_sn;
106 118 var qc_com = th.selectComponent("#qc_com"); //组件的id
... ... @@ -112,6 +124,8 @@ Page({
112 124 },
113 125 //跳到首页
114 126 goto: function(e) {
  127 + var th = this;
  128 + th.close();
115 129 wx.switchTab({
116 130 url: '/pages/index/index/index',
117 131 })
... ... @@ -122,5 +136,6 @@ Page({
122 136 onShow: function() {
123 137 var th = this;
124 138 th.query_bea();
  139 + th.close();
125 140 },
126 141 })
127 142 \ No newline at end of file
... ...
pages/user/my_service/tment_details.json
  View file @840f698
... ... @@ -3,6 +3,7 @@
3 3 "usingComponents": {
4 4 "qr_code": "/components/qr_code/qr_code",
5 5 "warn": "/components/long_warn/long_warn",
  6 + "my_confirm": "/components/my_confirm/my_confirm",
6 7 "nav_b": "/components/nav_b/nav_b"
7 8 }
8 9 }
9 10 \ No newline at end of file
... ...
pages/user/my_service/tment_details.wxml
  View file @840f698
... ... @@ -14,7 +14,7 @@
14 14 <view class="items lf">
15 15 <!-- 预约订单 -->
16 16 <view class="flex-vertical bmt" bindtap="code_show" data-order_sn="{{number}}">
17   - <view class="flex-vertical">
  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>
... ... @@ -22,19 +22,19 @@
22 22 </view>
23 23  
24 24 <!-- 预约门店 -->
25   - <view class="flex-vertical bmt">
  25 + <view class="flex-vertical bmt ai-bas">
26 26 <view class="name">预约门店:</view>
27 27 <view class="ellipsis-1 value">{{item.StorageName}}</view>
28 28 </view>
29 29  
30 30 <!-- 预约项目 -->
31   - <view class="flex-vertical bmt">
  31 + <view class="flex-vertical bmt ai-bas">
32 32 <view class="name">预约项目:</view>
33 33 <view class="ellipsis-1 value">{{item.ServiceName}}</view>
34 34 </view>
35 35  
36 36 <!-- 预约时间 -->
37   - <view class="flex-vertical bmt">
  37 + <view class="flex-vertical bmt ai-bas">
38 38 <view class="name">预约时间:</view>
39 39 <view class="date">{{arrangeTime}}</view>
40 40 <view>{{day}}</view>
... ... @@ -43,7 +43,7 @@
43 43 <view class="bt">
44 44  
45 45 <!-- 美容师 -->
46   - <view class="flex-vertical bmt">
  46 + <view class="flex-vertical bmt ai-bas">
47 47 <view class="name flex-vertical-between">
48 48 <view>美</view>
49 49 <view>容</view>
... ... @@ -53,7 +53,7 @@
53 53 </view>
54 54 <!-- 预约人及联系方式 -->
55 55 <!-- 姓名 -->
56   - <view class="flex-vertical bmt">
  56 + <view class="flex-vertical bmt ai-bas">
57 57 <view class="name flex-vertical-between">
58 58 <view>预</view>
59 59 <view>约</view>
... ... @@ -62,11 +62,11 @@
62 62 <view class="ellipsis-1 value">{{item.VIPName}}</view>
63 63 </view>
64 64 <!-- 号码 -->
65   - <view class="flex-vertical">
  65 + <view class="flex-vertical ai-bas">
66 66 <view class="name flex-vertical-between">
67 67 <view>手</view>
68 68 <view>机</view>
69   - <view>人:</view>
  69 + <view>号:</view>
70 70 </view>
71 71 <view>{{item.MobileTel}}</view>
72 72 </view>
... ... @@ -91,8 +91,8 @@
91 91 <!-- submit栏 -->
92 92 <view class="subs flex-vertical-between fs32">
93 93 <!-- 左边栏 -->
94   - <view class="sub flex-center yellow-b" wx:if="{{item.State==0}}">
95   - <view class="yellow-b" data-index="{{index}}" bindtap="cancel_tment">取消预约</view>
  94 + <view class="sub flex-center yellow-b" wx:if="{{item.State==0}}" bindtap="cancel_tment">
  95 + <view class="yellow-b" data-index="{{index}}">取消预约</view>
96 96 </view>
97 97 <navigator wx:if="{{item.State>0}}" class="sub flex-center yellow-b" url="/pages/user/my_service/tment_order_list">
98 98 <view class="yellow-b">我的服务</view>
... ... @@ -116,7 +116,8 @@
116 116 </view>
117 117  
118 118 <!-- 制作一个圆球导航 -->
119   -<nav_b></nav_b>
  119 +<nav_b id="nav_b"></nav_b>
  120 +<my_confirm id="my_confirm"></my_confirm>
120 121 <!-- 弹出框扫描 -->
121 122 <qr_code id="qc_com"></qr_code>
122 123 <warn id="warn"></warn>
... ...
pages/user/my_service/tment_details.wxss
  View file @840f698
... ... @@ -18,7 +18,7 @@ page {
18 18 }
19 19  
20 20 .bmt {
21   - margin-bottom: 45rpx;
  21 + margin-bottom: 35rpx;
22 22 }
23 23  
24 24 .name {
... ... @@ -33,7 +33,7 @@ page {
33 33 /* 公用 */
34 34  
35 35 .container {
36   - padding-bottom:40rpx;
  36 + padding-bottom:70rpx;
37 37 }
38 38  
39 39 .padding{
... ... @@ -58,7 +58,7 @@ page {
58 58 }
59 59  
60 60 .items {
61   - margin: 55rpx 0rpx;
  61 + margin: 40rpx 0rpx;
62 62 }
63 63  
64 64 .Tips {
... ... @@ -80,11 +80,10 @@ page {
80 80  
81 81 .subs {
82 82 width: 710rpx;
83   - padding: 0rpx 20rpx;
  83 + padding: 15rpx 20rpx;
84 84 position: fixed;
85 85 bottom:0rpx;
86 86 background-color: rgb(255,255,255);
87   - height: 140rpx;
88 87 }
89 88  
90 89 .sub {
... ... @@ -106,10 +105,10 @@ page {
106 105  
107 106 .Stickl {
108 107 width: 39rpx;
109   - height: 8rpx;
  108 + height: 10rpx;
110 109 background-color: rgb(153, 153, 153);
111 110 transform: rotate(270deg);
112   - border-radius: 8rpx;
  111 + border-radius: 20rpx;
113 112 left: 95rpx;
114 113 top: -15rpx;
115 114 }
... ...
pages/user/my_service/tment_eval.js
  View file @840f698
... ... @@ -208,7 +208,6 @@ Page({
208 208 * 生命周期函数--监听页面加载
209 209 */
210 210 onLoad: function(options) {
211   - console.log("为呃呃呃" + options.evaluate);
212 211 var th = this;
213 212 th.setData({
214 213 number: options.Number,
... ...
pages/user/my_service/tment_eval.wxml
  View file @840f698
... ... @@ -11,19 +11,19 @@
11 11 <view class="fs32">美容师</view>
12 12 <view> ：</view>
13 13 </view>
14   - <view class="itemlr fs30 ellipsis-1 {{is_evaluate==0?'datetime':''}}">{{beautician.BeauticianName}}</view>
  14 + <view class="itemlr fs30 ellipsis-1">{{beautician.BeauticianName}}</view>
15 15 </view>
16 16  
17 17 <!-- 项目 -->
18 18 <view class="flex-center item">
19 19 <view class="itemlf fs32">服务项目：</view>
20   - <view class="itemlr fs30 ellipsis-1 {{is_evaluate==0?'datetime':''}}">{{beautician.StorageName}}</view>
  20 + <view class="itemlr fs30 ellipsis-1">{{beautician.StorageName}}</view>
21 21 </view>
22 22  
23 23 <!-- 时间 -->
24 24 <view class="flex-center item">
25 25 <view class="itemlf fs32">服务时间：</view>
26   - <view class="itemlr fs30 {{is_evaluate==0?'datetime':''}}">{{arrangeTime}}</view>
  26 + <view class="itemlr fs30">{{arrangeTime}}</view>
27 27 </view>
28 28  
29 29 <!-- 评价时间 -->
... ... @@ -75,12 +75,6 @@
75 75 <view>满意的话请打五星噢，谢谢您的支持!</view>
76 76 </view>
77 77  
78   - <navigator wx:if="{{is_evaluate==0}}" class="Subs fs32 flex-center" bindtap="evaluate_save">
79   - <view class="Submission flex-center">
80   - <view>确认提交</view>
81   - </view>
82   - </navigator>
83   -
84 78 <block wx:if="{{sub_evaluate}}">
85 79 <view class="subSuccess">
86 80 <view class="flex-center">
... ... @@ -92,4 +86,9 @@
92 86 </view>
93 87 </block>
94 88 </view>
  89 +<navigator wx:if="{{is_evaluate==0}}" class="Subs fs32 flex-center" bindtap="evaluate_save">
  90 + <view class="Submission flex-center">
  91 + <view>确认提交</view>
  92 + </view>
  93 +</navigator>
95 94 <warn id="warn"></warn>
96 95 \ No newline at end of file
... ...
pages/user/my_service/tment_eval.wxss
  View file @840f698
1 1 .container {
2 2 border-top: 7rpx solid rgb(245, 245, 245);
3 3 padding-bottom: 100rpx;
  4 + background-color: rgb(255, 255, 255);
4 5 }
5 6  
6 7 .head {
... ... @@ -24,6 +25,7 @@
24 25 .itemlr {
25 26 width: 360rpx;
26 27 }
  28 +
27 29 .starss {
28 30 margin-top: 15rpx;
29 31 border-top: 3rpx dashed rgb(203, 203, 203);
... ... @@ -36,12 +38,14 @@
36 38 height: 50rpx;
37 39 margin-right: 20rpx;
38 40 }
39   -.datetime{
40   - width:190rpx;
  41 +
  42 +.datetime {
  43 + width: 190rpx;
41 44 }
  45 +
42 46 .tea_labs {
43 47 padding: 0rpx 56rpx;
44   - margin-top:20rpx;
  48 + margin-top: 20rpx;
45 49 }
46 50  
47 51 .proposal {
... ... @@ -101,7 +105,7 @@
101 105 background-color: rgb(255, 255, 255);
102 106 position: fixed;
103 107 width: 100%;
104   - bottom: 40rpx;
  108 + bottom: 40rpx;
105 109 }
106 110  
107 111 .Submission {
... ...
pages/user/my_service/tment_order_list.wxml
  View file @840f698
... ... @@ -31,23 +31,23 @@
31 31 </view>
32 32 <!-- 项目内容 -->
33 33 <view class="details">
34   - <view class="item flex-vertical">
  34 + <view class="item flex-vertical base">
35 35 <view class="itemname">预约门店:</view>
36 36 <view class="itemvalue ellipsis-1">{{item.StorageName}}</view>
37 37 </view>
38   - <view class="item flex-vertical">
  38 + <view class="item flex-vertical base">
39 39 <view class="itemname">预约项目:</view>
40 40 <view class="itemvalue ellipsis-1">{{item.ServiceName}}</view>
41 41 </view>
42   - <view class="item flex-vertical">
  42 + <view class="item flex-vertical base">
43 43 <view class="itemname">美容师:</view>
44 44 <view class="itemvalue ellipsis-1">{{item.BeauticianName}}</view>
45 45 </view>
46   - <view class="item flex-vertical">
  46 + <view class="item flex-vertical base">
47 47 <view class="itemname">预约时间:</view>
48 48 <view>{{item.ArrangeTime}}</view>
49 49 </view>
50   - <view class="item flex-vertical" wx:if="{{item.WriteTime==''?false:true}}">
  50 + <view class="item flex-vertical base" wx:if="{{item.WriteTime==''?false:true}}">
51 51 <view class="itemname">服务时间:</view>
52 52 <view>{{item.WriteTime}}</view>
53 53 </view>
... ...
pages/user/my_service/tment_order_list.wxss
  View file @840f698
... ... @@ -135,3 +135,7 @@ page {
135 135 background-color: rgb(255, 72, 72);
136 136 border-radius: 40rpx;
137 137 }
  138 +.base{
  139 + display: flex;
  140 + align-items: baseline;
  141 +}
138 142 \ No newline at end of file
... ...