订单

common/css/iconfont.scss

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4053045 */
-  src: url('//at.alicdn.com/t/c/font_4053045_tztu6byiibq.woff2?t=1683624677435') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4053045_tztu6byiibq.woff?t=1683624677435') format('woff'),
-       url('//at.alicdn.com/t/c/font_4053045_tztu6byiibq.ttf?t=1683624677435') format('truetype'),
-       url('//at.alicdn.com/t/c/font_4053045_tztu6byiibq.svg?t=1683624677435#iconfont') format('svg');
+  src: url('//at.alicdn.com/t/c/font_4053045_x0f8a4dqiha.woff2?t=1684058283095') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4053045_x0f8a4dqiha.woff?t=1684058283095') format('woff'),
+       url('//at.alicdn.com/t/c/font_4053045_x0f8a4dqiha.ttf?t=1684058283095') format('truetype'),
+       url('//at.alicdn.com/t/c/font_4053045_x0f8a4dqiha.svg?t=1684058283095#iconfont') format('svg');
 }
 
 .iconfont {
@@ -14,6 +14,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-wancheng:before {
+  content: "\e734";
+}
+
+.icon-shibai:before {
+  content: "\e735";
+}
+
+.icon-tianjiadizhi:before {
+  content: "\e617";
+}
+
+.icon-gantanhao-yuankuang:before {
+  content: "\e763";
+}
+
 .icon-weixinzhifu:before {
   content: "\e62a";
 }

pages/login/register.vue

@@ -293,7 +293,7 @@ export default {
 				password: '',
 				passWordConfirm: '',
 				smsCode: '',
-				avatarUrl: 'https://img1.baidu.com/it/u=928439317,3166459101&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500',
+				avatarUrl: '',
 				nickName: '',
 				unionId: '',
 				name:'',
@@ -302,14 +302,14 @@ export default {
 				townId:'',
 				address: '',
 				organizeType:1, //外部商城机构类型 0内部机构 1外部机构
-				shopPhoto:'https://img1.baidu.com/it/u=928439317,3166459101&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500',
-				businessLicense:'https://img1.baidu.com/it/u=928439317,3166459101&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500',
-				medicalPracticeLicense:'https://img1.baidu.com/it/u=928439317,3166459101&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500',
+				shopPhoto:'',
+				businessLicense:'',
+				medicalPracticeLicense:'',
 			},
 			codeParams:{
 				mobile: '',
 				isCheckCaptcha: 1,
-				activateCodeType: 2,
+				activateCodeType: 8,
 				platformType: 2
 			},
 			handleAddress:'请选择机构所在地区',
@@ -698,6 +698,7 @@ export default {
 						background: $btn-confirm;
 						text-align: center;
 						border-radius: 32rpx;
+						font-size: 24rpx;
 						&.none {
 							background: #f7f7f7;
 						}

pages/tabBar/home/index.js

@@ -75,6 +75,7 @@ const homeMiXins = {
                 this.logout()
                 uni.setStorageSync('unionId', error.data.unionId)
                 this.$store.commit('updateStatus', error.data)
+				 this.mallOrganizeHome()
             }
         },
         async updateCartCount() {

pages/user/order/create-order.vue

@@ -488,6 +488,8 @@ export default {
 			this.postageParam.townId = SelectData.townId
 			this.addressData = SelectData
 			this.getFreightData()
+		}else{
+			this.getAddressData()
 		}
 	}
 }

pages/user/order/order-pay-list.vue

@@ -1,44 +1,53 @@
 <template>
 	<view class="container cashier">
-		<view class="pay-title" v-if="!showPayUnder" @click="handlePayunder">
-			<view class="content">
-				因线上支付政策调整，请对每家店铺分别进行线上付款；若需要直接转账支付订单，请点击右侧箭头查看线下转账信息。
-				<view class="content-icon"> <text class="iconfont icon-xiangyou"></text> </view>
+		<tui-skeleton
+			v-if="skeletonShow"
+			backgroundColor="#fafafa"
+			borderRadius="10rpx"
+			:isLoading="true"
+			:loadingType="5"
+		></tui-skeleton>
+		<template v-else>
+			<view class="pay-title" v-if="!showPayUnder" @click="handlePayunder">
+				<view class="content">
+					因线上支付政策调整，请对每家店铺分别进行线上付款；若需要直接转账支付订单，请点击右侧箭头查看线下转账信息。
+					<view class="content-icon"> <text class="iconfont icon-xiangyou"></text> </view>
+				</view>
 			</view>
-		</view>
-		<view class="pay-content">
-			<view class="pay-list" v-for="(list, index) in list" :key="index">
-				<view class="pay-list-title">{{ list.shopName }}</view>
-				<view class="pay-list-goods" v-for="(pros, prosIndex) in list.orderProductList" :key="prosIndex">
-					<view class="pay-list-image"> <image :src="pros.image" class="image" mode=""></image> </view>
-					<view class="pay-list-info">
-						<view class="info-title">{{ pros.name }}</view>
-						<view class="info-view" v-if="pros.productUnit != ''"> 规格:{{ pros.productUnit ? pros.productUnit : '' }} </view>
-						<view class="info-view" v-if="pros.productCode != '' && pros.productCode != null">
-							商品编码:{{ pros.productCode ? pros.productCode : '' }}
-						</view>
-						<view class="info-price">
-							<view class="price">￥{{ pros.price | NumFormat }}</view>
-							<view class="count"><text class="sm">X</text> {{ pros.num }}</view>
+			<view class="pay-content">
+				<view class="pay-list" v-for="(list, index) in list" :key="index">
+					<view class="pay-list-title">{{ list.shopName }}</view>
+					<view class="pay-list-goods" v-for="(pros, prosIndex) in list.orderProductList" :key="prosIndex">
+						<view class="pay-list-image"> <image :src="pros.image" class="image" mode=""></image> </view>
+						<view class="pay-list-info">
+							<view class="info-title">{{ pros.name }}</view>
+							<view class="info-view" v-if="pros.productUnit != ''"> 规格:{{ pros.productUnit ? pros.productUnit : '' }} </view>
+							<view class="info-view" v-if="pros.productCode != '' && pros.productCode != null">
+								商品编码:{{ pros.productCode ? pros.productCode : '' }}
+							</view>
+							<view class="info-price">
+								<view class="price">￥{{ pros.price | NumFormat }}</view>
+								<view class="count"><text class="sm">X</text> {{ pros.num }}</view>
+							</view>
 						</view>
 					</view>
-				</view>
-				<view class="pay-list-msg">
-					<view class="list-msg" v-if="list.receiptAmount > 0"
-						>已付:<text class="text">￥{{ list.receiptAmount | NumFormat }}</text></view
-					>
-					<view class="list-msg" v-if="list.eachDiscount > 0"
-						>优惠:<text class="text">￥{{ list.eachDiscount | NumFormat }}</text></view
-					>
-				</view>
-				<view class="pay-list-btn">
-					<view class="btn" v-if="list.receiptStatus != 3" @click="handlePayOrder(list.shopOrderId)">付款</view>
-					<view class="list-msg" v-if="list.obligation > 0"
-						>待付:<text class="text red">￥{{ list.obligation | NumFormat }}</text></view
-					>
+					<view class="pay-list-msg">
+						<view class="list-msg" v-if="list.receiptAmount > 0"
+							>已付:<text class="text">￥{{ list.receiptAmount | NumFormat }}</text></view
+						>
+						<view class="list-msg" v-if="list.eachDiscount > 0"
+							>优惠:<text class="text">￥{{ list.eachDiscount | NumFormat }}</text></view
+						>
+					</view>
+					<view class="pay-list-btn">
+						<view class="btn" v-if="list.receiptStatus != 3" @click="handlePayOrder(list.shopOrderId)">付款</view>
+						<view class="list-msg" v-if="list.obligation > 0"
+							>待付:<text class="text red">￥{{ list.obligation | NumFormat }}</text></view
+						>
+					</view>
 				</view>
 			</view>
-		</view>
+		</template>			
 	</view>
 </template>
 
@@ -48,6 +57,7 @@ export default {
 		return {
 			orderId: 0,
 			showPayUnder:false,
+			skeletonShow:true,
 			list: []
 		}
 	},
@@ -71,25 +81,26 @@ export default {
 			this.payOrderId = '#' + e.orderId + '#'
 			this.PayOrderShoporders(this.orderId)
 		},
-		PayOrderShoporders(orderId) {
-			this.PayService.PayOrderShoporders({ orderId: orderId })
-				.then(response => {
-					this.list = response.data
-					this.PayOrderCheckoutCounter(orderId)
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+		async PayOrderShoporders(orderId) {
+			try{
+				const res =await  this.PayService.PayOrderShoporders({ orderId: orderId })
+				this.list = res.data
+				this.PayOrderCheckoutCounter(orderId)
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
 		},
-		PayOrderCheckoutCounter(orderId){
-			this.PayService.PayOrderCheckoutCounter({orderId:orderId}).then(response =>{
-				let data = response.data
+		async PayOrderCheckoutCounter(orderId){
+			try{
+				const res = await this.PayService.PayOrderCheckoutCounter({orderId:orderId})
+				const data = res.data
+				this.skeletonShow = false
 				if(data.discernReceipt.length>0){
 					this.showPayUnder = true
 				}
-			}).catch(error =>{
+			}catch(error){
 				this.$util.msg(error.msg,2000)
-			})
+			}
 		},
 		handlePayOrder(shopOrderId){
 			this.$api.navigateTo(`/pages/user/pay/card-order?shopOrderId=${shopOrderId}`)

pages/user/pay/card-order.vue

@@ -98,7 +98,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="pay-item" @click="tabClick(1)" v-if="showB2BpayMode">
+						<!-- <view class="pay-item" @click="tabClick(1)" v-if="showB2BpayMode">
 							<view class="pay-item-cell">
 								<view class="item-icon"><text class="iconfont icon-qiyewangyinzhifu"></text></view>
 								<view class="item-texts"><text>企业网银支付</text></view>
@@ -121,7 +121,7 @@
 									></text>
 								</view>
 							</view>
-						</view>
+						</view> -->
 					</view>
 					<view class="pay-statustext">
 						<view class="pay-statustext-inner">
@@ -233,7 +233,7 @@ export default {
 					text: '知道了',
 					customStyle: {
 						color: '#fff',
-						bgColor: 'linear-gradient(90deg, #F28F31 0%, #F3B574 100%)'
+						bgColor: '#F3B574'
 					},
 					plain: false
 				}
@@ -285,30 +285,29 @@ export default {
 			this.GetPayOrderInfo()
 			this.GetUserClubBanks()
 		},
-		GetPayOrderInfo() {
+		async GetPayOrderInfo() {
 			//初始化支付信息
-			this.PayService.PayOrderCheckoutShoporders({ shopOrderId: this.shopOrderId })
-				.then(response => {
-					let data = response.data
-					this.discernReceipt = data.discernReceipt // 支付记录
-					this.shopOrderInfo = data.shopOrder // 子订单
-					this.obligation = data.shopOrder.obligation // 待付金额
-					this.orderId = data.shopOrder.orderId // 主订单Id
-					this.receiptAmount = data.shopOrder.receiptAmount // 已付金额
-					this.payableAmount = data.shopOrder.realPay // 应付金额
-					this.payAmount = this.toFixedFn(this.obligation) // 自定义金额
-					this.balanceAmount = this.obligation - this.payAmount // 计算剩余支付金额
-					// 支付方式配置
-					if(data.onlinePayWays){
-						this.checkPayMode(data.onlinePayWays)
-					}
-					setTimeout(() => {
-						this.skeletonShow = false
-					}, 500)
-				})
-				.catch(error => {
-					this.$util.msg(error.msg, 2000)
-				})
+			try{
+				const res  = await this.PayService.PayOrderCheckoutShoporders({ shopOrderId: this.shopOrderId })
+				const data = res.data
+				this.discernReceipt = data.discernReceipt // 支付记录
+				this.shopOrderInfo = data.shopOrder // 子订单
+				this.obligation = data.shopOrder.obligation // 待付金额
+				this.orderId = data.shopOrder.orderId // 主订单Id
+				this.receiptAmount = data.shopOrder.receiptAmount // 已付金额
+				this.payableAmount = data.shopOrder.realPay // 应付金额
+				this.payAmount = this.toFixedFn(this.obligation) // 自定义金额
+				this.balanceAmount = this.obligation - this.payAmount // 计算剩余支付金额
+				// 支付方式配置
+				if(data.onlinePayWays){
+					this.checkPayMode(data.onlinePayWays)
+				}
+				setTimeout(() => {
+					this.skeletonShow = false
+				}, 500)
+			}catch(error){
+				this.$util.msg(error.msg, 2000)
+			}
 		},
 		async GetUserClubBanks() {
 		    //获取列表
@@ -346,37 +345,22 @@ export default {
 			if(this.isSubLoding){ return }
 			switch (this.tabCurrentIndex) {
 				case 0: // 微信支付
-					this.handleUmTrackEvent('Um_Event_ConfirmWechatPay', '微信支付')
 					this.MiniWxPayFor()
 					break
 				case 1: // 企业网银
 					this.payType = '1'
-					this.handleUmTrackEvent('Um_Event_ConfirmEbankPay', '企业网银')
 					this.handlePayOrderPayLink()
 					break
 				case 2: // 个人网银
 					this.payType = '2'
-					this.handleUmTrackEvent('Um_Event_ConfirmAbankPay', '个人网银')
 					this.handlePayOrderPayLink()
 					break
 				case 3: // 快捷支付
-					this.handleUmTrackEvent('Um_Event_ConfirmAbankPay', '快捷支付')
 					this.orderPayQuickPay()
 					break
 			}
 			this.isSubLoding = true
 		},
-		handleUmTrackEvent(UmName, UmPageName) {
-			// 友盟埋点收集
-			if (process.env.NODE_ENV != 'development') {
-				this.$uma.trackEvent(UmName, {
-					Um_Key_PageName: UmPageName,
-					Um_Key_SourcePage: '线上支付',
-					Um_Key_PayName: `${this.buttonText}`,
-					Um_Key_PayOrderID: `${this.shopOrderId}`
-				})
-			}
-		},
 		async orderPayQuickPay() {
 			//快捷支付
 			try {
@@ -433,10 +417,6 @@ export default {
 		},
 		async MiniWxPayFor() {
 			// 微信支付
-			if (this.payAmount > 5000) {
-				this.modal = true
-				return
-			}
 			if (this.payAmount == 0) {
 				this.$util.msg('请输入本次支付的金额', 2000)
 				return
@@ -555,9 +535,9 @@ page {
 		margin: 0 auto;
 		.pay-content {
 			width: 100%;
-			height: 420rpx;
+			height: 380rpx;
 			box-sizing: border-box;
-			padding: 64rpx 35rpx 0 35rpx;
+			padding: 38rpx 35rpx 0 35rpx;
 			background: url(https://static.caimei365.com/app/mini-mcare/icon/icon_payment@2x.png) no-repeat;
 			background-size: cover;
 			float: left;
@@ -570,7 +550,7 @@ page {
 				.pay-paid {
 					width: 100%;
 					height: auto;
-					margin-bottom: 38rpx;
+					margin-bottom: 28rpx;
 					text {
 						line-height: 48rpx;
 						text-align: left;
@@ -670,12 +650,12 @@ page {
 					.bot-resid-le {
 						display: inline-block;
 						float: left;
-						color: $color-system;
+						color: #F85050;
 					}
 					.bot-resid-ri {
 						display: inline-block;
 						float: right;
-						color: #1890f9;
+						color: #999999;
 						.iconfont {
 							font-size: 32rpx;
 						}
@@ -689,7 +669,6 @@ page {
 			float: left;
 			box-sizing: border-box;
 			padding: 0 0 32rpx 0;
-			border-top: 1px solid #e1e1e1;
 			margin-top: 180rpx;
 			.pay-card-main {
 				width: 100%;

pages/user/pay/mixins/cardMixins.js

@@ -67,26 +67,24 @@ const cardMixins = {
                 this.buttonText = '个人网银支付'
                 break
             case 3:
-                this.btnColor = 'linear-gradient(90deg, #FF9300 0%, #F3B574 100%)'
+                this.btnColor = '#F3B574'
                 this.buttonText = '使用银行卡快捷支付'
                 break
             }
         },
         checkPayMode(range) {
             // 校验支付模式
-            // test range = '4'
             // 1微信 2支付宝 3个人网银 4企业网银 5快捷支付
             this.weChatFlag = range.indexOf('1') > -1
             this.B2BpayFlag = range.indexOf('4') > -1
             this.QuickPayFlag = range.indexOf('5') > -1
-            // 设置默认支付方式
-            if(this.QuickPayFlag){
-                this.tabCurrentIndex = 3
-            }else{
-                this.tabCurrentIndex = this.weChatFlag ? 0 : this.B2BpayFlag ? 1 : 2
-            }
-            
-            this.tabClick(this.tabCurrentIndex)
+            // // 设置默认支付方式
+            // if(this.QuickPayFlag){
+            //     this.tabCurrentIndex = 3
+            // }else{
+            //     this.tabCurrentIndex = this.weChatFlag ? 0 : this.B2BpayFlag ? 1 : 2 
+            // }
+            this.tabClick(0)
         }
     }
 }

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.102:18002' //志国联调地址
-    URL_CONFIG = 'http://192.168.2.103:18002' // 陈凯联调
-    // URL_CONFIG = 'https://core-b.caimei365.com'
+    // URL_CONFIG = 'http://192.168.2.103:18002' // 陈凯联调
+    URL_CONFIG = 'https://core-b.caimei365.com'
     // URL_CONFIG = 'https://core.caimei365.com'  
 }else{
     // 生产环境

services/pay.service.js

@@ -20,7 +20,7 @@ export default class PayService {
 	    return this.AjaxService.get({ 
 	        url:'/order/pay/shoporders', 
 	        data, 
-	        isLoading: true ,
+	        isLoading: false ,
 	          
 	    })
     }