李万涛 1 年間 前
コミット
8770aeb50f

+ 13 - 1
App.vue

xqd xqd
@@ -2,6 +2,7 @@
 	import {
 		init
 	} from "@/common";
+	import uploadUrl from '@/common/config.js'
 	export default {
 		onLaunch(options) {
 
@@ -9,7 +10,18 @@
 			// init(options);
 			// // #ifndef MP-TOUTIAO
 			// uni.hideTabBar({});
-			// // #endif		
+			// // #endif	
+
+			uni.request({
+				url: uploadUrl.apiBaseUrl + '/weixin/getWxAppid',
+				method: "POST",
+				success: (res) => {
+					console.log('app.vue中微信id1', res)
+					if (res.data.code == 0) {
+						uni.setStorageSync('wxId', res.data.data.wechat_app_id)
+					}
+				}
+			})
 
 		},
 		onShow() {

+ 2 - 2
api/public/index.js

xqd
@@ -9,8 +9,8 @@ export const uploadPhotoOrVideo = (params, config = {}) => http.post('/order/cou
 
 
 
-//系统参数
-// export const uploadPhotoOrVideo = (params, config = {}) => http.post('/order/course/list', params, config)
+// //系统参数
+// export const getSysParmars = (params, config = {}) => http.post('/order/course/list', params, config)
 
 
 //gpt

+ 6 - 3
common/config.js

xqd
@@ -1,19 +1,22 @@
 var baseUrl = ''
 var chatUrl = ''
+var apiBaseUrl = ""
 if (process.env.NODE_ENV === 'development') {
 	console.log('开发环境---------------------');
 	baseUrl = 'https://t20.9026.com/api/common/upload'
-	chatUrl = 'https://t20.9026.com/api/chat/send'
+	chatUrl = 'https://t20.9026.com/api/chat/send',
+		apiBaseUrl = "https://t20.9026.com/api"
 }
 if (process.env.NODE_ENV === 'production') {
 	console.log('生产环境------------------');
 	baseUrl = 'https://t20.9026.com/api/common/upload'
 	chatUrl = 'https://t20.9026.com/api/chat/send'
-
+	apiBaseUrl = "https://t20.9026.com/api"
 	// baseUrl: 'https://www.ai5566.top/api/common/upload'
 }
 
 module.exports = {
 	baseUrl,
-	chatUrl
+	chatUrl,
+	apiBaseUrl
 }

+ 2 - 1
common/pay/index.js

xqd
@@ -85,7 +85,8 @@ export default class ShoproPay {
 				// // platform: 'wxOfficialAccount'
 				order_id: '666'
 			}
-			params.openid = 'wx96cad2970c232f6e';
+			// params.openid = 'wx96cad2970c232f6e';
+			params.openid = uni.getStorageSync('wxId');
 
 			let res6 = await wxPayPamars(params)
 			console.log('获取微信支付参数返回值', res6);

+ 1 - 1
common/wechat/wechat.js

xqd
@@ -93,7 +93,7 @@ export default {
 		// let redirect_uri = encodeURIComponent(`${host}pages/user/signin?payload=${payload}&uniacid=${UNIACID}`);
 		let redirect_uri = encodeURIComponent(`${host}?payload=${payload}&uniacid=${UNIACID}`);
 
-		let oauthUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + 'wx96cad2970c232f6e' +
+		let oauthUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=" + uni.getStorageSync('wxId') +
 			`&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_userinfo&state=1&uniacid=${UNIACID}`;
 		uni.setStorageSync("lastPage", window.location.href);
 		window.location = oauthUrl;

+ 11 - 11
components/wike-tabbar/wike-tabbar.vue

xqd
@@ -94,17 +94,17 @@
 							"selectedIconPath": "/static/images/tabs/joblists.png",
 							"text": "任务大厅"
 						},
-						{
-							pagePath: "/pages/chat/chat",
-							// pagePath: "/pages/gptLead/index",
-							navigateType: "navigateTo",
-							// navigateType: "switchTab",
-							showBig: false,
-							fontClass: "icon-chat",
-							"iconPath": "/static/images/tabs/joblist.png",
-							"selectedIconPath": "/static/images/tabs/joblists.png",
-							"text": "GPT"
-						},
+						// {
+						// 	pagePath: "/pages/chat/chat",
+						// 	// pagePath: "/pages/gptLead/index",
+						// 	navigateType: "navigateTo",
+						// 	// navigateType: "switchTab",
+						// 	showBig: false,
+						// 	fontClass: "icon-chat",
+						// 	"iconPath": "/static/images/tabs/joblist.png",
+						// 	"selectedIconPath": "/static/images/tabs/joblists.png",
+						// 	"text": "GPT"
+						// },
 						// {
 						// 	pagePath: "/pages/template/template",
 						// 	navigateType: "switchTab",

+ 28 - 28
pages.json

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -64,7 +64,7 @@
 		{
 			"path": "pages/index/scoreDetail/index",
 			"style": {
-				"navigationBarTitleText": "课程详情",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -81,7 +81,7 @@
 		{
 			"path": "pages/tusk/tuskDetail/index",
 			"style": {
-				"navigationBarTitleText": "任务详情",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -98,7 +98,7 @@
 		{
 			"path": "pages/tusk/tuskCat/index",
 			"style": {
-				"navigationBarTitleText": "任务分类",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -115,7 +115,7 @@
 		{
 			"path": "pages/index/scorePaySuc/index",
 			"style": {
-				"navigationBarTitleText": "课程支付状态",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -132,7 +132,7 @@
 		{
 			"path": "pages/index/scorePayMiddle/index",
 			"style": {
-				"navigationBarTitleText": "支付结果查询",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -285,7 +285,7 @@
 		{
 			"path": "pages/user/score/index",
 			"style": {
-				"navigationBarTitleText": "我的课程",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -299,7 +299,7 @@
 		{
 			"path": "pages/user/work/ticketDetail/index",
 			"style": {
-				"navigationBarTitleText": "凭证信息",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -313,7 +313,7 @@
 		{
 			"path": "pages/user/work/viewSuc/index",
 			"style": {
-				"navigationBarTitleText": "审核结果",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -327,7 +327,7 @@
 		{
 			"path": "pages/user/work/viewErr/index",
 			"style": {
-				"navigationBarTitleText": "审核结果",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -353,7 +353,7 @@
 		{
 			"path": "pages/user/work/index",
 			"style": {
-				"navigationBarTitleText": "我的任务",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -391,7 +391,7 @@
 		{
 			"path": "pages/user/accountSafe/updateMobile/index",
 			"style": {
-				"navigationBarTitleText": "更换手机号",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -405,7 +405,7 @@
 		{
 			"path": "pages/user/accountSafe/updatePwd/index",
 			"style": {
-				"navigationBarTitleText": "修改密码",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -452,7 +452,7 @@
 		}, {
 			"path": "pages/wx/newsdetail",
 			"style": {
-				"navigationBarTitleText": "详情",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#fff",
 				"navigationStyle": "default"
@@ -496,7 +496,7 @@
 				// "navigationStyle": "custom",
 				// "enablePullDownRefresh": false,
 				// "navigationBarBackgroundColor": "#ffffff"
-				"navigationBarTitleText": "我的团队",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				// #ifdef H5
 				"navigationStyle": "custom",
@@ -509,7 +509,7 @@
 		{
 			"path": "pages/user/commission/index",
 			"style": {
-				"navigationBarTitleText": "我的团队",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -521,7 +521,7 @@
 		}, {
 			"path": "pages/user/commission/commission-log",
 			"style": {
-				"navigationBarTitleText": "任务佣金",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -535,7 +535,7 @@
 		{
 			"path": "pages/user/commission/commission-log2",
 			"style": {
-				"navigationBarTitleText": "推广佣金",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -549,7 +549,7 @@
 		{
 			"path": "pages/user/work/detail/index",
 			"style": {
-				"navigationBarTitleText": "任务详情",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -563,7 +563,7 @@
 		{
 			"path": "pages/user/work/uploadTicket/index",
 			"style": {
-				"navigationBarTitleText": "上传完成凭证",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -576,7 +576,7 @@
 		}, {
 			"path": "pages/user/commission/withdraw",
 			"style": {
-				"navigationBarTitleText": "提现",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -608,7 +608,7 @@
 		{
 			"path": "pages/user/userinfo",
 			"style": {
-				"navigationBarTitleText": "修改用户信息",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarTextStyle": "black",
 				// #ifdef H5
@@ -623,7 +623,7 @@
 		, {
 			"path": "pages/template/template",
 			"style": {
-				"navigationBarTitleText": "提问模板",
+				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#F5FFFD",
 				// #ifdef H5
 				"navigationStyle": "custom",
@@ -646,7 +646,7 @@
 		, {
 			"path": "pages/signin/signin",
 			"style": {
-				"navigationBarTitleText": "每日任务",
+				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#F5FFFD",
 				// #ifdef H5
 				"navigationStyle": "custom",
@@ -658,7 +658,7 @@
 		}, {
 			"path": "pages/user/withdrawRes/index",
 			"style": {
-				"navigationBarTitleText": "提现结果",
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
@@ -668,7 +668,7 @@
 		{
 			"path": "pages/user/score/prePdf/index",
 			"style": {
-				"navigationBarTitleText": "pdf预览",
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
@@ -678,7 +678,7 @@
 		{
 			"path": "pages/user/score/preMp4/index",
 			"style": {
-				"navigationBarTitleText": "视频预览",
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
@@ -688,7 +688,7 @@
 		{
 			"path": "pages/user/score/preImg/index",
 			"style": {
-				"navigationBarTitleText": "图片预览",
+				"navigationBarTitleText": "",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
@@ -698,7 +698,7 @@
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "课程学习",
+		"navigationBarTitleText": "大学生任务接单平台",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	},

+ 26 - 3
pages/index/index.scss

xqd
@@ -117,13 +117,36 @@ page {
 						align-items: center;
 						padding: 30rpx;
 						margin-bottom: 30rpx;
-						image{
-							width: 200rpx;
-							height: 200rpx;
+						height: 200rpx;
+						
+						// .leftPicBox{
+						// 	width: 200rpx;
+						// 	height: 200rpx;
+						// 	border-radius: 20rpx;
+						// 	height: 100%;
+						// 	background: #eee;
+						// 	flex-shrink: 0;
+						// 	margin-right: 20rpx;
+						// 	display: flex;
+						// 	align-items: center;
+						// 	image{
+						// 		width: 200rpx;
+						// 	}
+						// }
+						.leftPicBox{
 							border-radius: 20rpx;
 							flex-shrink: 0;
 							margin-right: 20rpx;
+							width: 200rpx;
+							height: 200rpx;
+							background: #eee;
+							image{
+								border-radius: 20rpx;
+								width: 200rpx;
+								height: 200rpx;
+							}
 						}
+						
 						.right{
 							// width: 80%;
 							.des2{

+ 6 - 1
pages/index/index.vue

xqd
@@ -47,7 +47,12 @@
 			</view>
 			<ul>
 				<li v-for="(item,index) in tuskList" @click="goDetail(item.id)">
-					<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode=""></image>
+
+					<view class="leftPicBox">
+						<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode="aspectFit">
+						</image>
+					</view>
+
 
 					<view class="right">
 						<view class="title mb30" style="font-weight: 600;font-size: 34rpx;">

+ 11 - 3
pages/tusk/index.scss

xqd
@@ -99,13 +99,21 @@ page {
 							align-items: center;
 							padding: 30rpx;
 							margin-bottom: 30rpx;
-							image{
-								width: 200rpx;
-								height: 200rpx;
+							
+							.leftPicBox{
 								border-radius: 20rpx;
 								flex-shrink: 0;
 								margin-right: 20rpx;
+								width: 200rpx;
+								height: 200rpx;
+								background: #eee;
+								image{
+									border-radius: 20rpx;
+									width: 200rpx;
+									height: 200rpx;
+								}
 							}
+							
 							.right{
 								// width: 80%;
 								.title{

+ 24 - 5
pages/tusk/index.vue

xqd xqd xqd xqd
@@ -43,7 +43,13 @@
 				<view class="taskList">
 					<view class="ul">
 						<view class="li" v-for="(item,index) in tuskList2" @click="goDetail(item.id)">
-							<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode=""></image>
+							<!-- <image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode="">
+							</image> -->
+							<view class="leftPicBox">
+								<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'"
+									mode="aspectFit">
+								</image>
+							</view>
 							<view class="right">
 								<view class="title mb30">
 									<!-- Chat GPT应用场景 -->
@@ -96,8 +102,11 @@
 				<view v-if="tabCur===0" class="taskList">
 					<view class="ul">
 						<view class="li" v-for="(item,index) in tuskList" @click="goDetail(item.id)">
-							<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode=""></image>
-
+							<view class="leftPicBox">
+								<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'"
+									mode="aspectFit">
+								</image>
+							</view>
 							<view class="right">
 								<view class="title mb30">
 									<!-- Chat GPT应用场景 -->
@@ -122,8 +131,13 @@
 				<view v-if="tabCur===1" class="taskList">
 					<view class="ul">
 						<view class="li" v-for="(item,index) in tuskList" @click="goDetail(item.id)">
-							<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode=""></image>
+							<!-- <image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode=""></image> -->
 
+							<view class="leftPicBox">
+								<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'"
+									mode="aspectFit">
+								</image>
+							</view>
 							<view class="right">
 								<view class="title mb30">
 									<!-- Chat GPT应用场景 -->
@@ -148,7 +162,12 @@
 				<view v-if="tabCur===2" class="taskList">
 					<view class="ul">
 						<view class="li" v-for="(item,index) in tuskList" @click="goDetail(item.id)">
-							<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode=""></image>
+							<!-- <image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode=""></image> -->
+							<view class="leftPicBox">
+								<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'"
+									mode="aspectFit">
+								</image>
+							</view>
 
 							<view class="right">
 								<view class="title mb30">

+ 11 - 3
pages/tusk/tuskCat/index.scss

xqd
@@ -24,13 +24,21 @@ page {
 							align-items: center;
 							padding: 30rpx;
 							margin-bottom: 30rpx;
+							
+							
+						.leftPicBox{
+							border-radius: 20rpx;
+							flex-shrink: 0;
+							margin-right: 20rpx;
+							width: 200rpx;
+							height: 200rpx;
+							background: #eee;
 							image{
+								border-radius: 20rpx;
 								width: 200rpx;
 								height: 200rpx;
-								border-radius: 30rpx;
-								flex-shrink: 0;
-								margin-right: 20rpx;
 							}
+						}
 							.right{
 								// width: 80%;
 								.title{

+ 5 - 2
pages/tusk/tuskCat/index.vue

xqd
@@ -12,8 +12,11 @@
 			<view class="taskList">
 				<view class="ul">
 					<view class="li" v-for="(item,index) in tuskList" @click="goDetail(item.id)">
-						<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode=""></image>
-
+						<!-- <image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode=""></image> -->
+						<view class="leftPicBox">
+							<image :src="item.cover_image?item.cover_image:'../../static/posImg.png'" mode="aspectFit">
+							</image>
+						</view>
 						<view class="right">
 							<view class="title mb30">
 								<!-- Chat GPT应用场景 -->

+ 4 - 4
pages/user/commission/commission-log.vue

xqd xqd
@@ -20,19 +20,19 @@
 						</button>
 					</view>
 					<view class="card-num">
-						{{ showMoney ? Number(commissionSum.total_income).toFixed(2) : '***' }}
+						{{ showMoney ? Number(commissionSum.total_income?commissionSum.total_income:0).toFixed(2) : '***' }}
 					</view>
 					<view class="card-bottom u-flex u-row-left">
 						<view class="card-item u-flex-1">
 							<view class="item-title">待入账佣金</view>
 							<view class="item-value">
-								{{ showMoney ?Number(commissionSum.wait_income) .toFixed(2) : '***' }}
+								{{ showMoney ?Number(commissionSum.wait_income?commissionSum.wait_income:0) .toFixed(2) : '***' }}
 							</view>
 						</view>
 						<view class="card-item u-flex-1">
 							<view class="item-title">可提现佣金</view>
 							<view class="item-value">
-								{{ showMoney ?Number(commissionSum.cashing) .toFixed(2): '***' }}
+								{{ showMoney ?Number(commissionSum.cashing?commissionSum.cashing:0) .toFixed(2): '***' }}
 							</view>
 						</view>
 						<!-- 	<view class="card-item u-flex-1">
@@ -42,7 +42,7 @@
 						<view class="card-item u-flex-1">
 							<view class="item-title">已提现佣金</view>
 							<view class="item-value">
-								{{ showMoney ?Number(commissionSum.cashed) .toFixed(2) : '***' }}
+								{{ showMoney ?Number(commissionSum.cashed?commissionSum.cashed:0) .toFixed(2) : '***' }}
 							</view>
 						</view>
 					</view>

+ 5 - 4
pages/user/commission/commission-log2.vue

xqd xqd
@@ -21,19 +21,20 @@
 							<u-icon :name="showMoney ? 'eye-fill':'eye-off'" color="#fff" size="22"></u-icon>
 						</button>
 					</view>
-					<view class="card-num">{{ showMoney ?  Number(recommendSum.total_income).toFixed(2) : '***' }}
+					<view class="card-num">
+						{{ showMoney ?  Number(recommendSum.total_income?recommendSum.total_income:0).toFixed(2) : '***' }}
 					</view>
 					<view class="card-bottom u-flex u-row-left">
 						<view class="card-item u-flex-1">
 							<view class="item-title">待入账佣金</view>
 							<view class="item-value">
-								{{ showMoney ? Number(recommendSum.wait_income).toFixed(2) : '***' }}
+								{{ showMoney ? Number(recommendSum.wait_income?recommendSum.wait_income:0).toFixed(2) : '***' }}
 							</view>
 						</view>
 						<view class="card-item u-flex-1">
 							<view class="item-title">可提现佣金</view>
 							<view class="item-value">
-								{{ showMoney ?Number(recommendSum.cashing).toFixed(2) : '***' }}
+								{{ showMoney ?Number(recommendSum.cashing?recommendSum.cashing:0).toFixed(2) : '***' }}
 							</view>
 						</view>
 						<!-- 	<view class="card-item u-flex-1">
@@ -43,7 +44,7 @@
 						<view class="card-item u-flex-1">
 							<view class="item-title">已提现佣金</view>
 							<view class="item-value">
-								{{ showMoney ? Number(recommendSum.cashed).toFixed(2) : '***' }}
+								{{ showMoney ? Number(recommendSum.cashed?recommendSum.cashed:0).toFixed(2) : '***' }}
 							</view>
 						</view>
 					</view>

+ 3 - 2
pages/user/commission/index.vue

xqd
@@ -58,13 +58,14 @@
 					<view class="card-bottom u-flex">
 						<view class="u-flex-1 ">
 							<view class="item-title">累计收入</view>
-							<view class="item-detail">{{showMoney?Number(recommendSum.total_income).toFixed(2):'****'}}
+							<view class="item-detail">
+								{{showMoney?Number(recommendSum.total_income?recommendSum.total_income:0).toFixed(2):'****'}}
 							</view>
 						</view>
 						<view class="u-flex-1 u-col-center">
 							<view class="item-title">待入账佣金</view>
 							<view class="item-detail">
-								{{showMoney?Number(recommendSum.wait_income).toFixed(2):'****'}}
+								{{showMoney?Number(recommendSum.wait_income?recommendSum.wait_income:0).toFixed(2):'****'}}
 							</view>
 						</view>
 					</view>

+ 6 - 6
pages/user/public/agreement.vue

xqd
@@ -52,14 +52,14 @@
 				this.type = e.type
 
 				if (e.type == 'privacy') {
-					uni.setNavigationBarTitle({
-						title: '隐私政策'
-					})
+					// uni.setNavigationBarTitle({
+					// 	title: '隐私政策'
+					// })
 
 				} else {
-					uni.setNavigationBarTitle({
-						title: '用户协议'
-					})
+					// uni.setNavigationBarTitle({
+					// 	title: '用户协议'
+					// })
 				}
 
 				this.title = e.type == 'privacy' ? '隐私政策' : e.type == 'aboutus' ? '关于我们' : '用户协议'

+ 3 - 1
pages/user/signin.scss

xqd xqd
@@ -177,6 +177,7 @@ page{
 			justify-content: center;
 			position: relative;
 			height: 400rpx;
+			// min-height: 800rpx;
 			margin-bottom: 80rpx;
 		}
 
@@ -258,7 +259,8 @@ page{
 		
 		.defBtn{
 			    border: 1px solid #199063;
-			    width: 250rpx;
+			    // width: 250rpx;
+			    width: 500rpx;
 			    height: 42px;
 			    border-radius: 26px;
 			    font-size: 14px;

+ 8 - 5
pages/user/signin.vue

xqd xqd xqd xqd
@@ -22,6 +22,7 @@
 					</view>
 					<u-popup :show="showlogin" mode="bottom" :round="10" closeable @close="showlogin = false">
 						<view class="container" :class="[!isPc?'scroll':'']">
+							<!-- <view class="container"> -->
 							<view class="textl_ogin">{{showlogon?'账号密码登录':'账号密码注册'}}</view>
 							<view class="login">
 								<view class="input u-flex align-center">
@@ -80,12 +81,12 @@
 						<view class="wxBox">
 							<view class="">
 								<view class="grant wxBtn" @click="thirdLogin('wechat')"
-									style="border: none;width: 280rpx;">
+									style="border: none;width: 500rpx;">
 									<u-icon name="weixin-fill" color="#ffffff" size="26"></u-icon>
 									<view class="">绑定微信</view>
 								</view>
 							</view>
-							<view class="tyGpt" style="width: 280rpx;" @click="useGpt">体验CHATGPT</view>
+							<!-- <view class="tyGpt" style="width: 280rpx;" @click="useGpt">体验CHATGPT</view> -->
 						</view>
 						<view @tap="agree = !agree" class="flxe align-center justify-center" style="margin-top: 50rpx;">
 							<u-icon name="checkmark-circle-fill" :color="agree?'#07C160':'#ededed'" size="16"></u-icon>
@@ -108,9 +109,9 @@
 								<view class="">账号登录</view>
 							</view>
 
-							<view class="chatGpt" @click="useGpt">
+							<!-- <view class="chatGpt" @click="useGpt">
 								体验CHATGPT
-							</view>
+							</view> -->
 						</view>
 						<view style="color: #199063" @click="showlogon = false,showlogin = true" class="deftoregister">
 							未注册账号?点击去注册></view>
@@ -338,7 +339,9 @@
 
 			getWechatCode() {
 				if (isWechat) {
-					let appid = "wx96cad2970c232f6e"; //微信APPid
+					// let appid = "wx96cad2970c232f6e"; //微信APPid
+
+					let appid = uni.getStorageSync('wxId')
 					let code = this.getUrlCode().code; //是否存在code
 					uni.showToast({
 						title: '点击按钮获取的wx_code-----------' + code,