Merge branch 'dev' into 'test'

缺陷调整

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

src/packageGoods/coupon/index.vue

@@ -22,10 +22,10 @@
 
 		<view class="coupon-title">可用优惠券：{{ total }}</view>
 		<view class="coupon-list">
-			<u-radio-group v-model="radiovalue1" placement="column" @change="changeChechk($event)">
+			<!-- <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">
+					:style="{backgroundImage:`url(${ index == isActive ? backOn : backOff })`}" @click="changeChechk(item.id)">
+					<view class="flex coupon-list-item-info" @click="exclusive(index)">
 						<view class="money">
 							<!-- <view class="">￥<text>{{ item.discount / 100 }}</text></view> -->
 							<view class="price flex">
@@ -41,15 +41,25 @@
 							</view>
 						</view>
 					</view>
-					<view class="uradio">
-						<u-radio :customStyle="{ marginBottom: '8px' }" :name="item.id" activeColor="#F9822C" size="24"
+					<view class="uradio" @click="exclusive(index)">
+						<view class="" style="background-color: #F9822C;width: 24px;height: 24px;border-radius: 50%;" v-if="index == isActive">
+							<div style="display: inline-block;margin: 4px;">
+								<u-icon name="checkbox-mark" color="#fff" size="16"></u-icon>
+							</div>
+						</view>
+						<view class="" style="background-color: rgb(200, 201, 204);width: 24px;height: 24px;border-radius: 50%;" v-else>
+							<div style="display: inline-block;margin: 4px;">
+								<u-icon name="checkbox-mark" color="#fff" size="16"></u-icon>
+							</div>
+						</view>
+						<!-- <u-radio :customStyle="{ marginBottom: '8px' }" :name="item.id" activeColor="#F9822C" size="24"
 							@change="exclusive(index)">
-						</u-radio>
+						</u-radio> -->
 					</view>
 				</view>
 				<u-loadmore :line="true" v-if="list.length>5" :status="status" :loading-text="'努力加载中'"
 					:nomore-text="'已经到底了'" />
-			</u-radio-group>
+			<!-- </u-radio-group> -->
 		</view>
 
 		<view class="flex empty" v-if="!list.length">

src/packagePrize/ticket/index.vue

@@ -140,8 +140,10 @@
 			changeTab(e) {
 				if (e.index == 0) {
 					this.state = 2
+					this.status = 'nomore'
 				} else if (e.index == 1) {
 					this.state = 3
+					this.status = 'nomore'
 				}
 				this.pageList()
 			},

src/pages/activity/index.vue

@@ -136,8 +136,10 @@
 			changeTab(e) {
 				if (e.index == 0) {
 					this.triggerStatus = 0
+					thsi.status = 'nomore'
 				} else if (e.index == 1) {
 					this.triggerStatus = 1
+					thsi.status = 'nomore'
 				}
 				this.pageList()
 			},