样式优化

components/lf-waterfall/lf-waterfall.vue

@@ -139,7 +139,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/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,23 @@
 			this.getIndexData()
 			this.getFavourite()
 		},
+		onLoad(options) {
+			console.log('=======11111=======',options)
+			if (options.scene) {
+			    // 单个参数
+			    let str = decodeURIComponent(options.scene);
+			    let obj = this.parseData(str);
+				console.log('==============',str)
+				return
+			    if (obj.type == 'de_qr') {
+			     this.click_type = 'department_qr';
+			     this.qr_id = obj.first_id;
+			    }else if(obj.type == 'sp_qr'){
+			     this.click_type = 'special_qr';
+			     this.qr_id = obj.special_id;
+			    }
+			   }
+		},
 		methods: {
 			//获取猜你喜欢
 			getFavourite() {

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">