update

Author: zhaotoday

src/views/merchants/list/index.vue

@@ -86,7 +86,8 @@ export default class extends Vue {
           {
             title: "关联的微信用户",
             width: 130,
-            render: (h, { row }) => h("span", row.wxUser.nickName)
+            render: (h, { row }) =>
+              h("span", row.wxUser ? row.wxUser.nickName : "")
           },
           {
             title: "联系人",

src/views/orders/list/index.vue

@@ -246,7 +246,7 @@ export default class extends Vue {
       query: {
         offset: (this.listPageCurrent - 1) * this.$consts.PageSize,
         limit: this.$consts.PageSize,
-        where: this.listSearchWhere,
+        where: this.listSearchWhere || initWhere,
         include: [{ model: "WxUser", as: "wxUser" }]
       }
     });