确认订单赠品字段修改

components/cm-module/creatOrder/goodsList.vue

@@ -13,7 +13,7 @@
 					<view class="goods-pros-t">
 						<view class="pros-img">
 							<image :src="pros.image" alt="" />
-							<text class="tips" v-if="pros.productType ==2 || pros.productType ==1">赠品</text>
+							<text class="tips" v-if="pros.giftType ==2 || pros.giftType ==1">赠品</text>
 						</view>
 						<view class="pros-product">
 							<view class="producttitle">{{pros.name}}</view>

components/cm-module/creatOrder/sellerGoodsList.vue

@@ -13,7 +13,7 @@
 					<view class="goods-pros-t">
 						<view class="pros-img">
 							<image :src="pros.image" alt="" />
-							<text class="tips" v-if="pros.productType == 2 || pros.productType == 1">赠品</text>
+							<text class="tips" v-if="pros.giftType == 2 || pros.giftType == 1">赠品</text>
 						</view>
 						<view class="pros-product">
 							<view class="producttitle">{{ pros.name }}</view>

components/cm-module/orderDetails/goodsList.vue

@@ -22,7 +22,7 @@
 						<view class="pros-left">
 							<view class="pros-img">
 								<image :src="pros.image" alt="" />
-								<text class="tips" v-if="pros.productType == 2 || pros.productType == 1">赠品</text>
+								<text class="tips" v-if="pros.giftType == 2 || pros.giftType == 1">赠品</text>
 							</view>
 						</view>
 						<view class="pros-product">

pages/seller/order/create-order.vue

@@ -504,7 +504,7 @@
 							productId:item.productId,
 							productNum:item.number,
 							presentNum:0,
-							productType:item.productType
+							productType:item.giftType
 						})
 					})
 					return {shopId:el.shopId,note:el.note?el.note:'',productInfo:productInfo}

pages/user/order/create-order.vue

@@ -572,7 +572,7 @@
 							productId:item.productId,
 							productNum:item.number,
 							presentNum:0,
-							productType:item.productType
+							productType:item.giftType
 						})
 					})
 					return {shopId:el.shopId,note:el.note?el.note:'',productInfo:productInfo}