2024-10-29

components/payment/index.vue

@@ -337,13 +337,11 @@
 							});
 							// #endif
 							break;
-						case "lakala":
+						case "huifu":
 							// #ifdef MP
-							wx.navigateToMiniProgram({
-								appId: 'wx889424d565967811',
-								path: `payment-cashier/pages/checkout/index?source=WECHATMINI&counterUrl=${
-														        encodeURIComponent(res.data.result.counter_url)
-														    }`,
+							uni.openEmbeddedMiniProgram({
+								appId: 'wx33dc829ad98f7c64',
+								path: `pages/index/index?token=${res.data.result.data.pre_order_id}`,
 								envVersion: 'release',
 								// release: 正式版  trial: 体验版
 								success(res) {
@@ -356,9 +354,15 @@
 										});
 									}, 2000)
 								},
-								complete() {
+								complete(err) {
+									// uni.showModal({
+									// 	title:"",
+									// 	content:err
+									// })
+									console.log(err,'errrs')
 									uni.hideLoading();
 								}
+								
 							})
 							// #endif
 							// #ifdef H5

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "易趣C果园",
+    "name" : "易趣水果",
     "appid" : "__UNI__EFB0F0A",
     "description" : "易趣C果园",
-    "versionName" : "2.6.2",
-    "versionCode" : 269,
+    "versionName" : "2.6.7",
+    "versionCode" : 273,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -88,7 +88,7 @@
                     "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店",
                     "NSCameraUsageDescription" : "上传用户头像保存分享海报"
                 },
-                "idfa" : true,
+                "idfa" : false,
                 "dSYMs" : false
             },
             /* SDK配置 */
@@ -179,6 +179,7 @@
     /* 小程序特有相关 */
     "mp-weixin" : {
         "appid" : "wx9d53e46a38eda4b9",
+        "embeddedAppIdList" : [ "wx33dc829ad98f7c64" ],
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

pages/goods/order_confirm/index.vue

@@ -486,10 +486,10 @@
 						payStatus: 2,
 					},
 					{
-						"name": "lakala",
+						"name": "慧付",
 						"icon": "icon-yuezhifu1",
-						value: 'lakala',
-						title: '选择lakala支付',
+						value: 'huifu',
+						title: '选择慧付支付',
 						payStatus: 2,
 					}
 				],
@@ -1658,39 +1658,40 @@
 							});
 							// #endif
 							break;
-						case "LAKALA_PAY":
+						case "HUIFU_PAY":
 							// #ifdef MP
-							wx.navigateToMiniProgram({
-								appId: 'wx889424d565967811',
-								path: `payment-cashier/pages/checkout/index?source=WECHATMINI&counterUrl=${
-														        encodeURIComponent(res.data.result.counter_url)
-														    }`,
+							wx.openEmbeddedMiniProgram({
+								appId: 'wx33dc829ad98f7c64',
+								path: `pages/index/index?token=${res.data.result.data.pre_order_id}`,
 								envVersion: 'release',
 								// release: 正式版  trial: 体验版
 								success(res) {
 									// 打开成功
-									// return that.$util.Tips({
-									// title: '支付成功',
-									// icon: 'success'
-									// }, {
-									// tab: 4,
-									// url: goPages
-									// });
-									uni.navigateTo({
-										url: '/pages/goods/order_details/index?order_id=' +
-											orderId
-									})
+									return that.$util.Tips({
+									title: '支付成功',
+									icon: 'success'
+									}, {
+									tab: 4,
+									url: goPages
+									});
+									// uni.navigateTo({
+									// 	url: '/pages/goods/order_details/index?order_id=' +
+									// 		orderId
+									// })
 								},
-								complete() {
+								complete(err) {
+									// uni.showModal({
+									// 	title:"",
+									// 	content:err
+									// })
 									uni.hideLoading();
 								}
 							})
 							// #endif
 							// #ifdef H5
-							window.location.href = res.data.result.counter_url;
+							// window.location.href = res.data.result.counter_url;
 							// #endif
 							// #ifdef APP
-
 							plus.share.getServices((res) => {
 								console.log(JSON.stringify(res));
 								let sweixin = res.find(i => i.id === 'weixin');
@@ -1703,9 +1704,6 @@
 									})
 								}
 							})
