From 26ecdffbec59f2c2d70ea1da2508708b40c84d41 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Fri, 6 Sep 2024 18:02:39 +0800
Subject: [PATCH] =?UTF-8?q?111=E5=BA=8A=E5=9E=AB=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_user/changsuo.vue   |  6 +-----
 page_user/creadtg.vue    |  1 +
 page_user/devicelist.vue |  2 +-
 page_user/fuwu.vue       | 34 +++++++++++-----------------------
 page_user/homepage.vue   |  6 +++---
 page_user/promote.vue    | 17 +++++++++--------
 page_user/touzi.vue      | 20 +++++++++++++++-----
 page_user/tuiguang.vue   |  6 +++---
 page_user/yewuyuan.vue   | 18 ++++++++++++++----
 pages/index/index.vue    |  5 +++--
 10 files changed, 61 insertions(+), 54 deletions(-)

diff --git a/page_user/changsuo.vue b/page_user/changsuo.vue
index 6bbc56d..054473e 100644
--- a/page_user/changsuo.vue
+++ b/page_user/changsuo.vue
@@ -157,9 +157,7 @@
 			onScrollToLower() {
 				if (this.total > this.wateringList.length) {
 					this.getlist() // 上拉加载更多  
-				} else {
-			        
-				}
+				} 
 			},
 			// 搜索
 			serch(){
@@ -167,8 +165,6 @@
 				this.getlist()
 			},
 			
-			
-			
              btnxq(storeId){
 				 uni.navigateTo({
 				 	url:'/page_user/changsuoxq?storeId=' + storeId
diff --git a/page_user/creadtg.vue b/page_user/creadtg.vue
index 5bbf3e1..1ffa522 100644
--- a/page_user/creadtg.vue
+++ b/page_user/creadtg.vue
@@ -82,6 +82,7 @@
            
 		},
 		onShow() {
+			this.lists = []
 			this.getinfo()
 		},
 		// 分享到好友（会话）
diff --git a/page_user/devicelist.vue b/page_user/devicelist.vue
index 5e619d6..963d997 100644
--- a/page_user/devicelist.vue
+++ b/page_user/devicelist.vue
@@ -47,7 +47,7 @@
 					<view class="fj">所在房间</view>
 					<input type="text" v-model="room" :placeholder="item.room == undefined ? '无' : item.room"
 						@click.stop="" />
-					<view class="btn" @click.stop="btnedit(item.deviceId)">修改</view>
+					<view class="btn" @click.stop="btnedit(item.deviceId)" v-if="type == 2">修改</view>
 				</view>
 				<view class="devixexq">
 					<view class="xiaoav">
diff --git a/page_user/fuwu.vue b/page_user/fuwu.vue
index 98e0cdb..5b164b8 100644
--- a/page_user/fuwu.vue
+++ b/page_user/fuwu.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="pages">
 		<view class="title">
-			<image src="https://api.ccttiot.com/smartmeter/img/static/us3fy7PWk14FUljNypKh" mode=""
-				style="width: 60rpx;height: 60rpx;margin-right: 10rpx;vertical-align: bottom;vertical-align: bottom;"
+			<image src="https://api.ccttiot.com/smartmeter/img/static/ux6MC6FBl41qHB3f2SZh" mode=""
+				style="width: 54rpx;height: 56rpx;margin-right: 10rpx;vertical-align: bottom;vertical-align: bottom;"
 				@click="btnshouye"></image>
 			<text style="width: 80%;text-align: center;display: inline-block;">{{obj.deviceName}}</text>
 			<view class="wz" @click="call" style="text-align: right;padding-right: 50rpx;"
@@ -52,7 +52,7 @@
 				填充物：{{obj.fill == undefined ? '--' : obj.fill}}
 			</view>
 			<view class="shuomwz">
-				设备地址：{{sbobj.storeName == undefined ? '' : sbobj.storeName}} {{obj.room == undefined ? '--' : obj.room}}
+				设备地址：{{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}
 			</view>
 		</view>
 
@@ -103,18 +103,19 @@
 				suitFeeMode:'',
 				suitFeeType:'',
 				title:'',
-				sbobj:{}
+				sbobj:{},
+				onlineStatus:''
 			}
 		},
 		onLoad(option) {
 			if (option.q) {
 				function getQueryParam(url, paramName) {
-					let regex = new RegExp(`[?&]${paramName}=([^&]*)`);
+					let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
 					let results = regex.exec(url);
 					return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
 				}
 				this.sceneValue = option.q
-				let decodedValue = decodeURIComponent(this.sceneValue);
+				let decodedValue = decodeURIComponent(this.sceneValue)
 				this.id = getQueryParam(decodedValue, 's')
 				this.$u.get(`/app/user/userInfo`).then(res => {
 					if(res.code == 200){
@@ -137,8 +138,6 @@
 					}
 				})
 			}
-
-
 		},
 		// 分享到好友（会话）
 		onShareAppMessage: function() {
@@ -163,7 +162,8 @@
 					if (res.code == 200) {
 						this.list = res.data.suitList
 						this.obj = res.data
-						this.getsb(res.data.deviceId)
+						this.onlineStatus = res.data.onlineStatus
+						// this.getsb(res.data.deviceId)
 					}else if(res.code == 401){
 						uni.navigateTo({
 							url:'/pages/login/login'
@@ -171,17 +171,9 @@
 					}
 				})
 			},
-			// 查询设备详情
-			getsb(id){
-				this.$u.get(`app/device/${id}`).then((res) => {
-					if (res.code == 200) {
-						this.sbobj = res.data
-					}
-				})
-			},
 			// 点击支付	
 			btnzhifu() {
-				if(this.sbobj.onlineStatus == 0){
+				if(this.onlineStatus == 0){
 					uni.showToast({
 						title: '该设备离线，暂不能使用',
 						icon: 'none',
@@ -274,13 +266,10 @@
 								},2000)
 							}
 						})
-						
 					}
 				}
 			},
 
