222

pages.json

@@ -410,7 +410,7 @@
 					"titleNView": false
 				},
 				// #endif
-				"navigationBarTitleText": "申请店长"
+				"navigationBarTitleText": "代理升级"
 
 			}
 		},

pages/index/index.vue

@@ -117,7 +117,22 @@
 				<view class="">好货推荐</view>
 				<view class="title-b">优选商品低价入手</view>
 			</view>
+		
+				
+		
 			<view class="goods-wrapper flex">
+			
+				<view class="good" v-if="userInfo.uid &&  userInfo.level<=1"
+					@click="navTo('/pages/store/apply')">
+					<image src="../../static/img/daili.jpg"  class="good-img"></image>
+					<view class="good-name clamp">加盟代理</view>
+					<!-- <view class="good-info clamp">纯植物无香精</view> -->
+					<view class="good-price">
+						<text class="new-price">568.00</text>
+						<text class="old-price">755.00</text>
+					</view>
+				</view>
+				
 				<view class="good" v-for="item in bastList"
 					@click="navTo('/pages/product/product?id='+ item.id + '&spread=' + userInfo.uid )" :key="item.id">
 					<image :src="item.image" mode="" class="good-img"></image>
@@ -128,6 +143,7 @@
 						<text class="old-price">{{ item.ot_price }}</text>
 					</view>
 				</view>
+				
 			</view>
 		</view>
 		<view class="Mask" v-show="shareShow">
