app.json

@@ -9,6 +9,13 @@
     "pages/exam/index/index",
     "pages/exam/home/index",
     "pages/user/identify/index",
+<<<<<<< HEAD
+    "pages/study/course/index",
+    "pages/study/index/index",
+    "pages/study/sign/index",
+    "pages/study/market/index",
+=======
+>>>>>>> 6bcad0526cc12cd426186b6ef8155096e5462e6b
     "pages/post/post",
     "pages/train/index/index",
     "pages/train/limitHome/index",

pages/user/identify/index.wxml

@@ -1,5 +1,34 @@
+<<<<<<< HEAD
+<camera device-position="back" flash="auto" binderror="errorCamara" id="myCamera" wx:if="{{showcamara}}"
+  style="width: 100%; height:100vh;">
+  <cover-view class="mcover-view" style='width: 100%; height:100%; top:45%' wx:if="{{!hidden}}">
+    <cover-image class="dialog-body wh70" style='right:45%' src="/assets/loading.gif" />
+  </cover-view>
+  <cover-view class="mcover-bar" wx:if="{{hidden}}">
+    <cover-view class="mcover-view">
+      <cover-view>
+        <cover-image class="dialog-body circle wh60" src="/assets/img_gallery.png" bindtap="chooseImg" />
+      </cover-view>
+      <cover-view class="dialog-body camara" bindtap="takePhoto">
+        <cover-view class="camara-1"></cover-view>
+      </cover-view>
+
+      <cover-view>
+        <cover-image class="dialog-body circle wh60" src="/assets/img_close.png" bindtap="goBack" />
+      </cover-view>
+    </cover-view>
+  </cover-view>
+</camera>
+
+<scroll-view scroll-y="true" wx:else class="scroll-view">
+  <view class="identify-box" style="height:300rpx;">
+
+  </view>
+
+=======
 <scroll-view scroll-y="true" class="scroll-view">
   <view class="identify-box" style="height:240rpx;" > </view>
+>>>>>>> 6bcad0526cc12cd426186b6ef8155096e5462e6b
   <view class="p20 ">
     <view class="info-title">绑定用户信息</view>
     <form class="p20" bindsubmit="doIdentify">