diff --git a/main.js b/main.js
index 3358354..3d13af4 100644
--- a/main.js
+++ b/main.js
@@ -13,12 +13,14 @@ uni.$http = $http;
 
 // 请求的根路径
 // #ifdef H5
-$http.baseUrl = 'https://www.sanduolantoyoga.com/yoga'
+// $http.baseUrl = 'https://www.sanduolantoyoga.com/yoga'
+$http.baseUrl = 'https://yoga.runpengsoft.com/yoga'
 // $http.baseUrl = 'http://192.168.13.9:8083'
 // #endif
 
 //#ifdef APP-PLUS
-$http.baseUrl = 'https://www.sanduolantoyoga.com/yoga'
+// $http.baseUrl = 'https://www.sanduolantoyoga.com/yoga'
+$http.baseUrl = 'https://yoga.runpengsoft.com/yoga'
 // $http.baseUrl = 'http://192.168.13.9:8083'
 //#endif
 
@@ -26,12 +28,14 @@ $http.baseUrl = 'https://www.sanduolantoyoga.com/yoga'
 // WebSocket 地址（可根据平台条件编译）
 // #ifdef H5
 // Vue.prototype.$wsUrl = 'ws://192.168.13.9:8528/im'   // 开发环境
-Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver'  // 生产环境
+// Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver'  // 生产环境
+Vue.prototype.$wsUrl = 'wss://yoga.runpengsoft.com/yoga-imserver/'  // 生产环境
 // #endif
 
 // #ifdef APP-PLUS
 // Vue.prototype.$wsUrl = 'ws://192.168.13.9:8528/im'   // 开发环境
-Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver'  // 生产环境
+// Vue.prototype.$wsUrl = 'wss://www.sanduolantoyoga.com/yoga-imserver'  // 生产环境
+Vue.prototype.$wsUrl = 'wss://yoga.runpengsoft.com/yoga-imserver/'  // 生产环境
 // #endif
 
 // 请求开始之前做一些事情
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5440d6c..e1bd7e7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,62 +1,114 @@
 <template>
-	<view class="loginBack">
-		<view class="loginForm">
-			<view class="welcomeLogin">欢迎登录</view>
-			<view class="tip">yoga</view>
-			<view class="formregion">
-				<uni-forms :model="form" ref="uForm">
-
-					<uni-forms-item prop="phonenumber" >
-						<uni-easyinput type="number" placeholder="请输入手机号码"  v-model="form.phonenumber" @blur="zhhandleBlur" :inputBorder="false" :clearable="false"  :placeholderStyle="placeholderStyle"/>
-					</uni-forms-item>
-
-					<uni-forms-item prop="password" >
-						<uni-easyinput type="password" placeholder="请输入密码" v-model="form.password" @blur="mmhandleBlur" maxlength="12"  :inputBorder="false" :clearable="false"  :placeholderStyle="placeholderStyle"/>
-					</uni-forms-item>
-
-					<uni-forms-item prop="code" >
-						<uni-easyinput type="text" placeholder="请输入验证码" v-model.trim="form.code" :inputBorder="false" :clearable="false" :placeholderStyle="placeholderStyle"/>
-						<image :src="checkimg" class="checkimg" mode="scaleToFill"></image>
-						<view class="codebtn" @click="getcode">看不清?</view>
-					</uni-forms-item>
-
-					<button type="primary" class="logincla" @click="loginpwdDo">登录</button>
-					<view v-if="iflogin" class="loginno">登录中..</view>
-
-					<view class="regcon">
-						<!-- <view class="regtxt" @click="gotopwd">修改密码</view>
-						<view class="regtxtl"></view> -->
-						<view class="regtxtr" @click="gotoregister">注册账号 → </view>
-					</view>
+  <view class="loginBack">
+    <view class="loginForm">
+      <view class="welcomeLogin">欢迎登录</view>
+      <view class="tip">瑜伽汇</view>
+
+<!--       登录方式切换 Tabs-->
+      <view class="login-tabs">
+        <view class="tab-item" :class="{ active: loginType === 'pwd' }" @click="loginType = 'pwd'">
+          密码登录
+        </view>
+        <view class="tab-item" :class="{ active: loginType === 'sms' }" @click="loginType = 'sms'">
+          短信登录(待审核)
+        </view>
+      </view>
+
+      <view class="formregion">
+        <uni-forms :model="form" ref="uForm">
+
+          <!-- 手机号（共用） -->
+          <uni-forms-item prop="phonenumber">
+            <uni-easyinput type="number" placeholder="请输入手机号码" v-model="form.phonenumber" @blur="zhhandleBlur"
+                           :inputBorder="false" :clearable="false" :placeholderStyle="placeholderStyle" />
+          </uni-forms-item>
+
+<!--          &lt;!&ndash; 密码登录：密码 + 图形验证码 &ndash;&gt;-->
+          <block v-if="loginType === 'pwd'">
+            <uni-forms-item prop="password">
+              <uni-easyinput type="password" placeholder="请输入密码" v-model="form.password" @blur="mmhandleBlur"
+                             maxlength="12" :inputBorder="false" :clearable="false" :placeholderStyle="placeholderStyle" />
+            </uni-forms-item> 
+					 
 					
