Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
80e6ce855b
@ -1,30 +1,45 @@
|
|||||||
import request from '@/utils/request'
|
import request from '@/utils/request'
|
||||||
|
|
||||||
const version = '1.0.0'
|
let version = '-'
|
||||||
const buildNumber = 0
|
let buildNumber = "-"
|
||||||
|
uni.getSystemInfo({
|
||||||
|
success: function (res) {
|
||||||
|
// console.log('getSystemInfo', res)
|
||||||
|
version = res.appVersion
|
||||||
|
buildNumber = res.appVersionCode
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
const DEV = {
|
const DEV = {
|
||||||
name: '开发',
|
name: 'dev',
|
||||||
baseUrl: 'https://dev.lock.star-lock.cn/api',
|
baseUrl: 'https://dev.lock.star-lock.cn/api',
|
||||||
webviewBaseUrl: 'https://dev.lock.star-lock.cn',
|
webviewBaseUrl: 'https://dev.lock.star-lock.cn',
|
||||||
version,
|
version,
|
||||||
buildNumber
|
buildNumber
|
||||||
}
|
}
|
||||||
const PRE = {
|
const PRE = {
|
||||||
name: '预发',
|
name: 'pre',
|
||||||
baseUrl: 'https://pre.lock.star-lock.cn/api',
|
baseUrl: 'https://pre.lock.star-lock.cn/api',
|
||||||
webviewBaseUrl: 'https://pre.lock.star-lock.cn',
|
webviewBaseUrl: 'https://pre.lock.star-lock.cn',
|
||||||
version,
|
version,
|
||||||
buildNumber
|
buildNumber
|
||||||
}
|
}
|
||||||
|
|
||||||
const PROD = {
|
const XHJ = {
|
||||||
name: '线上',
|
name: 'xhj',
|
||||||
baseUrl: 'https://lock.xhjcn.ltd/api',
|
baseUrl: 'https://lock.xhjcn.ltd/api',
|
||||||
webviewBaseUrl: 'https://lock.xhjcn.ltd',
|
webviewBaseUrl: 'https://lock.xhjcn.ltd',
|
||||||
version,
|
version,
|
||||||
buildNumber
|
buildNumber
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const SKY = {
|
||||||
|
name: 'sky',
|
||||||
|
baseUrl: 'https://lock.skychip.top/api',
|
||||||
|
webviewBaseUrl: 'https://lock.skychip.top',
|
||||||
|
version,
|
||||||
|
buildNumber
|
||||||
|
}
|
||||||
|
|
||||||
// 更换环境的时候 切换导出就行
|
// 更换环境的时候 切换导出就行
|
||||||
export default { DEV, PRE, PROD }
|
export default { DEV, PRE, XHJ, SKY }
|
||||||
|
|||||||
@ -31,9 +31,10 @@
|
|||||||
<image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
|
<image class="icon-arrow" src="/static/images/icon_arrow.png" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="env" v-if="envVersion !== 'release' && env">
|
<view class="env">
|
||||||
<view class="env-text">{{env.name}}环境 版本号:{{env.version}}+{{env.buildNumber}}</view>
|
<view class="env-text">{{env.name}} {{env.version}}+{{env.buildNumber}}</view>
|
||||||
<view class="env-button" @click="show=true">切换环境</view>
|
<view>{{env.webviewBaseUrl}}</view>
|
||||||
|
<view v-if="envVersion !== 'release' && env" class="env-button" @click="show=true">切换环境</view>
|
||||||
</view>
|
</view>
|
||||||
<label for="changePhone">
|
<label for="changePhone">
|
||||||
<view class="switch-account">切换账号</view>
|
<view class="switch-account">切换账号</view>
|
||||||
@ -44,9 +45,10 @@
|
|||||||
<label for="phone">
|
<label for="phone">
|
||||||
<view class="button-login">登录</view>
|
<view class="button-login">登录</view>
|
||||||
</label>
|
</label>
|
||||||
<view class="env" v-if="envVersion !== 'release' && env">
|
<view class="env">
|
||||||
<view class="env-text">{{env.name}}环境 版本号:{{env.version}}+{{env.buildNumber}}</view>
|
<view class="env-text">{{env.name}} {{env.version}}+{{env.buildNumber}}</view>
|
||||||
<view class="env-button" @click="show=true">切换环境</view>
|
<view>{{env.webviewBaseUrl}}</view>
|
||||||
|
<view v-if="envVersion !== 'release' && env" class="env-button" @click="show=true">切换环境</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -242,22 +244,19 @@ page {
|
|||||||
line-height: 80rpx;
|
line-height: 80rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
margin-left: 75rpx;
|
margin-left: 75rpx;
|
||||||
font-size: 40rpx;
|
|
||||||
font-weight: bold;
|
|
||||||
|
|
||||||
.env-text {
|
.env-text {
|
||||||
|
font-weight: bold;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.env-button {
|
.env-button {
|
||||||
border-radius: 46rpx;
|
background: inherit;
|
||||||
background: #f0ad4e;
|
color: #022b7c;
|
||||||
color: #ffffff;
|
font-size: .8rem;
|
||||||
font-size: 40rpx;
|
text-align: right;
|
||||||
font-weight: bold;
|
text-decoration: underline;
|
||||||
width: 600rpx;
|
|
||||||
height: 80rpx;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user