123 3 rokov pred
rodič
commit
d0cb21caad

+ 2 - 2
App/manifest.json

@@ -2,8 +2,8 @@
     "name" : "刺兔",
     "appid" : "__UNI__509E9F1",
     "description" : "",
-    "versionName" : "1.4.0",
-    "versionCode" : 1400,
+    "versionName" : "1.6.0",
+    "versionCode" : 1600,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 24 - 22
App/pages/book/index/index.vue

@@ -10,10 +10,11 @@
 			</view> -->
 			<!-- <view slot="left" class="iconfont iconjuxing5" @click="gotoSearch"></view> -->
 			<view class="flex-n fac" style="width: 100%;" slot="title">
-				<view class="iconfont iconjuxing18kaobei" style="position: absolute;left: 30rpx;font-size: 30rpx;" @click="backtoday"></view>
+				<view class="iconfont iconjuxing18kaobei" style="position: absolute;left: 30rpx;font-size: 30rpx;"
+					@click="backtoday"></view>
 				<view @click="chooseDate(stateTab)">{{dataYearMonth}}</view>
 			</view>
-			
+
 			<view slot="right" class="iconfont iconjuxing5" style="font-size: 30rpx;" @click="gotoSearch"></view>
 		</z-navbar>
 		<!-- '列表','场地', -->
@@ -67,20 +68,20 @@
 				showtype: 'day',
 				datevalue: '',
 				stateTab: 1,
-				backState:true
+				backState: true
 			};
 		},
 		mounted() {
 			uni.hideTabBar();
-			uni.$on('saveOrder',(date)=>{
+			uni.$on('saveOrder', (date) => {
 				console.log('---------------保存訂單后跳轉回來的-------------------')
-				this.datevalue=date;
+				this.datevalue = date;
 				this.tabInfo();
 			})
-			uni.$on('switchTab',(router)=>{
-				console.log('--------------------',router,'----------------------')
-				if(router=='book/index/index')
-				this.backtoday();
+			uni.$on('switchTab', (router) => {
+				console.log('--------------------', router, '----------------------')
+				if (router == 'book/index/index')
+					this.backtoday();
 			})
 			this.backtoday();
 		},
@@ -106,7 +107,7 @@
 				});
 			},
 			onConfirm(e) {
-				console.log('-------',e,'-------')
+				console.log('-------', e, '-------')
 				this.datevalue = e.value;
 				this.tabInfo();
 			},
@@ -126,32 +127,33 @@
 				console.warn(this.datevalue)
 				var a = this.datevalue.split("-");
 				this.dataYearMonth = a[0] + '.' + a[1];
-					this.$nextTick(() => {
-						console.log(this.datevalue)
-				if (this.stateTab == 0) { //日
-						
+				setTimeout(() => {
+					console.log('???', this.datevalue)
+					if (this.stateTab == 0) { //日
+
 						if (this.$refs.day)
 							this.$refs.day.getDate(this.datevalue);
-				}
-				if (this.stateTab == 1) { //月
-				
+					}
+					if (this.stateTab == 1) { //月
+
 						if (this.$refs.month)
 							this.$refs.month.getDate(this.datevalue);
-				
 
-				}
-					})
+
+					}
+				},0)
 			},
 			changeTabs(idx) {
 				console.log(idx, this.datevalue)
 				this.stateTab = idx;
 				this.tabInfo();
 			},
