diff --git a/components/my-icon/my-icon.vue b/components/my-icon/my-icon.vue new file mode 100644 index 0000000..3f81b48 --- /dev/null +++ b/components/my-icon/my-icon.vue @@ -0,0 +1,97 @@ + + + + + \ No newline at end of file diff --git a/main.js b/main.js index ebd104f..c095eac 100644 --- a/main.js +++ b/main.js @@ -29,7 +29,7 @@ export function createApp() { app.config.globalProperties.$system = plus.os.name; // #endif app.config.globalProperties.$systemInfo = systemInfo - uni.setStorageSync('version', '1.0.6.sp12') + uni.setStorageSync('version', '1.0.6.sp14') app.config.globalProperties.$version = uni.getStorageSync('version') app.use(globalMethods); return { diff --git a/pages.json b/pages.json index 0c30da6..c5018f0 100644 --- a/pages.json +++ b/pages.json @@ -429,6 +429,22 @@ "navigationStyle": "custom" } }, + { + "path" : "game/sanjiaozhou", + "style" : + { + "navigationBarTitleText" : "三角洲", + "navigationStyle": "custom" + } + }, + { + "path" : "game/index", + "style" : + { + "navigationBarTitleText" : "游戏首页", + "navigationStyle": "custom" + } + }, { "path" : "wx-payment-success/wx-payment-success", "style" : @@ -476,6 +492,14 @@ "navigationBarTitleText" : "广东", "navigationStyle": "custom" } + }, + { + "path" : "video-chat/video-chat", + "style" : + { + "navigationBarTitleText" : "视频单聊", + "navigationStyle": "custom" + } } ] }, diff --git a/pages/index/index.nvue b/pages/index/index.nvue index c7a4c89..7766a69 100644 --- a/pages/index/index.nvue +++ b/pages/index/index.nvue @@ -275,6 +275,11 @@ const otherList = [{ name: "视频群聊", path: "/pages/other/video-group-chat/video-group-chat" }, +{ + icon: "/static/image/index/qita/shipinqunliao.png", + name: "视频单聊", + path: "/pages/other/video-chat/video-chat" +}, { icon: "/static/image/index/qita/zhifuchenggong-wx.png", name: "微信支付", @@ -297,8 +302,8 @@ const otherList = [{ }, { icon: "/static/image/index/qita/game.png", - name: "王者主页", - path: "/pages/other/game/honor-of-kings" + name: "游戏", + path: "/pages/other/game/index" }, { icon: "/static/image/other/certificate/certificate.png", diff --git a/pages/other/game/index.vue b/pages/other/game/index.vue new file mode 100644 index 0000000..6fa6a50 --- /dev/null +++ b/pages/other/game/index.vue @@ -0,0 +1,150 @@ + + + + + + \ No newline at end of file diff --git a/pages/other/game/sanjiaozhou.vue b/pages/other/game/sanjiaozhou.vue new file mode 100644 index 0000000..56eea25 --- /dev/null +++ b/pages/other/game/sanjiaozhou.vue @@ -0,0 +1,833 @@ + + + + + diff --git a/pages/other/video-chat/video-chat.vue b/pages/other/video-chat/video-chat.vue new file mode 100644 index 0000000..f3d968c --- /dev/null +++ b/pages/other/video-chat/video-chat.vue @@ -0,0 +1,1470 @@ + + + + + diff --git a/pages/other/wx-payment-success/wx-payment-success.vue b/pages/other/wx-payment-success/wx-payment-success.vue index 4b30c36..5f3551a 100644 --- a/pages/other/wx-payment-success/wx-payment-success.vue +++ b/pages/other/wx-payment-success/wx-payment-success.vue @@ -2,18 +2,22 @@ + {{ paymetInfo.productName }} - + {{ Number(paymetInfo.money).toFixed(2) }} + + 完成 @@ -21,6 +25,18 @@ 修改支付信息 + + 用户头像 + + + + × + + + + + + + *商品名称 @@ -29,6 +45,11 @@ *支付金额 + + 展示广告 + + 取消 @@ -64,6 +85,38 @@ const editPaymentInfo = () => { editPaymentInfoPopup.value.open('center'); } +const handleChooseAvatar = () => { + uni.chooseImage({ + count: 1, + success: (res) => { + const tempFilePath = res.tempFilePaths[0]; + // #ifndef H5 + uni.saveFile({ + tempFilePath: tempFilePath, + success: (saveRes) => { + if (paymetInfo.value.userImg && !paymetInfo.value.userImg.startsWith('/static/')) { + uni.removeSavedFile({ filePath: paymetInfo.value.userImg }); + } + paymetInfo.value.userImg = saveRes.savedFilePath; + } + }); + // #endif + // #ifdef H5 + paymetInfo.value.userImg = tempFilePath; + // #endif + } + }); +}; + +const handleDeleteAvatar = () => { + // #ifndef H5 + if (paymetInfo.value.userImg && !paymetInfo.value.userImg.startsWith('/static/')) { + uni.removeSavedFile({ filePath: paymetInfo.value.userImg }); + } + // #endif + paymetInfo.value.userImg = ''; +}; + const confirmEditPaymentInfo = () => { editPaymentInfoPopup.value.close(); storage.set('wx_payment_success_info', paymetInfo.value); @@ -80,8 +133,10 @@ const buttonGroup = [ const paymetInfo = ref({ + userImg: '', productName: '王者荣耀', - money: 298 + money: 298, + isAd: false, }); onShow(() => { @@ -95,7 +150,7 @@ onShow(() => { // #ifdef APP-PLUS&&!APP-HARMONY util.setAndroidSystemBarColor('#FFFFFF') setTimeout(() => { - plus.navigator.setStatusBarStyle("light"); + plus.navigator.setStatusBarStyle("dark"); }, 500) // #endif }) @@ -131,6 +186,15 @@ onLoad(async () => { .content-box { margin-top: 162rpx; + align-items: center; + + .user-img { + width: 94rpx; + height: 94rpx; + border-radius: 50%; + background-color: #D8D8D8; + transform: translateY(-50%); + } .product-name { font-size: 32rpx; @@ -154,6 +218,11 @@ onLoad(async () => { margin-right: 20rpx; } } + + .ad-img { + margin-top: 100rpx; + width: 654rpx; + } } .finish-butn { @@ -207,6 +276,57 @@ onLoad(async () => { font-size: 28rpx; color: #1A1A1A; } + + .avatar-uploader { + display: flex; + align-items: center; + + .upload-btn { + width: 100rpx; + height: 100rpx; + border-radius: 50%; + background-color: #F8F8F8; + display: flex; + justify-content: center; + align-items: center; + border: 2rpx dashed #CCCCCC; + + .plus { + font-size: 60rpx; + color: #999; + font-weight: 300; + margin-top: -6rpx; + } + } + + .avatar-preview { + position: relative; + width: 100rpx; + height: 100rpx; + + .preview-img { + width: 100%; + height: 100%; + border-radius: 50%; + } + + .delete-icon { + position: absolute; + top: -4rpx; + right: -4rpx; + width: 32rpx; + height: 32rpx; + background-color: red; + color: #fff; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + font-size: 30rpx; + line-height: 28rpx; + } + } + } } .btn-group { diff --git a/static/font/iconfont.ttf b/static/font/iconfont.ttf new file mode 100644 index 0000000..e3f27fc Binary files /dev/null and b/static/font/iconfont.ttf differ diff --git a/static/image/other/game/hepingjingying.png b/static/image/other/game/hepingjingying.png new file mode 100644 index 0000000..a2b4968 Binary files /dev/null and b/static/image/other/game/hepingjingying.png differ diff --git a/static/image/other/game/sanjiaozhou.png b/static/image/other/game/sanjiaozhou.png new file mode 100644 index 0000000..cf7f684 Binary files /dev/null and b/static/image/other/game/sanjiaozhou.png differ diff --git a/static/image/other/game/sanjiaozhou/kill.png b/static/image/other/game/sanjiaozhou/kill.png new file mode 100644 index 0000000..2a26277 Binary files /dev/null and b/static/image/other/game/sanjiaozhou/kill.png differ diff --git a/static/image/other/game/sanjiaozhou/line.png b/static/image/other/game/sanjiaozhou/line.png new file mode 100644 index 0000000..f6d06fa Binary files /dev/null and b/static/image/other/game/sanjiaozhou/line.png differ diff --git a/static/image/other/game/sanjiaozhou/style-1.jpg b/static/image/other/game/sanjiaozhou/style-1.jpg new file mode 100644 index 0000000..9271185 Binary files /dev/null and b/static/image/other/game/sanjiaozhou/style-1.jpg differ diff --git a/static/image/other/game/sanjiaozhou/style-2.jpg b/static/image/other/game/sanjiaozhou/style-2.jpg new file mode 100644 index 0000000..921aef9 Binary files /dev/null and b/static/image/other/game/sanjiaozhou/style-2.jpg differ diff --git a/static/image/other/game/sanjiaozhou/style-3.jpg b/static/image/other/game/sanjiaozhou/style-3.jpg new file mode 100644 index 0000000..4832eb6 Binary files /dev/null and b/static/image/other/game/sanjiaozhou/style-3.jpg differ diff --git a/static/image/other/game/sanjiaozhou/style-4.jpg b/static/image/other/game/sanjiaozhou/style-4.jpg new file mode 100644 index 0000000..0f06259 Binary files /dev/null and b/static/image/other/game/sanjiaozhou/style-4.jpg differ diff --git a/static/image/other/game/wangzhe.png b/static/image/other/game/wangzhe.png new file mode 100644 index 0000000..38b98be Binary files /dev/null and b/static/image/other/game/wangzhe.png differ diff --git a/static/image/other/game/wuweiqiyue.png b/static/image/other/game/wuweiqiyue.png new file mode 100644 index 0000000..26892cf Binary files /dev/null and b/static/image/other/game/wuweiqiyue.png differ diff --git a/static/image/other/payment-success/ad-img.png b/static/image/other/payment-success/ad-img.png new file mode 100644 index 0000000..a49501c Binary files /dev/null and b/static/image/other/payment-success/ad-img.png differ diff --git a/static/image/other/video-call/add-user.png b/static/image/other/video-call/add-user.png new file mode 100644 index 0000000..4e4a470 Binary files /dev/null and b/static/image/other/video-call/add-user.png differ diff --git a/static/image/other/video-call/suoding.png b/static/image/other/video-call/suoding.png new file mode 100644 index 0000000..794c318 Binary files /dev/null and b/static/image/other/video-call/suoding.png differ diff --git a/static/image/other/video-call/xuanfu.png b/static/image/other/video-call/xuanfu.png new file mode 100644 index 0000000..4d112ca Binary files /dev/null and b/static/image/other/video-call/xuanfu.png differ diff --git a/static/image/other/video-call/xuanzhuan.png b/static/image/other/video-call/xuanzhuan.png new file mode 100644 index 0000000..ddf2e50 Binary files /dev/null and b/static/image/other/video-call/xuanzhuan.png differ diff --git a/static/image/other/video-call/xvnibeijing.png b/static/image/other/video-call/xvnibeijing.png new file mode 100644 index 0000000..c5b0a37 Binary files /dev/null and b/static/image/other/video-call/xvnibeijing.png differ