Merge branch 'master' of https://gitee.com/wjl2008_admin/medicine_app

pages/bookShop/orderLCont.vue

@@ -235,6 +235,24 @@
             </view>
             <br clear="both" />
           </view>
+		  <view
+		    class="orderContent"
+		    v-else-if="orderContet.orderType == 'trainingClass'"
+		  >
+		    <image
+		      src="/static/icon/icon_pxb.png"
+		      mode="aspectFill"
+		      style="width: 100rpx; height: 100rpx"
+		    ></image>
+		    <view class="itemJian">
+		      <view class="orderTitle" style="line-height: 100rpx">
+		        <text>{{orderContet.remark}}</text>
+		      </view>
+		  
+		      <br clear="both" />
+		    </view>
+		    <br clear="both" />
+		  </view>
 
           <view class="order_item" style="">
             <view class="orderallpri">