Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2ecd70765e | ||
|
|
4b0e0eabb2 | ||
|
|
46266223f1 |
@@ -15,7 +15,7 @@
|
||||
},
|
||||
"tabBar": {
|
||||
"color": "#808080",
|
||||
"selectedColor": "#1385FA",
|
||||
"selectedColor": "#8363F9",
|
||||
"borderStyle": "white",
|
||||
"list": [{
|
||||
"pagePath": "pages/home/home",
|
||||
|
||||
@@ -143,7 +143,7 @@ input {
|
||||
line-height: 88rpx;
|
||||
border-radius: 44rpx;
|
||||
margin-bottom: 40rpx;
|
||||
background-color: #1385FA;
|
||||
background-color: #8363F9;
|
||||
}
|
||||
|
||||
.describe {
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
margin: 0 auto;
|
||||
text-align: center;
|
||||
border-radius: 44rpx;
|
||||
background-color: #1385FA;
|
||||
background-color: #8363F9;
|
||||
}
|
||||
|
||||
|
||||
@@ -187,7 +187,7 @@
|
||||
}
|
||||
|
||||
.progress2>view:nth-of-type(2) {
|
||||
color: #1385FA;
|
||||
color: #8363F9;
|
||||
width: 100%;
|
||||
height: 36rpx;
|
||||
font-size: 36rpx;
|
||||
|
||||
@@ -45,5 +45,5 @@
|
||||
line-height: 88rpx;
|
||||
text-align: center;
|
||||
border-radius: 44rpx;
|
||||
background-color: #1385FA;
|
||||
background-color: #8363F9;
|
||||
}
|
||||
|
||||
@@ -91,5 +91,5 @@
|
||||
margin: 0 auto;
|
||||
text-align: center;
|
||||
border-radius: 44rpx;
|
||||
background-color: #1385FA;
|
||||
background-color: #8363F9;
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
}
|
||||
|
||||
.replaceNetwork3>view:nth-of-type(2) {
|
||||
color: #1385FA;
|
||||
color: #8363F9;
|
||||
width: 100%;
|
||||
height: 36rpx;
|
||||
font-size: 36rpx;
|
||||
|
||||
@@ -45,5 +45,5 @@
|
||||
line-height: 88rpx;
|
||||
text-align: center;
|
||||
border-radius: 44rpx;
|
||||
background-color: #1385FA;
|
||||
background-color: #8363F9;
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 121 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 79 KiB |
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 121 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 8.5 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.3 KiB |
@@ -3,7 +3,7 @@
|
||||
<block wx:for="{{progress.data}}" wx:key="index">
|
||||
<view class="progressList">
|
||||
<view style="background-color: {{progress.index >= index ? '#BFDEFD' : '#C1DFFE'}};">
|
||||
<view style="height: {{progress.index >= index ? '24rpx' : '40rpx'}};width: {{progress.index >= index ? '24rpx' : '40rpx'}};background-color: {{progress.index >= index ? '#3194FB' : '#77849E'}};">{{progress.index >= index ? '' : index + 1}}</view>
|
||||
<view style="height: {{progress.index >= index ? '24rpx' : '40rpx'}};width: {{progress.index >= index ? '24rpx' : '40rpx'}};background-color: {{progress.index >= index ? '#8363F9' : '#77849E'}};">{{progress.index >= index ? '' : index + 1}}</view>
|
||||
</view>
|
||||
<view class="{{progress.index >= index ? 'active' : ''}}">{{item}}</view>
|
||||
</view>
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
}
|
||||
|
||||
.active {
|
||||
color: #3194FB !important;
|
||||
color: #8363F9 !important;
|
||||
font-weight: bold !important;
|
||||
}
|
||||
|
||||
|
||||
@@ -98,5 +98,5 @@ page {
|
||||
line-height: 88rpx;
|
||||
text-align: center;
|
||||
border-radius: 44rpx;
|
||||
background-color: #1385FA;
|
||||
background-color: #8363F9;
|
||||
}
|
||||
@@ -43,7 +43,7 @@ Page({
|
||||
let params = {
|
||||
code: code
|
||||
};
|
||||
$.ajax("weighingScale/checkOpenIdLogin", params, "POST", true, "加载中...").then((res) => {
|
||||
$.ajax("weighingScale/checkOpenIdLogin/v2", params, "POST", true, "加载中...").then((res) => {
|
||||
wx.setStorageSync("userInfo", res.result.user);
|
||||
wx.setStorageSync("token", res.result.token);
|
||||
this.setData({
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<view class="bg">
|
||||
<image src="/images/home/bg.jpg"/>
|
||||
<image src="/images/home/bg.png"/>
|
||||
</view>
|
||||
|
||||
<view class="home">
|
||||
@@ -16,8 +16,7 @@
|
||||
</block>
|
||||
</view>
|
||||
<view>智能蓝牙秤</view>
|
||||
<view>注重更好的健康生活品质</view>
|
||||
<view></view>
|
||||
<view>精准称重丨灵敏测脂丨健康管理</view>
|
||||
</view>
|
||||
<block wx:if="{{deviceList && deviceList.length}}">
|
||||
<view class="device" bind:tap="openDeviceInfo">
|
||||
@@ -29,8 +28,6 @@
|
||||
</block>
|
||||
<block wx:else>
|
||||
<view class="addDevice">
|
||||
<view>请添加设备</view>
|
||||
<view>添加设备后,解锁更多体验</view>
|
||||
<block wx:if="{{userInfo && token}}">
|
||||
<view bind:tap="openSearchDevice">添加设备</view>
|
||||
</block>
|
||||
|
||||
@@ -57,26 +57,20 @@
|
||||
|
||||
.title>view:nth-of-type(2) {
|
||||
color: #FFFFFF;
|
||||
height: 58rpx;
|
||||
font-size: 58rpx;
|
||||
height: 80rpx;
|
||||
font-size: 80rpx;
|
||||
font-weight: bold;
|
||||
line-height: 58rpx;
|
||||
margin-bottom: 34rpx;
|
||||
line-height: 80rpx;
|
||||
margin-bottom: 45rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.title>view:nth-of-type(3) {
|
||||
color: #FFFFFF;
|
||||
height: 32rpx;
|
||||
font-size: 32rpx;
|
||||
line-height: 32rpx;
|
||||
margin-bottom: 48rpx;
|
||||
}
|
||||
|
||||
.title>view:nth-of-type(4) {
|
||||
width: 120rpx;
|
||||
height: 6rpx;
|
||||
border-radius: 3rpx;
|
||||
background-color: #FFFFFF;
|
||||
height: 40rpx;
|
||||
font-size: 40rpx;
|
||||
line-height: 40rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.device {
|
||||
@@ -104,35 +98,15 @@
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.addDevice>view:nth-of-type(1) {
|
||||
.addDevice>view {
|
||||
color: #FFFFFF;
|
||||
width: 100%;
|
||||
height: 36rpx;
|
||||
font-size: 36rpx;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
line-height: 36rpx;
|
||||
margin-bottom: 30rpx;
|
||||
}
|
||||
|
||||
.addDevice>view:nth-of-type(2) {
|
||||
color: #FFFFFF;
|
||||
width: 100%;
|
||||
height: 30rpx;
|
||||
font-size: 30rpx;
|
||||
text-align: center;
|
||||
line-height: 30rpx;
|
||||
margin-bottom: 80rpx;
|
||||
}
|
||||
|
||||
.addDevice>view:nth-of-type(3) {
|
||||
color: #FFFFFF;
|
||||
width: 100%;
|
||||
height: 106rpx;
|
||||
height: 88rpx;
|
||||
font-size: 32rpx;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
line-height: 106rpx;
|
||||
border-radius: 16rpx;
|
||||
border: 1rpx solid #FFFFFF;
|
||||
line-height: 88rpx;
|
||||
border-radius: 44rpx;
|
||||
border: 1rpx solid #FFFFFF;
|
||||
background-color: rgba(0, 0, 0, .4);
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ Page({
|
||||
let params = {
|
||||
code: res.code
|
||||
};
|
||||
$.ajax("weighingScale/checkOpenIdLogin", params, "POST", true, "登录中...").then((res) => {
|
||||
$.ajax("weighingScale/checkOpenIdLogin/v2", params, "POST", true, "登录中...").then((res) => {
|
||||
wx.setStorageSync("userInfo", res.result.user);
|
||||
wx.setStorageSync("token", res.result.token);
|
||||
this.setData({
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
}
|
||||
|
||||
.btn>view {
|
||||
color: #1385FA;
|
||||
color: #8363F9;
|
||||
width: 580rpx;
|
||||
height: 88rpx;
|
||||
line-height: 88rpx;
|
||||
@@ -160,6 +160,6 @@
|
||||
border-radius: 44rpx;
|
||||
text-align: center;
|
||||
background-color: #F5F7FB;
|
||||
border: 1rpx solid #1385FA;
|
||||
border: 1rpx solid #8363F9;
|
||||
|
||||
}
|
||||
@@ -44,7 +44,7 @@ page {
|
||||
0% {
|
||||
width: 200rpx;
|
||||
height: 200rpx;
|
||||
background-color: #3194FB;
|
||||
background-color: #8363F9;
|
||||
}
|
||||
100% {
|
||||
width: 556rpx;
|
||||
|
||||
@@ -151,7 +151,7 @@ input {
|
||||
line-height: 88rpx;
|
||||
border-radius: 44rpx;
|
||||
margin-bottom: 40rpx;
|
||||
background-color: #1385FA;
|
||||
background-color: #8363F9;
|
||||
}
|
||||
|
||||
.describe {
|
||||
|
||||
@@ -1,41 +1,41 @@
|
||||
{
|
||||
"appid": "wx6c71f3ebcdcddffd",
|
||||
"compileType": "miniprogram",
|
||||
"libVersion": "3.8.5",
|
||||
"packOptions": {
|
||||
"ignore": [],
|
||||
"include": []
|
||||
},
|
||||
"setting": {
|
||||
"coverView": true,
|
||||
"es6": true,
|
||||
"postcss": true,
|
||||
"minified": true,
|
||||
"enhance": true,
|
||||
"showShadowRootInWxmlPanel": true,
|
||||
"packNpmRelationList": [],
|
||||
"babelSetting": {
|
||||
"ignore": [],
|
||||
"disablePlugins": [],
|
||||
"outputPath": ""
|
||||
},
|
||||
"compileWorklet": false,
|
||||
"uglifyFileName": false,
|
||||
"uploadWithSourceMap": true,
|
||||
"packNpmManually": false,
|
||||
"minifyWXSS": true,
|
||||
"minifyWXML": true,
|
||||
"localPlugins": false,
|
||||
"disableUseStrict": false,
|
||||
"useCompilerPlugins": false,
|
||||
"condition": false,
|
||||
"swc": false,
|
||||
"disableSWC": true
|
||||
},
|
||||
"condition": {},
|
||||
"editorSetting": {
|
||||
"tabIndent": "tab",
|
||||
"tabSize": 4
|
||||
},
|
||||
"simulatorPluginLibVersion": {}
|
||||
"appid": "wxd98be3eccdba8f7f",
|
||||
"compileType": "miniprogram",
|
||||
"libVersion": "3.8.5",
|
||||
"packOptions": {
|
||||
"ignore": [],
|
||||
"include": []
|
||||
},
|
||||
"setting": {
|
||||
"coverView": true,
|
||||
"es6": true,
|
||||
"postcss": true,
|
||||
"minified": true,
|
||||
"enhance": true,
|
||||
"showShadowRootInWxmlPanel": true,
|
||||
"packNpmRelationList": [],
|
||||
"babelSetting": {
|
||||
"ignore": [],
|
||||
"disablePlugins": [],
|
||||
"outputPath": ""
|
||||
},
|
||||
"compileWorklet": false,
|
||||
"uglifyFileName": false,
|
||||
"uploadWithSourceMap": true,
|
||||
"packNpmManually": false,
|
||||
"minifyWXSS": true,
|
||||
"minifyWXML": true,
|
||||
"localPlugins": false,
|
||||
"disableUseStrict": false,
|
||||
"useCompilerPlugins": false,
|
||||
"condition": false,
|
||||
"swc": false,
|
||||
"disableSWC": true
|
||||
},
|
||||
"condition": {},
|
||||
"editorSetting": {
|
||||
"tabIndent": "tab",
|
||||
"tabSize": 4
|
||||
},
|
||||
"simulatorPluginLibVersion": {}
|
||||
}
|
||||