This commit is contained in:
3321822538@qq.com 2024-09-12 18:02:26 +08:00
parent 935f4f2b07
commit ddefdbce5f
22 changed files with 118 additions and 150 deletions

View File

@ -20,8 +20,8 @@ const install = (Vue, vm) => {
// }, // },
// }); // });
Vue.prototype.$u.http.setConfig({ Vue.prototype.$u.http.setConfig({
baseUrl: 'http://192.168.2.81:3302', // baseUrl: 'http://192.168.2.81:3302',
// baseUrl: 'https://kang.chuangtewl.com/prod-api', baseUrl: 'https://kang.chuangtewl.com/prod-api',
loadingText: '努力加载中~', loadingText: '努力加载中~',
loadingTime: 800, loadingTime: 800,
// 设置自定义头部content-type // 设置自定义头部content-type

View File

@ -24,11 +24,15 @@
// background:'linear-gradient(to right, #FFEFEF 20%, #D9F6FF 100%)' // background:'linear-gradient(to right, #FFEFEF 20%, #D9F6FF 100%)'
}, },
cont:'', cont:'',
tit:'' tit:'',
type:''
} }
}, },
onLoad(option) { onLoad(option) {
this.tit = option.tit this.tit = option.tit
if(option.type){
this.type = option.type
}
this.getwz() this.getwz()
}, },
// //
@ -44,17 +48,25 @@
return { return {
title: '创亿康', title: '创亿康',
query: '', query: '',
path: '/pages/index/index' path: '/pages/index/index'
} }
}, },
methods: { methods: {
getwz(){ getwz(){
this.$u.get(`/app/article/useInfo`).then(res => { if(this.type == 'user'){
if(res.code == 200){ this.$u.get(`/app/article/licence/${this.type}`).then(res => {
this.cont = res.data.content if(res.code == 200){
} this.cont = res.data.content
}) }
} })
}else{
this.$u.get(`/app/article/useInfo`).then(res => {
if(res.code == 200){
this.cont = res.data.content
}
})
}
},
} }
} }
</script> </script>

View File

@ -39,7 +39,8 @@
<view v-if="item.bstType == 1">充值订单</view> <view v-if="item.bstType == 1">充值订单</view>
<view v-if="item.bstType == 2">订单退款</view> <view v-if="item.bstType == 2">订单退款</view>
<view v-if="item.bstType == 3">提现申请</view> <view v-if="item.bstType == 3">提现申请</view>
<view style="color: #8883F0;">{{item.amount}}</view> <view style="color: #f9693c;" v-if="item.amount < 0">{{item.amount}}</view>
<view style="color: #8883f0;" v-else>{{item.amount}}</view>
</view> </view>
<view class="yiy"> <view class="yiy">
<view>{{item.createTime}}</view> <view>{{item.createTime}}</view>

View File

