diff --git a/main.js b/main.js index 955e520..8abffd1 100644 --- a/main.js +++ b/main.js @@ -8,21 +8,14 @@ import dialog from './utils/dialog' import cookie from '@/utils/store/cookie' import cuCustom from '@/components/colorui/components/cu-custom.vue' -import { - parseRoute, - _router, - parseQuery -} from '@/utils' -import { - VUE_APP_RESOURCES_URL, - VUE_APP_API_URL -} from '@/config' +import { parseRoute, _router, parseQuery } from '@/utils' +import { VUE_APP_RESOURCES_URL, VUE_APP_API_URL } from '@/config' Vue.component('cu-custom', cuCustom) Vue.config.productionTip = false Vue.config.devtools = process.env.NODE_ENV !== 'production' Vue.prototype.$validator = function(rule) { - return new schema(rule) + return new schema(rule) } Vue.config.productionTip = false @@ -30,20 +23,20 @@ App.mpType = 'app' Vue.prototype.$store = store const app = new Vue({ - ...App, - store, + ...App, + store, }) Object.defineProperty(Vue.prototype, '$yrouter', { - get() { - return _router - }, + get() { + return _router + }, }) Object.defineProperty(Vue.prototype, '$yroute', { - get() { - return this._route - }, + get() { + return this._route + }, }) Vue.prototype.$VUE_APP_API_URL = VUE_APP_API_URL @@ -71,35 +64,19 @@ deviceType = 'routine' // #ifdef H5 // H5编译的代码 -import { - wechat, - clearAuthStatus, - oAuth, - auth, - toAuth, - pay, - openAddress, - openShareAll, - openShareAppMessage, - openShareTimeline, - wechatEvevt, - ready, - wxShowLocation -} from '@/libs/wechat' - -import { - isWeixin -} from '@/utils' +import { wechat, clearAuthStatus, oAuth, auth, toAuth, pay, openAddress, openShareAll, openShareAppMessage, openShareTimeline, wechatEvevt, ready, wxShowLocation } from '@/libs/wechat' + +import { isWeixin } from '@/utils' const CACHE_KEY = 'clear_0.0.1' if (!cookie.has(CACHE_KEY)) { - cookie.clearAll() - cookie.set(CACHE_KEY, 1) + cookie.clearAll() + cookie.set(CACHE_KEY, 1) } var urlSpread = parseQuery()['spread'] if (urlSpread) { - cookie.set('spread', urlSpread) + cookie.set('spread', urlSpread) } // #endif @@ -108,16 +85,15 @@ if (urlSpread) { // H5编译的代码 // 判断是否是微信浏览器 async function init() { - - if (isWeixin()) { - deviceType = 'weixin' - let wechatInit = wechat(); - if (wechatInit) { - await oAuth() - } - } else { - deviceType = 'weixinh5' - } + if (isWeixin()) { + deviceType = 'weixin' + let wechatInit = wechat() + if (wechatInit) { + await oAuth() + } + } else { + deviceType = 'weixinh5' + } } init() // #endif @@ -125,27 +101,22 @@ init() Vue.prototype.$deviceType = deviceType Vue.mixin({ - onLoad() { - const { - $mp - } = this.$root - this._route = parseRoute($mp) - }, - onShow() { - _router.app = this - _router.currentRoute = this._route - }, - // 这里为了解决 .vue文件中 template 无法获取 VUE.prototype 绑定的变量 - computed: { - $VUE_APP_RESOURCES_URL() { - return VUE_APP_RESOURCES_URL - }, - $deviceType() { - return deviceType - }, - }, + onLoad() { + const { $mp } = this.$root + this._route = parseRoute($mp) + }, + onShow() { + _router.app = this + _router.currentRoute = this._route + }, + // 这里为了解决 .vue文件中 template 无法获取 VUE.prototype 绑定的变量 + computed: { + $VUE_APP_RESOURCES_URL() { + return VUE_APP_RESOURCES_URL + }, + }, }) store.commit('updateDevicetype', deviceType) -app.$mount() +app.$mount() diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 61cd79a..9da39db 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -268,7 +268,7 @@ export default { AddressWindow, }, props: {}, - data: function () { + data: function() { return { offlinePayStatus: 2, from: this.$deviceType, @@ -313,7 +313,7 @@ export default { this.computedPrice() }, }, - onShow: function () { + onShow: function() { let that = this this.$store.dispatch('getUser', true) that.getCartInfo() @@ -338,7 +338,7 @@ export default { path: '/pages/shop/StoreList/index', }) }, - addressType: function (index) { + addressType: function(index) { if (index && !this.systemStore.id) { uni.showToast({ title: '暂无门店信息,您无法选择到店自提!', @@ -350,7 +350,7 @@ export default { console.log(this) this.shipping_type = index }, - changeUseIntegral: function (e) { + changeUseIntegral: function(e) { // this.computedPrice(); if (this.isIntegral) { return @@ -410,7 +410,7 @@ export default { }) }) }, - addressTap: function () { + addressTap: function() { this.showAddress = true if (!this.addressLoaded) { this.addressLoaded = true @@ -421,10 +421,10 @@ export default { this.addressLoaded = false this.showAddress = false }, - couponTap: function () { + couponTap: function() { this.showCoupon = true }, - changeCoupon: function (coupon) { + changeCoupon: function(coupon) { if (!coupon) { this.usableCoupon = { couponTitle: '不使用优惠券', @@ -435,7 +435,7 @@ export default { } this.computedPrice() }, - payItem: function (index) { + payItem: function(index) { this.active = index }, changeAddress(addressInfo) { @@ -508,6 +508,7 @@ export default { if (this.$deviceType == 'app') { from.from = 'app' } + console.log(this.$deviceType) // #ifdef MP-WEIXIN subscribeMessage() // #endif