Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-user!62

src/packageGoods/coupon/index.vue

@@ -22,7 +22,7 @@
 
 		<view class="coupon-title">可用优惠券：{{ total }}</view>
 		<view class="coupon-list">
-			<u-radio-group v-model="radiovalue1" placement="column" @change="changeChechk()">
+			<u-radio-group v-model="radiovalue1" placement="column" @change="changeChechk($event)">
 				<view class="flex coupon-list-item" v-for="(item,index) in list" :key="index"
 					:style="{backgroundImage:`url(${ index == isActive ? backOn : backOff })`}">
 					<view class="flex coupon-list-item-info">

src/pages.json

@@ -199,7 +199,7 @@
 		}
 	},
 	"tabBar": {
-		"custom": true,
+		// "custom": true,
 		"color": "black",
 		"backgroundColor": "#FFFFFF",
 		"selectedColor": "red",

src/pages/activity/index.vue

@@ -68,7 +68,11 @@
 	import env from '../../config/env.js'
 	import $http from '@/utils/request.js'
 	import appId from '@/config/appId.js'
+	import CustomTabBar from '../../components/custom-tab-bar/custom-tab-bar.vue'
 	export default {
+		components: {
+			CustomTabBar,
+		},
 		data() {
 			return {
 				status: 'nomore',//上拉刷新状态

src/pages/index/index -2022-7-15.vue

@@ -4,7 +4,7 @@
 			<view class="index" :style="{ top: statusHeight + 'px' }">
 				<view class="barrage">
 					<!-- 背景 -->
-					<image class="barrage-bg" src="../../static/index/barrage_bg.png" mode="scaleToFill"></image>
+					<image class="barrage-bg" src="../../static/index/barrage_bgTwo.png" mode="scaleToFill"></image>
 					<!-- 中奖信息轮播 -->
 					<swiper class="barrage-swiper" :interval="2000" :autoplay="true" :vertical="true" :circular="true">
 						<swiper-item v-for="(item, index) in prizeNewsListOne" :key="index">
@@ -68,7 +68,7 @@
 					</view>
 					<!-- #ifdef MP-WEIXIN -->
 					<view class="proposal-tip" @click="contactService">
-						<image src="../../static/index/index_tip_bg.png" mode="scaleToFill"></image>
+						<image src="../../static/index/index_tip_bgTwo.png" mode="scaleToFill"></image>
 						<text>投诉建议</text>
 					</view>
 					<!-- #endif -->