Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/pintuan/pintuanActive.vue

@@ -826,11 +826,21 @@
             }
           })
         }
-        console.log("this.addMsg.GroupList", this.addMsg.GroupList);
       },
       //获取会员价列表
       getMemberList(memberList) {
-        console.log("this.addMsg.member", memberList);
+          console.log("memberList",memberList);
+        if (this.addMsg.GroupList && this.addMsg.GroupList.length > 0) {
+          this.addMsg.GroupList.forEach(item => {
+            if (memberList && memberList.length > 0) {
+              memberList.forEach(subItem => {
+                if (item.People_Num == subItem.People_Num) {
+                  item.MemberpriceList = subItem.GradeMemberList
+                }
+              })
+            }
+          })
+        }
       }
     }
   };

src/components/pintuan/pintuanPlugin/memberPrice.vue

@@ -74,11 +74,27 @@
         memberList: [], //列表数据
       };
     },
-     watch: {
+    watch: {
       'SpecificationPriceList': {
+        immediate: true,
         handler: function (val, oldval) {
           if (val != oldval) {
-            this.memberChange()
+            this.memberList = [];
+            if (this.SpecificationPriceList && this.SpecificationPriceList.length > 0) {
+              if (this.SpecificationPriceList[0].MemberpriceList && this.SpecificationPriceList[0]
+                .MemberpriceList.length > 0) {
+                this.SpecificationPriceList.forEach(item => {
+                  var obj = {
+                    People_Num: item.People_Num,
+                    GradeMemberList: item.MemberpriceList,
+                  };
+                  this.memberList.push(obj);
+                })
+
+              } else {
+                this.memberChange();
+              }
+            }
           }
         }
       },
@@ -144,4 +160,5 @@
       this.getConfigMemberList();
     }
   };
-</script>
\ No newline at end of file
+
+</script>