Merge remote-tracking branch 'origin/master' into master

pages-userInfo/withdraw/withdraw.vue

@@ -32,7 +32,8 @@
 			  <view class="tl-font-28-34 tl-name" v-if="item.type == '1'">{{payType[1].title}}  {{item.accountNo}}</view>
 		      <view class="tl-font-28-34 tl-name" v-if="item.type == '2'">{{payType[2].title}}  {{item.accountNo}}</view>
 			 <view>
-			   <radio :value="item" color="#F2C827" :checked="item.isUse === '1'" class="radioStyle"/>
+			   <radio :value="JSON.stringify(item)" color="#F2C827" :checked="item.isUse === '1'" class="radioStyle"/>
+				<!-- <uni-data-checkbox v-model="item" :localdata="range" @change="change"></uni-data-checkbox> -->
 			 </view>
 			</view>
           </label>
@@ -122,12 +123,10 @@
 			},
 
 			radioChange: function(evt) {
-				console.log(JSON.stringify(evt.detail.value));
+				const param = JSON.parse(evt.detail.value);
 				let that = this;
-				  that.type = evt.detail.value.type;
+				  that.type = param.type;
-				  that.accountNo = evt.detail.value.accountNo;
+				  that.accountNo = param.accountNo;
-				  console.log(that.type);
-				  console.log(that.accountNo);
 			    },
 				
 			//检查是否超出余额

pages/userInfo/userInfo.vue

@@ -11,9 +11,9 @@
 			</view>
 		</view>
 		<view class="middle">
-			<uni-section title="我的资金" type="line" padding>
+			<uni-section title="我的数据" type="line" padding>
 				<uni-group mode="card">
-					<view>啦啦啦</view>
+					<view>粉丝数   点赞数    收藏数  </view>
 				</uni-group>
 			</uni-section>
 		</view>