diff --git a/App.vue b/App.vue index 6ba3e13..1e942a2 100644 --- a/App.vue +++ b/App.vue @@ -20,8 +20,12 @@ .uni-btn-icon{ display: none; } + /* #ifdef H5 */ + uni-page-head { + display: none; + } + /* #endif */ uni-tabbar { - .uni-tabbar { // tab背景 padding-top:28rpx; padding-bottom: 50rpx !important; diff --git a/components/cont/cont.vue b/components/cont/cont.vue index 612754d..e0b350e 100644 --- a/components/cont/cont.vue +++ b/components/cont/cont.vue @@ -1,6 +1,6 @@ @@ -11,7 +11,14 @@ const COMPONENT_NAME = 'navigation' export default { name: COMPONENT_NAME, - + props:{ + showBack: { + type: Boolean, + default () { + return true + } + }, + }, data() { return { diff --git a/manifest.json b/manifest.json index 54f7905..b67a334 100644 --- a/manifest.json +++ b/manifest.json @@ -43,7 +43,9 @@ /* ios打包配置 */ "ios" : {}, /* SDK配置 */ - "sdkConfigs" : {} + "sdkConfigs" : { + "ad" : {} + } } }, /* 快应用特有相关 */ @@ -88,7 +90,7 @@ } } }, - "title" : "In-Earn", + "title" : "color", "domain" : "webtest.luck-work.com" } } diff --git a/pages.json b/pages.json index a25d364..7ced903 100644 --- a/pages.json +++ b/pages.json @@ -3,6 +3,29 @@ "^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/menu/goods/index", + "style": { + } + }, + { + "path": "pages/menu/bankCard/addAddress/index", + "style": { + } + }, + + { + "path": "pages/menu/bankCard/addBankCard/index", + "style": { + } + }, + { + "path": "pages/menu/bankCard/index", + "style": { + } + }, + + { "path": "pages/login/index", "style": { @@ -155,7 +178,7 @@ "list":[ { "text":"Game", - "pagePath":"pages/menu/index/index", + "pagePath":"pages/menu/color/index", "iconPath":"./static/tabbar/meun_icon_game_nor@2x.png", "selectedIconPath":"./static/tabbar/meun_icon_game_sel@2x.png" }, @@ -173,5 +196,6 @@ } ] } + } diff --git a/pages/login/index.vue b/pages/login/index.vue index 1a4316c..f78de75 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -13,7 +13,7 @@ +{{areacode}} + placeholder-style="color: #BFC2CCFF;font-size:14px;" v-model="mobile" @input="btnControl()" style="height: 50px;" /> @@ -21,8 +21,8 @@ - + Reset Password @@ -185,7 +185,7 @@ }) setTimeout(function() { uni.reLaunch({ - url: '../menu/index/index' + url: '../menu/color/index' }) }, 1500) console.log(uni.getStorageSync('logInfo').data, 66666666666666666666) diff --git a/pages/menu/My/index.css b/pages/menu/My/index.css index 8366160..359af15 100644 --- a/pages/menu/My/index.css +++ b/pages/menu/My/index.css @@ -34,6 +34,7 @@ margin-left: 24rpx; font-size: 36rpx; } .my-id{ + margin-right: 20rpx; color: rgba(255,255,255,.5); font-size: 28rpx; } @@ -162,6 +163,9 @@ margin-left: 24rpx; } .tc_body{ padding: 48rpx 36rpx; + width: auto; + display: table; + margin: 0 auto; } .pupler{ color: #954DE3FF; diff --git a/pages/menu/My/index.vue b/pages/menu/My/index.vue index ba0c125..1d6a862 100644 --- a/pages/menu/My/index.vue +++ b/pages/menu/My/index.vue @@ -5,16 +5,21 @@ - {{MyInfo.nickname}} - + ID: {{MyInfo.userId}} - + + + Sex: + unknown + male + female + @@ -23,7 +28,7 @@ Available Balance: {{currentBalance}} - @@ -42,7 +47,7 @@ - + {{item.text}} @@ -54,7 +59,7 @@ - + change name @@ -76,6 +81,35 @@ + + + + change sex + + + + + {{item.name}} + + + + + + cancel + + + confirm + + + + + + + @@ -86,7 +120,22 @@ export default { data() { return { + // 动态显示mask + mCode:-1, + list: [ + { + name: 'male', + value:1, + disabled: false + }, + { + name: 'female', + value:2, + disabled: false + }, + ], newName: '', + newSex: '1', MyInfo: {}, transferCode: 0, currentBalance: '', @@ -96,18 +145,18 @@ id: '3', text: 'Change Nick Name' }, - // { - // id:'1', - // text:'wallet' - // }, - // { - // id:'2', - // text:'Bank card' - // }, - // { - // id:'3', - // text:'Address' - // }, + { + id:'0', + text:'Change Sex' + }, + { + id: '1', + text: 'Bank card' + }, + { + id: '2', + text: 'Address' + }, { id: '4', text: 'Reset password' @@ -123,17 +172,8 @@ onLoad() { this.areaCode = uni.getStorageSync('siteInfo').areaCode; this.androidUrl = uni.getStorageSync('siteInfo').androidUrl; - console.log(this.androidUrl, 78) this.currentBalance = uni.getStorageSync('currentBalance'); this.currencySymbol = uni.getStorageSync('siteInfo').currencySymbol; - - - - - - - - const post = api.userInfo({ "ticket": uni.getStorageSync('logInfo').data, }) @@ -156,31 +196,45 @@ duration: 2500 }) }) - - - - }, methods: { - + radioChange(){ + console.log(this.newSex,33333) + }, + // 前往不同页面 go(i) { - if (i == 0) { + if (i == 3) { this.transferCode = 1 + this.mCode=1 } - if (i == 1) { + if (i == 0) { + this.transferCode = 2 + this.mCode=2 + } + if (i == 4) { uni.navigateTo({ url: '../../login/resetPassword/index' }) } if (i == 2) { + uni.navigateTo({ + url: '../bankCard/addAddress/index' + }) + } + if (i == 1) { + uni.navigateTo({ + url: '../bankCard/index' + }) + } + if (i == 5) { console.log(this.androidUrl) // #ifdef H5 - window.location.href=this.androidUrl; + window.location.href = this.androidUrl; + // #endif + // #ifdef APP-PLUS + plus.runtime.openURL(this.androidUrl); // #endif - // #ifdef APP-PLUS - plus.runtime.openURL(this.androidUrl); - // #endif - + } }, changeName() { @@ -195,31 +249,65 @@ }) return; } - - - const post = api.updateNickname({ "ticket": uni.getStorageSync('logInfo').data, "nickname": this.newName, }) post.then(res => { - if (res.success == true) { - uni.showToast({ - title: 'Modified successfully', - icon: 'success', - duration: 1500 - }) - setTimeout(function() { - location.reload(); - }, 1000) - } else { + if (res.success == true) { + uni.showToast({ + title: 'Modified successfully', + icon: 'success', + duration: 1500 + }) + setTimeout(function() { + location.reload(); + }, 1000) + } else { + uni.showToast({ + title: 'Modification failed', + icon: 'none', + duration: 1500 + }) + } + }) + .catch(e => { uni.showToast({ - title: 'Modification failed', + title: e, icon: 'none', - duration: 1500 + duration: 2500 }) - } - console.log(res.data, 9990); + }) + + }, + + + changeSex() { + console.log(this.newSex) + uni.showLoading({ + title: "loading" + }) + const post = api.updateGender({ + "ticket": uni.getStorageSync('logInfo').data, + "gender": this.newSex, + }) + post.then(res => { + if (res.success == true) { + uni.showToast({ + title: 'Modified successfully', + icon: 'success', + duration: 1500 + }) + setTimeout(function() { + location.reload(); + }, 1000) + } else { + uni.showToast({ + title: 'Modification failed', + icon: 'none', + duration: 1500 + }) + } }) .catch(e => { uni.showToast({ @@ -228,7 +316,7 @@ duration: 2500 }) }) - + }, goRecharge() { uni.navigateTo({ diff --git a/pages/menu/bankCard/addAddress/index.css b/pages/menu/bankCard/addAddress/index.css new file mode 100644 index 0000000..69197b1 --- /dev/null +++ b/pages/menu/bankCard/addAddress/index.css @@ -0,0 +1,98 @@ + +.flex{ + display: flex; + align-items: center; +} +.logo{ + width: 80rpx; + height: 80rpx; + margin-right: 20rpx; +} +.login-body{ + padding: 0 36rpx; + padding-top: 48rpx; +} +.input-item{ + position: relative; + height: 96rpx; + padding-left: 24rpx; + border-bottom: 2rpx solid #F4F5F7; + margin-bottom: 24rpx; +} + +.input-item input{ + line-height: 96rpx; + width: 500rpx; + text-transform: capitalize; + font-size: 28rpx; + color: #303133FF; +} +.login-sigh{ + width: 172rpx; + position: relative; +} + +.login-sigh::before{ + content: ''; + width: 4rpx; + height: 26rpx; + background-color: #BFC2CCFF; + position: absolute; + right: 16rpx; + top: 50%; + transform: translateY(-50%); +} +.login-sigh2{ + width: 64rpx; +} +.login-sigh2::before{ + content: none; +} +.login-sigh .imgcon{ + width: 40rpx; + height: 40rpx; +} +.login-sigh .imgcon image{ + width: 100%; + height: 100%; +} +.login-sigh .quhao{ + font-size: 28rpx; + color: #303133FF; + margin-left: 20rpx; +} +.rePass{ + color: #606266FF; + font-size: 28rpx; + float: right; +} +.login-btn{ + display: block; + text-align: center; + line-height: 96rpx; + background: #34026B !important; + opacity: 0.2; + border-radius: 24rpx; + color: #fff !important; + margin-top: 120rpx; +} + +.on{ + opacity: 1 !important; +} +.login-re{ + width: auto; + display: table; + margin: 0 auto; + font-size: 14px; + font-weight: 400; + line-height: 27px; + color: #606266; + margin-top: 18px; + position: relative; + padding-right: 36rpx; +} + +/deep/ .u-form-item__message{ + padding-left: 0 !important; + } \ No newline at end of file diff --git a/pages/menu/bankCard/addAddress/index.vue b/pages/menu/bankCard/addAddress/index.vue new file mode 100644 index 0000000..4c4e2c4 --- /dev/null +++ b/pages/menu/bankCard/addAddress/index.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/pages/menu/bankCard/addBankCard/index.css b/pages/menu/bankCard/addBankCard/index.css new file mode 100644 index 0000000..69197b1 --- /dev/null +++ b/pages/menu/bankCard/addBankCard/index.css @@ -0,0 +1,98 @@ + +.flex{ + display: flex; + align-items: center; +} +.logo{ + width: 80rpx; + height: 80rpx; + margin-right: 20rpx; +} +.login-body{ + padding: 0 36rpx; + padding-top: 48rpx; +} +.input-item{ + position: relative; + height: 96rpx; + padding-left: 24rpx; + border-bottom: 2rpx solid #F4F5F7; + margin-bottom: 24rpx; +} + +.input-item input{ + line-height: 96rpx; + width: 500rpx; + text-transform: capitalize; + font-size: 28rpx; + color: #303133FF; +} +.login-sigh{ + width: 172rpx; + position: relative; +} + +.login-sigh::before{ + content: ''; + width: 4rpx; + height: 26rpx; + background-color: #BFC2CCFF; + position: absolute; + right: 16rpx; + top: 50%; + transform: translateY(-50%); +} +.login-sigh2{ + width: 64rpx; +} +.login-sigh2::before{ + content: none; +} +.login-sigh .imgcon{ + width: 40rpx; + height: 40rpx; +} +.login-sigh .imgcon image{ + width: 100%; + height: 100%; +} +.login-sigh .quhao{ + font-size: 28rpx; + color: #303133FF; + margin-left: 20rpx; +} +.rePass{ + color: #606266FF; + font-size: 28rpx; + float: right; +} +.login-btn{ + display: block; + text-align: center; + line-height: 96rpx; + background: #34026B !important; + opacity: 0.2; + border-radius: 24rpx; + color: #fff !important; + margin-top: 120rpx; +} + +.on{ + opacity: 1 !important; +} +.login-re{ + width: auto; + display: table; + margin: 0 auto; + font-size: 14px; + font-weight: 400; + line-height: 27px; + color: #606266; + margin-top: 18px; + position: relative; + padding-right: 36rpx; +} + +/deep/ .u-form-item__message{ + padding-left: 0 !important; + } \ No newline at end of file diff --git a/pages/menu/bankCard/addBankCard/index.vue b/pages/menu/bankCard/addBankCard/index.vue new file mode 100644 index 0000000..609e05e --- /dev/null +++ b/pages/menu/bankCard/addBankCard/index.vue @@ -0,0 +1,181 @@ + + + + + diff --git a/pages/menu/bankCard/index.css b/pages/menu/bankCard/index.css new file mode 100644 index 0000000..f1b3fd4 --- /dev/null +++ b/pages/menu/bankCard/index.css @@ -0,0 +1,71 @@ +.record_body{ + padding: 0 36rpx; +} +.flex{ + display: flex; + justify-content: space-between; + align-items: center; +} +.record_item{ + height: 144rpx; + border-bottom: 2rpx solid #F5F7FA; +} +.numcon .img1{ + width: 80rpx; + height: 80rpx; +} +.num{ + margin-left: 20rpx; + text-transform: capitalize; +} +.rec{ + color: #303133; + font-size: 32rpx; +} +.cpay{ + color: #909399; + font-size: 28rpx; +} +.time{ + width: 48rpx; + line-height: 48rpx; + text-align: center; + border-radius: 50%; + background-color: #BFC2CC; + color: #fff; + font-size: 28rpx; +} + +.select_con{ + width: 750rpx; + height: 446rpx; + background-color: #fff; + border-radius: 40rpx 40rpx 0 0; + position: fixed; + bottom: 0; + left: 0; + z-index: 999; + padding-top: 48rpx; +} + .select{ + text-align: center; + color: #303133; + font-size: 36rpx; + } + + .ed_con{ + margin-top: 48rpx; + padding: 0 36rpx; + } + .ed{ + line-height: 96rpx; + } + .img{ + width: 48rpx; + height: 48rpx; + vertical-align: text-bottom; + } + .text{ + font-size: 32rpx; + margin-left: 24rpx; + } \ No newline at end of file diff --git a/pages/menu/bankCard/index.vue b/pages/menu/bankCard/index.vue new file mode 100644 index 0000000..4b1c2dc --- /dev/null +++ b/pages/menu/bankCard/index.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/pages/menu/color/index.vue b/pages/menu/color/index.vue index b8871ce..b967a1a 100644 --- a/pages/menu/color/index.vue +++ b/pages/menu/color/index.vue @@ -1,6 +1,6 @@