Merge branch 'dev_1.0.0' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into dwb

components/my-components/my-date-pickerview.vue

@@ -487,7 +487,9 @@
 		const endTotal = returnDateString(e.detail.value, true).getTime()
 		value1.value = e.detail.value
 		nextTick(() => {
-			value1.value = endTotal < startTotal ? value.value : e.detail.value
+			if (props.isArea) {
+				value1.value = endTotal < startTotal ? value.value : e.detail.value
+			}
 			debounce(changeDays(true, value1.value), 100)
 		})
 	}
@@ -521,7 +523,7 @@
 	}
 
 	function nullFunction() {
-
+	
 	}
 
 	function pickend(e) {

pages.json

@@ -875,6 +875,13 @@
 					"style": {
 						"navigationBarTitleText": "退款"
 					}
+				},
+				{
+					"path" : "quan/quan",
+					"style" : 
+					{
+						"navigationBarTitleText" : "券包"
+					}
 				}
 
 			]

pagesOrder/quan/quan.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>