Merge branch 'developerC' into developerA

src/main/resources/static/js/product/detail.js

@@ -386,7 +386,7 @@ var productDetail = new Vue({
                     }
                 });
         },
-        queryProductDetilsCoupons() {// 初始化商品详情优惠券信息
+        queryProductDetilsCoupons: function() {// 初始化商品详情优惠券信息
             var _self = this;
             ProductApi.QueryProductDetilsCoupons(_self.couponParam, function (response) {
                 if (response.code == 0) {

src/main/resources/static/js/product/promotions.js

@@ -77,7 +77,7 @@ var promotionsList = new Vue({
                     var resultData = res.data.list;
                     var productIdArr = [];
                     resultData.map(function (item) {
-                        productIdArr.push(item.id)
+                        productIdArr.push(item.productId)
                     });
                     setProductPrice(resultData, productIdArr.join(","), _self.userId, function () {
                         _self.$forceUpdate();

src/main/resources/static/js/shopping/confirm.js

@@ -761,7 +761,7 @@ var shoppingConfirm = new Vue({
                 }
             });
         },
-        getProductIds: function(list){
+        getProductIds: function(list){// 获取订单商品id列表
             var productIds = [];
             list.forEach(function(supplier){
                 supplier.cartList.forEach(function(product){

src/main/resources/templates/components/header.html

@@ -11,7 +11,7 @@
                         <div v-if="headCart.cartCount>0">
                             <div class="cartMain">
                                 <div class="cartItem" v-for="cart in headCart.cartList">
-                                    <a href="javascript:void(0)" @click="productDetailsFn(cart.id)">
+                                    <a href="javascript:void(0)" @click="productDetailsFn(cart.productId)">
                                         <img :src="cart.image" >
                                         <span class="name" v-text="cart.name"></span>
                                         <span class="unit" v-text="'包装规格：'+cart.unit"></span>

src/main/resources/templates/product/promotions.html

@@ -37,10 +37,10 @@
         <ul class="productList clear mfw">
             <li class="productItem mfc" v-for="p in listData">
                 <div class="item">
-                    <a class="image" :href="'/product-'+p.id+'.html'" target="_blank">
+                    <a class="image" :href="'/product-'+p.productId+'.html'" target="_blank">
                         <img :src="p.image" :alt="p.name">
                     </a>
-                    <a class="name" :href="'/product-'+p.id+'.html'" target="_blank">
+                    <a class="name" :href="'/product-'+p.productId+'.html'" target="_blank">
                         <span v-html="p.name"></span>
                     </a>
                     <div class="price mfhc">

src/main/resources/templates/supplier-center/order/logistics-add.html

@@ -35,7 +35,7 @@
                     </p>
                     <div class="user">
                         <p>买家名称：<span>{{userInfo.name}}</span></p>
-                        <p>收货人：<span>{{userInfo.shouHuoRen}}</span></p>
+                        <p>收货人：<span>{{userInfo.receiver}}</span></p>
                         <p>联系方式：<span>{{userInfo.mobile}}</span></p>
                     </div>
                     <p class="address">收货地址：<span>{{userInfo.address}}</span></p>