Merge branch 'master' into ls

ghsPad/src/pages/home/cash.vue

@@ -105,6 +105,11 @@ export default {
 			if(this.getLoginInfo.skCustomId && this.getLoginInfo.skCustomId>0){
 				this.customId = this.getLoginInfo.skCustomId
 				this.customName = '快捷开单'
+				//世纪花都要自动弹出客户列表，多个地方要同步修改，关键词sj_pop_auto
+				if(this.getLoginInfo.shopId==30300 || this.getLoginInfo.shopId==3){
+					this.showCustomPop()
+				}
+
 			}
 		}
 	},
@@ -129,6 +134,10 @@ export default {
 					if(newValue.skCustomId && newValue.skCustomId>0){
 						this.customId = newValue.skCustomId
 						this.customName = '快捷开单'
+						//世纪花都要自动弹出客户列表，多个地方要同步修改，关键词sj_pop_auto
+						if(newValue.shopId==30300 || newValue.shopId==3){
+							this.showCustomPop()
+						}
 					}
 
 
@@ -201,6 +210,10 @@ export default {
 			//要调用rightItemRef里的方法更新，不能这边直接请求product.js里方法更新，因为会造成扫码那块出问题，识别不到，关键词scan_right_item
 			this.$refs.rightItemRef.refreshMyRightItem(this.customId)
 			this.getCustomData()
+			//世纪花都要自动弹出客户列表，多个地方要同步修改，关键词sj_pop_auto
+			if(this.getLoginInfo.shopId==30300 || this.getLoginInfo.shopId==3){
+				this.showCustomPop()
+			}
 		},
 		changeProperty(property){
 			this.currentProperty = property