修改

assets/colorui/app.scss

@@ -359,4 +359,20 @@ button {
 		@include arch;
 		right: -15rpx;
 	}
-}
+}
+
+
+
+/* start--去除button的所有默认样式--start */
+.btnCss {
+	padding: 0;
+	font-size: inherit;
+	line-height: inherit;
+	background-color: transparent;
+	color: inherit;
+}
+
+.btnCss {
+   border: none;
+}
+/* end--去除button的所有默认样式--end */

assets/http/api.js

@@ -180,9 +180,8 @@ const balanceBills = {
 }
 
 const pointbills = {
-	list: p => http.get('common/pointbills/list', {
-		params: p
-	}),
+	list: p => http.get('common/pointbills/list', {params: p}),
+	channelList: p => http.get('common/pointbills/channelList', {params: p}),
 }
 
 const goodsbills = {

components/channel-list.vue

@@ -7,11 +7,11 @@
 				</view>
 				<view class="content">
 					<text>{{channel.channelName}}</text>
-					<text>优先使用该渠道积分支付</text>
+					<text style="font-weight: 300;">优先使用该渠道积分支付</text>
 				</view>
 			</view>
 			<view class="right">
-				<text class="cuIcon-right"></text>
+				<text class="cuIcon-unfold"></text>
 			</view>
 		</view>
 		
@@ -85,7 +85,7 @@
 		display: flex;
 		justify-content: space-between;
 		margin-top: 10rpx;
-		padding:20rpx 30rpx;
+		padding:20rpx 40rpx;
 		background-color: #FFFFFF;
 		
 		.left{
@@ -106,7 +106,7 @@
 				margin-left: 16rpx;
 				
 				text:first-child{
-					font-size: 34rpx;
+					font-size: 32rpx;
 					margin-bottom: 10rpx;
 				}
 				
@@ -135,7 +135,7 @@
 		.channelbtn{
 			background-color: #18b566;
 			color: #FFFFFF;
-			padding: 36rpx 150rpx;
+			padding: 38rpx 180rpx;
 		}
 		
 		.channel-item{

pages/consume/comps/card1.vue

@@ -12,40 +12,42 @@
 		<view class="item">
 			<view class="card" @click="goDetail(item.id)" v-for="(item,index) in list" :key="index">
 				<view class="left">
-					<image :src="item.cover" mode=""></image>
+					<image :src="item.cover" mode="aspectFill"></image>
 				</view>
 				<view class="right" style="width: 100%;">
 					<view class="title   flex justify-between" >
 						<view class="text-cut-1" style="width: 70%;">
 							<text class="">{{item.name}}</text>
 						</view>
-						<view v-if="vuex_audit==1" @click.stop="$jump(`/pagesD/pages/menu/menu?shopId=${item.id}`)" class="text-base center" style="font-size: 28rpx;font-weight: normal;">
-							<image class="" style="width: 36rpx;height: 36rpx;margin-right: 4rpx;" src="@/static/icon/order.png" mode=""></image>
+						<view v-if="vuex_audit==1" @click.stop="$jump(`/pagesD/pages/menu/menu?shopId=${item.id}`)" class="text-base center" style="font-size: 26rpx;font-weight: normal;">
+							<image class="" style="width: 32rpx;height: 32rpx;margin-right: 4rpx;" src="@/static/icon/order.png" mode=""></image>
 							<text>去点餐</text>
 						</view>
 						
 					</view>
-					<view class="data">
-						<view class="">
-							<block>
-								<u-icon name="star-fill" color="#ff7001" size="30"></u-icon>
-								<text
-									style="margin-left: 4rpx;margin-right: 20rpx;color: #ff7001;font-size: 26rpx;">{{item.score}}</text>
-							</block>
-							<block>
-								<text>月售</text>
-								<text class="margin-left-10">{{item.sales==-1?0:item.sales}}</text>
-							</block>
+					<view class="margin-bottom-20">
+						<view class="data">
+							<view class="">
+								<block>
+									<u-icon name="star-fill" color="#ff7001" size="30"></u-icon>
+									<text
+										style="margin-left: 4rpx;margin-right: 20rpx;color: #ff7001;font-size: 26rpx;">{{item.score}}</text>
+								</block>
+								<block>
+									<text>月售</text>
+									<text class="margin-left-10">{{item.sales==-1?0:item.sales}}</text>
+								</block>
+							</view>
+							<view>
+								<u-icon name="map-fill" color="#FF9447"></u-icon>
+								<text class="margin-left-10">{{distance(item.latitude,item.longitude)}} km</text>
+							</view>
 						</view>
-						<view>
-							<u-icon name="map-fill" color="#FF9447"></u-icon>
-							<text class="margin-left-10">{{distance(item.latitude,item.longitude)}} km</text>
-						</view>
-					</view>
-					<view class="text-cut-2" style="width: 100%;height: 32rpx;margin-top: 14rpx;">
-						<view v-for="(item1,index1) in item.labelKey.split(',')" :key="index1" class="cu-tag sm "
-							style="background-color: #fff0d9;color: #ffa353;">
-							{{item1}}
+						<view class="text-cut-2" style="width: 100%;height: 32rpx;margin-top: 14rpx;">
+							<view v-for="(item1,index1) in item.labelKey.split(',')" :key="index1" class="cu-tag sm "
+								style="background-color: #fff0d9;color: #ffa353;">
+								{{item1}}
+							</view>
 						</view>
 					</view>
 				</view>
@@ -151,25 +153,24 @@
 			}
 		}
 	}
