Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/mall/goodlist.vue

@@ -531,6 +531,16 @@
         }
         this.mallapipost("/api/AppletOrder/SetERPGoodsOrderInfo", orderData, res => {
           if (res.data.resultCode == 1) {
+
+            let userInfo = this.getLocalStorage();
+            var resData = res.data.data;
+            this.payObj.orderId = resData.OrderId;
+            // this.payObj.TotalPrice = this.orderMsg.TotalPrice;
+            this.payObj.TotalPrice = 0.01;
+            this.payObj.contactName = userInfo.emName;
+            this.payObj.customerId = userInfo.EmployeeId;
+            this.payObj.outBranchId = userInfo.RB_Branch_id;
+
             this.Success("下单成功!");
             this.clreaMsg();
             this.getGoodList();