-			backtoday(){
+			backtoday() {
 				let date = new Date();
 				let month = date.getMonth() + 1;
 				let day = date.getDate()
-				this.datevalue = date.getFullYear() + '-' + (month > 9 ? month : ('0' + month)) + '-' + (day > 9 ? day : ('0' +
+				this.datevalue = date.getFullYear() + '-' + (month > 9 ? month : ('0' + month)) + '-' + (day > 9 ? day : (
+					'0' +
 					day));
 				this.tabInfo();
 			},

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
App/unpackage/dist/build/app-plus/app-service.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
App/unpackage/dist/build/app-plus/app-view.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
App/unpackage/dist/build/app-plus/manifest.json


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1 - 1
App/unpackage/dist/dev/app-plus/app-config-service.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
App/unpackage/dist/dev/app-plus/app-service.js


+ 144 - 23
App/unpackage/dist/dev/app-plus/app-view.js

@@ -10253,6 +10253,16 @@ var render = function() {
                               },
                               [_vm._v(_vm._$g("16-" + $32, "t0-0"))]
                             )
+                          : _vm._e(),
+                        _vm._$g("17-" + $32, "i")
+                          ? _c(
+                              "uni-view",
+                              {
+                                staticClass: _vm._$g("17-" + $32, "sc"),
+                                attrs: { _i: "17-" + $32 }
+                              },
+                              [_vm._v(_vm._$g("17-" + $32, "t0-0"))]
+                            )
                           : _vm._e()
                       ],
                       1
@@ -10267,7 +10277,7 @@ var render = function() {
         ],
         1
       ),
-      _c("u-toast", { ref: "uToast", attrs: { _i: 17 } })
+      _c("u-toast", { ref: "uToast", attrs: { _i: 18 } })
     ],
     1
   )
@@ -10890,7 +10900,7 @@ var render = function() {
                               staticClass: _vm._$g("23-" + $31, "sc"),
                               attrs: { _i: "23-" + $31 }
                             },
-                            [_vm._v("初一")]
+                            [_vm._v(_vm._$g("23-" + $31, "t0-0"))]
                           )
                         ],
                         1
@@ -10957,7 +10967,7 @@ var render = function() {
                               staticClass: _vm._$g("31-" + $32, "sc"),
                               attrs: { _i: "31-" + $32 }
                             },
-                            [_vm._v("初一")]
+                            [_vm._v(_vm._$g("31-" + $32, "t0-0"))]
                           )
                         ],
                         1
@@ -13710,16 +13720,12 @@ var render = function() {
           ),
           _c(
             "v-uni-scroll-view",
-            { attrs: { "scroll-y": true, _i: 6 } },
-            [
-              _c(
-                "uni-view",
-                { staticClass: _vm._$g(7, "sc"), attrs: { _i: 7 } },
-                [_vm._t("default", null, { _i: 8 })],
-                2
-              )
-            ],
-            1
+            {
+              staticClass: _vm._$g(6, "sc"),
+              attrs: { "scroll-y": true, _i: 6 }
+            },
+            [_vm._t("default", null, { _i: 7 })],
+            2
           )
         ],
         1
@@ -18551,11 +18557,100 @@ var render = function() {
             ],
             1
           ),