@ -223,7 +223,7 @@
// //
getlistcs() { getlistcs() {
this.isLoading = true this.isLoading = true
this.$u.get(`/store/device/list?isDefault=true&pageNum=${this.pagenum}&pageSize=${this.pagesize}&keyword=${this.keyword}`).then(res => { this.$u.get(`/app/store/list?isDefault=true&pageNum=${this.pagenum}&pageSize=${this.pagesize}&keyword=${this.keyword}`).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
if (this.total > 0) { if (this.total > 0) {
@ -292,7 +292,7 @@
} }
.list{ .list{
width: 680rpx; width: 680rpx;
height: 590rpx; max-height: 590rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 38rpx 38rpx 38rpx 38rpx; border-radius: 38rpx 38rpx 38rpx 38rpx;
margin: auto; margin: auto;

View File

@ -198,7 +198,7 @@
.jiben { .jiben {
width: 680rpx; width: 680rpx;
height: 400rpx; max-height: 400rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx; border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto; margin: auto;

View File

@ -17,7 +17,7 @@
<scroll-view scroll-y="true" @scrolltolower="onScrollToLower" style="height: 1360rpx;" class="order_list"> <scroll-view scroll-y="true" @scrolltolower="onScrollToLower" style="height: 1360rpx;" class="order_list">
<view class="order_item" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.userId)"> <view class="order_item" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.userId)">
<view class="tops"> <view class="tops">
<view>{{item.userName == undefined ? '--' : item.userName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}</view> <view>{{item.realOrUserName == undefined ? '--' : item.realOrUserName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}</view>
<view style="color: #8883F0;"> 查看详情 </view> <view style="color: #8883F0;"> 查看详情 </view>
</view> </view>
<view class="devixexq"> <view class="devixexq">
@ -41,7 +41,7 @@
<view class="zong"> <view class="zong">
<view class="xiaoav"> <view class="xiaoav">
<view class="">订单总额</view> <view class="">订单总额</view>
<view class="shu">{{item.totalIncome == undefined ? '--' : item.totalIncome}}</view> <view class="shu">{{item.billAmount == undefined ? '--' : item.billAmount}}</view>
</view> </view>
<view class="xiaoav"> <view class="xiaoav">
<view class="">提供分成</view> <view class="">提供分成</view>
@ -155,7 +155,7 @@
// overflow: scroll; // overflow: scroll;
.order_item { .order_item {
width: 672rpx; width: 672rpx;
height: 458rpx; max-height: 458rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07); box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07);
border-radius: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx;

View File

@ -4,7 +4,7 @@
title-size='36' height='44'></u-navbar> title-size='36' height='44'></u-navbar>
<view class="xqtop"> <view class="xqtop">
<view class="tit"> <view class="tit">
{{obj.userName == undefined ? '--' : obj.userName}} {{obj.realOrUserName == undefined ? '--' : obj.realOrUserName}}
</view> </view>
<view class="xiao"> <view class="xiao">
<view class="one">推广人</view> <view class="one">推广人</view>
@ -154,7 +154,7 @@
} }
.jiben{ .jiben{
width: 680rpx; width: 680rpx;
height: 480rpx; max-height: 480rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx; border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto; margin: auto;

View File

@ -17,8 +17,8 @@
<view class="devixexq"> <view class="devixexq">
<view class="xiaoav"> <view class="xiaoav">
<view class="">设备状态</view> <view class="">设备状态</view>
<view style="color: springgreen;" v-if="obj.status == 2">使用中</view> <view style="color: rgb(18, 210, 172);;" v-if="obj.status == 2">使用中</view>
<view style="color: springgreen;" v-if="obj.status == 1">正常</view> <view style="color: rgb(18, 210, 172);;" v-if="obj.status == 1">正常</view>
<view style="color: red;" v-if="obj.status == 3">不可用</view> <view style="color: red;" v-if="obj.status == 3">不可用</view>
</view> </view>
<view class="xiaoav"> <view class="xiaoav">

View File

@ -55,8 +55,8 @@
<view class="devixexq"> <view class="devixexq">
<view class="xiaoav"> <view class="xiaoav">
<view class="">设备状态</view> <view class="">设备状态</view>
<view style="color: springgreen;" v-if="item.status == 2">使用中</view> <view style="color: rgb(18, 210, 172);;" v-if="item.status == 2">使用中</view>
<view style="color: springgreen;" v-if="item.status == 1">正常</view> <view style="color: rgb(18, 210, 172);;" v-if="item.status == 1">正常</view>
<view style="color: red;" v-if="item.status == 3">不可用</view> <view style="color: red;" v-if="item.status == 3">不可用</view>
</view> </view>
<view class="xiaoav"> <view class="xiaoav">
@ -132,7 +132,8 @@
keyword: '', keyword: '',
statusList: '', statusList: '',
deviceId: '', deviceId: '',
type:'' type:'',
isUsing:''
} }
}, },
onLoad(option) { onLoad(option) {
@ -165,26 +166,31 @@
this.wateringList = [] this.wateringList = []
this.pagenum = 1 this.pagenum = 1
this.statusList = '' this.statusList = ''
this.isUsing = ''
this.getlist() this.getlist()
} else if (num == 2) { } else if (num == 2) {
this.wateringList = [] this.wateringList = []
this.pagenum = 1 this.pagenum = 1
this.statusList = 2 this.statusList = 2
this.isUsing = true
this.getlist() this.getlist()
} else if (num == 3) { } else if (num == 3) {
this.wateringList = [] this.wateringList = []
this.pagenum = 1 this.pagenum = 1
this.statusList = 1 this.statusList = 1
this.isUsing = false
this.getlist() this.getlist()
} else if (num == 4) { } else if (num == 4) {
this.wateringList = [] this.wateringList = []
this.pagenum = 1 this.pagenum = 1
this.statusList = 3 this.statusList = 3
this.isUsing = ''
this.getlist() this.getlist()
} else { } else {
this.wateringList = [] this.wateringList = []
this.pagenum = 1 this.pagenum = 1
this.statusList = '2,3' this.statusList = '2,3'
this.isUsing = ''
this.getlist() this.getlist()
} }
}, },
@ -290,7 +296,7 @@
// //
if(this.type == 2){ if(this.type == 2){
this.$u.get( this.$u.get(
`/agent/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}` `/agent/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}&isUsing=${this.isUsing}`
).then(res => { ).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
@ -304,7 +310,7 @@
// //
}else if(this.type == 4){ }else if(this.type == 4){
this.$u.get( this.$u.get(
`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}` `/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}&isUsing=${this.isUsing}`
).then(res => { ).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
@ -318,7 +324,7 @@
// //
}else if(this.type == 3){ }else if(this.type == 3){
this.$u.get( this.$u.get(
`/biz/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}` `/biz/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}&isUsing=${this.isUsing}`
).then(res => { ).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
@ -332,7 +338,7 @@
// //
}else if(this.type == 5){ }else if(this.type == 5){
this.$u.get( this.$u.get(
`store/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}` `store/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&statusList=${this.statusList}&keyword=${this.keyword}&isUsing=${this.isUsing}`
).then(res => { ).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.total = res.total this.total = res.total
@ -445,7 +451,7 @@
box-sizing: border-box; box-sizing: border-box;
.list_item { .list_item {
height: 618rpx; max-height: 618rpx;
padding: 24rpx 28rpx; padding: 24rpx 28rpx;
box-sizing: border-box; box-sizing: border-box;
background-color: #fff; background-color: #fff;

View File

@ -18,37 +18,6 @@
<!-- <text>客服</text> --> <!-- <text>客服</text> -->
</view> </view>
</view> </view>
<!-- 检测蓝牙未开启 -->
<!-- <view class="shibai" v-if="lanyaflag">
<view class="top">
设备离线
</view>
<view class="tishi">
检测到该设备离线,请打开蓝牙进行蓝牙模式
</view>
<view class="li">
<view class="wz">
第一检查手机蓝牙是否打开
</view>
<image style="width: 386rpx;height: 263rpx;"
src="https://api.ccttiot.com/smartmeter/img/static/uM4DY4Ee9AgFHLv4bIDR" mode=""></image>
</view>
<view class="li">
<view class="wz">
第二设置小程序蓝牙授权
</view>
<image style="width: 368rpx;height: 151rpx;"
src="https://api.ccttiot.com/smartmeter/img/static/uAj06uo9qysixLrcFHBn" mode=""></image>
<image style="width: 386rpx;height: 301rpx;"
src="https://api.ccttiot.com/smartmeter/img/static/ugFSKFZn4mzJJHQx3K2Z" mode=""></image>
<image style="width: 386rpx;height: 330rpx;"
src="https://api.ccttiot.com/smartmeter/img/static/uZ4XoCI2KNQzcPKbwGLN" mode=""></image>
</view>
<view class="jxcz" @click="btnjxcz">
我已知晓
</view>
</view> -->
<view class=""> <view class="">
<!-- 套餐 --> <!-- 套餐 -->
@ -74,19 +43,21 @@
<view class="shuomtit"> <view class="shuomtit">
功能介绍 功能介绍
</view> </view>
<view class="cont"> <view class="cont" style="height: 208rpx;">
{{obj.funcInfo == undefined ? '' : obj.funcInfo}} {{obj.funcInfo == undefined ? '暂无介绍...' : obj.funcInfo}}
</view> </view>
</view> </view>
<view class="shuom" style="max-height: 200rpx;margin-top: 30rpx;"> <view class="shuom" style="max-height: 220rpx;margin-top: 30rpx;">
<view class="shuomtit"> <view class="shuomtit">
设备地址 设备地址
</view> </view>
<view class="shuomwz"> <view class="shuomwz">
<image style="width: 30rpx;height: 30rpx;margin-right: 6rpx;" src="https://api.ccttiot.com/smartmeter/img/static/umUFE9oFeYo2Q7atp3jv" mode=""></image> {{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}} <image style="width: 30rpx;height: 30rpx;margin-right: 6rpx;" src="https://api.ccttiot.com/smartmeter/img/static/umUFE9oFeYo2Q7atp3jv" mode=""></image>
{{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}
</view> </view>
<view class="shuomwz"> <view class="shuomwz">
<image style="width: 30rpx;height: 30rpx;margin-right: 6rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uHHgD7nRON3WTmomzKVE" mode=""></image> {{obj.storeAddress == undefined ? '' : obj.storeAddress}} <image style="width: 30rpx;height: 30rpx;margin-right: 6rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uHHgD7nRON3WTmomzKVE" mode=""></image>
{{obj.storeAddress ? (obj.storeAddress.length > 18 ? obj.storeAddress.substring(0, 18) + '...' : obj.storeAddress) : '' }}
</view> </view>
</view> </view>
@ -261,31 +232,10 @@
} }
}, },
methods: { methods: {
//
// btnjxcz() {
// this.czflag = false
// xBlufi.initXBlufi(1)
// xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
// xBlufi.notifyStartDiscoverBle({
// 'isStart': true
// })
// setTimeout(() => {
// xBlufi.notifyStartDiscoverBle({
// 'isStart': false
// })
// if (this.devicesList.length > 0) {
// xBlufi.notifyConnectBle({
// isStart: true,
// deviceId: this.deviceId,
// name: this.name
// })
// }
// }, 2000)
// },
// //
btnxieyi(){ btnxieyi(){
uni.navigateTo({ uni.navigateTo({
url: '/page_fenbao/shiyong?tit=' + '用户服务协议' url: '/page_fenbao/shiyong?tit=' + '用户服务协议' + '&type=' + 'user'
}) })
}, },
// //

View File

@ -96,15 +96,17 @@
</view> </view>
<!-- 结束订单 --> <!-- 结束订单 -->
<view class="jieshu" v-if="msakflag"> <view class="jieshu" v-if="msakflag">
<view class="tishi"> <view class="jieshus">
温馨提示 <view class="tishi">
</view> 温馨提示
<view class="img"> </view>
<image src="https://api.ccttiot.com/smartmeter/img/static/uKR4t1SZuW0VrpwgyXDK" mode=""></image> <view class="img">
</view> <image src="https://api.ccttiot.com/smartmeter/img/static/uKR4t1SZuW0VrpwgyXDK" mode=""></image>
<view class="shuom"> </view>
结束订单后设备也将被关闭<br> <view class="shuom">
套餐费用不予退还是否结束? 结束订单后设备也将被关闭<br>
套餐费用不予退还是否结束?
</view>
</view> </view>
<view class="anniu"> <view class="anniu">
<view class="qux" @click="btnqx"> <view class="qux" @click="btnqx">
@ -841,18 +843,19 @@
} }
.jieshu { .jieshu {
width: 500rpx;
height: 436rpx;
border-radius: 20rpx;
padding: 20rpx;
box-sizing: border-box;
position: fixed; position: fixed;
top: 30%; top: 30%;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
background-color: #fff;
z-index: 2; z-index: 2;
.jieshus{
width: 500rpx;
max-height: 430rpx;
border-radius: 20rpx 20rpx 0 0;
padding: 20rpx;
box-sizing: border-box;
background-color: #fff;
}
.tishi { .tishi {
font-size: 32rpx; font-size: 32rpx;
width: 100%; width: 100%;
@ -881,8 +884,8 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
margin-top: 30rpx; background-color: #fff;
border-radius: 0 0 20rpx 20rpx;
.qux { .qux {
text-align: center; text-align: center;
width: 100%; width: 100%;
@ -1002,7 +1005,7 @@
.list_item { .list_item {
width: 658rpx; width: 658rpx;
height: 380rpx; max-height: 380rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1); box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
border-radius: 24rpx 24rpx 24rpx 24rpx; border-radius: 24rpx 24rpx 24rpx 24rpx;

View File

@ -8,29 +8,29 @@
<view class="bh"> <view class="bh">
设备编号{{item.deviceNo}} 设备编号{{item.deviceNo}}
</view> </view>
<view class="wc" v-if="item.status == 2"> <view class="wc" v-if="item.status == 2" style="color: #e6b000;">
已支付 已支付
</view> </view>
<view class="wc" v-if="item.status == 1"> <view class="wc" v-if="item.status == 1" style="color: #004fd8;">
未支付 未支付
</view> </view>
<view class="wc" v-if="item.status == 3"> <view class="wc" v-if="item.status == 3" style="color: #e10328;">
已退款 已退款
</view> </view>
<view class="wc" style="color: #ccc;" v-if="item.status == 4"> <view class="wc" v-if="item.status == 4" style="color: #5d5d5d;">
已取消(用户) 已取消(用户)
</view> </view>
<view class="wc" style="color: #ccc;" v-if="item.status == 5"> <view class="wc" v-if="item.status == 5" style="color: #5d5d5d;">
已取消(系统) 已取消(系统)
</view> </view>
<view class="wc" v-if="item.status == 6"> <view class="wc" v-if="item.status == 6" style="color: #e6b000;">
支付中 支付中
</view> </view>
<view class="wc" v-if="item.status == 7"> <view class="wc" v-if="item.status == 7" style="color: #e10328;">
退款中 退款中
</view> </view>
</view> </view>
<view class="item_xx"> <view class="item_xx">
<view class=""> <view class="">
订单号 订单号
</view> </view>
@ -192,7 +192,7 @@
.list_item { .list_item {
width: 658rpx; width: 658rpx;
height: 418rpx; max-height: 418rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1); box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
border-radius: 24rpx 24rpx 24rpx 24rpx; border-radius: 24rpx 24rpx 24rpx 24rpx;

View File

@ -26,18 +26,18 @@
<view class="order_item" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.billId)"> <view class="order_item" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.billId)">
<view class="tops"> <view class="tops">
<view>订单编号{{item.billNo}}</view> <view>订单编号{{item.billNo}}</view>
<view style="color: #8883F0;" v-if="item.isUsing == true"> <text></text> 进行中 </view> <view style="color: #17b402;" v-if="item.isUsing == true"> <text></text> 进行中 </view>
<view style="color: springgreen;" v-if="item.isFinished == true"> <text style="background-color: springgreen;"></text> 已完成 </view> <view style="color: #ec6941;" v-if="item.isFinished == true"> <text style="background-color: #ec6941;"></text> 已完成 </view>
<view class="" v-if="item.isUsing == false && item.isFinished == false"> <view class="" v-if="item.isUsing == false && item.isFinished == false">
<view v-if="item.status == 1" style="color: #ccc;"><text style="background-color: #ccc;"></text> 未支付</view> <view v-if="item.status == 1" style="color: #004fd8;"><text style="background-color: #004fd8;"></text> 未支付</view>
<view v-if="item.status == 2" style="color: springgreen;"><text style="background-color: springgreen;"></text> 支付成功</view> <view v-if="item.status == 2" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 支付成功</view>
<view v-if="item.status == 3" style="color: red;"><text style="background-color: red;"></text> 已退款</view> <view v-if="item.status == 3" style="color: #e10328;"><text style="background-color: #e10328;"></text> 已退款</view>
<view v-if="item.status == 4" style="color: #ccc;"><text style="background-color: #ccc;"></text> 用户取消</view> <view v-if="item.status == 4" style="color: #5d5d5d;"><text style="background-color: #5d5d5d;"></text> 用户取消</view>
<view v-if="item.status == 5" style="color: red;"><text style="background-color: red;"></text> 系统超时取消</view> <view v-if="item.status == 5" style="color: #5d5d5d;"><text style="background-color: #5d5d5d;"></text> 系统超时取消</view>
<view v-if="item.status == 6" style="color: #ccc;"><text style="background-color: #ccc;"></text> 支付中</view> <view v-if="item.status == 6" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 支付中</view>
<view v-if="item.status == 7" style="color: #ccc;"><text style="background-color: #ccc;"></text> 退款中</view> <view v-if="item.status == 7" style="color: #e10328;"><text style="background-color: #e10328;"></text> 退款中</view>
<view v-if="item.status == 8" style="color: #ccc;"><text style="background-color: #ccc;"></text> 押金未支付</view> <view v-if="item.status == 8" style="color: #004fd8;"><text style="background-color: #004fd8;"></text> 押金未支付</view>
<view v-if="item.status == 9" style="color: #ccc;"><text style="background-color: #ccc;"></text> 押金已支付</view> <view v-if="item.status == 9" style="color: #e6b000;"><text style="background-color: #e6b000;"></text> 押金已支付</view>
</view> </view>
</view> </view>
<view class="xiao"> <view class="xiao">
@ -264,7 +264,7 @@
overflow: scroll; overflow: scroll;
.order_item{ .order_item{
width: 672rpx; width: 672rpx;
height: 512rpx; max-height: 512rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0,0,0,0.07); box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0,0,0,0.07);
border-radius: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx;

View File

@ -189,7 +189,7 @@
.botwz{ .botwz{
margin-top: 20rpx; margin-top: 20rpx;
color: #8883F0; color: #8883F0;
font-size: 28rpx; font-size: 32rpx;
width: 100%; width: 100%;
text-align: center; text-align: center;
} }

View File

@ -107,7 +107,7 @@
sjmeoey:'', sjmeoey:'',
txlist:'', txlist:'',
channelId:'', channelId:'',
btnmsk:false, btnmsk:true,
listflag:true listflag:true
} }
}, },

View File

@ -17,7 +17,7 @@
<scroll-view scroll-y="true" @scrolltolower="onScrollToLower" style="height: 1360rpx;" class="order_list"> <scroll-view scroll-y="true" @scrolltolower="onScrollToLower" style="height: 1360rpx;" class="order_list">
<view class="order_item" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.userId)"> <view class="order_item" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.userId)">
<view class="tops"> <view class="tops">
<view>{{item.userName == undefined ? '--' : item.userName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}</view> <view>{{item.realOrUserName == undefined ? '--' : item.realOrUserName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}</view>
<view style="color: #8883F0;"> 查看详情 </view> <view style="color: #8883F0;"> 查看详情 </view>
</view> </view>
<view class="devixexq"> <view class="devixexq">
@ -174,7 +174,7 @@
// overflow: scroll; // overflow: scroll;
.order_item { .order_item {
width: 672rpx; width: 672rpx;
height: 370rpx; max-height: 370rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07); box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07);
border-radius: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx;

View File

@ -4,7 +4,7 @@
title-size='36' height='44'></u-navbar> title-size='36' height='44'></u-navbar>
<view class="xqtop"> <view class="xqtop">
<view class="tit"> <view class="tit">
{{obj.userName == undefined ? '--' : obj.userName}} {{obj.realOrUserName == undefined ? '--' : obj.realOrUserName}}
</view> </view>
<view class="xiao"> <view class="xiao">
<view class="one">直属合作伙伴</view> <view class="one">直属合作伙伴</view>
@ -142,7 +142,7 @@
} }
.jiben{ .jiben{
width: 680rpx; width: 680rpx;
height: 390rpx; max-height: 390rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx; border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto; margin: auto;

View File

@ -17,7 +17,7 @@
<scroll-view scroll-y="true" @scrolltolower="onScrollToLower" style="height: 1360rpx;" class="order_list"> <scroll-view scroll-y="true" @scrolltolower="onScrollToLower" style="height: 1360rpx;" class="order_list">
<view class="order_item" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.userId)"> <view class="order_item" v-for="(item,index) in wateringList" :key="index" @click="btndetail(item.userId)">
<view class="tops"> <view class="tops">
<view>{{item.userName == undefined ? '--' : item.userName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}</view> <view>{{item.realOrUserName == undefined ? '--' : item.realOrUserName}} {{item.phonenumber == undefined ? '--' : item.phonenumber}}</view>
<view style="color: #8883F0;"> 查看详情 </view> <view style="color: #8883F0;"> 查看详情 </view>
</view> </view>
<view class="devixexq"> <view class="devixexq">
@ -41,7 +41,7 @@
<view class="zong"> <view class="zong">
<view class="xiaoav"> <view class="xiaoav">
<view class="">订单总额</view> <view class="">订单总额</view>
<view class="shu">{{item.totalIncome == undefined ? '--' : item.totalIncome}}</view> <view class="shu">{{item.billAmount == undefined ? '--' : item.billAmount}}</view>
</view> </view>
<view class="xiaoav"> <view class="xiaoav">
<view class="">提供分成</view> <view class="">提供分成</view>
@ -185,7 +185,7 @@
// overflow: scroll; // overflow: scroll;
.order_item { .order_item {
width: 672rpx; width: 672rpx;
height: 458rpx; max-height: 458rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07); box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07);
border-radius: 20rpx 20rpx 20rpx 20rpx; border-radius: 20rpx 20rpx 20rpx 20rpx;

View File

@ -4,7 +4,7 @@
title-size='36' height='44'></u-navbar> title-size='36' height='44'></u-navbar>
<view class="xqtop"> <view class="xqtop">
<view class="tit"> <view class="tit">
{{obj.userName == undefined ? '--' : obj.userName}} {{obj.realOrUserName == undefined ? '--' : obj.realOrUserName}}
</view> </view>
<view class="xiao"> <view class="xiao">
<view class="one">推广人</view> <view class="one">推广人</view>
@ -150,7 +150,7 @@
} }
.jiben{ .jiben{
width: 680rpx; width: 680rpx;
height: 480rpx; max-height: 480rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 24rpx 24rpx 24rpx 24rpx; border-radius: 24rpx 24rpx 24rpx 24rpx;
margin: auto; margin: auto;

View File

@ -44,7 +44,7 @@
</view> </view>
<view class="chakan" @click="btnchak(listobj.storeId)"> <view class="chakan" @click="btnchak(listobj.storeId)">
<view class=""> <view class="">
本店共有{{listobj.deviceCount == undefined ? '--' : listobj.deviceCount}}个设备 本店共有{{listobj.deviceCount == undefined ? '--' : listobj.deviceCount}}
</view> </view>
<view class=""> <view class="">
查看 <u-icon name="arrow-right" color="#6863D9" size="24" style="margin-left: 10rpx;"></u-icon> 查看 <u-icon name="arrow-right" color="#6863D9" size="24" style="margin-left: 10rpx;"></u-icon>
@ -144,7 +144,7 @@
}, },
addMarkersWithoutLabels() { addMarkersWithoutLabels() {
this.listmap.forEach((item) => { this.listmap.forEach((item) => {
// if (item.deviceCount !== null && item.deviceCount > 0){ // if (item.deviceCount !== null && item.deviceCount > 0){
const shopCover = { const shopCover = {
id: parseFloat(item.storeId), id: parseFloat(item.storeId),
latitude: item.lat, latitude: item.lat,
@ -252,8 +252,7 @@
(res) => { (res) => {
if (res.code == 200) { if (res.code == 200) {
uni.navigateTo({ uni.navigateTo({
url: '/page_user/fuwu?id=' + url: '/page_user/fuwu?id=' + id
id
}) })
} }
}) })
@ -264,12 +263,9 @@
success: function(res) { success: function(res) {
if (res.confirm) { if (res.confirm) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/zhuce?sn=' + url: '/pages/zhuce?sn=' + id
id
}) })
} else if (res.cancel) { }
}
} }
}) })
} }

View File

@ -14,10 +14,10 @@
<view class="card_left_tit"> <view class="card_left_tit">
{{item.deviceName == null ? '--' : item.deviceName}} {{item.deviceName == null ? '--' : item.deviceName}}
</view> </view>
<view class="card_left_sta" v-if="item.status == 1"> <view class="card_left_sta" v-if="item.isUsing == false">
可使用 可使用
</view> </view>
<view class="card_left_sta" v-if="item.status == 2"> <view class="card_left_sta" v-else>
使用中 使用中
</view> </view>
</view> </view>

View File

@ -29,7 +29,7 @@
{{item.address}} {{item.address}}
</view> </view>
<view class="cenc"> <view class="cenc">
经营时间{{item.businessTimeStart}}-{{item.businessTimeEnd}}<text class="bu">可使用{{item.deviceCount}}</text> 经营时间{{item.businessTimeStart}}-{{item.businessTimeEnd}}<text class="bu">总数量{{item.deviceCount}}</text>
</view> </view>
</view> </view>
<view class="right"> <view class="right">