1

components/pwdCodeAlert/pwdCodeAlert.vue

@@ -5,7 +5,7 @@
 			<view class="title">请输入支付密码</view>
 			<view class="subTitle">您即将支付</view>
 			<view class="integral">{{integral}}<text>积分</text></view>
-			<validCode :maxlength="6" :isPwd="true" @finish="getPwd" @inputChange="inputChange"></validCode>
+			<validCode ref="pwd" :maxlength="6" :isPwd="true" @finish="getPwd" @inputChange="inputChange"></validCode>
 			<view @click="submit()" class="buy-bottom" :style="{'background-color':btnActive?'#FF0520':''}">确认支付</view>
 		</view>
 	</view>
@@ -45,9 +45,12 @@
 				if (!this.btnActive) {
 					return
 				}
+				this.close()
 				this.$emit('pwdSubmit', this.pwd)
 			},
 			close() {
+				this.pwd = ''
+				this.$refs.pwd.clear()
 				this.$parent[this.closeName] = false
 			}
 		}

components/smsCodeAlert/smsCodeAlert.vue

@@ -5,9 +5,9 @@
 			<view class="title">短信验证</view>
 			<view class="subTitle">已向<text>{{getPhone}}</text>手机号发送了一条验证短信,请将验证码填写进输入框中。</view>
 			<view class="code-content">
-				<validCode :maxlength="4" @finish="getPwd" @inputChange="inputChange"></validCode>
+				<validCode ref="code" :maxlength="4" @finish="getPwd" @inputChange="inputChange"></validCode>
 			</view>
-			<view @click="submit()" class="buy-bottom" :style="{'background-color':btnActive?'#FF0520':''}">确认支付</view>
+			<view @click="submit()" class="buy-bottom" :style="{'background-color':btnActive?'#FF0520':''}">确认</view>
 		</view>
 	</view>
 </template>
@@ -48,9 +48,12 @@
 				if (!this.btnActive) {
 					return
 				}
+				this.close()
 				this.$emit('smsCodeSubmit', this.code)
 			},
 			close() {
+				this.code = ''
+				this.$refs.code.clear()
 				this.$parent[this.closeName] = false
 			}
 		},

pages/home/home.vue

@@ -22,7 +22,7 @@
 				</view>
 			</view>
 		</view>
-		<uni-load-more v-if="brandList.length > 0" :status="loadingType"></uni-load-more>
+		<!-- <uni-load-more v-if="brandList.length > 0" :status="loadingType"></uni-load-more> -->
 	</view>
 </template>
 

pagesA/coupon/coupon.vue

@@ -63,7 +63,7 @@
 		<uni-load-more :status="loadingType" v-if="list.length>0"></uni-load-more>
 		<view class="empty" v-if="list.length<=0 && loadingType != 'loading'">
 			<image class="empty-img" src="../../static/empty-coupon.png" mode=""></image>
-			<view class="empty-text">暂无订单</view>
+			<view class="empty-text">暂无数据</view>
 		</view>
 		<view class="bottom" v-if="selectBtn" :style="{'height':safeAreaBottom+60+'px'}">
 			<view class="left">