-					<view class="xycon">
-						<view class="sitem">
-							<view class="selbtn">
-								<uni-data-checkbox multiple v-model="checkbox1" :localdata="checkboxitem"></uni-data-checkbox>
-							</view>
-							<view class="conright">
-								<text class="sname">
-									我已阅读并同意 
-								</text>
-								<text class="adress" @click="gotofw">
-									《用户服务协议》
-								</text>
-								<text class="sname">
-									与
-								</text>
-								<text class="adress" @click="gotoys">
-									《隐私政策条款》
-								</text>
-							</view>
-						</view>
-					</view>
-
-				</uni-forms>
-
-			</view>
-			<u-toast ref="uToast" />
-		</view>
-	</view>
+			
+            <uni-forms-item prop="code">
+              <uni-easyinput type="text" placeholder="请输入验证码" v-model.trim="form.code" :inputBorder="false"
+                             :clearable="false" :placeholderStyle="placeholderStyle" />
+              <image :src="checkimg" class="checkimg" mode="scaleToFill"></image>
+              <view class="codebtn" @click="getcode">看不清?</view>
+            </uni-forms-item> 
+
+            <button type="primary" class="logincla" @click="loginpwdDo">登录</button>
+          </block>
+
+          <!-- 短信登录：短信验证码 -->
+          <block v-if="loginType === 'sms'">
+            <uni-forms-item prop="smsCode">
+              <!-- 新增一层相对定位容器，作为绝对定位按钮的参照物 -->
+              <view class="input-wrap">
+                <uni-easyinput
+                    type="text"
+                    placeholder="请输入短信验证码"
+                    v-model.trim="form.smsCode"
+                    :inputBorder="false"
+                    :clearable="false"
+                    :placeholderStyle="placeholderStyle"
+                />
+                <view
+                    class="sms-code-btn"
+                    @click="sendSmsCode"
+                    :class="{ disabled: smsCountdown > 0 }"
+                >
+                  {{ smsCountdown > 0 ? smsCountdown + 's' : '获取验证码' }}
+                </view>
+              </view>
+            </uni-forms-item>
+
+            <button type="primary" class="logincla" @click="loginSmsDo">登录</button>
+          </block>
+
+
+          <view v-if="iflogin" class="loginno">登录中..</view>
+		  
+		  <view class="regcon">
+		  	<!-- <view class="regtxt" @click="gotopwd">修改密码</view>
+		  	<view class="regtxtl"></view> -->
+		  	<view class="regtxtr" @click="gotoregister">注册账号 → </view>
+		  </view>
+		  
+		  <view class="xycon">
+		  	<view class="sitem">
+		  		<view class="selbtn">
+		  			<uni-data-checkbox multiple v-model="checkbox1" :localdata="checkboxitem"></uni-data-checkbox>
+		  		</view>
+		  		<view class="conright">
+		  			<text class="sname">
+		  				我已阅读并同意 
+		  			</text>
+		  			<text class="adress" @click="gotofw">
+		  				《用户服务协议》
+		  			</text>
+		  			<text class="sname">
+		  				与
+		  			</text>
+		  			<text class="adress" @click="gotoys">
+		  				《隐私政策条款》
+		  			</text>
+		  		</view>
+		  	</view>
+		  </view> 
+		  
+
+          <view class="regcon">
+<!--            <view class="regtxtr" @click="gotoregister">注册账号 →</view>-->
+          </view>
+
+        </uni-forms>
+      </view>
+      <u-toast ref="uToast" />
+    </view>
+  </view>
 </template>
 
 <script>
