Merge remote-tracking branch 'origin/master'

src/Components/assistingAgriculture/index/Date.vue

@@ -55,6 +55,13 @@ const selectItem = (index, item) => {
     emit('dataParams', item, datePart);
   }
 };
+function timestampToDateBasic(timestamp) {
+  const date = new Date(timestamp);
+  const year = date.getFullYear();
+  const month = (date.getMonth() + 1).toString().padStart(2, '0');
+  const day = date.getDate().toString().padStart(2, '0');
+  return `${year}-${month}-${day} 00:00:00`;
+}
 const getStartDateList = () => {
   getStartDate(params).then((res) => {
     dataList.value = res.data;
@@ -64,13 +71,6 @@ function handleConfirm({ value }) {
   const datePart = timestampToDateBasic(value);
   emit('dataParams', null, datePart);
 }
-function timestampToDateBasic(timestamp) {
-  const date = new Date(timestamp);
-  const year = date.getFullYear();
-  const month = (date.getMonth() + 1).toString().padStart(2, '0');
-  const day = date.getDate().toString().padStart(2, '0');
-  return `${year}/${month}/${day}`;
-}
 </script>
 
 <style lang="scss" scoped>

src/pages.json

@@ -257,6 +257,12 @@
 				"navigationBarTitleText": "商品详情页"
 			}
 		},
+		{
+			"path": "pages/assistingAgriculture/order/refund",
+			"style": {
+				"navigationBarTitleText": "申请售后"
+			}
+		},
 		{
 			"path": "pages/assistingAgriculture/detail/comment",
 			"style": {

src/pages/assistingAgriculture/RuralTravel/specialOfferZoneList.vue

@@ -210,7 +210,7 @@ const dataParams = (item, datePart) => {
       queryOfferProdListFn();
     });
   } else {
-    params.value.dateType = 8;
+    params.value.dateType = '8';
     if (datePart && datePart !== 'NaN/NaN/NaN') {
       params.value.allocateDate = datePart;
       rotate2.value = false;