Merge branch 'dev-market-20200813' into 'release'

地区回显优化



See merge request !211

src/components/shop/send-set-dialog.vue

@@ -164,6 +164,9 @@
               }else if (this.dialogTitle == '配送设置') {
                 para.type = 2;
               }
+              if (para.orderNo) {
+                para.id = para.orderNo;
+              }
               updateExpress(para).then(res => {
                 if (res.code == '000000') {
                   this.$message.success('操作成功')

src/views/patients/mypatients-manage/components/edit-information.vue

@@ -354,6 +354,8 @@
           lazyLoad(node, resolve) {
             const { level } = node;
             console.log("node", node);
+            //初始化时，把children置为空，解决回显数据会重复问题
+            node.children = [];
             if (node.level == 1) {
               let req = {
                 provinceId: node.data.id