提测

api/order.js

@@ -9,8 +9,6 @@ import $reg from '@/common/config/common.js'
 
 /**
  *@结算页面
- *@param productIds 商品ID【”,”分割】
- *@param count		立即购买商品数量，购物车count为nul
  */
 export function createOrderInfo(params) {
 	return new Promise(function(resolve,reject) {
@@ -25,8 +23,6 @@ export function createOrderInfo(params) {
 }
 /**
  *@提交订单
- *@param productIds 商品ID【”,”分割】
- *@param count	立即购买商品数量，购物车count为nul
  */
 export function createOrderSubmit(params) {
 	return new Promise(function(resolve,reject) {

components/module/creatOrder/invoiceTent.vue

@@ -23,7 +23,7 @@
 							</label>
 						</radio-group>
 					</view>
-					<view class="invoice-main from" v-if="invoiceType == '1'">
+					<view class="invoice-main from" v-if="invoiceType == '3'">
 						<view class="invoice-from">
 							<view class="label">单位名称:</view>
 							<input class="form-input" type="text" v-model="invoiceData.invoiceTitle" placeholder="请填写单位信息(必填)" maxlength="20">
@@ -50,7 +50,7 @@
 								   type="text" 
 								   v-model="invoiceData.bankAccountNo" 
 								   placeholder="请填写银行账号(必填)" 
-								   maxlength="25">
+								   maxlength="19">
 						</view>
 					</view>
 					<view class="invoice-main" v-if="invoiceType == '2'">
@@ -82,7 +82,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="invoice-main" v-if="invoiceType == '3'">
+					<view class="invoice-main" v-if="invoiceType == '1'">
 						<view class="invoice-none">不开具发票信息</view>
 					</view>
 				</view>
@@ -95,31 +95,28 @@
 </template>
 
 <script>
+	import { getFindInvoice,updateInvoice } from "@/api/order.js"
 	export default{
 		name:"invoice",
-		props:{
-			invoiceDatas:{
-				type:Object
-			}
-		},
 		data() {
 			return{
-				invoiceText:'',
+				invoiceText:'不开发票',
 				specClass: '',//规格弹窗css类，控制开关动画
 				invoiceType:'1',//发票类型
 				current:0,
 				titleCurrent:0,
 				inventoryChecked:false,
 				invoiceTypeList:[
-					{value:'1',name:'增值税发票'},
+					{value:'1',name:'不开发票'},
 					{value:'2',name:'普通发票'},
-					{value:'3',name:'不开发票'},
+					{value:'3',name:'增值税发票'},
 				],
 				invoiceTitleList:[
 					{value:'0',name:'个人'},
 					{value:'1',name:'公司'},
 				],
 				invoiceData:{
+					id:'',
 					invoiceContent:'',	 //商品明细
 					invoiceTitle:'',	 //单位名称
 					corporationTaxNum:'',//纳税人识别号
@@ -132,35 +129,46 @@
 			}
 		},
 		created(){
-			this.initData(this.invoiceDatas)
+			// this.initData(this.invoiceDatas)
 		},
 		computed: {
 
 		},
 		methods:{
-			initData(res) {
-				if(res){
-					this.invoiceText = '无发票信息'
-				}else{
-					this.invoiceData = res
-					this.invoiceText = res.invoiceTitle
-					this.invoiceData.bankAccountNo = this.$reg.bankRegex(res.bankAccountNo)
-				}
+			getUseFindInvoice(){//获取发票信息
+				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+					getFindInvoice({userId:resolve.userID}).then(response =>{
+						if(response.data == null){
+							this.invoiceData = Object.assign(this.invoiceData,'',{type:0})
+						}else{
+							this.invoiceData = response.data
+						} 
+					})
+				})
+			},
+			updateInvoiceFn(){//保存发票信息
+				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+					let params =Object.assign(this.invoiceData,'',{userId:resolve.userID})
+					updateInvoice(params).then(response =>{})
+				})
 			},
 			choiceaInvoiceConfim(){
 				switch(this.invoiceType){
 					case '1':
-						this.choiceaInvoiceFirst()
-						this.invoiceText = this.invoiceData.invoiceTitle
+						this.choiceaInvoiceThree()
+						this.invoiceText = '不开发票'
 						break;
 					case '2':
 						this.choiceaInvoiceTwo()
 						this.invoiceText = this.invoiceData.invoiceTitle
 						break;
 					case '3':
+						this.choiceaInvoiceFirst()
+						this.invoiceText = this.invoiceData.invoiceTitle
+						break;	
+						default:
 						this.choiceaInvoiceThree()
 						this.invoiceText = '不开发票'
-						break;	
 				}
 			},
 			choiceaInvoiceFirst(){//增值税发票
@@ -188,6 +196,7 @@
 					this.$util.msg('请输入银行账号',2000)
 					return
 				}
+				this.updateInvoiceFn()
 				this.$emit('handleChoiceaInvoice',Object.assign(this.invoiceData,'',{type:2}))
 				this.hideSpec()
 			},
@@ -238,6 +247,9 @@
 						break;
 					}
 				}
+				if(this.invoiceType == '3'){
+					this.getUseFindInvoice()
+				}
 			},
 			radioChangeTitle(e) {
 				this.invoiceData.invoiceTitleType = e.target.value;

components/module/creatOrder/sellerFreight.vue

@@ -76,7 +76,6 @@
 		},
 		methods:{
 			infoData(data){//初始化运费
-				// console.log(data)
 				switch(data.freePostFlag){
 					case 1:
 						this.current = 0;
@@ -98,13 +97,13 @@
 			},
 			freightConfim(){//提交完成运费选择
 				switch(this.freightData.freePostFlag){
-					case '1':
+					case 1:
 						this.choiceaFreightFirst(this.freightData.freePostFlag)
 						break;
-					case '0':
+					case 0:
 						this.choiceaFreightFirst(this.freightData.freePostFlag)
 						break;
-					case '-1':
+					case -1:
 						this.choiceaFreightFirst(this.freightData.freePostFlag)
 						break;	
 				}		
@@ -135,15 +134,15 @@
 				this.specClass = 'show';
 			},
 			radioChange(e) {//运费选择切换
-				this.freightData.freePostFlag = e.target.value;
+				this.freightData.freePostFlag = parseInt(e.target.value);
 				switch(this.freightData.freePostFlag){
-					case'1':
+					case 1:
 						this.freightText = '不包邮'
 						break;
-					case '0':
+					case 0:
 						this.freightText = '包邮'
 						break;
-					case '-1':
+					case -1:
 						this.freightText = '到付'
 						break;	
 				}		

components/module/creatOrder/sellerInvoice.vue

@@ -23,7 +23,7 @@
 							</label>
 						</radio-group>
 					</view>
-					<view class="invoice-main from" v-if="invoiceType == '1'">
+					<view class="invoice-main from" v-if="invoiceType == '3'">
 						<view class="invoice-from">
 							<view class="label">单位名称:</view>
 							<input class="form-input" type="text" v-model="invoiceData.invoiceTitle" placeholder="请填写单位信息(必填)" maxlength="20">
@@ -50,7 +50,7 @@
 								   type="text" 
 								   v-model="invoiceData.bankAccountNo" 
 								   placeholder="请填写银行账号(必填)" 
-								   maxlength="25">
+								   maxlength="19">
 						</view>
 					</view>
 					<view class="invoice-main" v-if="invoiceType == '2'">
@@ -82,7 +82,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="invoice-main" v-if="invoiceType == '3'">
+					<view class="invoice-main" v-if="invoiceType == '1'">
 						<view class="invoice-none">不开具发票信息</view>
 					</view>
 				</view>
@@ -95,31 +95,28 @@
 </template>
 
 <script>
+	import { getFindInvoice,updateInvoice } from "@/api/order.js"
 	export default{
 		name:"invoice",
-		props:{
-			invoiceDatas:{
-				type:Object
-			}
-		},
 		data() {
 			return{
-				invoiceText:'',
+				invoiceText:'不开发票',
 				specClass: '',//规格弹窗css类，控制开关动画
 				invoiceType:'1',//发票类型
 				current:0,
 				titleCurrent:0,
 				inventoryChecked:false,
 				invoiceTypeList:[
-					{value:'1',name:'增值税发票'},
+					{value:'1',name:'不开发票'},
 					{value:'2',name:'普通发票'},
-					{value:'3',name:'不开发票'},
+					{value:'3',name:'增值税发票'},
 				],
 				invoiceTitleList:[
 					{value:'0',name:'个人'},
 					{value:'1',name:'公司'},
 				],
 				invoiceData:{
+					id:'',
 					invoiceContent:'',	 //商品明细
 					invoiceTitle:'',	 //单位名称
 					corporationTaxNum:'',//纳税人识别号
@@ -132,34 +129,42 @@
 			}
 		},
 		created(){
-			this.initData(this.invoiceDatas)
+			// this.initData(this.invoiceDatas)
 		},
 		computed: {
 
 		},
 		methods:{
-			initData(res) {
-				if(res){
-					this.invoiceText = '无发票信息'
-				}else{
-					this.invoiceData = res
-					this.invoiceText = res.invoiceTitle
-					this.invoiceData.bankAccountNo = this.$reg.bankRegex(res.bankAccountNo)
-				}
+			getUseFindInvoice(){//获取发票信息
+				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+					getFindInvoice({userId:resolve.userID}).then(response =>{
+						if(response.data == null){
+							this.invoiceData = Object.assign(this.invoiceData,'',{type:0})
+						}else{
+							this.invoiceData = response.data
+						} 
+					})
+				})
+			},
+			updateInvoiceFn(){//保存发票信息
+				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+					let params =Object.assign(this.invoiceData,'',{userId:resolve.userID})
+					updateInvoice(params).then(response =>{})
+				})
 			},
 			choiceaInvoiceConfim(){
 				switch(this.invoiceType){
 					case '1':
-						this.choiceaInvoiceFirst()
-						this.invoiceText = this.invoiceData.invoiceTitle
+						this.choiceaInvoiceThree()
+						this.invoiceText = '不开发票'
 						break;
 					case '2':
 						this.choiceaInvoiceTwo()
 						this.invoiceText = this.invoiceData.invoiceTitle
 						break;
 					case '3':
-						this.choiceaInvoiceThree()
-						this.invoiceText = '不开发票'
+						this.choiceaInvoiceFirst()
+						this.invoiceText = this.invoiceData.invoiceTitle
 						break;
 						default:
 						this.choiceaInvoiceThree()
@@ -191,6 +196,7 @@
 					this.$util.msg('请输入银行账号',2000)
 					return
 				}
+				this.updateInvoiceFn()
 				this.$emit('handleChoiceaInvoice',Object.assign(this.invoiceData,'',{type:2}))
 				this.hideSpec()
 			},
@@ -241,6 +247,9 @@
 						break;
 					}
 				}
+				if(this.invoiceType == '3'){
+					this.getUseFindInvoice()
+				}
 			},
 			radioChangeTitle(e) {
 				this.invoiceData.invoiceTitleType = e.target.value;

components/module/orderDetails/goodsList.vue

@@ -21,7 +21,7 @@
 							</view>
 							<view class="product-view">
 								<view class="view-num">税率：{{pros.taxRate}}%</view>
-								<view class="view-num">折扣：{{discount == null ? '0' : discount}}%</view>
+								<view class="view-num">折扣：{{pros.discount == null ? '0' : pros.discount}}%</view>
 							</view>
 							<view class="product-view">
 								<view class="view-num">折后单价：￥{{pros.discountPrice.toFixed(2)}}</view>

components/module/orderDetails/invoiceTent.vue

@@ -4,7 +4,7 @@
 		 <view class="invoice-content">
 		 	<view class="invoice-title">发票信息</view>
 			<view class="invoice-empty" v-if="isEmpty">
-			 	<text>无<text class="txt">（请到个人中心页面填写发票信息）</text></text>
+			 	<text>不开发票</text></text>
 			</view>
 			<view class="invoice-text" v-else>
 				<view class="invoice-top" @click="showInvoice">

components/module/orderDetails/orderInformation.vue

@@ -17,7 +17,9 @@
 				<view class="view-man">余额抵扣：￥{{balancePayFee =='undefined' ? '' : balancePayFee}}</view>
 			</view>
 			<view class="information-view">
-				<view class="view-num">运费：￥{{freight =='undefined' ? '0.00' : freight}}</view>
+				<view class="view-num" v-if="freePostFlag == '0'">运费：包邮</view>
+				<view class="view-num" v-if="freePostFlag == '-1'">运费：到付</view>
+				<view class="view-num" v-if="freePostFlag == '1'">运费：￥{{freight}}</view>
 				<view class="view-man">经理折扣：￥{{discountFee =='undefined' ? '' : discountFee}}</view>
 			</view>
 			<view class="information-view">
@@ -45,8 +47,9 @@
 				orderData:'',
 				payTotalFee:'',
 				balancePayFee:'',
-				discountFee:'',
 				freight:'',
+				discountFee:'',
+				freePostFlag:'',
 				payableAmount:'',
 				typeText:'',
 				expensesOfTaxation:'',
@@ -91,6 +94,7 @@
 				this.payableAmount =this.toFiexdFn(res.payableAmount);	//应付总额
 				this.balancePayFee = this.toFiexdFn(res.balancePayFee);
 				this.discountFee = this.toFiexdFn(res.discountFee);
+				this.freePostFlag = res.freePostFlag;
 				this.freight = this.toFiexdFn(res.freight);
 				this.expensesOfTaxation = this.toFiexdFn(res.expensesOfTaxation);
 				Object.keys(this.typeTextObject).forEach(key => {

components/seller/category.vue

@@ -6,7 +6,7 @@
 				<bt-search :clickPath="clickPath" :toestText='hotSearchText'></bt-search>
 			</view> -->
 			<!-- 左侧分类导航 -->
-			<scroll-view class="left-aside" scroll-y="true" scroll-with-animation :scroll-top="verticalNavTop" style="height:calc(100vh - 202rpx)">
+			<scroll-view class="left-aside" scroll-y="true" scroll-with-animation :scroll-top="verticalNavTop" style="height:calc(100vh - 202rpx)" :style="{top:CustomBar+'px'}">
 				<view class="row" v-if="m.smalltypeList.length > 0" v-for="(m, index) in categoryList" :key="index" :class="[index==showCategoryIndex?'on':'']" @tap="showCategory($event,index)" :data-id="index">
 					<view class="text">
 						{{m.name}}
@@ -15,7 +15,7 @@
 				</view>
 			</scroll-view>
 			<!--右侧子导航-->
-			<scroll-view  scroll-y="true" class="right-aside" style="height:calc(100vh - 202rpx)">
+			<scroll-view  scroll-y="true" class="right-aside" style="height:calc(100vh - 202rpx)" :style="{top:CustomBar+'px'}">
 				<view class="category" v-if="n.smalltypeList.length > 0" v-for="(n,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
 					<view class="category-box" v-for="(o,oIndex) in n.smalltypeList" :key="oIndex">
 						<view class="title">{{o.name}}</view>
@@ -52,6 +52,7 @@
 				search: '',
 				cateTop: {},
 				verticalNavTop: 0,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
 			}
 		},
 		created() {
@@ -132,7 +133,6 @@
 		.left-aside{
 			width: 200rpx;
 			left: 0rpx;
-			top: 110rpx;
 			background-color: #f2f2f2;
 			.row{
 				width: 100%;
@@ -181,7 +181,6 @@
 		.right-aside{
 			width: 550rpx;
 			left: 200rpx;
-			top: 120rpx;
 			background: #FFFFFF;
 			.category{
 				width: calc(100%);

market/pages/cart/cart.vue

@@ -137,11 +137,7 @@
 			}
 		},
 		onLoad(){
-			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.clubId = resolve.clubID
-			})
 			this.setScrollHeight();
-			this.initData()
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -353,16 +349,9 @@
 			    })
 			},		
 			changeCountAdd(item,pros){//商品数量加加
-				if(pros.productCount>=pros.stock){
-					pros.productCount= pros.stock
-					this.isStock =true
-					return
-				}else{
-					pros.productCount++
-					this.processActivityPrice(pros)
-					this.isStock =false
-				}
-				
+				pros.productCount++
+				this.processActivityPrice(pros)
+				this.isStock =false
 				this.updateShoppogNum(pros)
 				this.totalShopPeice();
 			},
@@ -524,8 +513,11 @@
 			uni.stopPullDownRefresh()
 		},
 		onShow(){
-		
-		},
+			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
+				this.clubId = resolve.clubID
+				this.initData()
+			})
+		}
 	}
 </script>
 

