diff --git a/src/assets/img/photoBtn.png b/src/assets/img/photoBtn.png new file mode 100644 index 0000000..e9d86c3 Binary files /dev/null and b/src/assets/img/photoBtn.png differ diff --git a/src/assets/img/reTry.png b/src/assets/img/reTry.png new file mode 100644 index 0000000..77f3e9f Binary files /dev/null and b/src/assets/img/reTry.png differ diff --git a/src/assets/img/selectImg.png b/src/assets/img/selectImg.png new file mode 100644 index 0000000..2a33de0 Binary files /dev/null and b/src/assets/img/selectImg.png differ diff --git a/src/assets/img/success.png b/src/assets/img/success.png new file mode 100644 index 0000000..51e86ef Binary files /dev/null and b/src/assets/img/success.png differ diff --git a/src/pages.json b/src/pages.json index 2952d01..181b48c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -45,9 +45,9 @@ "navigationBarBackgroundColor": "#F8F8F8", "backgroundColor": "#F8F8F8", "navigationStyle": "custom", - "rpxCalcMaxDeviceWidth": 1080, - "rpxCalcBaseDeviceWidth": 1080, - "rpxCalcIncludeWidth": 1080 + "rpxCalcMaxDeviceWidth": 2160, + "rpxCalcBaseDeviceWidth": 2160, + "rpxCalcIncludeWidth": 2160 }, "app": { "requiredBackgroundModes": [ diff --git a/src/pages/camera/index.vue b/src/pages/camera/index.vue index e9ff4e0..eb57241 100644 --- a/src/pages/camera/index.vue +++ b/src/pages/camera/index.vue @@ -1,80 +1,350 @@ diff --git a/src/pages/camera/indexChooseImage.vue b/src/pages/camera/indexChooseImage.vue deleted file mode 100644 index cd901ed..0000000 --- a/src/pages/camera/indexChooseImage.vue +++ /dev/null @@ -1,177 +0,0 @@ - - -// js部分 - - - diff --git a/src/pages/camera/indexVideo.vue b/src/pages/camera/indexVideo.vue deleted file mode 100644 index 79847be..0000000 --- a/src/pages/camera/indexVideo.vue +++ /dev/null @@ -1,82 +0,0 @@ - - - - - diff --git a/src/pages/camera/indexWebcam.vue b/src/pages/camera/indexWebcam.vue deleted file mode 100644 index ecf4160..0000000 --- a/src/pages/camera/indexWebcam.vue +++ /dev/null @@ -1,143 +0,0 @@ - - -// js部分 - - - diff --git a/src/pages/createing/index.vue b/src/pages/createing/index.vue index 7173b8e..03eac51 100644 --- a/src/pages/createing/index.vue +++ b/src/pages/createing/index.vue @@ -273,7 +273,10 @@ onUnload(() => { //#region function toCamera() { - uni.navigateTo({ url: "/pages/camera/index" }); + const url = styleData.value.coverImg; + uni.navigateTo({ + url: `/pages/camera/index?modelUrl=${url}`, + }); } //#endregion --------------------- diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 5f01bb2..2db6294 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -23,7 +23,19 @@ function toChooseStyle() { //#region getImei function Imei() { - getIMEI(); + try { + const IMEI = getIMEI(); + uni.showToast({ + title: IMEI, + icon: "success", + }); + } catch (error) { + uni.showToast({ + title: "Error", + icon: "error", + }); + } + // cordova.exec( // function (imei) { // console.log("IMEI:", imei); @@ -63,7 +75,7 @@ function Imei() { align-items: center; padding: 100rpx 0; width: 100%; - height: 400rpx; + height: 300rpx; background-color: rgba($color: #000000, $alpha: 0.5); .IMEI { position: absolute; diff --git a/src/style/my.scss b/src/style/my.scss index 1ce9921..2ba0e58 100644 --- a/src/style/my.scss +++ b/src/style/my.scss @@ -47,6 +47,8 @@ view { } .orangeBtn { + position: absolute; + bottom: 100rpx; background-color: #FF4F00; width: 520rpx; height: 100rpx;