调整

config/.env.dev.js

@@ -4,7 +4,7 @@ const UNI_APP = {
 
 	BASE_URL: 'https://dgj.hbjp.com.cn/electric-manager-api/',
 	
-	BASE_URL:'http://192.168.77.162:8081/electric-manager-api/',
+	//BASE_URL:'http://192.168.77.162:8081/electric-manager-api/',
 	
 	
 	NODE_ENV :"dev",
@@ -15,7 +15,7 @@ const UNI_APP = {
 	//openId:"oK9Wr57rAcNzihDN2PEdptprT0As", 
 	// openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	//openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
-	//openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4",
+	openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4",
 	//appid
 	VUE_APP_WXAPPID:"wx0b3c41a903053808",
 	VUE_APP_ALIAPPID:"2021003131641247",

pages/deductionRecord/billPush.vue

@@ -27,7 +27,7 @@
 							{{detail.tenantName}}
 						</view>
 					</view>
-					<view class="item">
+					<view class="item" v-if="false">
 						<view class="item-title">
 							推送用户
 						</view>
@@ -94,7 +94,8 @@
 				<view class="details-list" v-for="(item,i) in detail.itemList" :key="i">
 					<view class="item-list">
 						<view class="item-title">
-							<view class="item-title-name">{{item.contractItemName}}<span class="item-title-remark">({{item.num}}{{item.unit}})</span></view>
+							<view class="item-title-name">{{item.contractItemName}}
+							<span class="item-title-remark" v-if="false">({{item.num}}{{item.unit}})</span></view>
 							<view class="item-title-span">收费标准：{{item.price}}元/{{item.unit}}</view>
 						</view>
 						<view class="item-value">

pages/index/index.vue

@@ -60,7 +60,7 @@
 						<view class="icon icon3">
 							<image class="img" src="@/assets/img/antFill-account-book.svg" mode=""></image>
 						</view>
-						<view class="grid-text">余额提醒
+						<view class="grid-text">账单提醒
 						</view>
 					</u-grid-item>
 					<u-grid-item   @click="gotoUrl('/pages/message/messageList?type=4')">

pages/message/message.vue

@@ -4,7 +4,7 @@
 		<!-- 消息列表 -->
 		
 			<view class="message-list" v-if="list.length">
-				<view class="message-item"  @click="gotoUrl('/pages/message/messageList?type=1')" >
+				<view class="message-item"  @click="messageList1()" >
 					<view class="icon icon2">
 						<image class="img" src="@/assets/img/antFill-account-book.svg" mode=""></image>
 						<view class="dot">
@@ -173,6 +173,15 @@
 			this.getBillList()
 		},
 		methods: {
+			messageList1(){
+				if(this.list.length==1){
+					this.gotoUrl('/pages/deductionRecord/billPush?site=1&id='+this.list[0].id)
+					
+				}else{
+					this.gotoUrl('/pages/message/messageList?type=1')
+				}
+			},
+			
 			getBillList(){
 				uni.showLoading({
 					mask:true,title:'加载中...'

pages/message/messageList.vue

@@ -11,7 +11,7 @@
 					{{item.name}}
 				</view>
 				<view class="item-time">
-					{{item.pushTime}}  <!-- {{item.tenantName}} -->
+					{{item.createTime}}  <!-- {{item.tenantName}} -->
 				</view>
 			</view>
 			<u-divider :isnone="list.length==0"   nonetext="没有找到相关内容"
@@ -40,6 +40,14 @@
 			title(){
 				if(this.type==1){
 					return  '账单提醒'
+				}else if(this.type==2){
+					return  '停电通知'
+				}else if(this.type==3){
+					return  '故障警报'
+				}else if(this.type==4){
+					return  '断电通知'
+				}else if(this.type==5){
+					return  '账单提醒'
 				}else{
 					return  '消息提醒'
 				}
@@ -49,7 +57,11 @@
 			if(op.type){
 				this.type=op.type;
 			}
-			this.getBillList()
+			if(op.type==1){
+				this.getBillList()
+			}
+			
+			
 		},
 		onReachBottom() {
 			

pages/mine/mine.vue

@@ -22,17 +22,19 @@
 			<view class="address-box" >
 				<view class="address">
 					<view class="address-title">
-						荆鹏软件园
+						{{personInfo.name}}
 					</view>
-					<view class="address-value">
-						<u-icon name="map"></u-icon>荆州市沙市区江津东路附155号
+					<view class="address-value" >
+					<!--  -->
+						 <u-icon name="map"></u-icon>{{personInfo.remark}}
+						<!-- {{companyInfo.typeN}} -->
 					</view>
 				</view>
 				<!-- 切换 -->
-				<view class="change">
+				<view class="change" v-if="false">
 					切换
 				</view>
-				<view class="image" v-if="false">
+				<view class="image" >
 					<image class="img" src="@/assets/img/mineBackground.svg" mode=""></image>
 				</view>
 			</view>