caichengyu пре 11 часа
родитељ
комит
be9349573d

+ 2 - 1
common/request.js

@@ -181,7 +181,8 @@ function getTenantId() {
 			},
 			success: (res) => {
 				if (res.data.code == 200) {
-					resolve(res.data.data);
+					resolve('129978618875038');
+					// resolve(res.data.data);
 				} else {
 					uni.showToast({
 						title: "请求接口失败",

+ 1 - 0
manifest.json

@@ -5,6 +5,7 @@
     "versionName" : "1.0.0",
     "versionCode" : "100",
     "transformPx" : false,
+"sassImplementationName": "node-sass",
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,

+ 64 - 109
pages/index/index.vue

@@ -250,140 +250,95 @@
 				currentCourse: 0,
 				currentBank: 0,
 				certificate: [{
-						imgUrl: "https://file.xyyxt.net/web/static/img/bxxkz-zb.jpg",
+						imgUrl: "https://file.gdzckj.net/cos/web/static/img/bxxkz-zb.png",
 					},
 					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/djz.jpg",
+						imgUrl: "https://file.gdzckj.net/cos/web/static/img/djz.png",
 					},
 					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/hjgltxrz.jpg",
+						imgUrl: "https://file.gdzckj.net/cos/web/static/img/djz2.png",
 					},
 					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zyhjaqgktxrz.jpg",
+						imgUrl: "https://file.gdzckj.net/cos/web/static/img/bxxkz-zb2.png",
 						width: "147px"
 					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zlgltxrz.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zzqyzhjyxtrzzs.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/facesbrzzs.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zzyxtptrzzs1.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zzyxtptrzzs2.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zzzhkcrzzs1.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zzzhkcrzzs3.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zzzhkcrzzs2.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zzzhkcrzzs3-3.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zzzhkcrzzs.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/2018A1.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/2018A2.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/2018A3.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/2018A4.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/2018A5.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/2018A6.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/2018A7.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/2018A8.jpg",
-					},
-					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/2019A1.jpg",
-					},
-
 				],
 				teacher: [{
-						imgUrl: "https://file.xyyxt.net/web/static/img/ch.png",
-						name: "陈红",
-						occupation: "教授、高级工程师",
+						imgUrl: "https://file.gdzckj.net/cos/web/static/img/teach1.png",
+						name: "魏霖阳",
+						occupation: "工程师、高级讲师",
 						remark: [
-							"国务院安委会、咨询、建筑施工专业委员会专家",
-							"中国模板手脚架协会副秘书长",
-							"原中国建筑一局 (集团)有限公司工程技术部经理参编国家标准:",
-							"《建筑施工脚手架安全技术统一标准》",
-							"《建筑施工扣件式钢管脚手架安全技术规范》",
-							"《建筑施工临时支撑技术规范》"
+							"工学硕士、金牌讲师",
+							"国家级科研项目核心成员",
+							"粉丝矩阵:50w+;单日涨粉:10000+",
+							"独创「秒题全课程体系」",
+							"\"社工赛道破局者\"",
+							"学术实战派教育管理者,专注于社会工作师等职业考证培训,以学术严谨性和实战效果著称。"
 						]
 					},
 					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/xfk.png",
-						name: "徐福康",
-						occupation: "教授、高级工程师",
+						imgUrl: "https://file.gdzckj.net/cos/web/static/img/teach2.png",
+						name: "晁高点",
+						occupation: "工程师、高级讲师",
 						remark: [
-							"上海市施工现场安全生产保证体系第一审核认证中心副主任、总工程师",
-							"上海市建设工程安全质量监督总站高级工程师",
-							"国家标准《建筑施工企业安全生产管理规范》主要起草人"
+							"金牌讲师",
+							"独创「举例教学法」    全网粉丝:20w+",
+							"抖音平台单课程累计付费:突破1000w+",
+							"5年扎实社工经验  10年金牌授课经验",
+							"\"桃李天下 赞誉载道\"",
+							"兼具实战经验与授课技巧的资深讲师,以举例教学法著称。"
 						]
 					},
 					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/mym.png",
-						name: "马英明",
-						occupation: "教授、高级工程师",
+						imgUrl: "https://file.gdzckj.net/cos/web/static/img/teach3.png",
+						name: "王娜",
+						occupation: "工程师、高级讲师",
 						remark: [
-							"中国矿业大学博士生导师",
-							"国家住建部全国地铁与轻轨建设专家组专家",
-							"广东省人民政府科技专家顾问委员会委员",
-							"原中国地下工程学会副主任"
+							"金牌讲师",
+							"首创「娜多分口诀」记忆法",
+							"全网粉丝:20w+  线上学员总量:突破100w+",
+							"\"战略转型 破圈典范\"",
+							"\"专业筑基 实践先锋\"",
+							"以创新记忆法著称的专业讲师,擅长将复杂考点转化为易于记忆的口诀"
 						]
 					},
 					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/khc.png",
-						name: "邝穗春",
+						imgUrl: "https://file.gdzckj.net/cos/web/static/img/teach4.png",
+						name: "李君",
 						occupation: "工程师、高级讲师",
 						remark: [
-							"广州市建筑置业有限公司",
-							"生产技术部/工程部/资料管理部副部长",
-							"广州市市政集团培训中心高级讲师",
-							"广州大学市政技术学院特聘讲师",
-							"专业从事建筑工程竣工验收/技术资料管理",
-							"建筑工程施工安全资料管理"
+							"金牌讲师",
+							"抖音粉丝:50w+",
+							"视频号粉丝:10w+",
+							"教学卓越 · 备受信赖 · 真诚服务 · 口碑载道",
+							"入职3年成功转型优秀讲师主播",
+							"从传统教学成功转型为线上直播讲师的代表人物"
 						]
 					},
 					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/hxx.png",