@@ -278,6 +294,7 @@
 			return shareObj;
 		},
 		onLoad: function(option) {
+			console.log(this.userInfo.uid,'111222');
 			// #ifndef MP
 			if (option.spread) {
 				// 存储其他邀请人
@@ -298,6 +315,7 @@
 			// this.getaddress();
 		},
 		onShow: function() {
+			
 			// 判断是否强制登录
 			// if (this.loginInterceptor && !this.hasLogin) {
 			// 	// 登录拦截

pages/money/account.vue

@@ -4,8 +4,21 @@
 			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
 		</view>
 
+
 		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
 			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<view class="row b-b" >
+					<text class="tit">开户银行</text>
+					<!-- range是你要显示的数组，range-key是数组中你要显示的那一项，range-key="{{'label'}}" ，range-key中的数据要加引号！！！！！才生效！ -->
+					<picker class="input" :range="bankList" mode="selector"  :value="addressIndex"  @change="changeBank">
+						<view v-if="bankList[bankIndex]">{{bankList[bankIndex] }}</view>
+						<view v-else class="font-color-gray">开户银行</view>
+					</picker>
+				</view>
+				<view class="row b-b" >
+					<text class="tit">所属支行</text>
+					<input class="input" v-model="tabItem.orderList.zhiBank" type="text" placeholder="所属支行" placeholder-class="placeholder" />
+				</view>
 				<view class="row b-b">
 					<text class="tit">姓名</text>
 					<input class="input" v-model="tabItem.orderList.name" type="text" placeholder="提款人姓名" placeholder-class="placeholder" />
@@ -14,10 +27,7 @@
 					<text class="tit">{{ tabIndex == 0 ? '账号' : '银行卡号' }}</text>
 					<input class="input" v-model="tabItem.orderList.code" type="text" placeholder="请输入账号" placeholder-class="placeholder" />
 				</view>
-				<view class="row b-b" v-if="tabIndex == 1">
-					<text class="tit">所属银行</text>
-					<input class="input" v-model="tabItem.orderList.bankName" type="text" placeholder="请输入开户银行" placeholder-class="placeholder" />
-				</view>
+				
 			</swiper-item>
 		</swiper>
 
@@ -26,31 +36,48 @@
 </template>
 
 <script>
-import { aliInfo, bankInfo, setAliInfo, setBankInfo } from '@/api/wallet.js';
+import { aliInfo, bankInfo, setAliInfo, setBankInfo , extractBank} from '@/api/wallet.js';
 export default {
 	data() {
 		return {
+			bankList: [],
+			bankIndex:0,
+			addressDetail:'',
+			addressIndex:[0],
 			tabCurrentIndex: 0,
+			addressData: {
+				name: '',
+				mobile: '',
+				area: '',
+				default: false,
+				id: ''
+			},
+			bankList: [],
+			bankIndex:0,
 			navList: [
-				{
-					state: 0,
-					text: '支付宝',
-					loadingType: 'more',
-					orderList: {
-						name: '',
-						code: '',
-						id: ''
-					}
-				},
+				// {
+				// 	state: 0,
+				// 	text: '支付宝',
+				// 	loadingType: 'more',
+				// 	orderList: {
+				// 		name: '',
+				// 		code: '',
+				// 		id: ''
+				// 	}
+				// },
+				
 				{
 					state: 1,
 					text: '银行卡',
 					loadingType: 'more',
+					
 					orderList: {
+						
 						name: '',
 						code: '',
-						bankName: '',
-						id: ''
+						id: '',
+						bank:'',
+						zhiBank:''
 					}
 				}
 			]
@@ -61,9 +88,22 @@ export default {
 		this.tabCurrentIndex = +options.state || 0;
 		// this.loadAli();
 		// this.loadBank();
+		this.onCityClick();
 	},
 
 	methods: {
+		changeBank(e){
+			console.log(e,'22221');
+			this.bankIndex =e.target.value
+		},
+		//选择下拉框
+		onCityClick(){
+			extractBank({}).then(({data})=>{
+				console.log(data,'22222');
+				// this.navList.orderList.name = data.extractBank
+				this.bankList = data.extractBank
+			})
+		},
 		//加载数据
 		loadAli(source) {
 			aliInfo({}).then(({ data }) => {
@@ -75,6 +115,7 @@ export default {
 		},
 		loadBank() {
 			bankInfo({}).then(({ data }) => {
+				console.log(data,'22222');
 				let order = this.navList[1].orderList;
 				this.$set(order, 'name', data.fullname);
 				this.$set(order, 'code', data.bankno);
@@ -93,30 +134,38 @@ export default {
 		// 提交保存
 		confirm() {
 			let obj = this;
-			let arr = obj.navList[obj.tabCurrentIndex].orderList;
+			let arr = obj.navList[0].orderList;
 			let pages = getCurrentPages(); //获取所有页面栈实例列表
 			console.log(pages);
 			let nowPage = pages[pages.length - 1]; //当前页页面实例
 			let prevPage = pages[pages.length - 2]; //上一页页面实例
 			console.log(prevPage);
-			// prevPage.$vm.sh = 100;   //修改上一页data里面的sh参数值为100
-			if (obj.tabCurrentIndex == 1) {
+			prevPage.$vm.sh = 100;   //修改上一页data里面的sh参数值为100
+			
+			if (obj.tabCurrentIndex == 0) {
 				if (!arr.name) {
 					return this.$api.msg('请输入提款人姓名');
 				}
-				if (!arr.bankName) {
+				if (!obj.bankList[obj.bankIndex]) {
+					// console.log(obj.bankList[obj.bankIndex]);
 					return this.$api.msg('请输入所属银行');
 				}
 				if (!arr.code) {
 					return this.$api.msg('请输入银行卡号');
 				}
+				if (!arr.zhiBank) {
+					return this.$api.msg('请输入所属支行');
+				}
 				let data = {
 					fullname: arr.name,
-					bank: arr.bankName,
+					
+					bank: obj.bankList[obj.bankIndex]+'('+arr.zhiBank+')',
 					bankno: arr.code
 				};
+				console.log(data,'4444');
 				// #ifdef H5
 				prevPage.$vm.bankData = data;
+				console.log(data,'54454');
 				// #endif
 				// #ifdef MP
 				prevPage.setData({
@@ -133,35 +182,35 @@ export default {
 					delta: 1
 				});
 			}
-			if (obj.tabCurrentIndex == 0) {
-				if (!arr.name) {
-					return this.$api.msg('请输入提款人姓名');
-				}
-				if (!arr.code) {
-					return this.$api.msg('请输入支付宝账号');
-				}
-				let data = {
-					fullname: arr.name,
-					alino: arr.code
-				};
-				// #ifdef H5
-				prevPage.$vm.aliData = data;
-				// #endif
+			// if (obj.tabCurrentIndex == 0) {
+			// 	if (!arr.name) {
+			// 		return this.$api.msg('请输入提款人姓名');
+			// 	}
+			// 	if (!arr.code) {
+			// 		return this.$api.msg('请输入支付宝账号');
+			// 	}
+			// 	let data = {
+			// 		fullname: arr.name,
+			// 		alino: arr.code
+			// 	};
+			// 	// #ifdef H5
+			// 	prevPage.$vm.aliData = data;
+			// 	// #endif
 
-				// #ifdef MP
-				prevPage.setData({
-					bankData: data
-				});
-				// #endif
-				// obj.setAliInfo({
-				// 	fullname: arr.name,
-				// 	alino: arr.code,
-				// 	id:arr.id
-				// });
-				uni.navigateBack({
-					delta: 1
-				});
-			}
+			// 	// #ifdef MP
+			// 	prevPage.setData({
+			// 		bankData: data
+			// 	});
+			// 	// #endif
+			// 	// obj.setAliInfo({
+			// 	// 	fullname: arr.name,
+			// 	// 	alino: arr.code,
+			// 	// 	id:arr.id
+			// 	// });
+			// 	uni.navigateBack({
+			// 		delta: 1
+			// 	});
+			// }
 		},
 		/* 保存银行卡详细 */
 		setBankInfo(obj) {
@@ -212,12 +261,15 @@ export default {
 	height: 110rpx;
 	background: #fff;
 	.tit {
+		margin-right:50rpx;
 		flex-shrink: 0;
 		width: 120rpx;
 		font-size: 30rpx;
 		color: $font-color-dark;
 	}
 	.input {
+		display: flex;
+		align-items: center;
 		flex: 1;
 		font-size: 30rpx;
 		color: $font-color-dark;

pages/set/addressManage.vue

@@ -10,6 +10,7 @@
 		</view>
 		<view class="row b-b">
 			<text class="tit">省市区</text>
+			<!-- range是你要显示的数组，range-key是数组中你要显示的那一项，range-key="{{'label'}}" ，range-key中的数据要加引号！！！！！才生效！ -->
 			<picker mode="multiSelector" :range="areaJs" range-key="name" :value="addressIndex" @columnchange="onCityClick" @change="changeArea">
 				<view v-if="addressDetail">{{ addressDetail }}</view>
 				<view v-else class="font-color-gray">请选择省市区</view>

pages/store/apply.vue

@@ -2,7 +2,7 @@
 	<view class="conter">
 		<view class="top">
 			<!-- <view class="bg"><image src="../../static/img/open-vip.png" mode=""></image></view> -->
-			<view class="title">开通会员</view>
+			
 			<view class="card">
 				<view class="card-top flex">
 					<view class="avtur">
@@ -41,7 +41,7 @@
 		<view class="vip">
 			<view class="system-title">
 				<!-- <view class="img" style="margin-right: 45rpx;"><image class="img" src="../../static/img/vip-left.png"></image></view> -->
-				<view class="title">会员特权</view>
+				<view class="title">代理特权</view>
 				<!-- <view class="img" style="margin-left: 45rpx;"><image class="img" src="../../static/img/vip-right.png"></image></view> -->
 			</view>
 			<view class="money-box flex">
@@ -83,7 +83,7 @@
 
 					<view class="row" v-if="myProvincial.check">
 						<view class="row1">
-							<text class="tit">代理市区</text>
+							<text class="tit">代理市级</text>
 							<picker mode="selector" :range="municipal" range-key="name" :value="myMunicipal.id"
 								@change="changeArea($event, 2)">
 								<view v-if="myMunicipal.name != ''">{{ myMunicipal.name }}</view>
@@ -99,7 +99,7 @@
 
 						<view class="row" v-if="myMunicipal.check">
 							<view class="row1">
-								<text class="tit">代理街道</text>
+								<text class="tit">代理区级</text>
 								<picker mode="selector" :range="county" range-key="name" :value="myCounty.id"
 									@change="changeArea($event, 3)">
 									<view v-if="myCounty.name != ''">{{ myCounty.name }}</view>
@@ -115,7 +115,7 @@
 
 							<view class="row" v-if="myCounty.check && level >= 4">
 								<view class="row1">
-									<text class="tit">代理村镇</text>
+									<text class="tit">代理街道</text>
 									<picker mode="selector" :range="town" range-key="name" :value="myTown.id"
 										@change="changeArea($event, 4)">
 										<view v-if="myTown.name != ''">{{ myTown.name }}</view>
@@ -128,7 +128,7 @@
 
 								<view class="row" v-if="myTown.check && level >= 5">
 									<view class="row1 flex">
-										<text class="tit">省市区</text>
+										<text class="tit">代理村镇</text>
 										<picker mode="selector" :range="village" range-key="name" :value="myVillage.id"
 											@change="changeArea($event, 5)">
 											<view v-if="myVillage.name != ''">{{ myVillage.name }}</view>
@@ -149,7 +149,7 @@
 			<view class="price-left">
 				<text class="entrepreneurship">
 					开通前请阅读
-					<text>《会员服务协议》</text>
+					<text>《代理服务协议》</text>
 				</text>
 			</view>
 			<view class="price-right" @click="submit">马上开通</view>
@@ -555,7 +555,7 @@
 						if (this.level == 3) {
 							data = data.filter(e => {
 								console.log(e);
-								return e.agent_uid == null;
+								return e.agent_uid == 0;
 							});
 						}
 						console.log(data);
@@ -566,7 +566,7 @@
 						if (this.level == 4) {
 							data = data.filter(e => {
 								console.log(e);
-								return e.agent_uid == null;
+								return e.agent_uid == 0;
 							});
 						}
 						console.log(data);
@@ -576,7 +576,7 @@
 						if (this.level == 5) {
 							data = data.filter(e => {
 								console.log(e);
-								return e.agent_uid == null;
+								return e.agent_uid == 0;
 							});
 						}
 						console.log(data);
@@ -1221,10 +1221,11 @@
 				}
 
 				.right {
-							margin-right: 20rpx;
+					margin-right: 20rpx;
 					width: 24rpx;
 					height: 24rpx;
-
+					position: relative;
+					bottom: 26rpx;
 					image {
 						height: 100%;
 						width: 100%;

pages/user/user.vue

@@ -104,12 +104,14 @@
 				</view>
 			</view>
 			<!-- 升级店长 -->
-			<navigator url="/pages/store/apply" v-if="userInfo.level < 3">
+			
+			<navigator url="/pages/store/apply" v-if=" userInfo.level<=1">
 				<view class="up-box">
 					<image src="/static/img/upto01.png" mode=""></image>
 				</view>
 			</navigator>
 			<view>
+			
 				<!-- <view class="tj-sction">
 					<view class="tj-item" @click="navTo('/pages/money/wallet')">
 						<text class="num">{{ userInfo.now_money || '0.00' }}</text>
@@ -161,7 +163,9 @@
 								<image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image>
 							</view>
 							<text>申请会员</text>
-						</view> -->
+						</view>
+						 
+						 -->
 						<view class="order-item" @click="navTo('/pages/user/shareQrCode')" hover-class="common-hover"
 							:hover-stay-time="50">
 							<view class="icon icon-b">

pages/user/withdrawal.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="tishi">
-			提示：提现税率为7.5%
+			提示：提现税率为{{suilv}}%
 		</view>
 		<view class="row-box">
 			<view class="could">
@@ -65,7 +65,7 @@
 						<view class="right"><radio value="weixin" color="#ff4c4c" :checked="type == 'weixin'" /></view>
 					</view>
 				</label> -->
-				<label>
+				<!-- <label>
 					<view class="box">
 						<view class="icon iconfont iconzhifubao"></view>
 						<view class="title-box">
@@ -79,7 +79,7 @@
 						</view>
 						<view class="right"><radio value="alipay" color="#ff4c4c" :checked="type == 'alipay'" /></view>
 					</view>
-				</label>
+				</label> -->
 				<label>
 					<view class="box">
 						<view class="icon iconfont"><image class="icon-img" src="/static/icon/i8.png" mode="aspectFit"></image></view>
@@ -105,7 +105,7 @@
 
 <script>
 import { getMoneyStyle } from '@/utils/rocessor.js';
-import { extractCash, extractBank, aliInfo, bankInfo } from '@/api/wallet.js';
+import { extractCash, extractBank, aliInfo, bankInfo, } from '@/api/wallet.js';
 import uniNoticeBar from '@/components/uni-notice-bar/uni-notice-bar.vue';
 import { getSpreadCount } from '@/api/user.js';
 export default {
@@ -123,6 +123,7 @@ export default {
 			freeze: '0.0', //冻结金额
 			withdrawal: '', //提现金额
 			minPrice: '', //最少提现金额
+			suilv:'',
 			aliData: {},
 			bankData: {},
 			// #ifdef H5
@@ -134,11 +135,11 @@ export default {
 	computed: {
 		//提现手续费
 		sxf() {
-			return (this.withdrawal*1*0.075)
+			return (this.withdrawal*1*this.suilv*0.01)
 		},
 		//实际到账
 		sjdz() {
-			return (this.withdrawal*1*0.925)
+			return (this.withdrawal*1*(1-this.suilv*0.01))
 		}
 	},
 	onLoad(options) {
@@ -167,6 +168,7 @@ export default {
 		async loadBank() {
 			bankInfo({}).then(e => {
 				this.bankData = e.data;
+				
 			});
 		},
 		// 加载余额信息
@@ -183,6 +185,7 @@ export default {
 			// });
 			extractBank({}).then(({ data }) => {
 				this.money = data.commissionCount;//可提现余额
+				this.suilv = data.commission//税率
 				console.log(this.money)
 				this.minPrice = data.minPrice;//最小提现
 				this.freeze =data.inmoneyCount//提现中的余额

store/index.js

@@ -9,6 +9,7 @@ const store = new Vuex.Store({
 	state: {
 		// baseURL:"http://yrh.liuniu946.com",//'http://eb.shuibo.net',//请求地址配置 
 		baseURL:'https://ysg.liuniu946.com',//请求地址配置 
+		// baseURL:'http://ysg.frp.liuniu946.com',//请求地址配置 
 		// baseURL:'http://www.zjxwcm.cn',
 		urlFile:'/index',//项目部署所在文件夹
 		userInfo: {}, //登录信息