提交

src/views/Apply.vue

@@ -99,17 +99,17 @@ import "vant/lib/field/style/index";
 import "vant/lib/button/style/index";
 import "vant/lib/popup/style/index";
 import "vant/lib/picker/style/index";
-// import { urlSearchData } from "../utils/tool";
-// import {
-//   getAPPUser,
-//   apply,
-//   getAPPToken,
-//   getAPPUserDetail,
-//   goodsList,
-//   applyrang,
-// } from "../api/index";
-import { goodsList, apply, applyrang } from "../api/index";
-import { isIphone, isAndroid } from "@/utils/isTerminal.js";
+import { urlSearchData } from "../utils/tool";
+import {
+  getAPPUser,
+  apply,
+  getAPPToken,
+  getAPPUserDetail,
+  goodsList,
+  applyrang,
+} from "../api/index";
+// import { goodsList, apply, applyrang } from "../api/index";
+// import { isIphone, isAndroid } from "@/utils/isTerminal.js";
 
 export default {
   name: "Apply",
@@ -133,107 +133,107 @@ export default {
     };
   },
   mounted() {
-    // let search = urlSearchData(),
-    //   that = this;
-    // if (!search.ticket) return;
-    // getAPPUser({
-    //   ticket: search.ticket,
-    // }).then(r => {
-    //   getAPPToken("rest/63bada00-7d01-4acc-ab2b-df8061eeeb8f").then(res => {
-    //     const t = JSON.parse(res || "{}");
-    //     localStorage.token = t.id;
-    //     getAPPUserDetail({
-    //       loginName: r,
-    //     }).then(detail => {
-    //       const obj = JSON.parse(detail || "{}");
-    //       that.userphone = obj.telNumber;
-    //       that.username = obj.name;
-    //       goodsList({
-    //         userPhone: that.userphone || "",
-    //       }).then(res => {
-    //         this.goodsLi = (res || []).map(v => {
-    //           v.name = v.name + "(" + v.price + "元)";
-    //           return v;
-    //         });
-    //         this.radio = (this.goodsLi[0] || {}).id;
-    //       });
-    //       applyrang().then(res => {
-    //         let l = res || [],
-    //           nl = [],
-    //           o = {};
-    //         for (let i = 0; i < l.length; i++) {
-    //           const v = l[i];
-    //           if (v.isOrder === 1) continue;
-    //           let keys = v.startTime.split(" "),
-    //             key = keys[0],
-    //             val = keys[1];
-    //           v.startTime = val.replace(/:00$/, "");
-    //           if (o[key] >= 0) {
-    //             nl[o[key]].children.push(v);
-    //           } else {
-    //             o[key] = nl.length;
-    //             nl[o[key]] = {
-    //               startTime: key,
-    //               children: [v],
-    //             };
-    //           }
-    //         }
-    //         this.tagList = nl;
-    //       });
-    //     });
-    //   });
-    // });
-    window.voteNext = () => {
-      let user = "";
-      var payload = {
-        type: "JSbridge",
-        functionName: "getUserInfo",
-        arguments: {},
-      };
-      if (isAndroid && window.H5Listener && window.H5Listener.getUserInfo)
-        user = window.H5Listener.getUserInfo();
-      if (isIphone) user = window.prompt(JSON.stringify(payload));
-      user && (user = JSON.parse(user || "{}"));
-      this.userphone = user.phone || "";
-      this.username = user.realName || "";
-      if (!this.userphone) {
-        if (isAndroid && window.H5Listener && window.H5Listener.getUserInfo)
-          window.H5Listener.doLogin();
-        if (isIphone && window.webkit && window.webkit.messageHandlers)
-          window.webkit.messageHandlers.doLogin.postMessage("{}");
-      }
-      goodsList().then(res => {
-        this.goodsLi = (res || []).map(v => {
-          v.name = v.name + "(" + v.price + "元)";
-          return v;
+    let search = urlSearchData(),
+      that = this;
+    if (!search.ticket) return;
+    getAPPUser({
+      ticket: search.ticket,
+    }).then(r => {
+      getAPPToken("rest/63bada00-7d01-4acc-ab2b-df8061eeeb8f").then(res => {
+        const t = JSON.parse(res || "{}");
+        localStorage.token = t.id;
+        getAPPUserDetail({
+          loginName: r,
+        }).then(detail => {
+          const obj = JSON.parse(detail || "{}");
+          that.userphone = obj.telNumber;
+          that.username = obj.name;
+          goodsList({
+            userPhone: that.userphone || "",
+          }).then(res => {
+            this.goodsLi = (res || []).map(v => {
+              v.name = v.name + "(" + v.price + "元)";
+              return v;
+            });
+            this.radio = (this.goodsLi[0] || {}).id;
+          });
+          applyrang().then(res => {
+            let l = res || [],
+              nl = [],
+              o = {};
+            for (let i = 0; i < l.length; i++) {
+              const v = l[i];
+              if (v.isOrder === 1) continue;
+              let keys = v.startTime.split(" "),
+                key = keys[0],
+                val = keys[1];
+              v.startTime = val.replace(/:00$/, "");
+              if (o[key] >= 0) {
+                nl[o[key]].children.push(v);
+              } else {
+                o[key] = nl.length;
+                nl[o[key]] = {
+                  startTime: key,
+                  children: [v],
+                };
+              }
+            }
+            this.tagList = nl;
+          });
         });
-        this.radio = (this.goodsLi[0] || {}).id;
-      });
-      applyrang().then(res => {
-        let l = res || [],
-          nl = [],
-          o = {};
-        for (let i = 0; i < l.length; i++) {
-          const v = l[i];
-          if (v.isOrder === 1) continue;
-          let keys = v.startTime.split(" "),
-            key = keys[0],
-            val = keys[1];
-          v.startTime = val.replace(/:00$/, "");
-          if (o[key] >= 0) {
-            nl[o[key]].children.push(v);
-          } else {
-            o[key] = nl.length;
-            nl[o[key]] = {
-              startTime: key,
-              children: [v],
-            };
-          }
-        }
-        this.tagList = nl;
       });
-    };
-    window.voteNext();
+    });
+    // window.voteNext = () => {
+    //   let user = "";
+    //   var payload = {
+    //     type: "JSbridge",
+    //     functionName: "getUserInfo",
+    //     arguments: {},
+    //   };
+    //   if (isAndroid && window.H5Listener && window.H5Listener.getUserInfo)
+    //     user = window.H5Listener.getUserInfo();
+    //   if (isIphone) user = window.prompt(JSON.stringify(payload));
+    //   user && (user = JSON.parse(user || "{}"));
+    //   this.userphone = user.phone || "";
+    //   this.username = user.realName || "";
+    //   if (!this.userphone) {
+    //     if (isAndroid && window.H5Listener && window.H5Listener.getUserInfo)
+    //       window.H5Listener.doLogin();
+    //     if (isIphone && window.webkit && window.webkit.messageHandlers)
+    //       window.webkit.messageHandlers.doLogin.postMessage("{}");
+    //   }
+    //   goodsList().then(res => {
+    //     this.goodsLi = (res || []).map(v => {
+    //       v.name = v.name + "(" + v.price + "元)";
+    //       return v;
+    //     });
+    //     this.radio = (this.goodsLi[0] || {}).id;
+    //   });
+    //   applyrang().then(res => {
+    //     let l = res || [],
+    //       nl = [],
+    //       o = {};
+    //     for (let i = 0; i < l.length; i++) {
+    //       const v = l[i];
+    //       if (v.isOrder === 1) continue;
+    //       let keys = v.startTime.split(" "),
+    //         key = keys[0],
+    //         val = keys[1];
+    //       v.startTime = val.replace(/:00$/, "");
+    //       if (o[key] >= 0) {
+    //         nl[o[key]].children.push(v);
+    //       } else {
+    //         o[key] = nl.length;
+    //         nl[o[key]] = {
+    //           startTime: key,
+    //           children: [v],
+    //         };
+    //       }
+    //     }
+    //     this.tagList = nl;
+    //   });
+    // };
+    // window.voteNext();
   },
   computed: {
     selectTime() {

src/views/ranking/index.vue

@@ -11,7 +11,6 @@
         </div>
       </van-nav-bar>
     </van-sticky>
-    <a href="tel:18706867629" >18706867629</a>
     <div v-show="errorInformation.text === ''">
       <keep-alive>
         <component