谢杰标 3 лет назад
Родитель
Сommit
7cf8f0c03e
4 измененных файлов с 16 добавлено и 16 удалено
  1. 0 7
      common/wechat.js
  2. 12 2
      pages/bill/index.vue
  3. 2 0
      pages/cashout/record.vue
  4. 2 7
      pages/login/register.vue

+ 0 - 7
common/wechat.js

@@ -25,13 +25,6 @@ export default {
         signature: result.signature,
         jsApiList: this.jsApiList,
       });
-      // jweixin.checkJsApi({
-      //   jsApiList: this.jsApiList,
-      //   success: function (res) {
-      //     console.log(res, 7897);
-      //   },
-      // });
-      //配置完成后,再执行分享等功能
       if (callback) {
         callback(result);
       }

+ 12 - 2
pages/bill/index.vue

@@ -59,8 +59,11 @@ export default {
     uni.setStorageSync("BillHerf", window.location.href);
   },
   onShow() {
+    this.backUrl();
     backOpenId(this.login);
-    // authorize();
+    if (uni.getSystemInfoSync().platform != "ios") {
+      authorize();
+    }
     this.getSharePoster();
   },
   components: {
@@ -122,7 +125,7 @@ export default {
           title: this.billDetail.activityName,
           desc: data.advertise.name,
           imgUrl: this.$method.splitImgHost(data.goods.name),
-          link: window.location.href,
+          link: this.backUrl(),
         })
         .then((res) => {
           this.$method.isLogin() && this.bindLink();
@@ -134,6 +137,13 @@ export default {
         this.$store.dispatch("getUserInfo");
       });
     },
+    backUrl() {
+      let url = window.location.href;
+      if (url.includes("&code")) {
+        url = url.split("&code")[0];
+      }
+      return url;
+    },
   },
 };
 </script>

+ 2 - 0
pages/cashout/record.vue

@@ -22,6 +22,8 @@
               "二审通过",
               "三审通过",
               "已打款",
+              "打款中",
+              "打款失败"
             ][item.cwStatus + 2]
           }}
         </view>

+ 2 - 7
pages/login/register.vue

@@ -66,12 +66,8 @@
 
 <script>
 import { encryptor } from "@/common/jse";
-import {
-  registerUser,
-  registerSms,
-  accountLogin,
-  OfficialLogin,
-} from "@/utils/login";
+import { registerUser, registerSms, accountLogin } from "@/utils/login";
+import { OfficialLogin } from "@/utils/user";
 import { authorize, backOpenId } from "@/common/authorize";
 export default {
   data() {
@@ -159,7 +155,6 @@ export default {
                 content: "注册成功",
                 showCancel: false,
                 success: (resst) => {
-                  backCode();
                   accountLogin({
                     account: this.form.tel,
                     pwd: encryptor(this.form.pwd),