publish 1.0.15

pages/heatingPage/pay.vue

@@ -24,7 +24,7 @@
 	  <view class="tel flex">
 	    <label>缴费类型：</label>
 		<radio-group  @change="payChange">
-		  <radio value="1" :checked="payInfo.type!=2" style="margin-right: 30rpx;transform: scale(0.85);" >金额</radio>
+		  <radio value="1" :checked="payInfo.type!=2" style="margin-right: 30rpx;transform: scale(0.85);" >全额</radio>
 		  <radio value="2" :checked="payInfo.type==2" style="transform: scale(0.85);" :disabled="payInfo.status==1 || payInfo.status==3">空置</radio>
 		</radio-group>
 	  </view>
@@ -68,6 +68,7 @@
 				  </view>
 			  </view>
 			  <view class="popup-footer">
+				<button class="popup-cancel" @click="cancelInvocie">取消</button>
 			  	<button class="popup-submit" @click="submitInvocie">提交</button>
 			  </view>
 		  </view>
@@ -152,16 +153,28 @@ export default {
 		if (v == 2)
 		{
 			let value = this.payInfo.part_fee - this.payInfo.reduction;
+			value = Math.round(value * 100) / 100;
 			this.payInfo.real_fee = value;
 		}
 		else
 		{
 			let value = this.payInfo.total_fee - this.payInfo.reduction;
+			value = Math.round(value * 100) / 100;
 			this.payInfo.real_fee = value;
 		}
 		this.payInfo.type = e.detail.value;
 	},
 	paySubmit(){
+		if (this.payInfo.before > 0){
+			uni.showToast({
+			  title: "您有历史供暖订单未完成缴费，请先完成后再次尝试",
+			  icon: "none",
+			  duration: 2500,
+			});
+			return;
+		}
+		
+		
 		let that = this;
 		let type = this.payInfo.type;
 		if (this.payInfo.status == 2)
@@ -236,6 +249,9 @@ export default {
 		this.closePopup();
 		
 	},
+	cancelInvocie(){
+		this.$refs.popup.close();
+	},
 	openPopup() {
 		  this.$refs.popup.open('center');
 	  },

pages/index/index.vue

@@ -94,6 +94,14 @@
           </view>
         </view>
       </view>
+	  <view
+	    class="notice-content-box"
+	    style="justify-content: start; padding: 30rpx 0 30rpx 30rpx;border-radius: 0;"
+	    v-if="owner_id == 0">
+		 <view class="notice-content" style="width: 100%">
+			 <view class="notice-content-font">尚未关联业主信息，请先登录后完成关联！</view>
+		 </view>
+	  </view>
     </view>
    
 
@@ -135,12 +143,13 @@ export default {
         {
           url: "/static/navList/policy.png",
           path: "/pages/heatingPage/reportFix",
-          content: "一件报修",
+          content: "一键报修",
         },
       ],
       heatList: [],
 	  statusObj:getApp().globalData.statusObj,
 	  statusColor:getApp().globalData.statusColor,
+	  owner_id : 0,
     };
   },
   onShow() {
@@ -172,7 +181,7 @@ export default {
 		})
 	},
     getSwiperList() {
-		
+	  let that = this;
       let md5Sign = md5(
         "method=" +
           "common" +
@@ -208,7 +217,8 @@ export default {
             res.data.data.list.forEach((item) => {
               item.pic_path = getApp().globalData.shareUrl + item.pic_path;
             });
-            this.swiperList = res.data.data.list;
+            that.swiperList = res.data.data.list;
+			that.owner_id = res.data.data.owner_id;
 			// this.shareImgUrl = res.data.data.list[0].pic_path
           }
         },
@@ -237,6 +247,7 @@ export default {
           console.log(res);
           if (res.data.code === 200) {
             this.heatList = res.data.data.list;
+			this.owner_id = res.data.data.owner_id;
           }
         },
         fail: () => {

pages/selfCenter/index.vue

@@ -75,11 +75,13 @@ export default {
 		  url: "/pages/selfCenter/my_fix",
 		  isShow:true,
 		 },
+		 /*
         { 
 		   icoin: "/static/selfCenter/back.png",
 		   name: "退出登录" ,
 		   isShow:true,
 		 }
+		 */
       ],
       swiperBackground: "/static/poster-bg.png",
     };

pages/selfCenter/with_house.vue

@@ -110,7 +110,7 @@
 				  </view>
 			  </view>
 			  <view class="popup-footer">
-				  <button class="popup-cancel" @click="closePop">取消</button>
+				<button class="popup-cancel" @click="closePop">取消</button>
 			  	<button class="popup-submit" @click="submitPop">确定</button>
 			  </view>
 		  </view>
@@ -154,6 +154,7 @@ export default {
 	searchHood(){
 		let that = this;
 		this.hoodList = [];
+		this.hoodIndex = 0;
 		// let result = e.detail.value;
 		let md5Sign = md5(
 		  "method=" +
@@ -184,6 +185,10 @@ export default {
 		  success: (res) => {
 		    if (res.data.code === 200) {
 				let obj = res.data.data;
+				let c = {
+						name:"请选择小区",
+				}
+				this.hoodList.push(c);
 				for (let key in obj) {
 					let child = {
 						name:obj[key]
@@ -205,6 +210,10 @@ export default {
 		
 		if (room)
 		{
+			if (hood === "请选择小区")
+			{
+				return;
+			}
 			searchType = 'houseRoom'
 			addressResult = hood + '/' + build + '/' + unit + '/' + room
 		}