Skip to content

C
CFFP-HB
Commit a3c98e37 by kyle
Options

Merge branch 'dev' of http://139.224.139.2:9091/chaosun/CFFP into dev

parents e41cb573 1a40df24
Showing with 374 additions and 353 deletions
components/courseItem/courseItem.vue
...@@ -102,8 +102,7 @@ ...@@ -102,8 +102,7 @@
.itemContent{ .itemContent{
display: flex; display: flex;
.thumbnailBox{ .thumbnailBox{
width: 200rpx; width: 300rpx;
height: 200rpx;
margin-right: 26rpx; margin-right: 26rpx;
image{ image{
max-width: 100%; max-width: 100%;
...@@ -138,7 +137,7 @@ ...@@ -138,7 +137,7 @@
strong{ strong{
color: #F15A1F; color: #F15A1F;
font-size: 30rpx; font-size: 30rpx;
margin-right: 20rpx; margin: 10rpx 20rpx 10rpx 0;
} }
text{ text{
font-size: 28rpx; font-size: 28rpx;
...@@ -147,13 +146,14 @@ ...@@ -147,13 +146,14 @@
.tagListBox{ .tagListBox{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 20rpx;
.tagItem{ .tagItem{
color: #20279B; color: #20279B;
font-size: 28rpx; font-size: 24rpx;
border-radius: 20rpx; border-radius: 20rpx;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
padding: 10rpx 18rpx; padding: 5rpx 18rpx;
border: 1px solid #20279B; border: 1px solid #20279B;
margin-right: 20rpx; margin-right: 20rpx;
white-space: nowrap; white-space: nowrap;
......
pages.json
...@@ -6,469 +6,407 @@ ...@@ -6,469 +6,407 @@
"topWindow": false, "topWindow": false,
"navigationBarTitleText": "CFFP" "navigationBarTitleText": "CFFP"
} }
},{ }, {
"path": "components/login/login", "path": "components/login/login",
"style": { "style": {
"topWindow": false, "topWindow": false,
"navigationBarTitleText": "CFFP" "navigationBarTitleText": "CFFP"
} }
},{ }, {
"path": "pages/courselist/courselist", "path": "pages/courselist/courselist",
"style": { "style": {
"topWindow": false, "topWindow": false,
"navigationBarTitleText": "CFFP" "navigationBarTitleText": "CFFP"
} }
},{ }, {
"path" : "pages/courseDetail/courseDetail", "path": "pages/courseDetail/courseDetail",
"style" : "style": {
{
"navigationBarTitleText": "课程详情", "navigationBarTitleText": "课程详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/product/product", "path": "pages/product/product",
"style" : "style": {
{
"navigationBarTitleText": "SFP", "navigationBarTitleText": "SFP",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/shareFriend/shareFriend", "path": "pages/shareFriend/shareFriend",
"style" : "style": {
{
"navigationBarTitleText": "分享好友", "navigationBarTitleText": "分享好友",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/personalCenter/personalCenter", "path": "pages/personalCenter/personalCenter",
"style" : "style": {
{
"navigationBarTitleText": "我的", "navigationBarTitleText": "我的",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/announcement/announcement", "path": "pages/announcement/announcement",
"style" : "style": {
{
"navigationBarTitleText": "公告列表", "navigationBarTitleText": "公告列表",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/announcement/announcement_detail", "path": "pages/announcement/announcement_detail",
"style" : "style": {
{
"navigationBarTitleText": "公告详情", "navigationBarTitleText": "公告详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/systemMsg/system_msg", "path": "pages/systemMsg/system_msg",
"style" : "style": {
{
"navigationBarTitleText": "消息列表", "navigationBarTitleText": "消息列表",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/systemMsg/system_msg_detail", "path": "pages/systemMsg/system_msg_detail",
"style" : "style": {
{
"navigationBarTitleText": "消息详情", "navigationBarTitleText": "消息详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/application-process/basic-info", "path": "pages/application-process/basic-info",
"style" : "style": {
{
"navigationBarTitleText": "基本资料", "navigationBarTitleText": "基本资料",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/application-process/work-experience", "path": "pages/application-process/work-experience",
"style" : "style": {
{
"navigationBarTitleText": "从业经历", "navigationBarTitleText": "从业经历",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/myCertify/myCertify", "path": "pages/myCertify/myCertify",
"style" : "style": {
{
"navigationBarTitleText": "我的认证", "navigationBarTitleText": "我的认证",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/inviteJoin/inviteJoin", "path": "pages/inviteJoin/inviteJoin",
"style" : "style": {
{
"navigationBarTitleText": "邀请加盟", "navigationBarTitleText": "邀请加盟",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/orderConfirm/orderConfirm", "path": "pages/orderConfirm/orderConfirm",
"style" : "style": {
{
"navigationBarTitleText": "订单确认", "navigationBarTitleText": "订单确认",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/learnCertify/learnCertify", "path": "pages/learnCertify/learnCertify",
"style" : "style": {
{
"navigationBarTitleText": "学习认证", "navigationBarTitleText": "学习认证",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/authentication-query/authentication-query", "path": "pages/authentication-query/authentication-query",
"style" : "style": {
{
"navigationBarTitleText": "认证查询", "navigationBarTitleText": "认证查询",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/authentication-query/authentication-result", "path": "pages/authentication-query/authentication-result",
"style" : "style": {
{
"navigationBarTitleText": "查询结果", "navigationBarTitleText": "查询结果",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/certifyDetail/certifyDetail", "path": "pages/certifyDetail/certifyDetail",
"style" : "style": {
{
"navigationBarTitleText": "认证详情", "navigationBarTitleText": "认证详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/myLearning/myLearning", "path": "pages/myLearning/myLearning",
"style" : "style": {
{
"navigationBarTitleText": "我的学习", "navigationBarTitleText": "我的学习",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/personalCenter/myTeam", "path": "pages/personalCenter/myTeam",
"style" : "style": {
{
"navigationBarTitleText": "我的团队", "navigationBarTitleText": "我的团队",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/myShare/myShare", "path": "pages/myShare/myShare",
"style" : "style": {
{
"navigationBarTitleText": "我的分享", "navigationBarTitleText": "我的分享",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/myPoints/myPoints", "path": "pages/myPoints/myPoints",
"style" : "style": {
{
"navigationBarTitleText": "我的积分", "navigationBarTitleText": "我的积分",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/commonDetail/commonDetail",
"path" : "pages/commonDetail/commonDetail", "style": {
"style" :
{
"navigationBarTitleText": "明细", "navigationBarTitleText": "明细",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/orderDetail/orderDetail", "path": "pages/orderDetail/orderDetail",
"style" : "style": {
{
"navigationBarTitleText": "订单详情", "navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/afterSales/afterSales",
"path" : "pages/afterSales/afterSales", "style": {
"style" :
{
"navigationBarTitleText": "我的售后", "navigationBarTitleText": "我的售后",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/afterSaleDetail/afterSaleDetail", "path": "pages/afterSaleDetail/afterSaleDetail",
"style" : "style": {
{
"navigationBarTitleText": "我的售后", "navigationBarTitleText": "我的售后",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/saleCourseLists/saleCourseLists", "path": "pages/saleCourseLists/saleCourseLists",
"style" : "style": {
{
"navigationBarTitleText": "销售课程", "navigationBarTitleText": "销售课程",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/myPoints/pointsDetail", "path": "pages/myPoints/pointsDetail",
"style" : "style": {
{
"navigationBarTitleText": "积分明细", "navigationBarTitleText": "积分明细",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/pointsExchange/pointsStatus", "path": "pages/pointsExchange/pointsStatus",
"style" : "style": {
{
"navigationBarTitleText": "积分状态", "navigationBarTitleText": "积分状态",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/pointsExchange/pointsExchange", "path": "pages/pointsExchange/pointsExchange",
"style" : "style": {
{
"navigationBarTitleText": "积分兑换", "navigationBarTitleText": "积分兑换",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/withdrawal/withdrawal", "path": "pages/withdrawal/withdrawal",
"style" : "style": {
{
"navigationBarTitleText": "兑换提现", "navigationBarTitleText": "兑换提现",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/exchangeRecord/exchangeRecord", "path": "pages/exchangeRecord/exchangeRecord",
"style" : "style": {
{
"navigationBarTitleText": "兑换记录", "navigationBarTitleText": "兑换记录",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/withdrawal/withdrawalDetail", "path": "pages/withdrawal/withdrawalDetail",
"style" : "style": {
{
"navigationBarTitleText": "提现详情", "navigationBarTitleText": "提现详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/taxRules/taxRules", "path": "pages/taxRules/taxRules",
"style" : "style": {
{
"navigationBarTitleText": "纳税规则", "navigationBarTitleText": "纳税规则",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/applyDropClass/applyDropClass", "path": "pages/applyDropClass/applyDropClass",
"style" : "style": {
{
"navigationBarTitleText": "申请退课", "navigationBarTitleText": "申请退课",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/application-process/id-card", "path": "pages/application-process/id-card",
"style" : "style": {
{
"navigationBarTitleText": "申请加盟-个人证件", "navigationBarTitleText": "申请加盟-个人证件",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/application-process/education", "path": "pages/application-process/education",
"style" : "style": {
{
"navigationBarTitleText": "申请加盟-学历信息", "navigationBarTitleText": "申请加盟-学历信息",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/application-process/bank-card", "path": "pages/application-process/bank-card",
"style" : "style": {
{
"navigationBarTitleText": "申请加盟-银行卡号", "navigationBarTitleText": "申请加盟-银行卡号",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/application-process/personal-statement", "path": "pages/application-process/personal-statement",
"style" : "style": {
{
"navigationBarTitleText": "申请加盟-个人声明", "navigationBarTitleText": "申请加盟-个人声明",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/application-process/contract", "path": "pages/application-process/contract",
"style" : "style": {
{
"navigationBarTitleText": "申请加盟-合同文档", "navigationBarTitleText": "申请加盟-合同文档",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/application-process/signature", "path": "pages/application-process/signature",
"style" : "style": {
{
"navigationBarTitleText": "申请加盟-电子签名", "navigationBarTitleText": "申请加盟-电子签名",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"app-plus": {
"bounce": "none"
} }
} }
,{ }, {
"path" : "pages/personalCenter/teamMembers/teamMembers", "path": "pages/personalCenter/teamMembers/teamMembers",
"style" : "style": {
{
"navigationBarTitleText": "团队成员", "navigationBarTitleText": "团队成员",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/personalCenter/teamPerformance/teamPerformance",
"path" : "pages/personalCenter/teamPerformance/teamPerformance", "style": {
"style" :
{
"navigationBarTitleText": "团队业绩", "navigationBarTitleText": "团队业绩",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} ,{ }, {
"path" : "pages/personalCenter/user-information", "path": "pages/personalCenter/user-information",
"style" : "style": {
{
"navigationBarTitleText": "个人资料", "navigationBarTitleText": "个人资料",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/personalCenter/system/settings", "path": "pages/personalCenter/system/settings",
"style" : "style": {
{
"navigationBarTitleText": "设置", "navigationBarTitleText": "设置",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/orderStatus/orderStatus", "path": "pages/orderStatus/orderStatus",
"style" : "style": {
{
"navigationBarTitleText": "订单支付", "navigationBarTitleText": "订单支付",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} ,{ }, {
"path" : "pages/dropLists/dropLists", "path": "pages/dropLists/dropLists",
"style" : "style": {
{
"navigationBarTitleText": "已退课", "navigationBarTitleText": "已退课",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/learningStatistics/learningStatistics",
"path" : "pages/learningStatistics/learningStatistics", "style": {
"style" :
{
"navigationBarTitleText": "学习统计", "navigationBarTitleText": "学习统计",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/personalCenter/system/accontsetting", "path": "pages/personalCenter/system/accontsetting",
"style" : "style": {
{
"navigationBarTitleText": "账号绑定设置", "navigationBarTitleText": "账号绑定设置",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/personalCenter/accountoperation/phonebinding", "path": "pages/personalCenter/accountoperation/phonebinding",
"style" : "style": {
{
"navigationBarTitleText": "手机号绑定", "navigationBarTitleText": "手机号绑定",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/personalCenter/accountoperation/resetpassword", "path": "pages/personalCenter/accountoperation/resetpassword",
"style" : "style": {
{
"navigationBarTitleText": "重置密码", "navigationBarTitleText": "重置密码",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/personalCenter/accountoperation/aboutcffp", "path": "pages/personalCenter/accountoperation/aboutcffp",
"style" : "style": {
{
"navigationBarTitleText": "关于我", "navigationBarTitleText": "关于我",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "pages/certifyDetail/uploadinformation", "path": "pages/certifyDetail/uploadinformation",
"style" : "style": {
{
"navigationBarTitleText": "上传信息", "navigationBarTitleText": "上传信息",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }, {
,{ "path": "pages/receiptCycleDesc/receiptCycleDesc",
"path" : "pages/receiptCycleDesc/receiptCycleDesc", "style": {
"style" :
{
"navigationBarTitleText": "到账周期说明", "navigationBarTitleText": "到账周期说明",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} ,{ }, {
"path" : "pages/invitationRegister/invitationRegister", "path": "pages/invitationRegister/invitationRegister",
"style" : "style": {
{
"navigationBarTitleText": "邀请注册", "navigationBarTitleText": "邀请注册",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/invitationRegister/invitationlogin", "path": "pages/invitationRegister/invitationlogin",
"style" : "style": {
{
"navigationBarTitleText": "邀请登录", "navigationBarTitleText": "邀请登录",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},{ }, {
"path" : "pages/application-process/application-result", "path": "pages/application-process/application-result",
"style" : "style": {
{
"navigationBarTitleText": "申请加盟-结果", "navigationBarTitleText": "申请加盟-结果",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
,{ , {
"path" : "pages/product/finance-calculator", "path": "pages/product/finance-calculator",
"style" : "style": {
{
"navigationBarTitleText": "pages/product/finance-calculator", "navigationBarTitleText": "pages/product/finance-calculator",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path":"components/webview" "path": "components/webview"
}, },
{ {
"path" : "pages/personalCenter/system/cancellation", "path": "pages/personalCenter/system/cancellation",
"style" : "style": {
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path" : "components/clause/clause", "path": "components/clause/clause",
"style" : "style": {
{
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
...@@ -514,14 +452,12 @@ ...@@ -514,14 +452,12 @@
"navigationStyle": "custom" "navigationStyle": "custom"
}, },
"uniIdRouter": {}, "uniIdRouter": {},
"condition" : { //模式配置，仅开发期间生效 "condition": { //模式配置，仅开发期间生效
"current": 0, //当前激活的模式(list 的索引项) "current": 0, //当前激活的模式(list 的索引项)
"list": [ "list": [{
{
"name": "", //模式名称 "name": "", //模式名称
"path": "", //启动页面，必选 "path": "", //启动页面，必选
"query": "" //启动参数，在页面的onLoad函数里面得到 "query": "" //启动参数，在页面的onLoad函数里面得到
} }]
]
} }
} }
pages/application-process/basic-info.vue
...@@ -31,14 +31,13 @@ ...@@ -31,14 +31,13 @@
<text>邀请码</text> <text>邀请码</text>
<input type="text" class="form-control" placeholder="非必填" <input type="text" class="form-control" placeholder="非必填"
v-model="applyParam.inviterInvitationCode" v-model="applyParam.inviterInvitationCode"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" /> :disabled="this.display"/>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>申请身份</text> <text>申请身份</text>
<text v-if="partnerLevelName">{{partnerLevelName}}</text> <picker @change="changeIdentity" :value="identityIdx" :range="identityArr"
<picker v-else @change="changeIdentity" :value="identityIdx" :range="identityArr"
range-key="name" range-key="name"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"> :disabled="this.display">
<view class="uni-input">{{identityArr[identityIdx]['name']}} <view class="uni-input">{{identityArr[identityIdx]['name']}}
<text class="iconfont icon-youjiantou"></text> <text class="iconfont icon-youjiantou"></text>
</view> </view>
...@@ -47,14 +46,15 @@ ...@@ -47,14 +46,15 @@
<view class="contentItem" v-if="applyParam.partnerLevel == 'B1'"> <view class="contentItem" v-if="applyParam.partnerLevel == 'B1'">
<text>工作室名称</text> <text>工作室名称</text>
<input type="text" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称" <input type="text" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" /> :disabled="this.display"/>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>所属组织</text> <text>所属组织</text>
<text v-if="areaName">{{areaName}}</text> <input type="text" v-if="applyParam.hasCrossDistrict == 1" class="form-control" v-model="applyParam.b1Name" placeholder="请输入工作室名称"
:disabled="this.display"/>
<picker v-else @change="changeArea" :value="areaIdIdx" :range="cffpAreaQuerys" <picker v-else @change="changeArea" :value="areaIdIdx" :range="cffpAreaQuerys"
range-key="areaName" range-key="areaName"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"> :disabled="this.display">
<view class="uni-input">{{cffpAreaQuerys[areaIdIdx]['areaName']}} <view class="uni-input">{{cffpAreaQuerys[areaIdIdx]['areaName']}}
<text class="iconfont icon-youjiantou"></text> <text class="iconfont icon-youjiantou"></text>
</view> </view>
...@@ -62,18 +62,16 @@ ...@@ -62,18 +62,16 @@
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>姓名</text> <text>姓名</text>
<text v-if="applyParam.name">{{applyParam.name}}</text> <input type="text" class="form-control" v-model="applyParam.name" placeholder="请输入姓名"
<input v-else type="text" class="form-control" v-model="applyParam.name" placeholder="请输入姓名"
auto-blur=true @blur="checkInput(1,applyParam.name)" auto-blur=true @blur="checkInput(1,applyParam.name)"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" /> :disabled="this.display" />
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>手机号</text> <text>手机号</text>
<text v-if="applyParam.mobileNumber">{{applyParam.mobileNumber}}</text> <input type="text" class="form-control" v-model="applyParam.mobileNumber"
<input v-else type="text" class="form-control" v-model="applyParam.mobileNumber"
placeholder="请输入手机号" maxlength="11" auto-blur=true placeholder="请输入手机号" maxlength="11" auto-blur=true
@blur="checkInput(2,applyParam.mobileNumber)" @blur="checkInput(2,applyParam.mobileNumber)"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2" /> :disabled="this.display" />
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>证件类型</text> <text>证件类型</text>
...@@ -85,7 +83,7 @@ ...@@ -85,7 +83,7 @@
</picker> </picker>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>证件号码</text> <text>证件号码{{this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2}}</text>
<view> <view>
<input type="text" class="form-control" v-model="applyParam.idNo" placeholder="请输入证件号码" <input type="text" class="form-control" v-model="applyParam.idNo" placeholder="请输入证件号码"
auto-blur=true @blur="checkInput(3,applyParam.idNo)" auto-blur=true @blur="checkInput(3,applyParam.idNo)"
...@@ -162,6 +160,7 @@ ...@@ -162,6 +160,7 @@
name: null, name: null,
mobile: null, mobile: null,
shareId: null, shareId: null,
display: false,
cffp_userInfo: { cffp_userInfo: {
name: '', name: '',
mobile: '' mobile: ''
...@@ -171,16 +170,15 @@ ...@@ -171,16 +170,15 @@
components: {}, components: {},
onLoad(options) { onLoad(options) {
if (options.dataForm) { if (options.dataForm) {
console.log(options, '唧唧哇哇') this.shareId = option.shareId
let dataOneForm = JSON.parse(options.dataForm) // let dataOneForm = JSON.parse(options.dataForm)
this.applyParam.name = dataOneForm.name // this.applyParam.name = dataOneForm.name
this.shareId = options.shareId // this.applyParam.inviterInvitationCode = dataOneForm.invitationCode
this.applyParam.inviterInvitationCode = dataOneForm.invitationCode // this.applyParam.mobileNumber = dataOneForm.mobile
this.applyParam.mobileNumber = dataOneForm.mobile // this.areaName = dataOneForm.areaName
this.areaName = dataOneForm.areaName // this.applyParam.partnerLevel = dataOneForm.partnerLevel
this.applyParam.partnerLevel = dataOneForm.partnerLevel // this.partnerLevelName = dataOneForm.partnerLevel == 'A1' ? '事业伙伴' : '工作室'
this.partnerLevelName = dataOneForm.partnerLevel == 'A1' ? '事业伙伴' : '工作室' // this.applyParam.areaId = dataOneForm.areaId
this.applyParam.areaId = dataOneForm.areaId
uni.setStorageSync('applyId', '') uni.setStorageSync('applyId', '')
} else { } else {
this.cffp_userInfo = uni.getStorageSync('cffp_userInfo'); this.cffp_userInfo = uni.getStorageSync('cffp_userInfo');
...@@ -189,7 +187,7 @@ ...@@ -189,7 +187,7 @@
this.applyParam.mobileNumber = JSON.parse(uni.getStorageSync('cffp_userInfo'))['mobile']; this.applyParam.mobileNumber = JSON.parse(uni.getStorageSync('cffp_userInfo'))['mobile'];
} }
} }
this.erpInitialize(); // this.erpInitialize();
// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组 // let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
// let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由 // let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由
// console.log('当前路由地址',curRoute) // console.log('当前路由地址',curRoute)
...@@ -209,12 +207,15 @@ ...@@ -209,12 +207,15 @@
}, },
methods: { methods: {
erpInitialize() { erpInitialize() {
return new Promise((resolve,reject)=>{
api.erpInitialize({}).then((res) => { api.erpInitialize({}).then((res) => {
resolve(res['success']);
if (res['success']) { if (res['success']) {
this.idTypesList = this.idTypesList.concat(res['data']['idTypes']); this.idTypesList = this.idTypesList.concat(res['data']['idTypes']);
console.log(this.idTypesList) console.log(this.idTypesList)
} }
}) })
})
}, },
queryOrgList() { queryOrgList() {
const param = { const param = {
...@@ -302,7 +303,8 @@ ...@@ -302,7 +303,8 @@
} }
}, },
queryById(id, userId) { async queryById(id, userId) {
await this.erpInitialize();
api.queryById({ api.queryById({
id: id, id: id,
userId: userId userId: userId
...@@ -316,11 +318,13 @@ ...@@ -316,11 +318,13 @@
} }
} }
for (let i = 0; i < this.idTypesList.length; i++) { for (let i = 0; i < this.idTypesList.length; i++) {
if (this.applyParam.idType == this.idTypesList[i].name) { if (this.idTypesList[i].name == this.applyParam.idType) {
this.idTypeIdx = i; this.idTypeIdx = i;
} }
} }
if(this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2 || this.applyParam.applyType == '1'){
this.display = true
}
} else { } else {
this.queryOrgList(); this.queryOrgList();
} }
...@@ -371,7 +375,7 @@ ...@@ -371,7 +375,7 @@
} }
} }
} }
if (!this.applyParam.idType) { if (!this.applyParam.idType || this.applyParam.idType=='请选择') {
uni.showToast({ uni.showToast({
title: '请选择证件类型', title: '请选择证件类型',
duration: 2000, duration: 2000,
...@@ -397,10 +401,9 @@ ...@@ -397,10 +401,9 @@
} }
this.applyParam = { this.applyParam = {
...this.applyParam, ...this.applyParam,
applyType: 2, applyType: this.applyParam.inviterInvitationCode? '1': '2',
operatStep: 1, operatStep: 1,
userId: uni.getStorageSync('cffp_userId'), userId: uni.getStorageSync('cffp_userId'),
hasCrossDistrict: 0
} }
api.saveApplyInfo(this.applyParam).then((res) => { api.saveApplyInfo(this.applyParam).then((res) => {
if (res['success']) { if (res['success']) {
......
pages/application-process/education.vue
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</picker> </picker>
</view> </view>
<view class="contentItem"> <view class="contentItem">
<text>毕业学校{{applyParam.approvalStatus}}</text> <text>毕业学校{{applyParam.approvalStatus}} {{this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2}}</text>
<input class="form-control" v-model="applyParam.lastGraduateSchool" style="background: #666666;" <input class="form-control" v-model="applyParam.lastGraduateSchool" style="background: #666666;"
:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/> :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
</view> </view>
......
pages/application-process/signature.vue
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<text class="page_mark">8/8</text> <text class="page_mark">8/8</text>
</view> </view>
<view class="signatureContent" v-if="!applyParam.personalSignOssPath"> <view class="signatureContent" v-if="!applyParam.personalSignOssPath">
<e-signature :showCanvas="showCanvas" ref="signatureComponent" @sendImage="getImage"></e-signature> <e-signature :style="{'width':'100vw','height':'80vh'}" :showCanvas="showCanvas" ref="signatureComponent" @sendImage="getImage"></e-signature>
</view> </view>
<image :src="applyParam.personalSignOssPath" mode="widthFix" v-if="applyParam.personalSignOssPath"></image> <image :src="applyParam.personalSignOssPath" mode="widthFix" v-if="applyParam.personalSignOssPath"></image>
<view class="fixed" url="bank-card" @click="save()"> <view class="fixed" url="bank-card" @click="save()">
...@@ -124,11 +124,11 @@ ...@@ -124,11 +124,11 @@
<style lang="scss"> <style lang="scss">
@import 'applyCommon.scss'; @import 'applyCommon.scss';
uni-page-wrapper{ // uni-page-wrapper{
overflow: hidden!important; // overflow: hidden!important;
} // }
.signatureContent{ .signatureContent{
padding: 0 36rpx 20rpx 26rpx; // padding: 0 36rpx 20rpx 26rpx;
background: #fff; background: #fff;
margin-top: 20rpx; margin-top: 20rpx;
height: 100%; height: 100%;
......
pages/index/index.vue
<template> <template>
<movable-area style="width: 100vw; height: 100vh; pointer-events:none; z-index: 9999;position:fixed;top:0;left:0;" <movable-area style="width: 100vw; height: 100vh; pointer-events:none; z-index: 9999;position:fixed;top:0;left:0;"
@tap="tokefu()"> @tap="tokefu()">
<movable-view direction="all" style="width: 100rpx; pointer-events:auto; height: 80rpx;top: 50%;left: 85%;text-align: center;"> <movable-view direction="all"
style="width: 100rpx; pointer-events:auto; height: 80rpx;top: 50%;left: 85%;text-align: center;">
<image :src="kefu" mode="widthFix"></image> <image :src="kefu" mode="widthFix"></image>
<text style="font-size:20rpx;color: #1954fe;">在线客服</text> <text style="font-size:20rpx;color: #1954fe;">在线客服</text>
</movable-view> </movable-view>
...@@ -29,9 +30,11 @@ ...@@ -29,9 +30,11 @@
<view class="featureContent"> <view class="featureContent">
<!-- 模块导航 --> <!-- 模块导航 -->
<view class="nav_wrapper"> <view class="nav_wrapper">
<view class="nav_content" v-for="featureItem in featureLists" :key="featureItem.key" @click="featureSelect(featureItem)"> <view class="nav_content" v-for="featureItem in featureLists" :key="featureItem.key"
@click="featureSelect(featureItem)">
<view style="width: 120rpx;text-align: center;"> <view style="width: 120rpx;text-align: center;">
<image :src="'/static/moduleIcon/'+featureItem.icon + '.png'" alt="" srcset="" mode="widthFix"></image> <image :src="'/static/moduleIcon/'+featureItem.icon + '.png'" alt="" srcset=""
mode="widthFix"></image>
</view> </view>
<view>{{featureItem.name}}</view> <view>{{featureItem.name}}</view>
</view> </view>
...@@ -69,83 +72,141 @@ ...@@ -69,83 +72,141 @@
x: 0, x: 0,
y: 0 y: 0
}, },
featureLists:[ featureLists: [{
{ key: '00', name: '销售课程', icon: 'salesCourse', link: '/pages/saleCourseLists/saleCourseLists', isOpen: true }, key: '00',
{ key: '01', name: '我的积分', icon: 'integral', link: '/pages/myPoints/myPoints', isOpen: true }, name: '销售课程',
{ key: '02', name: '申请加盟', icon: 'applyJoin', link: '/pages/application-process/basic-info', isOpen: true }, icon: 'salesCourse',
{ key: '03', name: '学习认证', icon: 'learningCertify', link: '/pages/learnCertify/learnCertify', isOpen: true }, link: '/pages/saleCourseLists/saleCourseLists',
{ key: '04', name: '邀请加盟', icon: 'shareJoin', link: '/pages/inviteJoin/inviteJoin', isOpen: true }, isOpen: true
{ key: '05', name: '我的分享', icon: 'share', link: '/pages/myShare/myShare', isOpen: true }, },
{ key: '06', name: '我的团队', icon: 'team', link: '/pages/personalCenter/myTeam', isOpen: true }, {
{ key: '07', name: '更多功能', icon: 'more', link: '/pages/personalCenter/personalCenter', isOpen: true } key: '01',
name: '我的积分',
icon: 'integral',
link: '/pages/myPoints/myPoints',
isOpen: true
},
{
key: '02',
name: '申请加盟',
icon: 'applyJoin',
link: '/pages/application-process/basic-info',
isOpen: true
},
{
key: '03',
name: '学习认证',
icon: 'learningCertify',
link: '/pages/learnCertify/learnCertify',
isOpen: true
},
{
key: '04',
name: '邀请加盟',
icon: 'shareJoin',
link: '/pages/inviteJoin/inviteJoin',
isOpen: true
},
{
key: '05',
name: '我的分享',
icon: 'share',
link: '/pages/myShare/myShare',
isOpen: true
},
{
key: '06',
name: '我的团队',
icon: 'team',
link: '/pages/personalCenter/myTeam',
isOpen: true
},
{
key: '07',
name: '更多功能',
icon: 'more',
link: '/pages/personalCenter/personalCenter',
isOpen: true
}
], ],
cffpUserInfo:{ cffpUserInfo: {
address:'', address: '',
description:'', description: '',
fileUploadItemList:[], fileUploadItemList: [],
logo:'', logo: '',
name:'', name: '',
type:''//类型1,区域中心，2工作室 type: '' //类型1,区域中心，2工作室
}, },
announcementInfo:null, announcementInfo: null,
tagIds:123, tagIds: 123,
currentPage:'index', currentPage: 'index',
carouselList:[], carouselList: [],
userId: uni.getStorageSync('cffp_userId'), userId: uni.getStorageSync('cffp_userId'),
shareId:null, shareId: null,
kefu:'../../static/kefu.png' kefu: '../../static/kefu.png'
} }
}, },
components:{ components: {
courselist, courselist,
tabBar, tabBar,
carousel, carousel,
search search
}, },
onLoad(options) { onLoad(options) {
if(uni.getStorageSync('isLogin')){ if (uni.getStorageSync('isLogin')) {
this.queryAreaCenterInfo(); this.queryAreaCenterInfo();
this.announcementQuery(); this.announcementQuery();
}else{ } else {
uni.navigateTo({ uni.navigateTo({
url:'/components/login/login' url: '/components/login/login'
}) })
} }
}, },
methods: { methods: {
tokefu(){ tokefu() {
let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数 let url = 'http://q.url.cn/abkzV9?_type=wpa&qidian=true' // URL是要跳转的外部地址 作为参数
uni.navigateTo({ uni.navigateTo({
url: '/components/webview?url=' + url url: '/components/webview?url=' + url
// page.json定义的路径 传url 到webview界面去接收 实现跳转 // page.json定义的路径 传url 到webview界面去接收 实现跳转
}) })
}, },
featureSelect(featureItem){ featureSelect(featureItem) {
console.log(featureItem) console.log(featureItem)
if(featureItem.isOpen && featureItem.link){ if (featureItem.isOpen && featureItem.link) {
if (this.cffpUserInfo.partnerType) {
uni.navigateTo({ uni.navigateTo({
url:featureItem.link url: featureItem.link
}) })
}else{ }else {
uni.showToast({ uni.showToast({
title:'此功能暂未开放，敬请期待。' , title: "您本人尚未加盟，您加盟后可邀请加盟",
duration: 2000,
icon: 'none'
});
return false
}
} else {
uni.showToast({
title: '此功能暂未开放，敬请期待。',
duration: 2000, duration: 2000,
icon: 'none' icon: 'none'
}) })
} }
}, },
queryAreaCenterInfo(){ queryAreaCenterInfo() {
api.queryAreaCenterInfo({userId:this.userId}).then((res)=>{ api.queryAreaCenterInfo({
if(res['success']){ userId: this.userId
}).then((res) => {
if (res['success']) {
this.cffpUserInfo = res['data']; this.cffpUserInfo = res['data'];
// this.cffpUserInfo.logo = res['logo']; // this.cffpUserInfo.logo = res['logo'];
uni.setStorageSync('fileUploadItemCFFPList',this.cffpUserInfo['fileUploadItemCFFPList']) uni.setStorageSync('fileUploadItemCFFPList', this.cffpUserInfo['fileUploadItemCFFPList'])
const cffp_userInfo = { const cffp_userInfo = {
name:this.cffpUserInfo['userReName'], name: this.cffpUserInfo['userReName'],
mobile:this.cffpUserInfo['mobile'] mobile: this.cffpUserInfo['mobile']
} }
uni.setStorageSync('cffp_userInfo',JSON.stringify(cffp_userInfo)) uni.setStorageSync('cffp_userInfo', JSON.stringify(cffp_userInfo))
}else{ } else {
uni.showToast({ uni.showToast({
title: res['message'], title: res['message'],
duration: 2000, duration: 2000,
...@@ -154,9 +215,13 @@ ...@@ -154,9 +215,13 @@
} }
}) })
}, },
announcementQuery(){ announcementQuery() {
api.announcementQuery({announcementTypeId:37}).then((res)=>{ api.announcementQuery({
this.announcementInfo = res['data']['announcementInfoList'] ? res['data']['announcementInfoList'][0]['title'] : '银盾公告' announcementTypeId: 37
}).then((res) => {
this.announcementInfo = res['data']['announcementInfoList'] ? res['data'][
'announcementInfoList'
][0]['title'] : '银盾公告'
}) })
}, },
getIntroduce(type) { getIntroduce(type) {
...@@ -164,14 +229,14 @@ ...@@ -164,14 +229,14 @@
// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性 // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
this.$refs.popup.open(type) this.$refs.popup.open(type)
}, },
jumpToAnnouncement(){ jumpToAnnouncement() {
uni.navigateTo({ uni.navigateTo({
url:`../announcement/announcement` url: `../announcement/announcement`
}) })
}, },
goToCourselist(){ goToCourselist() {
uni.navigateTo({ uni.navigateTo({
url:'../../pages/courselist/courselist' url: '../../pages/courselist/courselist'
}) })
}, },
onChange: function(e) { onChange: function(e) {
...@@ -188,88 +253,105 @@ ...@@ -188,88 +253,105 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.container{ .container {
padding: 30rpx; padding: 30rpx;
.top{
.compony{ .top {
.compony {
display: flex; display: flex;
align-items:center; align-items: center;
max-height: 90rpx; max-height: 90rpx;
overflow: hidden; overflow: hidden;
.name{
.name {
font-size: 36rpx; font-size: 36rpx;
} }
image{
image {
margin-right: 20rpx; margin-right: 20rpx;
} }
.icon-31tishi{
.icon-31tishi {
font-size: 40rpx; font-size: 40rpx;
} }
} }
.banner{
.banner {
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
} }
} }
.message{
.message {
display: flex; display: flex;
align-items: center; align-items: center;
margin: 20rpx 0; margin: 20rpx 0;
background-color: #fff; background-color: #fff;
padding: 10rpx 0 10rpx 30rpx; padding: 10rpx 0 10rpx 30rpx;
justify-content: space-between; justify-content: space-between;
.icon-gonggao{
.icon-gonggao {
font-size: 60rpx; font-size: 60rpx;
color: #20279b; color: #20279b;
margin-right: 20rpx; margin-right: 20rpx;
} }
.msg{
.msg {
color: red; color: red;
} }
} }
.content { .content {
margin-bottom: 20rpx; margin-bottom: 20rpx;
overflow: hidden; overflow: hidden;
background: #fff; background: #fff;
position: relative; position: relative;
.featureContent{
.featureContent {
padding-top: 10px; padding-top: 10px;
.nav_wrapper{
.nav_wrapper {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
flex-wrap: wrap; flex-wrap: wrap;
width: 100%; width: 100%;
.nav_content{
.nav_content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin-bottom: 20rpx; margin-bottom: 20rpx;
flex:0 0 20%; flex: 0 0 20%;
font-size: 14px; font-size: 14px;
color: #666; color: #666;
margin: 10px 2%; margin: 10px 2%;
image{
image {
max-width: 80%; max-width: 80%;
} }
} }
} }
} }
} }
.course_content{
.course_content {
background: #fff; background: #fff;
position: relative; position: relative;
padding-bottom: 100rpx; padding-bottom: 100rpx;
.tag{
.tag {
padding: 20rpx; padding: 20rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
h4{
h4 {
margin-left: 20rpx; margin-left: 20rpx;
} }
} }
.tag:before{
.tag:before {
position: absolute; position: absolute;
left: 20rpx; left: 20rpx;
top: 20rpx; top: 20rpx;
...@@ -282,8 +364,8 @@ ...@@ -282,8 +364,8 @@
} }
} }
} }
.description{
.description {
padding: 40rpx; padding: 40rpx;
} }
</style> </style>
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