@@ -72,6 +124,7 @@
 				form: {
 					phonenumber:"",
 					password:"",
+          smsCode: "", // 短信验证码
 					code:"",
 					uuid:"",
 					registerId:"", // 设备id
@@ -81,13 +134,16 @@
 				gcj02:"1",
 				address:'',
 				longitude:'', // 经度
-				latitude:'', // 维度
+				latitude:'', // 维度 
 				checkbox1: [1],
 				checkboxitem: [{
 					text: '',
 					value: 1,
 				}],
-				ifxy: false // 是否选择协议
+				ifxy: false, // 是否选择协议 
+        loginType:'pwd',
+        smsCountdown: 0, // 短信验证码倒计时
+        smsTimer: null, // 定时器 
 			}
 		},
 		onLoad(){
@@ -332,12 +388,12 @@
 					});
 					return false;
 				}
-				
+
 				if(uni.getStorageSync("register_id")){
 					this.form.registerId=uni.getStorageSync("register_id");
 					this.$forceUpdate();
 				}
-				
+
 				uni.setStorageSync('iftoken', "1");
 				uni.showLoading({
 					title: '正在登录...'
@@ -455,8 +511,7 @@
 					var shoplist=[shop]
 					myCache('shoplist',shoplist);
 				}
-			},
-			
+			}, 
 			gotofw(){
 				uni.navigateTo({
 					url: `/pages/user/infofw`
@@ -466,8 +521,155 @@
 				uni.navigateTo({
 					url: `/pages/user/infoys`
 				});
-			},
-			
+			}, 
+      // ========== 短信验证码相关 ==========
+      /**
+       * 发送短信验证码
+       */
+      async sendSmsCode() {
+        // 1. 校验手机号
+        const phone = this.form.phonenumber;
+        if (!this.$u.test.mobile(phone)) {
+          this.$refs.uToast.show({
+            title: '请输入正确的手机号码',
+            type: 'warning',
+            duration: 2000
+          });
+          return;
+        }
+        console.log(12)
+        // 2. 防止重复点击（倒计时中）
+        if (this.smsCountdown > 0) {
+          return;
+        }
+        console.log(34)
+        // 3. 调用发送接口
+        uni.showLoading({
+          title: '发送中...'
+        });
+        try {
+          console.log(56)
+          const {
+            data: res
+          } = await uni.$http.post('/sms/sendCode', {
+            phone: phone
+          });
+          console.log(78)
+          uni.hideLoading();
+          console.log(9)
+          if (res && res.code === 200) {
+            this.$refs.uToast.show({
+              title: '验证码已发送',
+              type: 'success',
+              duration: 2000
+            });
+            // 开始倒计时
+            this.startCountdown();
+          } else {
+            this.$refs.uToast.show({
+              title: res.msg || '发送失败，请重试',
+              type: 'error',
+              duration: 2000
+            });
+          }
+        } catch (e) {
+          uni.hideLoading();
+          this.$refs.uToast.show({
+            title: '发送失败，请检查网络',
+            type: 'error',
+            duration: 2000
+          });
+        }
+      },
+
+      /**
+       * 开始60秒倒计时
+       */
+      startCountdown() {
+        this.smsCountdown = 60;
+        if (this.smsTimer) {
+          clearInterval(this.smsTimer);
+        }
+        this.smsTimer = setInterval(() => {
+          this.smsCountdown--;
+          if (this.smsCountdown <= 0) {
+            clearInterval(this.smsTimer);
+            this.smsTimer = null;
+          }
+        }, 1000);
+      },
+
+      /**
+       * 短信验证码登录
+       */
+      async loginSmsDo() {
+        const phone = this.form.phonenumber;
+        const smsCode = this.form.smsCode;
+
+        if (!this.$u.test.mobile(phone)) {
+          this.$refs.uToast.show({
+            title: '请输入正确的手机号码',
+            type: 'warning',
+            duration: 2000
+          });
+          return;
+        }
+        if (!smsCode || smsCode.length !== 6) {
+          this.$refs.uToast.show({
+            title: '请输入6位短信验证码',
+            type: 'warning',
+            duration: 2000
+          });
+          return;
+        }
+
+        if (uni.getStorageSync("register_id")) {
+          this.form.registerId = uni.getStorageSync("register_id");
+        }
+
+        uni.setStorageSync('iftoken', "1");
+        uni.showLoading({
+          title: '登录中...'
+        });
+
+        try {
+          const {
+            data: res
+          } = await uni.$http.post('/api/sms/login', {
+            phonenumber: phone,
+            smsCode: smsCode,
+            registerId: this.form.registerId,
+            position: this.form.position
+          });
+          if (res && res.code === 200) {
+            uni.setStorageSync("loginindex", "1");
+            uni.setStorageSync("token", res.token);
+            // 保存用户信息
+            this.getUserInfo();
+            this.loadshop();
+            this.$refs.uToast.show({
+              title: '登录成功',
+              type: 'success',
+              isTab: true,
+              duration: 2000,
+              url: '/pages/index/index'
+            });
+          } else {
+            this.$refs.uToast.show({
+              title: res.msg || '登录失败，请重试',
+              type: 'error',
+              duration: 2000
+            });
+          }
+        } catch (e) {
+          uni.hideLoading();
+          this.$refs.uToast.show({
+            title: '登录失败，请检查网络',
+            type: 'error',
+            duration: 2000
+          });
+        }
+      }, 
 		}
 
 	}
