Commit 397937e2 authored by Damon's avatar Damon

feat: 悬浮窗位置

parent b6b87dd5
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss">
.upload-progress { .upload-progress {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
import Vue from 'vue' import Vue from 'vue'
import moment from 'moment' import moment from 'moment'
import App from './App' import App from './App'
import uView from "uview-ui"; import uView from "uview-ui";
...@@ -8,24 +8,24 @@ import {router,RouterMount} from '@/router/index.js' //路径换成自己的 ...@@ -8,24 +8,24 @@ import {router,RouterMount} from '@/router/index.js' //路径换成自己的
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.mixin(vuexStore) Vue.mixin(vuexStore)
Vue.use(uView); Vue.use(uView);
App.mpType = 'app' App.mpType = 'app'
const app = new Vue({ const app = new Vue({
store, store,
...App ...App
}) })
// 引入时间组件 moment // 引入时间组件 moment
moment.locale('zh-cn'); moment.locale('zh-cn');
Vue.prototype.moment = moment Vue.prototype.moment = moment
Vue.filter('datefmt',function (input,fmtstring) {//当input为时间戳,需转为Number类型 Vue.filter('datefmt',function (input,fmtstring) {//当input为时间戳,需转为Number类型
if(input){ if(input){
return moment(input).format(fmtstring); return moment(input).format(fmtstring);
}else{ }else{
return ""; return "";
} }
}); });
// http拦截器,将此部分放在new Vue()和app.$mount()之间,才能App.vue中正常使用 // http拦截器,将此部分放在new Vue()和app.$mount()之间,才能App.vue中正常使用
import httpInterceptor from '@/common/http.interceptor.js' import httpInterceptor from '@/common/http.interceptor.js'
...@@ -33,9 +33,9 @@ Vue.use(httpInterceptor, app) ...@@ -33,9 +33,9 @@ Vue.use(httpInterceptor, app)
Vue.use(router) Vue.use(router)
// http接口API抽离,免于写url或者一些固定的参数 // http接口API抽离,免于写url或者一些固定的参数
import httpApi from '@/common/http.api.js' import httpApi from '@/common/http.api.js'
Vue.use(httpApi, app) Vue.use(httpApi, app)
// 分享 // 分享
let mpShare = require('@/uview-ui/libs/mixin/mpShare.js') let mpShare = require('@/uview-ui/libs/mixin/mpShare.js')
Vue.mixin(mpShare) Vue.mixin(mpShare)
//v1.3.5起 H5端 你应该去除原有的app.$mount();使用路由自带的渲染方式 //v1.3.5起 H5端 你应该去除原有的app.$mount();使用路由自带的渲染方式
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
<upload-progress></upload-progress> <upload-progress />
</TabBarPage> </TabBarPage>
</template> </template>
......
...@@ -313,6 +313,7 @@ ...@@ -313,6 +313,7 @@
:cancel-btn="true" :cancel-btn="true"
@click="uploadSelect" @click="uploadSelect"
></u-action-sheet> ></u-action-sheet>
<upload-progress />
</view> </view>
</template> </template>
<script> <script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment