diff --git a/page_components/HM-dragSorts/HM-dragSorts.vue b/page_components/HM-dragSorts/HM-dragSorts.vue
index 7fd12e4..2d8230e 100644
--- a/page_components/HM-dragSorts/HM-dragSorts.vue
+++ b/page_components/HM-dragSorts/HM-dragSorts.vue
@@ -61,11 +61,12 @@
(<text style="margin-top: 10rpx;" v-if="row.feeMode == 1">单次收费</text>
<text style="margin-top: 10rpx;" v-if="row.feeMode == 2">智能收费</text>)
<text style="width: 20rpx;display: inline-block;"></text>
- <text style="margin-top: 10rpx;margin-left: 6rpx;" v-if="row.feeMode == 2">押金{{row.deposit}}元</text>
+ <text style="margin-top: 10rpx;margin-left: 6rpx;" v-if="row.feeMode == 2">预存{{row.deposit}}元</text>
<text v-else>
- <text style="margin-top: 10rpx;" v-if="row.timeUnit == 2 && row.feeType != 3 && row.feeType != 4">{{row.value}}时 {{row.price}}元</text>
- <text style="margin-top: 10rpx;" v-if="row.timeUnit == 3 && row.feeType != 3 && row.feeType != 4">{{row.value}}分 {{row.price}}元</text>
- <text style="margin-top: 10rpx;" v-if="row.timeUnit == 4 && row.feeType != 3 && row.feeType != 4">{{row.value}}秒 {{row.price}}元</text>
+ <text style="margin-top: 10rpx;" v-if="row.timeUnit == 2 && row.feeType != 3 && row.feeType != 2 && row.feeType != 4">{{row.value}}时 {{row.price}}元</text>
+ <text style="margin-top: 10rpx;" v-if="row.timeUnit == 3 && row.feeType != 3 && row.feeType != 2 && row.feeType != 4">{{row.value}}分 {{row.price}}元</text>
+ <text style="margin-top: 10rpx;" v-if="row.timeUnit == 4 && row.feeType != 3 && row.feeType != 2 && row.feeType != 4">{{row.value}}秒 {{row.price}}元</text>
+ <text style="margin-top: 10rpx;" v-if="row.feeMode == 1 && row.feeType == 2">{{row.value}}度 {{row.price}}元</text>
</text>
</view>
</view>
diff --git a/page_components/bindszthr.vue b/page_components/bindszthr.vue
index bb63311..5a362f8 100644
--- a/page_components/bindszthr.vue
+++ b/page_components/bindszthr.vue
@@ -360,8 +360,8 @@
setTimeout(() => {
this.btnmsk = false
uni.reLaunch({
- url:'/pages/index/index'
- })
+ url:'/pages/shouye/index'
+ })
}, 1000)
}else{
uni.showToast({
diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index 2150caf..b228ca4 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -73,8 +73,7 @@
（{{item.feeMode == 1 ? '单次收费' : '智能收费'}}）：
<text v-if="item.feeType == 1">{{item.value}}<text v-if="item.timeUnit == 2">时</text> <text v-if="item.timeUnit == 3">分钟</text> <text v-if="item.timeUnit == 4">秒</text> {{item.price}}元</text>
<text v-if="item.feeType == 2">{{item.value}}度{{item.price}}元</text>
- <!-- <text v-if="item.feeType == 3 || item.feeType == 4">押金{{item.deposit}}元</text> -->
- <text v-if="item.feeMode == 2">押金{{item.deposit}}元</text>
+ <text v-if="item.feeMode == 2">预存{{item.deposit}}元</text>
</view>
<view class="" style="margin-top: 10rpx;color: #8883F0;font-size: 28rpx;" v-if="item.feeMode == 2">
diff --git a/page_fenbao/HM-dragSorts/HM-dragSorts.vue b/page_fenbao/HM-dragSorts/HM-dragSorts.vue
index 1fbbaad..5c58abf 100644
--- a/page_fenbao/HM-dragSorts/HM-dragSorts.vue
+++ b/page_fenbao/HM-dragSorts/HM-dragSorts.vue
@@ -92,11 +92,14 @@
<text style="margin-top: 10rpx;" v-if="row.feeType == 4">分时段按时收费</text>
(<text style="margin-top: 10rpx;" v-if="row.feeMode == 1">单次收费</text>
<text style="margin-top: 10rpx;" v-if="row.feeMode == 2">智能收费</text>)
- <text style="width: 20rpx;"></text>
- <text style="margin-top: 10rpx;" v-if="row.feeType == 3 || row.feeType == 4">押金{{row.price}}</text>
- <text style="margin-top: 10rpx;" v-if="row.timeUnit == 2 && row.feeType != 3 && row.feeType != 4">{{row.value}}时 {{row.price}}元</text>
- <text style="margin-top: 10rpx;" v-if="row.timeUnit == 3 && row.feeType != 3 && row.feeType != 4">{{row.value}}分 {{row.price}}元</text>
- <text style="margin-top: 10rpx;" v-if="row.timeUnit == 4 && row.feeType != 3 && row.feeType != 4">{{row.value}}秒 {{row.price}}元</text>
+ <text style="width: 20rpx;display: inline-block;"></text>
+ <text style="margin-top: 10rpx;margin-left: 6rpx;" v-if="row.feeMode == 2">预存{{row.deposit}}元</text>
+ <text v-else>
+ <text style="margin-top: 10rpx;" v-if="row.timeUnit == 2 && row.feeType != 3 && row.feeType != 2 && row.feeType != 4">{{row.value}}时 {{row.price}}元</text>
+ <text style="margin-top: 10rpx;" v-if="row.timeUnit == 3 && row.feeType != 3 && row.feeType != 2 && row.feeType != 4">{{row.value}}分 {{row.price}}元</text>
+ <text style="margin-top: 10rpx;" v-if="row.timeUnit == 4 && row.feeType != 3 && row.feeType != 2 && row.feeType != 4">{{row.value}}秒 {{row.price}}元</text>
+ <text style="margin-top: 10rpx;" v-if="row.feeMode == 1 && row.feeType == 2">{{row.value}}度 {{row.price}}元</text>
+ </text>
</view>
</view>
<view class="ccc">
diff --git a/page_fenbao/fenxiang.vue b/page_fenbao/fenxiang.vue
index 1356f04..8895d23 100644
--- a/page_fenbao/fenxiang.vue
+++ b/page_fenbao/fenxiang.vue
@@ -11,7 +11,7 @@
<!-- 展示二维码 -->
<view class="imgewm" @longpress="saveCanvas">
- <canvas canvas-id="qrcode" style="height: 100%;margin: 0 auto;" />
+ <canvas canvas-id="qrcode" style="height: 600rpx;margin: 0 auto;" />
<view class="" style="width: 100%;text-align: center;margin-top: 20rpx;">
SN:{{deviceNo}}
</view>
@@ -192,9 +192,8 @@
this.wemflag = true
uQRCode.make({
canvasId: 'qrcode',
- // componentInstance: this,
text: 'https://kg.chuantewulian.cn/w?s=' + this.deviceNo,
- size: 250,
+ size: 300,
margin: 0,
backgroundColor: '#ffffff',
foregroundColor: '#000000',
@@ -358,8 +357,8 @@
}
.imgewm {
- width: 250px;
- height:250px;
+ width: 300px;
+ height:300px;
margin: auto;
margin-top: 104rpx;
// position: fixed;
diff --git a/page_fenbao/statulist/myshop/editshop/index.vue b/page_fenbao/statulist/myshop/editshop/index.vue
index 9a18edd..81655d9 100644
--- a/page_fenbao/statulist/myshop/editshop/index.vue
+++ b/page_fenbao/statulist/myshop/editshop/index.vue
@@ -58,24 +58,12 @@
<!-- #endif -->
<!-- #ifdef MP-WEIXIN -->
- <input type="text" placeholder="请输入详细地址" v-model="xqdz" />
+ <input type="text" placeholder="请输入详细地址" v-model="xqdz" @click="btnjwd"/>
<u-icon name="map-fill" style="position: absolute;top: 20rpx;right: 22rpx;z-index: 99;"
- size="32" ></u-icon>
+ size="32" @click="btnjwd"></u-icon>
<!-- #endif -->
</view>
</view>
- <!-- <view class="listval">
- <view class="tit"> 是否展示店铺</view>
- <u-switch v-model="checked" active-color="#8883F0"></u-switch>
- </view>
- <view class="listval">
- <view class="tit"> 是否允许在非营业时间使用</view>
- <u-switch v-model="checkeds" active-color="#8883F0"></u-switch>
- </view> -->
- <!-- <view class="listval">
- <view class="tit"> 详细地址</view>
- <view class="but"> <input type="text" placeholder="请输入详细地址" v-model="xqdz" /> </view>
- </view> -->
<view class="icon">
<view class="list_box">
<view class="lt">
@@ -600,7 +588,6 @@
line-height: 70rpx;
padding-left: 22rpx;
padding-right: 72rpx;
- width: 100%;
}
}
}
@@ -627,7 +614,6 @@
height: 70rpx;
line-height: 70rpx;
padding-left: 22rpx;
- width: 100%;
}
}
}
diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue
index e1c89cb..f1493ad 100644
--- a/page_fenbao/statulist/myshop/shopxx/index.vue
+++ b/page_fenbao/statulist/myshop/shopxx/index.vue
@@ -53,7 +53,7 @@
<view class="tit"> 详细地址</view>
<view class="but">
<!-- #ifdef MP-ALIPAY -->
- <view style="line-height: 70rpx;padding-left: 40rpx;">
+ <view style="line-height: 70rpx;padding-left: 40rpx;" @click="btnjwd">
<text style="color: #ccc;font-size: 32rpx;">{{xqdz == '' ? '请选择详细地址' : xqdz}}</text>
</view>
<!-- #endif -->
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 669e88e..fdd5a35 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -183,21 +183,17 @@
content: '该设备未绑定,你需进行绑定吗？',
success: function(res) {
if (res.confirm) {
- that.$u.put("/app/device/bind", data).then(
- res => {
- if (res.code == 200) {
- that.$u.get(
- `/app/device/${id}/bySn`
- ).then((res) => {
- if (res.code ==
- 200) {
- uni.navigateTo({
- url: '/page_components/bindsz?id=' + res.data.deviceId
- })
- }
- })
- }
- })
+ that.$u.put("/app/device/bind", data).then(res => {
+ if (res.code == 200) {
+ that.$u.get(`/app/device/${id}/bySn`).then((res) => {
+ if (res.code == 200) {
+ uni.navigateTo({
+ url: '/page_components/bindsz?id=' + res.data.deviceId
+ })
+ }
+ })
+ }
+ })
}
}
})
@@ -224,7 +220,6 @@
path: '/pages/shouye/index'
}
},
-
// 分享到朋友圈
onShareTimeline: function() {
return {
@@ -279,12 +274,10 @@
})
},
-
startNetworkCheck() {
this.networkInterval = setInterval(() => {
uni.getNetworkType({
success: (res) => {
- // console.log(res);
if (res.networkType == "none") {
this.wangluo = false
} else {
@@ -297,7 +290,6 @@
});
}, 3000)
},
-
// 请求正在使用的设备列表
getshiy() {
this.$u.get("app/bill/usingList").then((res) => {
@@ -366,7 +358,6 @@
let sceneValue = res.result
let decodedValue = decodeURIComponent(sceneValue)
let id = getQueryParam(decodedValue, 's')
- // console.log(res, id)
let that = this
let data = {
deviceNo: id
@@ -386,24 +377,17 @@
content: '该设备未绑定,你需进行绑定吗？',
success: function(res) {
if (res.confirm) {
- // that.$u.get(`/app/device/${id}/bySn`).then((res) => {
- // if (res.code == 200) {
- // uni.navigateTo({
- // url: '/page_components/bindsz?id=' + res.data.deviceId + '&sn=' + id
- // })
- // }
- // })
that.$u.put("/app/device/bind", data).then(res => {
- if (res.code == 200) {
- that.$u.get(`/app/device/${id}/bySn`).then((res) => {
- if (res.code == 200) {
- uni.navigateTo({
- url: '/page_components/bindsz?id=' + res.data.deviceId
- })
- }
- })
- }
- })
+ if (res.code == 200) {
+ that.$u.get(`/app/device/${id}/bySn`).then((res) => {
+ if (res.code == 200) {
+ uni.navigateTo({
+ url: '/page_components/bindsz?id=' + res.data.deviceId
+ })
+ }
+ })
+ }
+ })
}
}
})
@@ -414,8 +398,7 @@
success: function(res) {
if (res.confirm) {
uni.navigateTo({
- url: '/page_fenbao/zhuce?sn=' +
- id
+ url: '/page_fenbao/zhuce?sn=' + id
})
} else if (res.cancel) {
@@ -457,7 +440,6 @@
})
},
-
btnindex(num) {
if (this.wangluo = true) { //判断是否有网络在进行点击
if (num == 2) {
@@ -572,9 +554,6 @@
type: 'wgs84',
success: (res) => {
console.log(res,'resresres');
- // this.jinweidu = res.longitude + ',' + res.latitude;
- // this.latitude = res.latitude;
- // this.longitude = res.longitude;
this.jinweidu = res.longitude + ',' + res.latitude
this.latitude = Number(res.latitude.toFixed(5)) - 0.005
this.longitude = Number(res.longitude.toFixed(5)) + 0.005
@@ -598,27 +577,20 @@
anchorX: (() => {
if (item.name.length <= 2) {
return -12
- } else if (item.name.length <=
- 3) {
+ } else if (item.name.length <= 3) {
return -20
- } else if (item.name.length <=
- 4) {
+ } else if (item.name.length <= 4) {
return -25
- } else if (item.name.length <=
- 5) {
+ } else if (item.name.length <= 5) {
return -30
- } else if (item.name.length <=
- 6) {
+ } else if (item.name.length <= 6) {
return -35
- } else if (item.name.length <=
- 8) {
+ } else if (item.name.length <= 8) {
return -40
- } else if (item.name.length <=
- 10) {
+ } else if (item.name.length <= 10) {
return -45
} else {
- return -item.name.length *
- 6
+ return -item.name.length * 6
}
})(),
fontWeight: 700,
@@ -707,7 +679,6 @@
url: '/page_user/mapditu/index?markerId=' + markerId
})
},
-
logins() {
this.getuserinfo()
},
@@ -725,7 +696,6 @@
}
})
},
-
// 静默登录
jmlogin() {
let taht = this
@@ -750,7 +720,6 @@
})
},
-
// 判断是否充值失败 充值失败启用蓝牙离线充值
gethuidaio() {
this.$u.get('/app/bill/recharge/device/fail/list').then(res => {
@@ -826,16 +795,13 @@
width: 100%;
height: 400rpx;
padding: 30rpx;
- // padding-top: 80rpx;
box-sizing: border-box;
border-radius: 20rpx 20rpx 0 0;
-
.toptit {
width: 100%;
text-align: center;
margin-top: 30rpx;
}
-
.quzf {
width: 100%;
height: 90rpx;
@@ -847,26 +813,20 @@
margin-top: 60rpx;
border-radius: 20rpx;
}
-
}
-
/deep/ .u-title {
padding-bottom: 22rpx;
}
-
/deep/ .u-icon__icon {
padding-bottom: 22rpx;
}
-
/deep/ .map {
width: 100%;
height: 100%;
}
-
.dateactive {
background: #E1F3ED;
}
-
.mask {
width: 100%;
height: 100vh;
@@ -877,19 +837,16 @@
background-color: #000;
opacity: .6;
}
-
page {
background: linear-gradient(180deg, #8883F0 10%, rgba(255, 255, 255, 0) 100%);
border-radius: 0rpx 0rpx 0rpx 0rpx;
}
-
.page {
width: 750rpx;
padding-left: 34rpx;
padding-right: 34rpx;
box-sizing: border-box;
height: 100%;
-
.tip_box {
position: fixed;
left: 72rpx;
@@ -898,10 +855,8 @@
background: #F7FAFE;
border-radius: 30rpx 30rpx 30rpx 30rpx;
z-index: 10000000;
-
.top {
padding: 52rpx 38rpx 42rpx 36rpx;
-
.txt {
width: 100%;
text-align: center;
@@ -910,13 +865,11 @@
color: #3D3D3D;
}
}
-
.bot {
border-top: 2rpx solid #D8D8D8;
display: flex;
flex-wrap: nowrap;
height: 100%;
-
.bot_left {
width: 50%;
height: 98rpx;
@@ -927,24 +880,19 @@
font-size: 36rpx;
color: #3D3D3D;
}
-
.bot_right {
width: 50%;
height: 98rpx;
display: flex;
align-items: center;
justify-content: center;
-
border-left: 2rpx solid #D8D8D8;
font-weight: 500;
font-size: 36rpx;
color: #8883F0;
-
}
-
}
}
-
.userdaili {
.gongneng {
width: 680rpx;
@@ -953,43 +901,35 @@
border-radius: 24rpx 24rpx 24rpx 24rpx;
padding: 0 50rpx;
box-sizing: border-box;
-
.icons {
display: inline-block;
width: 145rpx;
text-align: center;
-
image {
margin-top: 34rpx;
width: 50px;
height: 50px;
}
}
-
}
-
.ordertongji {
width: 680rpx;
height: 342rpx;
background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx;
-
.shuju {
display: flex;
justify-content: space-between;
padding: 0 40rpx;
box-sizing: border-box;
margin-top: 24rpx;
-
.ddje {
text-align: center;
-
.shu {
font-weight: 500;
font-size: 40rpx;
color: #3D3D3D;
}
-
.sb {
margin-top: 20rpx;
font-weight: 500;
@@ -998,7 +938,6 @@
}
}
}
-
.date {
padding-left: 80rpx;
padding-right: 80rpx;
@@ -1006,7 +945,6 @@
display: flex;
justify-content: space-between;
margin-top: 26rpx;
-
text {
padding: 6rpx 18rpx;
box-sizing: border-box;
@@ -1016,14 +954,12 @@
color: #808080;
}
}
-
.orderday {
display: flex;
justify-content: space-between;
width: 100%;
padding: 10rpx 12rpx;
box-sizing: border-box;
-
text {
margin-right: 10rpx;
border-radius: 20rpx;
@@ -1036,14 +972,12 @@
}
}
}
-
.dttitle {
margin: 36rpx 0;
font-weight: 500;
font-size: 36rpx;
color: #3D3D3D;
}
-
.zhanghu {
margin-top: 32rpx;
width: 680rpx;
@@ -1052,40 +986,33 @@
border-radius: 24rpx 24rpx 24rpx 24rpx;
padding: 36rpx 38rpx;
box-sizing: border-box;
-
.zhtitle {
display: flex;
justify-content: space-between;
-
.sj {
display: flex;
justify-content: space-between;
-
text {
font-size: 26rpx;
color: #3D3D3D;
}
}
-
.tx {
font-size: 26rpx;
color: #27D089;
}
}
-
.zhje {
margin-top: 20rpx;
display: flex;
justify-content: space-between;
border-bottom: 1px solid #ccc;
padding-bottom: 20rpx;
-
text {
font-weight: 500;
font-size: 48rpx;
color: #3D3D3D;
}
-
.btntx {
width: 156rpx;
height: 42rpx;
@@ -1098,7 +1025,6 @@
margin-top: 10rpx;
}
}
-
.buc {
margin-top: 20rpx;
font-size: 26rpx;
@@ -1106,10 +1032,6 @@
}
}
}
-
-
-
-
//样式结束
.title {
font-weight: 500;
@@ -1120,18 +1042,15 @@
font-style: normal;
text-transform: none;
}
-
.guangg {
margin-top: 10rpx;
margin-bottom: 10rpx;
-
image {
border-radius: 30rpx;
width: 680rpx;
height: 218rpx;
}
}
-
.saoma {
width: 750rpx;
height: 166rpx;
@@ -1141,7 +1060,6 @@
padding-top: 22rpx;
border-radius: 54rpx 54rpx 0 0;
margin-top: 20rpx;
-
view {
text-align: center;
width: 676rpx;
@@ -1154,7 +1072,6 @@
margin: auto;
line-height: 102rpx;
}
-
image {
width: 56rpx;
height: 56rpx;
@@ -1163,7 +1080,6 @@
margin-bottom: 10rpx;
}
}
-
.ditu {
width: 100%;
height: 980rpx;
@@ -1171,21 +1087,17 @@
border-radius: 38rpx 38rpx 38rpx 38rpx;
padding-top: 16rpx;
position: relative;
-
.ongoing_order {
width: 622rpx;
max-height: 100%;
background-color: rgba(0, 0, 0, 0.4);
border-radius: 40rpx 40rpx 40rpx 40rpx;
- // opacity: 0.6;
position: absolute;
top: 48rpx;
left: 34rpx;
-
.order_list {
width: 100%;
height: 110rpx;
- // background-color: rgba(0, 0, 0, 0.6);
border-radius: 40rpx 40rpx 40rpx 40rpx;
display: flex;
align-items: center;
@@ -1197,13 +1109,11 @@
box-sizing: border-box;
line-height: 110rpx;
animation: fadeInDown .5s ease-out forwards;
-
image {
width: 17rpx;
height: 34rpx;
}
}
-
.order_top {
width: 622rpx;
height: 94rpx;
@@ -1218,18 +1128,15 @@
font-weight: 400;
font-size: 36rpx;
color: #FFFFFF;
-
.order_lt {
display: flex;
align-items: center;
-
image {
width: 44rpx;
height: 62rpx;
margin-right: 20rpx;
}
}
-
image {
width: 47rpx;
height: 47rpx;
@@ -1238,19 +1145,16 @@
}
}
}
-
.fujin {
position: absolute;
top: 730rpx;
padding-left: 30rpx;
width: 100%;
-
image {
width: 210rpx;
height: 74rpx;
}
}
-
.dtxs {
width: 642rpx;
height: 812rpx;
@@ -1258,20 +1162,17 @@
border-radius: 30rpx;
overflow: hidden;
}
-
.tubiao {
display: flex;
justify-content: space-between;
padding: 30rpx 50rpx;
box-sizing: border-box;
-
.gr {
text-align: center;
width: 100%;
font-weight: 400;
font-size: 26rpx;
color: #3D3D3D;
-
image {
display: block;
margin: auto;
@@ -1281,13 +1182,11 @@
}
}
}
-
@keyframes fadeInDown {
from {
opacity: 0;
transform: translateY(-20px);
}
-
to {
opacity: 1;
transform: translateY(0);