更新价格提示优化

ghsPad/src/pages/home/cash.vue

@@ -25,17 +25,14 @@
 			</view>
 		</view>
 
-	</template>
-
-	<uni-popup ref="refrshRef" type="dialog">
-		<view style="width:60vw;height:70vh;background-color: white;padding:70upx 20upx 0 20upx;">
-			<view style="margin-bottom:40upx;text-align: center;font-size:24upx;">花材价格已修改，请刷新页面</view>
-			<view style="text-align:center;">
-				<button class="admin-button-com mini-btn default" @click="cancelRefresh">取消</button>
-				<button class="admin-button-com mini-btn default" @click="confirmRefresh" style="margin-left:30upx;">确认</button>
-			</view>
+		<view style="display: flex;align-items: center;justify-content: center;width:50vw;height:60upx;
+		background-color: white;color:black;position: absolute;bottom:0upx;border:1upx solid #CCCCCC;left:35vw;font-size:24upx;z-index:80;" v-if="mustUpdate">
+		花材价格已更新，请
+		<button class="admin-button-com mini-btn" @click="confirmRefresh" style="font-size:20upx;margin-left:10upx;margin-right:16upx;">刷新</button>
+		<text @click="cancelRefresh">x</text>
 		</view>
-	</uni-popup>
+
+	</template>
 
     <uni-popup ref="myCustomRef" background-color="#fff" type="center" :animation="false">
         <customerList @fastCreate="fastCreate" :myCustomList.sync="myCustomList" @confirmCustom="confirmCustom" @cancelChoose="cancelChoose">
@@ -77,7 +74,8 @@ export default {
             currentJobId:0,
 			hasChooseCustomer:true,
 			T:null,
-			myCustomList:[]
+			myCustomList:[],
+			mustUpdate:false
 		}
 	},
 	computed: {
@@ -167,6 +165,7 @@ export default {
 			this.customName = '快捷开单'
 			//要调用rightItemRef里的方法更新，不能这边直接请求product.js里方法更新，因为会造成扫码那块出问题，识别不到，关键词scan_right_item
 			this.$refs.rightItemRef.refreshMyRightItem(this.customId)
+			this.mustUpdate = false
 		},
 		showCustomPop(){
 			this.$refs.myCustomRef.open('top')
@@ -180,8 +179,10 @@ export default {
 			this.customName = info.name
 			//要调用rightItemRef里的方法更新，不能这边直接请求product.js里方法更新，因为会造成扫码那块出问题，识别不到，关键词scan_right_item
 			this.$refs.rightItemRef.refreshMyRightItem(this.customId)
+			this.mustUpdate = false
 		},
 		cancelRefresh(){
+			this.mustUpdate = false
 			this.beginRemind()
 		},
 		confirmRefresh(){
@@ -196,7 +197,7 @@ export default {
 					if(res.code == 1){
 						if(res.data.remind && res.data.remind == 1){
 							clearInterval(that.T)
-							that.$refs.refrshRef.open('center')
+							that.mustUpdate = true
 						}
 					}
 				})
@@ -208,6 +209,7 @@ export default {
 			//要调用rightItemRef里的方法更新，不能这边直接请求product.js里方法更新，因为会造成扫码那块出问题，识别不到，关键词scan_right_item
 			this.$refs.rightItemRef.refreshMyRightItem(this.customId)
 			this.getCustomData()
+			this.mustUpdate = false
 			//世纪花都、龙岩小林鲜花要自动弹出客户列表，多个地方要同步修改，关键词sj_pop_auto
 			if(this.getLoginInfo.shopId==30300 || this.getLoginInfo.shopId==15007){
 				this.showCustomPop()

hdPad/src/pages/home/cash.vue

@@ -28,18 +28,14 @@
 			</view>
 		</view>
 
-	</template>
-
-
-	<uni-popup ref="refrshRef" type="dialog">
-		<view style="width:60vw;height:70vh;background-color: white;padding:70upx 20upx 0 20upx;">
-			<view style="margin-bottom:40upx;text-align: center;font-size:24upx;">花材价格已修改，请刷新页面</view>
-			<view style="text-align:center;">
-				<button class="admin-button-com mini-btn default" @click="cancelRefresh">取消</button>
-				<button class="admin-button-com mini-btn default" @click="confirmRefresh" style="margin-left:30upx;">确认</button>
-			</view>
+		<view style="display: flex;align-items: center;justify-content: center;width:50vw;height:60upx;
+		background-color: white;color:black;position: absolute;bottom:0upx;border:1upx solid #CCCCCC;left:35vw;font-size:24upx;z-index:80;" v-if="mustUpdate">
+		花材价格已更新，请
+		<button class="admin-button-com mini-btn" @click="confirmRefresh" style="font-size:20upx;margin-left:10upx;margin-right:16upx;">刷新</button>
+		<text @click="cancelRefresh">x</text>
 		</view>
-	</uni-popup>
+
+	</template>
 
 
 	<uni-popup ref="myCustomRef" background-color="#fff" type="center" :animation="false">
@@ -83,7 +79,8 @@ export default {
 			hasChooseCustomer:true,
 			T:null,
 			customerInfo:{hasSelect:0,customId:0,customName:''},
-			myCustomList:[]
+			myCustomList:[],
+			mustUpdate:false
 		}
 	},
 	computed: {
@@ -148,6 +145,7 @@ export default {
 			this.customId = this.getMyShopInfo.defaultCustomId && this.getMyShopInfo.defaultCustomId > 0 ? Number(this.getMyShopInfo.defaultCustomId):0
 			this.customName = '快捷开单'
 			this.$refs.rightItemRef.renewMyRightItem(this.customId)
+			this.mustUpdate = false
 		},
 		init(){
 			//这个页面有二个这方法，不能去掉，不然会造成：全部缓存清了，点选客没有客户可选
@@ -175,8 +173,10 @@ export default {
 			this.customId = Number(info.id)
 			this.customName = info.name
 			this.$refs.rightItemRef.renewMyRightItem(this.customId)
+			this.mustUpdate = false
 		},
 		cancelRefresh(){
+			this.mustUpdate = false
 			this.beginRemind()
 		},
 		confirmRefresh(){
@@ -191,7 +191,7 @@ export default {
 					if(res.code == 1){
 						if(res.data.remind && res.data.remind == 1){
 							clearInterval(that.T)
-							that.$refs.refrshRef.open('center')
+							that.mustUpdate = true
 						}
 					}
 				})
@@ -203,6 +203,7 @@ export default {
 			//要调用rightItemRef里的方法更新，不能这边直接请求product.js里方法更新，因为会造成扫码那块出问题，识别不到，关键词hzg_scan_right_item
 			this.$refs.rightItemRef.renewMyRightItem(this.customId)
 			this.getCustomData()
+			this.mustUpdate = false
 		},
 		changeProperty(property){
 			this.currentProperty = property