Browse Source

协销订单列表订单详情增加分享支付 ,修改api

zhengjinyi 3 years ago
parent
commit
bd73a4c609

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

@@ -218,7 +218,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 =>{

+ 12 - 6
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{

+ 12 - 5
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)

+ 7 - 2
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){

+ 1 - 8
pages.json

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

+ 6 - 5
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: '', //机构余额

+ 6 - 1
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,

+ 0 - 214
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>

+ 0 - 4
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,

+ 47 - 47
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', {
@@ -350,7 +350,7 @@
 							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')
 					}
 				})
 			},

+ 5 - 5
pages/user/order/order-payment.vue

@@ -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>
@@ -164,7 +164,7 @@
 				optionType:'',
 				onlinePayFlag:'',
 				payBringTitle:'本次交易暂不支持线上支付,请使用线下转账方式付款',
-				payStatusText:'使用微信和企业网银支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。',
+				payStatusText:'使用微信和网银支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。',
 				pageType:''
 			}
 		},
@@ -250,10 +250,10 @@
 						this.invoiceStatus = data.invoiceStatus
 					}
 					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 =>{
@@ -263,7 +263,7 @@
 			goOrderCash(){
 				if(this.invoiceStatus){
 					this.$util.modal('','本次交易暂不支持线上支付开票,请使用线下转账的方式付款','知道了','',false,() =>{})
-					this.payStatusText = '使用微信和企业网银支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。'
+					this.payStatusText = '使用微信和网银支付全部金额后,供应商会在24小时后发货(周末、节假日顺延)。若着急发货,可以选择使用线下转账进行付款。'
 					this.isReceiptStatus = true
 				}else{
 					// 友盟埋点收集选择支付方式

+ 16 - 6
pages/user/order/order-sharedetails.vue

@@ -8,15 +8,14 @@
 		<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>
 		<!-- 退款记录 -->
 		<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>
@@ -28,7 +27,6 @@
 	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'		//促销活动弹窗
@@ -39,7 +37,6 @@
 			orderAddress,
 			invoiceTent,
 			goodsList,
-			transfeRecord,
 			paymentRecord,
 			refundRecord,
 			activiPopup
@@ -68,6 +65,7 @@
 				},
 				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},
 				]
 			}
 		},
@@ -108,6 +106,9 @@
 			queryLogistics(){//跳转查询物流页面
 				this.$api.navigateTo('/pages/user/order/order-logistics?orderId='+this.orderId)
 			},
+			btnConfirmPay(){// 待支付订单
+				
+			},
 		},
 		onShow() {
 
@@ -121,7 +122,7 @@
 		background:#F7F7F7;
 	}
 	.details{
-		padding-bottom: 130rpx;
+		padding-bottom: 180rpx;
 	}
 	.btn-hover{
 		background: #FFFFFF;
@@ -214,10 +215,19 @@
 			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>

+ 224 - 196
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" @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,250 @@
 	</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
 			}
+		}
+	},
+	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
-			}
-			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,() =>{})
-					}
-				})
-			},
-			getOrderCommodityData(){//查询订单商品信息s
-				this.OrderService.OrderCommodityData({orderId:this.params.orderId}).then(response =>{
+		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)
 				})
-			},
-			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
-				}
+				.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() {
-			
+		btnConfirmPay() {
+			// 待支付订单
+			this.$api.navigateTo(`/pages/user/order/order-payment?type=payfirm&orderId=${this.params.orderId}`)
 		}
-	}
+	},
+	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>

+ 0 - 5
services/ajax.service.js

@@ -27,11 +27,6 @@ class AjaxService {
             header = Object.assign(header, options.header)
         }
         url = requestUrl + url
-        // if(options.isHost){
-        //     url = corServiceUrl + url
-        // }else{
-        //     url = spiServiceUrl + url
-        // }
         let { isLoading = true } = options
         if (isLoading) {
             uni.showLoading({ title: '加载中' })

+ 1 - 1
services/beautyArchive.service.js

@@ -33,7 +33,7 @@ export default class BeautyArchiveService {
             url: '/user/club/archive/deduction',
             data,
             isLoading: true,
-            isHost:true
+              
         })
     }
 }

