|
|
@@ -16,22 +16,12 @@ import Vant from 'vant'
|
|
|
import clipboard from 'clipboard'
|
|
|
import 'vant/lib/index.css'
|
|
|
import wx from 'weixin-js-sdk'
|
|
|
-<<<<<<< HEAD
|
|
|
-import request from "@/utils/request"
|
|
|
-Vue.prototype.$axios = request
|
|
|
-Vue.prototype.$wx= wx
|
|
|
-Vue.component('tabbar',tabbar)
|
|
|
-Vue.component('banner',banner)
|
|
|
-Vue.component('back',back)
|
|
|
-Vue.component('backindex',backIndex)
|
|
|
-=======
|
|
|
Vue.prototype.$wx = wx
|
|
|
|
|
|
Vue.component('tabbar', tabbar)
|
|
|
Vue.component('banner', banner)
|
|
|
Vue.component('back', back)
|
|
|
Vue.component('backindex', backIndex)
|
|
|
->>>>>>> aa04db25e25a9b4b6579117270aa794e75ca8481
|
|
|
Vue.config.productionTip = false
|
|
|
Vue.use(Vant)
|
|
|
Vue.use(resource)
|
