Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/pages/user/placeOrderDetail/index.vue

@@ -39,7 +39,7 @@
           </div>
         </div>
       </div>
-      <span>下单人：{{userInfo.CustomerName}} {{userInfo.Phone}}</span>
+      <span>下单人：{{userInfo.customer.CustomerName}} {{userInfo.customer.Phone}}</span>
       <div class="bottom">
         <a @click="cancel">取消</a>
         <a @click="toPayer">确定</a>
@@ -146,7 +146,7 @@ export default {
     toPayer () { // 下单
       this.postData.info.OrgId = this.orgId
       this.postData.info.UserId = this.userInfo.CustomerId
-      this.postData.info.UserName = this.userInfo.CustomerName
+      this.postData.info.UserName = this.userInfo.customer.CustomerName
       this.postData.info.PayType = this.postData.coupon.length ? 'coupon' : 'vip'
       var orderInfo = JSON.parse(this.$route.query.info)
       this.postData.detail = []