Skip to content

C
CFFP-HB
Commit 963ad6ed by yuzhenWang
Options

合并dev代码

parents 1e2e71ef 096ff857
Showing with 94 additions and 73 deletions
components/carousel/carousel.vue
......@@ -10,6 +10,7 @@
</template>
<script>
import {shareURL} from "@/environments/environment";
export default {
props: ['carouselList'],
data() {
......@@ -30,7 +31,7 @@
if (!url) {
return false
} else {
let index = url.indexOf('/appYdhomeoffice/pages/');
let index = url.indexOf(`${shareURL}/pages/`);
if (index != -1) {
uni.navigateTo({
url: url.substring(index + 16, url.length)
......
components/listItem/listItem.vue → components/my-list-item/my-list-item.vue
......@@ -30,7 +30,7 @@
<script>
export default {
name: "listItem",
name: "my-list-item",
props: {
title: {
type: Array,
......
environments/environment.ts
const dev = {
base_url:'https://mdev.anjibao.cn',
api_url:'https://mdev.anjibao.cn/cffpApi',
cffp_url:'https://mdev.anjibao.cn/cffpApi/cffp'
cffp_url:'https://mdev.anjibao.cn/cffpApi/cffp',
share_url:'https://mdev.anjibao.cn/cffp',
}
const stage = {
base_url:'https://mstage.zuihuibi.cn',
api_url:'https://mstage.zuihuibi.cn/cffpApi',
cffp_url:'https://mstage.zuihuibi.cn/cffpApi/cffp'
cffp_url:'https://mstage.zuihuibi.cn/cffpApi/cffp',
share_url:'https://mstage.zuihuibi.cn/cffp',
}
const prod = {
base_url:'https://app.ydhomeoffice.cn',
api_url:'https://app.ydhomeoffice.cn/appApi',
cffp_url:'https://app.ydhomeoffice.cn/appApi/cffp'
cffp_url:'https://app.ydhomeoffice.cn/appApi/cffp',
share_url:'https://app.ydhomeoffice.cn/appYdhomeoffice',
}
let companyInfo = {
// companyType: '1',
......@@ -36,10 +40,12 @@ let env = 'prod';
let baseURL = config[env].base_url;
let apiURL = config[env].api_url;
let cffpURL = config[env].cffp_url;
let shareURL = config[env].share_url;
export{
baseURL,
apiURL,
cffpURL,
companyInfo
companyInfo,
shareURL
}
\ No newline at end of file
manifest.json
......@@ -186,7 +186,7 @@
"vueVersion" : "3",
"h5" : {
"router" : {
"base" : "/appYdhomeoffice/",
"base" : "/cffp/",
"mode" : "history"
},
"devServer" : {
......
package-lock.json
{
"name": "日期区间picker",
"version": "1.0.7",
"lockfileVersion": 1,
"name": "验证码输入框",
"version": "2.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "验证码输入框",
"version": "2.0",
"dependencies": {
"echarts": {
"version": "5.4.1",
"resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz",
"integrity": "sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==",
"requires": {
"tslib": "2.3.0",
"zrender": "5.4.1"
"echarts": "^5.4.1",
"nanoid": "^4.0.0"
}
},
"merge-images": {
"version": "1.2.0",
"resolved": "https://registry.npmmirror.com/merge-images/-/merge-images-1.2.0.tgz",
"integrity": "sha512-hEGvgnTdXr08uzGvEArxRsKpy7WmozM73YaSi4s5IYF4LxrhANpqfHaz9CgBZ5+0+s2NsjPnPdStz3aCc0Yulw=="
"node_modules/echarts": {
"version": "5.6.0",
"resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.6.0.tgz",
"integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==",
"dependencies": {
"tslib": "2.3.0",
"zrender": "5.6.1"
}
},
"nanoid": {
"version": "4.0.0",
"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-4.0.0.tgz",
"integrity": "sha512-IgBP8piMxe/gf73RTQx7hmnhwz0aaEXYakvqZyE302IXW3HyVNhdNGC+O2MwMAVhLEnvXlvKtGbtJf6wvHihCg=="
"node_modules/nanoid": {
"version": "4.0.2",
"resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-4.0.2.tgz",
"integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/ai"
}
],
"bin": {
"nanoid": "bin/nanoid.js"
},
"signature_pad": {
"version": "3.0.0-beta.4",
"resolved": "https://registry.npmmirror.com/signature_pad/-/signature_pad-3.0.0-beta.4.tgz",
"integrity": "sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw=="
"engines": {
"node": "^14 || ^16 || >=18"
}
},
"tslib": {
"node_modules/tslib": {
"version": "2.3.0",
"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
},
"vue-signature-pad": {
"version": "3.0.2",
"resolved": "https://registry.npmmirror.com/vue-signature-pad/-/vue-signature-pad-3.0.2.tgz",
"integrity": "sha512-o25o+lROfCmzASS2+fU8ZV801kV+D4/02zkZ+ez3NKeiUmbxW7kwlUf5oKQkvA+l7Ou9xGsGLsirBLch3jyX8A==",
"requires": {
"merge-images": "^1.1.0",
"signature_pad": "^3.0.0-beta.3"
}
},
"zrender": {
"version": "5.4.1",
"resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz",
"integrity": "sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==",
"requires": {
"node_modules/zrender": {
"version": "5.6.1",
"resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.6.1.tgz",
"integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==",
"dependencies": {
"tslib": "2.3.0"
}
}
......
package.json
......@@ -13,5 +13,9 @@
"前端组件",
"通用组件"
]
},
"dependencies": {
"echarts": "^5.4.1",
"nanoid": "^4.0.0"
}
}
pages.json
......@@ -524,7 +524,7 @@
"pagePath": "pages/courselist/courselist", // 页面路径，必须在 pages 中先定义
"iconPath": "static/tabbar/cffp.png", // 图片路径，icon 大小限制为40kb，建议尺寸为 81px * 81px
"selectedIconPath": "static/tabbar/cffp_active.png", // 选中时的图片路径
"text": "CFFP认证" // tab 上按钮文字
"text": "产品中心" // tab 上按钮文字
}, {
"pagePath": "pages/personalCenter/personalCenter",
"iconPath": "static/tabbar/my.png",
......@@ -541,6 +541,12 @@
"navigationStyle": "custom"
},
"uniIdRouter": {},
"easycom": {
"autoscan": true,
"custom": {
"^my-list-item": "@/components/my-list-item/my-list-item.vue"
}
},
"condition": { //模式配置，仅开发期间生效
"current": 0, //当前激活的模式(list 的索引项)
"list": [{
......
pages/commonDetail/commonDetail.vue
......@@ -2,19 +2,20 @@
<view>
<text class="iconfont icon-youjiantou zuojiantou" style="top: 20rpx;" @click="goBack()" ></text>
<template v-if="title">
<view style="padding-top: 50rpx;"><list-item :title="title" :lists="lists"></list-item></view>
<view style="padding-top: 50rpx;"><my-list-item :title="title" :lists="lists"></my-list-item></view>
<view v-if="lists.length<=0" style="text-align: center;margin-top: 40rpx;">暂无{{typeName}}记录</view>
</template>
</view>
</template>
<script>
import listItem from "@/components/listItem/listItem.vue";
// import myListItem from "@/components/my-list-item/my-list-item.vue";
import api from "@/api/api";
export default {
components:{
listItem
},
// components:{
// myListItem
// },
data() {
return {
title:[],
......
pages/courseDetail/courseDetail.vue
......@@ -189,7 +189,8 @@
import {hshare} from '@/util/fiveshare';
import {nanoid} from 'nanoid';
import common from '../../common/common';
import {baseURL,apiURL,cffpURL,companyInfo} from "@/environments/environment";
import {baseURL,apiURL,cffpURL,companyInfo,shareURL} from "@/environments/environment";
export default {
components: {
UniShareWx,
......@@ -218,7 +219,6 @@
orderId: '',
userId: uni.getStorageSync('cffp_userId'),
shareUserId: '',
shareCode: '',
shareReadId: '',
dataSource: '1',
requiredCount: 0,
......@@ -231,8 +231,6 @@
timer: null,
loginType: '',
sliceshare: false,
nonRequiredCount: 0,
requiredCount: 0,
realName: '',
coursesharing: null,
serialsNo: null,
......@@ -429,7 +427,7 @@
//app分享
// #ifdef APP-PLUS
let dataWXform = {
href: baseURL + "/appYdhomeoffice/pages/courseDetail/courseDetail?fileId=" + this.fileId +
href: shareURL + "/pages/courseDetail/courseDetail?fileId=" + this.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&",
title: this.courseInfo.fileTitle,
......@@ -786,7 +784,7 @@
let data = {
title: this.courseInfo.fileTitle,
desc: '加入我们开启学习之旅',
link:"https://" + window.location.host + "/appYdhomeoffice/pages/courseDetail/courseDetail?fileId=" + this.fileId +
link: shareURL + "/pages/courseDetail/courseDetail?fileId=" + this.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&", //分享链接
imgUrl: this.courseInfo.displayImage, //图片
......@@ -849,7 +847,7 @@
userId: uni.getStorageSync('cffp_userId'),
businessType: '1', // 分享类型
businessId: this.fileId, // 课程Id
shareUrl: "https://" + window.location.host + "/appYdhomeoffice/pages/courseDetail/courseDetail?fileId=" + this.fileId +
shareUrl: shareURL + "/pages/courseDetail/courseDetail?fileId=" + this.fileId +
'&coursesharing=1' + '&serialsNo=' + nanoid() + '&shareCode=' + shareCode + '&shareUserId=' +
this.userId + '&jumpUrl=' + jumptime + "&", // 分享链接
shareType: '2', // 分享类型(1:图片分享; 2:链接分享)
......
pages/index/index.vue
......@@ -2,7 +2,8 @@
<view class="container">
<view class="top">
<view class="compony">
<image :src="cffpUserInfo.logo" mode="widthFix" style="max-width:320rpx"></image>
<!-- <image :src="cffpUserInfo.logo" mode="widthFix" style="max-width:320rpx"></image> -->
<image src="@/static/logo1.png" mode="widthFix" style="width: 120rpx !important;"></image>
<text class="name">{{cffpUserInfo.name}}</text>
<text class="iconfont icon-31tishi" @click="getIntroduce('center')"></text>
</view>
......@@ -86,7 +87,7 @@
},
featureLists: [{
key: '00',
name: '销售课程',
name: '销售中心',
icon: 'salesCourse',
link: '/pages/saleCourseLists/saleCourseLists',
isOpen: true
......@@ -354,15 +355,16 @@
.compony {
display: flex;
align-items: center;
max-height: 90rpx;
overflow: hidden;
// max-height: 150rpx;
// overflow: hidden;
.name {
font-size: 36rpx;
}
image {
margin-right: 20rpx;
margin-right: 40rpx;
}
.icon-31tishi {
......
pages/inviteJoin/inviteJoin.vue
......@@ -69,7 +69,7 @@
<!-- 邀请信息 -->
<view class="inviteListsBox" v-if="tabType===2">
<h4 class="noListTip" v-if="!inviteLists || inviteLists.length<=0">暂无邀请记录！</h4>
<view class="listUl ulBox" v-for="item in inviteLists">
<view class="listUl ulBox" v-for="(item,index) in inviteLists" :key="index">
<view class="liBox">
<text>姓名：</text>
<text>{{item.name}}</text>
......@@ -144,12 +144,13 @@
import api from "@/api/api"
import common from '../../common/common';
import {hshare } from '@/util/fiveshare';
import {baseURL,apiURL,cffpURL,companyInfo} from "@/environments/environment";
import {baseURL,apiURL,cffpURL,companyInfo,shareURL} from "@/environments/environment";
export default {
data() {
return {
companyType:companyInfo.companyType,
ydLogoShare: `${baseURL}/appYdhomeoffice/static/yd_LogoShare.png`,
ydLogoShare: `${shareURL}/static/yd_LogoShare.png`,
dataForm: {
applyType: '1', //申请类型邀请加盟传 1 申请加盟传 2
operatStep: '1', // 99:最后一步,1:第一步,2:为第二步该obj 为第一步
......@@ -184,7 +185,7 @@
this.partnerLevel = 'P1'
//this.getqueryOrgList()
if(this.companyType == '1'){
this.ydLogoShare = `${baseURL}/appYdhomeoffice/static/cffp_logo.jpg`;
this.ydLogoShare = `${shareURL}/static/cffp_logo.jpg`;
}
let dataForm = uni.getStorageSync('userinfodataForm')
this.realName = dataForm.realName;
......@@ -298,8 +299,8 @@
title: '银盾家办家庭财务策划师联盟邀您加入',
//desc: `我是家庭财务策划师${this.realName}正在使用银盾家办，点击即刻加入！`,
desc: `${this.realName}邀您加入【家庭财策师联盟】，资源+伙伴，共赢未来！`,
link: "https://" + window.location.host +
"/appYdhomeoffice/pages/invitationRegister/invitationRegister?companyType="+this.companyType+"&shareId=" +
link: shareURL +
"/pages/invitationRegister/invitationRegister?shareId=" +
this.shareId + '&invitationCode=' + this.invitationCode, //分享链接
imgUrl: this.ydLogoShare, //图片
//imgUrl: `${baseURL}/static/cffp_logo.jpg`, //图片
......@@ -340,7 +341,7 @@
provider: "weixin",
scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
type: 0,
href: `${baseURL}/appYdhomeoffice/pages/invitationRegister/invitationRegister?companyType=${this.companyType}&shareId=${this.shareId}&invitationCode=${this.invitationCode}`,
href: `${shareURL}/pages/invitationRegister/invitationRegister?shareId=${this.shareId}&invitationCode=${this.invitationCode}`,
title: "银盾家办家庭财务策划师联盟邀您加入",
//summary: `我是家庭财务策划师${this.realName}正在使用银盾家办，点击下载即刻加入！`,
summary: `${this.realName}邀您加入【家庭财策师联盟】，资源+伙伴，共赢未来！`,
......
pages/personalCenter/accountoperation/aboutcffp.vue
......@@ -25,7 +25,7 @@
</view>
<view class="" style="display: align-self: end;">
<span><text style="color: #2D56A7;" @click="getFile(1)">《服务协议》 | </text><text style="color: #2D56A7;" @click="getFile(2)">《隐私政策》</text></span>
<p class="footer-text" style="margin: 10px 0;">客服电话：400：921-9290</p>
<p class="footer-text" style="margin: 10px 0;">客服电话：400-921-9290</p>
<p class="footer-text">由{{companyFullName}}提供</p>
</view>
</view>
......
pages/personalCenter/personalCenter.vue
......@@ -94,7 +94,7 @@
mainMenuLists:[
{id:'00',categoryName:'销售管理',
children:[
{title:'销售课程',icon:'salesCourse',link:'/pages/saleCourseLists/saleCourseLists',isOpen:true,isShow:true},
{title:'销售中心',icon:'salesCourse',link:'/pages/saleCourseLists/saleCourseLists',isOpen:true,isShow:true},
{title:'销售保单',icon:'salesOrder',link:'',isOpen:true,isShow:false},
{title:'我的售后',icon:'afterSales',link:'/pages/afterSales/afterSales',isOpen:true,isShow:true}
],
......
pages/product/finance-calculator.vue
......@@ -13,7 +13,7 @@ import MenuList from "@/components/menuList/menuList.vue"
data() {
return {
minorMenuLists: [{
title: '房贷推销计算器',
title: '购房能力测算',
icon: 'shareEcode',
link: '/sfp/housePurchase/housePurchase',
isOpen: true,
......
pages/withdrawal/withdrawal.vue
......@@ -58,7 +58,7 @@
<navigator class="rule" url="/pages/taxRules/taxRules">《劳务报酬税缴纳规则》;</navigator>
</view>
<view class="">
3、如需帮助，请联系银盾家办客服电话400:921-9290;
3、如需帮助，请联系银盾家办客服电话400-921-9290;
</view>
</view>
<view class="btn" @click="confirmWithdrawal()" :class="{'gray':readonlyFlag}" style="bottom: 30rpx;">
......
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