更新骑手接单池和转单

my/feedback/index.vue

@@ -5,7 +5,7 @@
 			<text @tap="chooseMsg">快速键入</text>
 		</view>
 		<view class="feedback-body"><textarea placeholder="请详细描述你的问题和意见..." v-model="sendDate.feedbackMessage" class="feedback-textare" /></view>
-		<view class="feedback-title"><text>QQ/邮箱</text></view>
+		<view class="feedback-title"><text>联系方式</text></view>
 		<view class="feedback-body"><input class="feedback-input" v-model="sendDate.userEmail" placeholder="方便我们联系你" /></view>
 
 		<button style="" class="feedback-submit" @tap="send">提交</button>
@@ -87,7 +87,7 @@ export default {
 			if (!this.sendDate.userEmail) {
 				uni.showToast({
 					icon: 'none',
-					title: '请填写QQ或邮箱'
+					title: '请填写联系方式'
 				});
 				return;
 			}

my/other/cashDetail.vue

@@ -34,7 +34,17 @@
 			</view>
 
 			<view style="margin-top:59upx" class="padding-lr margin-lr-sm">
-				<view class="flex justify-between margin-bottom-xl" v-for="(item,index) in openLists" :key="index">
+				<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>
@@ -46,7 +56,7 @@
 							</label>
 						</radio-group>
 					</view>
-				</view>
+				</view> -->
 			</view>
 
 			<view @click="getOut()"
@@ -55,12 +65,12 @@
 			</view>
 
 			<view style="display: flex;width: 100%;justify-content: center;">
-				<view style="color: grey;padding-bottom: 30px;padding-top: 20upx;flex: 1;" @click="goZhifuBao">提现账号
-				</view>
+				<!-- <view style="color: grey;padding-bottom: 30px;padding-top: 20upx;flex: 1;" @click="goZhifuBao">提现账号
+				</view> -->
 				<view style="color: grey;padding-bottom: 30px;padding-top: 20upx;flex: 1;" @click="goqianbao">钱包明细
 				</view>
-				<view style="color: grey;padding-bottom: 30px;padding-top: 20upx;flex: 1;" @click="isShow">微信收款码
-				</view>
+				<!-- <view style="color: grey;padding-bottom: 30px;padding-top: 20upx;flex: 1;" @click="isShow">微信收款码
+				</view> -->
 				<view style="color: grey;padding-bottom: 30px;padding-top: 20upx;flex: 1;" @click="gojilu">提现记录
 				</view>
 			</view>
@@ -130,11 +140,16 @@
 				openLists: [],
 				openWay: 1,
 				values: '',
-				wximg: ''
+				wximg: '',
+				yingName:'',
+				yingNo:'',
+				yingPeople:'',
+				
 			};
 		},
 		onLoad() {
 			this.getUserInfo()
+			this.getyinghanglist()
 			this.$Request.getT('/common/type/290').then(res => { //判断微信提现方式
 				if (res.code == 0) {
 					if (res.data && res.data.value) {
@@ -165,6 +180,7 @@
 		onShow: function(e) {
 			this.getwalletMoney();
 			this.getUserInfo()
+			this.getyinghanglist()
 
 
 		},
@@ -172,6 +188,26 @@
 			this.list();
 		},
 		methods: {
+			//获取商户银行信息
+			getyinghanglist(){
+				let data = {
+					userId: this.$queue.getData('userId')
+				}
+				this.$Request.getA('/admin/shop/bank/get-by-user',
+					data).then(
+					res => {
+						if (res.msg == 'success') {
+							this.yingName=res.data.openBank
+							this.yingNo=res.data.cardNo
+							this.yingPeople=res.data.realName
+						}else if(res.msg=='shopId对应的银行卡记录不存在'){
+							uni.showToast({
+								icon: 'none',
+								title: '银行信息不完整无法提现'
+							});
+						}
+					});
+			},
 			//用户收款码弹框
 			isShow() {
 				this.getUserInfo()
@@ -290,7 +326,7 @@
 									that.$queue.showLoading("提现中...");
 									let data = {
 										money: that.moneys,
-										classify: '1'
+										// classify: '1'
 									}
 									that.$Request.getT('/shop/shopmoney/shopCashMoney', data).then(
 										res => {
@@ -353,7 +389,7 @@
 												that.$queue.showLoading('提现中...');
 												let data = {
 													money: that.moneys,
-													classify: 2
+													// classify: 2
 												}
 												that.$Request.getT('/shop/shopmoney/shopCashMoney',
 													data).then(
@@ -409,7 +445,7 @@
 										that.$queue.showLoading('提现中...');
 										let data = {
 											money: that.moneys,
-											classify: 2
+											// classify: 2
 										}
 										that.$Request.getT('/shop/shopmoney/shopCashMoney', data).then(
 											res => {
@@ -478,5 +514,19 @@
 			color: #ffffff;
 			margin-bottom: 10px;
 		}
+		// 提现银行卡信息
+		.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>

my/other/wallet.vue

@@ -30,7 +30,7 @@
 						class="view2-view-image-right"></image>
 				</view>
 			</view>
-			<view class="view2-view" @click="goZhifuBao">
+			<!-- <view class="view2-view" @click="goZhifuBao">
 				<image src="https://api.shengqianxiong.com.cn/img/20201118/86efb280c3d2416e86e7b1900bbe17ff.png"
 					class="view2-view-image"></image>
 				<view class="view2-view1">
@@ -39,7 +39,7 @@
 						src="https://api.shengqianxiong.com.cn/file/uploadPath/2021/10/08/9a7ea5f18fae76c2f9c9d5b3e8323f4e.png"
 						class="view2-view-image-right"></image>
 				</view>
-			</view>
+			</view> -->
 			<view class="view2-view" @tap="list">
 				<image src="https://api.shengqianxiong.com.cn/img/20201118/5ce91ac860334fc9ac09c977467607cd.png"
 					class="view2-view-image"></image>

my/publish/goods.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="padding">
 		<view class="text-white padding bg radius">
+			<div style="color:red;">新增商品默认库存为1000件，需要修改可点击操作批量修改库存</div>
 			<u-form :model="shop" label-position="top">
 				<u-form-item label="商品标题">
 					<u-input v-model="shop.goodsName" placeholder="请填写商品标题" />

my/store/addgood.vue

@@ -680,9 +680,9 @@
 	}
 
 	.boxs {
-		width: 150upx;
+		// width: 150upx;
 		height: 55upx;
-		border: 2upx solid #CCCCCC;
+		// border: 2upx solid #CCCCCC;
 		border-radius: 28upx;
 		text-align: center;
 		line-height: 55upx;
@@ -692,7 +692,7 @@
 	}
 
 	.actives {
-		width: 150upx;
+		// width: 150upx;
 		height: 55upx;
 		border: 2upx solid #FFCC00;
 		border-radius: 28upx;

pages.json

@@ -210,12 +210,14 @@
 				"style": {
 					"navigationBarTitleText": "我的钱包"
 				}
-			}, {
-				"path": "other/zhifubao",
-				"style": {
-					"navigationBarTitleText": "提现账号"
-				}
-			}, {
+			}, 
+			// {
+			// 	"path": "other/zhifubao",
+			// 	"style": {
+			// 		"navigationBarTitleText": "提现账号"
+			// 	}
+			// }, 
+			{
 				"path": "other/cashList",
 				"style": {
 					"navigationBarTitleText": "钱包明细",

pages/my/index.vue

@@ -22,7 +22,7 @@
 					登录
 				</view>
 			</view>
-			<view class="moneybox" v-if="XCXIsSelect != '否'">
+			<view class="moneybox" v-if="XCXIsSelect == '是'">
 				<view class="padding" style="background: #FCD202;border-radius: 20upx 20upx 0upx 0upx;">
 					<view class="flex justify-between">
 						<view>
@@ -90,7 +90,7 @@
 				<image src="../../static/images/my/right.png" class="images" mode=""></image>
 			</view>
 			<!-- 保证金 -->
-			<view class="flex padding-lr padding-tb" @click="goNav(list[5].url)" v-if="XCXIsSelect != '否'">
+			<view class="flex padding-lr padding-tb" @click="goNav(list[5].url)" v-if="XCXIsSelect == '是'">
 				<image :src="list[5].image" style="width: 50rpx;height: 50rpx;" mode=""></image>
 				<view class="flex-sub margin-left text-df" style="line-height: 50upx;">{{list[5].title}}</view>
 				<image src="../../static/images/my/right.png" class="images" mode=""></image>
@@ -138,7 +138,7 @@
 				<image src="../../static/images/my/right.png" class="images" mode=""></image>
 			</view> -->
 			<!-- 意见反馈 -->
-			<view class="flex padding-lr padding-tb dfs" @click="goNav(list[8].url)" v-if="XCXIsSelect != '否'">
+			<view class="flex padding-lr padding-tb dfs" @click="goNav(list[8].url)" v-if="XCXIsSelect == '是'">
 				<image :src="list[8].image" style="width: 50rpx;height: 50rpx;" mode=""></image>
 				<view class="flex-sub margin-left text-df" style="line-height: 50upx;">{{list[8].title}}</view>
 				<image src="../../static/images/my/right.png" class="images" mode=""></image>
@@ -260,7 +260,7 @@
 					url: '/my/yhq/yhq'
 				}],
 				renzheng: 0,
-				XCXIsSelect: '是',
+				XCXIsSelect: '否',
 				isCashDeposit: '',
 				show: false,
 				shopQrImg: '',

pages/order/orderDet.vue

@@ -61,8 +61,12 @@
 						<view class="tosend_header_food_text2"><text>¥</text>{{item.goodsPack}}/份</view>
 					</view>
 				</view>
-				<view class="tosend_header_do do_top" v-if="dataDet.errandMoney>0&& dataDet.orderType == 2">
-					<view>配送费</view>
+				<view class="tosend_header_do do_bot" v-if="dataDet.errandMoney>0&&dataDet.orderType==2 && dataDet.errandMoneyIsShop=='本单未达到商家满减金额，跑腿费由用户承担'">
+					<view>跑腿费</view>
+					<view class="tosend_header_do_ri">￥{{dataDet.errandMoney}}</view>
+				</view>
+				<view class="tosend_header_do do_bot" v-if="dataDet.errandMoney>0&&dataDet.orderType==2 && dataDet.errandMoneyIsShop=='商家未开启配送费满减，跑腿费由用户承担'">
+					<view>跑腿费</view>
 					<view class="tosend_header_do_ri">￥{{dataDet.errandMoney}}</view>
 				</view>
 				<!-- <view class="tosend_header_do" v-if="dataDet.packMoney>0&& dataDet.orderType == 2">

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

@@ -43,7 +43,6 @@
         "other/about",
         "feedback/index",
         "other/wallet",
-        "other/zhifubao",
         "other/cashList",
         "other/moneydetail",
         "other/cashDetail",

unpackage/dist/dev/mp-weixin/my/components/com-input.json

@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "component": true
-}

unpackage/dist/dev/mp-weixin/my/components/com-input.wxss

@@ -1,125 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.main-input {
-  flex: 1;
-  text-align: left;
-  /* color: white; */
-  font-size: 16px;
-  padding-right: 6px;
-  margin-left: 10px;
-  border: 1rpx solid #d9d9d9;
-  height: 90rpx;
-  border-radius: 10rpx;
-  padding: 0px 10px;
-}
-.icon .mix-list-cell.b-b:after {
-  left: 45px;
-}
-.placeholder-class {
-  color: white;
-  opacity: 0.5;
-}
-.mix-list-cell {
-  border-radius: 32rpx;
-  margin-top: 1px;
-  font-size: 32rpx;
-  background: #ffffff;
-  text-align: left;
-  display: flex;
-  margin: 32rpx;
-  /* padding: 24upx 32upx; */
-  position: relative;
-}
-.mix-list-cell.cell-hover {
-  background: transparent;
-}
-.mix-list-cell.b-b:after {
-  left: 16px;
-}
-.mix-list-cell .cell-icon {
-  align-self: center;
-  width: 28px;
-  max-height: 30px;
-  font-size: 18px;
-}
-.mix-list-cell .cell-more {
-  align-self: center;
-  font-size: 16px;
-  color: #606266;
-  margin-left: 10px;
-}
-.mix-list-cell .cell-tit {
-  width: 80px;
-  font-size: 16px;
-  /* color: white; */
-  display: flex;
-  align-items: center;
-}
-.mix-list-cell .cell-tip {
-  font-size: 14px;
-  color: white;
-}
-.items {
-  position: absolute;
-  height: 48px;
-  width: 100%;
-  background: #FFFFFF;
-  /*opacity:0.05;*/
-}
-.main-list {
-  opacity: 0.8;
-  z-index: 88;
-  background: white;
-  border: 1px solid white;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  height: 18px;
-  /* Input 高度 */
-  color: #333333;
-  padding: 16px;
-  margin-top: 12px;
-  margin-bottom: 12px;
-}
-.img {
-  width: 16px;
-  height: 16px;
-  font-size: 16px;
-}
-.vercode {
-  color: #e10a07;
-  font-size: 14px;
-}
-.vercode-run {
-  color: black !important;
-}
-.oBorder {
-  border-radius: 2.5rem;
-  box-shadow: 0 0 30px 0 rgba(43, 86, 112, 0.1);
-}
-

unpackage/dist/dev/mp-weixin/my/components/watch-login/watch-button.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

unpackage/dist/dev/mp-weixin/my/components/watch-login/watch-button.wxml

@@ -1 +0,0 @@
-<view><button class="{{['buttonBorder',!_rotate?'dlbutton':'dlbutton_loading']}}" style="{{'background:'+(bgColor)+';'+('color:'+(fontColor)+';')}}"><view class="{{[_rotate?'rotate_loop':'']}}"><block wx:if="{{_rotate}}"><text class="cuIcon cuIcon-loading1 "></text></block><block wx:if="{{!_rotate}}"><text>{{text}}</text></block></view></button></view>

unpackage/dist/dev/mp-weixin/my/other/cashDetail.wxss

@@ -26,4 +26,17 @@
   color: #ffffff;
   margin-bottom: 10px;
 }
+.cash .yinghang {
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 36rpx;
+  font-weight: 700;
+  text-align: left;
+}
+.cash .yinghang2 {
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 36rpx;
+  font-weight: 700;
+}
 

unpackage/dist/dev/mp-weixin/my/other/zhifubao.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "提现账号",
-  "usingComponents": {
-    "list-cell": "/my/components/com-input",
-    "w-button": "/my/components/watch-login/watch-button"
-  }
-}

unpackage/dist/dev/mp-weixin/my/other/zhifubao.wxss

@@ -1,51 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-page {
-  background-color: #FFFFFF;
-}
-.container {
-  padding-top: 32rpx;
-  position: relative;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  background: #FFFFFF;
-}
-.confirm-btn {
-  width: 300px;
-  height: 42px;
-  line-height: 42px;
-  border-radius: 30px;
-  margin-top: 70rpx;
-  background: #e10a07;
-  color: #fff;
-  font-size: 32rpx;
-}
-.confirm-btn:after {
-  border-radius: 60px;
-}
-

unpackage/dist/dev/mp-weixin/my/store/addgood.wxss

@@ -70,9 +70,7 @@ page.data-v-4246d39b {
   background: #FFFFFF;
 }
 .boxs.data-v-4246d39b {
-  width: 150rpx;
   height: 55rpx;
-  border: 2rpx solid #CCCCCC;
   border-radius: 28rpx;
   text-align: center;
   line-height: 55rpx;
@@ -81,7 +79,6 @@ page.data-v-4246d39b {
   display: inline-block;
 }
 .actives.data-v-4246d39b {
-  width: 150rpx;
   height: 55rpx;
   border: 2rpx solid #FFCC00;
   border-radius: 28rpx;

unpackage/dist/dev/mp-weixin/pages/order/orderDet.wxss

@@ -599,6 +599,10 @@
 
 
 
+
+
+
+
 /* 余额 */
 .tosend.data-v-50e4cd82 {
 	width: 100%;

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

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