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

components/lf-indexShopMatrix/lf-indexShopMatrix.vue

@@ -4,9 +4,9 @@
 		<view class="flex-box">
 			<view class="item" v-for="(item, index) in list" :key="index" 
 				@click="$url('/pages/shop/shopdetail?id='+ item.associate.id)">
-				<image class="bg-img" :src="item.image"></image>
+				<image class="bg-img" :src="item.associate.images[0] && item.associate.images[0].path"></image>
 				<view class="shop">
-					<image :src="item.associate.logo"></image>
+					<image :src="item.image || item.associate.logo"></image>
 					<view class="lf-line-1">{{ item.associate.name }}</view>
 				</view>
 			</view>

components/lf-seckill/lf-seckill.vue

@@ -7,7 +7,7 @@
 			<scroll-view class="scroll-view" :scroll-x="true">
 				<view class="lf-flex">
 					<view class="goods-item" v-for="(item, index) in list" :key="index">
-						<image class="goods-img" :src="item.associate.goods.img"></image>
+						<image class="goods-img" :src="item.image || item.associate.goods.img"></image>
 						<view class="lf-line-1 goods-title">{{ item.associate.goods.name }}</view>
 						<view class="goods-price">
 							<text>¥{{ item.associate.seckill_price }}</text>

pages/coupon/index/index.vue

@@ -9,7 +9,8 @@
 				<scroll-view :style="{height: autoHeight}" :scroll-y="true" :refresher-enabled="true" :refresher-triggered="isRefresher"
 					@scrolltolower="onScrolltolower" @refresherrefresh="onRefresherrefresh">
 					<view class="coupon-wrap">
-						<view class="coupon-card lf-m-b-30" :class="{'invalid-bg': item.ifpast == true,'lf-bg-haveuse': item.used_at != ''}" v-for="(item, index) in tab.list" :key="index">
+						<!-- <view class="coupon-card lf-m-b-30" :class="{'invalid-bg': item.ifpast == true,'lf-bg-haveuse': item.used_at != ''}" v-for="(item, index) in tab.list" :key="index"> -->
+						<view class="coupon-card lf-m-b-30" :class="{'invalid-bg': item.ifpast, 'lf-bg-haveuse': item.used_at != ''}" v-for="(item, index) in tab.list" :key="index">
 							<view class="coupon-circle-top">
 								<view class="coupon-circle1"></view>
 							</view>
@@ -29,10 +30,10 @@
 									<view class="coupon-tag" v-if="item.used_at != ''">
 										已使用
 									</view>
-									<view class="coupon-tag" v-if="item.ifpast">
+									<view class="coupon-tag" v-else-if="item.ifpast">
 										已过期
 									</view>
-									<view class="coupon-tag" v-if="!item.ifpast && item.used_at == ''">
+									<view class="coupon-tag" v-else-if="!item.ifpast && item.used_at == ''">
 										待使用
 									</view>
 								</view>
@@ -205,7 +206,9 @@
 
 <style scoped lang="scss">
 	.lf-bg-haveuse {
-		background-color: rgba(255, 255, 255, 1)!important;
+		opacity: .5 !important;
+		background-color: #15716E !important;
+		// background-color: rgba(255, 255, 255, 1)!important;
 	}
 	.coupon-circle1 {
 		width: 40rpx;

pages/order/cashier/cashier.vue

@@ -125,6 +125,7 @@
 			// 支付密码输入完成
 			payComfirm(event) {
 				this.user_pw = event;
+				this.clickContinue = true;
 				this.confirm();
 			},
 			// 支付

pages/recharge/balance/balance.vue

@@ -30,7 +30,11 @@
 						:class="{'lf-color-price': item.value < 0}"
 						style="width: 70%;">{{ item.balance }}
 					</view>
-					<view class="lf-font-24 lf-color-555">{{ item.note }}</view>
+					<view class="lf-font-24 lf-color-555">
+						<text v-if="item.channel == 'online' && item.type == 'order_payment'">线上-</text>
+						<text v-else-if="item.channel == 'offline' && item.type == 'order_payment'">线下-</text>
+						<text>{{ item.brand.name || item.note }}</text>
+					</view>
 				</view>
 				<view class="lf-row-between lf-m-t-20">
 					<view class="lf-font-24 lf-color-555">¥{{ item.current }}</view>

pages/user/member/service.vue

@@ -9,7 +9,7 @@
 				<view class="item" v-for="(item, index) in serviceList" :key="index">
 					<image class="img" :src="item.image" mode="widthFix"></image>
 					<view class="title">{{item.name}}</view>
-					<view class="desc">{{item.remark}}</view>
+					<view class="desc" v-if="$isRight(item.remark)">{{item.remark}}</view>
 				</view>
 			</view>
 			<view style="height: 120rpx;"></view>