-
-
-
 							// plus.runtime.openURL(
 							// 	res.data.result.counter_url
 							// );

pages/goods/order_list/index.vue

@@ -207,6 +207,13 @@
 						title: '当前可用余额：',
 						number: 0,
 						payStatus: true
+					},
+					{
+						"name": "慧付",
+						"icon": "icon-yuezhifu1",
+						value: 'huifu',
+						title: '选择慧付支付',
+						payStatus: true
 					}
 				],
 				pay_close: false,

pages/users/user_payment/index.vue

@@ -9,19 +9,23 @@
 			</view>
 			<view class="payment">
 				<view class="nav acea-row row-around row-middle">
-					<view class="item" :class="active==index?'on':''" v-for="(item,index) in navRecharge" :key="index" @click="navRecharges(index)">{{item}}</view>
+					<view class="item" :class="active==index?'on':''" v-for="(item,index) in navRecharge" :key="index"
+						@click="navRecharges(index)">{{item}}</view>
 				</view>
-				<view class='tip picList' v-if='!active' >
-					<view class="pic-box pic-box-color acea-row row-center-wrapper row-column" :class="activePic == index ? 'pic-box-color-active' : ''"
-					 v-for="(item, index) in picList" :key="index" @click="picCharge(index, item)" v-if="item.price">
+				<view class='tip picList' v-if='!active'>
+					<view class="pic-box pic-box-color acea-row row-center-wrapper row-column"
+						:class="activePic == index ? 'pic-box-color-active' : ''" v-for="(item, index) in picList"
+						:key="index" @click="picCharge(index, item)" v-if="item.price">
 						<view class="pic-number-pic">
 							{{ item.price }}<span class="pic-number"> 元</span>
 						</view>
 						<view class="pic-number">赠送：{{ item.give_money }} 元</view>
 					</view>
-					<view class="pic-box pic-box-color acea-row row-center-wrapper" :class="activePic == picList.length ? 'pic-box-color-active' : ''"
-					 @click="picCharge(picList.length)">
-						<input type="digit" placeholder="其他" v-model="money" class="pic-box-money pic-number-pic" :class="activePic == picList.length ? 'pic-box-color-active' : ''" />
+					<view class="pic-box pic-box-color acea-row row-center-wrapper"
+						:class="activePic == picList.length ? 'pic-box-color-active' : ''"
+						@click="picCharge(picList.length)">
+						<input type="digit" placeholder="其他" v-model="money" class="pic-box-money pic-number-pic"
+							:class="activePic == picList.length ? 'pic-box-color-active' : ''" />
 					</view>
 					<view class="tips-box">
 						<view class="tips mt-30">注意事项：</view>
@@ -32,10 +36,14 @@
 
 				</view>
 				<view class="tip" v-else>
-					<view class='input'><text>￥</text><input @input='inputNum' :maxlength="moneyMaxLeng" placeholder="0.00" type='digit' placeholder-class='placeholder' :value="number" name="number"></input></view>
+					<view class='input'><text>￥</text><input @input='inputNum' :maxlength="moneyMaxLeng"
+							placeholder="0.00" type='digit' placeholder-class='placeholder' :value="number"
+							name="number"></input></view>
 					<view class="tips-title">
 						<view style="font-weight: bold; font-size: 26rpx;">提示：</view>
