zhengkaixin il y a 1 an
Parent
commit
21c493b505

+ 2 - 1
config/.env.dev.js

@@ -15,8 +15,9 @@ const UNI_APP = {
 	openId:"oLowyuAJ1Ld0ivnLj4qp1k5Vy_l4", //王晓春
 	//openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",
 	openId:"oLowyuOJvTszgk96C0f8j0XfcEXg",//zkx
+	 openId:"oLowyuNkSxqovYoobKbeHB1nSkm0", //sz
 	//openId:"oLowyuHCGgMomNBQEXZSbb5SJxfQ",//ys
-	//openId:"oLowyuAfn6fsjSe2YgUYHXdFkrYk",
+	//openId:"oLowyuB1PliW0qAnJJ56axydeUOM",//zq
 	//openId:"oLowyuMMjIkA_bLA4MXzRQ3KJB2E",//凡佳佳
 	//appid
 	VUE_APP_WXAPPID:"wx0b3c41a903053808",

+ 6 - 4
pages/deductionRecord/deductionDetails.vue

@@ -27,7 +27,7 @@
 					已扣费
 				</view>
 				<view class="details">
-					<view class="item">
+					<view class="item" v-if="tenantContract">
 						<view class="item-title">
 							合同信息
 						</view>
@@ -290,9 +290,11 @@
 					id: this.id
 				}).then((response) => {
 					uni.hideLoading();
-
-					this.contractItem = response.data.contractItem;
-
+					if( response.data.contractItem){
+						this.contractItem = response.data.contractItem;
+						
+					}
+					
 					this.tenantContract = response.data.tenantContract;
 					this.tenantBalanceRecord = response.data.tenantBalanceRecord;
 				}).catch(error => {

+ 2 - 1
pages/deductionRecord/deductionRecord.vue

@@ -24,7 +24,8 @@
 		</view>
 		<!-- 标签 -->
 		<view class="tabs">
-			<u-picker  v-model="tabsFrom.show1" mode="selector" :range="tabsFrom.selector1"  range-key="label" @confirm="selector1confirm" ></u-picker>
+			<u-picker  v-model="tabsFrom.show1"  
+			:default-selector="[tabsFrom.show1Index]" mode="selector" :range="tabsFrom.selector1"  range-key="label" @confirm="selector1confirm" ></u-picker>
 			<u-picker-select title="日期选择" v-model="tabsFrom.show2"
 			 :defaultTime="tabsFrom.show2Index" :endYear="endYear"
 			 mode="time" :params="params"  @confirm="selector2confirm" @reset="selector2reset" ></u-picker-select>

+ 17 - 1
pages/recharge/rechargeRecord.vue

@@ -12,7 +12,8 @@
 		</view>
 		<!-- 标签 -->
 		<view class="tabs">
-			<u-picker  v-model="tabsFrom.show1" mode="selector" :range="tabsFrom.selector1"  range-key="label" @confirm="selector1confirm" ></u-picker>
+			<u-picker  v-model="tabsFrom.show1" :default-selector="[tabsFrom.show1Index]" 
+			 mode="selector" :range="tabsFrom.selector1"  range-key="label" @confirm="selector1confirm" ></u-picker>
 			<u-picker-select title="日期选择" v-model="tabsFrom.show2"
 			 :defaultTime="tabsFrom.show2Index" :endYear="endYear"
 			 mode="time" :params="params"  @confirm="selector2confirm" @reset="selector2reset" ></u-picker-select>
@@ -32,11 +33,16 @@
 				<view class="details-title">
 					<view class="name">
 						{{item.remark}}-{{item.methodN}}    
+					</view>
+					<view class="record-time" v-if="item.extraInfo" v-html="extraInfoText(item.extraInfo)" >
+						 
 					</view>
 					<view class="record-time">
 						{{item.createTime}}  
 					</view>
 				</view>
+				
+				
 				<view class="sum">
 					{{jpAmount(item.amount)}} 
 
@@ -133,6 +139,16 @@
 			}
 		},
 		methods:{
+			extraInfoText(extraInfo){
+				var obj=JSON.parse(extraInfo)
+				if(obj.outOrderNo){
+					return  `充值订单编号:${obj.outOrderNo}`
+				}else{
+					return ''
+				}
+				
+				
+			},
 			selector2confirm(e){
 				
 				this.tabsFrom.show2Text=e.year+"年"+e.month+"月"

+ 2 - 1
pages/remoteControl/operationLog.vue

@@ -5,7 +5,8 @@
 		</u-navbar>
 		<!-- 标签 -->
 		<view class="tabs">
-			<u-picker v-model="tabsFrom.show1" mode="selector" :range="tabsFrom.selector1" range-key="label"
+			<u-picker v-model="tabsFrom.show1" :default-selector="[tabsFrom.show1Index]"
+			 mode="selector" :range="tabsFrom.selector1" range-key="label"
 				@confirm="selector1confirm"></u-picker>
 			<u-picker-select title="日期选择" v-model="tabsFrom.show2" :defaultTime="tabsFrom.show2Index" :endYear="endYear"
 				mode="time" :params="params" @confirm="selector2confirm" @reset="selector2reset"></u-picker-select>