Merge remote-tracking branch 'origin/sj-dev-v7' into wxl-develop

e892006a · wangxuelai · 006a2905 · 09c13661 · e892006a · e892006a
Commit e892006a authored Sep 28, 2019 by wangxuelai
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

taggedpicture.js business/pages/commenteditor/taggedpicture.js +0 -1

index.js src/pages/websiteindex/index.js +3 -2

No files found.
--- a/business/pages/commenteditor/taggedpicture.js
+++ b/business/pages/commenteditor/taggedpicture.js
@@ -580,7 +580,6 @@ Page({
      }
  },
  drawText(obj,ctx) {
-    // ctx.save();
    ctx.setFillStyle(obj.color);
    ctx.setFontSize(obj.size);
    ctx.setTextAlign(obj.align);

--- a/src/pages/websiteindex/index.js
+++ b/src/pages/websiteindex/index.js
@@ -643,11 +643,12 @@ Page({
            desc: '机构介绍',
          }, ];
        }else{
+          this.schoolInfoGet()
          this.setData({
            websitehomeEmpty:true,
-            bannerEmpty: data.banner ? false :true
+            bannerEmpty: data && data.banner ? false : true
          })
-          this.schoolInfoGet()
+          
        }
        this.setData({
          schoolInfo: data ? data : '',