Merge branch 'master' of http://git.jihengcc.cn/liubaiyan/qjd-user-uniapp

config/api.js

@@ -1,5 +1,6 @@
 // const WX_API_BASE = 'https://www.qianjiadi.com/'
-const WX_API_BASE = 'http://ch.jihengcc.cn:17080/'
+// const WX_API_BASE = 'http://ch.jihengcc.cn:17080/'
+const WX_API_BASE = 'https://test.jihengcc.cn/'
 
 module.exports = {
 	//  微信登录
@@ -113,5 +114,5 @@ module.exports = {
 	
 	
 	//  上传文件
-	uploadFile: WX_API_BASE + 'app/files/upload',
+	uploadFile: WX_API_BASE + 'app/uploadManage/upload',
 }

pagesGood/auctionDetail.vue

@@ -62,15 +62,21 @@
 					payTime: '竞拍正式开始！\n'
 				}],
 				auctionList: [],
+				timer: null
 			}
 		},
 		onLoad(options) {
 			this.goodId = options.goodId
 			this.getAuctionData()
-			setInterval(() => {
+		},
+		onShow() {
+			this.timer = setInterval(() => {
 				this.getAuctionData()
 			}, 5000)
 		},
+		onHide() {
+			clearInterval(this.timer)
+		},
 		methods: {
 			//  获取拍卖详情
 			getAuctionData() {

pagesGood/orderPay.vue

@@ -55,7 +55,7 @@
 					 v-if="orderType == 1">
 						<view>
 							<text class="order-text-left">{{coupon.couponName}}</text>
-							<text class="order-text-right">-￥{{coupon.discountAmount.toFixed(2)}}</text>
+							<text class="order-text-right">-￥{{coupon.discountAmount}}</text>
 						</view>
 					</u-cell-item>
 					<u-field label="备注" v-model="notes" placeholder="请输入备注" :border-bottom="false" label-align="right" label-width="170"
@@ -235,7 +235,7 @@
 				this.coupon = {
 					couponId: item.couponId,
 					couponName: item.couponName,
-					discountAmount: item.discountAmount,
+					discountAmount: parseFloat(item.discountAmount).toFixed(2),
 					couponType: item.couponType,
 				}
 				this.$refs.popup.close()

pagesGood/videoDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container">
-		<view class="video-box" @click="popupShow = true">
+		<view class="video-box">
 			<video id="myVideo" class="my-video" :src="videoUrl" @error="videoErrorCallback" controls></video>
 		</view>
 		<view class="popup-open" @click="showGoods()">
@@ -43,7 +43,7 @@
 			}
 		},
 		onLoad(options) {
-			this.videoUrl = uni.getStorageSync("videoUrl")
+			this.videoUrl = uni.getStorageSync("videoUrl").replace("http://","https://")
 			NET.request(API.getShortGoodsDetail + options.videoId, {}, 'GET').then(res => {
 				this.goodsList = res.data
 			}).catch(res => {
@@ -62,7 +62,7 @@
 			closeGoods() {
 				this.$refs.popup.close()
 			},
-			goToGoodDetails() {
+			goToGoodDetails(item) {
 				uni.navigateTo({
 					url: '/pagesGood/goodDetails?goodId=' + item.productId
 				});
@@ -79,9 +79,9 @@
 
 	.container {
 		width: 100%;
-		height: 100;
+		height: 100%;
 		float: left;
-		position: relative;
+		
 
 		.video-box {
 			width: 100%;