-						<view style="margin-top: 10rpx;">当前可转入佣金为 <text class='font-color'>￥{{userinfo.commissionCount || 0}}</text>,冻结佣金为<text class='font-color'>￥{{userinfo.broken_commission}}</text></view>
+						<view style="margin-top: 10rpx;">当前可转入佣金为 <text
+								class='font-color'>￥{{userinfo.commissionCount || 0}}</text>,冻结佣金为<text
+								class='font-color'>￥{{userinfo.broken_commission}}</text></view>
 					</view>
 					<view class="tips-box">
 						<view class="tips mt-30">注意事项：</view>
@@ -44,11 +52,11 @@
 						</view>
 					</view>
 				</view>
-				<button class='but bg-color' formType="submit" > {{active ? '立即转入': '立即充值' }}</button>
+				<button class='but bg-color' formType="submit"> {{active ? '立即转入': '立即充值' }}</button>
 			</view>
 		</form>
-		<payment :payMode="payMode" :pay_close="pay_close" :is-call="true" @changePayType="changePayType" @onChangeFun="onChangeFun"
-			:order_id="pay_order_id" :totalPrice="totalPrice"></payment>
+		<payment :payMode="payMode" :pay_close="pay_close" :is-call="true" @changePayType="changePayType"
+			@onChangeFun="onChangeFun" :order_id="pay_order_id" :totalPrice="totalPrice"></payment>
 		<home v-if="navigation"></home>
 		<view v-show="false" v-html="formContent"></view>
 		<!-- #ifdef MP -->
@@ -86,7 +94,7 @@
 			home,
 			payment
 		},
-		mixins:[colors],
+		mixins: [colors],
 		data() {
 			let that = this;
 			return {
@@ -102,8 +110,8 @@
 				picList: [],
 				activePic: 0,
 				money: "",
-				numberPic:'',
-				rechar_id:0,
+				numberPic: '',
+				rechar_id: 0,
 				password: '',
 				goodsList: [],
 				pay_order_id: '',
@@ -124,6 +132,14 @@
 						payStatus: true
 					}
 					// #endif
+					,
+					{
+						"name": "慧付",
+						"icon": "icon-yuezhifu1",
+						value: 'huifu',
+						title: '选择慧付支付',
+						payStatus: true,
+					}
 				],
 				pay_close: false,
 				payType: '',
@@ -133,21 +149,21 @@
 				isWeixin: this.$wechat.isWeixin(),
 				// #endif
 				type: '',
-				rechargeAttention:[],
-				moneyMaxLeng:8
+				rechargeAttention: [],
+				moneyMaxLeng: 8
 			};
 		},
 		computed: mapGetters(['isLogin']),
-		watch:{
-			isLogin:{
-				handler:function(newV,oldV){
-					if(newV){
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
 						this.getOrderPayType();
 						this.getUserInfo();
 						this.getRecharge();
 					}
 				},
-				deep:true
+				deep: true
 			}
 		},
 		onLoad(options) {
@@ -170,14 +186,14 @@
 				this.getOrderPayType();
 				this.getUserInfo();
 				this.getRecharge();
-				
+
 			},
 			inputNum: function(e) {
 				let val = e.detail.value;
 				let dot = val.indexOf('.');
-				if(dot>-1){
-					this.moneyMaxLeng = dot+3;
-				}else{
+				if (dot > -1) {
+					this.moneyMaxLeng = dot + 3;
+				} else {
 					this.moneyMaxLeng = 8
 				}
 			},
@@ -256,13 +272,19 @@
 				})
 			},
 			changePayType: function(e) {
+				console.log(e, '267');
+				this.payType = e;
 				// #ifdef H5
-				this.payType = e == 'alipay' ? 'alipay' : this.$wechat.isWeixin() ? 'weixin' : 'weixinh5'
+				if (!this.$wechat.isWeixin() && this.payType == 'weixin') {
+					this.payType = 'weixinh5';
+				}
 				// #endif
-				// #ifndef H5
-				this.payType = e == 'alipay' ? 'alipay' : 'routine'
+				// #ifdef MP
+				if (this.payType == 'weixin') {
+					this.payType = 'routine'
+				}
 				// #endif
-				console.log('双方各大华股份不报错',this.payType);
+				console.log('双方各大华股份不报错', this.payType);
 			},
 			onChangeFun: function(e) {
 				let opt = e;
@@ -277,6 +299,19 @@
 				this.createMemberCard(type);
 			},
 			createMemberCard(type) {
+				if (!this.payType) {
+					this.payType = type;
+					// #ifdef H5
+					if (!this.$wechat.isWeixin() && this.payType == 'weixin') {
+						this.payType = 'weixinh5';
+					}
+					// #endif
+					// #ifdef MP
+					if (this.payType == 'weixin') {
+						this.payType = 'routine'
+					}
+					// #endif
+				}
 				uni.showLoading({
 					title: '正在加载…'
 				});
@@ -286,121 +321,189 @@
 				})
 				let that = this
 				let money = parseFloat(this.money);
