Merge branch 'sit-Carl' into sit-Leung

# Conflicts:
#	rc-busness/pages/personal/settlement.vue
#	rc-busness/pages/personal/userpay.vue

rc-busness/pages/productdetails/producted.vue

@@ -328,7 +328,7 @@ export default {
 			userbuy = true;
 		}
 		if(!curItem || curItem.productName == undefined)
-			throw new Error("The id property is missing.");
+			throw new Error("商品信息错误");
 		let crumbs = [
 			{
 				path:'/productdetails/productlist/',
@@ -582,7 +582,8 @@ export default {
         item.picFile,
         item.productName,
         item.basePrice,
-        item.specifications
+        item.specifications,
+        item.leftAllotment
       );
       if (data) {
         this.productlist = data;