Merge branch 'test' of http://60.205.190.38:9000/zhaoheqing/ohplay_h5 into test

src/pages.json

@@ -219,6 +219,7 @@
       // 微信浏览器检测
       "path": "pages/weixin/index",
       "style": {
+        "navigationBarTitleText": "抱歉，出错了",
         "navigationStyle": "custom"
       }
     }

src/pages/activity/index.vue

@@ -50,8 +50,9 @@ export default {
         if (res.code === 0) {
           this.pic = res.data.pic;
         } else {
+          console.log("showToast" + res.message);
           uni.showToast({
-            title: res.data.message,
+            title: res.message,
             icon: "error",
             duration: 2000,
           });
@@ -68,7 +69,7 @@ export default {
           this.isShow = true;
         } else {
           uni.showToast({
-            title: res.data.message,
+            title: res.message,
             icon: "none",
             mask: true,
             duration: 2000,