Merge remote-tracking branch 'remotes/origin/timespace'

# Conflicts:
#	pages/book/b_addnew.js
#	project.config.json

@@ -113,7 +113,7 @@
                         </view>
                     </block>
                 </view>
-                <view class="flex-rr advice-more" bindtap="selectdesk" wx:if="{{tables.length>3 || form.id>0}}">
+                <view class="flex-rr advice-more" bindtap="selectdesk" wx:if="{{tables.length>3 || form.rid>0}}">
                     <view style="padding-right:30rpx;" class="gray-deep-font font26r">更多</view>
                     <image src="../image/click.png" class="icon12-22"></image>
                 </view>