js

src/views/common/wxShare.vue

@@ -62,29 +62,21 @@
         }
         }
       }
       }
     },
     },
-  //       beforeCreate(){
-  //  let href = window.location.href;
-  //   if(href.indexOf('groupmessage') > -1 || href.indexOf('singlemessage') > -1 || href.indexOf('timeline') > -1){
-  //      href = href.replace(/\?from=(groupmessage|singlemessage|timeline)(\S*)#/, '#');
-  //       window.location.replace(href);
-  //   }
-  //   },
 
 
     created() {
     created() {
       //无需登录的情况下
       //无需登录的情况下
-    if (!this.isLogin) {
+      if (!this.isLogin) {
         this.$store.dispatch({
         this.$store.dispatch({
           type: "wxShare",
           type: "wxShare",
-          current_url:location.href
+          current_url: location.href
         });
         });
-      }
-      else{
-      if (util.getCookie("Yo4teW_uid")) {
-        this.$store.dispatch({
-          type: "wxShare",
-         current_url:location.href
-        });
-      }
+      } else {
+        if (util.getCookie("Yo4teW_uid")) {
+          this.$store.dispatch({
+            type: "wxShare",
+            current_url: location.href
+          });
+        }
       }
       }
 
 
     },
     },

src/views/sample/special.vue

@@ -320,10 +320,8 @@
                 window.location.href='https://www.pcbhunt.com/pcbonline.html?BoardHeight=10&BoardWidth=10&Num=5&BoardLayers=2&BoardThickness=1.6';
                 window.location.href='https://www.pcbhunt.com/pcbonline.html?BoardHeight=10&BoardWidth=10&Num=5&BoardLayers=2&BoardThickness=1.6';
               }
               }
             } else {
             } else {
-              if(this.userSpecialInfo.has_order == 0){
-                Toast.loading({
-                  message: '您当前已申请领取了哟，请前往订单中心查看'
-                });
+              if(this.userSpecialInfo.has_order == '1'){
+                Toast('您当前已申请领取了哟，请前往订单中心查看');
               }else{
               }else{
                 this.getPops = true;
                 this.getPops = true;
               }
               }