theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'fixed bug' (#40) from cmx into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/40
This commit was merged in pull request #40.
This commit is contained in:
cmx
2020-08-11 20:39:12 +08:00
parent 5500dc9f73 26c2e044dc
commit 2ea72995a9
5 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pages/index/details.vue
View File

@@ -105,7 +105,8 @@
</view>
<view class="btn" @click="showDelivery = false">确认</view>
</u-popup>
<u-picker mode="selector" v-model="show" :default-selector="[0]" :range="list" range-key="content" @confirm="getselect"></u-picker>
<!-- <u-picker mode="selector" v-model="show" :default-selector="[0]" :range="list" range-key="content" @confirm="getselect" confirm-color="#ff780f;"></u-picker> -->
<u-select v-model="show" :list="list" @confirm="getselect" confirm-color="#FF780F"></u-select>
<!-- companylist -->
<u-picker
mode="selector"
@@ -378,7 +379,7 @@ export default {
},
// 选择骑手
getselect(e) {
this.selctcar = this.list[e[0]];
this.selctcar = this.list[e[0].value];
},
// 获取订单信息
resetinfo() {
@@ -405,7 +406,8 @@ export default {
} else {
let arr = res.data;
for (let index in arr) {
arr[index].content = arr[index].company_name + '——' + arr[index].contacts + '——' + arr[index].contact_number;
arr[index].value = index;
arr[index].label = arr[index].company_name + ' ' + arr[index].contacts + ' ' + arr[index].contact_number;
}
this.list = arr;
}

27
pages/index/index.vue
View File

@@ -2,20 +2,7 @@
<view class="home">
<view class="image-swiper"><u-swiper :list="imageList" mode="dot" border-radius="20"></u-swiper></view>
<view class="tab-swiper">
<!-- <u-tabs-swiper
ref="uTabs"
:list="list"
:current="current"
@change="tabsChange"
active-color="#FF780F"
inactive-color="#333333"
font-size="26"
height="98"
:show-bar="false"
swiperWidth="750"
gutter="52"
></u-tabs-swiper> -->
<u-tabs :list="list" font-size="26" gutter="10" item-width="140" bar-width="130" active-color="#FF780F" :current="current" @change="tabsChange"></u-tabs>
<u-tabs :list="list" font-size="26" gutter="10" item-width="130" bar-width="120" active-color="#FF780F" :current="current" @change="tabsChange"></u-tabs>
</view>
<view class="order-list" v-if="current == 0">
<view v-for="(item, index) in allorder" :key="index"><OrderItem :info="item"></OrderItem></view>
@@ -410,15 +397,15 @@ export default {
}
.complaint {
margin: 0 30rpx;
padding: 75rpx 30rpx;
padding: 100rpx 20rpx;
background-color: #ffffff;
.select-container {
display: flex;
align-items: center;
margin-bottom: 60rpx;
margin-bottom: 100rpx;
.title {
width: 180rpx;
font-size: 30rpx;
width: 150rpx;
font-size: 26rpx;
color: rgba(51, 51, 51, 1);
margin-right: 20rpx;
text-align: right;
@@ -456,8 +443,8 @@ export default {
box-sizing: border-box;
display: flex;
.title {
width: 180rpx;
font-size: 30rpx;
width: 150rpx;
font-size: 26rpx;
text-align: right;
color: rgba(51, 51, 51, 1);
margin-right: 20rpx;

14
pages/release/video.vue
View File

@@ -113,7 +113,8 @@ export default {
selectarr: [], //选中标签
tagcontent: '', //新建标签名字
selectvideo: '', //视频名字
videostate: false //视频状态
videostate: false, //视频状态
progress:0
};
},
onLoad() {
@@ -238,7 +239,7 @@ export default {
let url = this.action;
let that = this;
uni.showLoading({
title:"上传中！"
title:'上传中'+that.progress+'%'
})
uni.chooseVideo({
count: 1,
@@ -246,7 +247,7 @@ export default {
success: function(res) {
that.src = res.tempFilePath;
const tempFilePaths = res.tempFilePath;
uni.uploadFile({
const uploadTask = uni.uploadFile({
url: url, //仅为示例，非真实的接口地址
filePath: tempFilePaths,
name: 'article_video',
@@ -268,6 +269,13 @@ export default {
console.log(error);
}
});
uploadTask.onProgressUpdate((res) => {
console.log("上传进度",res.progress)
that.progress = res.progress
// 测试条件，取消上传任务。
if (res.progress == 100) {
}
});
}
});
},