@@ -491,7 +693,57 @@
 		border-radius: 254rpx 254rpx 254rpx 254rpx;
 		text-indent: 20rpx;
 	}
-	.lttxt{
+  /* ====== 新增 Tabs 样式 ====== */
+  .login-tabs {
+    display: flex;
+    justify-content: center;
+    background: #fff;
+    border-radius: 10px 10px 0 0;
+    padding: 10rpx 0 0 0;
+    margin-top: 10rpx;
+
+    .tab-item {
+      flex: 1;
+      text-align: center;
+      font-size: 30rpx;
+      padding: 20rpx 0;
+      color: #999;
+      border-bottom: 6rpx solid transparent;
+      transition: all 0.3s;
+
+      &.active {
+        color: #00a89b;
+        border-bottom-color: #00a89b;
+        font-weight: 600;
+      }
+    }
+  }
+
+  /* ====== 短信验证码按钮 ====== */
+  .sms-code-btn {
+    position: absolute;
+    top: 12rpx;               /* 与 codebtn 对齐 */
+    width: 180rpx;
+    right: 20rpx;
+    display: block;
+    display: flex;           /* 改为 flex */
+    align-items: center;     /* 垂直居中 */
+    justify-content: center; /* 水平居中 */
+    color: #00a89b;
+    height: 60rpx;
+    line-height: 60rpx;
+    font-size: 26rpx;
+    padding: 0 20rpx;
+    background: #f0f0f0;      /* 浅灰底，便于区分 */
+    border-radius: 30rpx;
+    /* 移除 transform，避免基准偏移 */
+    &.disabled {
+      color: #999;
+      background: #e8e8e8;
+    }
+  }
+
+  .lttxt{
 		font-size: 30rpx;
 		font-family: PingFang SC, PingFang SC;
 		font-weight: 400;
@@ -597,8 +849,8 @@
 			width: 100%;
 			padding: 30px 50rpx 20rpx;
 			background-color: #fff;
-			border-radius: 10px;
-			margin-top: 20rpx;
+			border-radius: 0 0 10px 10px;
+			margin-top: 10rpx;
 			position: relative;
 			display: block;
 			overflow: hidden;
@@ -637,7 +889,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		padding: 50rpx 0 0;
+		padding: 20rpx 0 0;
 		width: 100%;
 		.sitem {
 			display: flex;
diff --git a/pages/user/courselist.vue b/pages/user/courselist.vue
index c26f482..333e8f5 100644
--- a/pages/user/courselist.vue
+++ b/pages/user/courselist.vue
@@ -5,6 +5,11 @@
 			<view class="hback">
 				<uni-icons type="back" size="24" color="#000"  @tap="gotoBack"></uni-icons>
 				<text class="htxt">我的课程</text>
+        <view style="flex:1;"></view>
+        <view class="save-btn" @click="generateWeekScheduleImage" v-show="1==tabCurrentIndex0">
+          <uni-icons type="download" size="24" color="#00A99A"></uni-icons>
+          <text style="font-size:24rpx;color:#00A99A;margin-left:6rpx;">保存周课表</text>
+        </view>
 				<view class="tabtip" @click="openDialog">
 					<uni-icons class="rtop" type="info" size="21" color="#e96900"></uni-icons>
 				</view>
@@ -171,7 +176,9 @@
 		<!-- 是否登录 -->
 		<openlogin ref="loginId" @getPhoneNumber="getPhoneNumber"></openlogin>
 
-	</view>
+    <canvas canvas-id="weekCanvas" id="weekCanvas" :style="{position:'fixed',left:'-9999px',top:'0',width:canvasWidth+'px',height:canvasHeight+'px',pointerEvents:'none'}"></canvas>
+  </view>
+
 </template>
 
 <script>
@@ -183,6 +190,9 @@
 		},
 		data() {
 			return {
+        canvasWidth: 1,   // 新增，初始非0避免canvas无效
+        canvasHeight: 1,  // 新增
+        previewImagePath: '',  // 预览图片临时路径
 				openId:"",
 				phone:"",
 				userid:"",
@@ -678,6 +688,292 @@
 			},100);
 		},
 		methods: {
+      generateWeekScheduleImage() {
+        if (!this.columnTitles || this.columnTitles.length === 0 || !this.claTimeContainer || this.claTimeContainer.length === 0) {
+          uni.showToast({ title: '暂无数据可生成图片', icon: 'none' });
+          return;
+        }
+
+        const padding = 10;
+        const rowHeaderWidth = 80;
+        const cellWidth = 120;
+        const cellHeight = 90;
+        const headerHeight = 60;
+        const cols = this.columnTitles.length;
+        const rows = this.claTimeContainer.length;
+        const canvasWidth = padding * 2 + rowHeaderWidth + cols * cellWidth;
+        const canvasHeight = padding * 2 + headerHeight + rows * cellHeight;
+
+        // 先更新 canvas 实际尺寸（关键：必须非0）
+        this.canvasWidth = canvasWidth;
+        this.canvasHeight = canvasHeight;
+
+        uni.showLoading({ title: '生成中...' });
+
+        // 超时兜底，8秒后强制关闭loading
+        const timeoutTimer = setTimeout(() => {
+          uni.hideLoading();
+          uni.showToast({ title: '生成超时，请重试', icon: 'none' });
+        }, 8000);
+
+        const clearTimer = () => clearTimeout(timeoutTimer);
+
+        // #ifdef H5
+        try {
+          const canvas = document.createElement('canvas');
+          canvas.width = canvasWidth;
+          canvas.height = canvasHeight;
+          const ctx = canvas.getContext('2d');
+          if (!ctx) {
+            clearTimer();
+            uni.hideLoading();
+            uni.showToast({ title: '无法创建 Canvas 上下文', icon: 'none' });
+            return;
+          }
+          this.drawSchedule(ctx, canvasWidth, canvasHeight);
+          const dataURL = canvas.toDataURL('image/png');
+          clearTimer();
+          uni.hideLoading();
+          this.previewImagePath = dataURL;
+          this.$nextTick(() => {
+            this.$refs.previewPopup.open();
+          });
+        } catch (e) {
+          clearTimer();
+          uni.hideLoading();
+          console.error(e);
+          uni.showToast({ title: '生成失败', icon: 'none' });
+        }
+        // #endif
+
+        // #ifndef H5
+        // 等待 canvas 尺寸更新到 DOM 后再绘制
+        this.$nextTick(() => {
+          setTimeout(() => {
+            const ctx = uni.createCanvasContext('weekCanvas', this);
+            this.drawSchedule(ctx, canvasWidth, canvasHeight);
+            ctx.draw(false, () => {
+              uni.canvasToTempFilePath({
+                canvasId: 'weekCanvas',
+                width: canvasWidth,
+                height: canvasHeight,
+                destWidth: canvasWidth * 2,
+                destHeight: canvasHeight * 2,
+                success: (res) => {
+                  clearTimer();
+                  uni.hideLoading();
+                  this.previewImagePath = res.tempFilePath;
+                  this.$nextTick(() => {
+                    this.$refs.previewPopup.open();
+                  });
+                  this.saveImage();
+                },
+                fail: (err) => {
+                  clearTimer();
+                  uni.hideLoading();
+                  console.error('canvasToTempFilePath fail:', err);
+                  uni.showToast({ title: '生成失败：' + (err.errMsg || ''), icon: 'none' });
+                }
+              }, this);
+            });
+          }, 50);
+        });
+        // #endif
+      },
+
+      drawSchedule(ctx, canvasWidth, canvasHeight) {
+        // 判断是否为旧式 CanvasContext (uni-app 的 CanvasContext)
+        const isLegacy = typeof ctx.setFillStyle === 'function' && typeof ctx.fillStyle === 'undefined';
+
+        // 辅助函数，统一设置样式
+        const setFill = (color) => isLegacy ? ctx.setFillStyle(color) : (ctx.fillStyle = color);
+        const setStroke = (color) => isLegacy ? ctx.setStrokeStyle(color) : (ctx.strokeStyle = color);
+        const setFontSize = (size) => isLegacy ? ctx.setFontSize(size) : (ctx.font = size + 'px sans-serif');
+        const setTextAlign = (align) => isLegacy ? ctx.setTextAlign(align) : (ctx.textAlign = align);
+        const setTextBaseline = (baseline) => isLegacy ? ctx.setTextBaseline(baseline) : (ctx.textBaseline = baseline);
+
+        const padding = 10;
+        const rowHeaderWidth = 80;
+        const cellWidth = 120;
+        const cellHeight = 90;
+        const headerHeight = 60;
+        const cols = this.columnTitles.length;
+        const rows = this.claTimeContainer.length;
+
+        // 白色背景
+        setFill('#ffffff');
+        ctx.fillRect(0, 0, canvasWidth, canvasHeight);
+
+        // 绘制表头
+        setFill('#e4f9f7');
+        ctx.fillRect(padding, padding, rowHeaderWidth, headerHeight);
+
+        for (let i = 0; i < cols; i++) {
+          const col = this.columnTitles[i];
+          const x = padding + rowHeaderWidth + i * cellWidth;
+          setFill('#e4f9f7');
+          ctx.fillRect(x, padding, cellWidth, headerHeight);
+
+          setFill('#000000');
+          setFontSize(12);
+          setTextAlign('center');
+          setTextBaseline('middle');
+          ctx.fillText(col.day, x + cellWidth / 2, padding + headerHeight / 2 - 8);
+          ctx.fillText(col.weekName, x + cellWidth / 2, padding + headerHeight / 2 + 8);
+          if (col.count > 0) {
+            setFill('#ff0000');
+            setFontSize(10);
+            ctx.fillText(col.count, x + cellWidth - 20, padding + 12);
+          }
+        }
+
+        // 绘制每一行
+        for (let i = 0; i < rows; i++) {
+          const row = this.claTimeContainer[i];
+          const y = padding + headerHeight + i * cellHeight;
+
+          // 左侧时间
+          setFill('#F2F2F2');
+          ctx.fillRect(padding, y, rowHeaderWidth, cellHeight);
+          setFill('#000000');
+          setFontSize(12);
+          setTextAlign('center');
+          setTextBaseline('middle');
+          ctx.fillText(row.time, padding + rowHeaderWidth / 2, y + cellHeight / 2);
+
+          // 各列数据
+          for (let j = 0; j < cols; j++) {
+            const col = this.columnTitles[j];
+            const x = padding + rowHeaderWidth + j * cellWidth;
+            let course = null;
+            // 修复后：兼容 YYYY-MM-DD 与 MM-DD 两种格式
+            for (let key in row.claTimeWeekDayMap) {
+              const list = row.claTimeWeekDayMap[key];
+              if (list && list.length > 0) {
+                const claDate = list[0].claDate || '';
+                const day = col.day || '';
+                const matched = claDate === day ||
+                    (day.length === 5 && claDate.length === 10 && claDate.slice(5) === day);
+                if (matched) {
+                  course = list[0];
+                  break;
+                }
+              }
+            }
+
+
+            if (course) {
+              setFill(course.claColor || '#409EFF');
+              ctx.fillRect(x, y, cellWidth, cellHeight);
+              setFill('#000000');
+              setFontSize(10);
+              setTextAlign('center');
+              setTextBaseline('middle');
+              let textY = y + 12;
+              ctx.fillText(course.startTime + '-' + course.endTime, x + cellWidth / 2, textY);
+              textY += 16;
+              ctx.fillText(course.courseName, x + cellWidth / 2, textY);
+              textY += 16;
+              if (course.staffName) {
+                ctx.fillText(course.staffName, x + cellWidth / 2, textY);
+                textY += 16;
+              }
+              if (course.roomName) {
+                ctx.fillText(course.roomName, x + cellWidth / 2, textY);
+              }
+            } else {
+              setFill('#ffffff');
+              ctx.fillRect(x, y, cellWidth, cellHeight);
+            }
+
+            setStroke('#cccccc');
+            ctx.strokeRect(x, y, cellWidth, cellHeight);
+          }
+          setStroke('#cccccc');
+          ctx.strokeRect(padding, y, rowHeaderWidth, cellHeight);
+        }
+
+        // 外边框
+        setStroke('#cccccc');
+        ctx.strokeRect(padding, padding, rowHeaderWidth, headerHeight);
+        ctx.strokeRect(padding, padding, rowHeaderWidth + cols * cellWidth, headerHeight + rows * cellHeight);
+
+      },
+      saveImage() {
+        if (!this.previewImagePath) {
+          uni.showToast({ title: '图片不存在', icon: 'none' });
+          return;
+        }
+
+        // #ifdef H5
+        try {
+          if (this.previewImagePath.startsWith('data:')) {
+            // base64 转 blob 下载，兼容大图片
+            const arr = this.previewImagePath.split(',');
+            const mime = arr[0].match(/:(.*?);/)[1];
+            const bstr = atob(arr[1]);
+            let n = bstr.length;
+            const u8arr = new Uint8Array(n);
+            while (n--) {
+              u8arr[n] = bstr.charCodeAt(n);
+            }
+            const blob = new Blob([u8arr], { type: mime });
+            const url = URL.createObjectURL(blob);
+            const link = document.createElement('a');
+            link.download = '周课表.png';
+            link.href = url;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+            URL.revokeObjectURL(url);
+          } else {
+            const link = document.createElement('a');
+            link.download = '周课表.png';
+            link.href = this.previewImagePath;
+            document.body.appendChild(link);
+            link.click();
+            document.body.removeChild(link);
+          }
+          uni.showToast({ title: '下载成功' });
+          this.closePreview();
+        } catch (e) {
+          console.error(e);
+          uni.showToast({ title: '下载失败', icon: 'none' });
+        }
+        // #endif
+
+        // #ifndef H5
+        uni.saveImageToPhotosAlbum({
+          filePath: this.previewImagePath,
+          success: () => {
+            uni.showToast({ title: '保存成功' });
+            this.closePreview();
+          },
+          fail: (err) => {
+            console.error(err);
+            if (err.errMsg && err.errMsg.indexOf('auth deny') > -1) {
+              uni.showModal({
+                title: '提示',
+                content: '需要您授权保存到相册，是否前往设置？',
+                success: (res) => {
+                  if (res.confirm) {
+                    uni.openSetting();
+                  }
+                }
+              });
+            } else {
+              uni.showToast({ title: '保存失败', icon: 'none' });
+            }
+          }
+        });
+        // #endif
+      }
+      ,
+      closePreview() {
+        this.$refs.previewPopup.close();
+        // 可清除临时图片路径以释放内存
+        // this.previewImagePath = '';
+      },
       formatTime(timeStr) {
         // 假设 timeStr 格式为 "HH:MM:SS"
         return timeStr.slice(0, 5); // 取前5位 "HH:MM"
@@ -905,6 +1201,25 @@
 		height: calc(100vh - var(--window-top));
 		/* #endif */
 	}
+  .preview-container {
+    background: #fff;
+    border-radius: 20rpx;
+    padding: 40rpx;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 90%;
+    max-width: 600rpx;
+  }
+  .preview-actions {
+    display: flex;
+    justify-content: space-around;
+    width: 100%;
+    margin-top: 30rpx;
+    button {
+      width: 40%;
+    }
+  }
 	.headcon{
 		display: flex;
 		flex-direction: row;
@@ -924,6 +1239,14 @@
 				font-size: 30rpx;
 				margin-left: 10rpx;
 			}
+      .save-btn {
+        display: flex;
+        align-items: center;
+        margin-right: 10rpx;
+        padding: 8rpx 16rpx;
+        background-color: rgba(0,169,154,0.1);
+        border-radius: 30rpx;
+      }
 		}
 	}
 	.tabtip{
diff --git a/pages/user/set.vue b/pages/user/set.vue
index 4146c06..6e69f70 100644
--- a/pages/user/set.vue
+++ b/pages/user/set.vue
@@ -213,7 +213,7 @@
 							myCache("signtype",'11');
 							// 跳转 我的
 							uni.switchTab({
-								url: '/pages/user/user'
+								url: '/pages/login/login'
 							});
 						}
 					}
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 1edeecd..68d36c4 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -616,6 +616,9 @@
 									type: 'warning',
 									duration: 2000
 								});
+                uni.navigateTo({
+                  url: `/pages/login/login`
+                });
 							}
 						}
 					});
diff --git a/store/chatStore.js b/store/chatStore.js
index a1619db..7775637 100644
--- a/store/chatStore.js
+++ b/store/chatStore.js
@@ -516,7 +516,7 @@ const chatModule = {
 			if (msgInfo.id && msgInfo.id > 0) {
 				for (let i = 0; i < chat.messages.length; i++) {
 					const m = chat.messages[i];
-					if (m.id && msgInfo.id < m.id) {
+					if (m.id && Number(msgInfo.id) < Number(m.id)) {
 						insertPos = i;
 						console.log(`消息乱序修正: ${chat.messages.length} -> ${insertPos}`);
 						break;
@@ -530,6 +530,7 @@ const chatModule = {
 			// 标记已存储为 false（已在 mutation 中完成）
 			// 保存到本地
 			dispatch('saveToStorage', { withColdMessage: false });
+
 		},
 
 		// ========== 更新消息 ==========