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

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/40

pages/index/details.vue

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

pages/messages/messagesList.vue

@@ -113,10 +113,7 @@
 		font-size: 26rpx;
 		color: #666666;
 		height: 30rpx;
-		height: 30rpx;
+		line-height: 30rpx;
-		overflow:hidden; //超出的文本隐藏
-		text-overflow:ellipsis; //用省略号显示
-		white-space:nowrap; //不换行
 	}
 	.times{
 		position: absolute;

pages/release/video.vue

@@ -40,7 +40,14 @@
 						<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>
@@ -77,75 +84,6 @@
 </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 {
@@ -223,8 +161,8 @@ export default {
 					setTimeout(function(){
 						uni.navigateBack({
 							delta:1
-						});
+						})
-					}, 1000);
+					},1000)
 				}
 			});
 		},
@@ -298,7 +236,48 @@ export default {
 		},
 		// 上传视频
 		uploadvideo() {
-			cImage(this);
+			let url = this.action;
+			let that = this;
+			uni.showLoading({
+				title:'上传中'+that.progress+'%'
+			})
+			uni.chooseVideo({
+				count: 1,
+				sourceType: ['camera', 'album'],
+				success: function(res) {
+					that.src = res.tempFilePath;
+					const tempFilePaths = res.tempFilePath;
+					const uploadTask = 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);
+						}
+					});
+					uploadTask.onProgressUpdate((res) => {
+						console.log("上传进度",res.progress)
+						that.progress = res.progress
+						// 测试条件，取消上传任务。
+						if (res.progress == 100) {
+						}
+					});
+				}
+			});
 		},
 		// 新建标签
 		show_add() {
@@ -312,13 +291,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
 			}
 		},
 		// 删除直播商品
@@ -477,7 +456,7 @@ export default {
 		-webkit-line-clamp: 2;
 	}
 	.form-view {
-		background: #cdc7c8;
+		background: #CDC7C8;
 		border-radius: 6rpx;
 		margin-right: 20rpx;
 		font-size: 24rpx;
@@ -487,7 +466,7 @@ export default {
 		color: #fff;
 	}
 	.active {
-		background: #ff780f;
+		background: #FF780F;
 	}
 	.titles {
 		font-size: 30rpx;

static/imservice.js

@@ -299,7 +299,8 @@ IMService.prototype.initialIMListeners = function () {
                         friend.text = message.type != "text" ? "其他消息" : message.payload.text
                         let time = new Date(message.timestamp)
                         friend.date = message.timestamp
-                        friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+
                         console.log(that.friends)
                         that.friendsarr = []
                         for(let i in that.friends){
@@ -325,7 +326,8 @@ IMService.prototype.initialIMListeners = function () {
                 friend.text = message.type != "text" ? "其他消息" : message.payload.text
                 let time = new Date(message.timestamp)
                 friend.date = message.timestamp
-                friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+
                 console.log(this.friends)  
                 that.friendsarr = []
                 for(let i in this.friends){
@@ -424,7 +426,8 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
                 friend.text = message
                 let time = new Date()
                 friend.date = time.getTime()
-                friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+                friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+
                 console.log(that.friends)
                 that.friendsarr = []
                 for(let i in that.friends){
@@ -448,7 +451,8 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
         friend.text = message
         let time = new Date()
         friend.date = time.getTime()
-        friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds()
+        friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes())  + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
+
         console.log(this.friends)  
         that.friendsarr = []
         for(let i in this.friends){