From c95b648ecc296a4840e869f3a245825f3b741b8e Mon Sep 17 00:00:00 2001
From: leiqingsong <1762842758@qq.com>
Date: Mon, 29 Mar 2021 09:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93=E8=81=94=E8=B0=83=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 H5/.env.production                |  4 +--
 H5/src/App.vue                    |  5 ++--
 H5/src/components/BaseNavBar.vue  |  1 -
 H5/src/utils/bridgeToAppFun.js    | 41 ++++++++++++++++++++-----------
 H5/src/views/bank.vue             | 12 ++++++---
 H5/src/views/cashOut/cash-out.vue |  2 +-
 H5/src/views/customer-service.vue |  8 ++++--
 H5/vue.config.js                  |  2 +-
 8 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/H5/.env.production b/H5/.env.production
index 9ecc096..91ae612 100644
--- a/H5/.env.production
+++ b/H5/.env.production
@@ -1,5 +1,5 @@
 # 生产环境 部署生产环境放开这个
-# VUE_APP_BASE_URL = "http://app.xitiansen.com"
+VUE_APP_BASE_URL = "http://app.xitiansen.com"
 
 # 测试环境 部署测试环境放开这个
-VUE_APP_BASE_URL = "http://8.131.244.76:81"
\ No newline at end of file
+# VUE_APP_BASE_URL = "http://8.131.244.76:81"
\ No newline at end of file
diff --git a/H5/src/App.vue b/H5/src/App.vue
index 742cffd..493dc1d 100644
--- a/H5/src/App.vue
+++ b/H5/src/App.vue
@@ -27,11 +27,12 @@ export default {
     this.$bridgeToAppFun
       .getAuthToken()
       .then(res => {
-        console.log("获取token成功", res);
+        console.log("获取到token成功", res);
+        localStorage.setItem('token', res);
         this.saveUser(res);
       })
       .catch(err => {
-        console.log("获取token失败", err);
+        console.log("获取token失败123", err);
       });
   },
   methods: {
diff --git a/H5/src/components/BaseNavBar.vue b/H5/src/components/BaseNavBar.vue
index 1115ba6..ba11fe2 100644
--- a/H5/src/components/BaseNavBar.vue
+++ b/H5/src/components/BaseNavBar.vue
@@ -23,7 +23,6 @@ export default {
       const currentPage = this.$router.currentRoute.name;
       console.log("router", currentPage);
       const whiteList = [
-        "MyStatus",
         "Publish",
         "FastestProgress",
         "MonthAward",
diff --git a/H5/src/utils/bridgeToAppFun.js b/H5/src/utils/bridgeToAppFun.js
index 4943feb..ce0f597 100644
--- a/H5/src/utils/bridgeToAppFun.js
+++ b/H5/src/utils/bridgeToAppFun.js
@@ -18,30 +18,28 @@ class bridgeToAppFun {
   }
   // 获取Token
   getAuthToken() {
-    console.log('系统:', this.userAgent);
+    console.log("系统:", this.userAgent);
     if (this.userAgent === "android") {
       // android
       let token = null;
-      try {
-        token = window.android.getAuthToken();
-        localStorage.setItem("token", token);
-      } catch {
-        console.log("token获取失败");
-      }
       return new Promise((resolve, reject) => {
-        if (token) {
+        console.log('版本', window.android.getAppVersion());
+        console.log('接收', window.android.getToken());
+        token = window.android.getToken();
+        console.log('token', token);
+        if(token) {
           resolve(token);
         } else {
-          reject("失败");
+          reject('没有token');
         }
       });
     } else if (this.userAgent === "ios") {
       // ios
       return new Promise((resolve, reject) => {
-        console.log('调ios的方法');
+        console.log("调ios的方法");
         jsBridge.callhandler("getAuthToken", null, data => {
-          localStorage.setItem("token", data);
           if (data) {
+            // localStorage.setItem("token", data);
             resolve(data);
           } else {
             console.log("调用失败");
@@ -66,9 +64,10 @@ class bridgeToAppFun {
     console.log("返回");
     if (this.userAgent === "android") {
       try {
-        const home_url =
-          "https://shop92680967.youzan.com/v2/showcase/homepage?alias=6aFsQ4vCp7";
-        location.href = home_url;
+        // const home_url =
+        //   "https://shop92680967.youzan.com/v2/showcase/homepage?alias=6aFsQ4vCp7";
+        // location.href = home_url;
+        window.android1.navigateBack();
       } catch {
         console.log("返回调用失败，都不行");
       }
@@ -95,6 +94,20 @@ class bridgeToAppFun {
       jsBridge.callhandler("redirectToLogin");
     }
   }
+  // 保存图片
+  saveImage(url) {
+    console.log("调用App保存图片, 图片地址", url);
+    if (this.userAgent === "android") {
+      console.log("an");
+      window.android.appSaveImage(url);
+    } else {
+      jsBridge.callhandler("appSaveImage", url, response => {
+        if (response) {
+          console.log("保存成功");
+        }
+      });
+    }
+  }
 }
 
 export default bridgeToAppFun;
diff --git a/H5/src/views/bank.vue b/H5/src/views/bank.vue
index df6bb65..12e5ef2 100644
--- a/H5/src/views/bank.vue
+++ b/H5/src/views/bank.vue
@@ -106,13 +106,17 @@ export default {
         this.$toast.fail("请输入身份证号");
         return;
       }
-      if (!/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(this.form.idCardNo)) {
+      if (
+        !/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(
+          this.form.idCardNo
+        )
+      ) {
         this.$toast.fail("请输入正确的身份证号");
         return;
       }
-      if(!/^[a-zA-Z\u4e00-\u9fa5]+$/.test(this.form.name)){
-          this.$toast.fail("姓名仅支持中文或英文");
-          return;
+      if (!/^[a-zA-Z\u4e00-\u9fa5]+$/.test(this.form.name)) {
+        this.$toast.fail("姓名仅支持中文或英文");
+        return;
       }
       const params = this.form;
       if (this.form.id) {
diff --git a/H5/src/views/cashOut/cash-out.vue b/H5/src/views/cashOut/cash-out.vue
index 2fb636d..c4624ef 100644
--- a/H5/src/views/cashOut/cash-out.vue
+++ b/H5/src/views/cashOut/cash-out.vue
@@ -246,7 +246,7 @@ export default {
       const params = {
         code: this.validCode,
         money: this.money,
-        userId:JSON.parse(localStorage.getItem("user")).userId
+        userId: JSON.parse(localStorage.getItem("user")).userId
       };
       cashOut(params)
         .then(res => {
diff --git a/H5/src/views/customer-service.vue b/H5/src/views/customer-service.vue
index 483ac12..c4a1429 100644
--- a/H5/src/views/customer-service.vue
+++ b/H5/src/views/customer-service.vue
@@ -16,9 +16,9 @@
         <div class="save-code">
           <p>保存二维码</p>
           <p>打开微信扫一扫添加客服</p>
-          <p>请截图保存！</p>
+          <!-- <p>请截图保存！</p> -->
         </div>
-        <!-- <van-button>保存</van-button> -->
+        <van-button @click="onSave">保存</van-button>
       </div>
     </div>
   </div>
@@ -39,6 +39,10 @@ export default {
   },
   mounted() {},
   methods: {
+    onSave() {
+      const url = this.imageUrl;
+      this.$bridgeToAppFun.saveImage(url);
+    },
     handlerBack() {
       try {
         this.$bridgeToAppFun.navigateBack();
diff --git a/H5/vue.config.js b/H5/vue.config.js
index a063a79..e3e268e 100644
--- a/H5/vue.config.js
+++ b/H5/vue.config.js
@@ -4,7 +4,7 @@ const name = "西田森App";
 
 module.exports = {
   publicPath: "/front",
-  // outputDir: "front",
+  outputDir: "front",
   devServer: {
     proxy: {
       '/shop-mall': {
-- 
2.18.1