Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-hainan

components/lf-waterfall/lf-waterfall.vue

@@ -144,7 +144,8 @@
 		bottom: 0;
 		right: 0;
 		background-color: rgba(0,0,0,0.5);
-		width: 140rpx;
+		width: max-content;
+		padding: 0 20rpx;
 		height: 48rpx;
 		border-radius: 20rpx 0rpx 0rpx 0rpx;
 		font-size: 22rpx;

pages/about/index.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="lf-m-l-32 lf-m-r-32">
 		<rich-text :nodes="content" v-if="$isRight(content)"></rich-text>
 		<lf-nocontent v-else></lf-nocontent>
 		<!-- 回到顶部 -->

pages/channel/index.vue

@@ -177,9 +177,11 @@
 		text-align: center;
 		line-height: 82rpx;
 		background-color: #FFFFFF;
-		margin-right: -2rpx;
-		margin-top: -2rpx;
+		// margin-right: -2rpx;
+		// margin-top: -2rpx;
 		box-sizing: border-box;
+		margin: 6rpx;
+		border-radius: 20rpx;
 	}
 	.active{
 		border: 1rpx solid #FF0000;

pages/discover/discover.vue

@@ -2,13 +2,13 @@
 	<view class="page-color">
 		<view class="padding-lr lf-p-t-30" v-if="article_list.length">
 			<view class="card-discover lf-m-b-30" v-for="(item,index) of article_list" :key="index">
-				<view @click="$url('/pages/notice/article?article_id='+item.big.id)" v-if="item.big">
-					<image :src="item.big.image" mode="aspectFill" style="width: 686rpx;height: 300rpx;"></image>
+				<view class="lf-h-100 lf-w-100 lf-flex" @click="$url('/pages/notice/article?article_id='+item.big.id)" v-if="item.big">
+					<image :src="item.big.image" mode="aspectFill" style="width: 700rpx;height: 300rpx;border-radius: 20rpx 20rpx 0 0;"></image>
 				</view>
 				<view class="flex-direction bg-white discover-radius" v-if="item.children">
 					<view class="flex align-center text-center lf-p-30 solid-bottom" v-for="(i,index) of item.children" :key="index" @click="$url('/pages/notice/article?article_id='+i.id)">
 						<view>
-							<image :src="i.image" mode="aspectFill" style="width: 100rpx;height: 100rpx;"></image>
+							<image :src="i.image" mode="aspectFill" style="width: 100rpx;height: 100rpx;border-radius: 10rpx;"></image>
 						</view>
 						<view class="lf-line-2 lf-color-333 lf-font-28  lf-text-left lf-m-l-20" style="line-height: 44rpx;">
 							{{i.title}}

pages/goodsDetail/index.vue

@@ -102,7 +102,7 @@
 			}
 		},
 		onLoad(options){
-			this.goods_id = options.goods_id;
+			this.goods_id = options.goods_id || options.id;
 			
 			console.log('商品',this.goods_id)
 			this.getGoodsDetail();
@@ -204,8 +204,8 @@
 		},
 		onShareAppMessage(){
 			let goods = this.goods_detail;
-			let title = goods.name;
-			let imageUrl = goods.share_cover || goods.cover;
+			let title = goods.title;
+			let imageUrl = goods.pictures[0] || goods.picture;
 			let path = '/pages/route/index?route=goods_detail&id='+ goods.id;
 			console.log("path", path);
 			return {

pages/index/index.vue

@@ -59,7 +59,7 @@
 						</view>
 					</view>
 					<view>
-						<view class="recomm-img" @click="$url('/pages/goodsDetail/index?goods_id='+hot_list[1].id)">
+						<view class="recomm-img" style="margin-bottom: 14rpx;" @click="$url('/pages/goodsDetail/index?goods_id='+hot_list[1].id)">
 							<image :src="hot_list[1].picture" class="lf-w-100 lf-h-100"></image>
 						</view>
 						<view class="recomm-img lf-m-t-10" @click="$url('/pages/goodsDetail/index?goods_id='+hot_list[2].id)">
@@ -68,7 +68,7 @@
 					</view>
 				</view>
 				<view class="lf-row-between lf-m-t-10">
-					<view class="recomm-img" @click="$url('/pages/goodsDetail/index?goods_id='+item.id)" :key="index" v-for="(item,index) of hot_list" v-if="index>2">
+					<view class="recomm-img" style="margin-top: 4rpx;" @click="$url('/pages/goodsDetail/index?goods_id='+item.id)" :key="index" v-for="(item,index) of hot_list" v-if="index>2">
 						<image :src="item.picture" class="lf-w-100 lf-h-100"></image>
 					</view>
 				</view>
@@ -131,6 +131,15 @@
 			this.getIndexData()
 			this.getFavourite()
 		},
+		onLoad(options) {
+			if (options.scene) {
+			    // 单个参数
+			    let str = decodeURIComponent(options.scene);
+				this.$http(this.API.API_CONFIRM_CODE, {verify_code: str}).then(res => {
+					this.$msg('核销成功!');
+				});
+			   }
+		},
 		methods: {
 			//获取猜你喜欢
 			getFavourite() {
@@ -192,6 +201,7 @@
 		onPullDownRefresh(){
 			this.getIndexData()
 			this.getFavourite()
+			uni.stopPullDownRefresh()
 		},
 		onShareAppMessage(){
 			let shareInfo = {
@@ -311,13 +321,14 @@
 		.recomm-img{
 			width: 222rpx;
 			height: 222rpx;
-			border-radius: 5rpx;
+			border-radius: 15rpx;
+			overflow: hidden;
 		}
 		.max-recomm-img{
 			width: 455rpx;
 			height: 455rpx;
 			position: relative;
-			border-radius: 5rpx;
+			border-radius: 15rpx;
 			overflow: hidden;
 			.recomm-title{
 				// height: 142rpx;

pages/message/detail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="lf-m-l-32 lf-m-r-32">
 		<rich-text :nodes="content" v-if="$isRight(content)"></rich-text>
 		<lf-nocontent v-else></lf-nocontent>
 		<!-- 回到顶部 -->

pages/notice/article.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="lf-m-l-32 lf-m-r-32">
 		<rich-text :nodes="content" v-if="content"></rich-text>
 		<lf-nocontent v-else></lf-nocontent>
 		<!-- 回到顶部 -->

pages/notice/notice.vue

@@ -1,5 +1,5 @@
 <template>
-	<view>
+	<view class="lf-m-l-32 lf-m-r-32">
 		<rich-text :nodes="content" v-if="content"></rich-text>
 		<lf-nocontent v-else></lf-nocontent>
 		<!-- 回到顶部 -->

pages/order/order.vue

@@ -79,7 +79,7 @@
 						isPage: true
 					}, {
 						name: '已付款',
-						type: 1,
+						type: '1,2,3',
 						list: [],
 						loadingClass: true,
 						loadingText: '正在加载中',
@@ -97,7 +97,7 @@
 					},
 					{
 						name: '售后',
-						type: 6,
+						type: '6,7,8',
 						list: [],
 						loadingClass: true,
 						loadingText: '正在加载中',

pages/order/order_details.vue

@@ -67,8 +67,9 @@
 				<view class="bg-white flex flex-direction justify-around align-center text-center padding-tb"
 					style="padding-bottom: 140rpx;">
 					<view>
-						<tki-qrcode ref="qrcode" @result="qrR" :val="checkArea" :size="115" unit="px" background="#fff"
-							foreground="#000" pdground="#000" :onval="true" :loadMake="true" />
+						<!-- <tki-qrcode ref="qrcode" @result="qrR" :val="checkArea" :size="115" unit="px" background="#fff"
+							foreground="#000" pdground="#000" :onval="true" :loadMake="true" /> -->
+							<image src="../../static/defult_code.png" mode="aspectFill" style="width: 300rpx;height: 300rpx;"></image>
 					</view>
 					<view style="margin-top: 10rpx;position: relative;top: 26rpx;">
 						<view class="lf-font-28 text-black1">