Merge remote-tracking branch 'origin/2024鹅状元' into 2024鹅状元

# Conflicts:
#	pages.json

common/styles/global/components.scss

@@ -47,3 +47,9 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
     background-color: rgb(248, 248, 248);color: rgb(0, 0, 0);box-sizing: border-box;
 	display: flex;align-items: center;justify-content: center;overflow: hidden;z-index: 998;
   }
+
+
+.uni-tabbar{
+	@include ezy-no-repeat-contain(bottom);
+	background-image: url("@/static/images/tabbar/tabbar-bg.png");
+}

package.json

@@ -1,22 +1,51 @@
 {
-  "name": "hbproject",
-  "version": "1.0.0",
-  "description": "",
-  "main": "main.js",
-  "dependencies": {
-    "axios": "^1.7.2",
-    "jsencrypt": "^3.3.2",
-    "pinia": "^2.1.7",
-    "ts-md5": "^1.3.1"
-  },
-  "devDependencies": {},
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1112"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gogs.mtavip.com/wangguoyu/uniProject.git"
-  },
-  "author": "",
-  "license": "ISC"
+	"name": "hbproject",
+	"version": "1.0.0",
+	"description": "",
+	"main": "main.js",
+	"dependencies": {
+		"axios": "^1.7.2",
+		"jsencrypt": "^3.3.2",
+		"pinia": "^2.1.7",
+		"ts-md5": "^1.3.1",
+		"uview-plus": "^3.3.42",
+		"vue": "^3.5.13"
+	},
+	"devDependencies": {},
+	"uni-app": {
+		"scripts": {
+			"dev-h5": {
+				"title": "开发环境H5",
+				"BROWSER": "chrome",
+				"env": {
+					"UNI_PLATFORM": "h5",
+					"UNI_APP_URL": "https://www.wgy.com",
+					"UNI_BASE_URL": "https://www.wgy.com"
+				},
+				"define": {
+					"DEV-H5": true
+				}
+			},
+			"prod-h5": {
+				"title": "生产环境H5",
+				"BROWSER": "chrome",
+				"env": {
+					"UNI_PLATFORM": "h5",
+					"UNI_APP_URL": "https://www.wgy.com"
+				},
+				"define": {
+					"PROD-H5": true
+				}
+			}
+		}
+	},
+	"scripts": {
+		"dev:h5": "uni"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://gogs.mtavip.com/wangguoyu/uniProject.git"
+	},
+	"author": "",
+	"license": "ISC"
 }

pages.json