+ 2 - 2
services/config.env.js

@@ -4,8 +4,8 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.67:18002'	 //智捷联调地址
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
-    // URL_CONFIG = 'https://core-b.caimei365.com'
-    URL_CONFIG = 'https://core.caimei365.com'
+    URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'

+ 27 - 27
services/order.service.js

@@ -12,7 +12,7 @@ export default class OrderService {
             url:'/order/club/list', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 查询订单详情 */
@@ -21,7 +21,7 @@ export default class OrderService {
             url:'/order/club/detail', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 操作取消订单 */
@@ -30,7 +30,7 @@ export default class OrderService {
             url:'/order/club/cancel', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 操作删除订单 */
@@ -39,7 +39,7 @@ export default class OrderService {
             url:'/order/club/delete', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 确认订单操作 */
@@ -48,7 +48,7 @@ export default class OrderService {
             url:'/order/club/confirm', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 确认收货操作 */
@@ -57,7 +57,7 @@ export default class OrderService {
             url:'/order/club/receive', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 订单物流信息 */
@@ -66,7 +66,7 @@ export default class OrderService {
             url:'/order/club/logistics', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -78,7 +78,7 @@ export default class OrderService {
             url:'/order/club/share/code', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -91,7 +91,7 @@ export default class OrderService {
             data, 
             isLoading: true,
             isStatus: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -104,7 +104,7 @@ export default class OrderService {
             data, 
             isLoading: true,
             isStatus: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -119,7 +119,7 @@ export default class OrderService {
             url:'/order/club/search', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -131,7 +131,7 @@ export default class OrderService {
             url:'/order/club/search/history', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -143,7 +143,7 @@ export default class OrderService {
             url:'/order/club/search/history/delete', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -158,7 +158,7 @@ export default class OrderService {
             url:'/order/club/product/settlement', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -170,7 +170,7 @@ export default class OrderService {
             url:'/order/club/cart/count', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -184,7 +184,7 @@ export default class OrderService {
             url:'/order/club/cart/settlement', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -199,7 +199,7 @@ export default class OrderService {
             url:'/order/club/postage', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -211,7 +211,7 @@ export default class OrderService {
             url:'/order/club/invoice', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -223,7 +223,7 @@ export default class OrderService {
             url:'/order/club/invoice/update', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 提交订单 orderId 订单ID */
@@ -232,7 +232,7 @@ export default class OrderService {
             url:'/order/submit/generate', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 订单支付,效验付款规则 orderId 订单ID */
@@ -241,7 +241,7 @@ export default class OrderService {
             url:'/order/pay/check', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /* 余额抵扣 orderId 订单ID */
@@ -250,7 +250,7 @@ export default class OrderService {
             url:'/order/pay/balance/deduction', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /* 分享订单初始化查询 orderId 订单ID */
@@ -259,7 +259,7 @@ export default class OrderService {
             url:'/order/club/share/product', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /*二手订单 打款供应商 */
@@ -268,7 +268,7 @@ export default class OrderService {
             url:'/order/club/second/payment/confirm', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -282,7 +282,7 @@ export default class OrderService {
             url:'/order/club/product/buynow', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -293,8 +293,8 @@ export default class OrderService {
         return this.AjaxService.get({ 
             url:'/order/club/count', 
             data, 
-            isLoading: true ,
-            isHost:true
+            isLoading: false ,
+              
         })
     }
 }

+ 1 - 1
services/other.service.js

@@ -14,7 +14,7 @@ export default class OtherService {
 			url:'/order/club/clause', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/**

+ 8 - 8
services/pay.service.js

@@ -12,7 +12,7 @@ export default class PayService {
             url:'/order/pay/online/switch', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /* 小程序支付-初始化收银台 */
@@ -21,7 +21,7 @@ export default class PayService {
             url:'/order/pay/checkout/counter', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -37,7 +37,7 @@ export default class PayService {
             url:'/order/pay/wechat', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -49,7 +49,7 @@ export default class PayService {
         return this.AjaxService.post({ 
             url:'/order/pay/link', 
             data, isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -61,7 +61,7 @@ export default class PayService {
             url:'/order/pay/second/wechat', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     } 
     /**
@@ -73,7 +73,7 @@ export default class PayService {
             url:'/user/register/super/beans', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     } 
     /**
@@ -84,7 +84,7 @@ export default class PayService {
 	        url:'/user/register/super/pay', 
 	        data, 
 	        isLoading: true,
-	        isHost:true
+	          
 	    })
     }
     /**
@@ -98,7 +98,7 @@ export default class PayService {
             url:'/order/pay/vip/wechat', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     } 
 }

+ 31 - 31
services/product.service.js

@@ -39,7 +39,7 @@ export default class ProductService {
             url:'/commodity/price/list',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
 	
@@ -52,7 +52,7 @@ export default class ProductService {
             url:'/commodity/promotions/info',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -66,7 +66,7 @@ export default class ProductService {
             url:'/commodity/promotions/product',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
 	
@@ -80,7 +80,7 @@ export default class ProductService {
             url:'/commodity/product/details',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -95,7 +95,7 @@ export default class ProductService {
             url:'/commodity/coupon/details/coupons',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -121,7 +121,7 @@ export default class ProductService {
             url:'/order/club/cart/add',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -134,7 +134,7 @@ export default class ProductService {
             url:'/order/club/cart/add/bulk',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -158,7 +158,7 @@ export default class ProductService {
             url:'/order/club/cart/list',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
 	
@@ -171,7 +171,7 @@ export default class ProductService {
             url:'/order/club/cart/update',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
 	
@@ -187,7 +187,7 @@ export default class ProductService {
             url:'/order/club/coupon',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -200,7 +200,7 @@ export default class ProductService {
             url:'/order/club/cart/delete',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 二级列表 */
@@ -217,7 +217,7 @@ export default class ProductService {
             url:'/commodity/promotions/list', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 搜索项目仪器列表 */
@@ -226,7 +226,7 @@ export default class ProductService {
             url:'/commodity/search/query/equipment', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 项目仪器详情 */
@@ -235,7 +235,7 @@ export default class ProductService {
             url:'/commodity/equipment/details', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 查询搜索历史记录 */
@@ -268,7 +268,7 @@ export default class ProductService {
             url:'/commodity/search/query/product', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 搜索分类商品列表 */
@@ -277,7 +277,7 @@ export default class ProductService {
             url:'/commodity/search/query/product/type', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /* 搜索分类商品列表 */
@@ -286,7 +286,7 @@ export default class ProductService {
             url:'/commodity/seller/product/combination', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /* 获取商品评价 */
@@ -299,7 +299,7 @@ export default class ProductService {
             url:'/commodity/product/repeat', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 新商品搜索查询商品阶梯价格 */
@@ -308,7 +308,7 @@ export default class ProductService {
             url:'/commodity/price/ladder', 
             data, 
             isLoading: false,
-            isHost:true
+              
         })
     }
     /* 获取分类导航 */
@@ -339,7 +339,7 @@ export default class ProductService {
             url:'/commodity/coupon/activity/page',
             data,
             isLoading: true,
-            isHost:true
+              
         })
     }
     /**
@@ -354,7 +354,7 @@ export default class ProductService {
             url:'/commodity/coupon/center',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -368,7 +368,7 @@ export default class ProductService {
             url:'/commodity/coupon/collar/list',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -382,7 +382,7 @@ export default class ProductService {
             url:'/commodity/coupon/collar',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -396,7 +396,7 @@ export default class ProductService {
             url:'/commodity/coupon/redeem',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -408,7 +408,7 @@ export default class ProductService {
             url:'/commodity/coupon/coupons/count',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -421,7 +421,7 @@ export default class ProductService {
             url:'/commodity/userLike/likeOne',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -435,7 +435,7 @@ export default class ProductService {
             url:'/commodity/userLike/likeList',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -448,7 +448,7 @@ export default class ProductService {
             url:'/commodity/userLike/deleteList',
             data,
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -461,7 +461,7 @@ export default class ProductService {
             url:'/commodity/svip/product/page',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -475,7 +475,7 @@ export default class ProductService {
             url:'/commodity/seller/combination/list',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -490,7 +490,7 @@ export default class ProductService {
             url:'/commodity/search/query/brand',
             data,
             isLoading: true ,
-            isHost:true
+              
         })
     }
 	

+ 5 - 5
services/public.service.js

@@ -14,7 +14,7 @@ export default class PublicService {
 			url:'/order/address/select/all', 
 			data, 
 			isLoading: false ,
-			isHost:true
+			  
 		})
 	}
 	/**
@@ -26,7 +26,7 @@ export default class PublicService {
 			url:'/user/captcha', 
 			data, 
 			isLoading: true,
-			isHost:true
+			  
 		})
 	}
 	/**
@@ -65,7 +65,7 @@ export default class PublicService {
 			url:'/user/sms/code', 
 			data, 
 			isLoading: true,
-			isHost:true
+			  
 		})
 	}
 	/**
@@ -78,7 +78,7 @@ export default class PublicService {
 			url:'/user/mail/code', 
 			data, 
 			isLoading: true,
-			isHost:true
+			  
 		})
 	}
 	/**
@@ -96,7 +96,7 @@ export default class PublicService {
 			url:'/user/sms/bind', 
 			data, 
 			isLoading: true,
-			isHost:true
+			  
 		})
 	}
 }	

+ 3 - 3
services/second.service.js

@@ -15,7 +15,7 @@ export default class SecondService {
 			url:'/commodity/second/list', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/*二手发布/品牌列表 */
@@ -28,7 +28,7 @@ export default class SecondService {
 			url:'/commodity/second/release', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/*二手发布/浏览量 */
@@ -48,7 +48,7 @@ export default class SecondService {
 			url:'/commodity/second/detail', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 }

+ 20 - 20
services/sellse.service.js

@@ -18,7 +18,7 @@ export default class SellerService {
             url:'/user/login/seller', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -37,7 +37,7 @@ export default class SellerService {
             url:'/user/register/club/temporary', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -49,7 +49,7 @@ export default class SellerService {
             url:'/user/register/club/online', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -61,7 +61,7 @@ export default class SellerService {
             url:'/user/register/check', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /**
@@ -77,7 +77,7 @@ export default class SellerService {
             url:'/user/seller/club/list', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -119,7 +119,7 @@ export default class SellerService {
             url:'/order/seller/list', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -133,7 +133,7 @@ export default class SellerService {
             url:'/order/seller/list/club', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -147,7 +147,7 @@ export default class SellerService {
             url:'/order/seller/search', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     // 协销订单列表/再来一单
@@ -156,7 +156,7 @@ export default class SellerService {
             url:'/order/seller/cart/again', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -170,7 +170,7 @@ export default class SellerService {
             url:'/commodity/second/order/products', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -185,7 +185,7 @@ export default class SellerService {
             url:'/order/seller/second/settlement', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
 	
@@ -207,7 +207,7 @@ export default class SellerService {
             url:'/order/seller/cart/add', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -220,7 +220,7 @@ export default class SellerService {
             url:'/order/seller/cart/add', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -233,7 +233,7 @@ export default class SellerService {
             url:'/order/seller/cart/count', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -246,7 +246,7 @@ export default class SellerService {
             url:'/order/seller/cart/update', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -258,7 +258,7 @@ export default class SellerService {
             url:'/order/seller/cart/delete', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -271,7 +271,7 @@ export default class SellerService {
             url:'/order/seller/cart/list', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /*协销下单订单->api*/
@@ -286,7 +286,7 @@ export default class SellerService {
             url:'/order/seller/cart/settlement', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -309,7 +309,7 @@ export default class SellerService {
             url:'/order/submit/recharge', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /**
@@ -320,7 +320,7 @@ export default class SellerService {
             url:'/order/submit/generate', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     // 协销购物车清空失效列表

+ 22 - 22
services/shop.service.js

@@ -12,7 +12,7 @@ export default class ShopService {
 			url:'/user/register/shop', 
 			data, 
 			isLoading: true,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序-搜索供应商列表 */
@@ -21,7 +21,7 @@ export default class ShopService {
 			url:'/commodity/search/query/shop', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序供应商个人中心 */
@@ -34,7 +34,7 @@ export default class ShopService {
 			url:'/commodity/shop/product/list', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序供应商操作添加删除主推商品 */
@@ -43,7 +43,7 @@ export default class ShopService {
 			url:'/commodity/shop/featured/switch', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序供应商操作下架商品 */
@@ -52,7 +52,7 @@ export default class ShopService {
 			url:'/commodity/shop/product/offline', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序供应商我的店铺详情 */
@@ -77,7 +77,7 @@ export default class ShopService {
 			url:'/commodity/shop/product/main', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序供应商我的店铺全部商品 */
@@ -86,7 +86,7 @@ export default class ShopService {
 			url:'/commodity/search/query/product/shop', 
 			data, 
 			isLoading: false ,
-			isHost:true
+			  
 		})
 	}
 	/* 发货-添加商品资质初始化查询商品 */
@@ -95,7 +95,7 @@ export default class ShopService {
 			url:'/order/shop/ship/logistics/record', 
 			data, 
 			isLoading: false ,
-			isHost:true
+			  
 		})
 	}
 	/* 发货-商品资质回显 */
@@ -104,7 +104,7 @@ export default class ShopService {
 			url:'/order/shop/qualification/list', 
 			data, 
 			isLoading: false ,
-			isHost:true
+			  
 		})
 	}
 	/* 发货-保存商品资质 */
@@ -113,7 +113,7 @@ export default class ShopService {
 			url:'/order/shop/qualification/save', 
 			data, 
 			isLoading: false ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序供应商我的订单 */
@@ -122,7 +122,7 @@ export default class ShopService {
 			url:'/order/shop/list', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序发货-权限控制 */
@@ -131,7 +131,7 @@ export default class ShopService {
 			url:'/order/shop/share/code/check', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序发货-查询供应商子订单详情 */
@@ -140,7 +140,7 @@ export default class ShopService {
 			url:'/order/shop/detail', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序发货-供应商订单详情获取订单分享码 */
@@ -149,7 +149,7 @@ export default class ShopService {
 			url:'/order/shop/share/code', 
 			data, 
 			isLoading: false ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序发货-供应商订单发货商品查询 */
@@ -158,7 +158,7 @@ export default class ShopService {
 			url:'/order/shop/ship/info', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序发货-物流公司查询 */
@@ -167,7 +167,7 @@ export default class ShopService {
 			url:'/order/shop/ship/company', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序发货-查看发货记录物流信息 */
@@ -176,7 +176,7 @@ export default class ShopService {
 			url:'/order/shop/ship/logistics/info', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序发货-查看发货记录-添加物流 */
@@ -185,7 +185,7 @@ export default class ShopService {
 			url:'/order/shop/ship/logistics/add', 
 			data, 
 			isLoading: true,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序发货-扫码获取物流公司信息 */
@@ -194,7 +194,7 @@ export default class ShopService {
 			url:'/order/shop/ship/logistics/scan', 
 			data, 
 			isLoading: false,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序发货-确认发货 */
@@ -203,7 +203,7 @@ export default class ShopService {
 			url:'/order/shop/ship/delivery',
 			 data, 
 			 isLoading: true ,
-			 isHost:true
+			   
 		})
 	}
 	/* 小程序发货-发货记录 */
@@ -212,7 +212,7 @@ export default class ShopService {
 			url:'/order/shop/ship/delivery/record', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 小程序发货-撤销发货 */
@@ -221,7 +221,7 @@ export default class ShopService {
 			url:'/order/shop/ship/delivery/cancel', 
 			data, 
 			isLoading: true ,
-			isHost:true
+			  
 		})
 	}
 	/* 一级分类 */

+ 35 - 35
services/user.service.js

@@ -12,7 +12,7 @@ export default class UserService {
             url: '/user/login/auth/applets',
             data,
             isLoading: false,
-            isHost:true
+              
         })
     }
     /* 邀请码授权登录 */
@@ -22,7 +22,7 @@ export default class UserService {
             data,
             isLoading: true,
             isStatus: false,
-            isHost:true
+              
         })
     }
     /* 个人机构注册 */
@@ -31,7 +31,7 @@ export default class UserService {
             url:'/user/register/club', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /* 供应商注册 */ 
@@ -40,7 +40,7 @@ export default class UserService {
             url:'/user/register/shop', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /**
@@ -55,7 +55,7 @@ export default class UserService {
             data, 
             isLoading: true ,
             isStatus: true,
-            isHost:true
+              
         })
     }
     /* 查询机构资料*/
@@ -64,7 +64,7 @@ export default class UserService {
             url:'/user/club/info',
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /* 协销拉机构上线(查询暂时数据)*/
@@ -73,7 +73,7 @@ export default class UserService {
             url:'/user/register/temporary/data',
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /* 机构升级资质机构 */
@@ -82,7 +82,7 @@ export default class UserService {
             url:'/user/register/club/upgrade', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /* 机构提交资料修改 */
@@ -91,7 +91,7 @@ export default class UserService {
             url:'/user/club/info/update', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /* 供应商资料信息-数据回显 */
@@ -100,7 +100,7 @@ export default class UserService {
             url:'/user/shop/info', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /* 供应商修改申请信息保存 */
@@ -109,7 +109,7 @@ export default class UserService {
             url:'/user/register/shop/apply', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /* 供应商资料信息-提交修改 */
@@ -118,7 +118,7 @@ export default class UserService {
             url:'/user/shop/info/update', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /**
@@ -129,7 +129,7 @@ export default class UserService {
             url:'/user/login/auth/bind', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /*个人机构取消提示*/
@@ -138,7 +138,7 @@ export default class UserService {
             url:'/user/register/guide', 
             data, 
             isLoading: false ,
-            isHost:true
+              
         })
     }
     /**
@@ -154,7 +154,7 @@ export default class UserService {
             url:'/user/update/password', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -170,7 +170,7 @@ export default class UserService {
             url:'/user/update/mobile', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -184,7 +184,7 @@ export default class UserService {
             url:'/order/address/list', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -197,7 +197,7 @@ export default class UserService {
             url:'/order/address/save', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -210,7 +210,7 @@ export default class UserService {
             url:'/order/address/delete', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -241,7 +241,7 @@ export default class UserService {
             url:'/user/operation/list', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 运营人员管理-添加 */
@@ -250,7 +250,7 @@ export default class UserService {
             url:'/user/operation/save', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 运营人员管理-删除 */
@@ -259,7 +259,7 @@ export default class UserService {
             url:'/user/operation/delete', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /* 运营人员管理-更新邀请码 */
@@ -268,7 +268,7 @@ export default class UserService {
             url:'/user/operation/code/update', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -283,7 +283,7 @@ export default class UserService {
             url:'/user/seller/temporary/club', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -295,7 +295,7 @@ export default class UserService {
             url:'/user/seller/delete/temporary/club', 
             data, 
             isLoading: true ,
-            isHost:true
+              
         })
     }
     /**
@@ -307,7 +307,7 @@ export default class UserService {
             url:'/user/club/obtain/beans', 
             data, 
             isLoading: false,
-            isHost:true
+              
         })
     }
     /**
@@ -319,7 +319,7 @@ export default class UserService {
             url:'/user/club/home', 
             data, 
             isLoading: false,
-            isHost:true
+              
         })
     }
     /**
@@ -336,7 +336,7 @@ export default class UserService {
             url:'/user/club/beans/history', 
             data, 
             isLoading: false,
-            isHost:true
+              
         })
     }
     /**
@@ -350,7 +350,7 @@ export default class UserService {
             url:'/user/club/remarks/list', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /**
@@ -362,7 +362,7 @@ export default class UserService {
             url:'/user/club/remarks/save', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /**
@@ -374,7 +374,7 @@ export default class UserService {
             url:'/user/club/remarks/detail', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /**
@@ -386,7 +386,7 @@ export default class UserService {
             url:'/user/club/remarks/delete', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /**
@@ -398,7 +398,7 @@ export default class UserService {
             url:'/user/super/center', 
             data, 
             isLoading: false,
-            isHost:true
+              
         })
     }
     /**
@@ -412,7 +412,7 @@ export default class UserService {
             url:'/user/super/history', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }
     /**
@@ -423,7 +423,7 @@ export default class UserService {
             url:'/user/super/package', 
             data, 
             isLoading: true,
-            isHost:true
+              
         })
     }		
 }