From 5181a2a464728a149fc96dad0dc6f4a2d6700abc Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Tue, 1 Apr 2025 21:37:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8C=B6=E5=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.interceptor.js   |  4 ++--
 page_user/kabao/index.vue    |  3 ++-
 pages/index/index.vue        |  8 +++++---
 pages/login/index.vue        |  3 ++-
 pages/login/zhuce.vue        |  3 ++-
 pages/my.vue                 | 14 ++++++++++++++
 pages/nearbystores/index.vue | 24 ++++++++++++------------
 7 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 791676a..d6b67e1 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -20,8 +20,8 @@ const install = (Vue, vm) => {
 	// 	},
 	// https://yxd.ccttiot.com/prod-api}); 
 	Vue.prototype.$u.http.setConfig({
-			baseUrl: 'http://192.168.2.79:8089',  
-			// baseUrl: 'https://testcha.chuangtewl.com/prod-api',
+			// baseUrl: 'http://192.168.2.79:8089',  
+			baseUrl: 'https://testcha.chuangtewl.com/prod-api',
 			loadingText: '努力加载中~',
 			loadingTime: 800,
 			// 设置自定义头部content-type
diff --git a/page_user/kabao/index.vue b/page_user/kabao/index.vue
index 5849c13..20d2ec7 100644
--- a/page_user/kabao/index.vue
+++ b/page_user/kabao/index.vue
@@ -20,7 +20,8 @@
        	    </view>
        </view>
 	   <scroll-view class="list" scroll-y style="height: 81vh;" @scrolltolower="onScrollToLower">
-	   	<view class="list_item" v-for="(item,index) in listka" :key="index">
+		   <!-- listka -->
+	   	<view class="list_item" v-for="(item,index) in 0" :key="index">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/u9yhfTszqRFL3zhHWyR7" mode=""></image>
 				<view class="top">
 					<view class="lt">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a65dc59..be4a3ac 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1075,7 +1075,8 @@
 		font-weight: 600;
 	}
 	.hour-item.is-reserved {
-		background-color: #48893B !important;
+		background-color: #226914 !important;
+		height: 10rpx !important;
 	}
 
 	#active {
@@ -1563,7 +1564,7 @@
 						width: 100%;
 						display: flex;
 						justify-content: center;
-
+                        align-items: center;
 						view {
 							width: 26rpx;
 							height: 6rpx;
@@ -1668,7 +1669,8 @@
 							margin-top: 28rpx;
                             flex-wrap: wrap;
 							view {
-								max-width: 104rpx;
+								text-align: center;
+								width: 84rpx;
 								height: 46rpx;
 								font-size: 26rpx;
 								color: #48893B;
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 9f19f62..688fdce 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -203,6 +203,7 @@
 										let data = {
 											jsCode:  e.detail.code,
 											mobileCode: res.code,
+											appid:4
 										}
 										resolve(data);
 									} else {
@@ -216,7 +217,7 @@
 						})
 					}
 					wxLoginAsync().then(async (data) => {
-						this.$u.post(`/wxlogin?mobileCode=${this.jsCode}&jsCode=${this.mobileCode}`, data).then((res) => {
+						this.$u.post(`/wxlogin?mobileCode=${this.jsCode}&jsCode=${this.mobileCode}&appid=4`, data).then((res) => {
 							if (res.code == 200) {
 								wx.setStorageSync('token', res.token)
 								uni.reLaunch({
diff --git a/pages/login/zhuce.vue b/pages/login/zhuce.vue
index ad79a23..e92639d 100644
--- a/pages/login/zhuce.vue
+++ b/pages/login/zhuce.vue
@@ -201,6 +201,7 @@
 										let data = {
 											jsCode:  e.detail.code,
 											mobileCode: res.code,
+											appid:4
 										}
 										resolve(data);
 									} else {
@@ -214,7 +215,7 @@
 						})
 					}
 					wxLoginAsync().then(async (data) => {
-						this.$u.post(`/wxlogin?mobileCode=${this.jsCode}&jsCode=${this.mobileCode}`, data).then((res) => {
+						this.$u.post(`/wxlogin?mobileCode=${this.jsCode}&jsCode=${this.mobileCode}&appid=4`, data).then((res) => {
 							if (res.code == 200) {
 								wx.setStorageSync('token', res.token)
 								uni.reLaunch({
diff --git a/pages/my.vue b/pages/my.vue
index 8cc0d81..bd1b2cd 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -203,6 +203,20 @@
 				this.$u.get(`/getAppInfo`).then(res => {
 					if (res.code == 200) {
 						this.user = res.user
+					}else if(res.code == 401){
+						uni.showModal({
+							    title: '温馨提示',  
+							    content: '您该操作需登录，是否前去登录？',  
+							    success: function (res) {  
+							        if (res.confirm) {
+										uni.navigateTo({
+											url:'/pages/login/index'
+										})
+							        } else if (res.cancel) {
+							        
+							    }  
+							}  
+						})
 					}
 				})
 			},
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index 9172d6f..6a40593 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -964,19 +964,19 @@
 									that.getinfo()
 									wx.setStorageSync('token', res.token)
 								}else{
-									uni.showModal({
-										    title: '温馨提示',  
-										    content: '您还未登录，是否前去登录？',  
-										    success: function (res) {  
-										        if (res.confirm) {
-													uni.reLaunch({
-														url:'/pages/login/index'
-													})
-										        } else if (res.cancel) {
+									// uni.showModal({
+									// 	    title: '温馨提示',  
+									// 	    content: '您还未登录，是否前去登录？',  
+									// 	    success: function (res) {  
+									// 	        if (res.confirm) {
+									// 				uni.reLaunch({
+									// 					url:'/pages/login/index'
+									// 				})
+									// 	        } else if (res.cancel) {
 										         
-										    }  
-										}  
-									})
+									// 	    }  
+									// 	}  
+									// })
 								}
 							})
 						}