diff --git a/App.vue b/App.vue index 412bcca..36d98d3 100644 --- a/App.vue +++ b/App.vue @@ -25,13 +25,13 @@ } // #ifdef MP-WEIXIN if (this.envVersion === 'develop') { - return 'XHJ' + return 'SKY' } if (this.envVersion === 'trial') { - return 'XHJ' + return 'SKY' } // #endif - return 'XHJ' + return 'SKY' } }, computed: { diff --git a/components/SwitchLoading/SwitchLoading.vue b/components/SwitchLoading/SwitchLoading.vue index e797f6c..32f7aaa 100644 --- a/components/SwitchLoading/SwitchLoading.vue +++ b/components/SwitchLoading/SwitchLoading.vue @@ -17,7 +17,7 @@ :style="{ width: size * 0.75 - 2 + 'rpx', height: size * 0.75 - 2 + 'rpx' }" > @@ -74,8 +74,8 @@ align-items: center; justify-content: center; padding: 3upx; - background: rgb(99, 184, 175); - background: linear-gradient(0deg, rgba(99, 184, 175, 0.1) 33%, rgba(99, 184, 175, 1) 100%); + background: #4777ee; + background: linear-gradient(0deg, rgba(99, 184, 175, 0.1) 33%, rgba(71, 119, 238, 1) 100%); border-radius: 50%; animation: spin 0.8s linear 0s infinite; } @@ -87,7 +87,7 @@ align-items: center; justify-content: center; padding: 3upx; - background: rgb(99, 184, 175); + background: #4777ee; border-radius: 50%; } diff --git a/config/env.js b/config/env.js index 75636f8..c74463b 100644 --- a/config/env.js +++ b/config/env.js @@ -36,7 +36,7 @@ const XHJ = { const SKY = { name: 'sky', - appName: '星星锁Lite', + appName: '锁通通', baseUrl: 'https://lock.skychip.top/api', webviewBaseUrl: 'https://lock.skychip.top', version, diff --git a/manifest.json b/manifest.json index 6bdcace..2753183 100644 --- a/manifest.json +++ b/manifest.json @@ -1,11 +1,11 @@ { - "name" : "星星锁Lite", + "name" : "锁通通", "appid" : "__UNI__933D519", "description" : "", "versionName" : "1.3.5", "versionCode" : "42", "mp-weixin" : { - "appid" : "wx9829a39e65550757", + "appid" : "wx7991ace56366dd9a", "setting" : { "urlCheck" : true, "minified" : true @@ -21,15 +21,7 @@ "subPackages" : true }, "plugins" : { - "wmpf-voip" : { - "version" : "latest", - "provider" : "wxf830863afde621eb", - "genericsImplementation" : { - "call-page-plugin" : { - "custombox" : "pages/main/customBox" - } - } - } + } }, "vueVersion" : "3", diff --git a/pages.json b/pages.json index c35a594..d74cad4 100644 --- a/pages.json +++ b/pages.json @@ -16,13 +16,7 @@ "style": { "navigationStyle": "custom", "navigationBarTitleText": "监控", - "disableScroll": true, - "mp-weixin": { - "usingComponents": { - "iot-p2p-player-with-mjpg": "plugin://xp2p/iot-p2p-player-with-mjpg", - "iot-p2p-voice": "plugin://xp2p/iot-p2p-voice" - } - } + "disableScroll": true } }, { @@ -41,16 +35,7 @@ } ], "plugins": { - "xp2p": { - "version": "latest", - "provider": "wx1319af22356934bf", - "export": "exportForXp2pPlugin.js" - }, - "wechat-p2p-player": { - "version": "latest", - "provider": "wx9e8fbc98ceac2628", - "export": "exportForPlayerPlugin.js" - } + } }, { @@ -632,7 +617,7 @@ { "path": "pages/main/lockDetail", "style": { - "navigationBarTitleText": "星星锁" + "navigationBarTitleText": "锁通通" } } ], @@ -649,14 +634,14 @@ }, "globalStyle": { "navigationBarTextStyle": "white", - "navigationBarTitleText": "星星锁", - "navigationBarBackgroundColor": "#63b8af", + "navigationBarTitleText": "锁通通", + "navigationBarBackgroundColor": "#4777ee", "backgroundColor": "#F3F3F3", "navigationStyle": "default" }, "tabBar": { "color": "#a3a3a3", - "selectedColor": "#63b8af", + "selectedColor": "#4777ee", "borderStyle": "white", "backgroundColor": "#FFFFFF", "position": "bottom", diff --git a/pages/addDevice/addLockGuid.vue b/pages/addDevice/addLockGuid.vue index 7c85489..ea9bb9f 100644 --- a/pages/addDevice/addLockGuid.vue +++ b/pages/addDevice/addLockGuid.vue @@ -19,14 +19,14 @@ const basicStore = useBasicStore() const toSearchDevice = async () => { - if (bluetoothStore.bluetoothStatus !== 0) { - bluetoothStore.getBluetoothStatus() - return - } + // if (bluetoothStore.bluetoothStatus !== 0) { + // bluetoothStore.getBluetoothStatus() + // return + // } let result = true - if (!bluetoothStore.isInitBluetooth) { + // if (!bluetoothStore.isInitBluetooth) { result = await bluetoothStore.initAndListenBluetooth() - } + // } if (result) { basicStore.routeJump({ type: 'redirectTo', @@ -68,7 +68,7 @@ line-height: 100rpx; color: #fff; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 50rpx; } diff --git a/pages/addDevice/bindLock.vue b/pages/addDevice/bindLock.vue index 91f7e73..d0edbe3 100644 --- a/pages/addDevice/bindLock.vue +++ b/pages/addDevice/bindLock.vue @@ -204,7 +204,7 @@ line-height: 96rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 16rpx; } diff --git a/pages/addDevice/searchDevice.vue b/pages/addDevice/searchDevice.vue index 07cdffc..0bbc140 100644 --- a/pages/addDevice/searchDevice.vue +++ b/pages/addDevice/searchDevice.vue @@ -20,7 +20,7 @@ > {{ device.name }} - + diff --git a/pages/feature/adminDetail.vue b/pages/feature/adminDetail.vue index 6cd36ea..8f674dc 100644 --- a/pages/feature/adminDetail.vue +++ b/pages/feature/adminDetail.vue @@ -50,10 +50,10 @@ - {{ + {{ info.keyStatus === 110405 ? '解冻' : '冻结' }} - {{ + {{ info.keyRight === 1 ? '取消授权管理员' : '授权管理员' }} diff --git a/pages/feature/adminList.vue b/pages/feature/adminList.vue index 4894b43..526d271 100644 --- a/pages/feature/adminList.vue +++ b/pages/feature/adminList.vue @@ -336,7 +336,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/feature/bindFace.vue b/pages/feature/bindFace.vue index f3dd856..feae591 100644 --- a/pages/feature/bindFace.vue +++ b/pages/feature/bindFace.vue @@ -124,7 +124,7 @@ line-height: 100rpx; color: #fff; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 64rpx; } diff --git a/pages/feature/cardList.vue b/pages/feature/cardList.vue index 9c42134..5032f10 100644 --- a/pages/feature/cardList.vue +++ b/pages/feature/cardList.vue @@ -402,7 +402,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/feature/createAdmin.vue b/pages/feature/createAdmin.vue index eba2fca..c148ee9 100644 --- a/pages/feature/createAdmin.vue +++ b/pages/feature/createAdmin.vue @@ -6,10 +6,10 @@ lineWidth="40rpx" lineHeight="5rpx" :current="currentIndex" - lineColor="#63b8af" + lineColor="#4777ee" @click="clickTab" :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }" - :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }" + :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }" > @@ -363,7 +363,7 @@ line-height: 100rpx; color: #fff; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 64rpx; } diff --git a/pages/feature/createCard.vue b/pages/feature/createCard.vue index 99b20fc..35f927c 100644 --- a/pages/feature/createCard.vue +++ b/pages/feature/createCard.vue @@ -6,10 +6,10 @@ lineWidth="40rpx" lineHeight="5rpx" :current="currentIndex" - lineColor="#63b8af" + lineColor="#4777ee" @click="clickTab" :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }" - :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }" + :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }" > @@ -414,7 +414,7 @@ line-height: 100rpx; color: #fff; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 64rpx; } diff --git a/pages/feature/createFace.vue b/pages/feature/createFace.vue index 9bcb459..b563954 100644 --- a/pages/feature/createFace.vue +++ b/pages/feature/createFace.vue @@ -6,10 +6,10 @@ lineWidth="40rpx" lineHeight="5rpx" :current="currentIndex" - lineColor="#63b8af" + lineColor="#4777ee" @click="clickTab" :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }" - :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }" + :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }" > @@ -373,7 +373,7 @@ line-height: 100rpx; color: #fff; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 64rpx; } diff --git a/pages/feature/createFingerprint.vue b/pages/feature/createFingerprint.vue index 6167414..65de759 100644 --- a/pages/feature/createFingerprint.vue +++ b/pages/feature/createFingerprint.vue @@ -6,10 +6,10 @@ lineWidth="40rpx" lineHeight="5rpx" :current="currentIndex" - lineColor="#63b8af" + lineColor="#4777ee" @click="clickTab" :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }" - :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }" + :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }" > @@ -414,7 +414,7 @@ line-height: 100rpx; color: #fff; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 64rpx; } diff --git a/pages/feature/createKey.vue b/pages/feature/createKey.vue index 6416116..7bea18d 100644 --- a/pages/feature/createKey.vue +++ b/pages/feature/createKey.vue @@ -6,10 +6,10 @@ lineWidth="40rpx" lineHeight="5rpx" :current="current" - lineColor="#63b8af" + lineColor="#4777ee" @click="clickTab" :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }" - :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }" + :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }" > @@ -389,7 +389,7 @@ line-height: 100rpx; color: #fff; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 64rpx; } diff --git a/pages/feature/createPalmVein.vue b/pages/feature/createPalmVein.vue index a079915..49992fe 100644 --- a/pages/feature/createPalmVein.vue +++ b/pages/feature/createPalmVein.vue @@ -6,10 +6,10 @@ lineWidth="40rpx" lineHeight="5rpx" :current="currentIndex" - lineColor="#63b8af" + lineColor="#4777ee" @click="clickTab" :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }" - :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }" + :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }" > @@ -415,7 +415,7 @@ line-height: 100rpx; color: #fff; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 64rpx; } diff --git a/pages/feature/createPassword.vue b/pages/feature/createPassword.vue index c2b914e..89307a1 100644 --- a/pages/feature/createPassword.vue +++ b/pages/feature/createPassword.vue @@ -6,10 +6,10 @@ lineWidth="40rpx" lineHeight="5rpx" :current="currentIndex" - lineColor="#63b8af" + lineColor="#4777ee" @click="clickTab" :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }" - :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }" + :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }" > @@ -659,7 +659,7 @@ line-height: 100rpx; color: #fff; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 64rpx; } diff --git a/pages/feature/createRemote.vue b/pages/feature/createRemote.vue index d1919db..ce14a82 100644 --- a/pages/feature/createRemote.vue +++ b/pages/feature/createRemote.vue @@ -6,10 +6,10 @@ lineWidth="40rpx" lineHeight="5rpx" :current="currentIndex" - lineColor="#63b8af" + lineColor="#4777ee" @click="clickTab" :inactiveStyle="{ color: '#a3a3a3', fontSize: '32rpx', fontWeight: 'bold' }" - :activeStyle="{ color: '#63b8af', fontSize: '32rpx', fontWeight: 'bold' }" + :activeStyle="{ color: '#4777ee', fontSize: '32rpx', fontWeight: 'bold' }" > @@ -336,7 +336,7 @@ line-height: 100rpx; color: #fff; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 64rpx; } diff --git a/pages/feature/faceList.vue b/pages/feature/faceList.vue index 9850017..4752b3e 100644 --- a/pages/feature/faceList.vue +++ b/pages/feature/faceList.vue @@ -403,7 +403,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/feature/fingerprintList.vue b/pages/feature/fingerprintList.vue index 8c9851c..e293589 100644 --- a/pages/feature/fingerprintList.vue +++ b/pages/feature/fingerprintList.vue @@ -402,7 +402,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/feature/keyDetail.vue b/pages/feature/keyDetail.vue index fe5890a..ab87c67 100644 --- a/pages/feature/keyDetail.vue +++ b/pages/feature/keyDetail.vue @@ -94,7 +94,7 @@ {{ $lock.currentKeyInfo.keyStatus === 110405 ? '解冻' : '冻结' }} @@ -104,7 +104,7 @@ $lock.currentKeyInfo.keyType !== 3 && $lock.currentKeyInfo.keyType !== 4 " - :class="[$lock.currentKeyInfo.keyRight === 1 ? 'text-red' : 'text-#63b8af']" + :class="[$lock.currentKeyInfo.keyRight === 1 ? 'text-red' : 'text-#4777ee']" @click="authorize" >{{ $lock.currentKeyInfo.keyRight === 1 ? '取消授权管理员' : '授权管理员' }} diff --git a/pages/feature/keyList.vue b/pages/feature/keyList.vue index da65695..2f45729 100644 --- a/pages/feature/keyList.vue +++ b/pages/feature/keyList.vue @@ -69,7 +69,7 @@ > {{ getKeyStatus(key.keyStatus) }} @@ -396,7 +396,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/feature/palmVeinList.vue b/pages/feature/palmVeinList.vue index fae8127..ae28dec 100644 --- a/pages/feature/palmVeinList.vue +++ b/pages/feature/palmVeinList.vue @@ -407,7 +407,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/feature/passwordList.vue b/pages/feature/passwordList.vue index 6b29adc..1b5eaaf 100644 --- a/pages/feature/passwordList.vue +++ b/pages/feature/passwordList.vue @@ -371,7 +371,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/feature/recordList.vue b/pages/feature/recordList.vue index b25db87..9c951be 100644 --- a/pages/feature/recordList.vue +++ b/pages/feature/recordList.vue @@ -413,7 +413,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/feature/remoteList.vue b/pages/feature/remoteList.vue index 0ae6863..8bd0b50 100644 --- a/pages/feature/remoteList.vue +++ b/pages/feature/remoteList.vue @@ -405,7 +405,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/main/home.vue b/pages/main/home.vue index 7f5777d..0eda243 100644 --- a/pages/main/home.vue +++ b/pages/main/home.vue @@ -34,7 +34,7 @@ @@ -134,7 +134,7 @@ {{ $bluetooth.currentLockInfo.electricQuantity }}% @@ -41,7 +41,7 @@ {{ @@ -56,15 +56,15 @@ class="bottom-icon" :src=" $bluetooth.currentLockInfo.appUnlockOnline - ? 'https://oss-lock.xhjcn.ltd/mp/icon_cloud_active.png' - : 'https://oss-lock.xhjcn.ltd/mp/icon_cloud.png' + ? 'https://cos-lock.skychip.top/mp/icon_cloud_active.png' + : 'https://cos-lock.skychip.top/mp/icon_cloud.png' " mode="aspectFill" style="width: 40rpx; height: 40rpx" > 手机需联网 @@ -87,7 +87,7 @@ > 电子钥匙 @@ -102,7 +102,7 @@ > 密码 @@ -117,7 +117,7 @@ > @@ -132,7 +132,7 @@ > 指纹 @@ -147,7 +147,7 @@ > 遥控 @@ -162,7 +162,7 @@ > 人脸 @@ -177,7 +177,7 @@ > 掌静脉 @@ -202,7 +202,7 @@ > 授权管理员 @@ -213,7 +213,7 @@ > 操作记录 @@ -224,7 +224,7 @@ > 门锁记录 @@ -238,7 +238,7 @@ > 消息提醒 @@ -260,7 +260,7 @@ @click="$basic.routeJump({ name: 'setting' })" v-if="$bluetooth.currentLockInfo.transportType !== transportType.TRANSPORT_TENCENT_YUN" > - + 设置 @@ -409,7 +409,7 @@ justify-content: center; width: 100rpx; height: 100rpx; - background-color: #5db5aa; + background-color: #4777ee; border-radius: 50%; .delete-image { @@ -448,7 +448,7 @@ line-height: 120rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 46rpx; } diff --git a/pages/others/cycleDate.vue b/pages/others/cycleDate.vue index 396390a..ce10c8d 100644 --- a/pages/others/cycleDate.vue +++ b/pages/others/cycleDate.vue @@ -32,7 +32,7 @@ - + {{ item.event_type_name }} @@ -303,7 +303,7 @@ const color = computed(() => { if (info.value?.status === 1) { - return '#63b8af' + return '#4777ee' } if (info.value?.status === 2) { return 'red' diff --git a/pages/setting/autoLock.vue b/pages/setting/autoLock.vue index 936354c..790cfec 100644 --- a/pages/setting/autoLock.vue +++ b/pages/setting/autoLock.vue @@ -39,7 +39,7 @@ diff --git a/pages/setting/catEyeMode.vue b/pages/setting/catEyeMode.vue index d55038d..009d8bf 100644 --- a/pages/setting/catEyeMode.vue +++ b/pages/setting/catEyeMode.vue @@ -238,7 +238,7 @@ 我知道了 diff --git a/pages/setting/coercionFingerprint.vue b/pages/setting/coercionFingerprint.vue index 86e5d38..5ed15fc 100644 --- a/pages/setting/coercionFingerprint.vue +++ b/pages/setting/coercionFingerprint.vue @@ -69,7 +69,7 @@ 确定 @@ -266,7 +266,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/setting/lockDate.vue b/pages/setting/lockDate.vue index 0b35a49..3b4ae84 100644 --- a/pages/setting/lockDate.vue +++ b/pages/setting/lockDate.vue @@ -6,7 +6,7 @@ }} 校准时间 diff --git a/pages/setting/lockSound.vue b/pages/setting/lockSound.vue index d23c558..3892507 100644 --- a/pages/setting/lockSound.vue +++ b/pages/setting/lockSound.vue @@ -31,7 +31,7 @@ diff --git a/pages/setting/lockUser.vue b/pages/setting/lockUser.vue index 5ff6798..cc28cab 100644 --- a/pages/setting/lockUser.vue +++ b/pages/setting/lockUser.vue @@ -65,7 +65,7 @@ 确定 @@ -376,7 +376,7 @@ line-height: 88rpx; color: white; text-align: center; - background-color: #63b8af; + background-color: #4777ee; border-radius: 44rpx; } } diff --git a/pages/setting/lowElecNotice.vue b/pages/setting/lowElecNotice.vue index 890f25d..a1f631b 100644 --- a/pages/setting/lowElecNotice.vue +++ b/pages/setting/lowElecNotice.vue @@ -46,7 +46,7 @@ 保存 diff --git a/pages/setting/notOpenDoor.vue b/pages/setting/notOpenDoor.vue index 235ac35..4a68630 100644 --- a/pages/setting/notOpenDoor.vue +++ b/pages/setting/notOpenDoor.vue @@ -55,7 +55,7 @@ 保存 保存 确定 diff --git a/pages/setting/passageMode.vue b/pages/setting/passageMode.vue index 1b1e990..2f06b83 100644 --- a/pages/setting/passageMode.vue +++ b/pages/setting/passageMode.vue @@ -21,7 +21,7 @@ {{ item }} @@ -76,7 +76,7 @@ 保存 diff --git a/pages/setting/selectGroup.vue b/pages/setting/selectGroup.vue index 53c15ad..350c703 100644 --- a/pages/setting/selectGroup.vue +++ b/pages/setting/selectGroup.vue @@ -25,7 +25,7 @@ 创建新分组 更新 diff --git a/pages/setting/updateSetting.vue b/pages/setting/updateSetting.vue index 36c3de8..f56e1c6 100644 --- a/pages/setting/updateSetting.vue +++ b/pages/setting/updateSetting.vue @@ -20,7 +20,7 @@ {{ $bluetooth.currentLockSetting.lockSettingInfo[type] === 1 ? '关闭' : '开启' }} 开始 diff --git a/pages/setting/videoSlot.vue b/pages/setting/videoSlot.vue index c82abc8..5f0dc4e 100644 --- a/pages/setting/videoSlot.vue +++ b/pages/setting/videoSlot.vue @@ -76,7 +76,7 @@ > 确定 diff --git a/pages/user/deleteAccount.vue b/pages/user/deleteAccount.vue index c72c235..4c4281e 100644 --- a/pages/user/deleteAccount.vue +++ b/pages/user/deleteAccount.vue @@ -141,7 +141,7 @@ line-height: 108rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 16rpx; } @@ -177,7 +177,7 @@ line-height: 96rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 16rpx; } diff --git a/pages/user/forgotPassword.vue b/pages/user/forgotPassword.vue index 65cff42..63044da 100644 --- a/pages/user/forgotPassword.vue +++ b/pages/user/forgotPassword.vue @@ -105,7 +105,7 @@ 重置密码 diff --git a/pages/user/login.vue b/pages/user/login.vue index c58f46b..ee7e98a 100644 --- a/pages/user/login.vue +++ b/pages/user/login.vue @@ -64,7 +64,7 @@ 登录 diff --git a/pages/user/register.vue b/pages/user/register.vue index 00b2ed4..680bddb 100644 --- a/pages/user/register.vue +++ b/pages/user/register.vue @@ -5,9 +5,9 @@ @click="click" class="mx-4" lineWidth="300rpx" - lineColor="#63b8af" + lineColor="#4777ee" :activeStyle="{ - color: '#63b8af', + color: '#4777ee', fontWeight: 'bold', transform: 'scale(1.05)' }" @@ -136,7 +136,7 @@ 注册 diff --git a/pages/user/updateAccount.vue b/pages/user/updateAccount.vue index edd506c..e89aca3 100644 --- a/pages/user/updateAccount.vue +++ b/pages/user/updateAccount.vue @@ -260,7 +260,7 @@ line-height: 108rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 16rpx; } @@ -296,7 +296,7 @@ line-height: 96rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 16rpx; } diff --git a/pages/user/updateName.vue b/pages/user/updateName.vue index ca237d2..c0545fb 100644 --- a/pages/user/updateName.vue +++ b/pages/user/updateName.vue @@ -110,7 +110,7 @@ line-height: 96rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 16rpx; } diff --git a/pages/user/updatePassword.vue b/pages/user/updatePassword.vue index ba2acca..7ad3830 100644 --- a/pages/user/updatePassword.vue +++ b/pages/user/updatePassword.vue @@ -171,7 +171,7 @@ line-height: 96rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 16rpx; } @@ -207,7 +207,7 @@ line-height: 108rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 16rpx; } diff --git a/pages/user/verifyAccount.vue b/pages/user/verifyAccount.vue index f96633e..5977ded 100644 --- a/pages/user/verifyAccount.vue +++ b/pages/user/verifyAccount.vue @@ -139,7 +139,7 @@ line-height: 108rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 16rpx; } @@ -175,7 +175,7 @@ line-height: 96rpx; color: #ffffff; text-align: center; - background: #63b8af; + background: #4777ee; border-radius: 16rpx; } diff --git a/static/images/tabbar_key_no_select.png b/static/images/tabbar_key_no_select.png index ea6aa06..16d8848 100644 Binary files a/static/images/tabbar_key_no_select.png and b/static/images/tabbar_key_no_select.png differ diff --git a/static/images/tabbar_key_select.png b/static/images/tabbar_key_select.png index 2adb1a3..46d54bd 100644 Binary files a/static/images/tabbar_key_select.png and b/static/images/tabbar_key_select.png differ diff --git a/static/images/tabbar_mine_no_select.png b/static/images/tabbar_mine_no_select.png index 5cd3e24..a6c9280 100644 Binary files a/static/images/tabbar_mine_no_select.png and b/static/images/tabbar_mine_no_select.png differ diff --git a/static/images/tabbar_mine_select.png b/static/images/tabbar_mine_select.png index 4864337..7049c19 100644 Binary files a/static/images/tabbar_mine_select.png and b/static/images/tabbar_mine_select.png differ diff --git a/static/images/tabbar_notification_no_select.png b/static/images/tabbar_notification_no_select.png index 9ea5288..86713e1 100644 Binary files a/static/images/tabbar_notification_no_select.png and b/static/images/tabbar_notification_no_select.png differ diff --git a/static/images/tabbar_notification_select.png b/static/images/tabbar_notification_select.png index c2b0925..7c08750 100644 Binary files a/static/images/tabbar_notification_select.png and b/static/images/tabbar_notification_select.png differ