-						name: "胡欣欣",
-						occupation: "教授、硕士生导师",
+						imgUrl: "https://file.gdzckj.net/cos/web/static/img/teach5.png",
+						name: "张小凡",
+						occupation: "工程师、高级讲师",
 						remark: [
-							"二建考前名师",
-							"广东工业大学土木与交通工程学员硕士生导师",
-							"广东省工程造价协会专家库成员",
-							"广东省工程咨询协会专家库成员"
+							"金牌讲师",
+							"社会工作者单月业绩:10w+",
+							"一级建造师单月业绩:30w+",
+							"中级经济师单日业绩:3w+",
+							"三域穿透式教学法  “三域开疆 · 数据见证破局”",
+							"横跨社会工作者、一级建造师、中级经济师三大考证领域的全能型讲师"
 						]
 					},
 					{
-						imgUrl: "https://file.xyyxt.net/web/static/img/zzhteacher.png",
-						name: "朱培浩",
-						occupation: "博士、教材主编",
-						remark: ["机电实务全国名师", "建造师相关教材主编、参编"]
+						imgUrl: "https://file.gdzckj.net/cos/web/static/img/teach6.png",
+						name: "刘向向",
+						occupation: "工程师、高级讲师",
+						remark: [
+							"金牌讲师",
+							"矩阵粉丝:50w+  年课程销售额:500w+",
+							"现象级教培IP       学员通关率:行业TOP 3%",
+							"职业考证三栖王牌导师        主编《社会工作者330句》连续登顶抖音教辅热销榜",
+							"全链路操盘型的现象级教培讲师,从教材研发到直播带货的完整闭环能力"
+						]
 					}
 				],
 				jumpList: [{
@@ -441,15 +396,15 @@
 				version: null, //当前版本号
 				current: 0, //政策法规
 				courseLists: [{
-						name: "开班消息",
-						type: 1
-					},{
 						name: "最新消息",
 						type: 2
 					},
 					{
 						name: "政策法规",
 						type: 3
+					}, {
+						name: "开班消息",
+						type: 1
 					},
 					{
 						name: "通知通告",
@@ -464,7 +419,7 @@
 				},
 				total: 0,
 				formData1: {
-					pageSize: 5, //每页内容条数
+					pageSize: 4, //每页内容条数
 					pageNum: 1, //当前第几页
 				},
 			};
@@ -547,7 +502,7 @@
 				if (e == this.current) return;
 				this.current = e;
 				this.formData1 = {
-					pageSize: 5, //每页内容条数
+					pageSize: 4, //每页内容条数
 					pageNum: 1, //当前第几页
 				};
 				this.getList('d' + this.current);
@@ -558,7 +513,7 @@
 				return new Promise((resolve, reject) => {
 					var data = {
 						...this.formData1,
-						type: this.current==0?3:this.current==1?null:this.current==2?1:2
+						type: this.current == 2 ? 3 : this.current == 0 ? null : this.current == 3 ? 2 : 1
 					};
 
 					this.$api

+ 3 - 1
pages2/order/confirm_pay.vue

@@ -213,14 +213,16 @@
 							const url = window.location.host + "/pages2/order/confirm_pay";
 							// 跳自己授权
 							if (this.config.gzhSelfLicense) {
+										// console.log("asd1",res);
 								uni.request({
-									url: `https://cloud.xyyxt.net/app/common/wx/config`,
+									url: `https://admin.gdzckj.net/app/common/wx/config`,
 									method: "get",
 									data: {},
 									header: {
 										TenantId: tenantId,
 									},
 									success: (res) => {
+										// console.log("asd2",res,url);
 										location.replace(
 											`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${
 				        res.data.data.gzhAppId

+ 1 - 1
pages2/register/forget.vue

@@ -9,7 +9,7 @@
       title="忘记密码"
       :border-bottom="false"
       background="{ background: '#ffffff',opacity:0.4; }"
-      title-color="#ffffff"
+      title-color="rgb(128, 128, 128)"
       back-icon-color="#ffffff"
     ></u-navbar>
     <view style="padding: 30rpx">

+ 1 - 1
pages2/register/register.vue

@@ -2,7 +2,7 @@
 	<view style="height: 100%">
 		<image mode="widthFix" src="/pages2/static/login_bg.jpg" class="full_img"></image>
 		<u-navbar title="欢迎注册" :border-bottom="false" background="{ background: '#ffffff',opacity:0.4; }"
-			title-color="#ffffff" back-icon-color="#ffffff"></u-navbar>
+			title-color="rgb(128, 128, 128)" back-icon-color="#ffffff"></u-navbar>
 		<view style="padding: 30rpx">
 			<view class="login_box">
 				<u-form :model="form" ref="uForm">

BIN
pages2/static/login_bg.jpg


+ 1 - 1
pages4/login/login.vue

@@ -8,7 +8,7 @@
 		<view style="padding: 30rpx">
 			<view style="width: 400rpx">
 				<u-subsection @change="sectionChange" :list="list" :current="current" active-color="#007AFF"
-					inactive-color="#ffffff" bg-color="rgba(255,255,255,0.52)"></u-subsection>
+					inactive-color="rgb(128, 128, 128)" bg-color="rgba(255,255,255,0.52)"></u-subsection>
 			</view>
 			<view class="login_box">
 				<u-form :model="form" ref="uForm1" v-show="current == 0">

BIN
pages4/static/login_bg.jpg


BIN
pages4/static/login_bg11.jpg