Merge branch 'master' into dev

qianzhu-KFC/menu-list/menu-list.vue

@@ -353,12 +353,25 @@
 			showPopup(item) {
 				this.nums = 1;
 				this.cbkchangelist = item;
-				this.salesTallPrice = item.salesTallPrice;
+				
-				app.globalData.salesTallPrice = item.salesTallPrice;
-				this.marketTallPrice = item.marketTallPrice;
 				if (item.cupSize) {
 					this.cupSize = item.cupSize.split(',');
-					this.cupSizeid = this.cupSize[0];
+					this.cupSizeid = this.cupSize[0];
+					if (this.cupSizeid  == '中杯') {
+						this.salesTallPrice = this.cbkchangelist.salesTallPrice;
+						app.globalData.salesTallPrice = this.cbkchangelist.salesTallPrice;
+						this.marketTallPrice = this.cbkchangelist.marketTallPrice;
+					}
+					if (this.cupSizeid  == '大杯') {
+						this.salesTallPrice = this.cbkchangelist.salesGrandePrice;
+						app.globalData.salesTallPrice = this.cbkchangelist.salesGrandePrice;
+						this.marketTallPrice = this.cbkchangelist.marketGrandePrice;
+					}
+					if (this.cupSizeid  == '超大杯') {
+						this.salesTallPrice = this.cbkchangelist.salesVentiPrice;
+						app.globalData.salesTallPrice = this.cbkchangelist.salesVentiPrice;
+						this.marketTallPrice = this.cbkchangelist.marketVentiPrice;
+					}
 				}
 				if (item.temperature) {
 					this.temperature = item.temperature.split(',');