commit - m 修改订单详情

components/cm-module/orderDetails/orderInformation.vue

@@ -65,31 +65,31 @@
 					</view>
 				</view>
 				<view
-					class="information-view same"
+					class="information-view"
 					v-if="orderData.promotionFullReduction && orderData.promotionFullReduction > 0"
 				>
 					<view class="view-man">
 						促销满减：<label class="label">￥{{ orderData.promotionFullReduction | NumFormat }}</label>
 					</view>
 				</view>
-				<view class="information-view" v-if="orderData.couponAmount && orderData.couponAmount > 0">
+				<view class="information-view same">
 					<view class="view-man">
 						优惠券：<label class="label">￥{{ orderData.couponAmount | NumFormat }}</label>
 					</view>
 				</view>
-				<view class="information-view same" v-if="orderData.presentCount + orderData.promotionalGiftsCount > 0">
+				<view class="information-view">
 					<view class="view-man">
 						赠品总数：<label class="label">{{
 							orderData.presentCount + orderData.promotionalGiftsCount
 						}}</label>
 					</view>
 				</view>
-				<view class="information-view">
+				<view class="information-view same">
 					<view class="view-man">
 						应付总额：<label class="red">￥{{ orderData.payableAmount | NumFormat }}</label>
 					</view>
 				</view>
-				<view class="information-view same">
+				<view class="information-view">
 					<view class="view-num">
 						已支付：<label class="red">￥{{ orderData.receiptAmount | NumFormat }}</label>
 					</view>

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -112,26 +112,14 @@
 				this.shareCode = code
 			},
 			onShareCode(type){
-				if(this.order.onlinePayFlag!= 1){
-					this.PayService.PayOrderCheckoutCounter({orderId:this.order.orderId}).then(response =>{
-						let data = response.data.order
-						this.invoiceStatus =  data.invoiceStatus
-						//判断线上线下显示
-						if(this.invoiceStatus){
-							this.$util.modal('提示','由于商品发票属性的限制，本订单不能进行线上支付，请让客户选择线下转账方式付款','继续分享','知道了',true,() =>{
-								this.$parent.isShareModal = true
-							})		
-						}else{
-							this.$parent.isShareModal = true
-							this.$parent.isShareType = type
-						}
-					}).catch(error =>{
-						this.$util.msg(error.msg,2000)
-					})
+				if(this.order.onlinePayFlag == 1){
+					this.$util.modal('提示','本订单不能进行线上支付，请让客户选择线下转账方式付款','继续分享','知道了',true,() =>{
+						this.$parent.isShareModal = true
+					})	
 				}else{
 					this.$parent.isShareModal = true
+					this.$parent.isShareType = type
 				}
-				// this.$emit('shareConfirm')
 			},
 			btnConfirm(type,order){
 				let data = {

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -22,6 +22,9 @@
 			status: {
 				type:Number
 			},
+			order: {
+				type:Object
+			},
 			orderId: {
 				type:Number
 			},
@@ -99,11 +102,21 @@
 				this.shareCode = code
 			},
 			onShareCode(oID,uID,type){
-				this.$parent.isShareModal = true
-				this.$parent.btnoRderID = oID,
-				this.$parent.btnClubUserID = uID
-				this.$parent.isShareType = type
-				this.$emit('shareConfirm')
+				if(this.order.onlinePayFlag == 1){
+					this.$util.modal('提示','本订单不能进行线上支付，请让客户选择线下转账方式付款','继续分享','知道了',true,() =>{
+						this.$parent.isShareModal = true
+						this.$parent.btnoRderID = oID,
+						this.$parent.btnClubUserID = uID
+						this.$parent.isShareType = type
+						this.$emit('shareConfirm')
+					})	
+				}else{
+					this.$parent.isShareModal = true
+					this.$parent.btnoRderID = oID,
+					this.$parent.btnClubUserID = uID
+					this.$parent.isShareType = type
+					this.$emit('shareConfirm')
+				}
 			},
 			btnConfirm(type,orderId){
 				let data = {

main.js

@@ -5,7 +5,7 @@ import './services/index.js'
 import * as Api from '@/common/config/caimeiApi.js'
 import * as Regs from '@/common/config/common.js'
 // 友盟
-import Uma from './plugins/uma'
+// import Uma from './plugins/uma'
 
 // 公共组件 全局组件
 import { msg, modal, prePage, boundingClientRect } from './utils/util'
@@ -42,7 +42,7 @@ Vue.prototype.$Static = 'https://static.caimei365.com/app/img/'
 App.mpType = 'app'
 
 // 使用插件
-Vue.use(Uma)
+// Vue.use(Uma)
 
 const app = new Vue({
     ...App

manifest.json

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

pages/seller/order/order-list.vue

@@ -222,6 +222,7 @@
 								<order-button
 									ref="orderButton"
 									:status="order.status"
+									:order="order"
 									:orderId="order.orderId"
 									:rechargeGoods="order.rechargeGoods"
 									:userId="order.userId"

pages/user/order/order-sharelogin.vue

@@ -142,16 +142,10 @@ export default {
 					if(response.data.code == -1){
 						this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
 					}else{
-						if (response.data.onlinePayFlag === 1) {
-							this.$api.navigateTo(
-								`/pages/user/order/order-payment?type=onlinePay&Amount=${
-									response.data.pendingPayments
-								}&orderId=${orderId}`
-							)
+						if (response.data.onlinePayFlag === 1) {// 只能线下
+							this.$api.navigateTo(`/pages/user/order/order-payunder?orderId=${orderId}`)
 						} else {
-							this.$api.navigateTo(
-								`/pages/user/order/order-payment?type=payfirm&orderId=${orderId}`
-							)
+							this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${orderId}`)
 						}
 					}
 				})

pages/user/order/order-success.vue

@@ -67,7 +67,6 @@
 			},
 			initData(option){
 				const data = JSON.parse(option.data)
-				console.log('==========>',data)
 				this.orderId = data.data.orderId
 				this.payType = data.data.type
 				this.amuntMoney = data.data.payAmount
@@ -78,7 +77,6 @@
 					this.payStatus = false
 					this.successText = '订单支付失败'
 				}
-				console.log('主订单Id======>',this.orderId)
 				this.PayOrderCheckoutCounter(this.orderId)
 			},
 			PayOrderCheckoutCounter(orderId){//初始化支付信息
@@ -95,10 +93,10 @@
 				})
 			},
 			toAgainPay(){
-				this.$api.navigateTo(`/pages/user/order/order-pay-list?orderId=${this.orderId}`)
+				this.$api.reLaunch(`/pages/user/order/order-pay-list?orderId=${this.orderId}`)
 			},
 			details(){
-				this.$api.redirectTo('/pages/user/order/order-details?type=share&orderId='+this.orderId)
+				this.$api.reLaunch('/pages/user/order/order-details?type=share&orderId='+this.orderId)
 			}
 		},
 		onShow() {

plugins/uma/index.js

@@ -1,5 +1,5 @@
 // 友盟依赖包
-import uma from 'umtrack-wx'
+// import uma from 'umtrack-wx'
 import { umtrackWxKey as appKey } from './config.js'
 
 // 默认事件广播（防止报错）