Merge remote-tracking branch 'origin/developerE' into developerD

# Conflicts:
#	pages/user/order/order-pay.vue

components/cm-module/cm-seller/user.vue

@@ -82,12 +82,12 @@
 			</view>
 			<!-- 底部跳转 -->
 			<view class="foot-list">
-				<view class="list-cell-image" @click="navigator('/pages/user/coupon/coupon-activity')">
+<!-- 				<view class="list-cell-image" @click="navigator('/pages/user/coupon/coupon-activity')">
 					<view class="text">
 						<view class="h1">美博会</view>
 						<view class="p">大额好券等你来领~</view>
 					</view>
-				</view>
+				</view> -->
 				<view class="list-cell-item">
 					<view class="list-cell"  v-for="(item, index) in firstList" :key="index" @click="navigator(item.path)" hover-class="cell-hover" :hover-stay-time="50">
 						<view class="cell-icon">

manifest.json

@@ -64,6 +64,9 @@
             "postcss" : false
         },
         "usingComponents" : true,
+		"optimization" : {
+			"subPackages" : true
+		},
         "permission" : {},
         "navigateToMiniProgramAppIdList" : [ "wx5a5cda32926f55ac" ],
         "uniStatistics" : {

pages/user/member/member-pay.vue

@@ -169,7 +169,7 @@ export default {
 			this.payParams.code = await authorize.getCode('weixin')
 			this.PayService.PayOrderVipWechat(this.payParams)
 				.then(response => {
-					let PayInfo = JSON.parse(response.data.rt10_payInfo)
+					let PayInfo = JSON.parse(response.data.data.payInfo)
 					this.WxRequestPayment(PayInfo)
 				})
 				.catch(error => {
@@ -179,6 +179,7 @@ export default {
 		WxRequestPayment(data) {
 			// 微信支付Api
 			let self = this
+			console.log('data',data)
 			wx.requestPayment({
 				timeStamp: data.timeStamp,
 				nonceStr: data.nonceStr,

pages/user/order/order-pay.vue

@@ -224,16 +224,52 @@
 			},
 			buttonSubMit(){
 				switch(this.payType){
-					case '0':
+					case '0':// 微信支付
+						// 友盟埋点收集微信支付
+						if(process.env.NODE_ENV != 'development'){
+							this.$uma.trackEvent('Um_Event_ConfirmWechatPay', {
+								Um_Key_PageName: '微信支付',
+								Um_Key_SourcePage: '线上支付',
+								Um_Key_PayName:`${this.buttonText}`,
+								Um_Key_PayOrderID:`${this.orderId}`
+							})
+						}
 						this.MiniWxPayFor()
 						break
-					case '1':
+					case '1':// 企业网银
+						// 友盟埋点收集企业网银
+						if(process.env.NODE_ENV != 'development'){
+							this.$uma.trackEvent('Um_Event_ConfirmEbankPay', {
+								Um_Key_PageName: '企业网银',
+								Um_Key_SourcePage: '线上支付',
+								Um_Key_PayName:`${this.buttonText}`,
+								Um_Key_PayOrderID:`${this.orderId}`
+							})
+						}
 						this.BuildCatenate()
 						break
-					case '2':
+					case '2':// 个人网银
+						// 友盟埋点收集个人网银
+						if(process.env.NODE_ENV != 'development'){
+							this.$uma.trackEvent('Um_Event_ConfirmAbankPay', {
+								Um_Key_PageName: '个人网银',
+								Um_Key_SourcePage: '线上支付',
+								Um_Key_PayName:`${this.buttonText}`,
+								Um_Key_PayOrderID:`${this.orderId}`
+							})
+						}
 						this.BuildCatenate()
 						break
-					case '3':
+					case '3':// 大额支付
+						// 友盟埋点收集大额支付
+						if(process.env.NODE_ENV != 'development'){
+							this.$uma.trackEvent('Um_Event_ConfirmBigbankPay', {
+								Um_Key_PageName: '大额支付',
+								Um_Key_SourcePage: '线上支付',
+								Um_Key_PayName:`${this.buttonText}`,
+								Um_Key_PayOrderID:`${this.orderId}`
+							})
+						}
 						this.LargePayment()
 						break
 				}
@@ -308,15 +344,6 @@
 							orderId:this.orderId
 						}
 					this.PayService.WeChatMiniWxPay(params).then(response =>{
-						// 友盟埋点收集微信支付
-						if(process.env.NODE_ENV != 'development'){
-							this.$uma.trackEvent('Um_Event_ConfirmWechatPay', {
-								Um_Key_PageName: '微信支付',
-								Um_Key_SourcePage: '线上支付',
-								Um_Key_PayName:`${this.buttonText}`,
-								Um_Key_PayOrderID:`${this.orderId}`
-							})
-						}
 						let PayInfo = JSON.parse(response.data.data.payInfo)
 						this.WxRequestPayment(PayInfo)
 					}).catch(error =>{
@@ -326,6 +353,7 @@
 			},
 			WxRequestPayment(data){
 				let self = this
+				console.log('data',data)
 				wx.requestPayment({
 					'timeStamp': data.timeStamp,
 					'nonceStr': data.nonceStr,