-	
 	.item {
 		display: flex;
 		flex-direction: column;
 		margin-top: 50rpx;
 	
 		.card {
-			margin-bottom: 20rpx;
+			margin-bottom: 15rpx;
 			display: flex;
 			border-bottom: 1rpx solid #ececec;
-			padding-bottom: 20rpx;
+			padding-bottom: 10rpx;
 	
 			.left {
-				width: 30%;
+				width: 32%;
 	
 				image {
 					width: 100%;
-					border-radius: 12rpx;
-					height: 180rpx;
+					border-radius: 8rpx;
+					height: 175rpx;
 				}
 			}
 	
@@ -178,12 +179,11 @@
 				display: flex;
 				width: 70%;
 				flex-direction: column;
+				justify-content: space-between;
 	
 				.title {
-					
-					font-size: 30rpx;
+					font-size: 28rpx;
 					font-weight: 800;
-					margin-bottom: 30rpx;
 				}
 	
 				.data {

pages/consume/comps/card2.vue

@@ -3,7 +3,7 @@
 		<view class="cu-card case card" v-for="(item,index) in list" :key="index" @click="goDetail(item.id)">
 			<view class="cu-item shadow">
 				<view class="image">
-					<image style="width: 100%;height: 450rpx;" :src="item.logo"></image>
+					<image style="width: 100%;height: 350rpx;" :src="item.logo"></image>
 				</view>
 				<view class="content">
 					<view class="top">

pages/consume/consume.vue

@@ -3,8 +3,8 @@
 		<u-navbar :is-back="false" title=" " >
 			<view class="margin-left-20 text-cut-1" style="width: 100%;z-index: 99;" @click="chooseLocation()">
 				<view v-if="$isEmpty(location)" @click.stop="$u.toast('暂无位置信息')">
-					<u-icon name="map-fill" color="#000" size="34"></u-icon>
-					<text class="padding-left-sm " style="font-size: 34rpx;">暂无位置信息</text>
+					<u-icon name="map-fill" color="#000" size="32"></u-icon>
+					<text class="padding-left-sm " style="font-size: 32rpx;">暂无位置信息</text>
 				</view>
 				<view class="" v-else>
 					<u-icon name="map-fill" color="#000" size="34"></u-icon>

pagesA/pages/my-points/my-points.vue

@@ -52,7 +52,7 @@
 					</view>
 					<view class="area3 text-area ">
 						<view class="price reduce item-padding text-base" v-if="item.type=='PAY_CONSUMER'" style="font-size: 34rpx">{{item.totalPrice}}</view>
-						<view class="price plus item-padding text-base" v-else  style="font-size: 34rpx">{{item.price}}</view>
+						<view class="price plus item-padding text-black" v-else  style="font-size: 34rpx">{{item.price}}</view>
 					</view>
 				</view>
 			</mescroll-body>
@@ -107,16 +107,13 @@
 				let params = {
 					current:mescroll.num,
 					size:mescroll.size,
-					payId:this.vuex_userId,
-					payStatus:this.$global.payStatus.IS_PAY
+					userId:this.vuex_userId,
 				}
-				
 				if (this.defaultTime) {
 					params.createTime = this.$dateTime.format(new Date(this.defaultTime))
 				}
-				
 				try {
-					this.$api.pointbills.list(params).then(res => {
+					this.$api.pointbills.channelList(params).then(res => {
 						let data = res.data.records
 						let total = res.data.total
 						mescroll.endBySize(data.length, total);

pagesC/pages/checkstand/pay-qrcode.vue

@@ -11,17 +11,17 @@
 				</view>
 				<!-- 付款码 -->
 				<view class="qr-code center">
-					<tki-qrcode cid="2" ref="qrcode" :val="content" size="320" :onval="true" :loadMake="true"
+					<tki-qrcode cid="2" ref="qrcode" :icon="avatar" :val="content" size="350" :onval="true" :loadMake="true"
 						:usingComponents="true" />
 				</view>
 			</view>
 			<!-- 收款码 -->
 			<view v-else class="charge-code center">
-				<tki-qrcode cid="1" ref="qrcode-charge" :val="id" :icon="avatar" size="440" :onval="true"
+				<tki-qrcode cid="1" ref="qrcode-charge" :val="id" :icon="avatar" size="500" :onval="true"
 					:loadMake="true" :usingComponents="true" />
 			</view>
 		</view>
-		<view class="footer center flex-direction">
+		<view class="footer center flex-direction"  :style="$isNotEmpty(vuex_channel)?'padding: 30rpx 0rpx;':''">
 			<text class="text-xl text-bold">{{nickName}}</text>
 			<!-- #ifdef  MP-WEIXIN-->
 			<view style="width: 100%;padding: 0;">
@@ -214,7 +214,7 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
-		padding: 40rpx 0;
+		padding: 30rpx 0;
 		height: 100%;
 
 		.channelbtn {
@@ -296,8 +296,7 @@
 	.code-container {
 		background-color: #FFFFFF;
 		border-radius: 16rpx;
-		min-height: 800rpx;
-		margin: 60rpx 20rpx;
+		margin: 80rpx 20rpx;
 
 		.title {
 			border-radius: 25rpx 25rpx 0 0;
@@ -312,25 +311,22 @@
 
 		.footer {
 			width: 100%;
-			padding: 30rpx;
+			padding:40rpx 0rpx;
 			border-top: 1rpx dashed #dddddd;
 		}
 
 		.main-content {
 			width: 100%;
-			height: 600rpx;
-			scroll-margin-top: 600rpx;
+			height: 700rpx;
 
 			// overflow: hidden;
 			.bar-code {
-				margin-left: 5%;
-				width: 90%;
-				height: 150rpx;
+				height: 170rpx;
 			}
 
 			.qr-code {
 				width: 100%;
-				height: 450rpx;
+				height: 500rpx;
 			}
 
 			.charge-code {