Merge branch 'developerB' into developer

.gitignore

@@ -3,4 +3,3 @@ unpackage/
 .idea/
 .hbuilderx/launch.json
 /services/config.env.js
-/services/ajax.env.js

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

@@ -223,7 +223,7 @@
 					this.userId = resolve.userId ? resolve.userId : 0
 					this.SellerService.GetSellerHome({userId:this.userId}).then(response =>{
 						let sellerData = response.data
-						this.name = sellerData.linkMan1 ?sellerData.linkMan1 : '' 	//协销名称
+						this.name = sellerData.linkMan ?sellerData.linkMan : '' 	//协销名称
 						this.headpic = sellerData.logo //会所头像
 						this.skeletonShow = false
 					}).catch(error =>{

components/cm-module/modelAlert/sellerShareAlert.vue

@@ -5,8 +5,11 @@
 				<view class="text-content">
 					<view class="title">分享订单</view>
 					<view class="share">您的分享码：<text class="txt">{{shareCode}}</text></view>
-					<view class="text">
-						<text>有效期为24小时。订单分享后若对方无法直接登录小程序查看订单，请提供该分享码给对方，通过输入分享码查看</text>
+					<view class="text" v-if="shareType == 1">
+						<text>有效期为72小时。订单分享后客户可无需登录直接线上支付订单，也支持客户使用账号密码登录或直接输入分享码的方式查看订单。</text>
+					</view>
+					<view class="text" v-if="shareType == 2">
+						<text>有效期为72小时。订单分享后若对方无法直接登录小程序查看订单，请提供该分享码给对方，通过输入分享码查看。</text>
 					</view>
 				</view>				
 				<view class="alert-btn">
@@ -26,6 +29,9 @@
 		props:{
 			orderId:{
 				type:Number
+			},
+			shareType:{
+				type:Number
 			}
 		},
 		data() {
@@ -40,9 +46,9 @@
 			getShareCode(res){
 				this.OrderService.QueryOrderShareCode({orderId:res}).then(response =>{
 					this.shareCode = response.data
-					this.$parent.shareCode = this.shareCode;
+					this.$parent.shareCode = this.shareCode
 				}).catch(error =>{
-					this.$parent.isShareModal = false;
+					this.$parent.isShareModal = false
 					this.$util.modal('提示',error.msg,'确定','',false,() =>{})
 				})
 			},
@@ -81,7 +87,7 @@
 		}
 		.content{
 			width: 518rpx;
-			height: 418rpx;
+			height: 428rpx;
 			position: absolute;
 			background: $bg-color;
 			left: 0;
@@ -92,7 +98,7 @@
 			border-radius: 14rpx;
 			.text-content{
 				width: 448rpx;
-				height: 264rpx;
+				height: 284rpx;
 				padding: 20rpx 35rpx;
 				float: left;
 				.title{

components/cm-module/orderDetails/paymentRecord.vue

@@ -13,9 +13,9 @@
 			</view>
 			<view class="record-list" v-else>
 				<view class="record-item" v-for="(item,index) in discernReceiptList" :key="index">
-					<view class="item-time mm">￥{{item.associateAmount.toFixed(2)}}</view>
-					<view class="item-time pp">{{payTypeText(item.payType)}}</view>
 					<view class="item-time tt">{{item.receiptDate}}</view>
+					<view class="item-time pp">{{payTypeText(item.payType)}}</view>
+					<view class="item-time mm">￥{{item.associateAmount.toFixed(2)}}</view>
 				</view>
 			</view>
 		</view>
@@ -132,6 +132,7 @@
 						&.mm{
 							flex: 3;
 							color: $text-color;
+							text-align: right;
 						}
 						&.pp{
 							flex: 2;

components/cm-module/orderDetails/sellerDetaileButton.vue

@@ -5,10 +5,16 @@
 			<view class="btn btn-cancel"  v-if="secondHandOrderFlag!=1 && !rechargeGoods"  @click.stop="btnConfirm('again',order)">再来一单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel"  @click.stop="btnConfirm('cancel',order)">取消订单</view>
 			<!-- <view class="btn btn-cancel" v-if="btnState.isDelete"  @click.stop="btnConfirm('delete',order)">删除订单</view> -->
-			<view class="btn btn-share" @click.stop="onShareCode">
-				<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
-				分享订单
-			</view>	
+			<template>
+				<view class="btn btn-share" v-if="btnState.isPay" @click.stop="onShareCode(1)">
+					<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
+					分享支付
+				</view>	
+				<view class="btn btn-share" v-else @click.stop="onShareCode(2)">
+					<view class="tips" v-if="shareCode">分享码：{{shareCode}}</view>
+					分享订单
+				</view>	
+			</template>
 			<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',order)">确认订单</view>
 			<view class="btn btn-query" v-if="btnState.isQuery && order.secondHandOrderFlag!=1" @click.stop="btnConfirm('query',order)">查看物流</view>
 			<view class="btn btn-color" v-if="btnState.isPay && ableUserMoney > 0 && !rechargeGoods" @click.stop="btnConfirm('balance',order)">余额抵扣</view>
@@ -105,7 +111,7 @@
 			getShareCode(code){
 				this.shareCode = code
 			},
-			onShareCode(){
+			onShareCode(type){
 				if(this.order.onlinePayFlag!= 1){
 					this.PayService.PayOrderCheckoutCounter({orderId:this.order.orderId}).then(response =>{
 						let data = response.data.order
@@ -117,6 +123,7 @@
 							})		
 						}else{
 							this.$parent.isShareModal = true
+							this.$parent.isShareType = type
 						}
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)

components/cm-module/orderDetails/sellerOrderButton.vue

@@ -5,7 +5,10 @@
 			<view class="btn btn-cancel" v-if="secondHandOrderFlag!=1 && !rechargeGoods"  @click.stop="btnConfirm('again',orderId)">再来一单</view>
 			<view class="btn btn-cancel" v-if="btnState.isCancel" @click.stop="btnConfirm('cancel',orderId)">取消订单</view>
 			<!-- <view class="btn btn-cancel" v-if="btnState.isDelete" @click.stop="btnConfirm('delete',orderId)">删除订单</view> -->
-			<view class="btn btn-cancel"  @click.stop="onShareCode(orderId,userId)">分享订单</view>	
+			<template>
+				<view class="btn btn-cancel" v-if="btnState.isPay" @click.stop="onShareCode(orderId,userId,1)">分享支付</view>
+				<view class="btn btn-cancel" v-else @click.stop="onShareCode(orderId,userId,2)">分享订单</view>	
+			</template>
 			<view class="btn btn-query" v-if="btnState.isQuery && order.secondHandOrderFlag!=1" @click.stop="btnConfirm('query',orderId)">查看物流</view>
 			<view class="btn btn-color" v-if="btnState.isConfirm" @click.stop="btnConfirm('confirm',orderId)">确认订单</view>
 		</view>
@@ -45,6 +48,7 @@
 					{label:'isDelete',val:[6],status: true},
 					{label:'isCancel',val:[0,111],status: true},
 					{label:'isConfirm',val:[0],status: true},
+					{label:'isPay',val:[11,12,13,21,22,23,111],status: true},
 				]
 			}
 		},
@@ -94,10 +98,11 @@
 			getShareCode(code){
 				this.shareCode = code
 			},
-			onShareCode(oID,uID){
+			onShareCode(oID,uID,type){
 				this.$parent.isShareModal = true
 				this.$parent.btnoRderID = oID,
 				this.$parent.btnClubUserID = uID
+				this.$parent.isShareType = type
 				this.$emit('shareConfirm')
 			},
 			btnConfirm(type,orderId){

main.js

@@ -7,7 +7,7 @@ import * as Regs from '@/common/config/common.js'
 import { umtrackWxKey } from '@/utils/config.js'
 
 // 友盟依赖包
-import uma from 'umtrack-wx'
+// import uma from 'umtrack-wx'
 
 // 公共组件
 import { msg, modal, prePage, boundingClientRect } from './utils/util'
@@ -35,25 +35,25 @@ Vue.prototype.$getStorage = function(key) {
 /**
  * 友盟+小程序统计
  */
-if (process.env.NODE_ENV != 'development') {
-    // #ifdef MP-WEIXIN
-    uma.init({
-        appKey: umtrackWxKey, //由友盟分配的APP_KEY
-        // 使用Openid进行统计，此项为false时将使用友盟+uuid进行用户统计。
-        // 使用Openid来统计微信小程序的用户，会使统计的指标更为准确，对系统准确性要求高的应用推荐使用Openid。
-        useOpenid: true,
-        // 使用openid进行统计时，是否授权友盟自动获取Openid，
-        // 如若需要，请到友盟后台"设置管理-应用信息"(https://mp.umeng.com/setting/appset)中设置appId及secret
-        autoGetOpenid: true,
-        debug: true, //是否打开调试模式
-        uploadUserInfo: false // 自动上传用户信息，设为false取消上传，默认为false
-    })
-    uma.install = function(Vue) {
-        Vue.prototype.$uma = uma
-    }
-    Vue.use(uma)
-    // #endif
-}
+// if (process.env.NODE_ENV != 'development') {
+//     // #ifdef MP-WEIXIN
+//     uma.init({
+//         appKey: umtrackWxKey, //由友盟分配的APP_KEY
+//         // 使用Openid进行统计，此项为false时将使用友盟+uuid进行用户统计。
+//         // 使用Openid来统计微信小程序的用户，会使统计的指标更为准确，对系统准确性要求高的应用推荐使用Openid。
+//         useOpenid: true,
+//         // 使用openid进行统计时，是否授权友盟自动获取Openid，
+//         // 如若需要，请到友盟后台"设置管理-应用信息"(https://mp.umeng.com/setting/appset)中设置appId及secret
+//         autoGetOpenid: true,
+//         debug: true, //是否打开调试模式
+//         uploadUserInfo: false // 自动上传用户信息，设为false取消上传，默认为false
+//     })
+//     uma.install = function(Vue) {
+//         Vue.prototype.$uma = uma
+//     }
+//     Vue.use(uma)
+//     // #endif
+// }
 
 // Vue实例化
 Vue.config.productionTip = false

pages.json

@@ -502,14 +502,7 @@
                     "path": "order/order-list",
                     "style": {
                         "navigationBarTitleText": "订单列表",
-                        "navigationStyle": "custom"
-                    }
-                },
-                {
-                    "path": "order/order-sharedetails",
-                    "style": {
-                        "navigationBarTitleText": "订单详情",
-                        "navigationStyle": "custom"
+                        "navigationStyle": "custom" 
                     }
                 },
                 {

pages/goods/product.vue

@@ -1614,7 +1614,7 @@ page {
 	}
 	.wrap-label {
 		float: left;
-		width: 100%;
+		width: 85%;
 		box-sizing: border-box;
 		.label-a {
 			padding: 0 18rpx;

pages/seller/order/create-order.vue

@@ -475,8 +475,13 @@
 				console.log('优惠券金额',this.couponAmount)
 			},
 			orderSubmitMit(){//提交订单
-				this.modal = true
-				this.contentModalText = '请仔细确认订单是否为返佣订单后再提交订单'
+				console.log('secondflag',this.secondflag)
+				if(this.secondflag){
+					this.modal = true
+					this.contentModalText = '请仔细确认订单是否为返佣订单后再提交订单'
+				}else{
+					this.SellerCreateOrderSubmit()
+				}
 			},
 			handleClick(e){
 				//确认提交

pages/seller/order/order-details.vue

@@ -43,8 +43,6 @@
 			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 发票信息 -->
 			<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
-			<!-- 转账信息 -->
-			<!-- <transfe-record ref="transfe" v-if="isRequest"></transfe-record> -->
 			<!-- 支付记录 -->
 			<payment-record
 				ref="payment"
@@ -92,7 +90,11 @@
 			@paymentConfirm="hanldPaymentConfirm"
 		/>
 		<!-- 分享弹窗 -->
-		<share-alert :orderId="orderId" v-if="isShareModal" @shareConfirm="onShareAppMessage"> </share-alert>
+		<share-alert :orderId="orderId" 
+					 :shareType="isShareType"
+					 v-if="isShareModal" 
+					 @shareConfirm="onShareAppMessage"> 
+		</share-alert>
 		<!-- 促销活动弹窗 -->
 		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
 		<!-- 再来一单 -->
@@ -120,7 +122,6 @@ import orderAddress from '@/components/cm-module/orderDetails/orderAddress' //
 import goodsList from '@/components/cm-module/orderDetails/goodsList' //商品列表
 import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent' //发票信息
 import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
-import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord' //转账信息
 import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord' //支付记录
 import refundRecord from '@/components/cm-module/orderDetails/refundRecord' //退款记录
 import orderButton from '@/components/cm-module/orderDetails/sellerDetaileButton' //底部按钮
@@ -135,7 +136,6 @@ export default {
 		orderAddress,
 		invoiceTent,
 		goodsList,
-		transfeRecord,
 		paymentRecord,
 		refundRecord,
 		orderButton,
@@ -163,6 +163,7 @@ export default {
 			isRequest: false, //是否加载完成渲染子组件
 			isOrderShare: false,
 			isShareModal: false,
+			isShareType:2,
 			isPayModel: false,
 			modelType: 0,
 			ableUserMoney: '', //机构余额

pages/seller/order/order-list.vue

@@ -244,7 +244,11 @@
 			</swiper-item>
 		</swiper>
 		<!-- 分享弹窗 -->
-		<share-alert v-if="isShareModal" :orderId="btnoRderID" @shareConfirm="onShareAppMessage"> </share-alert>
+		<share-alert v-if="isShareModal" 
+					:orderId="btnoRderID" 
+					:shareType="isShareType"
+					@shareConfirm="onShareAppMessage">
+		</share-alert>
 		<!-- 透明模态层 -->
 		<modal-layer v-if="isModalLayer"></modal-layer>
 		<view class="aganBj" v-show="showAgan">
@@ -327,6 +331,7 @@ export default {
 			skeletonShow: true,
 			isClickChange: false,
 			isShareModal: false, //控制分享弹窗
+			isShareType:2,
 			isSeller: false,
 			isModalLayer: false,
 			loadding: false,

pages/seller/order/order-sharedetails.vue

@@ -1,214 +0,0 @@
-<template>
-	<view class="container details clearfix">
-		<!-- 地址选择 -->
-		<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData" ></order-address>
-		<!-- 订单信息 -->
-		<order-information ref="information" v-if="isRequest" :information="information"></order-information>
-		<!-- 商品 -->
-		<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData"></goods-list>
-		<!-- 发票信息 -->
-		<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
-		<!-- 转账记录 -->
-		<transfe-record ref="transfe" v-if="isRequest"></transfe-record>
-		<!-- 支付记录 -->
-		<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
-		<!-- 退款记录 -->
-		<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
-		<!-- 底部button -->
-		<view class="button-content" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-			<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="queryLogistics">查看物流</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
-	import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent'	 		 //发票信息
-	import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
-	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
-	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
-	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
-	
-	export default {
-		components:{
-			orderInformation,
-			orderAddress,
-			invoiceTent,
-			goodsList,
-			transfeRecord,
-			paymentRecord,
-			refundRecord,
-		},
-		data() {
-			return {
-				status:'',
-				userID:'',
-				orderID:'',
-				cellPhone:'',				//客服电话
-				btnStatus:0,				//按钮组件状态
-				isRequest:false,			//是否加载完成渲染子组件
-				addressData:{},				//地址信息初始化
-				information:{},				//订单信息初始化
-				shopOrderData:{},			//商品信息初始化
-				orderInvoice:{},			//发票信息初始化
-				returnedPurchaseList:{},	//退款信息初始化
-				discernReceiptList:{},		//支付信息初始化
-				receiptAmount:0,			//支付金额
-				returnedPurchaseFee:0,		//退款金额
-				isIphoneX:this.$store.state.isIphoneX,
-				btnState:{
-					isQuery:false
-				},
-				mapStateArr:[
-					{label:'isQuery',val:[4,5,12,13,33,22,23,32,77],status: true},
-				]
-			}
-		},
-		onLoad(option){
-			this.orderID = option.orderID
-			// this.orderID = 11315
-			this.initOrderDetaileData()
-		},
-		methods: {
-			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				this.OrderService.QueryOrderDetails({ orderID : this.orderID }).then(response =>{
-					let resData = response.data;
-					this.isRequest = true
-					this.userID = resData.order.userID
-					this.status = resData.order.status
-					this.addressData = resData.userInfo
-					this.information = resData.order
-					this.shopOrderData = resData.shopOrderList
-					this.orderInvoice = resData.orderInvoice
-					this.returnedPurchaseList = resData.returnedPurchaseList
-					this.discernReceiptList = resData.discernReceiptList
-					this.receiptAmount = resData.order.receiptAmount
-					this.returnedPurchaseFee = resData.order.returnedPurchaseFee
-					this.mapStateArr.forEach(el => {
-						el.val.forEach(value => {
-							if(this.status === value){
-								this.btnState[el.label] = el.status
-							}
-						})
-					})
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
-				})
-			},
-			queryLogistics(){//跳转查询物流页面
-				this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+this.orderID)
-			},
-		},
-		onShow() {
-
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		height: auto;
-		background:#F7F7F7;
-	}
-	.details{
-		padding-bottom: 130rpx;
-	}
-	.btn-hover{
-		background: #FFFFFF;
-	}
-	.animation{
-		/* transition: transform 0.3s ease;*/
-		transition-property: transform;
-		transition-duration: 0.3s;
-		transition-timing-function: ease;
-	}
-	.invoice-balance{
-		width: 702rpx;
-		height: auto;
-		padding:0 24rpx;
-		background: #FFFFFF;
-		float: left;
-		margin-top: 24rpx;
-		margin-bottom: 24rpx;
-		.balabce-t{
-			width: 100%;
-			height: 86rpx;
-			line-height: 86rpx;
-			font-size: $font-size-28;
-			color: $text-color;
-			float: left;
-			.balabce-t-le{
-				float: left;
-				font-weight: bold;
-			}
-			.balabce-t-ri{
-				float: right;
-				display: flex;
-				align-items: center;
-				.money{
-					display: flex;
-					float: left;
-				}
-				.checkbox-box{
-					display: flex;
-					width: 60rpx;
-					float: left;
-					height: 100%;
-					font-size: $font-size-24;
-					.checkbox{
-						width: 40rpx;
-						text-align: right;
-						box-sizing: border-box;
-						text-align: center;
-						text-decoration: none;
-						border-radius: 0;
-						-webkit-tap-highlight-color: transparent;
-						overflow: hidden;
-					}
-				}	
-			}
-		}
-		.balabce-b{
-			width: 100%;	
-			float: left;
-			overflow: hidden;
-			.balabce-b-text{
-				width: 100%;
-				line-height: 58rpx;
-				font-size: $font-size-24;
-				color: #FF2A2A;
-				text-align: right;
-				float: right;
-			}
-			&.balabce-b--hide {
-				padding: 0 0;
-				height: 0px;
-				line-height: 0px;
-			}	
-		}
-	}
-	.button-content{
-		width: 702rpx;
-		padding:0 24rpx;
-		height: auto;
-		background: #ffffff;
-		position: fixed;
-		bottom: 0;
-		left:0 ;
-		.btn{
-			width: 160rpx;
-			height:  64rpx;
-			margin:22rpx;
-			line-height: 64rpx;
-			font-size:$font-size-26;
-			color: #FFFFFF;
-			text-align: center;
-			float: right;
-		}
-		.btn-query{
-			background:linear-gradient(135deg,rgba(255,212,129,1) 0%,rgba(198,129,0,1) 100%);
-		}
-	}
-	
-</style>

pages/user/account/account.vue

@@ -53,11 +53,11 @@
 						<view class="t-t">{{item.type =='1'? '收入' : '支出'}}</view>
 					</view>
 				</view>
-				<!--加载loadding-->
-				<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
-				<tui-nomore :visible="!pullUpOn" bgcolor="#FFFFFF" :text='nomoreText'></tui-nomore>
-				<!--加载loadding-->
 			</view>
+			<!--加载loadding-->
+			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
+			<tui-nomore :visible="!pullUpOn" bgcolor="#FFFFFF" :text='nomoreText'></tui-nomore>
+			<!--加载loadding-->
 		</scroll-view>
 		<view class="showAccounExp" v-if="isShowAccounExp" :class="[isShowAccounExp == true ? 'show':'hide']" @tap="hideAccounExp">
 			<image src="https://img.caimei365.com/group1/M00/03/95/Cmis216Sk_SAZeZlAA2oDvspRRU204.png" mode=""></image>
@@ -66,10 +66,10 @@
 	</view>
 </template>
 <script>
-	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
-	import tuiNomore from "@/components/tui-components/nomore/nomore"
+	import tuiLoadmore from '@/components/tui-components/loadmore/loadmore'
+	import tuiNomore from '@/components/tui-components/nomore/nomore'
 	import uniCalendar from '@/components/uni-calendar/uni-calendar.vue'
-	var date = new Date();
+	var date = new Date()
 	export default{
 		components: {
 			uniCalendar,
@@ -160,10 +160,10 @@
 						let infoData = response.data
 						this.initAbleUserMoney(infoData.ableUserMoney)
 						let resultsData = infoData.pageDate.results
-						this.hasNextPage =  infoData.pageDate.hasNextPage;
+						this.hasNextPage =  infoData.pageDate.hasNextPage
 						if(resultsData && resultsData.length > 0){
-							this.isEmpty = false;
-							this.accountList = [...resultsData];
+							this.isEmpty = false
+							this.accountList = [...resultsData]
 						}else{
 							this.isEmpty = true
 						}
@@ -171,7 +171,7 @@
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
 						}else{
-							if(this.accountList.length < 2){
+							if(this.accountList.length < 8){
 								this.pullUpOn = true
 							}else{
 								this.pullUpOn = false
@@ -197,10 +197,10 @@
 					let infoData = response.data
 					this.initAbleUserMoney(infoData.ableUserMoney)
 					let resultsData = infoData.pageDate.results
-					this.hasNextPage =  infoData.pageDate.hasNextPage;
+					this.hasNextPage =  infoData.pageDate.hasNextPage
 					this.accountList = this.accountList.concat(resultsData)
-					this.pullFlag = false;// 防上拉暴滑
-					setTimeout(()=>{this.pullFlag = true;},500)
+					this.pullFlag = false// 防上拉暴滑
+					setTimeout(()=>{this.pullFlag = true},500)
 					if(this.hasNextPage){
 						this.pullUpOn = false
 						this.nomoreText = '上拉显示更多'
@@ -215,34 +215,34 @@
 			},
 			initAbleUserMoney(money){//拆分金额并转千分位格式显示
 				if(money == 0){
-					this.showIndexOfMoney ='0';
-					this.smallMoney=".00"
+					this.showIndexOfMoney ='0'
+					this.smallMoney='.00'
 				}else{
-					this.ableUserMoney = this.$api.FormatMoney(money) ;
-					let i =  this.ableUserMoney.toString().lastIndexOf('.');
+					this.ableUserMoney = this.$api.FormatMoney(money) 
+					let i =  this.ableUserMoney.toString().lastIndexOf('.')
 					if(i==-1){
 						this.showIndexOfMoney=this.$api.FormatMoney( this.ableUserMoney)
-						this.smallMoney=".00"
+						this.smallMoney='.00'
 					}else{
-						this.smallMoney = this.ableUserMoney.toString().substring(i);
+						this.smallMoney = this.ableUserMoney.toString().substring(i)
 						this.showIndexOfMoney= this.$api.FormatMoney(this.ableUserMoney.toString().substring(0,i))
 					}
 				}
 			},
 			tabClick(index){//tab点击
-				this.tabCurrentIndex = index;
+				this.tabCurrentIndex = index
 				this.pageNum = 1
 				this.accountList = []
 				this.pullUpOn = true //隐藏
-				this.getAccountInitData(this.tabCurrentIndex,this.year,this.month);
+				this.getAccountInitData(this.tabCurrentIndex,this.year,this.month)
 			},			
 			bindDateChange: function(e) {
 				this.date = e.target.value
 			},
 			monthSwitch(e) {
-				this.year = e.year;
-				this.month = e.month;
-				this.getAccountInitData(this.tabCurrentIndex,this.year,this.month);
+				this.year = e.year
+				this.month = e.month
+				this.getAccountInitData(this.tabCurrentIndex,this.year,this.month)
 			},
 			cheakType(type){
 				let typeTextHtml,
@@ -256,18 +256,18 @@
 						7:'余额订单充值',
 						8:'订金订单退款',
 						9:'余额订单退款'
-					};
+					}
 				Object.keys(typeObject).forEach(function(key){
 					if(key == type){
 						typeTextHtml = typeObject[key]
 					}
-				});	
-				return typeTextHtml;
+				})	
+				return typeTextHtml
 			},
 			hanldNavigateBack(){
 				uni.navigateBack({
 					delta: 1
-				});
+				})
 			},
 			showAccounExp(){
 				this.isShowAccounExp = true

pages/user/coupon/coupon-collection.vue

@@ -198,12 +198,6 @@
 						}
 						break
 					case 1:// 品类券：跳转到产品 287 / 仪器页 286
-						let categoryId = 0
-						if(coupon.categoryType == 1){
-							categoryId = 287
-						}else{
-							categoryId = 286
-						}
 						this.$api.navigateTo(`/pages/goods/good-floor?linkId=${ coupon.categoryType == 1 ? 287 : 286 }`)
 						break
 					case 2:// 用户专享券：跳转到商城首页

pages/user/coupon/coupon.vue

@@ -10,7 +10,7 @@
 			</coupon-tabs>
 		</view>
 		<view 	class="container-list" 
-				:style="{'overflow':'auto',paddingBottom :isIphoneX ? '100rpx' : '0rpx','height':(coupinList.length>6? windowHeight + 'px' : 'auto')}"
+				:style="{'overflow':'auto',paddingBottom :isIphoneX ? '140rpx' : '0rpx','height':(coupinList.length>6? windowHeight + 'px' : 'auto')}"
 				v-show="isRequest"
 			>
 			<view class="empty-container" v-if="showEmpty">
@@ -83,7 +83,7 @@
 </template>
 
 <script>
-	import { mapState,mapMutations} from 'vuex';
+	import { mapState,mapMutations} from 'vuex'
 	import couponTabs from '@/components/cm-module/coupon/tui-tabs.vue'
 	export default {
 		components:{
@@ -103,9 +103,9 @@
 					status:1
 				},
 				navbar: [
-					{ name: "未使用",num:0 }, 
-					{ name: "已使用",num:0 }, 
-					{ name: "已失效",num:0 },
+					{ name: '未使用',num:0 }, 
+					{ name: '已使用',num:0 }, 
+					{ name: '已失效',num:0 },
 				],
 				coupinList:[],
 				windowHeight:'',
@@ -125,20 +125,20 @@
 			TypeFormat(value) {
 				switch (value) {
 					case 0:
-						return  '活动券';
-						break;
+						return  '活动券'
+						break
 					case 1:
-						return  '品类券';
-						break;
+						return  '品类券'
+						break
 					case 2:
-						return  '用户专享券';
-						break;
+						return  '用户专享券'
+						break
 					case 3:
-						return  '店铺券';
-						break;
+						return  '店铺券'
+						break
 					case 4:
-						return  '新用户券';
-						break;
+						return  '新用户券'
+						break
 				}
 			}
 		},
@@ -147,9 +147,9 @@
 		},
 		methods: {
 			setScrollHeight() {
-				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
-				this.windowHeight = windowHeight - 1;
-				this.scrollHeight = windowHeight - 1;
+				const {windowHeight, pixelRatio} = wx.getSystemInfoSync()
+				this.windowHeight = windowHeight - 1
+				this.scrollHeight = windowHeight - 1
 			},
 			QueryCouponList() {// 获取优惠券列表
 				this.coupinList = []
@@ -160,8 +160,8 @@
 						this.showEmpty = false
 						this.hasNextPage = data.hasNextPage
 						this.coupinList = data.list
-						this.pullFlag = false;
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -177,9 +177,9 @@
 					}else{
 						this.showEmpty = true
 					}
-					this.isRequest = true;
+					this.isRequest = true
 				}).catch(error =>{
-					this.$util.msg(error.msg,2000);
+					this.$util.msg(error.msg,2000)
 				})
 			},
 			getOnReachBottomData(){// 上滑加载分页
@@ -190,8 +190,8 @@
 					if(data.list&&data.list.length > 0){
 						this.hasNextPage = data.hasNextPage
 						this.coupinList = this.coupinList.concat(data.list) 
-						this.pullFlag = false;// 防上拉暴滑
-						setTimeout(()=>{this.pullFlag = true;},500)
+						this.pullFlag = false// 防上拉暴滑
+						setTimeout(()=>{this.pullFlag = true},500)
 						if(this.hasNextPage){
 							this.pullUpOn = false
 							this.nomoreText = '上拉显示更多'
@@ -219,7 +219,7 @@
 					this.navbar[2].num = data.expiredNum
 				})
 				.catch(error =>{
-					this.$util.msg(error.msg,2000);
+					this.$util.msg(error.msg,2000)
 				})
 			},
 			toUseCoupon(coupon){// 去使用跳转路径
@@ -232,25 +232,19 @@
 						 }else{
 							this.$api.navigateTo('/pages/user/coupon/coupon-product?couponId='+coupon.couponId)
 						 }
-						break;
+						break
 					case 1:// 品类券：跳转到产品 287 / 仪器页 286
-						let categoryId = 0;
-						if(coupon.categoryType == 1){
-							categoryId = 287
-						}else{
-							categoryId = 286
-						}
 						this.$api.navigateTo(`/pages/goods/good-floor?linkId=${ coupon.categoryType == 1 ? 287 : 286 }`)
-						break;
+						break
 					case 2:// 用户专享券：跳转到商城首页
 						this.$api.switchTabTo('/pages/tabBar/home/index')
-						break;
+						break
 					case 3:// 店铺券：跳转到店铺首页
 						this.$api.navigateTo('/pages/supplier/user/my-shop?shopId='+coupon.shopId)
-						break;
+						break
 					case 4:// 新用户券：跳转到商城首页
 						this.$api.switchTabTo('/pages/tabBar/home/index')
-						break;
+						break
 				}
 			},
 			change(e) {
@@ -261,15 +255,15 @@
 					case 0:
 						this.listClass = 'list-used'
 						this.listQuery.status = 1
-						break;
+						break
 					case 1:
 						this.listClass = 'list-none'
 						this.listQuery.status = 2
-						break;
+						break
 					case 2:
 						this.listClass = 'list-none'
 						this.listQuery.status = 3
-						break;
+						break
 					
 				}
 				this.QueryCouponList()
@@ -292,11 +286,11 @@
 			}	
 		},
 		onShow(){		
-			this.setScrollHeight();
+			this.setScrollHeight()
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.userId = resolve.userId ? resolve.userId : 0;
+				this.listQuery.userId = resolve.userId ? resolve.userId : 0
 				this.getQueryCouponsCount()
-				this.QueryCouponList();
+				this.QueryCouponList()
 			})
 		}
 	}

