diff --git a/README.md b/README.md index 5175d22..1e3a9ca 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ +"appid": "wx75cf14e3a0d45821", git commit -m "feat: " git commit --no-verify -m "提交时的注释" 跳过检验 diff --git a/issus.txt b/issus.txt index b865680..d2ee631 100644 --- a/issus.txt +++ b/issus.txt @@ -1,4 +1,10 @@ 1、小程序登录与H5登录差异化 2、H5支付实现问题 3、生成照片失败时的错误处理(包括退换积分、页面展示、生成历史列表的展现形式) +<<<<<<< HEAD 4、生成照片失败是否从草稿恢复 +======= +(1)自动重试 +(2)错误时的友好提示 +(3)重试直到成功,通知用户 +>>>>>>> dev diff --git a/package.json b/package.json index 0367124..6f28701 100644 --- a/package.json +++ b/package.json @@ -38,19 +38,19 @@ "build:quickapp-webview-union": "uni build -p quickapp-webview-union" }, "dependencies": { - "@dcloudio/uni-app": "3.0.0-3080720230703001", - "@dcloudio/uni-app-plus": "3.0.0-3080720230703001", - "@dcloudio/uni-components": "3.0.0-3080720230703001", - "@dcloudio/uni-h5": "3.0.0-3080720230703001", - "@dcloudio/uni-mp-alipay": "3.0.0-3080720230703001", - "@dcloudio/uni-mp-baidu": "3.0.0-3080720230703001", - "@dcloudio/uni-mp-jd": "3.0.0-3080720230703001", - "@dcloudio/uni-mp-kuaishou": "3.0.0-3080720230703001", - "@dcloudio/uni-mp-lark": "3.0.0-3080720230703001", - "@dcloudio/uni-mp-qq": "3.0.0-3080720230703001", - "@dcloudio/uni-mp-toutiao": "3.0.0-3080720230703001", - "@dcloudio/uni-mp-weixin": "3.0.0-3080720230703001", - "@dcloudio/uni-quickapp-webview": "3.0.0-3080720230703001", + "@dcloudio/uni-app": "3.0.0-3081220230817001", + "@dcloudio/uni-app-plus": "3.0.0-3081220230817001", + "@dcloudio/uni-components": "3.0.0-3081220230817001", + "@dcloudio/uni-h5": "3.0.0-3081220230817001", + "@dcloudio/uni-mp-alipay": "3.0.0-3081220230817001", + "@dcloudio/uni-mp-baidu": "3.0.0-3081220230817001", + "@dcloudio/uni-mp-jd": "3.0.0-3081220230817001", + "@dcloudio/uni-mp-kuaishou": "3.0.0-3081220230817001", + "@dcloudio/uni-mp-lark": "3.0.0-3081220230817001", + "@dcloudio/uni-mp-qq": "3.0.0-3081220230817001", + "@dcloudio/uni-mp-toutiao": "3.0.0-3081220230817001", + "@dcloudio/uni-mp-weixin": "3.0.0-3081220230817001", + "@dcloudio/uni-quickapp-webview": "3.0.0-3081220230817001", "browser-image-compression": "^2.0.2", "clipboard": "^2.0.11", "dayjs": "^1.11.9", @@ -58,15 +58,15 @@ "pinia": "2.0.33", "pinia-plugin-persistedstate": "^3.2.0", "uview-plus": "^3.1.34", - "vue": "3.2.45", + "vue": "^3.2.45", "vue-i18n": "^9.1.9" }, "devDependencies": { "@dcloudio/types": "^3.3.2", - "@dcloudio/uni-automator": "3.0.0-3080720230703001", - "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001", - "@dcloudio/uni-stacktracey": "3.0.0-3080720230703001", - "@dcloudio/vite-plugin-uni": "3.0.0-3080720230703001", + "@dcloudio/uni-automator": "3.0.0-3081220230817001", + "@dcloudio/uni-cli-shared": "3.0.0-3081220230817001", + "@dcloudio/uni-stacktracey": "3.0.0-3081220230817001", + "@dcloudio/vite-plugin-uni": "3.0.0-3081220230817001", "sass": "^1.64.2", "sass-loader": "13.2.2", "vite": "4.1.4" diff --git a/src/App.vue b/src/App.vue index dd071b4..628ec32 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,7 @@ diff --git a/src/pages/createing/index.vue b/src/pages/createing/index.vue index 82676cb..1252966 100644 --- a/src/pages/createing/index.vue +++ b/src/pages/createing/index.vue @@ -2,49 +2,32 @@ - - - - - - - + + 更换风格 + + 写真生成中,预计用时X分X秒 做好后通知我 - + 继续制作写真 - 点击查看高清写真 - - - + 重新生成 @@ -56,7 +39,11 @@ import { voiceTotalApi } from "../../api/login.js"; //#endregion //#region 生成写真照片 - +const swiperList = [ + "https://cdn.uviewui.com/uview/swiper/swiper3.png", + "https://cdn.uviewui.com/uview/swiper/swiper2.png", + "https://cdn.uviewui.com/uview/swiper/swiper1.png", +]; //#endregion --------------------- //#region 页面跳转 @@ -79,23 +66,30 @@ function goLookPhoto() { diff --git a/src/pages/home/buyCoin.vue b/src/pages/home/buyCoin.vue index 1030862..c31e377 100644 --- a/src/pages/home/buyCoin.vue +++ b/src/pages/home/buyCoin.vue @@ -1,14 +1,17 @@ @@ -18,11 +21,15 @@ import { ref, reactive } from "vue"; //#endregion -------------- //#region 列表数据 +const active = ref(5); const orderList = ref([ { num: 5, money: 4.9 }, { num: 20, money: 18.9 }, { num: 30, money: 28.9 }, ]); +function select(item) { + active.value = item.num; +} //#endregion -------------- //#region @@ -31,19 +38,52 @@ const orderList = ref([ diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index 2219b77..89d57a3 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -31,11 +31,21 @@ > - + - 风格名称 - 生成时间 + 风格名称 + + 生成时间 + + + + + @@ -47,7 +57,34 @@ - + + + + + + + + 视频名称 + 生成时间 + + + + + + + + + + + @@ -145,7 +182,7 @@ const tabList = ref([ { name: "我的邀请", id: 3 }, { name: "消费记录", id: 4 }, ]); -const showListActive = ref(3); +const showListActive = ref(1); function clickTabHandle(e) { showListActive.value = e.id; } @@ -232,35 +269,131 @@ function clickTabHandle(e) { // 风格列表 .showStyleList { - margin-top: 20rpx; - width: 750rpx; + flex: 1; + overflow: hidden; + margin-top: 30rpx; + width: 690rpx; .showListItem { + margin-top: 10rpx; .top { display: flex; justify-content: space-between; padding: 0 30rpx; + margin-bottom: 20rpx; + .name { + font-weight: 900; + } + .time { + display: inline-block; + font-size: 22rpx; + font-weight: 100; + line-height: 33rpx; + text { + margin-right: 50rpx; + } + .moreBox { + display: inline-block; + width: 8rpx; + height: 33rpx; + image { + vertical-align: top; + width: 100%; + } + } + } } .imgListBox { white-space: nowrap; display: flex; justify-content: space-between; flex-wrap: nowrap; - height: 250rpx; + height: 200rpx; .item { - width: 240rpx; - height: 240rpx; - margin-right: 20rpx; + width: 150rpx; + height: 200rpx; + border-radius: 30rpx; + margin-right: 30rpx; display: inline-flex; // item的外层定义成行内元素才可进行滚动 inline-block / inline-flex 均可 flex-direction: column; align-items: center; .cover { - width: 240rpx; - height: 240rpx; + width: 150rpx; + height: 200rpx; + border-radius: 30rpx; } } } } } +// 视频列表 +.showVideoList { + flex: 1; + overflow: hidden; + margin-top: 30rpx; + width: 690rpx; + padding: 15rpx; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + word-break: keep-all; + .showListItem { + position: relative; + display: inline-block; + width: 330rpx; + height: 440rpx; + background-color: #000; + margin-bottom: 25rpx; + border-radius: 25rpx; + overflow: hidden; + .showImg { + position: absolute; + top: 0; + z-index: 1; + width: 100%; + } + .videoInfo { + position: absolute; + bottom: 0; + width: 100%; + height: 100rpx; + padding: 10rpx 20rpx; + background-color: red; + z-index: 2; + .name { + font-weight: 900; + margin-bottom: 10rpx; + } + .time { + font-size: 22rpx; + font-weight: 100; + } + } + .playIcon { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + z-index: 2; + image { + width: 72rpx; + height: 72rpx; + } + } + .moreBox { + position: absolute; + top: 23rpx; + right: 26rpx; + width: 8rpx; + height: 33rpx; + image { + width: 100%; + } + } + } + .showListItem:nth-child(odd) { + margin-right: 30rpx; + } +} // 邀请列表 .InviteBox { width: 100%; diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 59e709d..d92034f 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,13 +1,15 @@ diff --git a/src/pages/recorded/index.vue b/src/pages/recorded/index.vue index 369e87e..2a23c32 100644 --- a/src/pages/recorded/index.vue +++ b/src/pages/recorded/index.vue @@ -1,6 +1,6 @@