骑手更新银行卡

common/config.js

@@ -1,23 +1,23 @@
-const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
+// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/sqx_fast";
 // const ROOTPATH1 = "https://www.daweilinli.com/sqx_fast";
-const ROO2 = "https://mxys.chuanghai-tech.com/sqx_fast";
+// const ROO2 = "https://mxys.chuanghai-tech.com/sqx_fast";
 // const ROO2 = "https://www.daweilinli.com/sqx_fast";
-const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
+// const ROOTPATH = "https://mxys.chuanghai-tech.com/sqx_fast";
 // const ROOTPATH = "https://www.daweilinli.com/sqx_fast";
 // const APIHOST2 = "https://www.daweilinli.com/sqx_fast";
-const APIHOST2 = "https://mxys.chuanghai-tech.com/sqx_fast";
-const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"; //联系客服
+// const APIHOST2 = "https://mxys.chuanghai-tech.com/sqx_fast";
+// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"; //联系客服
 // const ROOTPATH2 = "wss://www.daweilinli.com/wss/websocket/"; //联系客服
-const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"; //聊天
+// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"; //聊天
 // const ROOTPATH3 = "wss://www.daweilinli.com/wss/ordersChat/"; //聊天
 
 
-// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-// const ROO2 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-// const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-// const APIHOST2 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"; //联系客服
-// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"; //聊天
+const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+const ROO2 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+const APIHOST2 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"; //联系客服
+const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"; //聊天
 
 module.exports = {
     APIHOST: ROOTPATH,

pages.json

@@ -189,15 +189,15 @@
 		// 	}
 		// }
         ,
-		// {
-  //           "path" : "pages/riderMy/myAccount/Txmoney/Txmoney",
-  //           "style" :                                                                                    
-  //           {
-  //               "navigationBarTitleText": "余额提现",
-  //               "enablePullDownRefresh": false
-  //           }
+		{
+            "path" : "pages/riderMy/myAccount/Txmoney/Txmoney",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "余额提现",
+                "enablePullDownRefresh": false
+            }
             
-  //       },
+        },
 		{
 		    "path" : "pages/riderMy/order",
 		    "style" :                                                                                    

pages/index/index.vue

@@ -696,6 +696,13 @@
 						<!-- <u-icon name="arrow-right" color="#999999"></u-icon> -->
 					</view>
 				</view>
+				<view class="part_two">
+					<view class="two_left">骑手所在站点</view>
+					<view class="two_right">
+						{{qiZhandian}}
+						<!-- <u-icon name="arrow-right" color="#999999"></u-icon> -->
+					</view>
+				</view>
 			</view>
 		</u-popup>
 		<u-popup v-model="Authorization" mode="center" close-icon="close-circle" close-icon-pos="top-right"
@@ -1101,6 +1108,7 @@
 				arr: [],
 				showModal111: true,
 				orderNum: 0,
+				qiZhandian:'',
 				goodsPicture: [],
 				count: 3,
 				duanxin:[],//发送的短信
@@ -1160,6 +1168,7 @@
 		onShow() {
 			let that = this
 			that.getOrderNum()
+			that.getZhandian()
 			//是否开启骑手新订单推送 340
 			that.$Request.getT('/app/common/type/340').then(res => {
 				if (res.code === 0) {
@@ -1522,6 +1531,18 @@
 					}
 				});
 			},
+			//获取骑手所在站点
+			getZhandian(){
+				let data = {
+					userId: uni.getStorageSync('userId'),
+				}
+				this.$Request.get('/admin/riderStation/getRiderStationName',data).then(res => {
+					console.log('骑手站点',this.userId,res)
+					if (res.code == 0 && res.data.stationName) {
+						this.qiZhandian = res.data.stationName
+					}
+				});
+			},
 			// 上传骑手位置
 			getLocation() {
 				if (this.userId) {
@@ -1946,6 +1967,16 @@
 					title: '加载中',
 					mask: true, // 是否显示透明蒙层，防止触摸穿透
 				});
+				var daa={
+					buyTpye:"",// 购买类型 0：骑手就近购买；1：用户指定地址购买"
+					indentType: this.indentType,
+					limit: 10,
+					page: this.page1,
+					receivingPattern: this.receivingPettern,
+					riderLat: this.latitude,
+					riderLng: this.longitude
+				}
+				console.log('之前',daa)
 				this.$Request.postJson('/app/tbindent/find-new-indent-group-by-shop', {
 					buyTpye:"",// 购买类型 0：骑手就近购买；1：用户指定地址购买"
 					indentType: this.indentType,

pages/riderMy/approve/approve.vue

@@ -9,6 +9,9 @@
 					<u-form-item label="证件号码" :border-bottom='false'>
 						<u-input :disabled="disabled" placeholder="请输入身份证号码" v-model="form.identityCardNumber" />
 					</u-form-item>
+					<u-form-item label="骑手所在站点" :border-bottom='false'>
+						<u-input v-model="form.qishouzhan" placeholder="请选择骑手所在站点" disabled @click="show = true" />
+					</u-form-item>
 				</u-form>
 			</view>
 			<view class=" padding bg-white radius margin-top">
@@ -94,6 +97,8 @@
 				<view class="pay_btns" @click="pay()">确认支付</view>
 			</view>
 		</u-popup>
+		<!-- 站点分类列表 -->
+		<u-select v-model="show" :list="zhandianList" valueName='id' labelName="stationName" @confirm="confirm"></u-select>
 	</view>
 </template>
 
@@ -103,7 +108,10 @@
 	export default {
 		data() {
 			return {
+				show: false,
 				form: {
+					qishouzhan:'',//骑手站点名
+					riderStationId:'',//骑手站点id
 					userName: '',
 					// phone: '',
 					identityCardNumber: '',
@@ -136,7 +144,8 @@
 				openWay: 1,
 				openLists: [],
 				indentNumber: '',
-				XCXIsSelect:'否'
+				XCXIsSelect:'否',
+				zhandianList:[],//站点列表
 			}
 		},
 		onLoad() {
@@ -187,11 +196,27 @@
 				}
 			]
 			// #endif
-
+			
+			this.getZhanList()
 			this.getRZmoney()
 			this.sessionkey = this.$queue.getData("sessionkey");
 		},
 		methods: {
+			//选择站点分类
+			confirm(e) {
+				console.log(e)
+				this.form.qishouzhan = e[0].label
+				this.form.riderStationId = e[0].value
+			},
+			//站点下拉框
+			getZhanList() {
+				this.$Request.get("/admin/riderStation/stationList").then(res => {
+					console.log(res,'站点hhhh')
+					if (res.code == 0) {
+						this.zhandianList = res.data
+					}
+				});
+			},
 			isShowAgree() {
 				this.showAgree = !this.showAgree
 			},
@@ -225,6 +250,14 @@
 					})
 					return;
 				}
+				if (!that.form.qishouzhan) {
+					uni.showToast({
+						title: '请选择骑手所在站点',
+						icon: 'none',
+						duration: 1000
+					})
+					return;
+				}
 				if (!that.form.identityCardFront) {
 					uni.showToast({
 						title: '请上传身份证正面',

pages/riderMy/myAccount/Txmoney/Txmoney.vue

@@ -29,6 +29,31 @@
 				</view>
 			</view>
 		</view>
+		<view style="margin-top:59upx" class="padding-lr margin-lr-sm">
+			<view class="yinghang">提现银行卡信息</view>
+			<view style="color:#333333;text-align: left;">
+				银行卡号：<text class="yinghang2">{{yingNo}}</text>
+			</view>
+			<view style="color:#333333;text-align: left;">
+				开户行：<text class="yinghang2">{{yingName}}</text>
+			</view>
+			<view style="color:#333333;text-align: left;">
+				开户人姓名：<text class="yinghang2">{{yingPeople}}</text>
+			</view>
+			<!-- <view class="flex justify-between margin-bottom-xl" v-for="(item,index) in openLists" :key="index">
+				<view class="flex align-center">
+					<image :src="item.image" style="width:23px;height:20px"></image>
+					<text class="text-lg margin-left-sm" style="color:#333333;font-weight:700;">{{item.text}}</text>
+				</view>
+				<view>
+					<radio-group name="openWay" style="margin-left: 20upx;" @tap='selectWay(item)'>
+						<label class="tui-radio">
+							<radio color="#FF7F00" :checked="openWay === item.id ? true : false" />
+						</label>
+					</radio-group>
+				</view>
+			</view> -->
+		</view>
 		<view class="part_four">
 			<view class="submit" @click="getOut()">立即提现</view>
 			<view class="four_box">
@@ -655,4 +680,18 @@ import configdata from '../../../../common/config.js';
 		justify-content: center;
 		align-items: center;
 	}
+	/* // 提现银行卡信息 */
+	.yinghang{
+		height: 80rpx;
+		line-height: 80rpx;
+		font-size: 36rpx;
+		font-weight: 700;
+		text-align: left;
+	}
+	.yinghang2{
+		height: 80rpx;
+		line-height: 80rpx;
+		font-size: 36rpx;
+		font-weight: 700;
+	}
 </style>

pages/riderMy/myAccount/myAccount.vue

@@ -3,7 +3,7 @@
 		<view class="account_top">
 			<view class="account_name">账户余额</view>
 			<view class="account_price">{{moneys}}<text>元</text></view>
-			<!-- <view class="account_btn" @click="bindTxmoney">立即提现</view> -->
+			<view class="account_btn" @click="bindTxmoney">立即提现</view>
 		</view>
 		<!-- 我的列表 -->
 		<view class="mylist">

unpackage/dist/dev/mp-weixin/app.json

@@ -24,6 +24,7 @@
     "pages/riderMy/myOnline/myOnline",
     "pages/login/login",
     "pages/login/forgetPwd",
+    "pages/riderMy/myAccount/Txmoney/Txmoney",
     "pages/riderMy/order",
     "pages/riderMy/set/xieyi",
     "pages/riderMy/set/about",

unpackage/dist/dev/mp-weixin/pages/riderMy/approve/approve.json

@@ -6,6 +6,7 @@
     "u-form-item": "/uview-ui/components/u-form-item/u-form-item",
     "u-input": "/uview-ui/components/u-input/u-input",
     "u-button": "/uview-ui/components/u-button/u-button",
-    "u-popup": "/uview-ui/components/u-popup/u-popup"
+    "u-popup": "/uview-ui/components/u-popup/u-popup",
+    "u-select": "/uview-ui/components/u-select/u-select"
   }
 }

unpackage/dist/dev/mp-weixin/pages/riderMy/myAccount/Txmoney/Txmoney.json

@@ -0,0 +1,8 @@
+{
+  "navigationBarTitleText": "余额提现",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u-input": "/uview-ui/components/u-input/u-input",
+    "u-popup": "/uview-ui/components/u-popup/u-popup"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/riderMy/myAccount/Txmoney/Txmoney.wxss

@@ -0,0 +1,179 @@
+
+page {
+	background: #F5F5F5;
+}
+.content {
+	width: 100%;
+}
+.part_one {
+	width: 90%;
+	margin: 0 auto;
+	background: #FFFFFF;
+	margin-top: 20rpx;
+	border-radius: 20rpx;
+	height: 170rpx;
+}
+.one_title {
+	width: 90%;
+	margin: 0 auto;
+	font-size: 32rpx;
+	letter-spacing: 1rpx;
+	padding-top: 30rpx;
+}
+.one_price {
+	width: 90%;
+	margin: 0 auto;
+	margin-top: 20rpx;
+	font-size: 47rpx;
+	font-weight: bold;
+}
+.part_two {
+	width: 90%;
+	margin: 0 auto;
+	background: #FFFFFF;
+	margin-top: 20rpx;
+	border-radius: 20rpx;
+}
+.two_title {
+	width: 90%;
+	margin: 0 auto;
+	line-height: 95rpx;
+	font-size: 34rpx;
+}
+.two_title text {
+	font-size: 27rpx;
+	margin-left: 34rpx;
+}
+.two_box {
+	width: 90%;
+	margin: 0 auto;
+	display: flex;
+	align-items: center;
+	font-size: 32rpx;
+	font-weight: bold;
+}
+.u-input__input {
+	font-size: 50rpx !important;
+	color: #747474 !important;
+	border-bottom: 1rpx solid #cccccc;
+}
+.tit {
+	width: 90%;
+	margin: 0 auto;
+	font-size: 31rpx;
+	margin-top: 10rpx;
+	color: black;
+}
+.beizhu {
+	width: 90%;
+	margin: 0 auto;
+	line-height: 55rpx;
+	color: red;
+	letter-spacing: 1rpx;
+}
+.part_three {
+	width: 90%;
+	margin: 0 auto;
+	background: #FFFFFF;
+	margin-top: 20rpx;
+	border-radius: 20rpx;
+}
+.three_name {
+	width: 90%;
+	margin: 0 auto;
+	font-size: 33rpx;
+	color: black;
+	line-height: 80rpx;
+}
+.btn {
+	width: 96%;
+	margin: 0 auto;
+	display: flex;
+	padding-bottom: 30rpx;
+}
+.btn_left {
+	flex: 1;
+	height: 90rpx;
+	border: 1rpx solid #ccc;
+	border-radius: 20rpx;
+	margin-right: 10rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.btn_right {
+	flex: 1;
+	/* width: 240rpx; */
+	height: 90rpx;
+	border: 1rpx solid #ccc;
+	border-radius: 20rpx;
+	margin-left: 10rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.btna {
+	border: 1rpx solid #E34B21 !important;
+}
+.btn_left image {
+	width: 50rpx;
+	height: 50rpx;
+	margin-right: 12rpx;
+}
+.btn_right image {
+	width: 50rpx;
+	height: 50rpx;
+	margin-right: 12rpx;
+}
+.part_four {
+	width: 90%;
+	margin: 0 auto;
+	/* background: #FFFFFF; */
+	margin-top: 20rpx;
+	border-radius: 20rpx;
+}
+.submit {
+	width: 100%;
+	height: 90rpx;
+	background: #F8501F;
+	color: #F8EBD2;
+	text-align: center;
+	line-height: 90rpx;
+	font-size: 37rpx;
+	border-radius: 12rpx;
+}
+.four_box {
+	width: 90%;
+	margin: 0 auto;
+	height: 125rpx;
+	display: flex;
+	color: #838383;
+}
+.box_left {
+	flex: 1;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.box_right {
+	flex: 1;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+/* // 提现银行卡信息 */
+.yinghang{
+	height: 80rpx;
+	line-height: 80rpx;
+	font-size: 36rpx;
+	font-weight: 700;
+	text-align: left;
+}
+.yinghang2{
+	height: 80rpx;
+	line-height: 80rpx;
+	font-size: 36rpx;
+	font-weight: 700;
+}
+

unpackage/dist/dev/mp-weixin/uview-ui/components/u-select/u-select.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "u-popup": "/uview-ui/components/u-popup/u-popup"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/uview-ui/components/u-select/u-select.wxss

@@ -0,0 +1,83 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* uni.scss */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-select__action.data-v-a577ac80 {
+  position: relative;
+  line-height: 70rpx;
+  height: 70rpx;
+}
+.u-select__action__icon.data-v-a577ac80 {
+  position: absolute;
+  right: 20rpx;
+  top: 50%;
+  transition: -webkit-transform .4s;
+  transition: transform .4s;
+  transition: transform .4s, -webkit-transform .4s;
+  -webkit-transform: translateY(-50%);
+          transform: translateY(-50%);
+  z-index: 1;
+}
+.u-select__action__icon--reverse.data-v-a577ac80 {
+  -webkit-transform: rotate(-180deg) translateY(50%);
+          transform: rotate(-180deg) translateY(50%);
+}
+.u-select__hader__title.data-v-a577ac80 {
+  color: #606266;
+}
+.u-select--border.data-v-a577ac80 {
+  border-radius: 6rpx;
+  border-radius: 4px;
+  border: 1px solid #dcdfe6;
+}
+.u-select__header.data-v-a577ac80 {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  height: 80rpx;
+  padding: 0 40rpx;
+}
+.u-select__body.data-v-a577ac80 {
+  width: 100%;
+  height: 500rpx;
+  overflow: hidden;
+  background-color: #fff;
+}
+.u-select__body__picker-view.data-v-a577ac80 {
+  height: 100%;
+  box-sizing: border-box;
+}
+.u-select__body__picker-view__item.data-v-a577ac80 {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  font-size: 32rpx;
+  color: #303133;
+  padding: 0 8rpx;
+}
+