银盾家办1

App.vue

@@ -35,8 +35,6 @@
 								systemType:systemInfo.osName.toLowerCase() === 'ios' ? 2 : 1
 								systemType:systemInfo.osName.toLowerCase() === 'ios' ? 2 : 1
 						    },  
 						    },  
 						    success: (result) => {
 						    success: (result) => {
-								console.log(wgtinfo)
-								console.log(result)
 						        const data = result.data.data['appVersionInfo'];
 						        const data = result.data.data['appVersionInfo'];
 								if (data.status==1 && data.isForceUpdate && data.wgtUrl) {
 								if (data.status==1 && data.isForceUpdate && data.wgtUrl) {
 									    uni.downloadFile({  
 									    uni.downloadFile({  
@@ -46,7 +44,6 @@
 									                plus.runtime.install(downloadResult.tempFilePath, {  
 									                plus.runtime.install(downloadResult.tempFilePath, {  
 									                    force: true  
 									                    force: true  
 									                }, function() {
 									                }, function() {
-									                    console.log('install success...');  
 									                    plus.runtime.restart();
 									                    plus.runtime.restart();
 									                }, function(e) {  
 									                }, function(e) {  
 									                    console.error('install fail...');  
 									                    console.error('install fail...');  

api/api.ts

@@ -382,6 +382,9 @@ export default {
 	//查询证书
 	//查询证书
 	officialWebsiteDetail(params){
 	officialWebsiteDetail(params){
 		return request(`${cffpURL}/certificate/officialWebsiteDetail`, "POST", params)
 		return request(`${cffpURL}/certificate/officialWebsiteDetail`, "POST", params)
+	},
+	//轮播图
+	getBanner(params) {
+		return request(`https://hoservice.ydhomeoffice.cn/hoserviceApi/metadata/getBanner`, 'POST', params)
 	}
 	}
-	
 }
 }

components/bootpage/bootpage.vue

@@ -7,8 +7,7 @@
 				</view>
 				</view>
 				<view class="login-code">
 				<view class="login-code">
 					<input name="form.code" placeholder="输入验证码" v-model="code" type="number" maxlength="6" />
 					<input name="form.code" placeholder="输入验证码" v-model="code" type="number" maxlength="6" />
-					<text @click="sendMessage()" :class="{'grey':disabledSendBtn}">{{sendCode}}</text>
-
+					<text style="width: 250rpx;" @click="sendMessage()" :class="{'grey':disabledSendBtn}">{{sendCode}}</text>
 				</view>
 				</view>
 				<view class="agree">
 				<view class="agree">
 					<label class="radio" style="padding-right: 10rpx;">
 					<label class="radio" style="padding-right: 10rpx;">
@@ -34,6 +33,7 @@
 <script>
 <script>
 	import api from '../../api/api';
 	import api from '../../api/api';
 	import common from '../../common/common';
 	import common from '../../common/common';
+	import {companyInfo} from "@/environments/environment";
 	export default {
 	export default {
 		data() {
 		data() {
 			return {
 			return {
@@ -49,7 +49,6 @@
 		},
 		},
 		mounted() {
 		mounted() {
 			this.loginTypeSync = uni.getStorageSync('loginType');
 			this.loginTypeSync = uni.getStorageSync('loginType');
-			//console.log(this.orderId, 222)
 		},
 		},
 		methods: {
 		methods: {
 			getFile(type){
 			getFile(type){
@@ -106,7 +105,7 @@
 			
 			
 				if(this.agreeFlag == false) {
 				if(this.agreeFlag == false) {
 					uni.showToast({
 					uni.showToast({
-						title: '请阅读并勾选江苏赢盾财务顾问有限公司服务协议和隐私条款',
+						title: '请阅读并勾选'+`${companyInfo.companyFullName}`+'服务协议和隐私条款',
 						duration: 2000,
 						duration: 2000,
 						icon: 'none'
 						icon: 'none'
 					});
 					});
@@ -127,6 +126,7 @@
 						// uni.navigateTo({
 						// uni.navigateTo({
 						// 	url:'/pages/orderConfirm/orderConfirm?userId=' + this.userId
 						// 	url:'/pages/orderConfirm/orderConfirm?userId=' + this.userId
 						// })
 						// })
+						this.loginTypeSync = "codelogin";
 						uni.$emit('loginUpdate');
 						uni.$emit('loginUpdate');
 						this.closebootpage()
 						this.closebootpage()
 					}else{
 					}else{
@@ -140,7 +140,6 @@
 			
 			
 			},
 			},
 			closebootpage() {
 			closebootpage() {
-				//debugger;
 				this.$emit('close', this.userId,this.loginTypeSync)
 				this.$emit('close', this.userId,this.loginTypeSync)
 			},
 			},
 		}
 		}

components/clause/clause.vue

@@ -8,10 +8,10 @@
 				 任的条款将以粗体下划线标识，您应重点阅读。
 				 任的条款将以粗体下划线标识，您应重点阅读。
 			</view>
 			</view>
 			<view class="">
 			<view class="">
-				欢迎注册CFFP财富中心在线会员，请您在注册前阅读本服务协议，登录表示您已经认真阅读并同意"，确认本服务协议内容并自愿遵守本协议。
+				欢迎注册银盾家办在线会员，请您在注册前阅读本服务协议，登录表示您已经认真阅读并同意"，确认本服务协议内容并自愿遵守本协议。
 			</view>
 			</view>
-			<view class="">CFFP财富中心是CFFP家庭财务策划师联盟所运营、持有的专属APP，开发者为江苏赢盾财务顾问有限公司。</view>
-			<view class="">CFFP家庭财务策划师联盟（以下简称CFFP）是AIOFP中国分会，由江苏赢盾财务顾问有限公司负责运营。</view>
+			<view class="">银盾家办是CFFP家庭财务策划师联盟所运营、持有的专属APP，开发者为{{companyFullName}}。</view>
+			<view class="">CFFP家庭财务策划师联盟（以下简称CFFP）是AIOFP中国分会，由{{companyFullName}}负责运营。</view>
 			<h4>一、会员须知</h4>
 			<h4>一、会员须知</h4>
 			
 			
 			<view class="">
 			<view class="">
@@ -107,8 +107,8 @@
 		</view>
 		</view>
 		<view v-if="type == 2" class="content" :style="{'margin-top': isBack!=1 ? '60rpx' : '0'}">
 		<view v-if="type == 2" class="content" :style="{'margin-top': isBack!=1 ? '60rpx' : '0'}">
 			<h4>隐私条款</h4>
 			<h4>隐私条款</h4>
-			<view class="">CFFP财富中心是CFFP家庭财务策划师联盟所运营、持有的专属APP，开发者为江苏赢盾财务顾问有限公司。</view>
-			<view class="">CFFP家庭财务策划师联盟（以下简称CFFP）是AIOFP中国分会，由江苏赢盾财务顾问有限公司负责运营。</view>
+			<view class="">银盾家办是CFFP家庭财务策划师联盟所运营、持有的专属APP，开发者为{{companyFullName}}。</view>
+			<view class="">CFFP家庭财务策划师联盟（以下简称CFFP）是AIOFP中国分会，由{{companyFullName}}负责运营。</view>
 			<view class="">AIOFP（Association of Independently Owned Financial Professionals)是澳洲最大的的独立金融专业人士协会）</view>
 			<view class="">AIOFP（Association of Independently Owned Financial Professionals)是澳洲最大的的独立金融专业人士协会）</view>
 			<view class="">CFFP致力于培养千位优秀的家庭财务策划师，传递正确的家庭财务管理理念，通过专业及精准的规划帮助千家万户达成家庭幸福圆满！</view>
 			<view class="">CFFP致力于培养千位优秀的家庭财务策划师，传递正确的家庭财务管理理念，通过专业及精准的规划帮助千家万户达成家庭幸福圆满！</view>
 			<view class="">本网站由CFFP拥有和运营。</view>
 			<view class="">本网站由CFFP拥有和运营。</view>
@@ -164,9 +164,11 @@
 </template>
 </template>
 
 
 <script>
 <script>
+	import {companyInfo} from "@/environments/environment";
 	export default{
 	export default{
 		data(){
 		data(){
 			return {
 			return {
+				companyFullName : companyInfo.companyFullName,
 				type:null,
 				type:null,
 				isBack:null
 				isBack:null
 			}
 			}

components/clause/clauseIOS.vue

@@ -9,10 +9,10 @@
 				任的条款将以粗体下划线标识，您应重点阅读。
 				任的条款将以粗体下划线标识，您应重点阅读。
 			</view>
 			</view>
 			<view class="">
 			<view class="">
-				欢迎注册CFFP财富中心在线会员，请您在注册前阅读本服务协议，登录表示您已经认真阅读并同意"，确认本服务协议内容并自愿遵守本协议。
+				欢迎注册银盾家办在线会员，请您在注册前阅读本服务协议，登录表示您已经认真阅读并同意"，确认本服务协议内容并自愿遵守本协议。
 			</view>
 			</view>
-			<view class="">CFFP财富中心是CFFP家庭财务策划师联盟所运营、持有的专属APP，开发者为江苏赢盾财务顾问有限公司。</view>
-			<view class="">CFFP家庭财务策划师联盟（以下简称CFFP）是AIOFP中国分会，由江苏赢盾财务顾问有限公司负责运营。</view>
+			<view class="">银盾家办是银盾联合家庭办公室所运营、持有的专属APP，开发者为{{companyFullName}}。</view>
+			<view class="">银盾联合家庭办公室（以下简称银盾家办），由{{companyFullName}}负责运营。</view>
 			<h4>一、会员须知</h4>
 			<h4>一、会员须知</h4>
 
 
 			<view class="">
 			<view class="">
@@ -119,8 +119,8 @@
 		</view>
 		</view>
 		<view v-if="type == 2" class="content" :style="{'margin-top': isBack!=1 ? '60rpx' : '0'}">
 		<view v-if="type == 2" class="content" :style="{'margin-top': isBack!=1 ? '60rpx' : '0'}">
 			<h4>隐私条款</h4>
 			<h4>隐私条款</h4>
-			<view class="">CFFP家庭财务策划师联盟（以下简称CFFP）是AIOFP中国分会，由江苏赢盾财务顾问有限公司负责运营。</view>
-			<view class="">CFFP财富中心是CFFP家庭财务策划师联盟所运营、持有的专属APP，开发者为江苏赢盾财务顾问有限公司。</view>
+			<view class="">银盾联合家庭办公室，由{{companyFullName}}负责运营。</view>
+			<view class="">银盾家办是银盾联合家庭办公室所运营、持有的专属APP，开发者为{{companyFullName}}。</view>
 			<view class="">AIOFP（Association of Independently Owned Financial Professionals)是澳洲最大的的独立金融专业人士协会）</view>
 			<view class="">AIOFP（Association of Independently Owned Financial Professionals)是澳洲最大的的独立金融专业人士协会）</view>
 			<view class="">CFFP致力于培养千位优秀的家庭财务策划师，传递正确的家庭财务管理理念，通过专业及精准的规划帮助千家万户达成家庭幸福圆满！</view>
 			<view class="">CFFP致力于培养千位优秀的家庭财务策划师，传递正确的家庭财务管理理念，通过专业及精准的规划帮助千家万户达成家庭幸福圆满！</view>
 			<view class="">本网站由CFFP拥有和运营。</view>
 			<view class="">本网站由CFFP拥有和运营。</view>
@@ -170,16 +170,18 @@
 			<view class="">(b) 在使用本应用网络服务时，您不可避免的要披露自己的个人信息，如联络方式或者邮政地址时，请您妥善保护自己的个人信息，仅在必要的情形下向他人提供。如您发现自己的个人信息泄密，尤其是本应用用户名及密码发生泄露，请您立即联络本应用客服，以便本应用采取相应措施。</view>
 			<view class="">(b) 在使用本应用网络服务时，您不可避免的要披露自己的个人信息，如联络方式或者邮政地址时，请您妥善保护自己的个人信息，仅在必要的情形下向他人提供。如您发现自己的个人信息泄密，尤其是本应用用户名及密码发生泄露，请您立即联络本应用客服，以便本应用采取相应措施。</view>
 			<view class="">7.本隐私政策的更改</view>
 			<view class="">7.本隐私政策的更改</view>
 			<view class="">(a) 如果决定更改隐私政策，我们会在本政策中、本公司网站中以及我们认为适当的位置发布这些更改，以便您了解我们如何收集、使用您的个人信息，哪些人可以访问这些信息，以及在什么情况下我们会透露这些信息。</view>
 			<view class="">(a) 如果决定更改隐私政策，我们会在本政策中、本公司网站中以及我们认为适当的位置发布这些更改，以便您了解我们如何收集、使用您的个人信息，哪些人可以访问这些信息，以及在什么情况下我们会透露这些信息。</view>
-			<view class="">(b) CFFP保留随时修改本政策的权利，因此请经常查看。如对本政策作出重大更改，本公司会通过网站通知的形式告知。</view>
+			<view class="">(b) 银盾家办保留随时修改本政策的权利，因此请经常查看。如对本政策作出重大更改，本公司会通过网站通知的形式告知。</view>
 		</view>
 		</view>
 	</view>
 	</view>
 
 
 </template>
 </template>
 
 
 <script>
 <script>
+	import {companyInfo} from "@/environments/environment";
 	export default {
 	export default {
 		data() {
 		data() {
 			return {
 			return {
+				companyFullName : companyInfo.companyFullName,
 				type: null,
 				type: null,
 				isBack: null
 				isBack: null
 			}
 			}

components/eSignature/eSignature.vue

@@ -136,14 +136,12 @@
 						canvasId: 'mycanvas',
 						canvasId: 'mycanvas',
 						success: function(res) {
 						success: function(res) {
 							if(!res || !res.tempFilePath) {
 							if(!res || !res.tempFilePath) {
-								// console.log('=====',res.tempFilePath);
 								that.SignatureImg = res.tempFilePath;
 								that.SignatureImg = res.tempFilePath;
 								that.$emit('sendImage', that.SignatureImg);
 								that.$emit('sendImage', that.SignatureImg);
 								that.close();
 								that.close();
 							}else{
 							}else{
 								//用来解决安卓真机获取到的是canvas图片的临时路径，转成base64格式
 								//用来解决安卓真机获取到的是canvas图片的临时路径，转成base64格式
 								pathToBase64(res.tempFilePath).then(re => {
 								pathToBase64(res.tempFilePath).then(re => {
-									// console.log('base===============',re);
 									that.SignatureImg = re;
 									that.SignatureImg = re;
 									that.$emit('sendImage', that.SignatureImg);
 									that.$emit('sendImage', that.SignatureImg);
 									that.close();
 									that.close();

components/listItem/listItem.vue

@@ -58,14 +58,12 @@
 			};
 			};
 		},
 		},
 		mounted() {
 		mounted() {
-			console.log(this.lists)
 		},
 		},
 		onLoad() {
 		onLoad() {
 
 
 		},
 		},
 		methods: {
 		methods: {
 			link(val, value, list) {
 			link(val, value, list) {
-				console.log(val, value, 5141548)
 				let dataList = list.children
 				let dataList = list.children
 				for (var i = 0; i < dataList.length; i++) {
 				for (var i = 0; i < dataList.length; i++) {
 					if (val == dataList[i].name) {
 					if (val == dataList[i].name) {

components/login/login.vue

@@ -5,7 +5,7 @@
 		</view>
 		</view>
 		<view class="logo">
 		<view class="logo">
 			<image :src="imgSrc" alt="logo" srcset="" class="iconBox" mode="widthFix"></image>
 			<image :src="imgSrc" alt="logo" srcset="" class="iconBox" mode="widthFix"></image>
-			<view>欢迎登录使用CFFP财富中心</view>
+			<view>欢迎登录使用银盾家办APP</view>
 		</view>
 		</view>
 		<view class="content">
 		<view class="content">
 			<view class="login_title">
 			<view class="login_title">
@@ -77,7 +77,7 @@
 <script>
 <script>
 	import api from '../../api/api';
 	import api from '../../api/api';
 	import common from '../../common/common';
 	import common from '../../common/common';
-	
+	import {companyInfo} from "@/environments/environment";
 	export default {
 	export default {
 			data() {
 			data() {
 				return {
 				return {
@@ -99,7 +99,8 @@
 					doublePassword:null,
 					doublePassword:null,
 					agreeFlag:false,
 					agreeFlag:false,
 					userId:null,
 					userId:null,
-					imgSrc:'../../static/cffp_logo.png',
+					imgSrc:'../../static/yd_Logo.png',
+					//imgSrc:'../../static/cffp_logo.png',
 					fileType:null
 					fileType:null
 				}
 				}
 			},
 			},
@@ -276,7 +277,7 @@
 						}
 						}
 						if(!this.agreeFlag){
 						if(!this.agreeFlag){
 							uni.showToast({
 							uni.showToast({
-								title: '请阅读并勾选江苏赢盾财务顾问有限公司服务协议和隐私条款',
+								title: '请阅读并勾选'+`${companyInfo.companyFullName}`+'服务协议和隐私条款',
 								duration: 5000,
 								duration: 5000,
 								icon: 'none'					
 								icon: 'none'					
 							})
 							})
@@ -294,7 +295,7 @@
 					}
 					}
 					if(!this.agreeFlag && this.loginType !='resetpw'){
 					if(!this.agreeFlag && this.loginType !='resetpw'){
 						uni.showToast({
 						uni.showToast({
-							title: '请阅读并勾选江苏赢盾财务顾问有限公司服务协议和隐私条款',
+							title: '请阅读并勾选'+`${companyInfo.companyFullName}`+'服务协议和隐私条款',
 							duration: 5000,
 							duration: 5000,
 							icon: 'none'					
 							icon: 'none'					
 						})
 						})

components/myteam/lazy-tree.vue

@@ -83,7 +83,8 @@
 						<text v-if="item.itemType == '2'">{{ item.levelName }}</text>
 						<text v-if="item.itemType == '2'">{{ item.levelName }}</text>
 						<text v-else></text>
 						<text v-else></text>
 					</view>
 					</view>
-					<view class="d-td"  style="text-align: center;">{{ item.count }}</view>
+					<view class="d-td"  style="text-align: center;" v-if="dataShowType == 1">{{ item.referrer }}</view>
+					<view class="d-td"  style="text-align: center;" v-if="dataShowType == 2">{{ item.count }}</view>
 				</view>
 				</view>
 			</block>
 			</block>
 		</view>
 		</view>
@@ -117,6 +118,9 @@
 			},
 			},
 			type: {
 			type: {
 				type: String,
 				type: String,
+			},
+			dataShowType: {
+				dataShowType: String,
 			}
 			}
 		},
 		},
 		name: 'lazy-tree',
 		name: 'lazy-tree',
@@ -206,7 +210,6 @@
 
 
 			},
 			},
 			syncOpen(ids) {
 			syncOpen(ids) {
-				console.log(ids, 15155)
 				const list = [];
 				const list = [];
 				ids.forEach(o => {
 				ids.forEach(o => {
 					this.openList.forEach(o1 => {
 					this.openList.forEach(o1 => {
@@ -248,7 +251,6 @@
 								}
 								}
 							})
 							})
 							// const list = this.deepClone(await this.lazyLoad(item.levelName));
 							// const list = this.deepClone(await this.lazyLoad(item.levelName));
-							// console.log(list, '这里是什么值啊')
 
 
 						}
 						}
 						this.openList.push(item.id);
 						this.openList.push(item.id);

components/myteam/myteam-table.vue

@@ -6,7 +6,7 @@
 			</view>
 			</view>
 		</view>
 		</view>
 		<!-- //  一级循环 -->
 		<!-- //  一级循环 -->
-		<view class="content-sam-box">
+		<view class="content-sam-box" v-if="dataList && dataList.length > 0">
 			<view class="" v-for="(pointItem,index) in dataList">
 			<view class="" v-for="(pointItem,index) in dataList">
 				<view class="content-sa" style=" " v-if="felTyle == 'achievement'">
 				<view class="content-sa" style=" " v-if="felTyle == 'achievement'">
 					<view class="content-box-title"
 					<view class="content-box-title"
@@ -22,10 +22,10 @@
 		    overflow: hidden;
 		    overflow: hidden;
 		    white-space: nowrap;">{{pointItem.name }}</view>
 		    white-space: nowrap;">{{pointItem.name }}</view>
 					</view>
 					</view>
-					<view class="content-box-title" style="text-overflow: ellipsis;overflow: hidden;
+				<!-- 	<view class="content-box-title" style="text-overflow: ellipsis;overflow: hidden;
 		    white-space: nowrap;max-width: 150rpx;">
 		    white-space: nowrap;max-width: 150rpx;">
 						<span>{{pointItem.areaCenterName }}</span>
 						<span>{{pointItem.areaCenterName }}</span>
-					</view>
+					</view> -->
 					<view class="content-box-title">
 					<view class="content-box-title">
 						<span style="color:#FF0000;">
 						<span style="color:#FF0000;">
 						&nbsp; {{pointItem.orderNum }} &nbsp; 
 						&nbsp; {{pointItem.orderNum }} &nbsp; 
@@ -40,6 +40,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
+		<h4 class="noListTip" v-else>暂无数据！</h4>
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -91,13 +92,11 @@
 			};
 			};
 		},
 		},
 		mounted() {
 		mounted() {
-			console.log(this.dataList)
 			// this.alist = this.dataList
 			// this.alist = this.dataList
 			// this.list = JSON.parse(JSON.stringify(this.dataList))
 			// this.list = JSON.parse(JSON.stringify(this.dataList))
 			// this.$nextTick(() => {
 			// this.$nextTick(() => {
 				
 				
 			// })
 			// })
-			// console.log(this.dataList, 555555)
 		},
 		},
 		methods: {
 		methods: {
 			subordinate(index, val, type, expand) {
 			subordinate(index, val, type, expand) {

components/tabBar/tabBar.vue

@@ -40,7 +40,6 @@
 			}	
 			}	
 		},
 		},
 		mounted() {
 		mounted() {
-			console.log(this.currentPage,1114)
 		}
 		}
 	}
 	}
 </script>
 </script>

components/uploadFile/uploadFile.vue

@@ -87,10 +87,10 @@
 		},
 		},
 		onReady() {
 		onReady() {
 			setTimeout(() => {
 			setTimeout(() => {
-				console.log('----演示动态更新参数-----');
+				//console.log('----演示动态更新参数-----');
 				this.$refs.lsjUpload.setData('formData.orderId', '动态设置的参数');
 				this.$refs.lsjUpload.setData('formData.orderId', '动态设置的参数');
 
 
-				console.log('以下注释内容为-动态更新参数更多演示，放开后可查看演示效果');
+				//console.log('以下注释内容为-动态更新参数更多演示，放开后可查看演示效果');
 				// 修改option对象的name属性
 				// 修改option对象的name属性
 				// this.$refs.lsjUpload.setData('name','myFile');
 				// this.$refs.lsjUpload.setData('name','myFile');
 
 
@@ -131,7 +131,7 @@
 			// 某文件上传结束回调(成功失败都回调)
 			// 某文件上传结束回调(成功失败都回调)
 			onuploadEnd(item) {
 			onuploadEnd(item) {
 				uni.hideLoading();
 				uni.hideLoading();
-				console.log(`${item.name}已上传结束，上传状态=${item.type}`);
+				//console.log(`${item.name}已上传结束，上传状态=${item.type}`);
 
 
 				// 更新当前状态变化的文件
 				// 更新当前状态变化的文件
 				// this.files.set(item.name, item);
 				// this.files.set(item.name, item);

components/webview.vue

@@ -11,7 +11,6 @@ export default {
   },
   },
   onLoad(item) {
   onLoad(item) {
     this.url = decodeURIComponent(item.url)
     this.url = decodeURIComponent(item.url)
-    console.log(this.url)
     // 传入需要跳转的链接 使用web-view标签进行跳转
     // 传入需要跳转的链接 使用web-view标签进行跳转
   }
   }
 }
 }

environments/environment.ts

@@ -13,20 +13,20 @@ const prod = {
 	api_url:'https://m.cffp.org.cn/api',
 	api_url:'https://m.cffp.org.cn/api',
 	cffp_url:'https://m.cffp.org.cn/api/cffp'
 	cffp_url:'https://m.cffp.org.cn/api/cffp'
 }
 }
-
+let companyInfo = {
+	// companyType: '1',
+	// companyName: '赢盾财务顾问',
+	// companyFullName: '江苏赢盾财务顾问有限公司'
+	companyType: '2',
+	companyName: '银盾家办',
+	companyFullName: '银盾家办（广州）企业管理咨询有限公司'
+}
 const config = {
 const config = {
 	dev,
 	dev,
 	stage,
 	stage,
 	prod
 	prod
 }
 }
-let env = 'prod';
-// if (process.env.NODE_ENV === 'development') {
-// 	env = 'dev';
-// }else if (process.env.NODE_ENV === 'production') {
-// 	env = 'prod';
-// }else if (process.env.NODE_ENV === 'uat'){
-// 	env = 'stage';
-// }
+let env = 'dev';
 
 
 let baseURL = config[env].base_url;
 let baseURL = config[env].base_url;
 let apiURL = config[env].api_url;
 let apiURL = config[env].api_url;
@@ -35,5 +35,6 @@ let cffpURL = config[env].cffp_url;
 export{
 export{
 	baseURL,
 	baseURL,
 	apiURL,
 	apiURL,
-	cffpURL
+	cffpURL,
+	companyInfo
 }
 }
\ No newline at end of file

hybrid/html/uploadFile.html

@@ -57,7 +57,7 @@
 							_this.option = JSON.parse(option);
 							_this.option = JSON.parse(option);
 						}catch(e){
 						}catch(e){
 							console.error('参数设置错误');
 							console.error('参数设置错误');
-							console.error(e);
+							//console.error(e);
 						}
 						}
 					},
 					},
 					async upload(name=''){
 					async upload(name=''){
@@ -87,7 +87,7 @@
 								this.toast(`不支持上传${suffix.toUpperCase()}格式文件`);
 								this.toast(`不支持上传${suffix.toUpperCase()}格式文件`);
 								return;
 								return;
 							}
 							}
-							console.log('this.size',this.prohibited.size);
+							//console.log('this.size',this.prohibited.size);
 							// 限制文件大小
 							// 限制文件大小
 							if (file.size > 1024 * 1024 * Math.abs(this.prohibited.size)) {
 							if (file.size > 1024 * 1024 * Math.abs(this.prohibited.size)) {
 								this.toast(`附件大小请勿超过${this.prohibited.size}M`)
 								this.toast(`附件大小请勿超过${this.prohibited.size}M`)
@@ -144,7 +144,7 @@
 							);
 							);
 							
 							
 							xmlRequest.ontimeout = () => {
 							xmlRequest.ontimeout = () => {
-								console.error('请求超时')
+								//console.error('请求超时')
 								item.type = 'fail';
 								item.type = 'fail';
 								this.changeFilesItem(item,true);
 								this.changeFilesItem(item,true);
 								return resolve(false);
 								return resolve(false);
@@ -161,7 +161,7 @@
 									} else if (xmlRequest.status == 0) {
 									} else if (xmlRequest.status == 0) {
 										console.error('status = 0 :请检查请求头Content-Type与服务端是否匹配，服务端已正确开启跨域，并且nginx未拦截阻止请求')
 										console.error('status = 0 :请检查请求头Content-Type与服务端是否匹配，服务端已正确开启跨域，并且nginx未拦截阻止请求')
 									}
 									}
-									console.error('--ERROR--：status = ' + xmlRequest.status) 
+									//console.error('--ERROR--：status = ' + xmlRequest.status) 
 									item.type = 'fail';
 									item.type = 'fail';
 									this.changeFilesItem(item,true);
 									this.changeFilesItem(item,true);
 									return resolve(false);
 									return resolve(false);

index.html

@@ -9,9 +9,10 @@
 				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
 				'<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
 				(coverSupport ? ', viewport-fit=cover' : '') + '" />')
 				(coverSupport ? ', viewport-fit=cover' : '') + '" />')
 		</script>
 		</script>
-		<title>CFFP财富中心</title>
+		<title>银盾家办</title>
 		<link rel="stylesheet" href="./static/font/iconfont.css">
 		<link rel="stylesheet" href="./static/font/iconfont.css">
-		<link rel="shortcut icon" href="./static/icon.png">
+		<link rel="shortcut icon" href="./static/iconLong.png">
+		<!-- <link rel="shortcut icon" href="./static/icon.png"> -->
 		<!--preload-links-->
 		<!--preload-links-->
 		<!--app-context-->
 		<!--app-context-->
 		<script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
 		<script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script>

manifest.json

 {
 {
-    "name" : "CFFP财富中心",
+    "name" : "银盾家办",
     "appid" : "__UNI__ED34740",
     "appid" : "__UNI__ED34740",
     "description" : "",
     "description" : "",
     "versionCode" : 105,
     "versionCode" : 105,
@@ -79,7 +79,7 @@
             "sdkConfigs" : {
             "sdkConfigs" : {
                 "share" : {
                 "share" : {
                     "weixin" : {
                     "weixin" : {
-                        "appid" : "wx3ec6ac74a8c074be",
+                        "appid" : "wxe8f4dfed6e50237f",
                         "UniversalLinks" : "https://mapp.cffp.org.cn/app/"
                         "UniversalLinks" : "https://mapp.cffp.org.cn/app/"
                     }
                     }
                 },
                 },
@@ -90,13 +90,13 @@
                     },
                     },
                     "weixin" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
                         "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx3ec6ac74a8c074be",
+                        "appid" : "wxe8f4dfed6e50237f",
                         "UniversalLinks" : "https://mapp.cffp.org.cn/app/"
                         "UniversalLinks" : "https://mapp.cffp.org.cn/app/"
                     }
                     }
                 },
                 },
                 "oauth" : {
                 "oauth" : {
                     "weixin" : {
                     "weixin" : {
-                        "appid" : "wx3ec6ac74a8c074be",
+                        "appid" : "wxe8f4dfed6e50237f",
                         "UniversalLinks" : "https://mapp.cffp.org.cn/app/"
                         "UniversalLinks" : "https://mapp.cffp.org.cn/app/"
                     }
                     }
                 },
                 },

myPackageA/lawManual/lawManual.vue

@@ -1762,7 +1762,6 @@
 		})
 		})
 		// document.querySelector(id).scrollIntoView({ behavior: "smooth" })
 		// document.querySelector(id).scrollIntoView({ behavior: "smooth" })
 	// 	uni.createSelectorQuery().select(id).boundingClientRect(data => { 
 	// 	uni.createSelectorQuery().select(id).boundingClientRect(data => { 
-	// 		console.log(data);
 	// 			// 调用页面滚动的api
 	// 			// 调用页面滚动的api
 	// 			uni.pageScrollTo({
 	// 			uni.pageScrollTo({
 	// 				duration: 300, // 滚动动画过渡时间
 	// 				duration: 300, // 滚动动画过渡时间

pages.json

@@ -4,19 +4,19 @@
 			"path": "pages/index/index",
 			"path": "pages/index/index",
 			"style": {
 			"style": {
 				"topWindow": false,
 				"topWindow": false,
-				"navigationBarTitleText": "CFFP财富中心"
+				"navigationBarTitleText": "银盾家办"
 			}
 			}
 		}, {
 		}, {
 			"path": "components/login/login",
 			"path": "components/login/login",
 			"style": {
 			"style": {
 				"topWindow": false,
 				"topWindow": false,
-				"navigationBarTitleText": "CFFP财富中心"
+				"navigationBarTitleText": "银盾家办"
 			}
 			}
 		}, {
 		}, {
 			"path": "pages/courselist/courselist",
 			"path": "pages/courselist/courselist",
 			"style": {
 			"style": {
 				"topWindow": false,
 				"topWindow": false,
-				"navigationBarTitleText": "CFFP财富中心"
+				"navigationBarTitleText": "银盾家办"
 			}
 			}
 		}, {
 		}, {
 			"path": "pages/courseDetail/courseDetail",
 			"path": "pages/courseDetail/courseDetail",

pages/afterSales/afterSales.vue

@@ -49,7 +49,6 @@
 				}
 				}
 				api.userAfterSales(param).then(res=>{
 				api.userAfterSales(param).then(res=>{
 					if(res['success']){
 					if(res['success']){
-						console.log(res);
 						this.userCourses = res['data']['userCourses']
 						this.userCourses = res['data']['userCourses']
 					}
 					}
 				})
 				})

pages/application-process/application-result.vue

@@ -14,8 +14,8 @@
 			<text class="num actived pass">6</text>
 			<text class="num actived pass">6</text>
 			<text class="line line_pass"></text>
 			<text class="line line_pass"></text>
  			<text class="num actived pass">7</text>
  			<text class="num actived pass">7</text>
-			<text class="line line_pass"></text>
-			<text class="num actived pass">8</text>
+<!--			<text class="line line_pass"></text>
+			<text class="num actived pass">8</text> -->
 		</view>
 		</view>
 		<view class="wrapper">
 		<view class="wrapper">
 			<view class="iconfont icon-gou"></view>
 			<view class="iconfont icon-gou"></view>
@@ -78,7 +78,6 @@
 						id: id,
 						id: id,
 						userId: userId
 						userId: userId
 					}).then((res) => {
 					}).then((res) => {
-						console.log(res)
 						if (res['success']) {
 						if (res['success']) {
 							// this.applyParam = res['data']['data'];
 							// this.applyParam = res['data']['data'];
 							this.approvalStatus = res.data.data.approvalStatus
 							this.approvalStatus = res.data.data.approvalStatus

pages/application-process/bank-card.vue

@@ -9,24 +9,24 @@
 			<text class="line line_pass"></text>
 			<text class="line line_pass"></text>
 			<text class="num actived pass">2</text>
 			<text class="num actived pass">2</text>
 			<text class="line line_pass"></text>
 			<text class="line line_pass"></text>
-			<text class="num actived pass">3</text>
-			<text class="line line_pass"></text>
-			<text class="num actived pass">4</text>
-			<text class="line line_pass"></text>
-			<text class="num actived">5</text>
+			<text class="num actived">3</text>
+			<text class="line"></text>
+			<text class="num">4</text>
+			<text class="line"></text>
+			<text class="num">5</text>
 			<text class="line"></text>
 			<text class="line"></text>
 		 	<text class="num">6</text>
 		 	<text class="num">6</text>
 			<text class="line"></text>
 			<text class="line"></text>
 			<text class="num">7</text>
 			<text class="num">7</text>
-			<text class="line"></text>
-			<text class="num">8</text>
+		<!--	<text class="line"></text>
+			<text class="num">8</text> -->
 		</view>
 		</view>
 		<view class="wrapper">
 		<view class="wrapper">
 			<view class="title">
 			<view class="title">
 				<view>
 				<view>
 					<text class="line"></text>银行卡号
 					<text class="line"></text>银行卡号
 				</view>
 				</view>
-				<text class="page_mark">5/8</text>
+				<text class="page_mark">3/7</text>
 			</view>
 			</view>
 			<view class="content">
 			<view class="content">
 				<view class="contentDetail employ">
 				<view class="contentDetail employ">
@@ -101,7 +101,6 @@
 					id: id,
 					id: id,
 					userId: userId
 					userId: userId
 				}).then((res) => {
 				}).then((res) => {
-					console.log(res)
 					if (res['success']) {
 					if (res['success']) {
 						this.applyParam = res['data']['data'];
 						this.applyParam = res['data']['data'];
 						if (uni.getStorageSync('backForm')) {
 						if (uni.getStorageSync('backForm')) {
@@ -128,6 +127,7 @@
 				uni.showLoading({
 				uni.showLoading({
 					title: '加载中...'
 					title: '加载中...'
 				});
 				});
+				if (this.backForm.approvalStatus == 0 || this.backForm.approvalStatus == 2) {
 					if (this.backForm.bankAccountId == '' || this.sureBankAccountId == '' || this.backForm
 					if (this.backForm.bankAccountId == '' || this.sureBankAccountId == '' || this.backForm
 						.bankAccountOpening == '') {
 						.bankAccountOpening == '') {
 						uni.showToast({
 						uni.showToast({
@@ -137,7 +137,6 @@
 						})
 						})
 						return;
 						return;
 					}
 					}
-				if (this.backForm.approvalStatus == 0 || this.backForm.approvalStatus == 2) {
 					if (this.backForm.bankAccountId || this.sureBankAccountId) {
 					if (this.backForm.bankAccountId || this.sureBankAccountId) {
 						if (Number(this.backForm.bankAccountId) != Number(this.sureBankAccountId)) {
 						if (Number(this.backForm.bankAccountId) != Number(this.sureBankAccountId)) {
 							alert('卡号',this.backForm.bankAccountId)
 							alert('卡号',this.backForm.bankAccountId)
@@ -176,6 +175,10 @@
 					})
 					})
 				} else {
 				} else {
 					uni.hideLoading()
 					uni.hideLoading()
+					// uni.navigateTo({
+					// 	// url:`personal-statement?id=${res['data']['id']}`
+					// 	url: `personal-statement`
+					// });
 					uni.navigateTo({
 					uni.navigateTo({
 						// url:`personal-statement?id=${res['data']['id']}`
 						// url:`personal-statement?id=${res['data']['id']}`
 						url: `personal-statement`
 						url: `personal-statement`

pages/application-process/basic-info.vue

@@ -18,8 +18,8 @@
 			<text class="num">6</text>
 			<text class="num">6</text>
 	 		<text class="line"></text>
 	 		<text class="line"></text>
 			<text class="num">7</text>
 			<text class="num">7</text>
-			<text class="line"></text>
-			<text class="num">8</text>
+	<!--		<text class="line"></text>
+			<text class="num">8</text> -->
 		</view>
 		</view>
 		<view class="wrapper">
 		<view class="wrapper">
 			<view class="title">
 			<view class="title">
@@ -27,7 +27,7 @@
 					<text class="line"></text>
 					<text class="line"></text>
 					基本资料
 					基本资料
 				</view>
 				</view>
-				<text class="page_mark">1/8</text>
+				<text class="page_mark">1/7</text>
 			</view>
 			</view>
 			<view class="content">
 			<view class="content">
 				<view class="contentDetail employ">
 				<view class="contentDetail employ">
@@ -36,7 +36,7 @@
 						<input type="text" class="form-control" placeholder="非必填"
 						<input type="text" class="form-control" placeholder="非必填"
 							v-model="applyParam.inviterInvitationCode" :disabled="this.display" />
 							v-model="applyParam.inviterInvitationCode" :disabled="this.display" />
 					</view>
 					</view>
-					<view class="contentItem">
+					<!-- <view class="contentItem">
 						<text>申请身份</text>
 						<text>申请身份</text>
 						<picker @change="changeIdentity" :value="identityIdx" :range="identityArr" range-key="name"
 						<picker @change="changeIdentity" :value="identityIdx" :range="identityArr" range-key="name"
 							:disabled="this.display">
 							:disabled="this.display">
@@ -51,7 +51,7 @@
 							:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"
 							:disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"
 							v-model="applyParam.b1Name" placeholder="请输入工作室名称" />
 							v-model="applyParam.b1Name" placeholder="请输入工作室名称" />
 					</view>
 					</view>
-					<view class="contentItem">
+					<view class="contentItem" >
 						<text>所属组织</text>
 						<text>所属组织</text>
 						<input type="text" v-if="applyParam.applyType == 1" class="form-control"
 						<input type="text" v-if="applyParam.applyType == 1" class="form-control"
 							v-model="applyParam.areaName" placeholder="请输入工作室名称" :disabled="this.display" />
 							v-model="applyParam.areaName" placeholder="请输入工作室名称" :disabled="this.display" />
@@ -61,7 +61,7 @@
 								<text class="iconfont icon-youjiantou"></text>
 								<text class="iconfont icon-youjiantou"></text>
 							</view>
 							</view>
 						</picker>
 						</picker>
-					</view>
+					</view> -->
 					<view class="contentItem">
 					<view class="contentItem">
 						<text>姓名</text>
 						<text>姓名</text>
 						<!-- @blur="checkInput(1,applyParam.name)" -->
 						<!-- @blur="checkInput(1,applyParam.name)" -->
@@ -134,7 +134,7 @@
 					inviterInvitationCode: '',
 					inviterInvitationCode: '',
 					name: '',
 					name: '',
 					mobileNumber: '',
 					mobileNumber: '',
-					partnerLevel: 'A1',
+					partnerLevel: 'P1',
 					idType: '',
 					idType: '',
 					idNo: '',
 					idNo: '',
 					birthday: '',
 					birthday: '',
@@ -219,7 +219,6 @@
 						resolve(res['success']);
 						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)
 						}
 						}
 					})
 					})
 				})
 				})
@@ -229,9 +228,7 @@
 					userId: this.userId,
 					userId: this.userId,
 					partnerLevel: this.applyParam.partnerLevel
 					partnerLevel: this.applyParam.partnerLevel
 				}
 				}
-				console.log(param)
 				api.queryOrgList(param).then((res) => {
 				api.queryOrgList(param).then((res) => {
-					console.log(res)
 					if (res['success']) {
 					if (res['success']) {
 						this.cffpAreaQuerys = [{
 						this.cffpAreaQuerys = [{
 							areaId: null,
 							areaId: null,
@@ -242,7 +239,6 @@
 						for (let j = 0; j < this.cffpAreaQuerys.length; j++) {
 						for (let j = 0; j < this.cffpAreaQuerys.length; j++) {
 							if (this.applyParam.areaId == this.cffpAreaQuerys[j].areaId) {
 							if (this.applyParam.areaId == this.cffpAreaQuerys[j].areaId) {
 								this.areaIdIdx = j;
 								this.areaIdIdx = j;
-								console.log(j)
 							}
 							}
 						}
 						}
 					}
 					}
@@ -251,14 +247,12 @@
 			changeIdentity: function(e) {
 			changeIdentity: function(e) {
 				this.identityIdx = e.detail.value;
 				this.identityIdx = e.detail.value;
 				this.applyParam.partnerLevel = this.identityArr[this.identityIdx]['partnerLevel'];
 				this.applyParam.partnerLevel = this.identityArr[this.identityIdx]['partnerLevel'];
-				console.log(this.applyParam.partnerLevel)
-				this.queryOrgList();
+				//this.queryOrgList();
 				this.areaIdIdx = 0;
 				this.areaIdIdx = 0;
 			},
 			},
 			changeIdType: function(e) {
 			changeIdType: function(e) {
 				this.idTypeIdx = e.detail.value;
 				this.idTypeIdx = e.detail.value;
 				this.applyParam.idType = this.idTypesList[this.idTypeIdx]['name'];
 				this.applyParam.idType = this.idTypesList[this.idTypeIdx]['name'];
-				console.log(this.applyParam.idType)
 			},
 			},
 			bindBirthday: function(e) {
 			bindBirthday: function(e) {
 				this.applyParam.birthday = e.detail.value;
 				this.applyParam.birthday = e.detail.value;
@@ -266,7 +260,6 @@
 			changeArea: function(e) {
 			changeArea: function(e) {
 				this.areaIdIdx = e.detail.value;
 				this.areaIdIdx = e.detail.value;
 				this.applyParam.areaId = this.cffpAreaQuerys[this.areaIdIdx]['areaId'];
 				this.applyParam.areaId = this.cffpAreaQuerys[this.areaIdIdx]['areaId'];
-				console.log(this.applyParam.areaId)
 			},
 			},
 			checkInput(type, code) {
 			checkInput(type, code) {
 				// if (type == 1) {
 				// if (type == 1) {
@@ -300,7 +293,6 @@
 							return;
 							return;
 						}
 						}
 						this.applyParam.birthday = util.dateFormat(common.IdCodeValid(code).birthDay, 'yyyy-MM-dd');
 						this.applyParam.birthday = util.dateFormat(common.IdCodeValid(code).birthDay, 'yyyy-MM-dd');
-						console.log(this.applyParam)
 					} else {
 					} else {
 						if (code && !common.checkTaxNo(code)) {
 						if (code && !common.checkTaxNo(code)) {
 							uni.showToast({
 							uni.showToast({
@@ -325,16 +317,18 @@
 						if (this.applyParam.inviterInvitationCode) {
 						if (this.applyParam.inviterInvitationCode) {
 							this.Invitationcodetype = true
 							this.Invitationcodetype = true
 						}
 						}
-						this.queryOrgList();
+						//this.queryOrgList();
 
 
 						for (let m = 0; m < this.identityArr.length; m++) {
 						for (let m = 0; m < this.identityArr.length; m++) {
 							if (this.applyParam.partnerLevel == this.identityArr[m].partnerLevel) {
 							if (this.applyParam.partnerLevel == this.identityArr[m].partnerLevel) {
 								this.identityIdx = m;
 								this.identityIdx = m;
+								break;
 							}
 							}
 						}
 						}
 						for (let i = 0; i < this.idTypesList.length; i++) {
 						for (let i = 0; i < this.idTypesList.length; i++) {
 							if (this.idTypesList[i].name == this.applyParam.idType) {
 							if (this.idTypesList[i].name == this.applyParam.idType) {
 								this.idTypeIdx = i;
 								this.idTypeIdx = i;
+								break;
 							}
 							}
 						}
 						}
 						if (this.applyParam.approvalStatus != 0 && this.applyParam.approvalStatus != 2 || this
 						if (this.applyParam.approvalStatus != 0 && this.applyParam.approvalStatus != 2 || this
@@ -342,7 +336,7 @@
 							this.display = true
 							this.display = true
 						}
 						}
 					} else {
 					} else {
-						this.queryOrgList();
+						//this.queryOrgList();
 					}
 					}
 				})
 				})
 			},
 			},
@@ -351,14 +345,14 @@
 					title: '加载中...'
 					title: '加载中...'
 				});
 				});
 				if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
 				if (this.applyParam.approvalStatus == 0 || this.applyParam.approvalStatus == 2) {
-					if (!this.applyParam.areaId) {
-						uni.showToast({
-							title: '请选择所属组织',
-							duration: 2000,
-							icon: 'none'
-						})
-						return;
-					}
+					// if (!this.applyParam.areaId) {
+					// 	uni.showToast({
+					// 		title: '请选择所属组织',
+					// 		duration: 2000,
+					// 		icon: 'none'
+					// 	})
+					// 	return;
+					// }
 					if (!this.applyParam.name) {
 					if (!this.applyParam.name) {
 						uni.showToast({
 						uni.showToast({
 							title: '请输入姓名',
 							title: '请输入姓名',
@@ -427,9 +421,13 @@
 					}
 					}
 					api.saveApplyInfo(this.applyParam).then((res) => {
 					api.saveApplyInfo(this.applyParam).then((res) => {
 						if (res['success']) {
 						if (res['success']) {
+							// uni.navigateTo({
+							// 	// url:`work-experience?id=${res['data']['id']}`
+							// 	url: `work-experience`
+							// });
 							uni.navigateTo({
 							uni.navigateTo({
-								// url:`work-experience?id=${res['data']['id']}`
-								url: `work-experience`
+								// url:`id-card?id=${res['data']['id']}`
+								url: `id-card`
 							});
 							});
 							uni.setStorageSync('applyId', String(res['data']['id']))
 							uni.setStorageSync('applyId', String(res['data']['id']))
 						} else {
 						} else {
@@ -443,9 +441,13 @@
 						uni.hideLoading()
 						uni.hideLoading()
 					})
 					})
 				} else {
 				} else {
+					// uni.navigateTo({
+					// 	// url:`work-experience?id=${res['data']['id']}`
+					// 	url: `work-experience`
+					// });
 						uni.navigateTo({
 						uni.navigateTo({
-						// url:`work-experience?id=${res['data']['id']}`
-						url: `work-experience`
+							// url:`id-card?id=${res['data']['id']}`
+							url: `id-card`
 						});
 						});
 				uni.hideLoading()
 				uni.hideLoading()
 				}
 				}

pages/application-process/contract.vue

@@ -13,20 +13,18 @@
 			<text class="line line_pass"></text>
 			<text class="line line_pass"></text>
 			<text class="num actived pass">4</text>
 			<text class="num actived pass">4</text>
 			<text class="line line_pass"></text>
 			<text class="line line_pass"></text>
-			<text class="num actived pass">5</text>
-			<text class="line line_pass"></text>
-			<text class="num actived pass">6</text>
-			<text class="line line_pass"></text>
-			<text class="num actived">7</text>
+			<text class="num actived">5</text>
+			<text class="line"></text>
+			<text class="num">6</text>
 			<text class="line"></text>
 			<text class="line"></text>
-			<text class="num">8</text>
+			<text class="num">7</text>
 		</view>
 		</view>
 		<view class="wrapper">
 		<view class="wrapper">
 			<view class="title">
 			<view class="title">
 				<view>
 				<view>
 					<text class="line"></text>合同文档确认
 					<text class="line"></text>合同文档确认
 				</view>
 				</view>
-				<text class="page_mark">7/8</text>
+				<text class="page_mark">5/7</text>
 			</view>
 			</view>
 			<view class="content">
 			<view class="content">
 				<view class="ulBox">
 				<view class="ulBox">
@@ -114,10 +112,9 @@
 			},
 			},
 			getContractList() {
 			getContractList() {
 				api.listQuery({
 				api.listQuery({
-					systemType: '1'
+					systemType: '2'
 				}).then((res) => {
 				}).then((res) => {
 					this.contractTermsList = res["data"]["contractDtos"];
 					this.contractTermsList = res["data"]["contractDtos"];
-					console.log(this.contractTermsList)
 				})
 				})
 			},
 			},
 			saveInfo() {
 			saveInfo() {
@@ -216,7 +213,6 @@
 						this.contractForm.approvalStatus = this.applyParam.approvalStatus
 						this.contractForm.approvalStatus = this.applyParam.approvalStatus
 						if (this.contractForm.contractTerms) {
 						if (this.contractForm.contractTerms) {
 							this.contractTermsConfirmsListParm = this.contractForm.contractTerms.split(',');
 							this.contractTermsConfirmsListParm = this.contractForm.contractTerms.split(',');
-							console.log(this.contractTermsConfirmsListParm)
 							for (let i = 0; i < this.contractTermsList.length; i++) {
 							for (let i = 0; i < this.contractTermsList.length; i++) {
 								for (let j = 0; j < this.contractTermsConfirmsListParm.length; j++) {
 								for (let j = 0; j < this.contractTermsConfirmsListParm.length; j++) {
 									if (this.contractTermsList[i]['termName'] == this
 									if (this.contractTermsList[i]['termName'] == this

pages/application-process/education.vue

@@ -139,7 +139,6 @@
 			},
 			},
 			educationLevelQuery() {
 			educationLevelQuery() {
 				api.educationLevelQuery().then((res) => {
 				api.educationLevelQuery().then((res) => {
-					console.log(res)
 					if (res['success']) {
 					if (res['success']) {
 						this.educationLevelList = this.educationLevelList.concat(res['data'][
 						this.educationLevelList = this.educationLevelList.concat(res['data'][
 							'educationLevelList'
 							'educationLevelList'
@@ -157,7 +156,6 @@
 				}).then((res) => {
 				}).then((res) => {
 					if (res['success']) {
 					if (res['success']) {
 						this.applyParam = res['data']['data'];
 						this.applyParam = res['data']['data'];
-						console.log(res, 114)
 						if (uni.getStorageSync('educationForm')) {
 						if (uni.getStorageSync('educationForm')) {
 							this.educationForm = uni.getStorageSync('educationForm')
 							this.educationForm = uni.getStorageSync('educationForm')
 						} else {
 						} else {

pages/application-process/id-card.vue

@@ -7,9 +7,9 @@
 		<view class="page">
 		<view class="page">
 			<text class="num actived pass">1</text>
 			<text class="num actived pass">1</text>
 			<text class="line line_pass"></text>
 			<text class="line line_pass"></text>
-			<text class="num actived pass">2</text>
-			<text class="line line_pass"></text>
-			<text class="num actived">3</text>
+			<text class="num actived">2</text>
+			<text class="line"></text>
+			<text class="num">3</text>
 			<text class="line"></text>
 			<text class="line"></text>
 			<text class="num">4</text>
 			<text class="num">4</text>
 			<text class="line"></text>
 			<text class="line"></text>
@@ -18,15 +18,15 @@
 			<text class="num">6</text>
 			<text class="num">6</text>
 			 <text class="line"></text>
 			 <text class="line"></text>
 			<text class="num">7</text>
 			<text class="num">7</text>
-			<text class="line"></text>
-			<text class="num">8</text>
+		<!--	<text class="line"></text>
+			<text class="num">8</text> -->
 		</view>
 		</view>
 		<view class="wrapper">
 		<view class="wrapper">
 			<view class="title">
 			<view class="title">
 				<view>
 				<view>
 					<text class="line"></text>个人证件资料
 					<text class="line"></text>个人证件资料
 				</view>
 				</view>
-				<text class="page_mark">3/8</text>
+				<text class="page_mark">2/7</text>
 			</view>
 			</view>
 			<view class="content" style="padding-bottom: 150rpx;">
 			<view class="content" style="padding-bottom: 150rpx;">
 				<view class="content_wrapper">
 				<view class="content_wrapper">
@@ -165,7 +165,6 @@
 							this.cardForm.idBackPageOssPath = res.data.filePath;
 							this.cardForm.idBackPageOssPath = res.data.filePath;
 						}
 						}
 						uni.setStorageSync('cardForm',this.cardForm)
 						uni.setStorageSync('cardForm',this.cardForm)
-						console.log(this.cardForm.idBackPageOssPath, 151515)
 					})
 					})
 				}
 				}
 			},
 			},
@@ -201,9 +200,12 @@
 					api.saveApplyInfo(this.applyParam).then((res) => {
 					api.saveApplyInfo(this.applyParam).then((res) => {
 						if (res['success']) {
 						if (res['success']) {
 							// this.queryById(null, uni.getStorageSync('cffp_userId'))
 							// this.queryById(null, uni.getStorageSync('cffp_userId'))
+							// uni.navigateTo({
+							// 	url: `education`
+							// });	
 							uni.navigateTo({
 							uni.navigateTo({
-								// url:`id-card?id=${res['data']['id']}`
-								url: `education`
+								// url:`bank-card?id=${res['data']['id']}`
+								url: `bank-card`
 							});
 							});
 						} else {
 						} else {
 							uni.showToast({
 							uni.showToast({
@@ -217,9 +219,11 @@
 					})
 					})
 				} else {
 				} else {
 					uni.hideLoading()
 					uni.hideLoading()
+					// uni.navigateTo({
+					// 	url: `education`
+					// });
 					uni.navigateTo({
 					uni.navigateTo({
-						// url:`id-card?id=${res['data']['id']}`
-						url: `education`
+						url: `bank-card`
 					});
 					});
 				}
 				}
 			}
 			}

pages/application-process/personal-statement.vue

@@ -11,22 +11,22 @@
 			<text class="line line_pass"></text>
 			<text class="line line_pass"></text>
 			<text class="num actived pass">3</text>
 			<text class="num actived pass">3</text>
 			<text class="line line_pass"></text>
 			<text class="line line_pass"></text>
-			<text class="num actived pass">4</text>
-			<text class="line line_pass"></text>
-			<text class="num actived pass">5</text>
-			<text class="line line_pass"></text>
-			<text class="num actived">6</text>
+			<text class="num actived actived">4</text>
 			<text class="line"></text>
 			<text class="line"></text>
-			<text class="num">7</text>
+			<text class="num">5</text>
 			<text class="line"></text>
 			<text class="line"></text>
-			<text class="num">8</text>
+			<text class="num">6</text>
+			<text class="line"></text>
+			<text class="num">7</text>
+		<!--	<text class="line"></text>
+			<text class="num">8</text> -->
 		</view>
 		</view>
 		<view class="wrapper">
 		<view class="wrapper">
 			<view class="title">
 			<view class="title">
 				<view>
 				<view>
 					<text class="line"></text>个人声明
 					<text class="line"></text>个人声明
 				</view>
 				</view>
-				<text class="page_mark">6/8</text>
+				<text class="page_mark">4/7</text>
 			</view>
 			</view>
 			<view class="content">
 			<view class="content">
 				<view class="ulBox">
 				<view class="ulBox">

pages/application-process/signature.vue

@@ -16,16 +16,16 @@
 			<text class="num actived pass">5</text>
 			<text class="num actived pass">5</text>
 			<text class="line line_pass"></text>
 			<text class="line line_pass"></text>
 			<text class="num actived pass">6</text>
 			<text class="num actived pass">6</text>
-			<text class="line line_pass"></text>
-			<text class="num actived pass">7</text>
-			<text class="line line_pass"></text>
-			<text class="num actived">8</text>
+	 		<text class="line"></text>
+			<text class="num">7</text>
+	<!--		<text class="line line_pass"></text>
+			<text class="num actived">8</text> -->
 		</view>
 		</view>
 		<view class="title">
 		<view class="title">
 		    <view>
 		    <view>
 		      <text class="line"></text>电子签名<text style="font-size: 20rpx;font-weight: normal;">（请书写工整，字迹清晰）</text>
 		      <text class="line"></text>电子签名<text style="font-size: 20rpx;font-weight: normal;">（请书写工整，字迹清晰）</text>
 		    </view>
 		    </view>
-		    <text class="page_mark">8/8</text>
+		    <text class="page_mark">6/7</text>
 		</view>
 		</view>
 		<!--这里必须用v-show否则打回重新签名时会获取不到dom元素-->
 		<!--这里必须用v-show否则打回重新签名时会获取不到dom元素-->
 		<view class="signatureContent" v-show="!applyParam.personalSignOssPath">
 		<view class="signatureContent" v-show="!applyParam.personalSignOssPath">
@@ -36,7 +36,7 @@
 			<image src="../../static/clear.png" @click="clearImg" mode="widthFix"></image>
 			<image src="../../static/clear.png" @click="clearImg" mode="widthFix"></image>
 		</view>
 		</view>
 		<view class="fixed" url="bank-card" @click="save()">
 		<view class="fixed" url="bank-card" @click="save()">
-		   {{(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2)?'我自愿签订推广人合同书':'下一步'}}
+		   {{(this.applyParam.approvalStatus== 0 || this.applyParam.approvalStatus == 2)?'我自愿签订合伙人合同书':'下一步'}}
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
@@ -61,7 +61,6 @@
 	    },
 	    },
 		components:{eSignature},
 		components:{eSignature},
 		onLoad(options) {
 		onLoad(options) {
-			console.log(options, 151515)
 			this.shareId = options.shareId
 			this.shareId = options.shareId
 		},
 		},
 		onShow() {
 		onShow() {
@@ -117,7 +116,6 @@
 			},
 			},
 			getImage(e){
 			getImage(e){
 				api.saveDigitalSignatures({imgStr:e}).then((res)=>{
 				api.saveDigitalSignatures({imgStr:e}).then((res)=>{
-					console.log(res)
 					if(res['success']){
 					if(res['success']){
 						// this.applyParam.personalSignOssPath = e;
 						// this.applyParam.personalSignOssPath = e;
 						this.applyParam.personalSignOssPath = res['data']['filePath'];
 						this.applyParam.personalSignOssPath = res['data']['filePath'];

pages/application-process/work-experience.vue

@@ -208,7 +208,6 @@
 				CommonUpload(this.dataForm).then(res => {
 				CommonUpload(this.dataForm).then(res => {
 					this.workform.certificate = res.data.filePath;
 					this.workform.certificate = res.data.filePath;
 					this.picList.push(this.workform.certificate);
 					this.picList.push(this.workform.certificate);
-					console.log(this.workform, 1111)
 					uni.setStorageSync('picList', this.picList);
 					uni.setStorageSync('picList', this.picList);
 				});
 				});
 			},
 			},

pages/applyDropClass/applyDropClass.vue

@@ -57,7 +57,7 @@
 					<h3>违约金规则</h3>
 					<h3>违约金规则</h3>
 					<i class="iconfont icon-guanbi" @click="closePopup()"></i>
 					<i class="iconfont icon-guanbi" @click="closePopup()"></i>
 				</view>
 				</view>
-				<view class="">
+		<!-- 		<view class="">
 					1.购买后14天内未点开学习全额退费； 
 					1.购买后14天内未点开学习全额退费； 
 				</view>
 				</view>
 				<view class="">
 				<view class="">
@@ -66,6 +66,15 @@
 				</view>
 				</view>
 				<view class="">
 				<view class="">
 					3.已点开课程学习或购买30天后不予退费。
 					3.已点开课程学习或购买30天后不予退费。
+				</view> -->
+				<view class="">
+					1.购买后7天内未使用全额退费；
+				</view>
+				<view class="">
+					2.购买后已使用或购买7天后不予退费；
+				</view>
+				<view class="">
+					&nbsp;
 				</view>
 				</view>
 			</view>
 			</view>
 		</uni-popup>
 		</uni-popup>
@@ -110,7 +119,6 @@
 			// 课程详情页面
 			// 课程详情页面
 			courseDetail(){
 			courseDetail(){
 				api.courseDetail({fileId:this.fileId,userId:this.userId}).then(res=>{
 				api.courseDetail({fileId:this.fileId,userId:this.userId}).then(res=>{
-					console.log('课程详情',res);
 					if(res['success']){
 					if(res['success']){
 						this.courseInfoItem =  res['data']['data'];
 						this.courseInfoItem =  res['data']['data'];
 					}
 					}
@@ -154,7 +162,6 @@
 						refundReason:this.dropReasons[this.dropIndex]['dropOptionName']
 						refundReason:this.dropReasons[this.dropIndex]['dropOptionName']
 					}
 					}
 					api.unifiedRefund(param).then(res=>{
 					api.unifiedRefund(param).then(res=>{
-						console.log(res, 1515)
 						if(res['success']){
 						if(res['success']){
 							uni.navigateTo({
 							uni.navigateTo({
 								url:`/pages/afterSaleDetail/afterSaleDetail?orderNo=${this.dropInfo.orderNo}&afterSalesFlag=3`
 								url:`/pages/afterSaleDetail/afterSaleDetail?orderNo=${this.dropInfo.orderNo}&afterSalesFlag=3`
@@ -177,7 +184,6 @@
 			// 退款原因
 			// 退款原因
 			dropOptionsQuery(){
 			dropOptionsQuery(){
 				api.dropOptionsQuery({code:'REFUND_REASON'}).then(res=>{
 				api.dropOptionsQuery({code:'REFUND_REASON'}).then(res=>{
-					console.log(res)
 					if(res['success']){
 					if(res['success']){
 						this.dropReasons = res['data']['dropMasterInfoList'][0]['dropOptionsInfoList']
 						this.dropReasons = res['data']['dropMasterInfoList'][0]['dropOptionsInfoList']
 					}
 					}

pages/certifyDetail/certifyDetail.vue

@@ -113,7 +113,6 @@
 					userSignupId:userSignupId!='null'?userSignupId:null
 					userSignupId:userSignupId!='null'?userSignupId:null
 				}
 				}
 				api.queryCertificateInfo(params).then(res=>{
 				api.queryCertificateInfo(params).then(res=>{
-					console.log(res)
 					if(res['success']){
 					if(res['success']){
 						this.certificateInfo = res['data']['certificateInfo'];
 						this.certificateInfo = res['data']['certificateInfo'];
 					}
 					}
@@ -128,7 +127,6 @@
 						try {
 						try {
 						    uni.clearStorageSync();
 						    uni.clearStorageSync();
 						} catch (e) {
 						} catch (e) {
-							// console.log(e)
 						    // error
 						    // error
 						}
 						}
 						return false
 						return false

pages/commonDetail/commonDetail.vue

@@ -73,7 +73,6 @@
 			this.queryDate = option.queryDate;
 			this.queryDate = option.queryDate;
 		},
 		},
 		mounted() {
 		mounted() {
-			console.log('mounted')
 			if(this.type=='1'){
 			if(this.type=='1'){
 				this.typeName = '分享';
 				this.typeName = '分享';
 				this.title = [
 				this.title = [

pages/courseDetail/courseDetail.vue

@@ -20,12 +20,27 @@
 		</view>
 		</view>
 		<!-- 课程banner图 -->
 		<!-- 课程banner图 -->
 		<!-- v-show="!sliceshare" -->
 		<!-- v-show="!sliceshare" -->
-		<view class="courseBannerBox" v-if="!sliceshare">
+		<view class="courseBannerBox" v-if="!sliceshare && bannerViewType == '1'">
 			<video v-if="isRenderVideo" id="myVideo" :src="courseInfo.filePathOss" :initial-time="viewTime"
 			<video v-if="isRenderVideo" id="myVideo" :src="courseInfo.filePathOss" :initial-time="viewTime"
 				object-fit="contain" class="videoBox" :poster="courseInfo.fileFirstImage" :title="courseInfo.fileTitle"
 				object-fit="contain" class="videoBox" :poster="courseInfo.fileFirstImage" :title="courseInfo.fileTitle"
 				@play="playVideo" @pause="pause" @timeupdate="timeupdate" style="width: 100vw;height: 312.5rpx;"
 				@play="playVideo" @pause="pause" @timeupdate="timeupdate" style="width: 100vw;height: 312.5rpx;"
 				 ></video>
 				 ></video>
 		</view>
 		</view>
+		<view class="swiperBox" v-if="bannerViewType == '2'">
+			  <uni-swiper-dot
+				:dots-styles="{
+				  backgroundColor: 'rgba(255, 255, 255, 0.5)',
+				  selectedBackgroundColor: 'rgba(255, 255, 255, 1)'
+				}" :info="swiperList" :current="current" mode="default">
+				<swiper autoplay  :interval="3000" circular class="swiper-box" @change="changeSwiper">
+					<swiper-item v-for="(item,index) in swiperList" :key="index" class="swiper-item-no-gap">
+						<view class="swiper-item">
+							<image style="height: 100%;width: 100%;display: block;" :src="item['filePath']" mode="aspectFill"></image>
+						</view>
+					</swiper-item>
+				</swiper>
+			  </uni-swiper-dot>
+		</view>
 
 
 		<!-- 课程详情图 -->
 		<!-- 课程详情图 -->
 		<view class="courseTitleContent">
 		<view class="courseTitleContent">
@@ -48,7 +63,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="dataBox">
 			<view class="dataBox">
-				<strong v-if="courseInfo.status==1 || courseInfo.status==2">￥{{courseInfo.coursePrice}}</strong>
+				<strong v-if="courseInfo.status==1 || courseInfo.status==2">￥{{Number(courseInfo.coursePrice).toFixed(2)}}</strong>
 				<strong v-if="(courseInfo.status==1 || courseInfo.status==2 )&& courseInfo.coursePrice == 0">免费</strong>
 				<strong v-if="(courseInfo.status==1 || courseInfo.status==2 )&& courseInfo.coursePrice == 0">免费</strong>
 				<!-- <text v-if="courseInfo.status==2" style="color: #F15A1F;margin-right: 20rpx;"><i
 				<!-- <text v-if="courseInfo.status==2" style="color: #F15A1F;margin-right: 20rpx;"><i
 						class="iconfont icon-yifukuan"></i>已购</text> -->
 						class="iconfont icon-yifukuan"></i>已购</text> -->
@@ -157,6 +172,9 @@
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
+				bannerViewType: '1',
+				swiperList: [],
+				current : 0,
 				isWeixin: false,
 				isWeixin: false,
 				isRenderVideo: false,
 				isRenderVideo: false,
 				fileId: null,
 				fileId: null,
@@ -220,8 +238,7 @@
 					this.userId = val
 					this.userId = val
 					uni.setStorageSync('cffp_userId', this.userId);
 					uni.setStorageSync('cffp_userId', this.userId);
 					this.courseDetail();
 					this.courseDetail();
-					console.log(loginTypeSync, 222)
-					if(loginTypeSync === "visitor"){
+					if(loginTypeSync == 'codelogin'){
 						setTimeout(() => {
 						setTimeout(() => {
 							if(this.courseInfo.status == 1){
 							if(this.courseInfo.status == 1){
 								this.jumppurchase();
 								this.jumppurchase();
@@ -432,12 +449,6 @@
 				}).then(res => {
 				}).then(res => {
 					if (res['success']) {
 					if (res['success']) {
 						this.lecturerInfo = res['data']['lecturerInfos'][0];
 						this.lecturerInfo = res['data']['lecturerInfos'][0];
-					} else {
-						uni.showToast({
-							title: res['message'],
-							duration: 2000,
-							icon: 'none'
-						})
 					}
 					}
 				})
 				})
 			},
 			},
@@ -450,6 +461,10 @@
 				}).then(res => {
 				}).then(res => {
 					if (res['success']) {
 					if (res['success']) {
 						this.courseInfo = res['data']['data'];
 						this.courseInfo = res['data']['data'];
+						if(this.courseInfo.filePathOss != null && Number(this.courseInfo.filePathOss)){
+							this.bannerViewType = "2";
+							this.getBanner(Number(this.courseInfo.filePathOss));
+						}
 						//this.courseInfo.serviceContent = res['data']['data']['filePathOss'];
 						//this.courseInfo.serviceContent = res['data']['data']['filePathOss'];
 						this.lecturerId = res['data']['data']['fileLecturerId'];
 						this.lecturerId = res['data']['data']['fileLecturerId'];
 						this.lecturerQuery();
 						this.lecturerQuery();
@@ -747,6 +762,19 @@
 						// });
 						// });
 					}
 					}
 				})
 				})
+			},
+			getBanner(itemType) {
+				//加载轮播图
+			  api.getBanner({ fileCategory: 7, itemType: itemType}).then(res => {
+			      if (res['success']) {
+					this.swiperList = res['data']['homeItemList']
+			      }
+			    })
+			},
+			changeSwiper(e) {
+			  if (e.detail.source == 'touch') {
+				this.current = e.detail.current
+			  }
 			}
 			}
 		},
 		},
 		onLoad(option) {
 		onLoad(option) {
@@ -837,6 +865,27 @@
 	page {
 	page {
 		padding: 0;
 		padding: 0;
 	}
 	}
+	.swiperBox {
+		height: 930rpx;
+		image {
+			border-radius: 12rpx;
+		}
+		padding: 0 40rpx;
+		margin-top: 0rpx;
+	}
+	.swiper-box {
+		height: 930rpx;
+	}
+	.swiper-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 930rpx;
+		color: #fff;
+	}
 	  
 	  
 	.courseBannerBox {
 	.courseBannerBox {
 		// background-color: #ebebeb;
 		// background-color: #ebebeb;

pages/courselist/courselist.vue

@@ -58,12 +58,12 @@
 				api.courseList(param).then(res=>{
 				api.courseList(param).then(res=>{
 					if(res['success']){
 					if(res['success']){
 						this.cffpCourseInfos = res['data']['data'];
 						this.cffpCourseInfos = res['data']['data'];
-					}else{
-						uni.showToast({
-							title: res['message'],
-							duration: 2000,
-							icon: 'none'					
-						})
+					// }else{
+					// 	uni.showToast({
+					// 		title: res['message'],
+					// 		duration: 2000,
+					// 		icon: 'none'					
+					// 	})
 					}
 					}
 				})
 				})
 			},
 			},
@@ -75,7 +75,6 @@
 				}
 				}
 			},
 			},
 			getCourseList(res){
 			getCourseList(res){
-                 console.log("res=========",res)
 				 this.queryName = res;
 				 this.queryName = res;
 				 this.courseList()
 				 this.courseList()
             }
             }

pages/downloadApp/downloadApp.vue

@@ -3,7 +3,7 @@
 			<view class="logoContainer">
 			<view class="logoContainer">
 				<image src="/static/downlogo.png" mode="widthFix"></image>
 				<image src="/static/downlogo.png" mode="widthFix"></image>
 			</view>
 			</view>
-			<view class="logoName">CFFP财富中心</view>
+			<view class="logoName">银盾家办APP</view>
 			<view class="downBtn" @click="handleBtnDown">立即下载</view>
 			<view class="downBtn" @click="handleBtnDown">立即下载</view>
 			<view class="qrcodeContainer">
 			<view class="qrcodeContainer">
 				<image :src="'/static/'+ (iosFlag ? 'iosDownLoadQrcode' : 'androidDownLoadQrcode')+'.png'" mode="widthFix"></image>
 				<image :src="'/static/'+ (iosFlag ? 'iosDownLoadQrcode' : 'androidDownLoadQrcode')+'.png'" mode="widthFix"></image>
@@ -46,7 +46,6 @@
 				if (browser.versions.android) {
 				if (browser.versions.android) {
 					window.location.href = "https://mdev.anjibao.cn/app.apk";
 					window.location.href = "https://mdev.anjibao.cn/app.apk";
 				}else if (browser.versions.ios) {
 				}else if (browser.versions.ios) {
-					console.log('ios')
 					window.location.href = "http://itunes.apple.com/us/app/id399608199";
 					window.location.href = "http://itunes.apple.com/us/app/id399608199";
 				} 
 				} 
 			}
 			}

pages/exchangeRecord/exchangeRecord.vue

 <template>
 <template>
 	<view class="container" style="position: relative;">
 	<view class="container" style="position: relative;">
-		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="top:-20rpx;left: 20rpx;"></text>
-		<view class="record_wrapper" v-if="cffpFortuneDeductionList.length > 0">
+		<view class="top" >
+			<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
+			<text>兑换记录</text>
+		</view>
+		<view class="record_wrapper" v-if="cffpFortuneDeductionList?.length > 0">
 			<view class="recordContent" v-for="(item,index) in cffpFortuneDeductionList" :key="index">
 			<view class="recordContent" v-for="(item,index) in cffpFortuneDeductionList" :key="index">
 				<image :src="item.deductionUrl" mode="widthFix"></image>
 				<image :src="item.deductionUrl" mode="widthFix"></image>
 				<view class="detail">
 				<view class="detail">
@@ -9,6 +12,18 @@
 					<view class="">
 					<view class="">
 						{{item.deductionDate}}
 						{{item.deductionDate}}
 					</view>
 					</view>
+					<view style="color: #0A2F99;" v-if="item.reviewStatus == 2 && !item.reviewMessage">
+						兑换失败
+					</view>
+					<view style="color: #0A2F99;" v-if="item.reviewStatus == 2 && item.reviewMessage">
+						兑换失败,原因: {{item.reviewMessage}}
+					</view>
+					<view style="color: #0A2F99;" v-else-if="item.reviewStatus == 1">
+						兑换成功
+					</view>
+					<view style="color: #0A2F99;" v-else>
+						兑换中
+					</view>
 				</view>
 				</view>
 				<view class="score" @click="toWithdralDtl(item)">
 				<view class="score" @click="toWithdralDtl(item)">
 					-{{item.integralExchange}}积分
 					-{{item.integralExchange}}积分
@@ -36,7 +51,6 @@
 		methods:{
 		methods:{
 			findByUserIdForWithdralHis(){
 			findByUserIdForWithdralHis(){
 				api.findByUserIdForWithdralHis({userId:this.userId}).then((res)=>{
 				api.findByUserIdForWithdralHis({userId:this.userId}).then((res)=>{
-					console.log(res)
 					if(res['success']){
 					if(res['success']){
 						this.cffpFortuneDeductionList = res['data']['cffpFortuneDeductionList']
 						this.cffpFortuneDeductionList = res['data']['cffpFortuneDeductionList']
 					}
 					}
@@ -64,8 +78,26 @@
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
+	.container{
+		height:100%;
+		.top{
+			display: flex;
+			height: 80rpx;
+			justify-content: space-between;
+			align-items: center;
+			position: relative;
+			width: 100%;
+			margin: 0 auto;
+			background: #fff;
+			text:nth-child(2){
+				width: 100%;
+				text-align: center;
+				position: absolute;
+			}
+		}
+	}
 	.record_wrapper{
 	.record_wrapper{
-		margin-top: 40rpx;
+		margin-top:0rpx;
 		.recordContent{
 		.recordContent{
 			display: flex;
 			display: flex;
 			margin-bottom: 20rpx;
 			margin-bottom: 20rpx;

pages/index/index.vue

@@ -61,7 +61,7 @@
 			</view>
 			</view>
 		</view>
 		</view>
 		<view class="" style="text-align: center;color: #666666;font-size: 24rpx;margin-top: 20rpx;">
 		<view class="" style="text-align: center;color: #666666;font-size: 24rpx;margin-top: 20rpx;">
-			由江苏赢盾财务顾问有限公司提供
+			由{{companyFullName}}提供
 		</view>
 		</view>
 		<!-- <tabBar :currentPage="currentPage"></tabBar> -->
 		<!-- <tabBar :currentPage="currentPage"></tabBar> -->
 	</view>
 	</view>
@@ -79,9 +79,11 @@
 	import carousel from '@/components/carousel/carousel.vue';
 	import carousel from '@/components/carousel/carousel.vue';
 	import search from '@/components/search/search.vue';
 	import search from '@/components/search/search.vue';
 	import courseItem from "@/components/courseItem/courseItem.vue";
 	import courseItem from "@/components/courseItem/courseItem.vue";
+	import {companyInfo} from "@/environments/environment";
 	export default {
 	export default {
 		data() {
 		data() {
 			return {
 			return {
+				companyFullName : companyInfo.companyFullName,
 				cffpCourseInfos: [],
 				cffpCourseInfos: [],
 				x: 0,
 				x: 0,
 				y: 0,
 				y: 0,
@@ -233,12 +235,6 @@
 				api.courseList(param).then(res => {
 				api.courseList(param).then(res => {
 					if (res['success']) {
 					if (res['success']) {
 						this.cffpCourseInfos = res['data']['data'];
 						this.cffpCourseInfos = res['data']['data'];
-					} else {
-						uni.showToast({
-							title: res['message'],
-							duration: 2000,
-							icon: 'none'
-						})
 					}
 					}
 				})
 				})
 			},
 			},
@@ -255,7 +251,6 @@
 				// #endif
 				// #endif
 			},
 			},
 			featureSelect(featureItem) {
 			featureSelect(featureItem) {
-				console.log(featureItem)
 				if (this.loginornot == false && featureItem.name != "学习认证" && featureItem.name != "更多功能") {
 				if (this.loginornot == false && featureItem.name != "学习认证" && featureItem.name != "更多功能") {
 					uni.showToast({
 					uni.showToast({
 						title: "请登陆个人账户使用该功能",
 						title: "请登陆个人账户使用该功能",
@@ -306,7 +301,8 @@
 			},
 			},
 			queryAreaCenterInfo() {
 			queryAreaCenterInfo() {
 				api.queryAreaCenterInfo({
 				api.queryAreaCenterInfo({
-					userId: uni.getStorageSync('cffp_userId')
+					userId: uni.getStorageSync('cffp_userId'),
+					companyType: `${companyInfo.companyType}`
 				}).then((res) => {
 				}).then((res) => {
 					if (res['success']) {
 					if (res['success']) {
 						this.cffpUserInfo = res['data'];
 						this.cffpUserInfo = res['data'];
@@ -317,12 +313,6 @@
 							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 {
-						uni.showToast({
-							title: res['message'],
-							duration: 2000,
-							icon: 'none'
-						})
 					}
 					}
 				})
 				})
 			},
 			},
@@ -332,7 +322,7 @@
 				}).then((res) => {
 				}).then((res) => {
 					this.announcementInfo = res['data']['announcementInfoList'] ? res['data'][
 					this.announcementInfo = res['data']['announcementInfoList'] ? res['data'][
 						'announcementInfoList'
 						'announcementInfoList'
-					][0]['title'] : '江苏赢盾财务顾问有限公司公告'
+					][0]['title'] : `${companyInfo.companyFullName}`+'公告'
 				})
 				})
 			},
 			},
 			getIntroduce(type) {
 			getIntroduce(type) {

pages/invitationRegister/invitationRegister.vue

@@ -17,10 +17,11 @@
 </template>
 </template>
 <script>
 <script>
 	import api from "@/api/api"
 	import api from "@/api/api"
+	import {companyInfo} from "@/environments/environment";
     export default {
     export default {
         data() {
         data() {
             return {
             return {
-				areaName:'',
+				areaName: companyInfo.companyName,
 				invitationName:'',
 				invitationName:'',
 				shareId:'',
 				shareId:'',
 				levelaName:'',
 				levelaName:'',
@@ -36,25 +37,18 @@
 		methods:{
 		methods:{
 			getqueryById(){
 			getqueryById(){
 				api.queryById({id:this.shareId}).then(res =>{
 				api.queryById({id:this.shareId}).then(res =>{
-					this.areaName = res.data.data.areaName
+					//this.areaName = res.data.data.areaName
 					this.areaId = res.data.data.areaId
 					this.areaId = res.data.data.areaId
 					this.invitationName = res.data.data.invitationName
 					this.invitationName = res.data.data.invitationName
 					this.name = res.data.data.name
 					this.name = res.data.data.name
 					this.mobileNumber = res.data.data.mobileNumber
 					this.mobileNumber = res.data.data.mobileNumber
-					this.levelaName = res.data.data.partnerLevel == 'B1' ?'工作室': '事业伙伴'
+					this.levelaName = res.data.data.partnerLevel == 'B1' ?'工作室': '合伙人'
 					this.partnerLevel = res.data.data.partnerLevel
 					this.partnerLevel = res.data.data.partnerLevel
 				})
 				})
 			},
 			},
 			ckregister(){
 			ckregister(){
-		// '		let dataForm = {
-		// 			name: this.name,
-		// 			mobile: this.mobileNumber,
-		// 			id:this.shareId
-		// 		};'
 				uni.navigateTo({
 				uni.navigateTo({
-					// url:'/pages/invitationRegister/invitationlogin?name=' +  this.name+'&mobile=' +this.mobileNumber + '&id=' + this.shareId
 					url:`/pages/invitationRegister/invitationlogin?name=${this.name}&mobile=${this.mobileNumber}&shareId=${this.shareId}`
 					url:`/pages/invitationRegister/invitationlogin?name=${this.name}&mobile=${this.mobileNumber}&shareId=${this.shareId}`
-					
 				})
 				})
 			}
 			}
 		}
 		}

pages/invitationRegister/invitationlogin.vue

@@ -40,6 +40,7 @@
 <script>
 <script>
 	import api from '../../api/api';
 	import api from '../../api/api';
 	import common from '../../common/common';
 	import common from '../../common/common';
+	import {companyInfo} from "@/environments/environment";
 	export default {
 	export default {
 		data() {
 		data() {
 			return {
 			return {
@@ -107,7 +108,6 @@
 				}, 1000);
 				}, 1000);
 			  },
 			  },
 			nextstep(){
 			nextstep(){
-				console.log(this.form.code, 555)
 				if(this.form.code =='' ||this.form.code == null ){
 				if(this.form.code =='' ||this.form.code == null ){
 					uni.showToast({
 					uni.showToast({
 						title: '请输入验证码',
 						title: '请输入验证码',
@@ -118,7 +118,7 @@
 				}
 				}
 				if(this.agreeFlag == false) {
 				if(this.agreeFlag == false) {
 					uni.showToast({
 					uni.showToast({
-						title: '请阅读并勾选江苏赢盾财务顾问有限公司服务协议和隐私条款',
+						title: '请阅读并勾选'+`${companyInfo.companyFullName}`+'服务协议和隐私条款',
 						duration: 2000,
 						duration: 2000,
 						icon: 'none'
 						icon: 'none'
 					});
 					});

pages/inviteJoin/inviteJoin.vue

@@ -20,7 +20,7 @@
 						<text><input v-model="dataForm.mobileNumber" class="uni-input" type="number" maxlength="11"
 						<text><input v-model="dataForm.mobileNumber" class="uni-input" type="number" maxlength="11"
 								placeholder="手机号" /></text>
 								placeholder="手机号" /></text>
 					</view>
 					</view>
-					<view class="liBox">
+					<!-- <view class="liBox">
 						<text>申请身份：</text>
 						<text>申请身份：</text>
 						<text>
 						<text>
 							<picker @change="bindPickerChange" :value="applyIdentity" :range="identityArr">
 							<picker @change="bindPickerChange" :value="applyIdentity" :range="identityArr">
@@ -52,6 +52,8 @@
 						</view>
 						</view>
 					</view>
 					</view>
 					<view class="describeLabel">晋升机制：当事业伙伴成功邀请加盟人数超过10人时，经过人工审核通过后，即可成功晋升为工作室。</view>
 					<view class="describeLabel">晋升机制：当事业伙伴成功邀请加盟人数超过10人时，经过人工审核通过后，即可成功晋升为工作室。</view>
+					 -->
+					
 					<!-- 			<view class="liBox"  v-if="isCross== true">
 					<!-- 			<view class="liBox"  v-if="isCross== true">
 						<text>所属组织名称：</text>
 						<text>所属组织名称：</text>
 						<text>
 						<text>
@@ -76,7 +78,7 @@
 						<text>手机号：</text>
 						<text>手机号：</text>
 						<text>{{item.mobileNumber}}</text>
 						<text>{{item.mobileNumber}}</text>
 					</view>
 					</view>
-					<view class="liBox">
+					<!-- <view class="liBox">
 						<text>申请身份：</text>
 						<text>申请身份：</text>
 						<text>{{item.partnerLevel == 'A1'? '事业伙伴' : '工作室'}}</text>
 						<text>{{item.partnerLevel == 'A1'? '事业伙伴' : '工作室'}}</text>
 					</view>
 					</view>
@@ -87,7 +89,7 @@
 					<view class="liBox">
 					<view class="liBox">
 						<text>是否跨区邀请：</text>
 						<text>是否跨区邀请：</text>
 						<text>{{item.hasCrossDistrict==1 ? '是' : '否'}}</text>
 						<text>{{item.hasCrossDistrict==1 ? '是' : '否'}}</text>
-					</view>
+					</view> -->
 					<view class="liBox">
 					<view class="liBox">
 						<text>邀请状态：</text>
 						<text>邀请状态：</text>
 						<text v-if="item.approvalStatus=='0'">邀请中</text>
 						<text v-if="item.approvalStatus=='0'">邀请中</text>
@@ -182,8 +184,9 @@
 			};
 			};
 		},
 		},
 		onLoad(option) {
 		onLoad(option) {
-			this.partnerLevel = option.levelCode
-			this.getqueryOrgList()
+			//this.partnerLevel = option.levelCode
+			this.partnerLevel = 'P1'
+			//this.getqueryOrgList()
 			let dataForm = uni.getStorageSync('userinfodataForm')
 			let dataForm = uni.getStorageSync('userinfodataForm')
 			this.realName = dataForm.realName
 			this.realName = dataForm.realName
 			this.invitationCode = dataForm.invitationCode
 			this.invitationCode = dataForm.invitationCode
@@ -253,12 +256,14 @@
 			},
 			},
 			// 发起邀请事件
 			// 发起邀请事件
 			shareToggle() {
 			shareToggle() {
-				this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'B1' : 'A1'
+				//this.dataForm.partnerLevel = this.applyIdentity == 0 ? 'B1' : 'A1'
+				this.dataForm.partnerLevel = 'P1'
 				this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0'
 				this.dataForm.hasCrossDistrict = this.isCross == true ? '1' : '0'
-				this.dataForm.areaId = this.isCross == true ? null : this.queryList[this.index].areaId
 				this.dataForm.userId = this.userId
 				this.dataForm.userId = this.userId
-				this.dataForm.areaName = this.isCross == false ? this.queryList[this.index].areaName : this.dataForm
-					.areaName
+				// this.dataForm.areaId = this.isCross == true ? null : this.queryList[this.index].areaId
+				// this.dataForm.areaName = this.isCross == false ? this.queryList[this.index].areaName : this.dataForm.areaName
+				this.dataForm.areaId = 1;
+				this.dataForm.areaName = '默认';
 				if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName == '') {
 				if (this.dataForm.name == "" || this.dataForm.mobileNumber == "" || this.dataForm.areaName == '') {
 					uni.showToast({
 					uni.showToast({
 						title: '请将信息补充完整',
 						title: '请将信息补充完整',
@@ -282,12 +287,13 @@
 							this.shareTipsFlag = true;
 							this.shareTipsFlag = true;
 							this.getshareData()
 							this.getshareData()
 							// #endif
 							// #endif
-						}
+						}else{
 							uni.showToast({
 							uni.showToast({
 								title: res['message'],
 								title: res['message'],
 								duration: 2000,
 								duration: 2000,
 								icon: 'none'
 								icon: 'none'
 							});
 							});
+						}
 					})
 					})
 				} else {
 				} else {
 					common.errorDialog(2, '手机号校验错误')
 					common.errorDialog(2, '手机号校验错误')
@@ -296,8 +302,8 @@
 			},
 			},
 			getshareData() {
 			getshareData() {
 				let data = {
 				let data = {
-					title: 'CFFP家庭财务策划师联盟邀您加入',
-					desc: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击即刻加入！`,
+					title: '银盾家办家庭财务策划师联盟邀您加入',
+					desc: `我是家庭财务策划师${this.realName}正在使用银盾家办，点击即刻加入！`,
 					link: "https://" + window.location.host +
 					link: "https://" + window.location.host +
 						"/cffp/pages/invitationRegister/invitationRegister?shareId=" +
 						"/cffp/pages/invitationRegister/invitationRegister?shareId=" +
 						this.shareId + '&invitationCode=' + this.invitationCode, //分享链接
 						this.shareId + '&invitationCode=' + this.invitationCode, //分享链接
@@ -322,7 +328,7 @@
 				this.$refs.share.close()
 				this.$refs.share.close()
 			},
 			},
 			reinvite(id) {
 			reinvite(id) {
-				debugger;
+				//debugger;
 				this.shareId = id
 				this.shareId = id
 				// #ifdef APP-PLUS
 				// #ifdef APP-PLUS
 				this.$refs.share.open()
 				this.$refs.share.open()
@@ -333,14 +339,14 @@
 				// #endif
 				// #endif
 			},
 			},
 			uniShare(type) {
 			uniShare(type) {
-				console.log(`${baseURL}/cffp/static/cffp_logo.jpg`)
+				//console.log(`${baseURL}/cffp/static/cffp_logo.jpg`)
 				uni.share({
 				uni.share({
 					provider: "weixin",
 					provider: "weixin",
 					scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
 					scene: type === 1 ? "WXSceneSession" : "WXSceneTimeline",
 					type: 0,
 					type: 0,
 					href: `${baseURL}/cffp/pages/invitationRegister/invitationRegister?shareId=${this.shareId}&invitationCode=${this.invitationCode}`,
 					href: `${baseURL}/cffp/pages/invitationRegister/invitationRegister?shareId=${this.shareId}&invitationCode=${this.invitationCode}`,
-					title: "CFFP家庭财务策划师联盟邀您加入",
-					summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
+					title: "银盾家办家庭财务策划师联盟邀您加入",
+					summary: `我是家庭财务策划师${this.realName}正在使用银盾家办，点击下载即刻加入！`,
 					imageUrl: `${baseURL}/cffp/static/cffp_logo.jpg`,
 					imageUrl: `${baseURL}/cffp/static/cffp_logo.jpg`,
 					success: function(res) {
 					success: function(res) {
 						console.log("success:" + JSON.stringify(res));
 						console.log("success:" + JSON.stringify(res));
@@ -356,8 +362,8 @@
 				// 		type: 0,
 				// 		type: 0,
 				// 		href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
 				// 		href: "https://mdev.zuihuibi.cn/cffp/pages/invitationRegister/invitationRegister?shareId=" +
 				// 			this.shareId,
 				// 			this.shareId,
-				// 		title: "CFFP家庭财务策划师联盟邀您加入",
-				// 		summary: `我是家庭财务策划师${this.realName}正在使用CFFP财富中心，点击下载即刻加入！`,
+				// 		title: "银盾家办家庭财务策划师联盟邀您加入",
+				// 		summary: `我是家庭财务策划师${this.realName}正在使用银盾家办，点击下载即刻加入！`,
 				// 		imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
 				// 		imageUrl: "https://mdev.zuihuibi.cn/cffp/static/cffp_logo.jpg",
 				// 		success: function(res) {
 				// 		success: function(res) {
 				// 			console.log("success:" + JSON.stringify(res));
 				// 			console.log("success:" + JSON.stringify(res));

pages/learnCertify/learnCertify.vue

@@ -121,7 +121,6 @@
 				api.queryCertificateList({
 				api.queryCertificateList({
 					userId: uni.getStorageSync('cffp_userId')
 					userId: uni.getStorageSync('cffp_userId')
 				}).then((res) => {
 				}).then((res) => {
-					console.log(res)
 					if (res['success']) {
 					if (res['success']) {
 						this.certificates = res['data']['certificates'];
 						this.certificates = res['data']['certificates'];
 						this.planFaqs = res['data']['planFaqs'];
 						this.planFaqs = res['data']['planFaqs'];

pages/learningStatistics/learningStatistics.vue

@@ -153,7 +153,6 @@
 			userStudyCount(){
 			userStudyCount(){
 				api.userStudyCount({userId:this.userId}).then(res=>{
 				api.userStudyCount({userId:this.userId}).then(res=>{
 					if(res['success']){
 					if(res['success']){
-						console.log(res, 101115)
 						this.userStudyCountList = res['data'];
 						this.userStudyCountList = res['data'];
 						this.studyInfos = res['data']['studyInfos'];
 						this.studyInfos = res['data']['studyInfos'];
 						let categories=[];
 						let categories=[];
@@ -175,7 +174,6 @@
 				})
 				})
 			},
 			},
 			userCoursePackBar(packFileId,orderId,state){
 			userCoursePackBar(packFileId,orderId,state){
-				console.log(packFileId,orderId,state, 1141)
 				if(!packFileId || !orderId){
 				if(!packFileId || !orderId){
 					return false;
 					return false;
 				}
 				}

pages/myPoints/myPoints.vue

@@ -55,12 +55,15 @@
 				<view>获得积分</view>
 				<view>获得积分</view>
 				<view>操作</view>
 				<view>操作</view>
 			</view>
 			</view>
+			<template v-if="cffpFortuneDeductionList && cffpFortuneDeductionList.length > 0">
 				<view class="point_content_list" v-for="pointItem in cffpFortuneDeductionList" @click="toPointDetail(pointItem)">
 				<view class="point_content_list" v-for="pointItem in cffpFortuneDeductionList" @click="toPointDetail(pointItem)">
 					<view>{{pointItem.productTypeName}}</view>
 					<view>{{pointItem.productTypeName}}</view>
 					<view>{{pointItem.commissionTypeName}}</view>
 					<view>{{pointItem.commissionTypeName}}</view>
 					<view class="get_point">{{pointItem.commissionAmount}}</view>
 					<view class="get_point">{{pointItem.commissionAmount}}</view>
 					<view class="point_detail">{{pointItem.productTypeName!='-'?'查看明细':'-'}}</view>
 					<view class="point_detail">{{pointItem.productTypeName!='-'?'查看明细':'-'}}</view>
 				</view>
 				</view>
+			</template>
+			<h4 class="noListTip" v-else>{{getName(timeFlag)}}暂无积分数据！</h4>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
@@ -125,7 +128,6 @@
 				// 	"timeFlag": "D"
 				// 	"timeFlag": "D"
 				// 	}
 				// 	}
 				api.findByUserIdForFortuneStatistic(param).then((res)=>{
 				api.findByUserIdForFortuneStatistic(param).then((res)=>{
-					console.log(res)
 					if(res['success']){
 					if(res['success']){
 						this.sumCommissionAmount = res['data']['sumCommissionAmount'];		//总积分
 						this.sumCommissionAmount = res['data']['sumCommissionAmount'];		//总积分
 						this.nowSumCommissionAmount	= res['data']['nowSumCommissionAmount']		//当前（日月年）积分
 						this.nowSumCommissionAmount	= res['data']['nowSumCommissionAmount']		//当前（日月年）积分

pages/myPoints/pointsDetail.vue

@@ -105,7 +105,6 @@
 			changeCommissionType: function(e) {
 			changeCommissionType: function(e) {
 				this.commissionTypeIdx = e.detail.value;
 				this.commissionTypeIdx = e.detail.value;
 				this.commissionType = this.commissionTypeList[this.commissionTypeIdx]['dropOptionCode'];
 				this.commissionType = this.commissionTypeList[this.commissionTypeIdx]['dropOptionCode'];
-				console.log(this.commissionType)
 				this.getDetail();
 				this.getDetail();
 			},
 			},
 			changeProductType: function(e) {
 			changeProductType: function(e) {
@@ -133,7 +132,6 @@
 			api.findForExchangeStatisticDtl(param).then((res)=>{
 			api.findForExchangeStatisticDtl(param).then((res)=>{
 				if(res['success']){
 				if(res['success']){
 					this.cffpFortuneDateList = res['data']['cffpFortuneDateList'];
 					this.cffpFortuneDateList = res['data']['cffpFortuneDateList'];
-					console.log(this.cffpFortuneDateList)
 					this.sumCommissionAmount = res['data']['sumCommissionAmount'];
 					this.sumCommissionAmount = res['data']['sumCommissionAmount'];
 				}
 				}
 			});
 			});
@@ -159,7 +157,6 @@
 							break;
 							break;
 						}
 						}
 					}
 					}
-					console.log(this.commissionTypeIdx)
 				})
 				})
 			},
 			},
 			// 查看订单详情
 			// 查看订单详情

pages/myShare/myShare.vue

@@ -38,8 +38,7 @@
 		<!-- 分享明细 -->
 		<!-- 分享明细 -->
 		<view class="shareDetailContent">
 		<view class="shareDetailContent">
 			<h3>分享明细</h3>
 			<h3>分享明细</h3>
-			<h4 class="noListTip" v-if="!userShareCourses">暂无分享记录！</h4>
-			<template v-if="userShareCourses">
+			<template v-if="userShareCourses && userShareCourses.length > 0">
 				<view class="shareOrderInfoItem" v-for="item in userShareCourses" :key="item.fileId">
 				<view class="shareOrderInfoItem" v-for="item in userShareCourses" :key="item.fileId">
 					<view class="timeBox">{{item.shareDate}}</view>
 					<view class="timeBox">{{item.shareDate}}</view>
 					<view class="courseInfoContent">
 					<view class="courseInfoContent">
@@ -67,6 +66,7 @@
 					</view>
 					</view>
 				</view>
 				</view>
 			</template>
 			</template>
+			<h4 class="noListTip" v-else>暂无分享记录！</h4>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
@@ -115,7 +115,6 @@
 					queryDate: this.queryDate
 					queryDate: this.queryDate
 				}
 				}
 				api.userShareCount(params).then(res => {
 				api.userShareCount(params).then(res => {
-					console.log(res)
 					if (res['success']) {
 					if (res['success']) {
 						this.coursesCountInfos = res['data'] ? res['data'] : this.coursesCountInfos;
 						this.coursesCountInfos = res['data'] ? res['data'] : this.coursesCountInfos;
 						Object.keys(this.coursesCountInfos).forEach((item) => {
 						Object.keys(this.coursesCountInfos).forEach((item) => {
@@ -132,7 +131,6 @@
 							integralCount: 0,
 							integralCount: 0,
 							shareSectionCount: 0
 							shareSectionCount: 0
 						};
 						};
-						console.log(this.coursesCountInfos)
 					}
 					}
 				})
 				})
 			},
 			},
@@ -141,9 +139,7 @@
 					userId: this.userId,
 					userId: this.userId,
 					queryDate: this.queryDate
 					queryDate: this.queryDate
 				}
 				}
-				console.log(this.userShareCourses)
 				api.userShareQuery(params).then(res => {
 				api.userShareQuery(params).then(res => {
-					console.log(res)
 					if (res['success']) {
 					if (res['success']) {
 						this.userShareCourses = res['data']['userShareCourses'];
 						this.userShareCourses = res['data']['userShareCourses'];
 					} else {
 					} else {

pages/orderConfirm/orderConfirm.vue

@@ -38,7 +38,6 @@
 				<view class="selectRadio" :class="{'actived':paymentMethod===2}">
 				<view class="selectRadio" :class="{'actived':paymentMethod===2}">
 					<i class="iconfont icon-duihao"></i>
 					<i class="iconfont icon-duihao"></i>
 				</view>
 				</view>
-
 			</view>
 			</view>
 			<view class="paymentItem" @click="selectPaymentMethod(1)" v-if="deviceType==3">
 			<view class="paymentItem" @click="selectPaymentMethod(1)" v-if="deviceType==3">
 				<view>
 				<view>
@@ -50,7 +49,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 			<!-- #ifdef APP-PLUS -->
 			<!-- #ifdef APP-PLUS -->
-			<view class="paymentItem" @click="selectPaymentMethod(1)">
+<!-- 			<view class="paymentItem" @click="selectPaymentMethod(1)">
 				<view>
 				<view>
 					<i class="iconfont icon-py_weixinzhifu"></i>
 					<i class="iconfont icon-py_weixinzhifu"></i>
 					<text>微信支付</text>
 					<text>微信支付</text>
@@ -58,7 +57,7 @@
 				<view class="selectRadio" :class="{'actived':paymentMethod===1}">
 				<view class="selectRadio" :class="{'actived':paymentMethod===1}">
 					<i class="iconfont icon-duihao"></i>
 					<i class="iconfont icon-duihao"></i>
 				</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- #endif -->
 			<!-- #endif -->
 		</view>
 		</view>
 		<!-- 底部 -->
 		<!-- 底部 -->
@@ -168,7 +167,7 @@
 <script>
 <script>
 	import api from "@/api/api";
 	import api from "@/api/api";
 	import courseItem from "@/components/courseItem/courseItem.vue";
 	import courseItem from "@/components/courseItem/courseItem.vue";
-	import {apiURL} from "@/environments/environment";
+	import {apiURL,companyInfo} from "@/environments/environment";
 	import {nextTick} from "vue";
 	import {nextTick} from "vue";
 	import common from '../../common/common';
 	import common from '../../common/common';
 	export default {
 	export default {
@@ -239,14 +238,14 @@
 					integralExchange: this.isDeduction == "true" ? this.deductionCore : 0,
 					integralExchange: this.isDeduction == "true" ? this.deductionCore : 0,
 					paymentType: '',
 					paymentType: '',
 					isPayOrAuth: '',
 					isPayOrAuth: '',
-					fileId: this.fileId
+					fileId: this.fileId,
+					companyType: companyInfo.companyType
 				}
 				}
 				if (this.paymentMethod == 1) {
 				if (this.paymentMethod == 1) {
 					// APP：微信app支付
 					// APP：微信app支付
 					// #ifdef APP-PLUS
 					// #ifdef APP-PLUS
 					param.paymentType = 1;
 					param.paymentType = 1;
 					api.unifiedPay(param).then(res => {
 					api.unifiedPay(param).then(res => {
-						//console.log(res)
 						this.paymentBtnDisabled = false;
 						this.paymentBtnDisabled = false;
 						if (res['success']) {
 						if (res['success']) {
 							const prepayId = res['data']['prepayId'];//统一下单订单号 如果为空，代表0元订单支付成功
 							const prepayId = res['data']['prepayId'];//统一下单订单号 如果为空，代表0元订单支付成功
@@ -400,7 +399,6 @@
 						}
 						}
 						this.payForm = res['data']['aliOrderString'];
 						this.payForm = res['data']['aliOrderString'];
 						this.$nextTick(() => {
 						this.$nextTick(() => {
-							console.log(document.forms)
 							document.forms['punchout_form'].submit();
 							document.forms['punchout_form'].submit();
 						})
 						})
 					} else {
 					} else {
@@ -434,7 +432,6 @@
 					fileId: this.fileId,
 					fileId: this.fileId,
 					userId: this.userId
 					userId: this.userId
 				}).then(res => {
 				}).then(res => {
-					console.log('课程详情', res);
 					if (res['success']) {
 					if (res['success']) {
 						this.courseInfoItem = res['data']['data'];
 						this.courseInfoItem = res['data']['data'];
 					}
 					}

pages/orderDetail/orderDetail.vue

@@ -17,7 +17,8 @@
 				</view>
 				</view>
 			</view>
 			</view>
 			<!-- 退课 -->
 			<!-- 退课 -->
-			<view class="dropClassBox" v-if="Withdrawal=='1' && orderDetail.operationStatus == '1'&& type == 'drop'">
+			<view class="dropClassBox" v-if="Withdrawal=='1' && orderDetail.isRefund == '1'&& type == 'drop'">
+			<!-- <view class="dropClassBox" v-if="Withdrawal=='1' && orderDetail.operationStatus == '1'&& type == 'drop'"> -->
 				<view class="dropBtn" @click="dropClasses()">退课</view>
 				<view class="dropBtn" @click="dropClasses()">退课</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -158,6 +159,7 @@
 					orderId: this.orderId,
 					orderId: this.orderId,
 					queryType: this.type == 'drop' ? '1' : '2',
 					queryType: this.type == 'drop' ? '1' : '2',
 					commissionType: this.commissionType,
 					commissionType: this.commissionType,
+					refundUserId: this.Withdrawal =='1'? uni.getStorageSync('cffp_userId'):null
 				}
 				}
 				api.userCourseInfo(param).then(res => {
 				api.userCourseInfo(param).then(res => {
 					if (res['success']) {
 					if (res['success']) {

pages/personalCenter/accountoperation/aboutcffp.vue

@@ -6,7 +6,7 @@
 				<view class="header-box-img">
 				<view class="header-box-img">
 				</view>
 				</view>
 			<view class="" style="text-align: center;">
 			<view class="" style="text-align: center;">
-				<p style="font-size: 22px;font-weight: 500;">CFFP财富中心</p>
+				<p style="font-size: 22px;font-weight: 500;">银盾家办APP</p>
 				<p style="margin-top: 20rpx;">V1.0</p>
 				<p style="margin-top: 20rpx;">V1.0</p>
 			</view>
 			</view>
 			</view>
 			</view>
@@ -25,17 +25,18 @@
 			<view class="" style="display: align-self: end;">
 			<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>
 				<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">由江苏赢盾财务顾问有限公司提供</p>
+				<p class="footer-text">由{{companyFullName}}提供</p>
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
+	import {companyInfo} from "@/environments/environment";
 	export default {
 	export default {
 		data() {
 		data() {
 			return {
 			return {
-				
+				companyFullName : companyInfo.companyFullName
 			}
 			}
 		},
 		},
 		created() {
 		created() {
@@ -105,7 +106,8 @@
 			width: 124rpx;
 			width: 124rpx;
 			height: 124rpx;
 			height: 124rpx;
 			margin: 90rpx auto  45rpx auto;
 			margin: 90rpx auto  45rpx auto;
-			background: url('../../../static/myteam/Group1633.png');
+			//background: url('../../../static/myteam/Group1633.png');
+			background: url('../../../static/myteam/logo.png');
 			background-size: auto 100%;
 			background-size: auto 100%;
 		}
 		}
 </style>
 </style>
\ No newline at end of file

pages/personalCenter/accountoperation/phonebinding.vue

@@ -12,7 +12,6 @@
 			}
 			}
 		},
 		},
 		onLoad(params) {
 		onLoad(params) {
-			console.log(params,777)
 			// encodeURIComponent 函数可把字符串作为 URI 组件进行编码。decodeURIComponent解码
 			// encodeURIComponent 函数可把字符串作为 URI 组件进行编码。decodeURIComponent解码
 			// 这里的 params.fileUrl 是另一个组件进入到该组件时通过 navigateTo 传进来的pdf文件路径
 			// 这里的 params.fileUrl 是另一个组件进入到该组件时通过 navigateTo 传进来的pdf文件路径
 			let fileUrl = decodeURIComponent(params.fileUrl);
 			let fileUrl = decodeURIComponent(params.fileUrl);

pages/personalCenter/myTeam.vue

@@ -43,7 +43,6 @@
 				});
 				});
 			},
 			},
 			goteam(item) {
 			goteam(item) {
-				console.log(item)
 				if(item.type===1){
 				if(item.type===1){
 					uni.navigateTo({
 					uni.navigateTo({
 						url:`/pages/personalCenter/teamMembers/teamMembers`,
 						url:`/pages/personalCenter/teamMembers/teamMembers`,

pages/personalCenter/personalCenter.vue

@@ -3,7 +3,7 @@
 		<!-- 头部信息 -->
 		<!-- 头部信息 -->
 		<view class="basicInfoBox">
 		<view class="basicInfoBox">
 			<view class="avatar">
 			<view class="avatar">
-				<image :src="customerBasicInfo.headPicture?customerBasicInfo.headPicture:'../../static/myteam/Group1633.png'" alt="" srcset="" ></image>
+				<image :src="customerBasicInfo.headPicture?customerBasicInfo.headPicture:'../../static/myteam/logo.png'" alt="" srcset="" ></image>
 			</view>
 			</view>
 			<view class="infoBox">
 			<view class="infoBox">
 				<view class="firstLineBox">
 				<view class="firstLineBox">
@@ -200,7 +200,6 @@
 				}
 				}
 			},
 			},
 			ckidentity(item){
 			ckidentity(item){
-				console.log(item, 15551)
 				if(item.identity == true && this.customerBasicInfo.partnerType ==null){
 				if(item.identity == true && this.customerBasicInfo.partnerType ==null){
 					uni.showToast({
 					uni.showToast({
 						title: "您本人尚未加盟，您加盟后可邀请加盟",
 						title: "您本人尚未加盟，您加盟后可邀请加盟",
@@ -253,16 +252,15 @@
 			queryInfo(){
 			queryInfo(){
 				api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{
 				api.queryInfo({userId:uni.getStorageSync('cffp_userId')}).then(res=>{
 					if(res['success']){
 					if(res['success']){
-						console.log(res['data'])
 						this.customerBasicInfo = res['data'];
 						this.customerBasicInfo = res['data'];
 						this.inviteEqrode = this.customerBasicInfo.invitationCode;
 						this.inviteEqrode = this.customerBasicInfo.invitationCode;
 						uni.setStorageSync('user_mobile', res.data.mobile)
 						uni.setStorageSync('user_mobile', res.data.mobile)
 						uni.setStorageSync('userinfodataForm', res.data)
 						uni.setStorageSync('userinfodataForm', res.data)
-					}else{
-						uni.showToast({
-							title: res['message'],
-							duration: 2000
-						});
+					// }else{
+					// 	uni.showToast({
+					// 		title: res['message'],
+					// 		duration: 2000
+					// 	});
 					}
 					}
 				})
 				})
 			}
 			}

pages/personalCenter/system/menulist.vue

@@ -36,7 +36,6 @@
 		},
 		},
 		methods: {
 		methods: {
 			goDetail(item) {
 			goDetail(item) {
-				console.log(item, 844)
 				if (item.isShow == true && item.isOpen == true) {
 				if (item.isShow == true && item.isOpen == true) {
 						if (item.isTips == true) {
 						if (item.isTips == true) {
 							uni.showModal({
 							uni.showModal({

pages/personalCenter/system/settings.vue

@@ -39,7 +39,7 @@ import  MenuList from "@/components/menuList/menuList.vue"
 						isTips: true,
 						isTips: true,
 					},
 					},
 					{
 					{
-						title: '关于CFFP财富中心',
+						title: '关于银盾家办APP',
 						icon: 'myCertify',
 						icon: 'myCertify',
 						link: '/pages/personalCenter/accountoperation/aboutcffp',
 						link: '/pages/personalCenter/accountoperation/aboutcffp',
 						isOpen: true,
 						isOpen: true,

pages/personalCenter/teamMembers/jurisdiction.vue

@@ -56,7 +56,6 @@
 		},
 		},
 		mounted() {
 		mounted() {
 			this.dataList = this.raiseList
 			this.dataList = this.raiseList
-			console.log(this.raiseList, 77777)
 		},
 		},
 		methods:{
 		methods:{
 			getList(item,arr){
 			getList(item,arr){

pages/personalCenter/teamMembers/members.vue

@@ -5,7 +5,7 @@
 				<text class="concent-text">{{levelName}}</text>
 				<text class="concent-text">{{levelName}}</text>
 			</view>
 			</view>
 		</view>
 		</view>
-		<view  style="text-align: right;margin: 20px;">
+		<view v-if="dataShowType ==1" style="text-align: right;margin: 20px;">
 			总合计：{{count}}
 			总合计：{{count}}
 		</view>
 		</view>
 
 
@@ -15,16 +15,18 @@
 					<span class="">{{item}}</span>
 					<span class="">{{item}}</span>
 				</view> -->
 				</view> -->
 				<view class="d-td" style="text-align: left;">
 				<view class="d-td" style="text-align: left;">
-					<text>辖下组织/成员</text>
+					<text v-if="dataShowType ==1">成员</text>
+					<text v-if="dataShowType == 2">育成团队</text>
 				</view>
 				</view>
-				<view class="d-td" style="flex: 1;text-align: center;">
+				<view class="d-td" style="text-align: center;">
 					<text>职级</text>
 					<text>职级</text>
 				</view>
 				</view>
-				<view class="d-td" style="flex: 1;text-align: center;">
-					<text>成员数量</text>
+				<view class="d-td"  style="text-align:center;">
+					<text v-if="dataShowType ==1">关系</text>
+					<text v-if="dataShowType == 2">数量</text>
 				</view>
 				</view>
 			</view>
 			</view>
-			<lazy-tree v-if="dataList" :datatitleList="datatitleList" :dataList="dataList" type="2"></lazy-tree>
+			<lazy-tree v-if="dataList" :datatitleList="datatitleList" :dataList="dataList" type="2" :dataShowType="dataShowType"></lazy-tree>
 			<!-- <myteam-table :datatitleList="datatitleList" :dataList="dataList" type="1"></myteam-table> -->
 			<!-- <myteam-table :datatitleList="datatitleList" :dataList="dataList" type="1"></myteam-table> -->
 		</view>
 		</view>
 	</view>
 	</view>
@@ -43,6 +45,9 @@
 			},
 			},
 			count: {
 			count: {
 				type: Number
 				type: Number
+			},
+			dataShowType: {
+				type: String
 			}
 			}
 		},
 		},
 		components:{
 		components:{
@@ -62,7 +67,6 @@
 			// 	parentId: x.parentId? x.parentId : '0'
 			// 	parentId: x.parentId? x.parentId : '0'
 			// }))
 			// }))
 			this.dataList = this.directList
 			this.dataList = this.directList
-			console.log(this.dataList, 74852)
 		}
 		}
 	}
 	}
 </script>
 </script>
@@ -97,19 +101,23 @@
 	.d-box {
 	.d-box {
 		display: flex;
 		display: flex;
 		justify-content: space-between;
 		justify-content: space-between;
-		// padding: 0 20rpx;
 		font-size: 32rpx;
 		font-size: 32rpx;
 		font-weight: 600;
 		font-weight: 600;
+		// .d-header {
+		// 	text-align: center;
+		// 	font-size: 26rpx;
+		// }
 
 
-		.d-header {
-			text-align: center;
-			font-size: 26rpx;
-		}
-
+		// .d-td {
+		// 	align-items: center;
+		// 	padding: 5rpx 10rpx;
+		// }
 		.d-td {
 		.d-td {
+			flex: 1;
 			align-items: center;
 			align-items: center;
 			padding: 5rpx 10rpx;
 			padding: 5rpx 10rpx;
 		}
 		}
+			
 	}
 	}
 .table-content{
 .table-content{
 	margin: 10px 20px;
 	margin: 10px 20px;

pages/personalCenter/teamMembers/otherteam.vue

 <template>
 <template>
 	<view class="content">
 	<view class="content">
+		<view  style="text-align: right;margin: 20rpx 40rpx;">
+			总合计：{{count}}人
+		</view>
 		<view class="content-box">
 		<view class="content-box">
 			<view class="content-box-title" v-for="item in datatitleList">
 			<view class="content-box-title" v-for="item in datatitleList">
 				<text class="title">{{item}}</text>
 				<text class="title">{{item}}</text>
 			</view>
 			</view>
 		</view>
 		</view>
 		<view class="content-sam-box" v-for="pointItem in otherList">
 		<view class="content-sam-box" v-for="pointItem in otherList">
-			<span class="content-box-title">{{pointItem.org}}</span>
-			<span class="content-box-title">{{pointItem.levelName}}</span>
 			<span class="content-box-title">{{pointItem.name}}</span>
 			<span class="content-box-title">{{pointItem.name}}</span>
+			<span class="content-box-title">{{pointItem.levelName}}</span>
+			<span class="content-box-title">{{pointItem.parentName}}</span>
 			<span class="content-box-title">{{pointItem.referrer}}</span>
 			<span class="content-box-title">{{pointItem.referrer}}</span>
 		</view>
 		</view>
 	<!-- 	<view class="">
 	<!-- 	<view class="">
@@ -24,6 +27,9 @@
 			otherList: {
 			otherList: {
 				type: Array,
 				type: Array,
 				default: null
 				default: null
+			},
+			count: {
+				type: Number
 			}
 			}
 		},
 		},
 		// components:{
 		// components:{
@@ -31,7 +37,7 @@
 		// },
 		// },
 		data() {
 		data() {
 			return {
 			return {
-				datatitleList: ['所属组织', '职级', '姓名', '推荐关系'],
+				datatitleList: ['成员', '职级', '上级', '关系'],
 				dataList:[],
 				dataList:[],
 				// dataList: [{
 				// dataList: [{
 				// 		title: '所属组织1',
 				// 		title: '所属组织1',
@@ -61,7 +67,6 @@
 			// 	name: x.name,
 			// 	name: x.name,
 			// 	referrer:x.referrer
 			// 	referrer:x.referrer
 			// }))
 			// }))
-			// console.log(this.otherList, 7778878788)
 		}
 		}
 	}
 	}
 </script>
 </script>

pages/personalCenter/teamMembers/teamMembers.vue

@@ -4,26 +4,27 @@
 		<!-- <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text> -->
 		<!-- <text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text> -->
 		<!-- tab选项 -->
 		<!-- tab选项 -->
 		<view class="tabTitle">
 		<view class="tabTitle">
-			<text :class="{'actived': tabType===1}" @click="switchTab(1)">直辖团队</text>
-			<text :class="{'actived': tabType===2}" @click="switchTab(2)">所辖团队</text>
-			<text :class="{'actived': tabType===3}" @click="switchTab(3)">其他</text>
+			<text :class="{'actived': tabType===3}" @click="switchTab(3)">直辖团队</text>
+			<text :class="{'actived': tabType===1}" @click="switchTab(1)">所辖团队</text>
+			<text :class="{'actived': tabType===2}" @click="switchTab(2)">育成团队</text>
 		</view>
 		</view>
 		<!-- tab内容 -->
 		<!-- tab内容 -->
 		<view class="tabContent">
 		<view class="tabContent">
 			<view v-if="tabType===1">
 			<view v-if="tabType===1">
-				<members v-if="directList" :directList="directList" :levelName = "levelName" :count= "count"></members>
+				<members v-if="directList" :directList="directList" :levelName = "levelName" :count= "count" dataShowType="1"></members>
 				<view v-else class="zdata" >
 				<view v-else class="zdata" >
 					<text>暂无数据!</text>
 					<text>暂无数据!</text>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view v-if="tabType===2">
 			<view v-if="tabType===2">
-				<jurisdiction v-if="raiseList" :raiseList="raiseList"></jurisdiction>
+				<!-- <jurisdiction v-if="raiseList" :raiseList="raiseList"></jurisdiction> -->
+				<members v-if="raiseList" :directList="raiseList" :levelName = "levelName" :count= "countRaise" dataShowType="2"></members>
 				<view v-else class="zdata" style="">
 				<view v-else class="zdata" style="">
 					<text>暂无数据!</text>
 					<text>暂无数据!</text>
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="other" v-if="tabType===3">
 			<view class="other" v-if="tabType===3">
-				<other-team v-if="otherList" :otherList="otherList"></other-team>
+				<other-team v-if="otherList" :otherList="otherList" :count="countOther"></other-team>
 				<view v-else class="zdata" style="">
 				<view v-else class="zdata" style="">
 					<text>暂无数据!</text>
 					<text>暂无数据!</text>
 				</view>
 				</view>
@@ -45,10 +46,12 @@
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
-				tabType: 1,
+				tabType: 3,
 				userStudyLists: [],
 				userStudyLists: [],
 				userId: uni.getStorageSync('cffp_userId'),
 				userId: uni.getStorageSync('cffp_userId'),
+				countOther:0,
 				count:0,
 				count:0,
+				countRaise:0,
 				directList: null, //直属团队数组
 				directList: null, //直属团队数组
 				raiseList: null,  //所辖团队数组
 				raiseList: null,  //所辖团队数组
 				otherList: null, // 其他
 				otherList: null, // 其他
@@ -59,7 +62,7 @@
 
 
 		},
 		},
 		mounted() {
 		mounted() {
-			this.switchTab(1)
+			this.switchTab(3)
 			this.getmyseatem()
 			this.getmyseatem()
 		},
 		},
 		methods:{
 		methods:{
@@ -70,31 +73,34 @@
 			},
 			},
 			getmyseatem() {
 			getmyseatem() {
 				api.queryMyTeamInfo({
 				api.queryMyTeamInfo({
-					userId: this.userId
+					userId: this.userId,
+					type: '2'
 				}).then(res =>{
 				}).then(res =>{
 					if(res['success']){
 					if(res['success']){
-						console.log(res, 11215)
 						let data = res.data
 						let data = res.data
 						if(data.orgInfo) {
 						if(data.orgInfo) {
-							this.levelName =data.orgInfo.areaCenterName;
-							this.count = data.orgInfo.count;
+							//this.levelName =data.orgInfo.areaCenterName;
+							this.levelName = data.orgInfo.name;
 						}
 						}
-						if(data.directList.length != 0 && data.directList != null){
+						if(data.directList && data.directList.length != 0 && data.directList != null){
 							this.directList = data['directList'];
 							this.directList = data['directList'];
+							this.count = this.directList.length;
 							this.directList.forEach((x)=>{
 							this.directList.forEach((x)=>{
 								this.$set(x, 'hasChildren' , true)
 								this.$set(x, 'hasChildren' , true)
 								this.$set(x, 'children' , [])
 								this.$set(x, 'children' , [])
 							})
 							})
 						}
 						}
-						if(data.raiseList.length != 0 && data.raiseList != null) {
+						if(data.raiseList && data.raiseList.length != 0 && data.raiseList != null) {
 							this.raiseList = data['raiseList'];
 							this.raiseList = data['raiseList'];
+							this.countRaise = this.raiseList.length;
 							this.raiseList.forEach((x)=>{
 							this.raiseList.forEach((x)=>{
 								this.$set(x, 'hasChildren', true)
 								this.$set(x, 'hasChildren', true)
 								this.$set(x, 'children' , [])
 								this.$set(x, 'children' , [])
 							})
 							})
 						}
 						}
-						if(data.other.length != 0 && data.other != null){
+						if(data.other && data.other.length != 0 && data.other != null){
 							this.otherList = data['other'];
 							this.otherList = data['other'];
+							this.countOther = this.otherList.length;
 						}
 						}
 					}
 					}
 				})
 				})
@@ -106,7 +112,6 @@
 			// 		if (res['success']) {
 			// 		if (res['success']) {
 			// 			this.userStudyLists = res['data']['userStudyTimeInfos'];
 			// 			this.userStudyLists = res['data']['userStudyTimeInfos'];
 			// 		}
 			// 		}
-			// 		console.log(res)
 			// 	})
 			// 	})
 			// },
 			// },
 			switchTab(type) {
 			switchTab(type) {

pages/personalCenter/teamPerformance/teamPerformance.vue

@@ -68,6 +68,7 @@
 		<view  v-if="listType == true">
 		<view  v-if="listType == true">
 			<myteam-table  :datatitleList="datatitleList" :dataList="dataList" felTyle="achievement"></myteam-table>
 			<myteam-table  :datatitleList="datatitleList" :dataList="dataList" felTyle="achievement"></myteam-table>
 		</view>
 		</view>
+		<h4 class="noListTip" v-else>暂无数据！</h4>
 	</view>
 	</view>
 </template>
 </template>
 
 
@@ -82,8 +83,10 @@
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
-				datatitleList: ['姓名', '所属组织', '单数', '销售额', '销售收入'],
-				teamList: ['直辖团队', '所辖团队', '其他'],
+				//datatitleList: ['姓名', '所属组织', '单数', '销售额', '销售收入'],
+				//teamList: ['直辖团队', '所辖团队', '其他'],
+				datatitleList: ['姓名', '单数', '销售额', '销售收入'],
+				teamList: ['直辖团队', '所辖团队', '育成团队'],
 				teamtype: 0,
 				teamtype: 0,
 				montdindex: 0,
 				montdindex: 0,
 				array: ['一季度', '二季度', '三季度', '四季度'],
 				array: ['一季度', '二季度', '三季度', '四季度'],
@@ -116,7 +119,8 @@
 					startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
 					startDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
 					endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
 					endDate: `${new Date().getFullYear()}-${new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0'+ (new Date().getMonth() + 1)}`,
 					queryType: '',
 					queryType: '',
-					courseOrPolicy: '1'
+					courseOrPolicy: '1',
+					type: '2'
 				},
 				},
 				dataList: []
 				dataList: []
 			}
 			}
@@ -165,7 +169,6 @@
 					if (res['success']) {
 					if (res['success']) {
 						this.listType = true
 						this.listType = true
 						this.dataList = res.data.list || [];
 						this.dataList = res.data.list || [];
-						console.log(this.dataList)
 						this.totalOrder = res.data.totalOrder ? res.data.totalOrder : '0';
 						this.totalOrder = res.data.totalOrder ? res.data.totalOrder : '0';
 						this.totalCoursePrice = res.data.totalCoursePrice ? res.data.totalCoursePrice : '0';
 						this.totalCoursePrice = res.data.totalCoursePrice ? res.data.totalCoursePrice : '0';
 						this.totalIncome = res.data.totalIncome ? res.data.totalIncome : '0';
 						this.totalIncome = res.data.totalIncome ? res.data.totalIncome : '0';
@@ -194,7 +197,6 @@
 			},
 			},
 			// 这个是时间组件返回的时间值
 			// 这个是时间组件返回的时间值
 			change(time) {
 			change(time) {
-				console.log(time, 88)
 				this.CffpOrgInfoReqVO.startDate = time
 				this.CffpOrgInfoReqVO.startDate = time
 				this.getqueryTeamAchievement()
 				this.getqueryTeamAchievement()
 			},
 			},

pages/personalCenter/user-information.vue

@@ -3,8 +3,8 @@
 		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 		<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()" style="left: 20rpx;"></text>
 		<view class="header">
 		<view class="header">
 			<view class="headportrait" @click="uploadAvatar()">
 			<view class="headportrait" @click="uploadAvatar()">
-				<image :src="optionForm.headPicture ? optionForm.headPicture  :'../../static/myteam/Group1633.png'"
-					mode=""></image>
+				<!-- <image :src="optionForm.headPicture ? optionForm.headPicture  :'../../static/myteam/Group1633.png'" mode=""></image> -->
+				<image :src="optionForm.headPicture ? optionForm.headPicture  :'../../static/myteam/logo.png'" mode=""></image>
 			</view>
 			</view>
 		</view>
 		</view>
 <!-- 		<view class="linechart">
 <!-- 		<view class="linechart">
@@ -98,14 +98,28 @@
 			},
 			},
 			// 修改个人资料接口
 			// 修改个人资料接口
 			submitinfo() {
 			submitinfo() {
-				if (!common.nameValid(this.optionForm.realName)) {
-					uni.showToast({
-						title: '请输入真实的姓名!',
-						duration: 2000,
-						icon: 'none'
-					})
+				if(!this.optionForm.realName || this.optionForm.realName.length <= 0){
+					uni.showToast({title: '请填写真实姓名',duration: 2000,icon: 'none'});
+					return;
+				}else if (!common.nameValid(this.optionForm.realName)) {
+					let that = this;
+					uni.showModal({
+					  content: '真实姓名不合规，是否继续保存',
+					  confirmText: '保存',
+					  cancelText: '取消',
+					  success: function (res) {
+							if (res.confirm) {
+								that.saveUserInfo();
+							}else{
 								return;
 								return;
 							}
 							}
+						}
+					});
+				}else{
+					this.saveUserInfo();
+				}
+			},
+			saveUserInfo(){
 				let UserRequestVO = {
 				let UserRequestVO = {
 					id: uni.getStorageSync('cffp_userId'),
 					id: uni.getStorageSync('cffp_userId'),
 					realName: this.optionForm.realName,
 					realName: this.optionForm.realName,
@@ -115,20 +129,11 @@
 				}
 				}
 				api.updateinfo(UserRequestVO).then(res => {
 				api.updateinfo(UserRequestVO).then(res => {
 					if (res.success) {
 					if (res.success) {
-						uni.showToast({
-							title: res['message'],
-							duration: 2000,
-							icon: 'none'
-						});
-						uni.$emit("handClick", {
-							data: this.optionForm
-						});
+						uni.showToast({title: '修改成功',duration: 2000,icon: 'none'});
+						uni.$emit("handClick", {data: this.optionForm});
 						setTimeout(() => {
 						setTimeout(() => {
-							uni.navigateBack({
-								delta: 1
-							})
+							uni.navigateBack({delta: 1});
 						}, 1000)
 						}, 1000)
-
 					}
 					}
 				})
 				})
 			},
 			},

pages/pointsExchange/pointsExchange.vue

@@ -75,7 +75,6 @@
 			},
 			},
 			queryByUserIdFortuneStatistic(){
 			queryByUserIdFortuneStatistic(){
 				api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
 				api.queryByUserIdFortuneStatistic({userId:uni.getStorageSync('cffp_userId')}).then((res)=>{
-					console.log(res, 55454)
 					if(res['success']){
 					if(res['success']){
 						this.yesExchangeFortune = res['data']['yesExchangeFortune'];
 						this.yesExchangeFortune = res['data']['yesExchangeFortune'];
 						this.notExchangeFortune = res['data']['notExchangeFortune'];
 						this.notExchangeFortune = res['data']['notExchangeFortune'];

pages/receiptCycleDesc/receiptCycleDesc.vue

 <template>
 <template>
 	<view class="container">
 	<view class="container">
-		<view class="">根据交易方式不同，退款处理时间不同，请在对应的时间内注意查看到账情况：</view>
+		<view class="top">
+			<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
+			<text>到账说明</text>
+		</view>
+		<view class="returnDetailContainer">
+			<h4>根据交易方式不同，退款处理时间不同，请在对应的时间内注意查看到账情况：</h4>
+			<view class="returnInfoContent">
+				<view>
+					<h4>微信</h4>
+				</view>				
 				<view class="">
 				<view class="">
-			微信
+					1、零钱支付的用户，资金是实时到账，退款到微信->钱包；
+				</view>	
+				<view class="">
+					2、储蓄卡支付的将在1-5个工作日内退款到储蓄卡；
+				</view>
+				<view class="">
+					3、信用卡支付的将在2-5个工作日内退款到信用卡（最长15工作日）。
+				</view>
+			</view>
+			<view class="returnInfoContent">
+				<view>
+					<h4></h4>
+				</view>	
+				<view>
+					<h4>支付宝</h4>
 				</view>
 				</view>
 				<view class="">
 				<view class="">
-			1.零钱支付的用户，资金是实时到账，退款到微信->钱包； 2.储蓄卡支付的将在1-5个工作日内退款到储蓄卡； 3.信用卡支付的将在2-5个工作日内退款到信用卡（最长15工作日）。
+					1、退回支付宝余额：资金是实时到账，请在支付宝中的【账户收支明细】查看；
 				</view>
 				</view>
 				<view class="">
 				<view class="">
-			支付宝
+					2、退回到银行卡：一般3-7天入账，请在支付宝中的【进度中心】查看进度；
 				</view>
 				</view>
 				<view class="">
 				<view class="">
-			1.退回支付宝余额：资金是实时到账，请在支付宝中的【账户收支明细】查看； 2.退回到银行卡：一般3-7天入账，请在支付宝中的【进度中心】查看进度； 3.退回余额宝：资金实时入账，请在支付宝中的【余额宝明细】查询。
+					3、退回余额宝：资金实时入账，请在支付宝中的【余额宝明细】查询。
+				</view>
+			</view>
 		</view>
 		</view>
 	</view>
 	</view>
 </template>
 </template>
@@ -22,19 +47,44 @@
 			return {
 			return {
 				
 				
 			};
 			};
+		},
+		methods:{
+			goBack(){
+				uni.navigateBack({  
+					delta: 1  
+				})
+			}
 		}
 		}
 	}
 	}
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
 	.container{
 	.container{
-		height: 100%;
-		padding: 20rpx 40rpx;
+		height:100%;
+		.top{
+			display: flex;
+			height: 80rpx;
+			justify-content: space-between;
+			align-items: center;
+			position: relative;
+			width: 100%;
+			margin: 0 auto;
+			background: #fff;
+			text:nth-child(2){
+				width: 100%;
+				text-align: center;
+				position: absolute;
+			}
+		}
+		.returnDetailContainer{
 			background-color: #fff;
 			background-color: #fff;
-		view{
-			margin-bottom: 10rpx;
+			padding: 20rpx 40rpx;
+			margin: 10rpx auto;
+			h4{
+				font-size: 32rpx;
 				color: #333;
 				color: #333;
-			font-size: 28rpx;
+				margin-bottom: 20rpx;
+			}
 		}
 		}
 	}
 	}
 </style>
 </style>

pages/saleCourseLists/saleCourseLists.vue

@@ -143,7 +143,6 @@
 				}
 				}
 				if(this.tabType===1){
 				if(this.tabType===1){
 					api.userCourseList(params).then(res=>{
 					api.userCourseList(params).then(res=>{
-						console.log(res)
 						if(res['success']){
 						if(res['success']){
 							this.userCourses = res['data']['userCourses'];
 							this.userCourses = res['data']['userCourses'];
 							this.userCourseCountNum = res['data']['userCourseCount'];
 							this.userCourseCountNum = res['data']['userCourseCount'];
@@ -179,7 +178,6 @@
 		},
 		},
 		onShow() {
 		onShow() {
 			let app22 = getCurrentPages().length
 			let app22 = getCurrentPages().length
-			console.log(app22)
 		}
 		}
 	}
 	}
 </script>
 </script>

pages/systemMsg/system_msg.vue

@@ -11,7 +11,7 @@
 				<text>清除未读</text>	
 				<text>清除未读</text>	
 			</view>
 			</view>
 		</view>
 		</view>
-		<view class="content" v-if="system_msgs_list">
+		<view class="content" v-if="system_msgs_list && system_msgs_list.length > 0">
 			<view class="announcement_wrapper" v-for="(item,index) in system_msgs_list" :key="index"
 			<view class="announcement_wrapper" v-for="(item,index) in system_msgs_list" :key="index"
 			@click="goToDetail(item.id)">
 			@click="goToDetail(item.id)">
 				<text class="iconfont icon-zizhutuiguang"></text>
 				<text class="iconfont icon-zizhutuiguang"></text>
@@ -28,7 +28,7 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<view class="content" v-if="!system_msgs_list">
+		<view class="content" v-else>
 			<view style="text-align: center;">暂无消息</view>
 			<view style="text-align: center;">暂无消息</view>
 		</view>
 		</view>
 	</view>
 	</view>
@@ -70,7 +70,6 @@
 				})
 				})
 			},
 			},
 			oneKeyRead(){
 			oneKeyRead(){
-				console.log(this.system_msgs_list, 46)
 				if( this.system_msgs_list.length == 0){
 				if( this.system_msgs_list.length == 0){
 					uni.showToast({
 					uni.showToast({
 						title: '暂无可清除未读消息',
 						title: '暂无可清除未读消息',
@@ -98,7 +97,6 @@
 			}
 			}
 		}
 		}
 	}
 	}
-	
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">

pages/systemMsg/system_msg_detail.vue

@@ -41,7 +41,6 @@
 				api.querySystemMessageDetail({systemMessageId:this.id}).then((res)=>{
 				api.querySystemMessageDetail({systemMessageId:this.id}).then((res)=>{
 					if(res['success']){
 					if(res['success']){
 						this.systemMsgInfo = res['data']['systemMessageInfo']
 						this.systemMsgInfo = res['data']['systemMessageInfo']
-						console.log(this.systemMsgInfo)
 					}
 					}
 				})
 				})
 			},
 			},

pages/taxRules/taxRules.vue

@@ -3,7 +3,7 @@
 		<view class="content_wrapper">
 		<view class="content_wrapper">
 			<h4>劳务报酬税缴纳规则</h4>
 			<h4>劳务报酬税缴纳规则</h4>
 			<view class="content">
 			<view class="content">
-				根据国家相关法律法规，提现将由CFFP财富中心官方代缴个税后（按劳务报酬税率计算），付款到用户的微信钱包内。 根据规则，奖实行按月累计扣税，若在当月发起多次提现，本次扣税基数将累计当月全部的提现金额。以下供参考，详细可在国家税务局查询。
+				根据国家相关法律法规，提现将由银盾家办官方代缴个税后（按劳务报酬税率计算），付款到用户的微信钱包内。 根据规则，奖实行按月累计扣税，若在当月发起多次提现，本次扣税基数将累计当月全部的提现金额。以下供参考，详细可在国家税务局查询。
 			</view>
 			</view>
 			<h4 style="text-align: center;">劳务报酬所得预扣率表</h4>
 			<h4 style="text-align: center;">劳务报酬所得预扣率表</h4>
 			<view style="color:#666;text-align: center;margin-bottom: 20rpx;">
 			<view style="color:#666;text-align: center;margin-bottom: 20rpx;">

pages/withdrawal/withdrawal.vue

@@ -58,7 +58,7 @@
 					<navigator class="rule" url="/pages/taxRules/taxRules">《劳务报酬税缴纳规则》;</navigator>
 					<navigator class="rule" url="/pages/taxRules/taxRules">《劳务报酬税缴纳规则》;</navigator>
 				</view>
 				</view>
 				<view class="">
 				<view class="">
-					3、如需帮助，请联系CFFP财富中心客服电话400:921-9290;
+					3、如需帮助，请联系银盾家办客服电话400:921-9290;
 				</view>
 				</view>
 			</view>
 			</view>
 			<view class="btn" @click="confirmWithdrawal()" :class="{'gray':readonlyFlag}" style="bottom: 30rpx;">
 			<view class="btn" @click="confirmWithdrawal()" :class="{'gray':readonlyFlag}" style="bottom: 30rpx;">
@@ -86,7 +86,6 @@
 		onLoad(options){
 		onLoad(options){
 			this.exchangeAmount = options.exchangeAmount;
 			this.exchangeAmount = options.exchangeAmount;
 			this.partnerTradeNo = options.partnerTradeNo;
 			this.partnerTradeNo = options.partnerTradeNo;
-			console.log(options)
 			this.goFortuneWithdrawal()
 			this.goFortuneWithdrawal()
 		},
 		},
 		methods:{
 		methods:{
@@ -96,7 +95,6 @@
 				});
 				});
 			},
 			},
 			goFortuneWithdrawal(){
 			goFortuneWithdrawal(){
-				console.log(1)
 				const param = {
 				const param = {
 					userId:uni.getStorageSync('cffp_userId'),
 					userId:uni.getStorageSync('cffp_userId'),
 					// userId:1,
 					// userId:1,
@@ -104,7 +102,6 @@
 					partnerTradeNo:this.partnerTradeNo?this.partnerTradeNo:null
 					partnerTradeNo:this.partnerTradeNo?this.partnerTradeNo:null
 				}
 				}
 				api.goFortuneWithdrawal(param).then((res)=>{
 				api.goFortuneWithdrawal(param).then((res)=>{
-					console.log(res)
 					if(res['success']){
 					if(res['success']){
 						const data = res['data']
 						const data = res['data']
 						this.exchangeAmount = data.exchangeAmount;
 						this.exchangeAmount = data.exchangeAmount;
@@ -155,7 +152,6 @@
 					userId:uni.getStorageSync('cffp_userId'),
 					userId:uni.getStorageSync('cffp_userId'),
 				}
 				}
 				//#endif
 				//#endif
-				console.log(aliWithdrawalResVOParam)
 				api.aliWithdrawal(aliWithdrawalResVOParam).then((res)=>{
 				api.aliWithdrawal(aliWithdrawalResVOParam).then((res)=>{
 					this.readonlyFlag = false;
 					this.readonlyFlag = false;
 					if(res['success']){
 					if(res['success']){

pages/withdrawal/withdrawalDetail.vue

 <template>
 <template>
 	<view class="container">
 	<view class="container">
+		<view class="top">
+			<text class="iconfont icon-youjiantou zuojiantou" @click="goBack()"></text>
+			<text>兑换详情</text>
+		</view>
 		<view class="recordContent">
 		<view class="recordContent">
 			<image :src="deductionUrl" mode="widthFix"></image>
 			<image :src="deductionUrl" mode="widthFix"></image>
 			<view class="detail">
 			<view class="detail">
@@ -52,10 +56,14 @@
 		components:{},
 		components:{},
 		onLoad(options){
 		onLoad(options){
 			this.partnerTradeNo = options.partnerTradeNo;
 			this.partnerTradeNo = options.partnerTradeNo;
-			console.log(this.partnerTradeNo)
 			this.findByUserIdForWithdralDtl();
 			this.findByUserIdForWithdralDtl();
 		},
 		},
 		methods:{
 		methods:{
+			goBack(){
+				uni.navigateBack({  
+					delta: 1  
+				})
+			},
 			findByUserIdForWithdralDtl(){
 			findByUserIdForWithdralDtl(){
 				const params = {
 				const params = {
 					partnerTradeNo:this.partnerTradeNo,
 					partnerTradeNo:this.partnerTradeNo,
@@ -63,7 +71,6 @@
 					// userId:1
 					// userId:1
 				}
 				}
 				api.findByUserIdForWithdralDtl(params).then((res)=>{
 				api.findByUserIdForWithdralDtl(params).then((res)=>{
-					console.log(res)
 					if(res['success']){
 					if(res['success']){
 						const data = res['data']['cffpFortuneExchangeVO'];
 						const data = res['data']['cffpFortuneExchangeVO'];
 						this.productTypeName = data['productTypeName'];
 						this.productTypeName = data['productTypeName'];
@@ -84,6 +91,24 @@
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
+	.container{
+		height:100%;
+		.top{
+			display: flex;
+			height: 80rpx;
+			justify-content: space-between;
+			align-items: center;
+			position: relative;
+			width: 100%;
+			margin: 0 auto;
+			background: #fff;
+			text:nth-child(2){
+				width: 100%;
+				text-align: center;
+				position: absolute;
+			}
+		}
+	}
 	.recordContent{
 	.recordContent{
 		display: flex;
 		display: flex;
 		margin-bottom: 20rpx;
 		margin-bottom: 20rpx;

sfp/childEdu/childEdu.vue

@@ -265,10 +265,8 @@
 				this.isNeedOfficialAccountQrcode= ref(e);
 				this.isNeedOfficialAccountQrcode= ref(e);
 			},
 			},
 			onnodeclick(e) {
 			onnodeclick(e) {
-				console.log(e);
 			},
 			},
 			onchange(e) {
 			onchange(e) {
-				// console.log('onchange:', e);
 			},
 			},
 			drawLine(){
 			drawLine(){
 				  // 基于准备好的dom，初始化echarts实例
 				  // 基于准备好的dom，初始化echarts实例

sfp/dataImport/data-import.vue

@@ -225,7 +225,6 @@
 				  });
 				  });
 				  return;
 				  return;
 			  }
 			  }
-			  console.log(this.policyYearLists)
 			  for(let i=0;i<this.policyYearLists.length;i++){
 			  for(let i=0;i<this.policyYearLists.length;i++){
 				  if(this.policyYearLists[i].cashValue<0 || isNaN(this.policyYearLists[i].cashValue || this.policyYearLists[i].cashValue > 999999999999999)){
 				  if(this.policyYearLists[i].cashValue<0 || isNaN(this.policyYearLists[i].cashValue || this.policyYearLists[i].cashValue > 999999999999999)){
 					  uni.showModal({
 					  uni.showModal({

sfp/housePurchase/loanBalance.vue

@@ -93,7 +93,6 @@
 			
 			
 		},
 		},
 		setup(props,content) {
 		setup(props,content) {
-			console.log('子组件拿到值了',props);
 			const a = reactive({value:props.a});
 			const a = reactive({value:props.a});
 			const b = reactive({value:props.b});
 			const b = reactive({value:props.b});
 			const loanType = ref(props.loanType);
 			const loanType = ref(props.loanType);
@@ -101,8 +100,6 @@
 			const sendData = (e) =>{
 			const sendData = (e) =>{
 				content.emit('getData',e);
 				content.emit('getData',e);
 			}
 			}
-			console.log(a);
-			console.log(b)
 			return {loanType,sendData,a,b,isReadonly}
 			return {loanType,sendData,a,b,isReadonly}
 		},
 		},
 		mounted(){
 		mounted(){
@@ -287,7 +284,6 @@
 				}
 				}
 				
 				
 				// 旧房贷款信息集合
 				// 旧房贷款信息集合
-				// console.log(this.houseLoanOldList)
 				const ab = {
 				const ab = {
 					a:this.accumulationFundParams,
 					a:this.accumulationFundParams,
 					b:this.commercialLoansParams,
 					b:this.commercialLoansParams,

sfp/index/index.vue

@@ -274,7 +274,7 @@
 			}, */
 			}, */
 			getFollowData(e){
 			getFollowData(e){
 				this.isNeedOfficialAccountQrcode= ref(e);
 				this.isNeedOfficialAccountQrcode= ref(e);
-				console.log('父组件拿到值了',e);
+				//console.log('父组件拿到值了',e);
 			},
 			},
 			// 使用说明跳转
 			// 使用说明跳转
 			instructionForUse(){
 			instructionForUse(){
@@ -438,7 +438,7 @@
 					withdrawalStart:null,
 					withdrawalStart:null,
 					withdrawalEnd:null,
 					withdrawalEnd:null,
 					yearWithdrawalAmount:null,}]);
 					yearWithdrawalAmount:null,}]);
-					console.log(this.yearWithdrawalInfos)
+					//console.log(this.yearWithdrawalInfos)
 				}else{
 				}else{
 					this.yearWithdrawalInfos = [];
 					this.yearWithdrawalInfos = [];
 				}
 				}

static/font/iconfont.json

 {
 {
   "id": "3749283",
   "id": "3749283",
-  "name": "CFFP财富中心",
+  "name": "银盾家办",
   "font_family": "iconfont",
   "font_family": "iconfont",
   "css_prefix_text": "icon-",
   "css_prefix_text": "icon-",
   "description": "",
   "description": "",

uni_modules/uni-share-wx/index.vue

@@ -61,7 +61,6 @@
 				hshare(data, url)
 				hshare(data, url)
 			},
 			},
 			open(option) {
 			open(option) {
-				console.log(option, 155)
 				this.WXdata = option
 				this.WXdata = option
 				this.$refs.sharewx.open()
 				this.$refs.sharewx.open()
 				this.share()
 				this.share()
@@ -90,8 +89,6 @@
 						console.log(res, 155)
 						console.log(res, 155)
 					},
 					},
 					fail: function(err) {
 					fail: function(err) {
-						alert(err)
-						alert(JSON.stringify(err))
 						console.log("fail:" + JSON.stringify(err));
 						console.log("fail:" + JSON.stringify(err));
 					}
 					}
 				});
 				});

uni_modules/uni-share/js_sdk/uni-share.js

@@ -27,11 +27,11 @@ class UniShare extends UniImageMenu{
 							...param.content,
 							...param.content,
 							...menus[e.index].share,
 							...menus[e.index].share,
 							success: res=> {
 							success: res=> {
-								console.log("success:" + JSON.stringify(res));
+								//console.log("success:" + JSON.stringify(res));
 								super.hide()
 								super.hide()
 							},
 							},
 							fail: function(err) {
 							fail: function(err) {
-								console.log("fail:" + JSON.stringify(err));
+								//console.log("fail:" + JSON.stringify(err));
 								uni.showModal({
 								uni.showModal({
 									content: JSON.stringify(err),
 									content: JSON.stringify(err),
 									showCancel: false,
 									showCancel: false,
@@ -48,18 +48,15 @@ class UniShare extends UniImageMenu{
 				showCancel: false,
 				showCancel: false,
 				confirmText: '知道了'
 				confirmText: '知道了'
 			});
 			});
-			console.error('获取服务供应商失败：' + JSON.stringify(err));
 		})
 		})
 	}
 	}
 	hide(){
 	hide(){
 		super.hide()
 		super.hide()
 	}
 	}
 	copyurl(param) {
 	copyurl(param) {
-		console.log('copyurl',param);
 		uni.setClipboardData({
 		uni.setClipboardData({
 			data: param.content.href,
 			data: param.content.href,
 			success: ()=>{
 			success: ()=>{
-				console.log('success');
 				uni.hideToast() //关闭自带的toast
 				uni.hideToast() //关闭自带的toast
 				uni.showToast({
 				uni.showToast({
 					title: '复制成功',
 					title: '复制成功',
@@ -77,16 +74,13 @@ class UniShare extends UniImageMenu{
 	}
 	}
 	// 使用系统分享发送分享消息 
 	// 使用系统分享发送分享消息 
 	shareSystem(param) {
 	shareSystem(param) {
-		console.log('shareSystem',param);
 		plus.share.sendWithSystem({
 		plus.share.sendWithSystem({
 			type: 'text',
 			type: 'text',
 			content: param.content.title + param.content.summary || '',
 			content: param.content.title + param.content.summary || '',
 			href: param.content.href,
 			href: param.content.href,
 		}, (e)=> {
 		}, (e)=> {
-			console.log('分享成功');
 			super.hide()
 			super.hide()
 		}, (err)=> {
 		}, (err)=> {
-			console.log('分享失败：' + JSON.stringify(err));
 			uni.showModal({
 			uni.showModal({
 				title: '获取服务供应商失败：' + JSON.stringify(err),
 				title: '获取服务供应商失败：' + JSON.stringify(err),
 				showCancel: false,
 				showCancel: false,

util/authorizeUtils.ts

@@ -26,7 +26,6 @@ export default class authorizeUtils {
 		let compat: any = plus.android.importClass('androidx.core.content.ContextCompat')
 		let compat: any = plus.android.importClass('androidx.core.content.ContextCompat')
 		let context = plus.android.runtimeMainActivity()
 		let context = plus.android.runtimeMainActivity()
 		let result = compat.checkSelfPermission(context, authorize)
 		let result = compat.checkSelfPermission(context, authorize)
-		console.log("result===", result);
 		if (result === 0) return true
 		if (result === 0) return true
 		// 如果已经授权直接返回
 		// 如果已经授权直接返回
 		const contentData = {
 		const contentData = {

util/interceptor.ts

- import {baseURL,apiURL,cffpURL} from "../environments/environment";
+ import {apiURL,cffpURL} from "../environments/environment";
 // 白名单，不需要携带token就允许被访问的接口
 // 白名单，不需要携带token就允许被访问的接口
 const whiteApiList = [`${apiURL}/authorize/obtainToken`, `${apiURL}/authorize/checkToken`, `${cffpURL}/user/loginVerification`,`${apiURL}/appVersion/checkIsUpdate`,
 const whiteApiList = [`${apiURL}/authorize/obtainToken`, `${apiURL}/authorize/checkToken`, `${cffpURL}/user/loginVerification`,`${apiURL}/appVersion/checkIsUpdate`,
 						`${cffpURL}/accessLog/accessLogSave`,`${cffpURL}/user/powerQuery`,`${cffpURL}/user/wxLogin`,`${cffpURL}/certificate/officialWebsiteDetail`];
 						`${cffpURL}/accessLog/accessLogSave`,`${cffpURL}/user/powerQuery`,`${cffpURL}/user/wxLogin`,`${cffpURL}/certificate/officialWebsiteDetail`];
 export const interceptor = () => {
 export const interceptor = () => {
 	uni.addInterceptor('request', {
 	uni.addInterceptor('request', {
-
 		// 请求拦截器
 		// 请求拦截器
 		invoke(args) {
 		invoke(args) {
-			// console.log('请求拦截器',args.url);
-			// 加载loading
-			// uni.showLoading({
-			//   title: '加载中...'
-			// });
-			
 			// 当本地没有token，并且接口地址没在白名单内，需要重新获取token
 			// 当本地没有token，并且接口地址没在白名单内，需要重新获取token
 			if (!uni.getStorageSync('uni-token') && !whiteApiList.includes(args.url)) {
 			if (!uni.getStorageSync('uni-token') && !whiteApiList.includes(args.url)) {
-				
 				const params = {
 				const params = {
-					ticket:'uni-app',
-					loginId:null
+					ticket: 'uni-app',
+					loginId: null
 				}
 				}
 				let h5userId = uni.getStorageSync('cffp_userId');
 				let h5userId = uni.getStorageSync('cffp_userId');
 				if (h5userId) {
 				if (h5userId) {
@@ -29,7 +21,6 @@ export const interceptor = () => {
 					method: 'POST',
 					method: 'POST',
 					data: params,
 					data: params,
 					success: (res) => {
 					success: (res) => {
-						
 						if (res.statusCode === 200) {
 						if (res.statusCode === 200) {
 							uni.setStorageSync('uni-token', res.data['data']['token']);
 							uni.setStorageSync('uni-token', res.data['data']['token']);
 							let isHas = window.location.href.indexOf('?')==-1?'?':'&';
 							let isHas = window.location.href.indexOf('?')==-1?'?':'&';
@@ -38,8 +29,6 @@ export const interceptor = () => {
 					}
 					}
 				})
 				})
 			}
 			}
-			// request 触发前拼接 url
-
 			//设置请求头及token
 			//设置请求头及token
 			args.header = {
 			args.header = {
 				'content-type': args.method === 'POST' ? 'application/json' : 'application/x-www-form-urlencoded',
 				'content-type': args.method === 'POST' ? 'application/json' : 'application/x-www-form-urlencoded',
@@ -48,17 +37,10 @@ export const interceptor = () => {
 				// 'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
 				// 'Access-Control-Allow-Methods': 'POST, GET, OPTIONS',
 				// 'Access-Control-Max-Age': 86400,
 				// 'Access-Control-Max-Age': 86400,
 			}
 			}
-			// console.log(args.header)
 		},
 		},
-
 		// 响应拦截器，可以对数据进行预处理
 		// 响应拦截器，可以对数据进行预处理
 		success(args) {
 		success(args) {
-			// uni.hideLoading()
-			 //console.log(args);
 			if(args && args.data && args.data.errorCode && "T001"==args.data.errorCode){
 			if(args && args.data && args.data.errorCode && "T001"==args.data.errorCode){
-				// uni.redirectTo({
-				// 	url:'/components/login/login'
-				// })
 				 uni.removeStorageSync('isLogin');
 				 uni.removeStorageSync('isLogin');
 				 uni.switchTab({
 				 uni.switchTab({
 					url:'/pages/index/index'
 					url:'/pages/index/index'
@@ -67,11 +49,8 @@ export const interceptor = () => {
 		},
 		},
 		fail() {
 		fail() {
 			// console.log('interceptor-fail', err)
 			// console.log('interceptor-fail', err)
-			// console.log('请求失败')
-			// uni.hideLoading()
 		},
 		},
 		complete() {
 		complete() {
-			
 			// uni.hideLoading()
 			// uni.hideLoading()
 		}
 		}
 	})
 	})

util/request.ts

-
-// import {interceptor} from "./interceptor";
 // 全局请求封装
 // 全局请求封装
 export default (url:string, method:any, params?:any) => {
 export default (url:string, method:any, params?:any) => {
-	// interceptor();
 	return new Promise((resolve, reject) => {
 	return new Promise((resolve, reject) => {
-		// uni.showLoading({
-		//   title: '加载中...'
-		// });
 		uni.request({
 		uni.request({
 			url: url,
 			url: url,
 			method: method,
 			method: method,

util/uploaderFile.ts

-import request from "./request";
-import authorizeUtils from "./authorizeUtils";
-import { baseURL, apiURL, cffpURL } from "../environments/environment";
+//import request from "./request";
+//import authorizeUtils from "./authorizeUtils";
+import { apiURL } from "../environments/environment";
 // 上传图片事件
 // 上传图片事件
 export function CommonUpload(psrams) {
 export function CommonUpload(psrams) {
 	let requestVO = psrams
 	let requestVO = psrams
 	// @ts-ignore
 	// @ts-ignore
 	return new Promise((resolve, reject) => {
 	return new Promise((resolve, reject) => {
-		  // 1. 弹窗说明权限用途
-		//let authFlag = authorizeUtils.showAuthTipModal("android.permission.READ_EXTERNAL_STORAGE");
-		//let authFlag2 = authorizeUtils.showAuthTipModal("android.permission.CAMERA");
+	    // #ifdef APP-PLUS
+		  let imageCamera = uni.getStorageSync('imageCamera');
+		  if(!imageCamera || imageCamera != '1'){
 			 uni.showModal({
 			 uni.showModal({
 				title: '权限说明',
 				title: '权限说明',
 				content: '我们需要访问您的相机和相册，以便您拍摄或上传图片。',
 				content: '我们需要访问您的相机和相册，以便您拍摄或上传图片。',
@@ -16,59 +16,84 @@ export function CommonUpload(psrams) {
 				cancelText: '拒绝',
 				cancelText: '拒绝',
 				success: function (res) {
 				success: function (res) {
 		  		  if (res.confirm) {
 		  		  if (res.confirm) {
-					  
+			 		uni.setStorageSync('imageCamera', '1');
 					uni.chooseImage({
 					uni.chooseImage({
 						count: 1, //默认9
 						count: 1, //默认9
 						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 						sourceType: ['album','camera'], //从相册选择
 						sourceType: ['album','camera'], //从相册选择
 						success: function(res) {
 						success: function(res) {
-					  		// res.tempFiles 数组
-					  		// for (var i = 0; i < res.tempFiles.length; i++) {
-					  		uni.showLoading({
-					  			title: '加载中',
-					  			mask: true
-					  		});
+							uni.showLoading({title: '加载中', mask: true});
 							uni.uploadFile({
 							uni.uploadFile({
-					  			// /api/file/upload //pc上传代理
-					  			// https://mdev.zuihuibi.cn/api/file/upload
 								url: `${apiURL}/file/upload`, // 后端api接口
 								url: `${apiURL}/file/upload`, // 后端api接口
 								filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
 								filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
 								name: 'file', //后端通过'file'获取上传的文件对象
 								name: 'file', //后端通过'file'获取上传的文件对象
-					  			// formData: this.sendDate,
-					  			// header:{"third-session": uni.getStorageSync('thirdSession')},
-					  			formData: { //后台所需除图片外的参数可以写在这里面 ，单张多张都可
-					  				requestVO: JSON.stringify(requestVO)
-					  			},
-					  			header: {
-					  				// "third-session": uni.getStorageSync('thirdSession')
-					  				// 'content-type': 'application/json',
-					  				'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''
-					  			},
+								formData: { requestVO: JSON.stringify(requestVO)},//后台所需除图片外的参数可以写在这里面 ，单张多张都可
+								header: {'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''},
 								success: (res) => {
 								success: (res) => {
-					  				let data = JSON.parse(res.data)
-					  				// // 抛出
-					  				resolve(data)
+									resolve(JSON.parse(res.data));
 									uni.hideLoading();
 									uni.hideLoading();
 								},
 								},
 								fail:(err) =>{
 								fail:(err) =>{
-					  				uni.showModal({
-					  					content:'上传失败',
-					  					showCancel: false
+									uni.showModal({content:'上传失败', showCancel: false})
+									uni.hideLoading();
+								}
+							});
+						}
+					});
+				  }
+				}
 			})
 			})
+		  }else{
+			uni.chooseImage({
+				count: 1, //默认9
+				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['album','camera'], //从相册选择
+				success: function(res) {
+					uni.showLoading({title: '加载中', mask: true});
+					uni.uploadFile({
+						url: `${apiURL}/file/upload`, // 后端api接口
+						filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
+						name: 'file', //后端通过'file'获取上传的文件对象
+						formData: { requestVO: JSON.stringify(requestVO)},//后台所需除图片外的参数可以写在这里面 ，单张多张都可
+						header: {'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''},
+						success: (res) => {
+							resolve(JSON.parse(res.data));
+							uni.hideLoading();
+						},
+						fail:(err) =>{
+							uni.showModal({content:'上传失败', showCancel: false})
 							uni.hideLoading();
 							uni.hideLoading();
-					  				// console.log(data, '发生错误,查看错误日志')
 						}
 						}
-					  		
 					});
 					});
-					  		// }
 				}
 				}
 			});
 			});
-					  
-		  		  } else if (res.cancel) {
-						console.log('用户点击取消');
 		  }
 		  }
+		// #endif
+		// #ifdef H5
+		uni.chooseImage({
+			count: 1, //默认9
+			sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+			sourceType: ['album','camera'], //从相册选择
+			success: function(res) {
+				uni.showLoading({title: '加载中', mask: true});
+				uni.uploadFile({
+					url: `${apiURL}/file/upload`, // 后端api接口
+					filePath: res.tempFilePaths[0], // uni.chooseImage函数调用后获取的本地文件路劲
+					name: 'file', //后端通过'file'获取上传的文件对象
+					formData: { requestVO: JSON.stringify(requestVO)},//后台所需除图片外的参数可以写在这里面 ，单张多张都可
+					header: {'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''},
+					success: (res) => {
+						resolve(JSON.parse(res.data));
+						uni.hideLoading();
+					},
+					fail:(err) =>{
+						uni.showModal({content:'上传失败', showCancel: false})
+						uni.hideLoading();
+					}
+				});
 			}
 			}
 		});
 		});
+		// #endif
 	})
 	})
 }
 }
 
 
@@ -83,7 +108,6 @@ export function ckbigImg(params) {
 	})
 	})
 }
 }
 
 
-
 // 这个方法用来上传文件
 // 这个方法用来上传文件
 export function uploadFilepdf(params) {
 export function uploadFilepdf(params) {
 	let requestVO = params
 	let requestVO = params
@@ -93,10 +117,8 @@ export function uploadFilepdf(params) {
 			count: 1, //默认100
 			count: 1, //默认100
 			extension: ['.pdf', '.doc'],
 			extension: ['.pdf', '.doc'],
 			success: function(res) {
 			success: function(res) {
-				console.log(res, 5588)
 				  var str = res.tempFiles[0].name; //截取后4位
 				  var str = res.tempFiles[0].name; //截取后4位
 				    let a = str.substring(str.length - 3);
 				    let a = str.substring(str.length - 3);
-				    console.log(a , 'aaaaaa')
 					if(a !== 'pdf') {
 					if(a !== 'pdf') {
 						uni.showToast({
 						uni.showToast({
 							title: '上传文件格式不正确！',
 							title: '上传文件格式不正确！',
@@ -106,8 +128,6 @@ export function uploadFilepdf(params) {
 						return
 						return
 					}
 					}
 			    var name = 	res.tempFiles[0].name
 			    var name = 	res.tempFiles[0].name
-				// res.tempFiles 数组
-				// for (var i = 0; i < res.tempFiles.length; i++) {
 				uni.showLoading({
 				uni.showLoading({
 					title: '加载中',
 					title: '加载中',
 					mask: true
 					mask: true
@@ -119,14 +139,10 @@ export function uploadFilepdf(params) {
 					formData: {
 					formData: {
 						requestVO: JSON.stringify(requestVO)
 						requestVO: JSON.stringify(requestVO)
 					},
 					},
-					// header:{"third-session": uni.getStorageSync('thirdSession')},
 					header: {
 					header: {
-						// "third-session": uni.getStorageSync('thirdSession')
-						// 'content-type': 'application/json',
 						'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''
 						'X-Authorization': uni.getStorageSync('uni-token') ? uni.getStorageSync('uni-token') : ''
 					},
 					},
 					success: (res) => {
 					success: (res) => {
-						console.log(res, 54854)
 						let data = JSON.parse(res.data)
 						let data = JSON.parse(res.data)
 						if(data.success == true){
 						if(data.success == true){
 							data.name = name
 							data.name = name
@@ -138,20 +154,10 @@ export function uploadFilepdf(params) {
 								icon: 'none'		
 								icon: 'none'		
 							});
 							});
 						}
 						}
-						
-
-						// urlList.push({
-						// 	url: data.data.link,
-						// 	recordId: data.data.recordId
-						// })
-						// 抛出
-					
 						uni.hideLoading();
 						uni.hideLoading();
 					}
 					}
 				});
 				});
-				// }
 			}
 			}
 		});
 		});
 	})
 	})
 }
 }
\ No newline at end of file
-