diff --git a/README.md b/README.md index c757020..987e633 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # Suimang-wxapp # setStorageSync 键名 - +SN --设备识别码 +token --token +UserId --扫码登录后获取的用户id wx-"appid": "", diff --git a/src/api/createing.js b/src/api/createing.js new file mode 100644 index 0000000..42d3dad --- /dev/null +++ b/src/api/createing.js @@ -0,0 +1,26 @@ +import { request } from "../utils/request" + +/** +* @description:获取二维码 +* @param {*} (appId, openId,phone,code) +* @return: list +*/ +export function getQRCodeApi(data) { + return request({ + url: `api/machineqrcode/getQRCode`, + method: 'POST', + data + }) +} + +/** +* @description:获取用户状态 +* @param {*} (appId, openId,phone,code) +* @return: list +*/ +export function getUserApi(UserId) { + return request({ + url: `api/machineuser/getUser?tmpUserId=${UserId}`, + method: 'get', + }) +} \ No newline at end of file diff --git a/src/pages/camera/index.vue b/src/pages/camera/index.vue index 080996c..ecf4160 100644 --- a/src/pages/camera/index.vue +++ b/src/pages/camera/index.vue @@ -57,8 +57,8 @@ onMounted(() => { // height: 1536, //实时摄像机查看器的高度 width: 864, //实时摄像机查看器的宽度 height: 1536, //实时摄像机查看器的高度 - dest_width: 392, //捕获相机图像的宽 - dest_height: 698, //捕获相机图像的高 + // dest_width: 392, //捕获相机图像的宽 + // dest_height: 698, //捕获相机图像的高 dest_width: 720, //捕获相机图像的宽 dest_height: 720, //捕获相机图像的高 // crop_width: 700, //最终裁剪图像的宽度(以像素为单位),默认为dest_width。 diff --git a/src/pages/chooseStyle/index.vue b/src/pages/chooseStyle/index.vue index cf77a8c..f246543 100644 --- a/src/pages/chooseStyle/index.vue +++ b/src/pages/chooseStyle/index.vue @@ -13,7 +13,7 @@ > - 更多 + 更多 @@ -54,7 +54,6 @@ 开始制作写真 + 摄像头调试 + + + + + + 打开微信扫码登录小程序 + 取 消 + + + diff --git a/src/style/my.scss b/src/style/my.scss index a8fb1e2..1ce9921 100644 --- a/src/style/my.scss +++ b/src/style/my.scss @@ -76,6 +76,7 @@ view { .uni-toast { width: 280rpx; font-size: 30rpx; + padding: 20rpx 30rpx; .uni-toast__icon { width: 50rpx !important; diff --git a/src/utils/request.js b/src/utils/request.js index ce770b9..77dc225 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,7 +1,10 @@ // import { userInfoModules } from "@/store/modules/userInfo"; // import { store } from '@/store/index'; -const BASE_URL = 'https://test.metavatar.cc/C/'; + +// const BASE_URL = 'https://test.metavatar.cc/C/'; +const BASE_URL = 'https://zhixiangtest.malls.iformall.com/C/'; +// const BASE_URL = '192.168.1.105:7600/C/'; // const userInfoModulesPinia = userInfoModules(store); // const BASE_URL = 'https://test.metavatar.cc/'; diff --git a/vite.config.js b/vite.config.js index 94850c8..e0f06a6 100644 --- a/vite.config.js +++ b/vite.config.js @@ -20,6 +20,7 @@ export default defineConfig(({ command, mode }) => { // 反向代理解决跨域 "/api": { target: env.VITE_APP_BASE_URL, // 线上接口地址 + // target: "https://zhixiangtest.malls.iformall.com/C", // 线上接口地址 changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, ""), },