@@ -1,7 +1,13 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path": "pages/login",
+			"path": "pages/login/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/login/login",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -21,8 +27,21 @@
 			}
 		},
 		{
+			"path": "pages/study/lookShipin",
+			"style": {
+				"navigationBarTitleText": "视频",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/my/index",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
 			"path" : "pages/unitTest/index",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText" : "单元测试",
 				"navigationStyle": "custom"
@@ -30,33 +49,27 @@
 		}
 	],
 	"tabBar": {
-		"color": "#565656",
-		"selectedColor": "#0856E6",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"fontSize": "13px",
-		"iconWidth": "28px",
+		"height": "150rpx",
+		"iconWidth": "134rpx",
 		"spacing": "0px",
+		"backgroundColor": "transparent",
+		"borderStyle": "transparent",
 		"list": [{
-			"pagePath": "pages/study/catalogue",
-			"iconPath": "static/images/tabbar/unselect/index-sj.png",
-			"selectedIconPath": "static/images/tabbar/select/index-sj.png",
-			"text": "首页"
+			"pagePath": "pages/study/index",
+			"iconPath": "static/images/tabbar/unselect/plan-sj.png",
+			"selectedIconPath": "static/images/tabbar/select/plan-sj.png"
 		}, {
 			"pagePath": "pages/study/catalogue",
-			"iconPath": "static/images/tabbar/unselect/exam-sj.png",
-			"selectedIconPath": "static/images/tabbar/select/exam-sj.png",
-			"text": "考试"
+			"iconPath": "static/images/tabbar/unselect/develop-sj.png",
+			"selectedIconPath": "static/images/tabbar/select/develop-sj.png"
 		}, {
 			"pagePath": "pages/study/catalogue",
-			"iconPath": "static/images/tabbar/unselect/kecheng-sj.png",
-			"selectedIconPath": "static/images/tabbar/select/kecheng-sj.png",
-			"text": "课程"
+			"iconPath": "static/images/tabbar/unselect/partner-sj.png",
+			"selectedIconPath": "static/images/tabbar/select/partner-sj.png"
 		}, {
-			"pagePath": "pages/study/catalogue",
-			"iconPath": "static/images/tabbar/unselect/score-sj.png",
-			"selectedIconPath": "static/images/tabbar/select/score-sj.png",
-			"text": "成绩"
+			"pagePath": "pages/my/index",
+			"iconPath": "static/images/tabbar/unselect/my-sj.png",
+			"selectedIconPath": "static/images/tabbar/select/my-sj.png"
 		}]
 	},
 	"globalStyle": {

pages/login.vue

@@ -1,115 +0,0 @@
-<template>
-  <view class="ezy-login-page">
-	  <view class="ezy-login-wrap" >
-			<!-- 手机号 -->
-			<template v-if="data.loginTel">
-				<view class="login-body-box">
-					<view class="login-title-img"></view>
-				    <view class="phone-input-box">
-						<view class="phone-prefix">+86</view>
-						<input class="phone-input" type="text" v-model="data.phoneNumber" placeholder="请输入手机号" 
-						maxlength="11" :value="data.phoneNumber" @input="clearTelInput" />
-						<view class="close-btn" v-if="data.clearTelIcon" @click="clearTel"></view>
-				    </view>
-					<!-- 协议勾选框和按钮 -->
-					<view class="agreement-checkbox-box">
-						<checkbox class="agreement-checkbox" color="#FFFFFF" :checked="isAgreed" @change="handleAgreementChange">
-						  我已阅读并同意<view class="agreement-text">《用户协议》</view>和<view class="agreement-text">《隐私政策》</view>
-						</checkbox>
-					</view>
-					<view class="yzm-btn-disabled" @click="getYzmBtn" :class="data.telStatus"></view>
-				</view>
-				<view class="wx-btn-img"></view>
-			</template>
-			<!-- 验证码 -->
-			<template v-if="!data.loginTel">
-				<view class="login-body-box">
-					<view class="login-title-img"></view>
-					<view class="phone-prefix">验证码已发送至：{{data.phoneNumber}}</view>
-					<view class="phone-input-box">
-						<input class="phone-input" type="text" v-model="data.yzmNumber" placeholder="请输入验证码" 
-						maxlength="6" :value="data.yzmNumber" @input="clearYzmInput" />
-						<view class="close-btn" v-if="data.clearYzmIcon" @click="clearYzm"></view>
-					</view>
-					<view class="yzm-btn-disabled" @click="loginBtn" :class="data.yzmStatus"></view>
-				</view>
-			</template>
-		  </view>
-		  
-  </view>
-</template>
-
-<script setup>
-	import {
-		ref,
-		reactive
-	} from "vue"
-	
-	const data = reactive({
-		loginTel: true,
-		phoneNumber: null,
-		clearTelIcon: false,
-		telStatus:'',
-		isAgreed: false,
-		yzmNumber: null,
-		clearYzmIcon: false,
-		yzmStatus:'',
-	})
-	
-	/********* 手机号部分 *********/
-	const getYzmBtn = () => {
-		console.log('123');
-		data.loginTel =false;
-		
-	}
-	
-	// 手机号校验规则
-	const validatePhoneNumber = (value) => {
-	  const phoneRegex = /^1[3-9]\d{9}$/;
-	  if (phoneRegex.test(value)) {
-		console.log('手机号格式正确');
-		data.telStatus = 'yzm-btn-normal';
-	  } else {
-	    console.log('手机号格式不正确');
-	  }
-	}
-	
-	const clearTelInput = (event) => {
-	    if (event.detail.value.length > 0) {
-	        data.clearTelIcon = true;
-			validatePhoneNumber(event.detail.value);
-	    } else {
-	        data.clearTelIcon = false;
-	    }
-	}
-			
-	const clearTel = () => {
-		data.phoneNumber = '';
-		data.clearTelIcon = false;
-	}
-	
-	/********* 验证码 *********/
-	const loginBtn = () => {
-		uni.switchTab({
-			url: '/pages/index/index'
-		});
-		/* uni.navigateTo({
-			url: `/pages/study/index?gradeId=${options.grade}&termId=${options.term}&text=${text1}${text2}`
-		}) */
-	}
-	
-	const clearYzmInput = (event) => {
-		if (event.detail.value.length > 0) {
-		    data.clearYzmIcon = true;
-		} else {
-		    data.clearYzmIcon = false;
-		}
-	}
-	
-	const clearYzm = () => {
-		data.yzmNumber = '';
-		data.clearYzmIcon = false;
-	}
-	
-	
-</script>

pages/study/index.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view @click="goBack">{{gradeTerm.text}}</view>
 		<view>
-			<view v-for="item in data.list" :key="item.index"> {{item.index}} {{item.label}} </view>
+			<view v-for="item in data.list" :key="item.index" @click="listClick"> {{item.index}} {{item.label}} </view>
 		</view>
 		<view>
 			<uni-button @click="handleCheckCatalogue">go catalogue</uni-button>
@@ -63,7 +63,6 @@
 			},
 		]
 	})
-
 	function handleChangeZhang(data) {
 		console.log('章:', data);
 	}

pages/study/lookShipin.vue

@@ -0,0 +1,20 @@
+<template>
+	<view>
+	123
+	</view>
+</template>
+
+<script setup>
+	import {
+		useRoute
+	} from "vue-router";
+	import {
+		reactive
+	} from "vue";
+	const route = useRoute();
+	const gradeTerm = route.query;
+</script>
+
+<style>
+
+</style>

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,15 +1,25 @@
 {
-  "hash": "88503f0e",
-  "configHash": "ea4e468c",
+  "hash": "2a404f3e",
+  "configHash": "088a760f",
   "lockfileHash": "e3b0c442",
-  "browserHash": "38e76d38",
+  "browserHash": "082c642f",
   "optimized": {
+    "jsencrypt": {
+      "src": "../../../../../node_modules/jsencrypt/lib/index.js",
+      "file": "jsencrypt.js",
+      "fileHash": "b20b551a",
+      "needsInterop": false
+    },
     "ts-md5/dist/md5": {
       "src": "../../../../../node_modules/ts-md5/dist/md5.js",
       "file": "ts-md5_dist_md5.js",
-      "fileHash": "c0f874e9",
+      "fileHash": "f1831990",
       "needsInterop": true
     }
   },
-  "chunks": {}
+  "chunks": {
+    "chunk-Y2F7D3TJ": {
+      "file": "chunk-Y2F7D3TJ.js"
+    }
+  }
 }