Merge branch 'dev' of maopiao/mp-ui-user into test

src/packageOther/about/index.vue

@@ -22,7 +22,7 @@
 			<view class="flex about-logo">
 				<image src="../../static/public/logo.png" mode="scaleToFill"></image>
 				<!-- #ifndef MP-ALIPAY -->
-				<view class="edition">v 1.0.17</view>
+				<view class="edition">v 1.1.0</view>
 				<!-- #endif -->
 				<!-- #ifdef MP-ALIPAY -->
 				<view class="edition">v 2.2.6</view>

src/packagePrize/bean/components/transfer.vue

@@ -77,7 +77,7 @@
 					return
 				}
 				if(Object.keys(this.info).length  == 0) {
-					uni.$u.toast('请确认转让用户')
+					uni.$u.toast('请确认转赠用户')
 					return
 				}
 				if(!this.beanNum) {