diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 89ac2fa..24c7385 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -16,7 +16,6 @@ const install = (Vue, vm) => {
// // 配置请求头信息
// header: {
// 'content-type': 'application/json;charset=UTF-8',
-
// },
// });
Vue.prototype.$u.http.setConfig({
diff --git a/page_components/bindsz.vue b/page_components/bindsz.vue
index 8fb44b1..0e0faad 100644
--- a/page_components/bindsz.vue
+++ b/page_components/bindsz.vue
@@ -294,6 +294,7 @@
},
onShow() {
+ this.wateringList = []
this.setMode == null
this.taocan = ''
this.getQiniuToken()
diff --git a/page_fenbao/statulist/myshop/index.vue b/page_fenbao/statulist/myshop/index.vue
index 3d97c1d..4ddd871 100644
--- a/page_fenbao/statulist/myshop/index.vue
+++ b/page_fenbao/statulist/myshop/index.vue
@@ -33,8 +33,14 @@
-
- 审核状态： {{item.status == 1 ? '正常' : '审核中'}}
+
+ 审核状态： 审核中
+
+
+ 审核状态： 正常
+
+
+ 是否生效： {{item.enabled == false ? '未生效' : '生效'}}
绑定人员：{{item.contactName}}
@@ -47,13 +53,11 @@
已运营{{item.daysDifference + 1}}天 {{item.createTime}}
-
暂无更多店铺...
-
@@ -107,8 +111,7 @@
// return;
// }
this.isLoading = true;
- this.$u.get("/app/store/list?pageNum=" + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' + this
- .keyword).then(res => {
+ this.$u.get("/app/store/list?pageNum=" + this.pagenum + '&pageSize=' + this.pagesize + '&keyword=' + this.keyword).then(res => {
if (res.code == 200) {
this.total = res.total
if (this.total > 0) {
@@ -123,28 +126,26 @@
// 计算创建到现在运行了多少天
this.wateringList.forEach((item, index) => {
- var dateTime = new Date(item.createTime);
+ var dateTime = new Date(item.createTime)
if (isNaN(dateTime.getTime())) {
- console.error(`无法解析日期时间字符串: ${item.createTime}`);
- return;
+ console.error(`无法解析日期时间字符串: ${item.createTime}`)
+ return
}
- var now = new Date().getTime();
+ var now = new Date().getTime()
var differenceInMilliseconds = now - dateTime.getTime();
- var differenceInDays = Math.floor(differenceInMilliseconds / (1000 * 60 *
- 60 * 24));
+ var differenceInDays = Math.floor(differenceInMilliseconds / (1000 * 60 * 60 * 24))
// 直接修改原数组中的对象，添加daysDifference属性
- item.daysDifference = differenceInDays;
- });
-
+ item.daysDifference = differenceInDays
+ })
} else {
// 没有更多数据
- this.noMoreData = true;
+ this.noMoreData = true
}
- this.isLoading = false;
+ this.isLoading = false
}
}).catch(error => {
- console.error('获取店铺失败:', error);
- this.isLoading = false; // 加载失败也标记为完成
+ console.error('获取店铺失败:', error)
+ this.isLoading = false // 加载失败也标记为完成
})
},
@@ -156,7 +157,7 @@
onReachBottom() {
let sum = this.total / this.pagesize
if (this.pagenum - 1 < sum) {
- this.getlist(); // 上拉加载更多
+ this.getlist() // 上拉加载更多
} else {
uni.showToast({
title: '没有更多店铺了',
@@ -195,21 +196,14 @@
.page {
width: 750rpx;
- // position: fixed;
- // top: 0;
- // left: 0;
height: 100vh;
.box {
width: 750rpx;
- // height: 100%;
- // background: #F4F5F7;
border-radius: 0rpx 0rpx 0rpx 0rpx;
padding-top: 150rpx;
.list {
- // overflow-y: scroll;
- // height: 100vh;
padding-bottom: 400rpx;
margin-top: 26rpx;
@@ -218,7 +212,7 @@
padding: 12rpx 38rpx;
box-sizing: border-box;
width: 680rpx;
- height: 490rpx;
+ height: 540rpx;
background: #FFFFFF;
border-radius: 38rpx 38rpx 38rpx 38rpx;
margin: auto;
@@ -271,7 +265,6 @@
.rishou {
margin-top: 26rpx;
- // padding: 0 28rpx;
box-sizing: border-box;
.rishouwz {
@@ -324,7 +317,6 @@
font-weight: 600;
font-size: 30rpx;
color: #3D3D3D;
- // padding: 10rpx 12rpx;
box-sizing: border-box;
}
diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue
index b5b71f9..c7c17a6 100644
--- a/page_fenbao/statulist/myshop/shopdetail/index.vue
+++ b/page_fenbao/statulist/myshop/shopdetail/index.vue
@@ -101,7 +101,7 @@
xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
xBlufi.notifyStartDiscoverBle({
'isStart': false
- });
+ })
},
onHide() {
xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
@@ -134,7 +134,7 @@
methods: {
btnsh(){
uni.navigateTo({
- url:'/page_fenbao/editshenhe?obj=' + JSON.stringify(this.listobj)
+ url:'/page_fenbao/editshenhe?storeId=' + this.storeId
})
},
getdetail() {
@@ -191,7 +191,7 @@
}
})
} else if (res.cancel) {
- console.log('用户点击了取消');
+ console.log('用户点击了取消')
}
}
})
@@ -267,7 +267,7 @@
url: '/page_fenbao/zhuce?sn=' + id
})
} else if (res.cancel) {
-
+
}
}
})
@@ -298,7 +298,7 @@
this.mac = device.name.substring(5)
this.devicesList = uniqueDevicesList;
}
-
+
})
} else {
uni.showToast({
diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue
index db52cdc..4330de3 100644
--- a/page_fenbao/statulist/myshop/shopxx/index.vue
+++ b/page_fenbao/statulist/myshop/shopxx/index.vue
@@ -166,13 +166,13 @@
uni.chooseImage({
count: 1,
success: (rst) => {
- this.url = rst.tempFilePaths[0];
+ this.url = rst.tempFilePaths[0]
}
})
},
onok(ev) {
- this.url = "";
- this.path = ev.path;
+ this.url = ""
+ this.path = ev.path
let _this = this
let math = 'static/' + _this.$u.guid(20)
wx.uploadFile({
@@ -337,8 +337,8 @@
btnjwd() {
uni.chooseLocation({
success: (res) => {
- this.latitude = res.latitude;
- this.longitude = res.longitude;
+ this.latitude = res.latitude
+ this.longitude = res.longitude
this.xqdz = res.name
},
fail: function(err) {
@@ -349,7 +349,7 @@
icon: 'none'
});
} else {
- console.log('选择位置失败', err);
+ console.log('选择位置失败', err)
// 处理其他失败情况
}
},
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 4567f05..035cda5 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -47,6 +47,7 @@
+
@@ -1225,7 +1226,7 @@
.card1 {
padding: 34rpx 0 0 40rpx;
width: 670rpx;
- height: 320rpx;
+ height: 300rpx;
background: #FFFFFF;
box-shadow: 0rpx 14rpx 35rpx 0rpx rgba(53, 140, 255, 0.1);
border-radius: 28rpx 28rpx 28rpx 28rpx;
@@ -1315,7 +1316,7 @@
}
.bot {
- margin-top: 53rpx;
+ margin-top: 20rpx;
display: flex;
flex-wrap: nowrap;
align-items: center;
diff --git a/page_user/yetx.vue b/page_user/yetx.vue
index 06bbca1..ecda377 100644
--- a/page_user/yetx.vue
+++ b/page_user/yetx.vue
@@ -135,7 +135,7 @@
},
onShow() {
this.gettxlist()
- this.getfuwu()
+ // this.getfuwu()
this.getinfo()
this.getuserinfo()
},
@@ -207,6 +207,7 @@
},
pay(index,id){
this.channelId = id
+ this.getfuwu()
this.currentindex=index
},
all(){
@@ -222,7 +223,7 @@
},
// 获取提现服务费
getfuwu(){
- this.$u.get('/app/bill/getWithdrawService?channelId=1').then((res) => {
+ this.$u.get(`/app/bill/getWithdrawService?channelId=${this.channelId}`).then((res) => {
if (res.code == 200) {
this.serviceType = res.data.serviceType
this.serviceRate = res.data.serviceRate