-				if( this.rechar_id == 0){
-					if(Number.isNaN(money)){
-						return that.$util.Tips({title: '充值金额必须为数字'});
+				if (this.rechar_id == 0) {
+					if (Number.isNaN(money)) {
+						return that.$util.Tips({
+							title: '充值金额必须为数字'
+						});
 					}
-					if(money <= 0){
-						return that.$util.Tips({title: '充值金额不能为0'});
+					if (money <= 0) {
+						return that.$util.Tips({
+							title: '充值金额不能为0'
+						});
 					}
-				}else{
+				} else {
 					// money = this.numberPic
 				}
-				rechargeRecharge({
-					price: parseFloat(this.totalPrice),
-					type: 0,
-					rechar_id: this.rechar_id,
-					from: this.payType === 'alipay' ? 'alipay' : 'routine'
-				}).then(res => {
-					uni.hideLoading();
-					let data = res.data.data;
-					let mp_pay_name=''
-					if(uni.requestOrderPayment){
-						mp_pay_name='requestOrderPayment'
-					}else{
-						mp_pay_name='requestPayment'
-					}
-					uni[mp_pay_name]({
-						// #ifdef MP
-						timeStamp: data.timestamp,
-						nonceStr: data.nonceStr,
-						package: data.package,
-						signType: data.signType,
-						paySign: data.paySign,
-						// #endif
-						// #ifdef APP-PLUS
-						provider: this.payType==='alipay'?'alipay':'wxpay',
-						orderInfo: data,
-						// #endif
-						success: function(res) {
-							return that.$util.Tips({
-								title: '支付成功',
-								icon: 'success'
-							}, {
-								tab: 5,
-								url: '/pages/users/user_money/index'
-							});
-						},
-						fail: function() {
-							return that.$util.Tips({
-								title: '支付失败'
-							});
-						},
-						complete: function(res) {
-							if (res.errMsg == 'requestPayment:cancel') return that.$util.Tips({
-								title: '取消支付'
-							});
+				if (this.payType != 'huifu') {
+					rechargeRecharge({
+						price: parseFloat(this.totalPrice),
+						type: 0,
+						rechar_id: this.rechar_id,
+						from: this.payType
+					}).then(res => {
+						uni.hideLoading();
+						let data = res.data.data;
+						let mp_pay_name = ''
+						if (uni.requestOrderPayment) {
+							mp_pay_name = 'requestOrderPayment'
+						} else {
+							mp_pay_name = 'requestPayment'
 						}
-					})
-				}).catch(err => {
-					uni.hideLoading();
-					return that.$util.Tips({
-						title: err
-					})
-				});
-				// #endif
-				// #ifdef H5
-					let that = this
-					this.pay_close = true;
-					this.totalPrice = this.rechar_id == 0 ? this.money : this.numberPic;
-					if (!this.payType) {
-						this.changePayType(type);
-					}
-					rechargeWechat({
+						uni[mp_pay_name]({
+							// #ifdef MP
+							timeStamp: data.timestamp,
+							nonceStr: data.nonceStr,
+							package: data.package,
+							signType: data.signType,
+							paySign: data.paySign,
+							// #endif
+							// #ifdef APP-PLUS
+							provider: this.payType === 'alipay' ? 'alipay' : 'wxpay',
+							orderInfo: data,
+							// #endif
+							success: function(res) {
+								return that.$util.Tips({
+									title: '支付成功',
+									icon: 'success'
+								}, {
+									tab: 5,
+									url: '/pages/users/user_money/index'
+								});
+							},
+							fail: function() {
+								return that.$util.Tips({
+									title: '支付失败'
+								});
+							},
+							complete: function(res) {
+								uni.showModal({
+									title:"",
+									content:err
+								})
+								if (res.errMsg == 'requestPayment:cancel') return that.$util.Tips({
+									title: '取消支付'
+								});
+							}
+						})
+
+					}).catch(err => {
+						uni.hideLoading();
+						return that.$util.Tips({
+							title: err
+						})
+					});
+				} else {
+					rechargeRecharge({
 						price: parseFloat(this.totalPrice),
-						// from: this.payType == '' ? this.$wechat.isWeixin() ? 'weixin' :'weixinh5' : this.payType,
-						from: this.payType,
-						rechar_id: that.rechar_id
+						type: 0,
+						rechar_id: this.rechar_id,
+						from: this.payType
 					}).then(res => {
-						let data = res.data;
-						if (data.type == "weixinh5") {
-							uni.showToast({
-								title: data.msg,
-								success() {
-									location.href = data.data.mweb_url;
-								}
-							});
-						}else if(data.type == "alipay") {
-							uni.hideLoading();
-							uni.hideLoading();
-							this.formContent = data.data;
-							this.$nextTick(() => {
-								document.getElementById('alipaysubmit').submit();
-							});
-						}else if(data.type == "weixin") {
-							this.$wechat.pay(data.data).then(res => {
-								this.$util.Tips({
+						uni.hideLoading();
+						let data = res.data.data;
+						// #ifdef MP
+						uni.openEmbeddedMiniProgram({
+							appId: 'wx33dc829ad98f7c64',
+							path: `pages/index/index?token=${res.data.pre_order_id}`,
+							envVersion: 'release',
+							// release: 正式版  trial: 体验版
+							success(res) {
+								return that.$util.Tips({
 									title: '支付成功',
 									icon: 'success'
 								}, {
 									tab: 5,
 									url: '/pages/users/user_money/index'
 								});
-							}).catch(err => {
-								if (err.errMsg == 'chooseWXPay:cancel') {
-									uni.showToast({
-										title: '取消支付',
-										icon: 'none'
-									});
-								}
-							});
-						}
-					}).catch(err=>{
+							},
+							complete(err) {
+								console.log(err,'errrs')
+								uni.hideLoading();
+							}
+						})
+						// #endif
+
+
+					}).catch(err => {
 						uni.hideLoading();
 						return that.$util.Tips({
 							title: err
 						})
+					});
+
+				}
+
+				// #endif
+				// #ifdef H5
+				let that = this
+				this.pay_close = true;
+				this.totalPrice = this.rechar_id == 0 ? this.money : this.numberPic;
+				if (!this.payType) {
+					this.changePayType(type);
+				}
+				rechargeWechat({
+					price: parseFloat(this.totalPrice),
+					// from: this.payType == '' ? this.$wechat.isWeixin() ? 'weixin' :'weixinh5' : this.payType,
+					from: this.payType,
+					rechar_id: that.rechar_id
+				}).then(res => {
+					let data = res.data;
+					if (data.type == "weixinh5") {
+						uni.showToast({
+							title: data.msg,
+							success() {
+								location.href = data.data.mweb_url;
+							}
+						});
+					} else if (data.type == "alipay") {
+						uni.hideLoading();
+						uni.hideLoading();
+						this.formContent = data.data;
+						this.$nextTick(() => {
+							document.getElementById('alipaysubmit').submit();
+						});
+					} else if (data.type == "weixin") {
+						this.$wechat.pay(data.data).then(res => {
+							this.$util.Tips({
+								title: '支付成功',
+								icon: 'success'
+							}, {
+								tab: 5,
+								url: '/pages/users/user_money/index'
+							});
+						}).catch(err => {
+							if (err.errMsg == 'chooseWXPay:cancel') {
+								uni.showToast({
+									title: '取消支付',
+									icon: 'none'
+								});
+							}
+						});
+					} else if (data.type == "huifu") {
+						this.$wechat.pay(data.data).then(res => {
+							this.$util.Tips({
+								title: '支付成功',
+								icon: 'success'
+							}, {
+								tab: 5,
+								url: '/pages/users/user_money/index'
+							});
+						}).catch(err => {
+							if (err.errMsg == 'chooseWXPay:cancel') {
+								uni.showToast({
+									title: '取消支付',
+									icon: 'none'
+								});
+							}
+						});
+					}
+				}).catch(err => {
+					uni.hideLoading();
+					return that.$util.Tips({
+						title: err
 					})
+				})
 				// #endif
 			},
 			/*
@@ -460,7 +563,7 @@
 					this.pay_close = true;
 					// #endif
 					// #ifndef MP
-						this.pay_close = true;
+					this.pay_close = true;
 					// #endif
 					this.totalPrice = this.rechar_id == 0 ? parseFloat(this.money) : parseFloat(this.numberPic);
 				}
@@ -475,9 +578,11 @@
 		height: 100%;
 		background-color: #fff;
 	}
-	.bgcolor{
+
+	.bgcolor {
 		background-color: var(--view-theme)
 	}
+
 	.payment {
 		position: relative;
 		width: 100%;
@@ -514,7 +619,7 @@
 		font-size: 56rpx;
 		color: #333333;
 		flex-wrap: nowrap;
-		
+
 	}
 
 	.payment .input text {
@@ -613,26 +718,30 @@
 			color: #fff !important;
 		}
 	}
-	.tips-box{
+
+	.tips-box {
 		.tips {
-		  font-size: 28rpx;
-		  color: #333333;
-		  font-weight: 800;
-		  margin-bottom: 14rpx;
+			font-size: 28rpx;
+			color: #333333;
+			font-weight: 800;
+			margin-bottom: 14rpx;
 			margin-top: 20rpx;
 		}
+
 		.tips-samll {
-		  font-size: 24rpx;
-		  color: #333333;
-		  margin-bottom: 14rpx;
+			font-size: 24rpx;
+			color: #333333;
+			margin-bottom: 14rpx;
 		}
+
 		.tip-box {
-		  margin-top: 30rpx;
+			margin-top: 30rpx;
 		}
 	}
-	.tips-title{
+
+	.tips-title {
 		margin-top: 20rpx;
 		font-size: 24rpx;
 		color: #333;
 	}
-</style>
+</style>

static/html/pc.html

@@ -4,7 +4,7 @@
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
 		<meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
-		<title>crmeb-PC端</title>
+		<title>易趣C水果园</title>
 		<meta name="Copyright" content="helang">
 		<link rel="shortcut icon" type="image/png" href="">
 		<meta name="keywords" content="">

utils/upApp.js

@@ -2,7 +2,7 @@ import confige from '@/config/app.js'
 import {getAppVersion} from '@/api/api.js'
 const getIosUpAppUrl = 'https://itunes.apple.com/cn/lookup?id=6476127203'
 const iosAppStroeUrl =
-	'https://apps.apple.com/cn/app/%E7%A5%9E%E8%8B%B1%E4%BC%98%E9%80%89/id6476127203';
+	'https://apps.apple.com/cn/app/%E6%98%93%E8%B6%A3c%E6%9E%9C%E5%9B%AD/id6695741460';
 
 // 获取app是否需要升级
 export function getUpApp () {