Merge remote-tracking branch 'origin/dev' into pet-2.0

# Conflicts:
#	pages/login/login.vue

App.vue

@@ -2,6 +2,7 @@
 export default {
   onLaunch: function () {
     console.log('App Launch')
+    this.$store.dispatch('setfilePath', 'https://skqhdg.porthebei.com:9004/file/');
     this.isLogin()
   },
   onShow: function () {

pages/safety-environmental-inspection/inspector-confirms/detail.vue

@@ -130,6 +130,8 @@
           <u-cell>
             <view slot="title" class="title flex-between">
               签字：
+            </view>
+            <view slot="value">
               <u-button type="primary" text="手写添加" size="mini" @click="signShow = true"></u-button>
             </view>
             <view slot="label" class="mt-10">

styles/home_style.scss

@@ -276,6 +276,6 @@
 		content: "\e6a3";
 		text-align: center;
 		font-size: 34rpx;
-		font-family: cuIcon;
+		font-family: cuIcon, serif;
 		line-height: 30rpx
 	}