2024-8-26

components/payment/index.vue

@@ -337,6 +337,54 @@
 							});
 							// #endif
 							break;
+						case "lakala":
+							// #ifdef MP
+							wx.navigateToMiniProgram({
+								appId: 'wx889424d565967811',
+								path: `payment-cashier/pages/checkout/index?source=WECHATMINI&counterUrl=${
+														        encodeURIComponent(res.data.result.counter_url)
+														    }`,
+								envVersion: 'release',
+								// release: 正式版  trial: 体验版
+								success(res) {
+									uni.showToast({
+										title: "支付成功"
+									})
+									setTimeout(res => {
+										that.$emit('onChangeFun', {
+											action: 'pay_complete'
+										});
+									}, 2000)
+								},
+								complete() {
+									uni.hideLoading();
+								}
+							})
+							// #endif
+							// #ifdef H5
+							window.location.href = res.data.result.counter_url;
+							that.$emit('onChangeFun', {
+								action: 'pay_complete'
+							});
+							// #endif
+							// #ifdef APP
+							plus.share.getServices((res) => {
+								console.log(JSON.stringify(res));
+								let sweixin = res.find(i => i.id === 'weixin');
+								if (sweixin) {
+									sweixin.launchMiniProgram({
+										id: res.data.result.id,
+										userName: '',
+										path: res.data.result.counter_url,
+										type: 0, //0正式1测试2体验
+									})
+									that.$emit('onChangeFun', {
+										action: 'pay_complete'
+									});
+								}
+							})
+							// #endif
+							break;
 					}
 				}).catch(err => {
 					uni.hideLoading();

manifest.json

@@ -1,9 +1,9 @@
 {
     "name" : "易趣C果园",
-    "appid" : "__UNI__EF80BD1",
+    "appid" : "__UNI__EFB0F0A",
     "description" : "易趣C果园",
-    "versionName" : "2.6.1",
-    "versionCode" : 268,
+    "versionName" : "2.6.2",
+    "versionCode" : 269,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -62,7 +62,7 @@
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                 "permissionExternalStorage" : {
                     "request" : "none",
                     "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"

pages/annex/vip_paid/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- svip会员模块 -->
+	<!-- svip会员模块 -->
 	<view class="vipPaid">
 		<view class="card-section">
 			<view class="acea-row row-middle">
@@ -9,9 +9,9 @@
 					<view v-if="userInfo.is_ever_level">永久SVIP会员</view>
 					<view v-else-if="userInfo.is_money_level">SVIP会员 {{userInfo.overdue_time | dateFormat}} 到期</view>
 					<view class="acea-row row-middle" v-else>
-					  <span>您与</span>
-					  <span class='shopName line1'>{{userInfo.shop_name || ''}}</span>
-					  <span>商城的第 {{userInfo.register_days || 0}} 天</span>
+						<span>您与</span>
+						<span class='shopName line1'>{{userInfo.shop_name || ''}}</span>
+						<span>商城的第 {{userInfo.register_days || 0}} 天</span>
 					</view>
 				</view>
 			</view>
@@ -70,7 +70,9 @@
 			<scroll-view class="section-bd" scroll-x="true">
 				<view v-for="item in memberCoupons" :key="item.id" class="item acea-row row-center-wrapper"
 					:class="{gray: item.is_fail || item.status === '已使用'}">
-					<view class="money"><text v-if="item.coupon_type==1">￥</text><text class="num">{{item.coupon_type == 1?item.coupon_price:parseFloat(item.coupon_price)/10}}</text><text v-if="item.coupon_type==2">折</text></view>
+					<view class="money"><text v-if="item.coupon_type==1">￥</text><text
+							class="num">{{item.coupon_type == 1?item.coupon_price:parseFloat(item.coupon_price)/10}}</text><text
+							v-if="item.coupon_type==2">折</text></view>
 					<view class="text">
 						<view class="name">{{item.coupon_title}}</view>
 						<view v-if="item.use_min_price === '0.00'" class="mark">无门槛券</view>
@@ -151,7 +153,7 @@
 			home,
 			payment
 		},
-		mixins:[colors],
+		mixins: [colors],
 		filters: {
 			dateFormat: function(value) {
 				return dayjs(value * 1000).format('YYYY-MM-DD');
@@ -203,8 +205,14 @@
 				// #endif
 				type: '',
 				svip: null,
-				isShowAuth:false,
-				vipId: 0
+				isShowAuth: false,
+				vipId: 0,
+				// #ifdef APP
+				showAppHistary: false,
+				// #endif
+				// #ifndef APP
+				showAppHistary: true,
+				// #endif
 			}
 		},
 		watch: {
@@ -222,16 +230,20 @@
 				this.onLunch();
 			}
 		},
-		onShow(){
+		onShow() {
 			uni.removeStorageSync('form_type_cart');
-			if(!this.isLogin){
+			if (!this.isLogin) {
 				toLogin()
 			}
 		},
 		onReachBottom() {
 			this.groomList();
 		},
-
+		// #ifdef APP
+		onReady() {
+			this.showAppHistary = uni.getStorageSync('showAppHistary') || false
+		},
+		// #endif
 		methods: {
 			/**
 			 * 授权回调
@@ -330,7 +342,7 @@
 				});
 			},
 			checkType(svip) {
-				console.log('呼呼',svip);
+				console.log('呼呼', svip);
 				this.type = svip.type;
 				this.svip = svip;
 				this.totalPrice = svip.pre_price;
@@ -529,11 +541,11 @@
 						break;
 					case 'WECHAT_PAY':
 						// #ifdef MP
-						let mp_pay_name=''
-						if(uni.requestOrderPayment){
-							mp_pay_name='requestOrderPayment'
-						}else{
-							mp_pay_name='requestPayment'
+						let mp_pay_name = ''
+						if (uni.requestOrderPayment) {
+							mp_pay_name = 'requestOrderPayment'
+						} else {
+							mp_pay_name = 'requestPayment'
 						}
 						uni[mp_pay_name]({
 							timeStamp: jsConfig.timestamp,
@@ -733,9 +745,10 @@
 </script>
 
 <style lang="scss" scoped>
-	.vipPaid{
+	.vipPaid {
 		padding-bottom: 50rpx;
 	}
+
 	.card-section {
 		height: 328rpx;
 		padding: 88rpx 66rpx 0;
@@ -753,7 +766,8 @@
 			line-height: 30rpx;
 			color: #89735B;
 			width: 400rpx;
-			.shopName{
+
+			.shopName {
 				max-width: 164rpx;
 			}
 		}

pages/goods/order_confirm/index.vue

@@ -574,7 +574,13 @@
 				collage_id: 0,
 				goodsList: [],
 				tableId: 0,
-				codeData: {}
+				codeData: {},
+				// #ifdef APP
+				showAppHistary: false,
+				// #endif
+				// #ifndef APP
+				showAppHistary: true,
+				// #endif
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -670,6 +676,11 @@
 			})
 			this.timeranges = arrayNew;
 		},
+		// #ifdef APP
+		onReady() {
+			this.showAppHistary = uni.getStorageSync('showAppHistary')||false
+		},
+		// #endif
 		methods: {
 			// #ifdef MP
 			// 桌码信息
@@ -1254,11 +1265,15 @@
 						.product_type == 4) ? 0 : 1);
 					//微信支付是否开启
 					that.cartArr[0].payStatus = res.data.pay_weixin_open || 0
+					// #ifdef APP
+					that.cartArr[0].payStatus = this.showAppHistary ? 1 : 0;
+					// #endif
 					//支付宝是否开启
 					that.cartArr[1].payStatus = res.data.ali_pay_status || 0;
 					//#ifdef MP
 					that.cartArr[1].payStatus = 0;
 					//#endif
+
 					//余额支付是否开启
 					// that.cartArr[2].title = '可用余额:' + res.data.userInfo.now_money;
 					that.cartArr[2].number = res.data.userInfo.now_money;
@@ -1411,59 +1426,6 @@
 					switch (status) {
 						case 'ORDER_EXIST':
 						case 'EXTEND_ORDER':
-						case "LAKALA_PAY":
-							// #ifdef MP
-							wx.navigateToMiniProgram({
-								appId: 'wx889424d565967811',
-								path: `payment-cashier/pages/checkout/index?source=WECHATMINI&counterUrl=${
-							        encodeURIComponent(res.data.result.counter_url)
-							    }`,
-								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
-									})
-								},
-								complete() {
-									uni.hideLoading();
-								}
-							})
-							// #endif
-							// #ifdef H5
-							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');
-								if(sweixin){
-									sweixin.launchMiniProgram({
-										id: res.data.result.id,
-										userName:'',
-										path:res.data.result.counter_url,
-										type:0,//0正式1测试2体验
-									})
-								}
-							})
-							
-							
-							
-							// plus.runtime.openURL(
-							// 	res.data.result.counter_url
-							// );
-							// #endif
-							break;
 						case 'PAY_ERROR':
 							uni.hideLoading();
 							return that.$util.Tips({
@@ -1696,6 +1658,59 @@
 							});
 							// #endif
 							break;
+						case "LAKALA_PAY":
+							// #ifdef MP
+							wx.navigateToMiniProgram({
+								appId: 'wx889424d565967811',
+								path: `payment-cashier/pages/checkout/index?source=WECHATMINI&counterUrl=${
+														        encodeURIComponent(res.data.result.counter_url)
+														    }`,
+								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
+									})
+								},
+								complete() {
+									uni.hideLoading();
+								}
+							})
+							// #endif
+							// #ifdef H5
+							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');
+								if (sweixin) {
+									sweixin.launchMiniProgram({
+										id: res.data.result.id,
+										userName: '',
+										path: res.data.result.counter_url,
+										type: 0, //0正式1测试2体验
+									})
+								}
+							})
+
+
+
+							// plus.runtime.openURL(
+							// 	res.data.result.counter_url
+							// );
+							// #endif
+							break;
 					}
 				}).catch(err => {
 					uni.hideLoading();

pages/users/user_money/index.vue

@@ -11,7 +11,7 @@
 								<view class='money'>{{userInfo.now_money || 0}}</view>
 							</view>
 							<!-- #ifdef APP-PLUS || H5 -->
-							<navigator url="/pages/users/user_payment/index" hover-class="none"
+							<navigator v-if="showAppHistary" url="/pages/users/user_payment/index" hover-class="none"
 								class='recharge'>充值</navigator>
 							<!-- #endif -->
 							<!-- #ifdef MP -->
@@ -164,7 +164,13 @@
 				isShowAuth: false, //是否隐藏授权
 				hotScroll: false,
 				hotPage: 1,
-				hotLimit: 10
+				hotLimit: 10,
+				// #ifdef APP
+				showAppHistary: false,
+				// #endif
+				// #ifndef APP
+				showAppHistary: true,
+				// #endif
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -191,6 +197,11 @@
 		onShow() {
 			uni.removeStorageSync('form_type_cart');
 		},
+		// #ifdef APP
+		onReady() {
+			this.showAppHistary = uni.getStorageSync('showAppHistary')||false
+		},
+		// #endif
 		methods: {
 			onLoadFun: function() {
 				this.getUserInfo();

utils/util.js

@@ -739,7 +739,7 @@ export default {
 			upimg()
 		} else {
 			let title = '申请相册权限';
-			let content = "是否允许访问相册用于上传图片？"
+			let content = "是否允许访问相册/相机用于上传图片？"
 			uni.showModal({
 				title,
 				content,