diff --git a/app.wxss b/app.wxss index f1e0389..5b81edd 100644 --- a/app.wxss +++ b/app.wxss @@ -380,13 +380,18 @@ list-view{ display: block; } +switch{ +} switch .wx-switch-input{ background-color:#999999; } -switch .wx-switch-input.wx-switch-input-checked { +switch .wx-switch-input.wx-switch-input-checked{ background-color:var(--main-color); border-color: var(--main-color); } +switch .wx-switch-input.wx-switch-input-checked::after{ + transform:translateX(36rpx); +} switch .wx-switch-input::after { width: 40rpx; height: 40rpx; diff --git a/components/background-notice/index.js b/components/background-notice/index.js index 47675e2..d9f73b8 100644 --- a/components/background-notice/index.js +++ b/components/background-notice/index.js @@ -31,6 +31,9 @@ Component({ this.bgam.onEnded(()=>{ this.bgam.src = this.data.emptyAudio; }); + this.bgam.onStop(()=>{ + this.triggerEvent('stop') + }); this.triggerEvent('initSuccess'); }).catch(()=>{ this.triggerEvent('initError'); diff --git a/components/modalView/index.wxss b/components/modalView/index.wxss index 40d9564..35ddb00 100644 --- a/components/modalView/index.wxss +++ b/components/modalView/index.wxss @@ -54,7 +54,7 @@ } .custom-modal-view .textarea{ border: 1.2px solid rgba(85, 85, 85, 0.3); - border-radius: 18px; + border-radius: 18rpx; margin:30rpx 0; padding:24rpx 20rpx; font-size: 34rpx; diff --git a/pages/index/index.js b/pages/index/index.js index 1ca0b9a..a8565dc 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -65,7 +65,9 @@ Page({ selectedOrderId:'', - markupStatusKV:orderApi.markUp.statusKV + markupStatusKV:orderApi.markUp.statusKV, + + appConfig:{} }, onLoad(){ this.orderBackgroundNotice = this.selectComponent('#orderBackgroundNotice'); @@ -101,6 +103,11 @@ Page({ } }) }, + stopBGNotice(){ + this.setData({ + isStartLoopOrder:false + }) + }, bgNoticeError(){ wx.showToast({ icon:'error', @@ -280,6 +287,11 @@ Page({ isShowLeftPanelMask:true, leftPanelMoveViewX:510 }) + }); + app.getAppConfig().then((data)=>{ + this.setData({ + appConfig:data + }); }) }, closeLeftPanel(){ @@ -588,5 +600,10 @@ Page({ this.setData({ isStartLoopOrder:event.detail.value }) + }, + navToAgreement(){ + wx.navigateTo({ + url: `/pages/browser/index?url=${this.data.appConfig.url_user_agreement}`, + }) } }) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 0d54d08..3267674 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -196,15 +196,15 @@ - + 修改密码 - + 用户协议 @@ -222,4 +222,4 @@ \ No newline at end of file + bind:initError="bgNoticeError" bind:stop="stopBGNotice"/> \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 3d41b96..a0f782e 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -509,11 +509,15 @@ text-align: center; display: flex; justify-content: space-between; - font-size: 24rpx; - color: #555555; } .left-panel .actions .item{ padding:0 20rpx; + font-size: 24rpx; + color: #555555; +} +.left-panel .actions .item.button{ + font-weight: normal; + background-color: transparent; } .left-panel .actions .item .icon{ width:40rpx;height:40rpx;