diff --git a/components/QuickOrderEntry.vue b/components/QuickOrderEntry.vue index 7f47ae9..9472992 100644 --- a/components/QuickOrderEntry.vue +++ b/components/QuickOrderEntry.vue @@ -45,6 +45,9 @@ export default { isInitialized: false } }, + mounted() { + this.getQuickOrderInfo() + }, methods: { // 处理点击事件 handleClick() { @@ -69,6 +72,11 @@ export default { // 获取快捷下单的信息 getQuickOrderInfo() { + + if(!uni.getStorageSync('token')){ + return + } + // 调用接口获取快捷下单信息 this.$api('getOrderInfo', {}, res => { if (res.code === 200 && res.result) { @@ -137,11 +145,6 @@ export default { getMessageCount() { return this.innerMessageCount; }, - - // 获取当前订单信息 - getOrderInfo() { - return this.orderInfo; - } }, } diff --git a/components/productItem.vue b/components/productItem.vue index cda73b2..d6e70b9 100644 --- a/components/productItem.vue +++ b/components/productItem.vue @@ -13,10 +13,11 @@ ¥{{item.price}}元/{{item.unit}} - + diff --git a/main.js b/main.js index 47c1892..fc4b8fe 100644 --- a/main.js +++ b/main.js @@ -22,10 +22,12 @@ Vue.mixin(mixinConfigList) import configPopup from '@/components/config/configPopup.vue' import navbar from '@/components/base/navbar.vue' import kefu from '@/components/base/kefu.vue' +import QuickOrderEntry from '@/components/QuickOrderEntry.vue' Vue.component('configPopup',configPopup) Vue.component('navbar',navbar) Vue.component('kefu',kefu) +Vue.component('QuickOrderEntry', QuickOrderEntry) const app = new Vue({ ...App, diff --git a/pages/index/cart.vue b/pages/index/cart.vue index bf4cacd..ac4cd95 100644 --- a/pages/index/cart.vue +++ b/pages/index/cart.vue @@ -101,6 +101,11 @@ + + diff --git a/pages/index/category.vue b/pages/index/category.vue index f07bc70..37bd07d 100644 --- a/pages/index/category.vue +++ b/pages/index/category.vue @@ -54,7 +54,7 @@ @@ -66,14 +66,10 @@ diff --git a/pages/index/index.vue b/pages/index/index.vue index 7e5957b..dd613ce 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -27,10 +27,14 @@ - + + height="350rpx" + :list="bannerList" + circular + bgColor="#ffffff"> @@ -72,7 +76,6 @@ diff --git a/pages/index/order.vue b/pages/index/order.vue index 261a6d3..707c83a 100644 --- a/pages/index/order.vue +++ b/pages/index/order.vue @@ -61,6 +61,10 @@ + + diff --git a/pages_order/mine/about.vue b/pages_order/mine/about.vue index 3cb3433..fb4d065 100644 --- a/pages_order/mine/about.vue +++ b/pages_order/mine/about.vue @@ -10,6 +10,10 @@ + + diff --git a/pages_order/mine/address.vue b/pages_order/mine/address.vue index 46b4440..1775499 100644 --- a/pages_order/mine/address.vue +++ b/pages_order/mine/address.vue @@ -19,6 +19,9 @@ @saveOrUpdate="saveOrUpdate" :title="title"> + diff --git a/pages_order/mine/help.vue b/pages_order/mine/help.vue index 746bcd5..6123350 100644 --- a/pages_order/mine/help.vue +++ b/pages_order/mine/help.vue @@ -51,6 +51,10 @@ 确认 + + diff --git a/pages_order/mine/individualTeam.vue b/pages_order/mine/individualTeam.vue index 7df7e3e..f852267 100644 --- a/pages_order/mine/individualTeam.vue +++ b/pages_order/mine/individualTeam.vue @@ -62,6 +62,10 @@ + + diff --git a/pages_order/mine/promotion.vue b/pages_order/mine/promotion.vue index b953efe..7ea524f 100644 --- a/pages_order/mine/promotion.vue +++ b/pages_order/mine/promotion.vue @@ -2,7 +2,7 @@ @@ -19,6 +19,10 @@ 保存到相册 + + diff --git a/pages_order/mine/purse.vue b/pages_order/mine/purse.vue index 5d0ae0f..065c1a8 100644 --- a/pages_order/mine/purse.vue +++ b/pages_order/mine/purse.vue @@ -35,6 +35,10 @@ 提交 + + diff --git a/pages_order/mine/runningWater.vue b/pages_order/mine/runningWater.vue index 6903223..8ab9e73 100644 --- a/pages_order/mine/runningWater.vue +++ b/pages_order/mine/runningWater.vue @@ -48,6 +48,10 @@ + + + + diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue index 4047837..4c119c1 100644 --- a/pages_order/product/productDetail.vue +++ b/pages_order/product/productDetail.vue @@ -68,6 +68,9 @@ + diff --git a/pages_order/product/productList.vue b/pages_order/product/productList.vue index 809bb9e..65657cd 100644 --- a/pages_order/product/productList.vue +++ b/pages_order/product/productList.vue @@ -18,6 +18,10 @@ :item="item" v-for="(item, index) in list" :key="index"/> + + diff --git a/store/store.js b/store/store.js index ced0ef9..467b838 100644 --- a/store/store.js +++ b/store/store.js @@ -166,6 +166,7 @@ const store = new Vuex.Store({ uni.getImageInfo({ src: `${Vue.prototype.$config.baseUrl}/info/createQrCode?token=${uni.getStorageSync('token')}`, success : res => { + uni.hideLoading() that.commit('setPromotionUrl', res.path) }, fail : err => {