diff --git a/App.vue b/App.vue index 95abc2e7..5337dffd 100644 --- a/App.vue +++ b/App.vue @@ -168,9 +168,12 @@ // 获取位置选择缓存key cache_userlocation_key: 'cache_userlocation_key', - // 地区选择缓存key + // 地区组件选择缓存key cache_region_picker_choice_key: 'cache_region_picker_choice_key', + // 时间组件选择缓存key + cache_time_select_choice_key: 'cache_time_select_choice_key', + // 页面支付临时缓存key cache_page_pay_key: 'cache_page_pay_key', diff --git a/manifest.json b/manifest.json index c8d9a6ec..444c50b2 100644 --- a/manifest.json +++ b/manifest.json @@ -186,19 +186,18 @@ } }, "__usePrivacyCheck__" : true, - "plugins" : { - // 腾讯地图路线规划插件(需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件,教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a) - // "routePlan" : { - // "version" : "1.0.19", - // "provider" : "wx50b5593e81dd937a" - // }, - // 直播(需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件,教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370) - // "live-player-plugin" : { - // "version" : "1.3.5", - // "provider" : "wx2b03c6e691cd7370" - // } - } + "plugins" : {} }, + // 腾讯地图路线规划插件(需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件,教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a) + // "routePlan" : { + // "version" : "1.0.19", + // "provider" : "wx50b5593e81dd937a" + // }, + // 直播(需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件,教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370) + // "live-player-plugin" : { + // "version" : "1.3.5", + // "provider" : "wx2b03c6e691cd7370" + // } "mp-alipay" : { "usingComponents" : true, "appid" : "2021001173639600" diff --git a/pages.json b/pages.json index 5bcef530..5c979c62 100644 --- a/pages.json +++ b/pages.json @@ -673,7 +673,13 @@ "path": "buy/buy", "style": { "enablePullDownRefresh": true, - "navigationBarTitleText": "" + "navigationBarTitleText": "", + "usingComponents": { + "component-time-select": "/pages/common/components/time-select/time-select" + }, + "componentPlaceholder": { + "component-time-select": "view" + } } }, { diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index a191113c..c6a2317e 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -360,7 +360,7 @@ import componentCommon from '@/components/common/common'; import componentPopup from '@/components/popup/popup'; import componentNoData from '@/components/no-data/no-data'; - import componentTimeSelect from '@/components/time-select/time-select'; + import componentTimeSelect from '@/pages/common/components/time-select/time-select'; import componentPayment from '@/components/payment/payment'; import componentBuyOrdergoodsform from '@/pages/plugins/ordergoodsform/components/buy-ordergoodsform/buy-ordergoodsform'; @@ -1201,11 +1201,12 @@ }, // 下单选择时间 - buy_datetime_event(e) { - var temp = this.buy_datetime_info; + buy_datetime_event() { + let data = uni.getStorageSync(app.globalData.data.cache_time_select_choice_key) || ''; + let temp = this.buy_datetime_info; temp['status'] = !temp.status; - if (e != 'open' && e != 'close') { - temp['value'] = ((e || null) != null ? e.value : '') || ''; + if (data != 'open' && data != 'close') { + temp['value'] = ((data || null) != null ? data.value : '') || ''; } this.setData({ buy_datetime_info: temp, diff --git a/pages/common/components/region-picker/region-picker.vue b/pages/common/components/region-picker/region-picker.vue index a2ef3f8c..1df82b71 100644 --- a/pages/common/components/region-picker/region-picker.vue +++ b/pages/common/components/region-picker/region-picker.vue @@ -201,7 +201,7 @@ export default { this.$emit("onclose", false); }, //提交按钮 - sub_ragion_event(e) { + sub_ragion_event() { let province = this.columns[0][this.columns_index[0]]; let city = this.columns[1][this.columns_index[1]]; let areal = this.columns[2][this.columns_index[2]]; @@ -211,8 +211,8 @@ export default { areal: areal }); this.popup_close_event(); - this.$emit("call-back"); - }, + this.$emit("callBackEvent"); + } }, }; diff --git a/components/time-select/time-select.vue b/pages/common/components/time-select/time-select.vue similarity index 99% rename from components/time-select/time-select.vue rename to pages/common/components/time-select/time-select.vue index 66d52699..a14f47f2 100644 --- a/components/time-select/time-select.vue +++ b/pages/common/components/time-select/time-select.vue @@ -33,6 +33,21 @@