Commit 638f1714 by hank

fix bug

parent f183c5c2
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"description": "", "description": "",
"appid": "wx9dd4033f37a9fa9f", "appid": "wx9dd4033f37a9fa9f",
"setting": { "setting": {
"urlCheck": true, "urlCheck": false,
"es6": false, "es6": false,
"postcss": false, "postcss": false,
"minified": false, "minified": false,
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
page { page {
width: 100%; width: 100%;
height: 100%; height: 100%;
font-family: PingFang, PingFang SC, Source Han Sans CN, noto sans;
} }
.at-tabs .at-tabs__item { .at-tabs .at-tabs__item {
......
...@@ -30,6 +30,16 @@ $primary-text-color: #333; ...@@ -30,6 +30,16 @@ $primary-text-color: #333;
} }
@font-face { @font-face {
font-family: PingFang;
src: url(https://visual-clouds.bdideal.com/html/156170435921582b04ee33fce4589808130a0b0d0e8e1.ttf) format('truetype');
}
@font-face {
font-family: PingFang SC;
src: url(https://visual-clouds.bdideal.com/html/156170435921582b04ee33fce4589808130a0b0d0e8e1.ttf);
}
@font-face {
font-family: 'DIN-Condensed'; font-family: 'DIN-Condensed';
src: url(https://visual-clouds.bdideal.com/html/156394962402878b178ab4088494e9df36c49ec944add.ttf) format('truetype'), url('DINCondensed-Bold.ttf') format('truetype'); src: url(https://visual-clouds.bdideal.com/html/156394962402878b178ab4088494e9df36c49ec944add.ttf) format('truetype'), url('DINCondensed-Bold.ttf') format('truetype');
font-weight: bold; font-weight: bold;
......
...@@ -3,6 +3,7 @@ export const FETCH_TIME_OUT = 5000 ...@@ -3,6 +3,7 @@ export const FETCH_TIME_OUT = 5000
// export const WEBVIEW_URL = 'https://visual.bdideal.com' // export const WEBVIEW_URL = 'https://visual.bdideal.com'
export const BASE_URL = 'https://dev-server.bdideal.com' export const BASE_URL = 'https://dev-server.bdideal.com'
export const WEBVIEW_URL = 'https://dev-visual.bdideal.com' export const WEBVIEW_URL = 'https://dev-visual.bdideal.com'
// export const WEBVIEW_URL = 'http://127.0.0.1:8080'
/** 蓝牙的服务 uuid */ /** 蓝牙的服务 uuid */
export const BLE_SERVICE_ID = '000088A0-0000-1000-8000-00805F9B34FB' export const BLE_SERVICE_ID = '000088A0-0000-1000-8000-00805F9B34FB'
......
...@@ -224,7 +224,7 @@ class FilmDetail extends Component { ...@@ -224,7 +224,7 @@ class FilmDetail extends Component {
<WebView <WebView
src={`${WEBVIEW_URL}/tempaltes/edit?${ src={`${WEBVIEW_URL}/tempaltes/edit?${
templateId ? 'templateId=' + templateId : 'filmId=' + filmId templateId ? 'templateId=' + templateId : 'filmId=' + filmId
}&token=${token.getToken()}&t=${Date.now()}`} }&token=${token.getToken()}&t=${Date.now()}#wechat_redirect`}
onLoad={() => { onLoad={() => {
this.webviewLoad() this.webviewLoad()
}} }}
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
color: #fff; color: #fff;
letter-spacing: 0.43px; letter-spacing: 0.43px;
vertical-align: middle; vertical-align: middle;
display: flex;
align-items: center;
} }
.vip-icon { .vip-icon {
...@@ -46,6 +48,7 @@ ...@@ -46,6 +48,7 @@
&-vip { &-vip {
// padding-left: 20px; // padding-left: 20px;
margin-top: 10px;
background: rgba(254, 74, 26, 1); background: rgba(254, 74, 26, 1);
border-radius: 22px; border-radius: 22px;
display: inline-block; display: inline-block;
......
...@@ -86,7 +86,7 @@ class User extends Component { ...@@ -86,7 +86,7 @@ class User extends Component {
<View className="user-top-info-name"> <View className="user-top-info-name">
<View className="user-top-info-phone"> <View className="user-top-info-phone">
{userPhone} {userPhone}
{vipState === 'DISABLE' ? ( {vipState !== 'DISABLE' ? (
<Image <Image
mode="aspectFit" mode="aspectFit"
className="vip-icon" className="vip-icon"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment