Browse Source

2023-10-16

cmy 2 years ago
parent
commit
99a5445fd8

+ 3 - 2
components/orderGoods/index.vue

@@ -250,12 +250,13 @@
 		},
 		},
 		watch: {
 		watch: {
 			cartInfo: function(nVal, oVal) {
 			cartInfo: function(nVal, oVal) {
-				console.log(this.$parent)
+				// console.log(nVal,JSON.stringify(nVal));
 				let num = 0
 				let num = 0
 				nVal.forEach((item, index) => {
 				nVal.forEach((item, index) => {
 					num += item.cart_num
 					num += item.cart_num
 				})
 				})
-				this.totalNmu = num
+				this.totalNmu = num;
+				// console.log(this.totalNmu,'this.totalNmu');
 			},
 			},
 			giveCartInfo:function(nVal, oVal){
 			giveCartInfo:function(nVal, oVal){
 				let num = 0
 				let num = 0

+ 18 - 0
components/payment/index.vue

@@ -5,6 +5,23 @@
 			<view class="title acea-row row-center-wrapper">
 			<view class="title acea-row row-center-wrapper">
 				选择付款方式<text class="iconfont icon-guanbi" @click='close'></text>
 				选择付款方式<text class="iconfont icon-guanbi" @click='close'></text>
 			</view>
 			</view>
+			<!-- #ifdef APP-PLUS -->
+			<view class="item acea-row row-between-wrapper" v-for="(item,index) in payMode" :key="index"
+				v-if='item.payStatus && (item.name!="微信支付")' @click="payType(item.number || 0 , item.value,index)">
+				<view class="left acea-row row-between-wrapper">
+					<view class="iconfont" :class="item.icon"></view>
+					<view class="text">
+						<view class="name">{{item.name}}</view>
+						<view class="info" v-if="item.value == 'yue'">
+							{{item.title}} <span class="money">¥{{ item.number }}</span>
+						</view>
+						<view class="info" v-else>{{item.title}}</view>
+					</view>
+				</view>
+				<view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef APP -->
 			<view class="item acea-row row-between-wrapper" v-for="(item,index) in payMode" :key="index"
 			<view class="item acea-row row-between-wrapper" v-for="(item,index) in payMode" :key="index"
 				v-if='item.payStatus' @click="payType(item.number || 0 , item.value,index)">
 				v-if='item.payStatus' @click="payType(item.number || 0 , item.value,index)">
 				<view class="left acea-row row-between-wrapper">
 				<view class="left acea-row row-between-wrapper">
@@ -19,6 +36,7 @@
 				</view>
 				</view>
 				<view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view>
 				<view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view>
 			</view>
 			</view>
+			<!-- #endif -->
 			<view class="payMoney">支付<span class="font-color">¥<span class="money">{{totalPrice}}</span></span></view>
 			<view class="payMoney">支付<span class="font-color">¥<span class="money">{{totalPrice}}</span></span></view>
 			<view class="button bg-color acea-row row-center-wrapper" @click='goPay(number, paytype)'>去付款</view>
 			<view class="button bg-color acea-row row-center-wrapper" @click='goPay(number, paytype)'>去付款</view>
 			<slot name="buttom"></slot>
 			<slot name="buttom"></slot>

+ 0 - 2
pages/annex/vip_paid/index.vue

@@ -174,7 +174,6 @@
 				goodsList: [],
 				goodsList: [],
 				pay_order_id: '',
 				pay_order_id: '',
 				payMode: [
 				payMode: [
-					// #ifndef APP-PLUS
 					{
 					{
 						name: '微信支付',
 						name: '微信支付',
 						icon: 'icon-weixinzhifu',
 						icon: 'icon-weixinzhifu',
@@ -182,7 +181,6 @@
 						title: '微信快捷支付',
 						title: '微信快捷支付',
 						payStatus: true
 						payStatus: true
 					}
 					}
-					// #endif
 					// #ifdef H5 ||APP-PLUS
 					// #ifdef H5 ||APP-PLUS
 					,
 					,
 					{
 					{

+ 0 - 2
pages/goods/lottery/grids/order.vue

@@ -358,7 +358,6 @@
 				textareaStatus: true,
 				textareaStatus: true,
 				//支付方式
 				//支付方式
 				cartArr: [
 				cartArr: [
-					// #ifndef APP
 					{
 					{
 						"name": "微信支付",
 						"name": "微信支付",
 						"icon": "icon-weixin2",
 						"icon": "icon-weixin2",
@@ -366,7 +365,6 @@
 						title: '使用微信快捷支付',
 						title: '使用微信快捷支付',
 						payStatus: 1,
 						payStatus: 1,
 					},
 					},
-					// #endif
 					{
 					{
 						"name": "支付宝支付",
 						"name": "支付宝支付",
 						"icon": "icon-zhifubao",
 						"icon": "icon-zhifubao",

File diff suppressed because it is too large
+ 675 - 649
pages/goods/order_confirm/index.vue


+ 0 - 2
pages/goods/order_details/index.vue

@@ -1132,7 +1132,6 @@
 				refund_close: false,
 				refund_close: false,
 				isClose: false,
 				isClose: false,
 				payMode: [
 				payMode: [
-					// #ifndef APP-PLUS
 					{
 					{
 						name: "微信支付",
 						name: "微信支付",
 						icon: "icon-weixinzhifu",
 						icon: "icon-weixinzhifu",
@@ -1140,7 +1139,6 @@
 						title: '使用微信快捷支付',
 						title: '使用微信快捷支付',
 						payStatus: true,
 						payStatus: true,
 					},
 					},
-					// #endif
 					// #ifdef H5 || APP-PLUS
 					// #ifdef H5 || APP-PLUS
 					{
 					{
 						name: '支付宝支付',
 						name: '支付宝支付',

+ 0 - 2
pages/goods/order_list/index.vue

@@ -187,7 +187,6 @@
 				page: 1,
 				page: 1,
 				limit: 20,
 				limit: 20,
 				payMode: [
 				payMode: [
-					// #ifndef APP-PLUS
 					{
 					{
 						name: '微信支付',
 						name: '微信支付',
 						icon: 'icon-weixinzhifu',
 						icon: 'icon-weixinzhifu',
@@ -195,7 +194,6 @@
 						title: '使用微信快捷支付',
 						title: '使用微信快捷支付',
 						payStatus: true
 						payStatus: true
 					},
 					},
-					// #endif
 					{
 					{
 						name: '支付宝支付',
 						name: '支付宝支付',
 						icon: 'icon-zhifubao',
 						icon: 'icon-zhifubao',

+ 0 - 2
pages/goods/order_pay/index.vue

@@ -65,7 +65,6 @@
 				pay_close: false,
 				pay_close: false,
 				//支付方式
 				//支付方式
 				cartArr: [
 				cartArr: [
-					// #ifndef APP-PLUS
 					{
 					{
 						"name": "微信支付",
 						"name": "微信支付",
 						"icon": "icon-weixin2",
 						"icon": "icon-weixin2",
@@ -73,7 +72,6 @@
 						title: '使用微信快捷支付',
 						title: '使用微信快捷支付',
 						payStatus: 1,
 						payStatus: 1,
 					},
 					},
-					// #endif
 					{
 					{
 						"name": "支付宝支付",
 						"name": "支付宝支付",
 						"icon": "icon-zhifubao",
 						"icon": "icon-zhifubao",

+ 0 - 2
pages/points_mall/integral_order_details.vue

@@ -184,7 +184,6 @@
 				status: {}, //订单底部按钮状态
 				status: {}, //订单底部按钮状态
 				isClose: false,
 				isClose: false,
 				payMode: [
 				payMode: [
-					// #ifndef APP-PLUS
 					{
 					{
 						name: "微信支付",
 						name: "微信支付",
 						icon: "icon-weixinzhifu",
 						icon: "icon-weixinzhifu",
@@ -192,7 +191,6 @@
 						title: '使用微信快捷支付',
 						title: '使用微信快捷支付',
 						payStatus: true,
 						payStatus: true,
 					},
 					},
-					// #endif
 					// #ifdef H5 || APP-PLUS
 					// #ifdef H5 || APP-PLUS
 					{
 					{
 						name: '支付宝支付',
 						name: '支付宝支付',

+ 0 - 2
pages/users/user_invoice_order/index.vue

@@ -576,14 +576,12 @@
 				status: {}, //订单底部按钮状态
 				status: {}, //订单底部按钮状态
 				isClose: false,
 				isClose: false,
 				payMode: [
 				payMode: [
-					// #ifndef APP-PLUS
 					{
 					{
 						name: "微信支付",
 						name: "微信支付",
 						icon: "icon-weixinzhifu",
 						icon: "icon-weixinzhifu",
 						value: 'weixin',
 						value: 'weixin',
 						title: '微信快捷支付'
 						title: '微信快捷支付'
 					},
 					},
-					// #endif
 					// #ifdef H5 || APP-PLUS
 					// #ifdef H5 || APP-PLUS
 					{
 					{
 						name: '支付宝支付',
 						name: '支付宝支付',

+ 0 - 2
pages/users/user_payment/index.vue

@@ -108,7 +108,6 @@
 				goodsList: [],
 				goodsList: [],
 				pay_order_id: '',
 				pay_order_id: '',
 				payMode: [
 				payMode: [
-					// #ifndef APP-PLUS
 					{
 					{
 						name: '微信支付',
 						name: '微信支付',
 						icon: 'icon-weixinzhifu',
 						icon: 'icon-weixinzhifu',
@@ -116,7 +115,6 @@
 						title: '微信快捷支付',
 						title: '微信快捷支付',
 						payStatus: true
 						payStatus: true
 					},
 					},
-					// #endif
 					// #ifdef H5 ||APP-PLUS
 					// #ifdef H5 ||APP-PLUS
 					,
 					,
 					{
 					{

Some files were not shown because too many files changed in this diff