合并分支 'sgj' 到 'master'

Sgj



查看合并请求 !3

 <view class="answer" wx:for="{{list}}" wx:for-index="index">
 <view class="answer" wx:for="{{list}}" wx:for-index="index">
-    <view class="answer_left" wx:if="{{item.id<9}}">0{{item.id}}</view>
-    <view class="answer_left" wx:else>{{item.id}}</view>
+    <view class="answer_left" wx:if="{{index+1<9}}">0{{index+1}}</view>
+    <view class="answer_left" wx:else>{{index+1}}</view>
     <view class="answer_right">
     <view class="answer_right">
         <view class="answer_question">{{item.title}}</view>
         <view class="answer_question">{{item.title}}</view>
         <radio-group bindchange="radioChange">
         <radio-group bindchange="radioChange">

@@ -70,7 +70,13 @@
 		<view class='my_itemletf'>
 		<view class='my_itemletf'>
 			<view class='iconfont '>
 			<view class='iconfont '>
 				<image src="/imgs/ac5.png"></image>
 				<image src="/imgs/ac5.png"></image>
-			</view>成为志愿者
+			</view>
+		<block wx:if="{{datalist.status==''}}">成为志愿者
+	
+		</block>
+		<block wx:if="{{datalist.status!=''}}">我的资料
+	
+  </block>
 		</view>
 		</view>
 		<view class='iconfont icon-xiangyou'></view>
 		<view class='iconfont icon-xiangyou'></view>
 
 

@@ -68,6 +68,13 @@
             let head = {
             let head = {
                 'XX-Token': wx.getStorageSync('token')
                 'XX-Token': wx.getStorageSync('token')
             }
             }
+            if(that.data.datalist==null){
+                wx.showToast({
+                  title: '请选择收货地址',
+                  icon:'none'
+                })
+                return;
+            }
             app.post(url, {
             app.post(url, {
                 good_id: that.data.goodsInfo.id,
                 good_id: that.data.goodsInfo.id,
                 num: that.data.count,
                 num: that.data.count,