Merge branch 'liuquan' of http://git.xiaodongai.com/WechatMiniProgram/XDJK into liuquan

packageA/productOrder/productOrder.js

@@ -253,10 +253,8 @@ Page({
    */
   goPay: debouce(function (e) {
     let that = this;
-    let orderClass = e.currentTarget.dataset.class;
-    console.log("orderClass", orderClass);
     let data = {
-      prescription: e.currentTarget.dataset.yfid,
+      prescription: e.currentTarget.dataset.prescription,
       patient_unionid: wx.getStorageSync('data').unionid,
       isquick: e.currentTarget.dataset.isquick
     }

packageA/productOrder/productOrder.wxml

@@ -71,7 +71,7 @@
 						</view>
 						<view class="ljzf" wx:if="{{item.status==2||item.status==3 || item.status==4}}" bindtap="goOrderDetail"
 							data-id="{{item.id}}">订单详情</view>
-						<view class="ljzf" wx:if="{{item.status==1}}" bindtap="goPay" data-id="{{item.id}}" data-yfid="{{item.yfid}}"
+						<view class="ljzf" wx:if="{{item.status==1}}" bindtap="goPay" data-id="{{item.id}}" data-prescription="{{item.modular==0?item.yfid:item.quickid}}"
 							data-isquick="{{item.modular}}">立即支付</view>
 						<view class="ljzf1" wx:if="{{item.status==5}}">订单过期</view>
 						<view class="ljzf1" wx:if="{{item.status==7}}">订单作废</view>