pages/user/member/member-pay.vue

@@ -82,6 +82,7 @@ export default {
 			payType: 0,
 			isPaySwitch: true,
 			payParams: {
+				payType:'XCX',
 				code: 0,
 				vipRecordId: 0
 			},
@@ -168,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.data.payInfo)
+					let PayInfo = JSON.parse(response.data.rt10_payInfo)
 					this.WxRequestPayment(PayInfo)
 				})
 				.catch(error => {

pages/user/member/member.vue

@@ -232,6 +232,7 @@ export default {
 				packageId: 0
 			},
 			payParam: {
+				
 				userId: 0,
 				packageId: 0
 			},
@@ -467,7 +468,6 @@ export default {
 		},
 		toUseCoupon(coupon) {
 			// 去使用跳转路径
-			console.log('coupon', coupon)
 			switch (coupon.couponType) {
 				case 0: // 活动券：跳转到商城首页 / 或者活动页（看是否指定了商品）
 					if (coupon.productType == 1) {
@@ -478,12 +478,6 @@ export default {
 					}
 					break
 				case 1: // 品类券：跳转到产品 287 / 仪器页 286
-					let categoryId = 0
-					if (coupon.categoryType == 1) {
-						categoryId = 287
-					} else {
-						categoryId = 286
-					}
 					this.$api.navigateTo(`/pages/goods/good-floor?linkId=${coupon.categoryType == 1 ? 287 : 286}`)
 					break
 				case 2: // 用户专享券：跳转到商城首页

pages/user/order/order-details.vue

@@ -41,8 +41,6 @@
 			<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 			<!-- 发票信息 -->
 			<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
-			<!-- 转账信息 -->
-			<!-- <transfe-record ref="transfe" v-if="receiptAmount == 0 || onlinePayFlag == '1'"></transfe-record> -->
 			<!-- 支付记录 -->
 			<payment-record
 				ref="payment"
@@ -107,7 +105,6 @@ import orderAddress from '@/components/cm-module/orderDetails/orderAddress' //
 import goodsList from '@/components/cm-module/orderDetails/goodsList' //商品列表
 import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent' //发票信息
 import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
-import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord' //转账信息
 import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord' //支付记录
 import refundRecord from '@/components/cm-module/orderDetails/refundRecord' //退款记录
 import orderButton from '@/components/cm-module/orderDetails/orderButton' //底部按钮
@@ -123,7 +120,6 @@ export default {
 		orderAddress,
 		invoiceTent,
 		goodsList,
-		transfeRecord,
 		paymentRecord,
 		refundRecord,
 		orderButton,
@@ -317,7 +313,7 @@ export default {
 							this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
 							break
 						default:
-							if (response.data.onlinePayFlag == '1') {
+							if (response.data.onlinePayFlag == 1) {
 								this.$api.navigateTo(
 									`/pages/user/order/order-payment?type=onlinePay&Amount=${
 										response.data.pendingPayments
@@ -344,7 +340,7 @@ export default {
 							`/pages/user/order/success?type=deduction&data=${JSON.stringify({ data: _data })}`
 						)
 					} else {
-						if (data.order.onlinePayFlag === '1') {
+						if (data.order.onlinePayFlag === 1) {
 							this.$api.navigateTo(
 								`/pages/user/order/order-payment?type=onlinePay&Amount=${
 									data.order.pendingPayments

pages/user/order/order-list.vue

@@ -535,7 +535,7 @@ export default {
 							this.$util.modal('', '订单已申请全部退款，无需再付款！', '确定', '', false, () => {})
 							break
 						default:
-							if (response.data.onlinePayFlag == '1') {
+							if (response.data.onlinePayFlag == 1) {
 								this.$api.navigateTo(
 									`/pages/user/order/order-payment?type=onlinePay&Amount=${
 										response.data.pendingPayments
@@ -562,7 +562,7 @@ export default {
 							`/pages/user/order/success?type=deduction&data=${JSON.stringify({ data: _data })}`
 						)
 					} else {
-						if (data.order.onlinePayFlag === '1') {
+						if (data.order.onlinePayFlag === 1) {
 							this.$api.navigateTo(
 								`/pages/user/order/order-payment?type=onlinePay&Amount=${
 									data.order.pendingPayments

pages/user/order/order-pay.vue

@@ -70,7 +70,7 @@
 					<view class="text-content">
 						<view class="text">请复制以下链接，并发送至电脑端，在浏览器访问该链接并选择银行尽快完成支付</view>
 						<view class="text-p">{{payHttpUrl}}</view>
-						<view class="text-b">链接有效期为24小时</view>
+						<view class="text-b">链接有效期为72小时</view>
 					</view>
 					<view class="text-button" @click.stop="clipboard(payHttpUrl)">复制链接</view>
 				</view>
@@ -81,7 +81,7 @@
 
 <script>
 	import authorize from '@/common/config/authorize.js'
-	import thorui from "@/components/clipboard/clipboard.thorui.js"
+	import thorui from '@/components/clipboard/clipboard.thorui.js'
 	export default{
 		components: {
 			// keyboard
@@ -121,23 +121,23 @@
 		},
 		filters: {
 			NumFormat(value) {
-				if(!value) return '0.00';
+				if(!value) return '0.00'
 				/*原来用的是Number(value).toFixed(0)，这样取整时有问题，例如0.51取整之后为1，感谢Nils指正*/
 				/*后来改成了 Number(value)|0,但是输入超过十一位就为负数了，具体见评论 */
-				var intPart = Number(value) - Number(value)%1; //获取整数部分（这里是windy93的方法）
-				var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,'); //将整数部分逢三一断
-				var floatPart = ".00"; //预定义小数部分
-				var value2Array = value.toString().split(".");
+				var intPart = Number(value) - Number(value)%1 //获取整数部分（这里是windy93的方法）
+				var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') //将整数部分逢三一断
+				var floatPart = '.00' //预定义小数部分
+				var value2Array = value.toString().split('.')
 				//=2表示数据有小数位
 				if(value2Array.length == 2) {
-					floatPart = value2Array[1].toString(); //拿到小数部分
+					floatPart = value2Array[1].toString() //拿到小数部分
 					if(floatPart.length == 1) { //补0,实际上用不着
-						return intPartFormat + "." + floatPart + '0';
+						return intPartFormat + '.' + floatPart + '0'
 					} else {
-						return intPartFormat + "." + floatPart;
+						return intPartFormat + '.' + floatPart
 					}
 				} else {
-					return intPartFormat + floatPart;
+					return intPartFormat + floatPart
 				}
 			}
 		},
@@ -149,19 +149,19 @@
 				switch(this.payType){
 					case '0':
 						this.payWay = 'WEIXIN'
-						this.btnColor="#09BB07"
+						this.btnColor='#09BB07'
 						this.buttonText = '去支付'
-						break;
+						break
 					case '1':
 						this.payWay = 'UNIONPAY'
-						this.btnColor="#034582"
+						this.btnColor='#034582'
 						this.buttonText = '生成企业网银支付链接'
-						break;
+						break
 					case '2':
 						this.payWay = 'UNIONPAY'
-						this.btnColor="#034582"
+						this.btnColor='#034582'
 						this.buttonText = '生成个人网银支付链接'
-						break;
+						break
 				}
 				this.GetPayOrderInfo()
 			},
@@ -183,22 +183,22 @@
 				switch(this.payType){
 					case '0':
 						this.MiniWxPayFor()
-						break;
+						break
 					case '1':
 						this.BuildCatenate()
-						break;
+						break
 					case '2':
 						this.BuildCatenate()
-						break;
+						break
 				}
 			},
 			BuildCatenate(){
 				if(this.payAmount == 0){
-					this.$util.msg("请输入本次支付的金额",2000)
+					this.$util.msg('请输入本次支付的金额',2000)
 					return
 				}
 				if(this.payAmount <=10){
-					this.$util.msg("企业网银支付的金额必须大于￥10.00",2000)
+					this.$util.msg('网银支付的金额必须大于￥10.00',2000)
 					return
 				}
 				this.PayService.PayOrderPayLink({unpaidAmount:this.payAmount,orderId:this.orderId,payType:this.payType}).then(response =>{
@@ -213,17 +213,17 @@
 						return
 					}
 					if(this.payAmount == 0){
-						this.$util.msg("请输入本次支付的金额",2000)
+						this.$util.msg('请输入本次支付的金额',2000)
 						return
 					}
 					if(this.payAmount*100 < 2){
-						this.$util.msg("本次支付的金额必须大于￥0.02",2000)
+						this.$util.msg('本次支付的金额必须大于￥0.02',2000)
 						return
 					}
 					console.log('this.payAmount',this.payAmount)
 					let params ={
 							payAmount:this.accMul(this.payAmount,100),
-							payWay:"WEIXIN",
+							payWay:'WEIXIN',
 							code:wechatcode,
 							orderId:this.orderId
 						}
@@ -237,7 +237,7 @@
 								Um_Key_PayOrderID:`${this.orderId}`
 							})
 						}
-						let PayInfo = JSON.parse(response.data.data.payInfo);
+						let PayInfo = JSON.parse(response.data.data.payInfo)
 						this.WxRequestPayment(PayInfo)
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
@@ -253,7 +253,7 @@
 					'signType': data.signType,
 					'paySign': data.paySign,
 					'success':function(res){
-						wx.reLaunch({url: '/pages/tabBar/user/user'});
+						wx.reLaunch({url: '/pages/tabBar/user/user'})
 					},
 					'fail':function(res){
 						self.$util.msg('用户取消支付~')
@@ -265,16 +265,16 @@
 			},
 			accMul(value1, value2) {
 			    if (value1 == 0 || value2 == 0) {
-			      return 0;
+			      return 0
 			    }
-			    let m = 0;
-			    let v1 = value1.toString();
-			    let v2 = value2.toString();
-			    m += v1.split(".")[1] ? v1.split(".")[1].length : 0;
-			    m += v2.split(".")[1] ? v2.split(".")[1].length : 0;
-			    let _v1 = Number(v1.replace(".", ""));
-			    let _v2 = Number(v2.replace(".", ""));
-			    return (_v1 * _v2) / Math.pow(10, m);
+			    let m = 0
+			    let v1 = value1.toString()
+			    let v2 = value2.toString()
+			    m += v1.split('.')[1] ? v1.split('.')[1].length : 0
+			    m += v2.split('.')[1] ? v2.split('.')[1].length : 0
+			    let _v1 = Number(v1.replace('.', ''))
+			    let _v2 = Number(v2.replace('.', ''))
+			    return (_v1 * _v2) / Math.pow(10, m)
 			},
 			confirmEvent(value){//点击自定义键盘完成的回调函数
 				this.chechValue(value)
@@ -290,13 +290,13 @@
 				this.showDigitKeyboard = false
 			},
 			chechValue(value){
-				let patern = /\d+\.\d+/g;
+				let patern = /\d+\.\d+/g
 				if(value && value.split('.').length > 2) {
-					value= patern.exec(value);
+					value= patern.exec(value)
 				}
-				if(value == "" || value <0 ){
-					this.payAmount = '';
-					this.balanceAmount = this.payableAmount;
+				if(value == '' || value <0 ){
+					this.payAmount = ''
+					this.balanceAmount = this.payableAmount
 				}else if( value > this.payableAmount){
 					this.payAmount = this.toFixedFn(this.payableAmount)
 					this.balanceAmount = this.toFixedFn(this.payableAmount - this.payAmount)
@@ -308,7 +308,7 @@
 			hanldNavigateBack(){//页面返回
 				uni.navigateBack({
 					delta: 1
-				});
+				})
 			},
 			payTypeText (state){//处理支付记录文字
 				let stateText = '',
@@ -324,19 +324,19 @@
 						stateText = stateTextObject[key]
 					}
 				})
-				return stateText;
+				return stateText
 			},
 			hideTips(){//隐藏弹窗
 				this.isShowTip = false
 			},
 			toFixedFn(text){//处理小数点后两位数
-				return Number(text).toFixed(2);
+				return Number(text).toFixed(2)
 			},
 			clipboard(data) {//复制链接
 				thorui.getClipboardData(data, (res) => {
 					if (res) {
-						this.isShowTip = false;
-						this.$util.msg("复制成功",2000,true,'success');
+						this.isShowTip = false
+						this.$util.msg('复制成功',2000,true,'success')
 						// 友盟埋点收集复制网银链接
 						if(process.env.NODE_ENV != 'development'){
 							this.$uma.trackEvent('Um_Event_CopyUnionPay', {
@@ -346,11 +346,8 @@
 								Um_Key_PayOrderID:`${this.orderId}`
 							})
 						}
-						setTimeout(()=>{
-							this.$api.navigateTo(`/pages/user/order/order-details?state=0&orderId=${this.orderId}`)
-						},2000)
 					} else {
-						this.$util.msg("复制失败",2000,true,'none');
+						this.$util.msg('复制失败',2000,true,'none')
 					}
 				})
 			},

pages/user/order/order-payment.vue

@@ -27,7 +27,7 @@
 			</view>		
 		</template>
 		<template v-else>
-			<view class="container-cash clearfix" v-if="invoiceStatus">
+			<view class="container-cash clearfix" v-if="onlinePay == 2">
 				<view class="pay-bring-title">{{payBringTitle}}</view>
 				<view class="container-wrapper">
 					<view class="pay-content">
@@ -115,7 +115,7 @@
 					<view class="pay-bring-line"><text class="line"></text></view>
 					<view class="pay-bring-content" v-if="!isShowTip">
 						<view class="text bg-color">查看转账信息</view>
-						<view class="text">除了以上两种支付方式</view>
+						<view class="text">除了以上线上支付方式</view>
 						<view class="text">您还可以通过线下转账的方式付款</view>
 					</view>
 					<view class="pay-bring-content" v-else>
@@ -159,12 +159,12 @@
 				buttonText:'使用微信支付',
 				btnColor:'#09BB07',
 				receiptStatus:'',
-				invoiceStatus:false,
+				onlinePay:1,
 				isPaySwitch:false,
 				optionType:'',
 				onlinePayFlag:'',
 				payBringTitle:'本次交易暂不支持线上支付，请使用线下转账方式付款',
-				payStatusText:'使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
+				payStatusText:'使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。',
 				pageType:''
 			}
 		},
@@ -216,7 +216,7 @@
 						this.PayOrderCheckoutCounter(this.orderId)
 						break
 					case 'onlinePay':
-						this.invoiceStatus = true
+						this.onlinePay = 2
 						this.isPaySwitch = false
 						this.nvabarData.haveBack = true
 						this.nvabarData.haveHome = false
@@ -245,15 +245,15 @@
 					this.onlinePayFlag = data.onlinePayFlag					
 					//判断线上线下显示
 					if(this.optionType == 'onlinePay'){
-						this.invoiceStatus = true
+						this.onlinePay = 2
 					}else{
-						this.invoiceStatus = data.invoiceStatus
+						this.onlinePay = response.data.onlinePay
 					}
 					if(data.receiptAmount>0){
-						this.payStatusText = '使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。'
+						this.payStatusText = '使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。'
 						this.isReceiptStatus = false
 					}else{
-						this.payStatusText = '使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。'
+						this.payStatusText = '使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。'
 						this.isReceiptStatus = true
 					}
 				}).catch(error =>{
@@ -261,9 +261,9 @@
 				})
 			},
 			goOrderCash(){
-				if(this.invoiceStatus){
+				if(this.onlinePay == 2){
 					this.$util.modal('','本次交易暂不支持线上支付开票,请使用线下转账的方式付款','知道了','',false,() =>{})
-					this.payStatusText = '使用微信和企业网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。'
+					this.payStatusText = '使用微信和网银支付全部金额后，供应商会在24小时后发货（周末、节假日顺延）。若着急发货，可以选择使用线下转账进行付款。'
 					this.isReceiptStatus = true
 				}else{
 					// 友盟埋点收集选择支付方式

pages/user/order/order-sharedetails.vue

@@ -1,22 +1,36 @@
 <template>
 	<view class="container details clearfix">
 		<!-- 地址选择 -->
-		<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData" ></order-address>
+		<order-address ref="orderAddress" v-if="isRequest" :addressData="addressData"></order-address>
 		<!-- 商品 -->
-		<goods-list ref='goods' v-if="isRequest" :shopOrderData="shopOrderData" @popupClick="hanldePopupFn"></goods-list>
+		<goods-list
+			ref="goods"
+			v-if="isRequest"
+			:shopOrderData="shopOrderData"
+			@popupClick="hanldePopupFn"
+		></goods-list>
 		<!-- 订单信息 -->
 		<order-information ref="information" v-if="isRequest" :information="information"></order-information>
 		<!-- 发票信息 -->
 		<invoice-tent ref="invoice" v-if="isRequest" :orderInvoice="orderInvoice"></invoice-tent>
-		<!-- 转账记录 -->
-		<transfe-record ref="transfe" v-if="isRequest"></transfe-record>
 		<!-- 支付记录 -->
-		<payment-record ref="payment" v-if="isRequest" :discernReceiptList="discernReceiptList" :receiptAmount="receiptAmount"></payment-record>
+		<payment-record
+			ref="payment"
+			v-if="isRequest"
+			:discernReceiptList="discernReceiptList"
+			:receiptAmount="receiptAmount"
+		></payment-record>
 		<!-- 退款记录 -->
-		<refund-record ref="refund" v-if="isRequest" :returnedPurchaseList="returnedPurchaseList" :returnedPurchaseFee="returnedPurchaseFee"></refund-record>
+		<refund-record
+			ref="refund"
+			v-if="isRequest"
+			:returnedPurchaseList="returnedPurchaseList"
+			:returnedPurchaseFee="returnedPurchaseFee"
+		></refund-record>
 		<!-- 底部button -->
-		<view class="button-content" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
+		<view class="button-content" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
 			<view class="btn btn-query" v-if="btnState.isQuery" @click.stop="queryLogistics">查看物流</view>
+			<view class="btn btn-cancel" v-if="btnState.isPay" @click.stop="btnConfirmPay">立即支付</view>
 		</view>
 		<!-- 促销活动弹窗 -->
 		<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
@@ -24,61 +38,63 @@
 </template>
 
 <script>
-	import orderAddress from '@/components/cm-module/orderDetails/orderAddress' 		 //地址信息
-	import goodsList from '@/components/cm-module/orderDetails/goodsList'		 		 //商品列表
-	import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent'	 		 //发票信息
-	import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
-	import transfeRecord from '@/components/cm-module/orderDetails/transfeRecord'		 //转账信息
-	import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord'		 //支付记录
-	import refundRecord from '@/components/cm-module/orderDetails/refundRecord'		 //退款记录
-	import activiPopup from '@/components/cm-module/orderDetails/activipopu'		//促销活动弹窗
-	
-	export default {
-		components:{
-			orderInformation,
-			orderAddress,
-			invoiceTent,
-			goodsList,
-			transfeRecord,
-			paymentRecord,
-			refundRecord,
-			activiPopup
-		},
-		data() {
-			return {
-				status:'',
-				userId:'',
-				orderId:'',
-				cellPhone:'',				//客服电话
-				btnStatus:0,				//按钮组件状态
-				isRequest:false,			//是否加载完成渲染子组件
-				addressData:{},				//地址信息初始化
-				information:{},				//订单信息初始化
-				shopOrderData:{},			//商品信息初始化
-				orderInvoice:{},			//发票信息初始化
-				returnedPurchaseList:{},	//退款信息初始化
-				discernReceiptList:{},		//支付信息初始化
-				receiptAmount:0,			//支付金额
-				returnedPurchaseFee:0,		//退款金额
-				isIphoneX:this.$store.state.isIphoneX,
-				popupShow:false,
-				handlerPros:{},
-				btnState:{
-					isQuery:false
-				},
-				mapStateArr:[
-					{label:'isQuery',val:[4,5,12,13,33,22,23,32,77],status: true},
-				]
-			}
-		},
-		onLoad(option){
-			this.orderId = option.orderId
-			this.userId = option.userId
-			this.initOrderDetaileData()
-		},
-		methods: {
-			initOrderDetaileData(){//初始化页面数据@参数：订单ID
-				this.OrderService.QueryOrderDetails({ orderId : this.orderId,userId : this.userId }).then(response =>{
+import orderAddress from '@/components/cm-module/orderDetails/orderAddress' //地址信息
+import goodsList from '@/components/cm-module/orderDetails/goodsList' //商品列表
+import invoiceTent from '@/components/cm-module/orderDetails/invoiceTent' //发票信息
+import orderInformation from '@/components/cm-module/orderDetails/orderInformation' //订单信息
+import paymentRecord from '@/components/cm-module/orderDetails/paymentRecord' //支付记录
+import refundRecord from '@/components/cm-module/orderDetails/refundRecord' //退款记录
+import activiPopup from '@/components/cm-module/orderDetails/activipopu' //促销活动弹窗
+
+export default {
+	components: {
+		orderInformation,
+		orderAddress,
+		invoiceTent,
+		goodsList,
+		paymentRecord,
+		refundRecord,
+		activiPopup
+	},
+	data() {
+		return {
+			status: '',
+			userId: '',
+			orderId: '',
+			cellPhone: '', //客服电话
+			btnStatus: 0, //按钮组件状态
+			isRequest: false, //是否加载完成渲染子组件
+			addressData: {}, //地址信息初始化
+			information: {}, //订单信息初始化
+			shopOrderData: {}, //商品信息初始化
+			orderInvoice: {}, //发票信息初始化
+			returnedPurchaseList: {}, //退款信息初始化
+			discernReceiptList: {}, //支付信息初始化
+			receiptAmount: 0, //支付金额
+			returnedPurchaseFee: 0, //退款金额
+			isIphoneX: this.$store.state.isIphoneX,
+			popupShow: false,
+			handlerPros: {},
+			btnState: {
+				isQuery: false,
+				isPay:false
+			},
+			mapStateArr: [
+				{ label: 'isQuery', val: [4, 5, 12, 13, 33, 22, 23, 32, 77], status: true },
+				{ label: 'isPay', val: [11, 12, 13, 21, 22, 23, 111], status: true }
+			]
+		}
+	},
+	onLoad(option) {
+		this.orderId = option.orderId
+		this.userId = option.userId
+		this.initOrderDetaileData()
+	},
+	methods: {
+		initOrderDetaileData() {
+			//初始化页面数据@参数：订单ID
+			this.OrderService.QueryOrderDetails({ orderId: this.orderId, userId: this.userId })
+				.then(response => {
 					let data = response.data
 					this.status = data.order.status
 					this.addressData = data.userInfo
@@ -92,132 +108,167 @@
 					this.isRequest = true
 					this.mapStateArr.forEach(el => {
 						el.val.forEach(value => {
-							if(this.status === value){
+							if (this.status === value) {
 								this.btnState[el.label] = el.status
 							}
 						})
 					})
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
 				})
-			},
-			hanldePopupFn(data){//监听活动内容
-				this.popupShow = true
-				this.handlerPros = data
-			},
-			queryLogistics(){//跳转查询物流页面
-				this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+this.orderId)
-			},
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
 		},
-		onShow() {
-
+		hanldePopupFn(data) {
+			//监听活动内容
+			this.popupShow = true
+			this.handlerPros = data
+		},
+		queryLogistics() {
+			//跳转查询物流页面
+			this.$api.navigateTo('/pages/user/order/order-logistics?orderId=' + this.orderId)
+		},
+		btnConfirmPay() {
+			// 立即支付点击事件
+			this.getOrderPaymentValidation(this.orderId)
+		},
+		getOrderPaymentValidation(orderId) {
+			//监听根据付款状态做操作
+			this.OrderService.OrderPaymentValidation({ orderId: orderId })
+				.then(response => {
+					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}`
+							)
+						} else {
+							this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${orderId}`)
+						}
+					}
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
 		}
-	}
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	page {
-		height: auto;
-		background:#F7F7F7;
-	}
-	.details{
-		padding-bottom: 130rpx;
-	}
-	.btn-hover{
-		background: #FFFFFF;
-	}
-	.animation{
-		/* transition: transform 0.3s ease;*/
-		transition-property: transform;
-		transition-duration: 0.3s;
-		transition-timing-function: ease;
-	}
-	.invoice-balance{
-		width: 702rpx;
-		height: auto;
-		padding:0 24rpx;
-		background: #FFFFFF;
+page {
+	height: auto;
+	background: #f7f7f7;
+}
+.details {
+	padding-bottom: 180rpx;
+}
+.btn-hover {
+	background: #ffffff;
+}
+.animation {
+	/* transition: transform 0.3s ease;*/
+	transition-property: transform;
+	transition-duration: 0.3s;
+	transition-timing-function: ease;
+}
+.invoice-balance {
+	width: 702rpx;
+	height: auto;
+	padding: 0 24rpx;
+	background: #ffffff;
+	float: left;
+	margin-top: 24rpx;
+	margin-bottom: 24rpx;
+	.balabce-t {
+		width: 100%;
+		height: 86rpx;
+		line-height: 86rpx;
+		font-size: $font-size-28;
+		color: $text-color;
 		float: left;
-		margin-top: 24rpx;
-		margin-bottom: 24rpx;
-		.balabce-t{
-			width: 100%;
-			height: 86rpx;
-			line-height: 86rpx;
-			font-size: $font-size-28;
-			color: $text-color;
+		.balabce-t-le {
 			float: left;
-			.balabce-t-le{
+			font-weight: bold;
+		}
+		.balabce-t-ri {
+			float: right;
+			display: flex;
+			align-items: center;
+			.money {
+				display: flex;
 				float: left;
-				font-weight: bold;
 			}
-			.balabce-t-ri{
-				float: right;
+			.checkbox-box {
 				display: flex;
-				align-items: center;
-				.money{
-					display: flex;
-					float: left;
-				}
-				.checkbox-box{
-					display: flex;
-					width: 60rpx;
-					float: left;
-					height: 100%;
-					font-size: $font-size-24;
-					.checkbox{
-						width: 40rpx;
-						text-align: right;
-						box-sizing: border-box;
-						text-align: center;
-						text-decoration: none;
-						border-radius: 0;
-						-webkit-tap-highlight-color: transparent;
-						overflow: hidden;
-					}
-				}	
-			}
-		}
-		.balabce-b{
-			width: 100%;	
-			float: left;
-			overflow: hidden;
-			.balabce-b-text{
-				width: 100%;
-				line-height: 58rpx;
+				width: 60rpx;
+				float: left;
+				height: 100%;
 				font-size: $font-size-24;
-				color: #FF2A2A;
-				text-align: right;
-				float: right;
+				.checkbox {
+					width: 40rpx;
+					text-align: right;
+					box-sizing: border-box;
+					text-align: center;
+					text-decoration: none;
+					border-radius: 0;
+					-webkit-tap-highlight-color: transparent;
+					overflow: hidden;
+				}
 			}
-			&.balabce-b--hide {
-				padding: 0 0;
-				height: 0px;
-				line-height: 0px;
-			}	
 		}
 	}
-	.button-content{
-		width: 702rpx;
-		padding:0 24rpx;
-		height: auto;
-		background: #ffffff;
-		position: fixed;
-		bottom: 0;
-		left:0 ;
-		.btn{
-			width: 160rpx;
-			height:  64rpx;
-			margin:22rpx;
-			line-height: 64rpx;
-			font-size:$font-size-26;
-			color: #FFFFFF;
-			text-align: center;
+	.balabce-b {
+		width: 100%;
+		float: left;
+		overflow: hidden;
+		.balabce-b-text {
+			width: 100%;
+			line-height: 58rpx;
+			font-size: $font-size-24;
+			color: #ff2a2a;
+			text-align: right;
 			float: right;
 		}
-		.btn-query{
-			background:linear-gradient(135deg,rgba(255,212,129,1) 0%,rgba(198,129,0,1) 100%);
+		&.balabce-b--hide {
+			padding: 0 0;
+			height: 0px;
+			line-height: 0px;
 		}
 	}
-	
+}
+.button-content {
+	width: 702rpx;
+	padding: 0 24rpx;
+	height: auto;
+	background: #ffffff;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	.btn {
+		width: 160rpx;
+		height: 64rpx;
+		margin: 22rpx;
+		line-height: 64rpx;
+		font-size: $font-size-26;
+		color: #ffffff;
+		text-align: center;
+		float: right;
+		border-radius: 32rpx;
+	}
+	.btn-query {
+		background: linear-gradient(135deg, rgba(255, 212, 129, 1) 0%, rgba(198, 129, 0, 1) 100%);
+	}
+	.btn-cancel {
+		background: #ffffff;
+		color: #666666;
+		float: left;
+		// margin: 22rpx 0;
+		margin-right: 15rpx;
+		border: 2rpx solid #999999;
+	}
+}
 </style>

pages/user/order/order-sharelogin.vue

@@ -4,24 +4,22 @@
 			<view class="main-title">此订单包含如下商品：</view>
 			<view class="main-list clearfix">
 				<view class="main-list-item" v-for="(item, index) in productList" :key="index">
-					<view class="item-image">
-						<image :src="item.image" mode="scaleToFill"></image>
-					</view>
+					<view class="item-image"> <image :src="item.image" mode="scaleToFill"></image> </view>
 					<view class="item-mesage">
-						<view class="item-name">{{item.name}}</view>
-						<view class="item-num"><text>X</text>{{item.num}}</view>
+						<view class="item-name">{{ item.name }}</view>
+						<view class="item-num"><text>X</text>{{ item.num }}</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		<view class="container-footer">
-			<view class="login-btn" @click.stop="goLogin(1)">账号登录查看</view>
-			<view class="login-btn" @click.stop="goLogin(2)">使用分享码查看</view>
+		<view class="container-footer" :style="{ paddingBottom: isIphoneX ? '68rpx' : '34rpx' }">
+			<view class="login-btn" v-if="btnState.isPay" @click.stop="btnConfirmPay">立即支付</view>
+			<view class="login-sub">
+				<view class="btn" @click.stop="goLogin(1)">账号登录查看</view>
+				<view class="btn" @click.stop="goLogin(2)">使用分享码查看</view>
+			</view>
 			<view class="pay-statustext">
 				<view class="pay-statustext-inner">
-					<view class="pay-icon">
-						<text class="iconfont icon-gantanhao-yuankuang"></text>
-					</view>
 					<view class="pay-text">
 						<text>使用账号登录支持确认订单和直接付款，使用分享码只支持查看订单，不能操作</text>
 					</view>
@@ -31,220 +29,288 @@
 	</view>
 </template>
 <script>
-	import authorize from '@/common/config/authorize.js' 
-	export default{
-		data() {
-			return{
-				imagePath:'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAQhKoAAKWfqqSIds292.png',
-				shareCode:'',  		//获取用户登录的邀请码
-				isUserInfo:false,	//控制显示授权弹窗
-				isShareStatus:false,
-				productList:[],
-				params:{
-					code:'',
-					iv:'',
-					encryptedData:'',
-					orderId:0,			//订单ID
-					userId:0,			//机构用户ID	
-					serviceProviderId:0,//协销ID	
+import authorize from '@/common/config/authorize.js'
+export default {
+	data() {
+		return {
+			isIphoneX: this.$store.state.isIphoneX,
+			imagePath: 'https://img.caimei365.com/group1/M00/03/83/Cmis214FbbCAQhKoAAKWfqqSIds292.png',
+			shareCode: '', //获取用户登录的邀请码
+			isUserInfo: false, //控制显示授权弹窗
+			isShareStatus: false,
+			productList: [],
+			params: {
+				code: '',
+				iv: '',
+				encryptedData: '',
+				orderId: 0, //订单ID
+				userId: 0, //机构用户ID
+				serviceProviderId: 0 //协销ID
+			},
+			btnState: {
+				isPay:false
+			},
+			mapStateArr: [
+				{ label: 'isPay', val: [11, 12, 13, 21, 22, 23, 111], status: true }
+			]
+		}
+	},
+	onLoad(e) {
+		console.log(e)
+		this.params.orderId = e.orderId
+		this.params.userId = e.userId
+		if (e.serviceProviderId) {
+			this.params.serviceProviderId = e.serviceProviderId
+		}
+		this.initQueryUser()
+	},
+	methods: {
+		async initQueryUser() {
+			const getUserInfo = await authorize.getUserInfo('weixin')
+			this.params.code = await authorize.getCode('weixin')
+			this.params.iv = getUserInfo.iv
+			this.params.encryptedData = getUserInfo.encryptedData
+			this.OrderService.OrderShareCodeIdentity(this.params).then(response => {
+				if (response.code == 0) {
+					// 初始化订单商品数据
+					console.log(response.msg)
+					this.getOrderCommodityData()
+				} else if (response.code == 1) {
+					// 同为会所运营人员查看订单详情
+					this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderId=${this.params.orderId}`)
+				} else if (response.code == 2) {
+					// 协销查看分享订单
+					this.$api.navigateTo(
+						`/pages/seller/order/order-details?type=share&orderId=${this.params.orderId}&userId=${
+							this.params.userId
+						}`
+					)
+				} else if (response.code == 3) {
+					// 游客第二次查看订单详情
+					this.$api.redirectTo(
+						`/pages/user/order/order-sharedetails?orderId=${this.params.orderId}&userId=${
+							this.params.userId
+						}`
+					)
+				} else {
+					// 错误信息返回
+					this.$util.modal('提示', response.msg, '确定', '', false, () => {})
 				}
-			}
+			})
 		},
-		onLoad(e) {
-			console.log(e)
-			this.params.orderId = e.orderId
-			this.params.userId = e.userId
-			if(e.serviceProviderId){
-				this.params.serviceProviderId = e.serviceProviderId
+		getOrderCommodityData() {
+			//查询订单商品信息s
+			this.OrderService.OrderCommodityData({ orderId: this.params.orderId })
+				.then(response => {
+					const data =  response.data
+					this.productList = data.productList
+					this.mapStateArr.forEach(el => {
+						el.val.forEach(value => {
+							if (!data.payButton && data.orderStatus === value) {
+								this.btnState[el.label] = el.status
+							}
+						})
+					})
+					this.isShareStatus = true
+				})
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
+				})
+		},
+		goLogin(index) {
+			switch (index) {
+				case 1:
+					this.$store.commit('setLoginType', 7)
+					this.$store.commit('setLoginOrderId', this.params.orderId)
+					this.$api.navigateTo('/pages/login/login')
+					break
+				case 2:
+					this.$api.navigateTo(
+						`/pages/user/order/orderShareLogin?orderId=${this.params.orderId}&userId=${this.params.userId}`
+					)
+					break
 			}
-			this.initQueryUser()
 		},
-		methods:{
-			async initQueryUser(){
-				const getUserInfo = await authorize.getUserInfo('weixin')
-				this.params.code = await authorize.getCode('weixin')
-				this.params.iv = getUserInfo.iv
-				this.params.encryptedData = getUserInfo.encryptedData
-				this.OrderService.OrderShareCodeIdentity(this.params).then(response =>{
-					if(response.code == 0){// 初始化订单商品数据
-						console.log(response.msg)
-						this.getOrderCommodityData()
-					}else if(response.code == 1){// 同为会所运营人员查看订单详情
-						this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderId=${this.params.orderId}`)
-					}else if(response.code == 2){// 协销查看分享订单
-						this.$api.navigateTo(`/pages/seller/order/order-details?type=share&orderId=${this.params.orderId}&userId=${this.params.userId}`)
-					}else if(response.code == 3){// 游客第二次查看订单详情
-						this.$api.redirectTo(`/pages/user/order/order-sharedetails?orderId=${this.params.orderId}&userId=${this.params.userId}`)
-					}else{// 错误信息返回
-						this.$util.modal('提示',response.msg,'确定','',false,() =>{})
+		btnConfirmPay() {
+			// 待支付订单
+			this.getOrderPaymentValidation(this.params.orderId)
+		},
+		getOrderPaymentValidation(orderId) {
+			//监听根据付款状态做操作
+			this.OrderService.OrderPaymentValidation({ orderId: orderId })
+				.then(response => {
+					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}`
+							)
+						} else {
+							this.$api.navigateTo(
+								`/pages/user/order/order-payment?type=payfirm&orderId=${orderId}`
+							)
+						}
 					}
 				})
-			},
-			getOrderCommodityData(){//查询订单商品信息s
-				this.OrderService.OrderCommodityData({orderId:this.params.orderId}).then(response =>{
-					this.productList = response.data
-					this.isShareStatus = true
-				}).catch(error =>{
-					this.$util.msg(error.msg,2000)
+				.catch(error => {
+					this.$util.msg(error.msg, 2000)
 				})
-			},
-			goLogin(index){
-				switch(index){
-					case 1:
-						this.$store.commit('setLoginType',7)
-						this.$store.commit('setLoginOrderId',this.params.orderId)
-						this.$api.navigateTo('/pages/login/login')
-						break
-					case 2:
-						this.$api.navigateTo(`/pages/user/order/orderShareLogin?orderId=${this.params.orderId}&userId=${this.params.userId}`)
-						break
-				}
-			}
 		},
-		onShow() {
-			
-		}
-	}
+	},
+	onShow() {}
+}
 </script>
 
 <style lang="scss">
-	.login{
+.login {
+	width: 100%;
+	height: 100%;
+	background: #f7f7f7;
+	.model-warp.none {
+		display: none;
+	}
+	.model-warp.show {
+		display: block;
+	}
+	.container-main {
 		width: 100%;
-		height:100%;
-		background: #F7F7F7;
-		.model-warp.none{
-			display: none;			
-		}
-		.model-warp.show{
-			display: block;
+		height: auto;
+		padding-top: 80rpx;
+		padding-bottom: 352rpx;
+		.main-title {
+			width: 100%;
+			height: 80rpx;
+			padding: 0 20rpx;
+			background-color: #f7f7f7;
+			line-height: 80rpx;
+			text-align: left;
+			font-size: $font-size-30;
+			color: #333;
+			box-sizing: border-box;
+			position: fixed;
+			top: 0;
+			left: 0;
 		}
-		.container-main{
+		.main-list {
+			box-sizing: border-box;
 			width: 100%;
 			height: auto;
-			padding-top:80rpx ;
-			padding-bottom: 352rpx;
-			.main-title{
-				width: 100%;
-				height: 80rpx;
-				padding: 0 20rpx;
-				background-color: #F7F7F7;
-				line-height: 80rpx;
-				text-align: left;
-				font-size: $font-size-30;
-				color: #333;
-				box-sizing: border-box;
-				position: fixed;
-				top: 0;
-				left: 0;
-			}
-			.main-list{
+			background-color: #ffffff;
+			.main-list-item {
 				box-sizing: border-box;
 				width: 100%;
-				height: auto;
-				background-color: #FFFFFF;
-				.main-list-item{
-					box-sizing: border-box;
-					width: 100%;
-					height: 200rpx;
-					padding: 20rpx;
-					border-bottom: 1px solid #F7F7F7;
-					.item-image{
+				height: 200rpx;
+				padding: 20rpx;
+				border-bottom: 1px solid #f7f7f7;
+				.item-image {
+					width: 160rpx;
+					height: 160rpx;
+					float: left;
+					image {
 						width: 160rpx;
 						height: 160rpx;
-						float: left;
-						image{
-							width: 160rpx;
-							height: 160rpx;
-							display: block;
-						}
+						display: block;
 					}
-					.item-mesage{
-						width: 530rpx;
-						height: 160rpx;
-						float: left;
-						margin-left: 20rpx;
-						.item-name{
-							width: 100%;
-							height:84rpx;
-							line-height: 42rpx;
-							font-size: $font-size-28;
-							color: #333333;
-							text-align: justify;
-							text-overflow:ellipsis;
-							display: -webkit-box;
-							word-break: break-all;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 2;
-							overflow: hidden;
-						}
-						.item-num{
-							width: 100%;
-							height:46rpx;
-							line-height: 46rpx;
-							margin-top: 30rpx;
-							font-size: $font-size-28;
-							color: #333333;
-							text-align: left;
-							text{
-								font-size: $font-size-20;
-							}
+				}
+				.item-mesage {
+					width: 530rpx;
+					height: 160rpx;
+					float: left;
+					margin-left: 20rpx;
+					.item-name {
+						width: 100%;
+						height: 84rpx;
+						line-height: 42rpx;
+						font-size: $font-size-28;
+						color: #333333;
+						text-align: justify;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						word-break: break-all;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						overflow: hidden;
+					}
+					.item-num {
+						width: 100%;
+						height: 46rpx;
+						line-height: 46rpx;
+						margin-top: 30rpx;
+						font-size: $font-size-28;
+						color: #333333;
+						text-align: left;
+						text {
+							font-size: $font-size-20;
 						}
 					}
 				}
 			}
+	}
 		}
-		.login-btn{
-			width: 600rpx;
+	.login-btn {
+		width: 600rpx;
+		height: 88rpx;
+		font-size: $font-size-28;
+		line-height: 88rpx;
+		color: #ffffff;
+		margin: 0 auto;
+		margin-bottom: 24rpx;
+		text-align: center;
+		background: $btn-confirm;
+		border-radius: 50rpx;
+	}
+	.login-sub {
+		width: 600rpx;
+		height: 88rpx;
+		margin: 0 auto;
+		margin-bottom: 24rpx;
+		display: flex;
+		.btn {
+			flex: 1;
+			width: 288rpx;
 			height: 88rpx;
-			font-size: $font-size-28;
-			line-height: 88rpx;
-			color: #FFFFFF;
-			margin: 0 auto;
-			margin-bottom: 24rpx;
+			box-sizing: border-box;
+			border: 1px solid #b2b2b2;
 			text-align: center;
-			background: $btn-confirm;
+			line-height: 88rpx;
+			margin: 0 12rpx;
+			font-size: $font-size-30;
+			color: #333333;
 			border-radius: 50rpx;
 		}
-		.container-footer{
-			box-sizing: border-box;
-			width: 100%;
-			height: 352rpx;
-			padding: 0 24rpx;
-			padding-top: 24rpx;
-			padding-bottom: 24rpx;
-			background-color: #FFFFFF;
-			position: fixed;
-			bottom: 0;
-			left: 0;
-		}
-		.pay-statustext{
-			width: 100%;
-			height: auto;
-			float: left;
-			.pay-statustext-inner{
-				width: 100%;
-				margin: 0 auto;
-				.pay-icon{
-					width: 62rpx;
-					height: 100%;
-					float: left;
-					text-align: center;
-					.iconfont{
-						color: $color-system;
-						font-size:$font-size-36;
-						line-height: 20rpx;
-					}
-				}
-				.pay-text{
-					width: 635rpx;
-					height: 100%;
-					float: left;
-					line-height: 40rpx;
-					font-size: $font-size-26;
-					color: $color-system;
-					text-align: justify;
-				}
+	}
+	.container-footer {
+		box-sizing: border-box;
+		width: 100%;
+		height: auto;
+		padding: 0 24rpx;
+		padding-top: 24rpx;
+		padding-bottom: 24rpx;
+		background-color: #ffffff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+	}
+	.pay-statustext {
+		width: 100%;
+		height: auto;
+		float: left;
+		.pay-statustext-inner {
+			width: 600rpx;
+			margin: 0 auto;
+			.pay-text {
+				width: 600rpx;
+				height: 100%;
+				float: left;
+				line-height: 40rpx;
+				font-size: $font-size-26;
+				color: #fea785;
+				text-align: justify;
 			}
 		}
 	}
-</style>
+}
+</style>

services/ajax.env.js

@@ -1,14 +0,0 @@
-let URL_CONFIG = ''
-if(process.env.NODE_ENV === 'development'){
-    // 开发环境
-    // URL_CONFIG = 'http://192.168.2.67:8008'	 //智捷联调地址
-    // URL_CONFIG = 'http://192.168.2.68:8008'	 	 //涛涛联调地址
-    // URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'//采美测试地址
-    // URL_CONFIG = 'https://spi.caimei365.com'
-}else{ 
-    // 生产环境
-    // URL_CONFIG = 'https://spi-b.caimei365.com'
-    URL_CONFIG = 'https://spi.caimei365.com' 
-}
-export default URL_CONFIG

services/order.service.js

@@ -293,7 +293,7 @@ export default class OrderService {
         return this.AjaxService.get({ 
             url:'/order/club/count', 
             data, 
-            isLoading: true ,
+            isLoading: false ,
               
         })
     }

services/user.service.js

@@ -386,112 +386,9 @@ export default class UserService {
             url:'/user/club/remarks/delete', 
             data, 
             isLoading: true,
+              
         })
     }
-    /**
-	 *@添加潜在客户咨询人
-	 *@param name	机构用户clubId
-	 *@param serviceProviderId	协销Id
-	 */
-    getUserClubVisitorSave (data = {}) {
-	    return this.AjaxService.get({ 
-	        url:'/user/club/remarks/visitor/save', 
-	        data, 
-	        isLoading: false,
-        })	
-    }
-    /**
-	 *@修改潜在客户咨询人名称
-	 *@param questionMan	姓名
-	 *@param questionManId	咨询人Id
-	 *@param serviceProviderId	协销Id
-	 */
-    getUserClubVisitorUpdate (data = {}) {
-	    return this.AjaxService.get({ 
-	        url:'/user/club/remarks/visitor/update', 
-	        data, 
-	        isLoading: false,
-        })	
-    }
-    /**
-	 *@潜在客户列表 
-	 *@param serviceProviderId	机构用户clubId
-	 *@param pageNum 页码
-	 *@param pageSize 条数
-	 */
-    getUserClubVisitorList (data = {}) {
-	    return this.AjaxService.get({ 
-	        url:'/user/club/remarks/visitor/list', 
-	        data, 
-	        isLoading: true,
-        })	
-    }
-    /**
-	 *@潜在客户列表 
-	 *@param questionManId	咨詢人ID
-	 *@param pageNum 页码
-	 *@param pageSize 条数
-	 */
-    getUserClubVisitorRecordlist (data = {}) {
-	    return this.AjaxService.get({ 
-	        url:'/user/club/remarks/visitor/recordlist', 
-	        data, 
-	        isLoading: true,
-        })	
-    }
-    /**
-	 *@潜在客户信息保存
-	 *@param remarksId	記錄ID
-	 *@param questionManId	咨詢人ID
-	 *@param serviceProviderId	协销ID
-	 *@param remarks	文字
-	 *@param fileList	文件
-	 *@param imageList	图片
-	 *@param pageNum 页码
-	 *@param pageSize 条数
-	 */
-    getUserClubVisitorSaveAdd(data = {}) {
-	    return this.AjaxService.post({ 
-	        url:'/user/club/remarks/save/visit', 
-	        data, 
-	        isLoading: true,
-        })	
-    }
-    /**
-	 *@咨询人记录删除
-	 *@param remarksId	备注Id
-	 */
-    getUserRemarksVisitDelete (data = {}) {
-	    return this.AjaxService.post({ 
-	        url:'/user/club/remarks/delete/visit', 
-	        data, 
-	        isLoading: true,
-	    })
-    }
-    /**
-	 *@咨询人记录详情
-	 *@param remarksId	备注Id
-	 */
-    getUserRemarksVisitDetail (data = {}) {
-	    return this.AjaxService.get({ 
-	        url:'/user/club/remarks/detail/visit', 
-	        data, 
-	        isLoading: true,
-	    })
-    }
-    /**
-	 *@同步咨询人至机构
-	 *@param questionManId	备注Id
-	 */
-    getUserRemarksConcactVisit (data = {}) {
-	    return this.AjaxService.post({ 
-	        url:'/user/club/remarks/concact/visit', 
-	        data, 
-	        isLoading: true,
-            loadText:'同步中...'
-	    })
-    }
-	
     /**
 	 *@会员中心
 	 *@param userId	用户Id