-
-
 			btnactive(item) {
 				this.activeindex = item.suitId
 				this.prices = item.price
@@ -324,7 +313,6 @@
 					}
 				})
 			},
-
 		}
 	}
 </script>
@@ -477,7 +465,7 @@
 			font-weight: 600;
 			font-size: 40rpx;
 			color: #3D3D3D;
-			margin-top: 110rpx;
+			margin-top: 100rpx;
 			height: 126rpx;
 
 			.wz {
diff --git a/page_user/homepage.vue b/page_user/homepage.vue
index 5491810..c25452c 100644
--- a/page_user/homepage.vue
+++ b/page_user/homepage.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="pages">
-		<u-navbar title="首页" @custom-back="back" :border-bottom="false" :background="bgc" back-icon-color="#3D3D3D" title-color='#3D3D3D'
+		<u-navbar title="首页" :custom-back="btnback" :border-bottom="false" :background="bgc" back-icon-color="#3D3D3D" title-color='#3D3D3D'
 			title-size='36' height='44'></u-navbar>
         
 		<view class="my">
@@ -186,7 +186,7 @@
 			}
 		},
 		methods: {
-			back(){
+			btnback(){
 				uni.reLaunch({
 					url:'/pages/index/index'
 				})
@@ -197,7 +197,7 @@
 					if(res.code == 200){
 						this.infoobj = res.data
 						this.type = res.data.type
-						if(res.data.type == 5){
+						if(res.data.type == 5 || res.data.type == 4){
 							this.jytxt = '场所管理'
 						}else{
 							this.jytxt = '推广管理'
diff --git a/page_user/promote.vue b/page_user/promote.vue
index 291e66e..e1ce103 100644
--- a/page_user/promote.vue
+++ b/page_user/promote.vue
@@ -5,20 +5,21 @@
 
 		<image class="pic" src="https://api.ccttiot.com/smartmeter/img/static/umgY9Xj3E8fWw7Lh2pSQ" mode="" @longpress="saveCanvas"></image>
 		<view class="img">
-			<canvas canvas-id="qrcode" style="width:100%;height: 100%;margin: 0 auto;background-color: #000;"/>
+			<canvas canvas-id="qrcode" style="width:100%;height: 100%;margin: 0 auto;"/>
 		</view>
 		<view class="tuixx">
-				<view class="">角色：{{txt}}</view>
+			<view class="">角色：{{txt}}</view>
 			<view class="">推广人：{{obj.userName == undefined ? '' : obj.userName}}</view>
 			<view class="" v-if="obj.investorName">创业者：{{obj.investorName == undefined ? '' : obj.investorName}}</view>
 			<view class="">可支配分成比例：{{obj.point == undefined ? '' : obj.point}}%</view>
+			<view class="">推广号：{{obj.codeNo == undefined ? '' : obj.codeNo.slice(-4)}}</view>
 		</view>
 	</view>
 </template>
 
 <script>
 	import uQRCode from '@/common/uqrcode.js'
-	export default {
+	export default { 
 		data() {
 			return {
 				bgc: {
@@ -120,7 +121,7 @@
 					canvasId: 'qrcode',
 					componentInstance: this,
 					text: 'https://kang.chuangtewl.com/sc?c=' + text,
-					size: 170,
+					size: 150,
 					margin: 0, 
 					backgroundColor: '#ffffff',
 					foregroundColor: '#000000',
@@ -173,10 +174,10 @@
 		.pic {
 			width: 660rpx;
 			height: 1306rpx;
-			position: absolute;
-			top: 230rpx;
-			left: 50%;
-			transform: translateX(-50%);
+			// position: absolute;
+			// top: 230rpx;
+			// left: 50%;
+			// transform: translateX(-50%);
 		}
 
 		.img {
diff --git a/page_user/touzi.vue b/page_user/touzi.vue
index 60e886e..8d6d88a 100644
--- a/page_user/touzi.vue
+++ b/page_user/touzi.vue
@@ -61,12 +61,14 @@
 				pagesize: 10, // 一页多少数据
 				total: 0,
 				type:4,
-				keyword:''
+				keyword:'',
+				type:''
 			}
 		},
 		onLoad() {
             this.$u.get(`/app/user/userInfo`).then(res => {
             	if(res.code == 200){
+					this.type = res.data.type
             		if(res.data.type == 2){
             			this.getlist()
             		}else{
@@ -92,7 +94,7 @@
 			}
 		},
 		methods: {
-			// 合作伙伴
+			// 搜索合作伙伴-代理
 			getlist(){
 				this.$u.get(`/agent/user/investorList?pageNum=${this.pagenum}&pageSize=${this.pagesize}&type=${this.type}&keyword=${this.keyword}`).then(res => {
 					if(res.code == 200){
@@ -105,7 +107,7 @@
 					}
 				})
 			},
-			// 业务
+			// 搜索业务员-渠道商
 			getlists(){
 				this.$u.get(`/biz/user/investorList?pageNum=${this.pagenum}&pageSize=${this.pagesize}&type=${this.type}&keyword=${this.keyword}`).then(res => {
 					if(res.code == 200){
@@ -121,7 +123,11 @@
 			// 滚动到底部
 			onScrollToLower() {
 				if (this.total > this.wateringList.length) {
-					this.getlist() // 上拉加载更多  
+					if(this.type == 2){
+						this.getlist() // 上拉加载更多
+					}else{
+						this.getlists() // 上拉加载更多
+					} 
 				} else {
 			        
 				}
@@ -129,7 +135,11 @@
 			btnscreh(){
 				this.wateringList = []
 				this.pagenum = 1
-				this.getlist()
+				if(this.type == 2){
+					this.getlist() // 搜索合作伙伴-代理
+				}else{
+					this.getlists() // 搜索业务员-渠道商
+				}
 			},
 			
              // 跳转详情
diff --git a/page_user/tuiguang.vue b/page_user/tuiguang.vue
index e77ccd1..340abc4 100644
--- a/page_user/tuiguang.vue
+++ b/page_user/tuiguang.vue
@@ -6,13 +6,13 @@
          	<view class="img" @click="btnpage(1)" v-if="type == 2">
          		<image src="https://api.ccttiot.com/smartmeter/img/static/uizHnwqSgXv8sqsnW4yJ" mode=""></image>
          	</view>
-			<view class="img" @click="btnpage(2)" v-if="type != 5">
+			<view class="img" @click="btnpage(2)">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/ullaHV7ekElj4lAXWuGQ" mode=""></image>
 			</view>
-			<view class="img" @click="btnpage(3)" v-if="type != 5">
+			<view class="img" @click="btnpage(3)">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uIpmf4ICgCCBf9oyT4sg" mode=""></image>
 			</view>
-			<view class="img" @click="btnpage(4)" v-if="type == 5">
+			<view class="img" @click="btnpage(4)">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uaaS0g2CDVCGHhsbEo7T" mode=""></image>
 			</view>
          </view>
diff --git a/page_user/yewuyuan.vue b/page_user/yewuyuan.vue
index 0c0ac7b..314198e 100644
--- a/page_user/yewuyuan.vue
+++ b/page_user/yewuyuan.vue
@@ -72,12 +72,14 @@
 				pagesize: 10, // 一页多少数据
 				total: 0,
 				type:3,
-				keyword:''
+				keyword:'',
+				type:''
 			}
 		},
 		onLoad() {
 			this.$u.get(`/app/user/userInfo`).then(res => {
 				if(res.code == 200){
+					this.type = res.data.type
 					if(res.data.type == 2){
 						this.getlist()
 					}else{
@@ -116,7 +118,7 @@
 					}
 				})
 			},
-			// 业务
+			// 搜索业务员-渠道商
 			getlists(){
 				this.$u.get(`/biz/user/bizList?pageNum=${this.pagenum}&pageSize=${this.pagesize}&keyword=${this.keyword}`).then(res => {
 					if(res.code == 200){
@@ -132,7 +134,11 @@
 			// 滚动到底部
 			onScrollToLower() {
 				if (this.total > this.wateringList.length) {
-					this.getlist() // 上拉加载更多  
+					if(this.type == 2){
+						this.getlist() // 上拉加载更多
+					}else{
+						this.getlists() // 上拉加载更多
+					}
 				} else {
 			        
 				}
@@ -140,7 +146,11 @@
 			btnscreh(){
 				this.wateringList = []
 				this.pagenum = 1
-				this.getlist()
+				if(this.type == 2){
+					this.getlist() // 搜索合作伙伴-代理
+				}else{
+					this.getlists() // 搜索业务员-渠道商
+				}
 			},
 			
              // 跳转详情
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 638aaaa..e0fa92d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -89,14 +89,14 @@
 					<view class="xiao">
 						<view class="">您的推广人:</view>
 						<view class="">{{tgobj.userName == undefined ? '--' : tgobj.userName}}（<text
-								v-if="tgobj.creatorUserType == 2">合作伙伴商</text><text
+								v-if="tgobj.creatorUserType == 2">合作伙伴</text><text
 								v-if="tgobj.creatorUserType == 3">渠道商</text><text
 								v-if="tgobj.creatorUserType == 4">创业者</text><text
 								v-if="tgobj.creatorUserType == 5">场所负责人</text>）</view>
 					</view>
 					<view class="xiao">
 						<view class="">您的角色:</view>
-						<view class="" v-if="tgobj.userType == 2">合作伙伴商</view>
+						<view class="" v-if="tgobj.userType == 2">合作伙伴</view>
 						<view class="" v-if="tgobj.userType == 3">渠道商</view>
 						<view class="" v-if="tgobj.userType == 4">创业者</view>
 						<view class="" v-if="tgobj.userType == 5">场所负责人</view>
@@ -305,6 +305,7 @@
 								duration: 1500
 							})
 							this.czflag = false
+							this.getuserinfo()
 						} else if (res.code == 401) {
 							uni.showModal({
 								title: '提示',