刷新

ghsPad/src/pages/home/cash.vue

@@ -27,9 +27,15 @@
 
 	</template>
 
-    <uni-popup ref="refrshRef" type="dialog">
-        <uni-popup-dialog type="info" cancelText="取消" @close="cancelRefresh" confirmText="确认" title="提示" content="花材价格已修改，请刷新" @confirm="confirmRefresh"></uni-popup-dialog>
-    </uni-popup>
+	<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>
+	</uni-popup>
 
     <uni-popup ref="myCustomRef" background-color="#fff" type="center" :animation="false">
         <customerList @fastCreate="fastCreate" :myCustomList.sync="myCustomList" @confirmCustom="confirmCustom" @cancelChoose="cancelChoose">

ghsPad/src/pages/home/components/toPay.vue

@@ -139,9 +139,10 @@ export default {
             cancelOrderFn({id:this.orderId}).then(res=>{
                 if(res.code == 1){
                     that.$msg('已取消')
-                    that.$emit('cancelPay')
                 }
             })
+            //有可能订单已经是取消的状态了，再点取消就直接关闭页面，所以可以不用考虑取消动作是否成功才关闭页面
+            that.$emit('cancelPay')
         }
     }
 }

hdPad/src/pages/home/cash.vue

@@ -30,9 +30,17 @@
 
 	</template>
 
-    <uni-popup ref="refrshRef" type="dialog">
-        <uni-popup-dialog type="info" cancelText="取消" @close="cancelRefresh" confirmText="确认" title="提示" content="花材价格已修改，请刷新" @confirm="confirmRefresh"></uni-popup-dialog>
-    </uni-popup>
+
+	<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>
+	</uni-popup>
+
 
 	<uni-popup ref="myCustomRef" background-color="#fff" type="center" :animation="false">
         <customerList @fastCreate="fastCreate" :myCustomList.sync="myCustomList" @confirmCustom="confirmCustom" @cancelChoose="cancelChoose">

hdPad/src/pages/home/components/toPay.vue

@@ -141,9 +141,10 @@ export default {
             cancelOrderFn({id:this.orderId}).then(res=>{
                 if(res.code == 1){
                     that.$msg('已取消')
-                    that.$emit('cancelPay')
                 }
             })
+            //有可能订单已经是取消的状态了，再点取消就直接关闭页面，所以可以不用考虑取消动作是否成功才关闭页面
+            that.$emit('cancelPay')
         }
     }
 }