market/pages/club/club-list.vue

@@ -259,6 +259,7 @@
 			.list-left{
 				height: 140rpx;
 				flex: 2;
+				margin-right: 10rpx;
 				.list-head{
 					width: 140rpx;
 					height: 140rpx;

market/pages/club/list.vue

@@ -23,7 +23,7 @@
 							<view class="list-tel">
 								<text class="txt">{{item.name}}</text>
 								<text class="txt sm">
-									<text class="txt-le">{{item.linkMan1}}</text>
+									<text class="txt-le">{{item.linkMan1 ? item.linkMan1 : ''}}</text>
 									{{item.contractMobile1 ? item.contractMobile1 : ''}}</text>
 							</view>
 						</view>

market/pages/login/apply.vue

@@ -49,7 +49,7 @@
 				<view class="register-from"  @click="showMulLinkageThreePicker">
 					<view class="label">机构地址:</view>
 					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
-						{{addressData.address}}
+						{{addressData.address ? addressData.address :''}}
 					</text>		
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
@@ -330,9 +330,9 @@ import { mapMutations } from 'vuex';
 					this.uploadMentuzImage = organizationClub.headpic
 					this.uploadMedicalImage = organizationClub.medicalPracticeLicenseImg
 					this.department = organizationClub.department						
-					this.clubTelePhone = organizationClub. contractPhone
-					this.clubFax = organizationClub.fax
-					this.companyPprofile = organizationClub.info
+					this.clubTelePhone = organizationClub.contractPhone ? organizationClub.contractPhone : ''
+					this.clubFax = organizationClub.fax ? organizationClub.fax : ''
+					this.companyPprofile = organizationClub.info ? organizationClub.info : ''
 					//机构类型&&主营项目
 					switch(this.firstClubType){
 						case '1':
@@ -408,7 +408,7 @@ import { mapMutations } from 'vuex';
 				}
 				console.log(params)
 				sellerClubUpdate(params).then(response =>{
-					this.$util.msg('修改成功',2000);
+					this.$util.msg('提交成功',2000,true,'success')
 					setTimeout(()=>{
 						uni.navigateBack({
 							delta: 1

market/pages/login/information.vue

@@ -34,7 +34,7 @@
 				<view class="register-from"  @click="showMulLinkageThreePicker">
 					<view class="label">机构地址:</view>
 					<text class="row-input" :class="addressData.address === '请选择机构所在地区' ? 'none' : ''">
-						{{addressData.address}}
+						{{addressData.address ? addressData.address :''}}
 					</text>		
 					<text class="iconfont icon-xiayibu"></text>
 				</view>
@@ -415,7 +415,7 @@
 						info : this.companyPprofile
 				}
 				sellerClubUpdate(params).then(response =>{
-					this.$util.msg('修改成功',2000);
+					this.$util.msg('修改成功',2000,true,'success')
 					setTimeout(()=>{
 						uni.navigateBack({
 							delta: 1

market/pages/login/login.vue

@@ -9,9 +9,9 @@
 			<view class="login-input">
 				<input type="text" 
 					   v-model="accountNumber"  
-					   maxlength="30" 
+					   maxlength="11" 
 					   class="input" 
-					   placeholder="请输入邮箱/手机号"
+					   placeholder="请输入手机号"
 				/>
 			</view>
 			<view class="login-input">

market/pages/order/create-order.vue

@@ -69,7 +69,7 @@
 	import freightAlert from '@/components/module/modelAlert/freightAlert.vue'
 	import modalLayer from "@/components/modal-layer"
 	import { queryAddressList } from "@/api/cart.js" 
-	import { getOrderPostage,getFindInvoice,updateInvoice } from "@/api/order.js" 
+	import { getOrderPostage } from "@/api/order.js" 
 	import { sellerSettlement,sellerCreateOrderSubmit } from "@/api/seller.js" 
 	export default {
 		components:{
@@ -107,7 +107,7 @@
 				ischecked:false,	      //是否勾选余额
 				addressData:{},			  //初始化地址信息
 				goodsData:[],			  //初始化商品信息
-				invoiceData:{},			  //初始化发票信息
+				invoiceData:{type:0},	  //初始化发票信息
 				freightData:{},			  //邮费数据
 				orderInfo:[],			  //提交的商品信息
 				payInfo:{},				  //订单信息
@@ -137,7 +137,6 @@
 						this.isRequest = true
 						this.goodsData = resData.shopList
 						this.userMoney = resData.userMoney
-						this.getUseFindInvoice()
 					}).catch(response =>{
 						this.$util.msg(response.msg,2000)
 					})
@@ -162,17 +161,7 @@
 					})	
 				})
 			},
-			getUseFindInvoice(){//获取发票信息
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					getFindInvoice({userID:resolve.userID}).then(response =>{
-						if(response.data == null){
-							this.invoiceData = Object.assign(this.invoiceData,'',{type:0})
-						}else{
-							this.invoiceData = response.data
-						} 
-					})
-				})
-			},
+
 			getAddressData(){//获取地址信息
 				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
 					queryAddressList({pageNum:1,pageSize:1,userID:resolve.userID}).then(response =>{
@@ -194,11 +183,6 @@
 			},
 			handleChoiceaInvoiceData(data){//获取发票信息
 				this.invoiceData = data
-				this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-					let params =Object.assign(data,'',{userID:resolve.userID})
-					updateInvoice(params).then(response =>{
-					})
-				})
 			},
 			handleChoiceaFreightData(data){//获取运费信息
 				console.log(data)
@@ -282,7 +266,7 @@
 						clauseId:0,//条款（暂时保留）
 						orderShouldPayFee:this.payAllPrice.toFixed(2),//提交的总价
 						balancePayFlag:this.balanceDeductionFlag,//余额抵扣的状态
-						freight:this.freightData.freight>0 ? this.freightData.freight : this.freightData.freight.toFixed(2),//邮费
+						freight:parseInt(this.freightData.freight).toFixed(2),//邮费
 						freePostFlag:parseInt(this.freightData.freePostFlag)//运费形式
 					}
 				let params = {

market/pages/order/order-details.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container details clearfix">
+	<view class="container details clearfix" :style="{paddingBottom :isIphoneX ? (130+68)+'rpx' : '130rpx'}">
 		<!-- 自定义返回 -->
 		<header-back :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :isShare='isOrderShare'></header-back>
 		<view class="container-details" :style="{paddingTop:navbarHeight+'px'}">
@@ -81,6 +81,8 @@
 				navbarHeight:'',
 				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
 				systeminfo: this.setSysteminfo(),		 //获取设备信息
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
 				nvabarData: {							 //顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
 					title: '订单详情', // 导航栏 中间的标题
@@ -229,9 +231,6 @@
 		height: auto;
 		background:#F7F7F7;
 	}
-	.details{
-		padding-bottom: 130rpx;
-	}
 	.btn-hover{
 		background: #FFFFFF;
 	}

market/pages/order/order-history.vue

@@ -10,7 +10,7 @@
 					<view class="list" v-for="(item, index) in historyList" :key="index">
 						<view class="list-left">
 							<view class="list-p">订单号:<text class="txt">{{item.orderNo}}</text><text v-if="item.orderSubmitType == 3" class="tag">协销</text></view>
-							<view class="list-p">总金额:<text class="txt">￥{{orderPriceToFixed(item.productTotalFee)}}</text></view>
+							<view class="list-p">总金额:<text class="txt">￥{{orderPriceToFixed(item.payTotalFee)}}</text></view>
 							<view class="list-p">数量(赠):<text class="txt">{{item.productCount}}({{item.presentCount}})</text></view>
 						</view>
 						<view class="list-opea">

pages/user/order/create-order.vue

@@ -68,7 +68,7 @@
 	import freightAlert from '@/components/module/modelAlert/freightAlert'
 	import modalLayer from "@/components/modal-layer"
 	import { queryAddressList } from "@/api/cart.js" 
-	import { createOrderInfo,createOrderSubmit,getOrderPostage,getFindInvoice,updateInvoice } from "@/api/order.js" 
+	import { createOrderInfo,createOrderSubmit,getOrderPostage } from "@/api/order.js" 
 	
 	export default {
 		components:{
@@ -105,7 +105,7 @@
 				ischecked:false,	      //是否勾选余额
 				addressData:{},			  //初始化地址信息
 				goodsData:[],			  //初始化商品信息
-				invoiceData:{},			  //初始化发票信息
+				invoiceData:{type:0},	  //初始化发票信息
 				freightData:{},			  //邮费数据
 				orderInfo:[],			  //提交的商品信息
 				payInfo:{},				  //订单信息
@@ -139,7 +139,6 @@
 					this.isRequest = true
 					this.goodsData = resData.shopList
 					this.userMoney = resData.userMoney
-					this.getUseFindInvoice()
 				}).catch(response =>{
 					this.$util.msg(response.msg,2000)
 				})
@@ -159,15 +158,6 @@
 					}
 				})	
 			},
-			getUseFindInvoice(){//获取发票信息
-				getFindInvoice({userID:this.userID}).then(response =>{
-					if(response.data == null){
-						this.invoiceData = Object.assign(this.invoiceData,'',{type:0})
-					}else{
-						this.invoiceData = response.data
-					} 
-				})
-			},
 			getAddressData(){//获取地址信息
 				this.$api.getStorage().then((resolve) => {
 					queryAddressList({pageNum:1,pageSize:1,userID:resolve.userID}).then(response =>{
@@ -189,10 +179,6 @@
 			},
 			handleChoiceaInvoiceData(data){//获取发票信息
 				this.invoiceData = data
-				let params =Object.assign(data,'',{userID:this.userID})
-				updateInvoice(params).then(response =>{
-					console.log('<=====保存发票信息成功====>')
-				})
 			},
 			checkedBalabce(){//勾选使用余额
 				if(this.userMoney > 0){

pages/user/order/order-details.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="container details clearfix">
+	<view class="container details clearfix" :style="{paddingBottom :isIphoneX ? (130+68)+'rpx' : '130rpx'}">
 		<!-- 自定义返回 -->
 		<header-back :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :isShare='isOrderShare'></header-back>
 		<view class="container-details" :style="{paddingTop:navbarHeight+'px'}">
@@ -81,6 +81,8 @@
 				navbarHeight:'',
 				headerBtnPosi:	this.setHeaderBtnPosi(), //获取设备顶部胶囊高度
 				systeminfo: this.setSysteminfo(),		 //获取设备信息
+				isIphoneX:this.$store.state.isIphoneX,
+				CustomBar:this.CustomBar,// 顶部导航栏高度
 				nvabarData: {							 //顶部自定义导航
 					showCapsule: 1, // 是否显示左上角图标   1表示显示    0表示不显示
 					title: '订单详情', // 导航栏 中间的标题