1.新增实物商品

2.修改抽奖活动

high-unionPay/pages/order/confirmation.vue

@@ -93,6 +93,22 @@
 				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">邀请码</view>
 				<input class="width60 fotrt font15" v-model="identificationCode" placeholder="请输入邀请码" />
 			</view>
+		</view>
+		
+		<!-- //实物配置 -->
+		<view class="width94 backcorfff mart10" v-if="couponList.wherePost">
+			<view class="width94 alijusstart height50 font14 fcor666 bor-botm1">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系人</view>
+				<input class="width60 fotrt font15" v-model="contactPepole" placeholder="请输入联系人" />
+			</view>
+			<view class="width94 alijusstart height50 font14 fcor666 bor-botm1">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系电话</view>
+				<input class="width60 fotrt font15" v-model="contactPhone" placeholder="请输入联系电话" />
+			</view>
+			<view class="width94 alijusstart height50 font14 fcor666">
+				<view class="width40 fcor333 fontwig6 font16" style="padding-left: 2%;">联系地址</view>
+				<input class="width60 fotrt font15" v-model="contactAddress" placeholder="请输入联系地址" />
+			</view>
 		</view>
 
 		<view class="width94 comorder mart10">
@@ -247,7 +263,10 @@
 				isDiscont: false,
 				coupondiscountid: '',
 				typeId: '',
-				identificationCode: '' //渠道商
+				identificationCode: '' ,//渠道商
+				contactPepole: '', //联系人
+				contactPhone: '', //联系电话
+				contactAddress: '' //联系地址
 
 			};
 		},
@@ -440,7 +459,12 @@
 						"goodsId": this.couponId,
 						"saleCount": 1,
 						"storeId": this.storeId
-					}]
+					}],
+					"postData": {
+						"address": this.contactAddress,
+						"user": this.contactPepole,
+						"phone": this.contactPhone
+					}
 				}
 				addOrder(goods).then(res => {
 					if (res.return_code == '000000') {

high-unionPay/pages/user/order_details/order_details.vue

@@ -150,6 +150,30 @@
 				<view class="right">
 					{{recinfo.refusalRefundContent}}
 				</view>
+			</view>
+			<view class="row" v-if="materialData">
+				<view class="left">
+					联系人 :
+				</view>
+				<view class="right">
+					{{materialData.user}}
+				</view>
+			</view>
+			<view class="row" v-if="materialData">
+				<view class="left">
+					联系电话 :
+				</view>
+				<view class="right">
+					{{materialData.phone}}
+				</view>
+			</view>
+			<view class="row" v-if="materialData">
+				<view class="left">
+					联系地址 :
+				</view>
+				<view class="right">
+					{{materialData.address}}
+				</view>
 			</view>
 			<view class="row" v-if="recinfo.finishTime">
 				<view class="left">
@@ -286,7 +310,8 @@
 				imageUrl: app.globalData.imgUrl,
 				imagewxUrl: app.globalData.imageWxImg,
 				imgadres1: 'dhf.png',
-				preByOrderInfo: ''
+				preByOrderInfo: '',
+				materialData: '' //实物参数
 			};
 		},
 		onShow() {
@@ -343,7 +368,10 @@
 				getOrderById(params).then(res => {
 					if (res.return_code == '000000') {
 						uni.hideLoading();
-						this.recinfo = res.return_data;
+						this.recinfo = res.return_data;
+						if (res.return_data.remarks) {
+							this.materialData = JSON.parse(res.return_data.remarks);
+						}
 					} else {
 						uni.hideLoading()
 					}

high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue

@@ -19,7 +19,7 @@
 		</view>
 		<!-- 商品主图轮播 -->
 		<view class="swiper-box">
-			<swiper circular="true" autoplay="true" @change="swiperChange">
+			<swiper circular="true" autoplay="true"  style="height: 188px;"  @change="swiperChange">
 				<swiper-item v-for="(swiper,index) in swiperList" :key="index">
 					<image mode="widthFix" :src="imageUrl+swiper" @click="perImage(swiper)"></image>
 				</swiper-item>

high-unionPay/subPages/lottery/lottery.vue

@@ -193,6 +193,7 @@
 					couponId: this.couponId
 				}
 				getActivityByCoupon(params).then(res => {
+					uni.hideLoading();
 					if (res.return_code == '000000') {
 						let prizeLists = res.return_data.activityAward;
 						this.activityId = res.return_data.activityInfo.id;
@@ -287,7 +288,9 @@
 		},
 		onLoad(options) {
 			this.couponId = options.id
-			this.handleInitCanvas()
+		},
+		onShow() {
+			this.handleInitCanvas();
 		},
 		onUnload() {
 			uni.hideLoading()