Merge remote-tracking branch 'origin/dev' into pet-2.0
# Conflicts: # pages/login/login.vuepet-2.0
commit
58c05d88d6
1
App.vue
1
App.vue
|
@ -2,6 +2,7 @@
|
||||||
export default {
|
export default {
|
||||||
onLaunch: function () {
|
onLaunch: function () {
|
||||||
console.log('App Launch')
|
console.log('App Launch')
|
||||||
|
this.$store.dispatch('setfilePath', 'https://skqhdg.porthebei.com:9004/file/');
|
||||||
this.isLogin()
|
this.isLogin()
|
||||||
},
|
},
|
||||||
onShow: function () {
|
onShow: function () {
|
||||||
|
|
|
@ -130,6 +130,8 @@
|
||||||
<u-cell>
|
<u-cell>
|
||||||
<view slot="title" class="title flex-between">
|
<view slot="title" class="title flex-between">
|
||||||
签字:
|
签字:
|
||||||
|
</view>
|
||||||
|
<view slot="value">
|
||||||
<u-button type="primary" text="手写添加" size="mini" @click="signShow = true"></u-button>
|
<u-button type="primary" text="手写添加" size="mini" @click="signShow = true"></u-button>
|
||||||
</view>
|
</view>
|
||||||
<view slot="label" class="mt-10">
|
<view slot="label" class="mt-10">
|
||||||
|
|
|
@ -276,6 +276,6 @@
|
||||||
content: "\e6a3";
|
content: "\e6a3";
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-size: 34rpx;
|
font-size: 34rpx;
|
||||||
font-family: cuIcon;
|
font-family: cuIcon, serif;
|
||||||
line-height: 30rpx
|
line-height: 30rpx
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue