Commit e876d89a by yuzhenWang

Merge branch 'test' into 'dev'

Test

See merge request !133
parents 92378981 27213859
......@@ -11,10 +11,14 @@
return {
invitationHandled: false ,// 在data中明确定义,
dataToken:'',
loginType:''
}
},
onLaunch: function() {
console.log('App Launch');
if(uni.getStorageSync('loginType')){
this.loginType = uni.getStorageSync('loginType')
}
if(uni.getStorageSync('dataToken')){
uni.removeStorageSync('dataToken')
}
......@@ -249,11 +253,12 @@
uni.setStorageSync('dataToken',decodeURIComponent(params.dataToken));
}
//家办商城跳转未登录状态下
if(params.noLogin){
if(params.mpCffp&&(params.noLogin ||!params.dataToken)){
uni.removeStorageSync('userIsActive')
uni.removeStorageSync('dataToken')
uni.setStorageSync('loginType','visitor');
}
if(params.addSystemType){
uni.setStorageSync('addSystemType', params.addSystemType);
}
......
......@@ -199,16 +199,28 @@ export default {
* 检测设备信息
* deviceType:PC为1,移动端为2,微信为3
*/
// checkDeviceType() {
// let deviceType = null;
// if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {
// if (navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1) {
// deviceType = '3';
// } else {
// deviceType = '2';
// }
// } else {
// deviceType = '1';
// }
// return deviceType;
// },
checkDeviceType() {
let deviceType = null;
if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {
if (navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1) {
// 优先判断是否在微信环境(包含手机微信、电脑微信的 WebView)
if (navigator.userAgent.toLowerCase().indexOf('micromessenger') !== -1) {
deviceType = '3';
} else {
} else if (/Android|webOS|iPhone|iPod|iPad|BlackBerry/i.test(navigator.userAgent)) {
deviceType = '2';
}
} else {
deviceType = '1';
deviceType = '1';
}
return deviceType;
},
......
......@@ -122,7 +122,9 @@ import { ref, computed, onMounted, onUnmounted } from 'vue';
// import pdfjsWorker from 'pdfjs-dist/build/pdf.worker?url';
import * as pdfjsLib from 'pdfjs-dist/es5/build/pdf';
import pdfjsWorker from 'pdfjs-dist/es5/build/pdf.worker.js?url';
import pdfjsWorker from 'pdfjs-dist/build/pdf.worker.min.js?url';
// ================== PROPS ==================
interface PdfInfo {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
{
"id": "vcode-input",
"name": "验证码输入框",
"version": "2.0",
"description": "验证码输入框,密码输入框",
"keywords": [
"验证码输入框",
"支付密码输入框"
],
"displayName": "验证码输入框",
"dcloudext": {
"category": [
"前端组件",
"通用组件"
]
},
"dependencies": {
"@dcloudio/uni-ui": "^1.5.11",
"@uqrcode/js": "^4.0.7",
......@@ -29,7 +14,6 @@
"qrcode": "^1.5.4",
"qrcodejs2": "^0.0.2",
"uqrcodejs": "^4.0.7",
"vite-plugin-top-level-await": "^1.6.0",
"weixin-js-sdk": "^1.6.5"
},
"devDependencies": {
......
{
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
"pages": [
{
"path": "pages/index/index",
"style": {
"topWindow": false,
"navigationBarTitleText": "银盾家办"
}
}, {
},
"lazyLoad": true
},
{
"path": "components/login/login",
"style": {
"topWindow": false,
"navigationBarTitleText": "银盾家办"
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/courselist/courselist",
"style": {
"topWindow": false,
"navigationBarTitleText": "银盾家办"
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/courseDetail/courseDetail",
"style": {
"navigationBarTitleText": "产品详情",
......@@ -27,51 +32,66 @@
"app-plus": {
"softinputMode": "adjustResize"
}
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/product/product",
"style": {
"navigationBarTitleText": "SFP",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/shareFriend/shareFriend",
"style": {
"navigationBarTitleText": "分享好友",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/personalCenter",
"style": {
"navigationBarTitleText": "我的",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/announcement/announcement",
"style": {
"navigationBarTitleText": "公告列表",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/announcement/announcement_detail",
"style": {
"navigationBarTitleText": "公告详情",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/systemMsg/system_msg",
"style": {
"navigationBarTitleText": "消息列表",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/systemMsg/system_msg_detail",
"style": {
"navigationBarTitleText": "消息详情",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/application-process/basic-info",
"style": {
"navigationBarTitleText": "申请加盟-基本资料",
......@@ -79,213 +99,265 @@
"app-plus": {
"softinputMode": "adjustPan"
}
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/application-process/work-experience",
"style": {
"navigationBarTitleText": "从业经历",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/myCertify/myCertify",
"style": {
"navigationBarTitleText": "我的认证",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/inviteJoin/inviteJoin",
"style": {
"navigationBarTitleText": "邀请加盟",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/orderConfirm/orderConfirm",
"style": {
"navigationBarTitleText": "订单确认",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/learnCertify/learnCertify",
"style": {
"navigationBarTitleText": "学习认证",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/authentication-query/authentication-query",
"style": {
"navigationBarTitleText": "认证查询",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/authentication-query/authentication-result",
"style": {
"navigationBarTitleText": "查询结果",
"enablePullDownRefresh": false
}
}, {
"path": "pages/certifyDetail/certifyDetail",
"style": {
"navigationBarTitleText": "认证详情",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "pages/myLearning/myLearning",
"path": "pages/certifyDetail/certifyDetail",
"style": {
"navigationBarTitleText": "我的学习",
"navigationBarTitleText": "认证详情",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
// {
// "path": "pages/myLearning/myLearning",
// "style": {
// "navigationBarTitleText": "我的学习",
// "enablePullDownRefresh": false
// }
// },
{
"path": "pages/personalCenter/myTeam",
"style": {
"navigationBarTitleText": "我的团队",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/myTeamIncubate",
"style": {
"navigationBarTitleText": "育成团队",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/helpCenter",
"style": {
"navigationBarTitleText": "帮助中心",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "pages/myShare/myShare",
"style": {
"navigationBarTitleText": "分享数据",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "pages/myPoints/myPoints",
"style": {
"navigationBarTitleText": "我的积分",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/commonDetail/commonDetail",
"style": {
"navigationBarTitleText": "明细",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/orderDetail/orderDetail",
"style": {
"navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/afterSales/afterSales",
"style": {
"navigationBarTitleText": "我的售后",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/afterSaleDetail/afterSaleDetail",
"style": {
"navigationBarTitleText": "我的售后",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/saleCourseLists/saleCourseLists",
"style": {
"navigationBarTitleText": "成交订单",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/myPoints/pointsDetail",
"style": {
"navigationBarTitleText": "积分明细",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/pointsExchange/pointsStatus",
"style": {
"navigationBarTitleText": "佣金",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/pointsExchange/pointsExchange",
"style": {
"navigationBarTitleText": "佣金",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/withdrawal/withdrawal",
"style": {
"navigationBarTitleText": "兑换提现",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/exchangeRecord/exchangeRecord",
"style": {
"navigationBarTitleText": "兑换记录",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/withdrawal/withdrawalDetail",
"style": {
"navigationBarTitleText": "提现详情",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/taxRules/taxRules",
"style": {
"navigationBarTitleText": "纳税规则",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/applyDropClass/applyDropClass",
"style": {
"navigationBarTitleText": "申请退款",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/application-process/id-card",
"style": {
"navigationBarTitleText": "申请加盟-个人证件",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/application-process/education",
"style": {
"navigationBarTitleText": "申请加盟-学历信息",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/application-process/bank-card",
"style": {
"navigationBarTitleText": "申请加盟-银行卡号",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/application-process/personal-statement",
"style": {
"navigationBarTitleText": "申请加盟-个人声明",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/application-process/contract",
"style": {
"navigationBarTitleText": "申请加盟-合同文档",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/application-process/signature",
"style": {
"navigationBarTitleText": "申请加盟-电子签名",
......@@ -293,396 +365,452 @@
"app-plus": {
"bounce": "none"
}
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/teamMembers/teamMembers",
"style": {
"navigationBarTitleText": "团队成员",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/teamPerformance/teamPerformance",
"style": {
"navigationBarTitleText": "团队业绩",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/user-information",
"style": {
"navigationBarTitleText": "个人资料",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/system/settings",
"style": {
"navigationBarTitleText": "设置",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/orderStatus/orderStatus",
"style": {
"navigationBarTitleText": "订单支付",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/dropLists/dropLists",
"style": {
"navigationBarTitleText": "已退课",
"enablePullDownRefresh": false
}
}, {
"path": "pages/learningStatistics/learningStatistics",
"style": {
"navigationBarTitleText": "学习统计",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
// {
// "path": "pages/learningStatistics/learningStatistics",
// "style": {
// "navigationBarTitleText": "学习统计",
// "enablePullDownRefresh": false
// }
// },
{
"path": "pages/personalCenter/system/accontsetting",
"style": {
"navigationBarTitleText": "账号绑定设置",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/accountoperation/phonebinding",
"style": {
"navigationBarTitleText": "手机号绑定",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/accountoperation/resetpassword",
"style": {
"navigationBarTitleText": "重置密码",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/accountoperation/confirmResetpassword",
"style": {
"navigationBarTitleText": "重置密码",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "pages/personalCenter/accountoperation/aboutcffp",
"style": {
"navigationBarTitleText": "关于我",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "pages/certifyDetail/uploadinformation",
"style": {
"navigationBarTitleText": "上传信息",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/receiptCycleDesc/receiptCycleDesc",
"style": {
"navigationBarTitleText": "到账周期说明",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/invitationRegister/invitationRegister",
"style": {
"navigationBarTitleText": "邀请注册",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/invitationRegister/invitationlogin",
"style": {
"navigationBarTitleText": "邀请登录",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/application-process/application-result",
"style": {
"navigationBarTitleText": "申请加盟-结果",
"enablePullDownRefresh": false
}
}, {
},
"lazyLoad": true
},
{
"path": "pages/downloadApp/index",
"style": {
"navigationBarTitleText": "下载",
"enablePullDownRefresh": false
}
}
, {
},
"lazyLoad": true
},
{
"path": "pages/product/finance-calculator",
"style": {
"navigationBarTitleText": "pages/product/finance-calculator",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "components/webview"
"path": "components/webview",
"style": {},
"lazyLoad": true
},
{
"path": "pages/personalCenter/system/cancellation",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "components/clause/clauseIOS",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
"style": {},
"lazyLoad": true
},
{
"path": "sfp/index/index",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "sfp/housePurchase/housePurchase",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "sfp/childEdu/childEdu",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
"lazyLoad": true
},
{
"path": "sfp/dataImport/data-import",
"style": {
"topWindow": false,
"navigationBarTitleText": "批量数据计算"
}
},
"lazyLoad": true
},
{
"path" : "pages/personalCenter/detail",
"style" :
{
"navigationBarTitleText" : "",
"path": "pages/personalCenter/detail",
"style": {
"navigationBarTitleText": "",
"disableScroll": false,
"webview": {
// 1. 允许加载本地静态资源(viewer.html /static 目录)
"allowAccessFromFileURLs": true,
// 2. 允许加载外部资源(OSS的PDF)
"allowUniversalAccessFromFileURLs": true,
// 3. 启用JavaScript(PDF.js依赖)
"enableJavaScript": true,
// 4. 关闭安全校验(开发环境测试用,线上可关闭)
"disableWebSecurity": true,
// 5. 允许跳转外部链接
"allowNavigateToExternalPages": true,
// 6. 启用调试(关键:便于查看WebView内部错误)
"webviewDebug": true
}
}
"allowAccessFromFileURLs": true,
"allowUniversalAccessFromFileURLs": true,
"enableJavaScript": true,
"disableWebSecurity": true,
"allowNavigateToExternalPages": true,
"webviewDebug": true
}
},
"lazyLoad": true
},
{
"path": "pages/lanch/index",
"style": {
"topWindow": false,
"navigationBarTitleText": "启动页"
}
},
"lazyLoad": true
}
],
"subPackages": [{
"root": "myPackageA",
"pages": [{
"path": "lawManual/lawManual",
"style": {
"navigationBarTitleText": "CFFP法条摘要"
}
}, {
"path": "videoProject/login",
"style": {
"navigationBarTitleText": "登录"
}
}, {
"path": "videoProject/videoDetail",
"style": {
"navigationBarTitleText": "视频播放"
}
}, {
"path": "videoProject/wxLogin",
"style": {
"navigationBarTitleText": "微信登录"
}
},{
"path": "applyFranchise/applyFranchise",
"style": {
"navigationBarTitleText": "申请加盟"
}
},{
"path": "integralExchange/exchange",
"style": {
"navigationBarTitleText": "积分提现"
}
},{
"path": "ruleAndContract/taxRules",
"style": {
"navigationBarTitleText": "纳税规则"
}
},{
"path": "integralExchange/authenticaInfo",
"style": {
"navigationBarTitleText": "实名认证"
}
},{
"path": "setting/logOff",
"style": {
"navigationBarTitleText": "合伙人解约"
}
},{
"path": "ruleAndContract/cancelProtocol",
"style": {
"navigationBarTitleText": "合伙人解约协议"
}
}, {
"path": "login/login",
"style": {
"navigationBarTitleText": "银盾家办"
}
},{
"path": "ruleAndContract/clause",
"style": {
"navigationBarTitleText": "协议"
}
},{
"path": "poster/poster",
"style": {
"navigationBarTitleText": "分销海报"
}
},{
"path": "myTeam/myTeam",
"style": {
"navigationBarTitleText": "我的团队"
}
},{
"path": "commission/withdrawalRecord",
"style": {
"navigationBarTitleText": "提现记录"
}
},{
"path": "compare-result/compare-result",
"style": {
"navigationBarTitleText": "对比结果"
}
},{
"path": "product-list/product-list",
"style": {
"navigationBarTitleText": "产品对比"
}
},{
"path": "product-list/product-commission",
"style": {
"navigationBarTitleText": "产品佣率查询"
}
},
{
"path": "product-list/commission-detail",
"style": {
"navigationBarTitleText": "佣金详情"
}
},
"subPackages": [
{
"path" : "businessCard/businessCard",
"style" :
{
"navigationBarTitleText" : "我的名片"
}
},
{
"path" : "noBusinessCard/noBusinessCard",
"style" :
{
"navigationBarTitleText" : "我的名片"
}
"root": "myPackageA",
"pages": [
{
"path": "lawManual/lawManual",
"style": {
"navigationBarTitleText": "CFFP法条摘要"
},
"lazyLoad": true
},
{
"path": "videoProject/login",
"style": {
"navigationBarTitleText": "登录"
},
"lazyLoad": true
},
{
"path": "videoProject/videoDetail",
"style": {
"navigationBarTitleText": "视频播放"
},
"lazyLoad": true
},
{
"path": "videoProject/wxLogin",
"style": {
"navigationBarTitleText": "微信登录"
},
"lazyLoad": true
},
{
"path": "applyFranchise/applyFranchise",
"style": {
"navigationBarTitleText": "申请加盟"
},
"lazyLoad": true
},
{
"path": "integralExchange/exchange",
"style": {
"navigationBarTitleText": "积分提现"
},
"lazyLoad": true
},
{
"path": "ruleAndContract/taxRules",
"style": {
"navigationBarTitleText": "纳税规则"
},
"lazyLoad": true
},
{
"path": "integralExchange/authenticaInfo",
"style": {
"navigationBarTitleText": "实名认证"
},
"lazyLoad": true
},
{
"path": "setting/logOff",
"style": {
"navigationBarTitleText": "合伙人解约"
},
"lazyLoad": true
},
{
"path": "ruleAndContract/cancelProtocol",
"style": {
"navigationBarTitleText": "合伙人解约协议"
},
"lazyLoad": true
},
{
"path": "login/login",
"style": {
"navigationBarTitleText": "银盾家办"
},
"lazyLoad": true
},
{
"path": "ruleAndContract/clause",
"style": {
"navigationBarTitleText": "协议"
},
"lazyLoad": true
},
{
"path": "poster/poster",
"style": {
"navigationBarTitleText": "分销海报"
},
"lazyLoad": true
},
{
"path": "myTeam/myTeam",
"style": {
"navigationBarTitleText": "我的团队"
},
"lazyLoad": true
},
{
"path": "commission/withdrawalRecord",
"style": {
"navigationBarTitleText": "提现记录"
},
"lazyLoad": true
},
{
"path": "compare-result/compare-result",
"style": {
"navigationBarTitleText": "对比结果"
},
"lazyLoad": true
},
{
"path": "product-list/product-list",
"style": {
"navigationBarTitleText": "产品对比"
},
"lazyLoad": true
},
{
"path": "product-list/product-commission",
"style": {
"navigationBarTitleText": "产品佣率查询"
},
"lazyLoad": true
},
{
"path": "product-list/commission-detail",
"style": {
"navigationBarTitleText": "佣金详情"
},
"lazyLoad": true
},
{
"path": "businessCard/businessCard",
"style": {
"navigationBarTitleText": "我的名片"
},
"lazyLoad": true
},
{
"path": "noBusinessCard/noBusinessCard",
"style": {
"navigationBarTitleText": "我的名片"
},
"lazyLoad": true
},
{
"path": "salary/salaryList",
"style": {
"navigationBarTitleText": "积分明细"
},
"lazyLoad": true
}
// {
// "path" : "ticket/unUsed",
// "style" : {
// "navigationBarTitleText" : "我的卡券"
// }
// },
// {
// "path" : "ticket/alreadyUsed",
// "style" : {
// "navigationBarTitleText" : "使用记录"
// }
// }
]
},
{
"path" : "salary/salaryList",
"style" :
{
"navigationBarTitleText" : "积分明细"
}
"root": "officialWebsite",
"pages": [
{
"path": "memberQuery",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
},
"lazyLoad": true
}
]
}
// {
// "path" : "ticket/unUsed",
// "style" :
// {
// "navigationBarTitleText" : "我的卡券"
// }
// },
// {
// "path" : "ticket/alreadyUsed",
// "style" :
// {
// "navigationBarTitleText" : "使用记录"
// }
// }
]
},{
"root": "officialWebsite",
"pages": [{
"path": "memberQuery",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}]
}],
],
"tabBar": {
"color": "#7A7E83", // tab 上的文字默认颜色
"selectedColor": "#20279b", // tab 上的文字选中时的颜色
"borderStyle": "black", // tabbar 上边框的颜色,可选值 black/white
"backgroundColor": "#ffffff", // tab 的背景色
"color": "#7A7E83",
"selectedColor": "#20279b",
"borderStyle": "black",
"backgroundColor": "#ffffff",
"fontSize": "24rpx",
"iconWidth": "30rpx",
"height": "100rpx",
"list": [{ // 最少2个、最多5 tab
"pagePath": "pages/index/index", // 页面路径,必须在 pages 中先定义
"iconPath": "static/images/home.png",// 图片路径,icon 大小限制为40kb,建议尺寸为 81px * 81px
"list": [
{
"pagePath": "pages/index/index",
"iconPath": "static/images/home.png",
"selectedIconPath": "static/images/selectHome.png",
"text": "首页" // tab 上按钮文字
"text": "首页"
},
{ // 最少2个、最多5 tab
"pagePath": "pages/product/product", // 页面路径,必须在 pages 中先定义
"iconPath": "static/images/tools.png",// 图片路径,icon 大小限制为40kb,建议尺寸为 81px * 81px
{
"pagePath": "pages/product/product",
"iconPath": "static/images/tools.png",
"selectedIconPath": "static/images/selectTools.png",
"text": "金融工具" // tab 上按钮文字
"text": "金融工具"
},
{ // 最少2个、最多5 tab
"pagePath": "pages/courselist/courselist", // 页面路径,必须在 pages 中先定义
"text": "产品中心" ,// tab 上按钮文字
"iconPath": "static/images/product.png",// 图片路径,icon 大小限制为40kb,建议尺寸为 81px * 81px
{
"pagePath": "pages/courselist/courselist",
"text": "产品中心",
"iconPath": "static/images/product.png",
"selectedIconPath": "static/images/selectProduct.png"
}, {
},
{
"pagePath": "pages/personalCenter/personalCenter",
"text": "我的",
"iconPath": "static/images/personal.png",// 图片路径,icon 大小限制为40kb,建议尺寸为 81px * 81px
"iconPath": "static/images/personal.png",
"selectedIconPath": "static/images/selectPersonal.png"
}
]
......@@ -695,18 +823,20 @@
"navigationStyle": "custom"
},
"uniIdRouter": {},
"easycom": {
"autoscan": true,
"custom": {
"^my-list-item": "@/components/my-list-item/my-list-item.vue"
}
},
"condition": { //模式配置,仅开发期间生效
"current": 0, //当前激活的模式(list 的索引项)
"list": [{
"name": "", //模式名称
"path": "", //启动页面,必选
"query": "" //启动参数,在页面的onLoad函数里面得到
}]
"easycom": {
"autoscan": true,
"custom": {
"^my-list-item": "@/components/my-list-item/my-list-item.vue"
}
},
"condition": {
"current": 0,
"list": [
{
"name": "",
"path": "",
"query": ""
}
]
}
}
\ No newline at end of file
......@@ -150,6 +150,7 @@
<text>{{showName}}</text>
</view>
</view>
<!-- 小程序的购买 -->
<view v-if="mpCffp" class="shareBuyBox">
<view class="rightShare" @click="reinvite">
<loadingIcon :loading="isLoading" v-if="isLoading" loadColor="#20269B" />
......@@ -394,7 +395,7 @@
// 打开微信分享啊
reinvite() {
//小程序没登录进入到系统,要回到小程序去登录
if (uni.getStorageSync('mpCffp') && !uni.getStorageSync('dataToken')) {
if (uni.getStorageSync('mpCffp') && !uni.getStorageSync('dataToken')&&this.loginType === 'visitor') {
this.jumpMplogin()
return
}
......@@ -481,7 +482,8 @@
// desc: '加入我们开启学习之旅',
desc: this.courseInfo.fileSynopsis,
link: `${shareURL}/pages/lanch/index?fileId=${this.fileId}&coursesharing=1&serialsNo=${nanoid()}&shareCode=${shareCode}&shareUserId=${this.userId}&jumpUrl=${jumptime}&landingPage=courseDetail&miniShare=1`,
imgUrl: this.courseInfo.displayImage, //图片
// imgUrl: this.courseInfo.displayImage, //图片
imgUrl: this.courseInfo.shareImg, //图片
sharePage: 'courseDetail', //分享的哪个页面
commonId: shareCode,
userId: this.userId,
......@@ -492,7 +494,8 @@
wx.miniProgram.postMessage({
data: {
type: 'share',
shareData: JSON.stringify(shareInfo)
shareData: JSON.stringify(shareInfo),
messageId: nanoid() // 唯一消息ID
}
})
......@@ -636,12 +639,14 @@
},
// 订单保存
saveOrder() {
//小程序没登录进入到系统,要回到小程序去登录
if (uni.getStorageSync('mpCffp') && !uni.getStorageSync('dataToken')) {
this.loginType = uni.getStorageSync('loginType');
//小程序没登录进入到分销系统,并且分销系统也没登录要回到小程序去登录 (比如在申请加盟那登录了,可以直接在分销系统中购买)
if (uni.getStorageSync('mpCffp') && !uni.getStorageSync('dataToken')&&this.loginType === 'visitor') {
this.jumpMplogin()
return
}
this.loginType = uni.getStorageSync('loginType');
if (this.loginType === 'visitor') {
this.wayType = '1'
if (this.systemType == 'IOS') {
......@@ -1088,7 +1093,8 @@
// desc: '加入我们开启学习之旅',
desc: this.courseInfo.fileSynopsis,
link: newLink, //分享链接
imgUrl: this.courseInfo.displayImage, //图片
// imgUrl: this.courseInfo.displayImage, //图片
imgUrl: this.courseInfo.shareImg, //图片
}
console.log('data', data);
//安卓机型获取当前页面路径
......
......@@ -302,6 +302,7 @@
if (uni.getStorageSync('cffp_userInfo')) {
this.userInfo = JSON.parse(uni.getStorageSync('cffp_userInfo'))
}
this.shareItem = JSON.parse(JSON.stringify(item))
// return
// 未登录去登录
if (uni.getStorageSync('loginType') !== 'codelogin') {
......@@ -320,7 +321,7 @@
this.sharelogin = true
return
}
this.shareItem = JSON.parse(JSON.stringify(item))
// this.shareItem = JSON.parse(JSON.stringify(item))
// 已登录,未成为合伙人
if (this.userInfo && !this.userInfo['partnerType']) {
dataHandling.pocessTracking(
......@@ -395,7 +396,8 @@
title: this.shareItem.fileTitle,
desc: this.shareItem.fileSynopsis,
link: `${shareURL}/pages/lanch/index?fileId=${this.shareItem.fileId}&coursesharing=1&serialsNo=${nanoid()}&shareCode=${shareCode}&shareUserId=${this.userId}&jumpUrl=${jumptime}&landingPage=courseDetail&miniShare=1`,
imgUrl: this.shareItem.displayImage, //图片
// imgUrl: this.shareItem.displayImage, //图片
imgUrl: this.shareItem.shareImg, //图片
commonId: this.shareItem.fileId,
sharePage: 'courseDetail', //分享出去得页面
userId:this.userId,
......@@ -427,7 +429,8 @@
link: shareURL + "/pages/courseDetail/courseDetail?fileId=" + item.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&", //分享链接
imgUrl: item.displayImage, //图片
// imgUrl: item.displayImage, //图片
imgUrl: item.shareImg, //图片
}
//安卓机型获取当前页面路径
let url = window.location.href.split('#')[0];
......
......@@ -38,6 +38,7 @@
</view>
</view>
<!-- 支付方式 -->
<view class="paymentMethodContent">
<h4>选择支付方式</h4>
<view @click="selectPaymentMethod(2)">
......@@ -61,17 +62,7 @@
<i class="iconfont icon-duihao txtFont"></i>
</view>
</view>
<!-- #ifdef APP-PLUS -->
<!-- <view class="paymentItem" @click="selectPaymentMethod(1)">
<view>
<i class="iconfont icon-py_weixinzhifu"></i>
<text>微信支付</text>
</view>
<view class="selectRadio" :class="{'actived':paymentMethod===1}">
<i class="iconfont icon-duihao"></i>
</view>
</view> -->
<!-- #endif -->
</view>
</view>
......
......@@ -109,6 +109,20 @@
<view class="subtit">
晋升下一级目标
</view>
<view class="" >
<view class="">
<text class="iconfont icon-xiaoshoue leftIcon"></text>
<text>购买分销系统内任一产品(含自购)</text>
<!-- <text class="iconfont icon-duihao2 rightIcon" ></text> -->
<text v-if="partnerStatistic.hasCompletedFirstOrder!='1'"
class="iconfont icon-weiwancheng rightIcon"></text>
<text v-else class="iconfont icon-duihao2 rightIcon"></text>
</view>
<!-- <view class="num">
<text>{{partnerStatistic.totalSingeSaleNum.toFixed(2)}}元 /
{{partnerStatistic.reachSingeSaleNum.toFixed(2)}}</text>
</view> -->
</view>
<view class="" v-if="partnerStatistic.reachPeopleNum>0">
<view class="">
<text class="iconfont icon-a-tuandui3 leftIcon"></text>
......@@ -123,20 +137,7 @@
<text v-if="partnerStatistic.peopleNum>0">(相差{{partnerStatistic.peopleNum}}人)</text>
</view>
</view>
<view class="" v-if="partnerStatistic.reachSingeSaleNum>0">
<view class="">
<text class="iconfont icon-xiaoshoue leftIcon"></text>
<text>个人标准销售累计金额</text>
<!-- <text class="iconfont icon-duihao2 rightIcon" ></text> -->
<text v-if="partnerStatistic.totalSingeSaleNum<partnerStatistic.reachSingeSaleNum"
class="iconfont icon-weiwancheng rightIcon"></text>
<text v-else class="iconfont icon-duihao2 rightIcon"></text>
</view>
<view class="num">
<text>{{partnerStatistic.totalSingeSaleNum.toFixed(2)}}元 /
{{partnerStatistic.reachSingeSaleNum.toFixed(2)}}</text>
</view>
</view>
<view class="" v-if="partnerStatistic.reachSaleNum>0">
<view class="">
<text class="iconfont icon-ddailirenshu leftIcon"></text>
......@@ -1309,7 +1310,7 @@
}
.applyBox {
width: 500rpx;
width: 600rpx;
border-radius: 30rpx;
background-color: #ffff;
padding: 30rpx;
......
!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function i(e,i){return n.call(e,i)}Object.assign({},{unit:"rem",unitRatio:10/320,unitPrecision:5});var t=[];function o(){return window.__dcloud_weex_postMessage||window.__dcloud_weex_}function a(){return window.__uniapp_x_postMessage||window.__uniapp_x_}var r=function(e,n){var i={options:{timestamp:+new Date},name:e,arg:n};if(a()){if("postMessage"===e){var r={data:n};return window.__uniapp_x_postMessage?window.__uniapp_x_postMessage(r):window.__uniapp_x_.postMessage(JSON.stringify(r))}var d={type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}};window.__uniapp_x_postMessage?window.__uniapp_x_postMessageToService(d):window.__uniapp_x_.postMessageToService(JSON.stringify(d))}else if(o()){if("postMessage"===e){var s={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(s):window.__dcloud_weex_.postMessage(JSON.stringify(s))}var w={type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(w):window.__dcloud_weex_.postMessageToService(JSON.stringify(w))}else{if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:i,pageId:""},"*");if(0===t.length){var u=plus.webview.currentWebview();if(!u)throw new Error("plus.webview.currentWebview() is undefined");var g=u.parent(),c="";c=g?g.id:u.id,t.push(c)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}},"__uniapp__service");else{var v=JSON.stringify(i);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(v,",").concat(JSON.stringify(t),");"))}}},d={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;r("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("redirectTo",{url:encodeURI(n)})},getEnv:function(e){if(a()){var n=navigator.userAgent.includes("uni-app"),i=navigator.userAgent.includes("OpenHarmony"),t={uvue:!0};n&&i&&(t.harmony=!0),e(t)}else o()?e({nvue:!0}):window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};r("postMessage",e.data||{})}},s=/uni-app/i.test(navigator.userAgent),w=/Html5Plus/i.test(navigator.userAgent),u=/complete|loaded|interactive/;var g=window.my&&navigator.userAgent.indexOf(["t","n","e","i","l","C","y","a","p","i","l","A"].reverse().join(""))>-1;var c=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var v=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var _=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var m=window.qa&&/quickapp/i.test(navigator.userAgent);var f=window.ascfwebProxy&&window.ascfwebProxy.invokeJsApi&&/ASCF/i.test(navigator.userAgent);var l=window.ks&&window.ks.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var E=window.tt&&window.tt.miniProgram&&/Lark|Feishu/i.test(navigator.userAgent);var y=window.jd&&window.jd.miniProgram&&/jdmp/i.test(navigator.userAgent);var x=window.xhs&&window.xhs.miniProgram&&/xhsminiapp/i.test(navigator.userAgent);for(var S,h=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},b=[function(e){if(s||w)return window.__uniapp_x_postMessage||window.__uniapp_x_||window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&u.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),d},function(e){if(_)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(v)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(g){"loading"!==document.readyState?setTimeout(e,0):document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(c)return"loading"!==document.readyState?setTimeout(e,0):document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(p)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(m){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(f)return document.addEventListener("DOMContentLoaded",e),Object.assign({},window.has,window.has.ascfweb)},function(e){if(l)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.ks.miniProgram},function(e){if(E)return"loading"!==document.readyState?setTimeout(e,0):document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(y)return window.JDJSBridgeReady&&window.JDJSBridgeReady.invoke?setTimeout(e,0):document.addEventListener("JDJSBridgeReady",e),window.jd.miniProgram},function(e){if(x)return window.xhs.miniProgram},function(e){return document.addEventListener("DOMContentLoaded",e),d}],P=0;P<b.length&&!(S=b[P](h));P++);S||(S={});var M="undefined"!=typeof uni?uni:{};if(!M.navigateTo)for(var T in S)i(S,T)&&(M[T]=S[T]);return M.webView=S,M}));
......@@ -22,9 +22,9 @@ export default [
{
"Q": "合伙人晋升条件",
"A": [
"见习合伙人:完成加盟申请",
"新锐合伙人:个人标准销售额≥198元",
"资深合伙人:个人标准销售额≥198元 + 团队有效人数≥5人 + 团队标准销售额≥5万元",
"见习合伙人:申请加盟成功",
"新锐合伙人:申请加盟成功且购买分销系统内任一产品(含自购)",
"资深合伙人:申请加盟成功且购买分销系统内任一产品(含自购)+团队≥5人+团队标准销售额≥5万",
],
"isActive": 1,
"isMore": true
......
// vite.config.js
import { defineConfig } from 'vite'
import uni from '@dcloudio/vite-plugin-uni'
// 自定义插件:移除 CSS 中的 shadow-grey.png 引用
function removeShadowGrey() {
return {
name: 'remove-shadow-grey',
transform(code, id) {
// 只处理 CSS 和 Vue 文件(含 <style>)
if (id.endsWith('.css') || id.endsWith('.scss') || id.endsWith('.vue')) {
// 将 url(...) 中包含 shadow-grey.png 的替换为 none
const newCode = code.replace(
/url\([^)]*shadow-grey\.png[^)]*\)/g,
'none' // 或 '""' 或 '#000',可根据需要调整
)
if (newCode !== code) {
return { code: newCode, map: null }
}
}
return null // 不处理其他文件
}
}
}
export default defineConfig({
plugins: [
uni(),
removeShadowGrey() // 加入自定义插件
],
build: {
cssCodeSplit: true
// 不再配置 rollupOptions.output.manualChunks,使用 Vite 默认分包策略
}
})
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment