合并代码

jiuyi2/api/mine.js

@@ -36,7 +36,20 @@ const mine = {
 			url: `/user/adolescent/open`,
 			data: param.data,
 			method: 'GET',
-			load: 1,
+			load: true,
+		})
+	},
+
+	/**
+	 * 青少年模式解锁
+	 * @param {Object} param
+	 */
+	adolescentClose(param) {
+		return util.request({
+			url: `/user/adolescent`,
+			path: param.path,
+			method: 'GET',
+			load: true,
 		})
 	},
 
@@ -53,7 +66,7 @@ const mine = {
 	},
 
 	/**
-	 * 验证盖章后是否实名
+	 * 验证实名信息是否填写
 	 * @param {Object} param
 	 */
 	isCertification(param) {

jiuyi2/common/js/config.js

@@ -6,8 +6,9 @@ const config = {
 	// #endif
 	// #ifndef H5
 	// host: 'http://91f.xyz:8080',
-	// host: 'http://192.168.31.61:8080',
+	// host: 'http://192.168.0.110:8080',
-	host: 'http://192.168.31.41:8080',
+	// host: 'http://192.168.0.105:8080',
+	host: 'http://192.168.0.102:8080',
 	// #endif
 	// 支付方式配置
 	payType: {

jiuyi2/components/footerMenu/footerMenu.vue

@@ -110,13 +110,13 @@
 			})
 		}
 		// 1是商家
-		if(userinfo.value.isShop == 1) {
+		// if(userinfo.value.isShop == 1) {
-			result.push({
+		// 	result.push({
-				name: '发布商品',
+		// 		name: '发布商品',
-				img: '/static/footerMenu1.png',
+		// 		img: '/static/footerMenu1.png',
-				url: '/pages/release/commodity',
+		// 		url: '/pages/release/commodity',
-			})
+		// 	})
-		}
+		// }
 		// 追加
 		// result.push({
 		// 	name: '打车',

jiuyi2/pages/login/lock.vue

@@ -38,31 +38,14 @@
 		// md5加密
 		data.userPassword = CryptoJS.MD5(data.userPassword).toString();
 
-		api.mine.checkSecondLevelCipher({
-			data,
-		}).then(rs => {
-			if (rs.code === 200) {
-				// 更新用户信息解除青少年模式
-				unLockTeenMode()
-				return
-			}
-			util.alert({
-				content: rs.msg,
-				showCancel: false,
-			})
-		})
-	}
-
 		// 解除青少年模式
-	function unLockTeenMode() {
+		api.mine.adolescentClose({
-		api.mine.updateUserInfo({
+			path: [data.userPassword],
-			data: {
-				userId: userinfo.value.userId,
-				teen
-			}
 		}).then(rs => {
 			if (rs.code == 200) {
-				// uni.navigateBack()
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
 				return
 			}
 			util.alert({
@@ -77,10 +60,10 @@
 	<view class="container pr fmid fdc">
 		<view class="title f40 b">输入登录密码解锁未成年模式</view>
 
-		<view class="account mtb20 c666 f32">当前账号: {{userinfo.userPhone}}</view>
+		<view class="account mtb20 c666 f32">当前账号: {{userinfo.phoneNumber}}</view>
 
 		<view class="password mtb30 br20">
-			<input class="input" type="text" v-model="form.userPassword" placeholder="登录密码" />
+			<input class="input" type="text" v-model="form.userPassword" placeholder="二级密码" />
 		</view>
 
 		<view class="button btn lg bar black mt60" @click="handleSubmit">解锁</view>

jiuyi2/pages/shop/store/commodities.vue

@@ -74,13 +74,23 @@
 			})
 		})
 	}
+
+	/**
+	 * 跳转
+	 * @param {Object} url 路径
+	 */
+	function link(url) {
+		uni.navigateTo({
+			url
+		})
+	}
 </script>
 
 <template>
 	<view class="app">
 		<apex title="商品管理">
 			<template #right>
-				<view class="f24">添加</view>
+				<view class="f24" @click="link('/pages/release/commodity')">添加</view>
 			</template>
 		</apex>
 

jiuyi2/readme.md

@@ -431,3 +431,4 @@ likeType
 
 
 
+

jiuyi2/vite.config.js

@@ -5,8 +5,9 @@ import uni from '@dcloudio/vite-plugin-uni';
 
 // 
 // let target = 'http://91f.xyz:8080'
-let target = 'http://192.168.31.41:8080'
+// let target = 'http://192.168.0.110:8080'
-// let target = 'http://192.168.31.61:8080'
+// let target = 'http://192.168.0.105:8080'
+let target = 'http://192.168.0.102:8080'
 
 export default defineConfig({
 	plugins: [uni()],