diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 0a8a705..89ac2fa 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -20,8 +20,8 @@ const install = (Vue, vm) => {
// },
// });
Vue.prototype.$u.http.setConfig({
- // baseUrl: 'http://192.168.2.143:10002',
- baseUrl: 'https://kg.chuangtewl.com/prod-api',
+ baseUrl: 'http://192.168.2.143:10002',
+ // baseUrl: 'https://kg.chuangtewl.com/prod-api',
// loadingText: '努力加载中~',
// loadingTime: 1000,
// 设置自定义头部content-type
@@ -126,7 +126,6 @@ const install = (Vue, vm) => {
})
}
},
-
})
}
diff --git a/page_fenbao/HM-dragSorts/HM-dragSorts.vue b/page_fenbao/HM-dragSorts/HM-dragSorts.vue
index db0c995..d6c02db 100644
--- a/page_fenbao/HM-dragSorts/HM-dragSorts.vue
+++ b/page_fenbao/HM-dragSorts/HM-dragSorts.vue
@@ -329,7 +329,7 @@
} else {
this.tcidlist.push(id);
}
- console.log(this.tcidlist);
+ // console.log(this.tcidlist);
this.$emit('update:tcidlist', this.tcidlist)
},
@@ -349,9 +349,9 @@
},
initList() {
- console.log(this.list,'020202');
+ // console.log(this.list,'020202');
let tmpList = JSON.parse(JSON.stringify(this.list));
- console.log(tmpList);
+ // console.log(tmpList);
for (let i = 0, len = tmpList.length; i < len; i++) {
// 组件内赋予临时id和sort
if (!tmpList[i].hasOwnProperty('HMDrag_id')) {
diff --git a/page_fenbao/statulist/taocanlist/addtaocan/index.vue b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
index 216ec33..74bf6cc 100644
--- a/page_fenbao/statulist/taocanlist/addtaocan/index.vue
+++ b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
@@ -5,27 +5,27 @@
+ justify-content: space-between;
+ width: 100%;
+ align-items: center;">
套餐名称
+ justify-content: space-between;
+ width: 100%;
+ align-items: center;margin-top: 30rpx;">
价格（元）
+ justify-content: space-between;
+ width: 100%;
+ align-items: center;margin-top: 30rpx;">
通电时长
@@ -67,6 +67,9 @@
删除
+
+ 取消
+
@@ -120,6 +123,9 @@
}
},
methods: {
+ btnqx(){
+ uni.navigateBack()
+ },
// bindPickerChange(e) {
// this.index = e.detail.value
// },
@@ -153,22 +159,33 @@
})
},
btndel() {
- this.$u.delete(`/app/suit/${this.suitId}`).then((res) => {
- if (res.code == 200) {
- uni.showToast({
- title: '删除成功',
- icon: 'success',
- duration: 1000,
- })
- setTimeout(() => {
- uni.navigateBack()
- }, 1000)
- } else {
- uni.showToast({
- title: res.msg,
- icon: 'none',
- duration: 1000,
- })
+ let that = this
+ uni.showModal({
+ title: '提示',
+ content: '您确定要删除该套餐吗？',
+ success: function(res) {
+ if (res.confirm) {
+ that.$u.delete(`/app/suit/${that.suitId}`).then((res) => {
+ if (res.code == 200) {
+ uni.showToast({
+ title: '删除成功',
+ icon: 'success',
+ duration: 1000,
+ })
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 1000)
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 1000,
+ })
+ }
+ })
+ } else if (res.cancel) {
+
+ }
}
})
},
@@ -387,7 +404,7 @@
filter: blur(0px);
margin: auto;
border-radius: 30rpx;
- padding: 15rpx 38rpx;
+ padding: 30rpx 38rpx;
box-sizing: border-box;
.title {
@@ -434,6 +451,21 @@
color: #FFFFFF;
border-radius: 50rpx;
}
+ .trueqx {
+ width: 290rpx;
+ height: 84rpx;
+ background: #ccc;
+ filter: blur(0px);
+ text-align: center;
+ line-height: 84rpx;
+ position: fixed;
+ bottom: 76rpx;
+ right: 33%;
+ transform: translateX(-50%);
+ font-size: 36rpx;
+ color: #FFFFFF;
+ border-radius: 50rpx;
+ }
}
}
\ No newline at end of file
diff --git a/page_fenbao/statulist/taocanlist/index.vue b/page_fenbao/statulist/taocanlist/index.vue
index 80bd5bc..1af14f8 100644
--- a/page_fenbao/statulist/taocanlist/index.vue
+++ b/page_fenbao/statulist/taocanlist/index.vue
@@ -111,7 +111,7 @@
methods: {
handleTcidlistUpdate(newTcidlist) {
// 这里是处理接收到的新 tcidlist 的地方
- console.log('接收到的 tcidlist:', newTcidlist);
+ // console.log('接收到的 tcidlist:', newTcidlist);
this.tcidlist = newTcidlist
},
@@ -125,7 +125,7 @@
}
})
let filteredArr = newSortedList.filter(item => item.suitId !== undefined)
- console.log("新的排列数据:", filteredArr)
+ // console.log("新的排列数据:", filteredArr)
setTimeout(() => {
this.$u.put("/app/suit/sort", filteredArr).then((res) => {
if (res.code == 200) {
@@ -152,13 +152,13 @@
if (res.code == 200) {
if (res.data.length > 0) {
this.titaoc = res.data
- let uniqueSuitIds = new Set();
+ let uniqueSuitIds = new Set()
this.list.forEach(item => {
if (this.titaoc.some(titaocItem => titaocItem.sourceId === item.suitId || titaocItem.suitId === item.suitId)) {
- uniqueSuitIds.add(item.suitId);
+ uniqueSuitIds.add(item.suitId)
}
})
- this.tcidlist = Array.from(uniqueSuitIds);
+ this.tcidlist = Array.from(uniqueSuitIds)
let matchedItems = this.list.filter(item => uniqueSuitIds.has(item.suitId))
let unmatchedItems = this.list.filter(item => !uniqueSuitIds.has(item.suitId))
this.list = matchedItems.concat(unmatchedItems)
diff --git a/page_user/cbRecord.vue b/page_user/cbRecord.vue
index 6853bc5..8963796 100644
--- a/page_user/cbRecord.vue
+++ b/page_user/cbRecord.vue
@@ -12,24 +12,30 @@
消费时间：{{item.createTime}}
-
- 未支付
+ 未支付
+
- 已退款
+ 已退款
+
- 已取消(用户)
+ 已取消(用户)
+
- 已取消(系统)
+ 已取消(系统)
+
- 支付中
- -->
+ 支付中
+
+
{{item.money}}元
diff --git a/page_user/switchs.vue b/page_user/switchs.vue
index 6237b01..f36c1f6 100644
--- a/page_user/switchs.vue
+++ b/page_user/switchs.vue
@@ -116,6 +116,8 @@
},
onShow() {
+ this.wateringList = []
+ this.pagenum = 1
this.getList()
},
// 分享到好友（会话）
diff --git a/page_user/txrecord.vue b/page_user/txrecord.vue
index e380198..8a1ef2b 100644
--- a/page_user/txrecord.vue
+++ b/page_user/txrecord.vue
@@ -2,9 +2,16 @@
-
+
- 成功提现
+ 提现
+ (审核中)
+ (审核通过)
+ (已拒绝)
+ (已打款)
+ (打款失败)
+ (打款中)
+
{{item.createTime}}
@@ -53,6 +60,11 @@
}
},
methods: {
+ btntx(billId){
+ uni.navigateTo({
+ url:'/page_user/mapditu/withdraw_xq?billId=' + billId
+ })
+ },
getDeviceList(){
this.$u.get("/app/bill/withdrawList?pageNum=1&pageSize=10").then((res) => {
if (res.code == 200) {
diff --git a/page_user/yetx.vue b/page_user/yetx.vue
index 11f3eaa..5213199 100644
--- a/page_user/yetx.vue
+++ b/page_user/yetx.vue
@@ -16,7 +16,7 @@
余额提现
- 提现明细
+ 提现记录
@@ -24,12 +24,15 @@
￥
-
+
全部提现
+
+ 提现服务费为 ￥{{serviceRates}}
+
@@ -51,7 +54,7 @@
-
+
+
-
+
确认提现
@@ -107,11 +111,15 @@
currentindex:0,
payType:1,
accountNo:'',
- userinfo:{}
-
+ userinfo:{},
+ serviceType:'',
+ serviceRate:'',
+ serviceRates:'',
+ sjmeoey:''
}
},
onShow() {
+ this.getfuwu()
this.getinfo()
this.getuserinfo()
},
@@ -132,6 +140,17 @@
}
},
methods: {
+ change(){
+ if(this.serviceType == 2){
+ this.serviceRates = this.serviceRate
+ this.sjmeoey = Number(this.money) - Number(this.serviceRates)
+ }else{
+ let qian = this.money * this.serviceRate / 100
+ this.serviceRates = qian
+ this.sjmeoey = Number(this.money) - Number(this.serviceRates)
+ }
+
+ },
// 跳转到提现记录
btntxrecord(){
uni.navigateTo({
@@ -157,6 +176,28 @@
},
all(){
this.money=this.userinfo.balance
+ if(this.serviceType == 2){
+ this.serviceRates = this.serviceRate
+ this.sjmeoey = Number(this.money) - Number(this.serviceRates)
+ }else{
+ let qian = this.money * this.serviceRate / 100
+ this.serviceRates = qian
+ this.sjmeoey = Number(this.money) - Number(this.serviceRates)
+ }
+ },
+ // 获取提现服务费
+ getfuwu(){
+ this.$u.get('/app/bill/getWithdrawService?channelId=1').then((res) => {
+ if (res.code == 200) {
+ this.serviceType = res.data.serviceType
+ this.serviceRate = res.data.serviceRate
+ if(this.serviceType == 2){
+ this.serviceRates = this.serviceRate
+ }else{
+ this.serviceRates = 0
+ }
+ }
+ })
},
sub(){
if(this.money<20){
@@ -173,12 +214,12 @@
});
}else{
let data ={
- // payPassword:'123456',
money:this.money,
- arrivalAmount:this.money,
- serviceCharge:0,
- channelId:this.payType,
- accountNo:this.accountNo
+ arrivalAmount:this.sjmeoey,
+ serviceCharge:this.serviceRates,
+ channelId:1,
+ serviceRate:this.serviceRate , //服务费
+ serviceType:this.serviceType //服务费收取方式
}
this.$u.post('/app/bill/withdraw',data).then((res) => {
if (res.code == 200) {
@@ -288,10 +329,10 @@
}
.ipt{
width: 60%;
- .u-input::placeholder {
- font-size: 20px;
- color: red;
- }
+ // .u-input::placeholder {
+ // font-size: 20px;
+ // color: red;
+ // }
}
.altx{
display: flex;
diff --git a/pages.json b/pages.json
index cea6f18..dd1f9b9 100644
--- a/pages.json
+++ b/pages.json
@@ -98,6 +98,16 @@
"navigationStyle": "custom"
}
},
+ {
+ "path": "mapditu/withdraw_xq",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#3996FD",
+ "navigationBarTextStyle": "#FFFFFF",
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "shouzhi",
"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index baf10a8..65d956b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -30,9 +30,9 @@
-
-
+
+
该店铺暂无设备...
-
+
@@ -219,6 +219,8 @@
touchStartX: 0, // 触屏起始点x
touchStartY: 0, // 触屏起始点y
+
+ xiaflag:true
}
},
onLoad() {
@@ -311,11 +313,14 @@
} else {
console.log(deltaY)
if (deltaY > 250) {
- this.shuaxin = true
- this.pagenum = 1
- setTimeout(() => {
- this.getlist()
- }, 1000)
+ if(this.xiaflag){
+ this.xiaflag = false
+ this.shuaxin = true
+ this.pagenum = 1
+ setTimeout(() => {
+ this.getlist()
+ }, 1000)
+ }
}
}
}
@@ -359,16 +364,10 @@
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) {
+ that.$u.get(`/app/device/${id}/bySn`).then((res) => {
+ if (res.code == 200) {
uni.navigateTo({
- url: '/page_components/bindsz?id=' +
- res
- .data
- .deviceId
+ url: '/page_components/bindsz?id=' + res.data.deviceId
})
}
})
@@ -534,7 +533,7 @@
this.groupList = res.data.filter(item => {
return item.name === '全部'
})
- // console.log(this.groupLists);
+ // console.log(this.groupLists,'第一');
this.storeId = this.groupList[0].storeId
this.getlist()
}
@@ -545,6 +544,7 @@
// if (this.storeId == null) {
this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
if (res.code == 200) {
+ this.xiaflag = true
this.shuaxin = false
this.total = res.total
if (res.rows.length > 0) {
@@ -569,7 +569,7 @@
})
this.wateringList.forEach(wateringItem => {
this.groupLists.forEach(groupItem => {
- if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId === wateringItem.storeId) {
+ if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId == wateringItem.storeId) {
if (!groupItem.wateringList.some(item => item.storeId === wateringItem.storeId)) {
groupItem.wateringList.push(wateringItem);
}
@@ -594,18 +594,20 @@
this.wateringList.forEach(wateringItem => {
this.groupLists[0].wateringList.push(wateringItem);
})
+ // console.log(this.groupLists,'020202');
this.wateringList.forEach(wateringItem => {
this.groupLists.forEach(groupItem => {
- if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId === wateringItem.storeId) {
+ if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId == wateringItem.storeId) {
groupItem.wateringList.push(wateringItem)
}
})
})
- // console.log(this.groupLists)
+ console.log(this.groupLists)
}
this.isLoading = false;
} else {
this.shuaxin = false
+ this.xiaflag = true
}
})
// } else {
@@ -973,7 +975,9 @@
this.pagenum = 1
this.curtitidx = e.detail.current
this.storeId = this.groupLists[this.curtitidx].storeId
- this.getlist()
+ // if(this.curtitidx == 0){
+ // this.getlist()
+ // }
},
getdevice() {
@@ -1008,6 +1012,7 @@
})
},
todetail(id) {
+ console.log(id);
uni.navigateTo({
url: '/page_user/sbdetail?id=' + id
})
@@ -1023,18 +1028,19 @@