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

Compare commits

base: theluyuan:d97b749a0a25cc5f54c64f5147d791a2b576c42a
Branches Tags
theluyuan:master theluyuan:qxf theluyuan:zhy theluyuan:xbx theluyuan:gyh theluyuan:cmx theluyuan:zmr theluyuan:lxb
...
compare: theluyuan:cmx
Branches Tags
theluyuan:qxf theluyuan:master theluyuan:zhy theluyuan:xbx theluyuan:gyh theluyuan:cmx theluyuan:zmr theluyuan:lxb

2 Commits
d97b749a0a ... cmx

Author SHA1 Message Date
cmxdd
9baac8ef63 update adout upload adout tencentCOS 2020-08-12 15:17:48 +08:00
cmxdd
26c2e044dc fixed bug 2020-08-11 20:37:54 +08:00
6 changed files with 116 additions and 82 deletions
Expand all files Collapse all files

7
common/cos-wx-sdk-v5.js Normal file
View File

File diff suppressed because one or more lines are too long

16
components/order-item/testlist.vue
View File

@@ -2,14 +2,16 @@
<view class="item" @click="toDetailsPage">
<image :src="info.goods_pic"></image>
<view class="goods">
<view class="">
<view class="box">
<view class="boxid">
{{info.goods_try_id}}
</view>
<!-- 0:待处理订单 20:同意 40:拒绝此订单 -->
<view class="status" v-if="info.goods_try_order_status==0">待处理订单</view>
<view class="status" v-if="info.goods_try_order_status==20">已接单订单</view>
<view class="status" v-if="info.goods_try_order_status==40">已拒绝订单</view>
<view class="status" v-if="info.goods_try_order_status==50">已完成订单</view>
</view>
<view class="name u-line-1">{{info.goods_name}}</view>
<view class="info">
<view class="num">共{{info.goods_try_num}}件商品</view>
@@ -67,7 +69,15 @@ export default {
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: center;
justify-content: space-between;
.box{
width: 100%;
display: flex;
font-size: 24rpx;
}
.boxid{
flex: 1;
}
.status {
align-self: flex-end;
font-size: 26rpx;

11
pages/index/details.vue
View File

@@ -80,7 +80,7 @@
<!-- 已发货 -->
<view class="pushtimeline" v-if="type == 2">
<view class="timelinetitle">物流信息</view>
<view class="timelineid">订单单号:{{ info.order_sn }}</view>
<view class="timelineid">订单单号:&nbsp;&nbsp;&nbsp;{{ info.order_sn }}</view>
<view class="timelinebox" v-for="list in info.express_list">
<view class="timelinecontent">{{list.content}}</view>
<view class="timelinetime">{{list.kd_time}}</view>
@@ -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;
}
@@ -461,7 +463,6 @@ export default {
font-weight: 500;
color: #333333;
background-color: #ffffff;
border-bottom: 2rpx solid #ececec;
}
.refunds-user {
padding: 25rpx 30rpx;

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;

137
pages/release/video.vue
View File

@@ -25,7 +25,7 @@
<view>
<view class="titles">标签</view>
<view class="form-view active" @click="show_add()">+ 新建标签</view>
<view :class="['form-view',item.state == true ? 'active' : '']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
<view :class="['form-view', item.state == true ? 'active' : '']" v-for="(item, index) in fileListes" :key="index" @click="changeselect(index)">
{{ item.name }}
</view>
</view>
@@ -40,14 +40,7 @@
<view class="listes_shoping" v-for="(item, index) in list" :key="index">
<view>
<u-checkbox-group>
<u-checkbox
shape="circle"
size="40"
active-color="#FF780F"
v-model="item.checked"
:name="index"
@change="checkboxChange"
></u-checkbox>
<u-checkbox shape="circle" size="40" active-color="#FF780F" v-model="item.checked" :name="index" @change="checkboxChange"></u-checkbox>
</u-checkbox-group>
</view>
<view><image :src="item.goods_image" mode="widthFix"></image></view>
@@ -84,6 +77,75 @@
</template>
<script>
let COS = require('../../common/cos-wx-sdk-v5.js');
// 上传文件
const upload_file_server = (_this, filepath) => {
// 腾讯云配置
let cosConfig = {
Bucket: 'dmmall-1300406074', //replace with yours
Region: 'ap-shanghai', //replace with yours
SecretId: 'AKIDjDPJhni9gTzEB9iGNWQ3PTVGjv74q7EL', //replace with yours
SecretKey: 'ye3SZOvAQO5X5LK3Vy933h6G86h4mqpG' //replace with yours
};
// 获取本地文件
let filePath = filepath;
// 自定义文件名以及路径
let time = new Date();
var y = time.getFullYear();
var m = time.getMonth() + 1;
m = m < 10 ? '0' + m : m;
var d = time.getDate();
d = d < 10 ? '0' + d : d;
let str = y + m + d;
let Key = 'video/' + str + '/' + filePath.substr(filePath.lastIndexOf('/') + 1);
// 初始化凭证
var cos = new COS({
SecretId: cosConfig.SecretId,
SecretKey: cosConfig.SecretKey
});
//上传文件
cos.postObject(
{
Bucket: cosConfig.Bucket,
Region: cosConfig.Region,
Key: Key,
StorgeClass: 'STANDARD', //存储方式
FilePath: filePath
},
(err, data) => {
console.log(err, data, 12345);
if (err == null) {
if (data.statusCode == 200) {
_this.videopath = 'https://dmmall-1300406074.cos.ap-shanghai.myqcloud.com/' + Key;
uni.hideLoading();
_this.videostate = true;
} else {
uni.showToast({
title: '上传失败！',
icon: 'none'
});
}
} else {
return;
}
}
);
};
// 选择图片(通用)
const cImage = _this => {
uni.chooseVideo({
count: 1,
sourceType: ['camera', 'album'],
success: function(res) {
uni.showLoading({
title: '上传中'
});
const tempFilePaths = res.tempFilePath;
console.log(tempFilePaths);
upload_file_server(_this, tempFilePaths);
}
});
};
export default {
data() {
return {
@@ -113,7 +175,8 @@ export default {
selectarr: [], //选中标签
tagcontent: '', //新建标签名字
selectvideo: '', //视频名字
videostate: false //视频状态
videostate: false, //视频状态
progress: 0
};
},
onLoad() {
@@ -157,11 +220,11 @@ export default {
title: res.message,
type: 'success'
});
setTimeout(function(){
setTimeout(function() {
uni.navigateBack({
delta:1
})
},1000)
delta: 1
});
}, 1000);
}
});
},
@@ -235,41 +298,7 @@ export default {
},
// 上传视频
uploadvideo() {
let url = this.action;
let that = this;
uni.showLoading({
title:"上传中！"
})
uni.chooseVideo({
count: 1,
sourceType: ['camera', 'album'],
success: function(res) {
that.src = res.tempFilePath;
const tempFilePaths = res.tempFilePath;
uni.uploadFile({
url: url, //仅为示例，非真实的接口地址
filePath: tempFilePaths,
name: 'article_video',
formData: {
name: 'article_video'
},
header: {
Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
},
success: uploadFileRes => {
console.log(uploadFileRes);
let obj = JSON.parse(uploadFileRes.data);
that.videopath = obj.data.url;
that.selectvideo = obj.data.key;
uni.hideLoading()
that.videostate = true;
},
fail: function(error) {
console.log(error);
}
});
}
});
cImage(this);
},
// 新建标签
show_add() {
@@ -283,13 +312,13 @@ export default {
// 选中某个复选框时，由checkbox时触发
checkboxChange(e) {
let that = this;
let num =Number(e.name)
let num = Number(e.name);
if (e.value == true) {
that.pushes(that.list[num].goods_id);
that.list[num].checked=true
that.list[num].checked = true;
} else {
that.delarr(that.list[num].goods_id);
that.list[num].checked=false
that.list[num].checked = false;
}
},
// 删除直播商品
@@ -448,7 +477,7 @@ export default {
-webkit-line-clamp: 2;
}
.form-view {
background: #CDC7C8;
background: #cdc7c8;
border-radius: 6rpx;
margin-right: 20rpx;
font-size: 24rpx;
@@ -458,7 +487,7 @@ export default {
color: #fff;
}
.active {
background: #FF780F;
background: #ff780f;
}
.titles {
font-size: 30rpx;

BIN
static/image/home/chat.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 723 B

After

Width:  |  Height:  |  Size: 5.0 KiB