+          _c(
+            "uni-view",
+            { staticClass: _vm._$g(21, "sc"), attrs: { _i: 21 } },
+            [_vm._v("创建订单时间段")]
+          ),
+          _c(
+            "uni-view",
+            { staticClass: _vm._$g(22, "sc"), attrs: { _i: 22 } },
+            [
+              _c("v-uni-image", {
+                staticClass: _vm._$g(23, "sc"),
+                attrs: { src: _vm._$g(23, "a-src"), _i: 23 }
+              }),
+              _c(
+                "uni-view",
+                { staticClass: _vm._$g(24, "sc"), attrs: { _i: 24 } },
+                [
+                  _vm._$g(25, "i")
+                    ? _c(
+                        "uni-view",
+                        {
+                          staticClass: _vm._$g(25, "sc"),
+                          attrs: { _i: 25 },
+                          on: {
+                            click: function($event) {
+                              return _vm.$handleViewEvent($event)
+                            }
+                          }
+                        },
+                        [_vm._v("开始日期")]
+                      )
+                    : _c(
+                        "div",
+                        {
+                          staticClass: _vm._$g(26, "sc"),
+                          attrs: { _i: 26 },
+                          on: {
+                            click: function($event) {
+                              return _vm.$handleViewEvent($event)
+                            }
+                          }
+                        },
+                        [_vm._v(_vm._$g(26, "t0-0"))]
+                      ),
+                  _c("uni-view", { attrs: { _i: 27 } }, [_vm._v("-")]),
+                  _vm._$g(28, "i")
+                    ? _c(
+                        "uni-view",
+                        {
+                          staticClass: _vm._$g(28, "sc"),
+                          attrs: { _i: 28 },
+                          on: {
+                            click: function($event) {
+                              return _vm.$handleViewEvent($event)
+                            }
+                          }
+                        },
+                        [_vm._v("结束日期")]
+                      )
+                    : _c(
+                        "div",
+                        {
+                          staticClass: _vm._$g(29, "sc"),
+                          attrs: { _i: 29 },
+                          on: {
+                            click: function($event) {
+                              return _vm.$handleViewEvent($event)
+                            }
+                          }
+                        },
+                        [_vm._v(_vm._$g(29, "t0-0"))]
+                      )
+                ],
+                1
+              ),
+              _vm._$g(30, "i")
+                ? _c("uni-view", {
+                    staticClass: _vm._$g(30, "sc"),
+                    attrs: { _i: 30 },
+                    on: {
+                      click: function($event) {
+                        return _vm.$handleViewEvent($event)
+                      }
+                    }
+                  })
+                : _vm._e()
+            ],
+            1
+          ),
           _c(
             "uni-view",
             {
-              staticClass: _vm._$g(21, "sc"),
-              attrs: { _i: 21 },
+              staticClass: _vm._$g(31, "sc"),
+              attrs: { _i: 31 },
               on: {
                 click: function($event) {
                   return _vm.$handleViewEvent($event)
@@ -18565,35 +18660,61 @@ var render = function() {
             [_vm._v("确定")]
           ),
           _c("z-date-select", {
-            attrs: { _i: 22 },
+            attrs: { _i: 32 },
             on: {
               "update:visible": function($event) {
                 return _vm.$handleViewEvent($event)
               }
             },
             model: {
-              value: _vm._$g(22, "v-model"),
+              value: _vm._$g(32, "v-model"),
               callback: function() {},
               expression: "beginTime"
             }
           }),
           _c("z-date-select", {
-            attrs: { _i: 23 },
+            attrs: { _i: 33 },
             on: {
               "update:visible": function($event) {
                 return _vm.$handleViewEvent($event)
               }
             },
             model: {
-              value: _vm._$g(23, "v-model"),
+              value: _vm._$g(33, "v-model"),
               callback: function() {},
               expression: "endTime"
             }
+          }),
+          _c("z-date-select", {
+            attrs: { _i: 34 },
+            on: {
+              "update:visible": function($event) {
+                return _vm.$handleViewEvent($event)
+              }
+            },
+            model: {
+              value: _vm._$g(34, "v-model"),
+              callback: function() {},
+              expression: "createTimeBegin"
+            }
+          }),
+          _c("z-date-select", {
+            attrs: { _i: 35 },
+            on: {
+              "update:visible": function($event) {
+                return _vm.$handleViewEvent($event)
+              }
+            },
+            model: {
+              value: _vm._$g(35, "v-model"),
+              callback: function() {},
+              expression: "createTimeEnd"
+            }
           })
         ],
         1
       ),
-      _c("z-date-select", { attrs: { _i: 24 } })
+      _c("z-date-select", { attrs: { _i: 36 } })
     ],
     1
   )
@@ -24903,7 +25024,7 @@ var render = function() {
     [
       _c("z-navbar", { attrs: { _i: 1 } }),
       _c("w-picker", {
-        ref: "operateDate",
+        ref: "operateTime",
         attrs: { _i: 2 },
         on: {
           confirm: function($event) {
@@ -24916,7 +25037,7 @@ var render = function() {
         model: {
           value: _vm._$g(2, "v-model"),
           callback: function() {},
-          expression: "info.operateDate"
+          expression: "info.operateTime"
         }
       }),
       _c(
@@ -24936,7 +25057,7 @@ var render = function() {
                     model: {
                       value: _vm._$g(6, "v-model"),
                       callback: function() {},
-                      expression: "info.operateDate"
+                      expression: "info.operateTime"
                     }
                   })
                 ],

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
App/unpackage/dist/dev/app-plus/manifest.json


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
App/unpackage/dist/dev/app-plus/view.umd.min.js


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov