Merge branch 'dev_lqs' into 'master'

Dev lqs

See merge request !146

H5/src/views/settings.vue

@@ -2,7 +2,8 @@
   <div class="settings">
     <van-cell-group class="group-1">
       <van-cell title="用户名" :value="userName" />
-      <van-cell is-link center title="头像" @click="onModefy">
+      <!--is-link @click="onModefy" -->
+      <van-cell center title="头像" is-link @click="onModefy">
         <img class="avatar-img" :src="imageBaseUrl + avatar" alt="头像" />
       </van-cell>
     </van-cell-group>
@@ -104,10 +105,10 @@ export default {
     updateVersion() {
       versionUpdate(this.version.substr(2)).then(res => {
         this.versionShow = true;
-        if (res.data === "当前已是最新版本！") {
+        if (res.code == 1) {
           this.updateResult = res.data;
           this.needUpdate = false;
-        } else {
+        } else if (res.code == 0) {
           this.downAppUrl = res.data;
           this.updateResult = "最新版App下载地址：" + res.data;
           this.updateBtn = "下载最新版App";

H5/vue.config.js

@@ -4,7 +4,7 @@ const name = "西田森App";
 
 module.exports = {
   publicPath: "/front",
-  outputDir: "front",
+  // outputDir: "front",
   devServer: {
     proxy: {
       '/shop-mall': {