Merge branch 'spp' into 'master'

Spp

See merge request !25

src/views/my/charge.vue

@@ -103,6 +103,10 @@
 		</div>
 		<div class="skBtn" @click="launch(repair_order_id)">发起收款</div>
 		</div>
+        <!-- 底部返回按钮 -->
+        <div class="backBtn" @click="goBack">
+            <img src="@assets/images/back3.png" alt="">
+        </div>
 	</div>
 </template>
 
@@ -159,6 +163,11 @@ export default {
         },
     },
     methods: {
+        goBack(){
+            this.$router.push({
+                path: '/'
+            })
+        },
         callPhone(order){
             let phoneNumber = order.telephone
             window.location.href = 'tel://' + phoneNumber
@@ -320,6 +329,23 @@ export default {
     background: #fff;
     padding-top: 0.2rem;
 }
+.backBtn{
+    width: 1rem;
+    height: 1rem;
+    background: #fff;
+    box-shadow: 0 0 0.1rem #0054ff;
+    position: fixed;
+    right: 0.3rem;
+    bottom: 1.3rem;
+    z-index: 1;
+    border-radius: 50%;
+    padding: 0.1rem;
+}
+.backBtn img{
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+}
 .top {
     width: 6.9rem;
     background: #ffffff;