diff --git a/components/mescroll-uni/components/mescroll-uni/components/mescroll-down.css b/components/mescroll-uni/components/mescroll-uni/components/mescroll-down.css index 3a8a210..f01f6ab 100644 --- a/components/mescroll-uni/components/mescroll-uni/components/mescroll-down.css +++ b/components/mescroll-uni/components/mescroll-uni/components/mescroll-down.css @@ -1,24 +1,26 @@ /* 下拉刷新区域 */ .mescroll-downwarp { - /* position: absolute; + position: absolute; top: -100%; left: 0; width: 100%; height: 100%; - text-align: center; */ - height: 25px; - text-align: center; + text-align: center; + display: none; + /* height: 25px; + text-align: center; */ } /* 下拉刷新--内容区,定位于区域底部 */ .mescroll-downwarp .downwarp-content { - /* position: absolute; + position: absolute; left: 0; bottom: 0; width: 100%; min-height: 60rpx; padding: 20rpx 0; - text-align: center; */ + text-align: center; + display: none; } /* 下拉刷新--提示文本 */ @@ -27,6 +29,7 @@ font-size: 28rpx; vertical-align: middle; margin-left: 16rpx; + /* color: gray; 已在style设置color,此处删去*/ } diff --git a/pages/order/index.vue b/pages/order/index.vue index dd3b319..3c67c02 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -115,31 +115,36 @@ - 更多 + + + + 现在出发 + 拒单申请 + 我已到达 + 开始服务 + 转待补单 + + 服务完成 + 确认接单 联系客服 - 联系客户 - - 现在出发 - 我已到达 - 开始服务 - 转待补单 + + + - 服务完成 - 拒单申请 - 确认接单 + @@ -346,6 +351,9 @@ }, startTime: '', endTime: '', + gengBtnShow:false, + gengBtnHeid:false, + gengNum:0, } }, onLoad() { @@ -479,8 +487,8 @@ }, gengBtn(index){ console.log(11) - this.btnShow=index - // this.btnShow=!this.btnShow + this.gengNum=index; + this.gengBtnShow=!this.gengBtnShow }, goChat() {//联系客服 let kefu = this.$queue.getData('kefu'); // 用户端联系方式 1 手机号 2企业微信 @@ -884,7 +892,20 @@ .showBtn{ justify-content: space-between; } - .showBtn,.hideBtn{ + .hideBtn{ + padding: 5px; + display: flex; + flex-direction: row; + align-items: center; + flex-wrap: wrap; + justify-content: space-between; + position: absolute; + bottom: 0; + background-color: #fff; + margin-bottom: 54px; + margin-left: 20px; + } + .showBtn{ width: 100%; display: flex; flex-direction: row; @@ -1154,6 +1175,7 @@ } .padding-order{ padding: 10rpx 20rpx; + position: relative; } .text-cut{ width: 95%; diff --git a/unpackage/release/apk/__UNI__B37C795__20240628135802.apk b/unpackage/release/apk/__UNI__B37C795__20240628135802.apk deleted file mode 100644 index 8d58b33..0000000 Binary files a/unpackage/release/apk/__UNI__B37C795__20240628135802.apk and /dev/null differ diff --git a/unpackage/release/apk/__UNI__B37C795__20240630095332.apk b/unpackage/release/apk/__UNI__B37C795__20240630095332.apk deleted file mode 100644 index d750f71..0000000 Binary files a/unpackage/release/apk/__UNI__B37C795__20240630095332.apk and /dev/null differ diff --git a/unpackage/release/apk/__UNI__B37C795__20240702093758.apk b/unpackage/release/apk/__UNI__B37C795__20240702093758.apk deleted file mode 100644 index 395cb07..0000000 Binary files a/unpackage/release/apk/__UNI__B37C795__20240702093758.apk and /dev/null differ diff --git a/unpackage/release/apk/__UNI__B37C795__20240702153607.apk b/unpackage/release/apk/__UNI__B37C795__20240702223121.apk similarity index 97% rename from unpackage/release/apk/__UNI__B37C795__20240702153607.apk rename to unpackage/release/apk/__UNI__B37C795__20240702223121.apk index fbac375..31c1e80 100644 Binary files a/unpackage/release/apk/__UNI__B37C795__20240702153607.apk and b/unpackage/release/apk/__UNI__B37C795__20240702223121.apk differ