From 5117b4f2574f9f4af0784023967b1709c8effeeb Mon Sep 17 00:00:00 2001
From: lin <1005713861@163.com>
Date: Sat, 09 May 2026 14:58:15 +0800
Subject: [PATCH] feat：星享购 细节调整
---
pages/pays/pays.vue | 8 ++--
pages/quanyi/add.vue | 5 +-
util.js | 68 +++++++++++++++++-----------------
pages/quanshou/index.vue | 2
pages/quanyi/index.vue | 2
manifest.json | 5 +-
App.vue | 22 +++++-----
7 files changed, 57 insertions(+), 55 deletions(-)
diff --git a/App.vue b/App.vue
index 09f34d6..4328f68 100644
--- a/App.vue
+++ b/App.vue
@@ -59,17 +59,17 @@
updesc = res.data.android.desc
}
if (downUrl && updateFlag) {
- uni.showModal({
- showCancel: false,
- confirmText: '立即更新',
- title: '温馨提示！',
- content: updesc || '有最新版本，请更新APP！',
- success: res => {
- if (res.confirm) {
- plus.runtime.openURL(downUrl)
- }
- }
- })
+ // uni.showModal({
+ // showCancel: false,
+ // confirmText: '立即更新',
+ // title: '温馨提示！',
+ // content: updesc || '有最新版本，请更新APP！',
+ // success: res => {
+ // if (res.confirm) {
+ // plus.runtime.openURL(downUrl)
+ // }
+ // }
+ // })
}
})
// #endif
diff --git a/manifest.json b/manifest.json
index c48ceb6..ec26999 100644
--- a/manifest.json
+++ b/manifest.json
@@ -67,7 +67,7 @@
"minSdkVersion" : 29,
"schemes" : "xxg-app",
"targetSdkVersion" : 30,
- "abiFilters" : [ "arm64-v8a" ]
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
},
/* ios打包配置 */
"ios" : {
@@ -82,7 +82,8 @@
"com.apple.developer.associated-domains" : [ "applinks:www.ncmiruo.com" ]
}
},
- "urltypes" : "xxg-app"
+ "urltypes" : "xxg-app",
+ "idfa" : true
},
/* SDK配置 */
"sdkConfigs" : {
diff --git a/pages/pays/pays.vue b/pages/pays/pays.vue
index 657f393..85c1869 100644
--- a/pages/pays/pays.vue
+++ b/pages/pays/pays.vue
@@ -68,12 +68,12 @@
<text v-if="userInfo">余额支付(可用余额：{{userInfo.const}})</text>
<image class="rgt" :src="payment == 1 ? '/static/imgs/checked.png' : '/static/imgs/check.png'" mode=""></image>
</view> -->
- <!-- <view class="pay-item" @tap="choosePayment(2)">
+ <view class="pay-item" @tap="choosePayment(2)">
<image class="pay-icon" src="/static/imgs/wxpay.png" mode=""></image>
<text>微信支付</text>
<image class="rgt" :src="payment == 2 ? '/static/imgs/checked.png' : '/static/imgs/check.png'" mode=""></image>
- </view> -->
- <view class="pay-item">
+ </view>
+ <!-- <view class="pay-item">
<image class="pay-icon" src="/static/imgs/bankpay.png" mode=""></image>
<view @tap="chooseBank">
<text>银行卡支付</text>
@@ -81,7 +81,7 @@
<text v-else>(请选择银行卡 》》)</text>
</view>
<image class="rgt" :src="payment == 3 ? '/static/imgs/checked.png' : '/static/imgs/check.png'" mode="" @tap="choosePayment(3)"></image>
- </view>
+ </view> -->
</view>
</view>
<view class="authBtn-desc" v-if="userInfo && payment == 1 && userInfo.edu_auth == 1">
diff --git a/pages/quanshou/index.vue b/pages/quanshou/index.vue
index f54a8c2..a595e44 100644
--- a/pages/quanshou/index.vue
+++ b/pages/quanshou/index.vue
@@ -56,7 +56,7 @@
const _this = this;
this.isAgree = uni.getStorageSync('boughtEquity')
uni.request({
- url: _this.$webHost+'/api/v2/customer/getRyxBenefitsRecordList?phone='+uni.getStorageSync('phone')+'&appId='+'47be9559-6b1b-42dd-84ed-25d028065013',
+ url: _this.$webHost+'/api/v2/customer/getRyxBenefitsRecordList?phone='+uni.getStorageSync('phone')+'&appId='+uni.getStorageSync('ygxLogin').appId,
success: function (res) {
if(res.data.code==200){
_this.lst = res.data.data;
diff --git a/pages/quanyi/add.vue b/pages/quanyi/add.vue
index 9fe0cb6..ce66b23 100644
--- a/pages/quanyi/add.vue
+++ b/pages/quanyi/add.vue
@@ -386,6 +386,7 @@
title: e.data.data,
icon: 'none'
});
+ return;
}
uni.request({
url:_this.$webHost+`/api/v2/pay/getPayBindCardInfo/${uni.getStorageSync('ygxLogin').customerId}`,
@@ -448,7 +449,7 @@
});
- that.isCounting = true;
+ // that.isCounting = true;
@@ -506,7 +507,7 @@
})
return;
}
-
+ that.isCounting = true;
if(res.data.code === 200){
that.bindCardId = res.data.data;
} else {
diff --git a/pages/quanyi/index.vue b/pages/quanyi/index.vue
index 009a426..4ba6006 100644
--- a/pages/quanyi/index.vue
+++ b/pages/quanyi/index.vue
@@ -225,7 +225,7 @@
<text style="color: #20110E;">我已阅读并同意</text>
<!-- <text style="display: inline;font-size: 24rpx;color: #4766FE" @click="link('/pages/protocol/protocol?code=shop_ai_service&title=会员服务协议-YXKJ')">《会员服务协议-YXKJ》</text>
<text style="display: inline;font-size: 24rpx;color: #4766FE" @click="link('/pages/protocol/protocol?code=shop_auto_service&title=委托扣款确认书-YXKJ')">《委托扣款确认书-YXKJ》</text>-->
- <text style="display: inline;font-size: 24rpx;color: #4766FE" @click="link(`/pages/web/xieyi?code=${memberPeriodConfigInfo.protocolCode}&title=${memberPeriodConfigInfo.protocolName}`)">《会员权益服务协议-星享购》</text>
+ <text style="display: inline;font-size: 24rpx;color: #4766FE" @click="link(`/pages/web/xieyi?code=${memberPeriodConfigInfo.protocolCode}&title=${memberPeriodConfigInfo.protocolName}`)">{{memberPeriodConfigInfo.protocolName}}</text>
</view>
<!-- <view class="tips" style="color: #666666;margin-top: 24rpx;margin-bottom: 20rpx;font-size: 26rpx">*会员服务一经开通不支持取消、退款，会员服务到期前，用户可以选择续订或取消续费。</view>-->
diff --git a/util.js b/util.js
index bb536c0..54408ad 100644
--- a/util.js
+++ b/util.js
@@ -261,41 +261,41 @@
})
return false
} else {
- return true
+ // return true
// 隐藏掉实名认证
- // let userInfo = getUserInfo()
- // let goUrl = ''
- // if(userInfo.idcard_auth == 0){
- // goUrl = '/pages/idcard/idcard'
- // } else if(userInfo.face_auth == 0){
- // goUrl = '/pages/face/face'
- // } else if(userInfo.job_auth == 0){
- // goUrl = '/pages/job/job'
- // } else if(userInfo.bank_auth == 0){
- // goUrl = '/pages/addBank/addBank?backUrl=/pages/face/face'
- // }
- // console.log('goUrl', goUrl)
- // if(goUrl != ''){
- // uni.showModal({
- // title: '温馨提示',
- // content: '根据国家法律法规规定，使用本服务需要完成实名认证，是否前往认证？',
- // success: function (res) {
- // if (res.confirm) {
- // uni.navigateTo({
- // url: goUrl
- // })
- // }
- // }
- // })
- // return false
- // }
- // if(url != '' && isgo == 1){
- // uni.navigateTo({
- // url: url
- // })
- // } else {
- // return true
- // }
+ let userInfo = getUserInfo()
+ let goUrl = ''
+ if(userInfo.idcard_auth == 0){
+ goUrl = '/pages/idcard/idcard'
+ } else if(userInfo.face_auth == 0){
+ goUrl = '/pages/face/face'
+ } else if(userInfo.job_auth == 0){
+ goUrl = '/pages/job/job'
+ } else if(userInfo.bank_auth == 0){
+ goUrl = '/pages/addBank/addBank?backUrl=/pages/face/face'
+ }
+ console.log('goUrl', goUrl)
+ if(goUrl != ''){
+ uni.showModal({
+ title: '温馨提示',
+ content: '根据国家法律法规规定，使用本服务需要完成实名认证，是否前往认证？',
+ success: function (res) {
+ if (res.confirm) {
+ uni.navigateTo({
+ url: goUrl
+ })
+ }
+ }
+ })
+ return false
+ }
+ if(url != '' && isgo == 1){
+ uni.navigateTo({
+ url: url
+ })
+ } else {
+ return true
+ }
}
}
--
Gitblit v1.9.3