Merge branch 'dev_lqs' into 'master'

修改

See merge request !66

H5/src/components/BaseNavBar.vue

@@ -10,7 +10,6 @@
 </template>
 
 <script>
-import { navigateBack } from "@/utils/bridgeToAppFun";
 export default {
   name: "BaseNavBar",
   props: {
@@ -38,7 +37,7 @@ export default {
       ];
       if (whiteList.indexOf(currentPage) > -1) {
         try {
-          navigateBack();
+          this.$bridgeToAppFun.navigateBack();
         } catch {
           console.log("不能交互");
         }

H5/src/views/customer-service.vue

@@ -16,8 +16,9 @@
         <div class="save-code">
           <p>保存二维码</p>
           <p>打开微信扫一扫添加客服</p>
+          <p>请截图保存！</p>
         </div>
-        <van-button>保存</van-button>
+        <!-- <van-button>保存</van-button> -->
       </div>
     </div>
   </div>

H5/src/views/settings.vue

@@ -3,11 +3,7 @@
     <van-cell-group class="group-1">
       <van-cell title="用户名" :value="$userId" />
       <van-cell is-link center title="头像" @click="onModefy">
-        <img
-          class="avatar-img"
-          :src="imgBaseUrl + avatar"
-          alt="头像"
-        />
+        <img class="avatar-img" :src="imgBaseUrl + avatar" alt="头像" />
       </van-cell>
     </van-cell-group>
     <van-cell-group>
@@ -59,7 +55,7 @@ export default {
   name: "Settings",
   data() {
     return {
-      imgBaseUrl: '',
+      imgBaseUrl: "",
       avatar: "",
       fileList: [],
       fillCode: "",