1

@@ -103,7 +103,7 @@
           </div>
           </div>
           <div class="rule-line">
           <div class="rule-line">
             <div>5.</div>
             <div>5.</div>
-            <div>报名截止时间9月19日23:59，投票截止时间9月20日23:59，最终入围名单将在9月21日在立乐家微信公众号公布</div>
+            <div>投票截止时间9月27日中午12:00，最终入围名单将在9月30日在立乐家微信公众号公布</div>
           </div>
           </div>
           <div class="rule-line">
           <div class="rule-line">
             <div>6.</div>
             <div>6.</div>

@@ -112,24 +112,32 @@ export default {
         mask: true,
         mask: true,
         message: "请稍等..."
         message: "请稍等..."
       });
       });
-      httpGet({ url: urls.index }).then(res => {
-        if (res.isSubcribe == 1) {
-          let data = {
-            worksCode: this.formData.worksCode
-          };
-          request.post(urls.praise, data).then(res => {
+      httpGet({ url: urls.index })
+        .then(res => {
+          if (res.isSubcribe == 1) {
+            let data = {
+              worksCode: this.formData.worksCode
+            };
+            request.post(urls.praise, data).then(res => {
+              Toast.clear();
+              this.$emit("praiseSuccess");
+            });
+          } else {
             Toast.clear();
             Toast.clear();
-            this.$emit("praiseSuccess");
-          });
-        } else {
+            httpGet({
+              url: urls.cache,
+              data: { worksCode: this.formData.worksCode }
+            }).then(res => {});
+            this.model.show = true;
+          }
+        })
+        .catch(res => {
+          console.log(res);
+          this.loading = false;
           Toast.clear();
           Toast.clear();
-          httpGet({
-            url: urls.cache,
-            data: { worksCode: this.formData.worksCode }
-          }).then(res => {});
-          this.model.show = true;
-        }
-      });
+          let msg = res.data && res.data.errMsg ? res.data.errMsg : "点赞失败";
+          Toast(msg);
+        });
     },
     },
     showShareHandler() {
     showShareHandler() {
       // 出现分享层
       // 出现分享层
@@ -143,7 +151,7 @@ export default {
     BizModel
     BizModel
   },
   },
   created() {
   created() {
-    console.log("created")
+    console.log("created");
     let code = this.formData.worksCode;
     let code = this.formData.worksCode;
     let link = location.origin + location.pathname;
     let link = location.origin + location.pathname;
     link += "?worksCode=" + code;
     link += "?worksCode=" + code;

@@ -222,9 +222,10 @@ export default {
           this.$emit("submit", data);
           this.$emit("submit", data);
         })
         })
         .catch(res => {
         .catch(res => {
+          console.log(res);
           this.loading = false;
           this.loading = false;
           Toast.clear();
           Toast.clear();
-          let msg = res.errMsg ? res.errMsg : "作品提交失败";
+          let msg = res.data && res.data.errMsg ? res.data.errMsg : "作品提交失败";
           Toast(msg);
           Toast(msg);
         });
         });
     }
     }

@@ -97,9 +97,8 @@ export default {
       httpGet({ url: urls.myWork }).then(res => {
       httpGet({ url: urls.myWork }).then(res => {
         // this.model.index = "submit";
         // this.model.index = "submit";
         // this.model.show = true;
         // this.model.show = true;
-
         this.init = true;
         this.init = true;
-        Toast.clear();
+        Toast.clear(true);
         this.formData = res.data || {};
         this.formData = res.data || {};
         if (!res.data) {
         if (!res.data) {
           this.formEdit = true;
           this.formEdit = true;