Merge branch 'master' into 1-12-dev

# Conflicts:
#	.gitignore
#	high-unionPay/pages/order/confirmation.vue
#	high-unionPay/pages/tabBar/home/home.vue
#	high-unionPay/pages/user/order_details/order_details.vue
1.解决冲突

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/high-unionPay.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

.idea/libraries/.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="银联">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/high-unionPay/unpackage/dist/build/h5/银联.zip!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/high-unionPay.iml" filepath="$PROJECT_DIR$/.idea/high-unionPay.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

high-unionPay/pages/order/confirmation.vue

@@ -69,6 +69,22 @@
 			</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">
 
 			<view class="width92 alijusstart paddtop20">
@@ -229,6 +245,12 @@
 				rechargeDes: '', // 支付详情
 				rebateIntegral: '', //返回积分
 				Integrastu: 1 //返积分状态
+				typeId: '',
+				identificationCode: '' ,//渠道商
+				contactPepole: '', //联系人
+				contactPhone: '', //联系电话
+				contactAddress: '' //联系地址
+
 			};
 		},
 		onLoad(option) {
@@ -507,6 +529,13 @@
 					"payGold": this.priceValue[1],
 					"promoteCode": this.identificationCode,
 					memDiscountId: this.memDiscountId
+						"storeId": this.storeId
+					}],
+					"postData": {
+						"address": this.contactAddress,
+						"user": this.contactPepole,
+						"phone": this.contactPhone
+					}
 				}
 				create(goods).then(res => {
 					if (res.return_code == '000000') {

high-unionPay/pages/tabBar/category/category.vue

@@ -272,9 +272,11 @@
 			},
 			//拨打客服电话
 			playPhone() {
+				let cont = "本服务由惠兑礼品提供\n400-678-738";
+				let content = cont.replace(/<br>/g,"\n");
 				uni.showModal({
 					title: '客服',
-					content: '4006780738',
+					content: content,
 					success: function(res) {
 						if (res.confirm) {
 							uni.makePhoneCall({

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

@@ -488,9 +488,11 @@
 			},
 			//拨打客服电话
 			playPhone() {
+				let cont = "本服务由惠兑礼品提供\n400-678-738";
+				let content = cont.replace(/<br>/g,"\n");
 				uni.showModal({
 					title: '客服',
-					content: '4006780738',
+					content: content,
 					success: function(res) {
 						if (res.confirm) {
 							uni.makePhoneCall({

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

@@ -319,6 +319,30 @@
 					{{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">
 					完成时间 :
@@ -466,6 +490,8 @@
 				imagewxUrl: app.globalData.imageWxImg,
 				imgadres1: 'dhf.png',
 				preByOrderInfo: '',
+				materialData: '' //实物参数
+				preByOrderInfo: '',
 				countdownh: '', //倒计时时
 				countdownm: '', // 倒计时分
 				countdowns: '', // 倒计时秒
@@ -563,6 +589,11 @@
 					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.oilList = 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()