From b29428ffdb4e49a94703cc5d52fcd8fd78b92825 Mon Sep 17 00:00:00 2001
From: "zoomtk@126.com" <zoomtk@126.com>
Date: Fri, 7 Apr 2023 17:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   5 -
 common/js/diy.js                              |   3 -
 components/common-payment/common-payment.vue  |  31 +-
 components/diy-components/diy-graphic-nav.vue |   3 +-
 components/diy-components/diy-member-info.vue |   5 +-
 components/payment/payment.vue                |   2 +
 pages.json                                    |   2 +-
 pages/member/public/js/index.js               |   4 +-
 pages_promotion/fenxiao/apply.vue             |  11 +-
 pages_promotion/fenxiao/apply_upgrade.vue     | 841 ++++++++++------
 pages_promotion/fenxiao/index.vue             |   2 +-
 pages_promotion/presale/payment.vue           |   6 +-
 pages_rush/components/pay-pop/pay-pop.vue     | 174 ++++
 pages_rush/components/pay-pop/static/bg.png   | Bin 0 -> 17033 bytes
 pages_rush/components/pay-pop/static/ht.png   | Bin 0 -> 1033 bytes
 pages_rush/components/pay-pop/static/pwd.png  | Bin 0 -> 5022 bytes
 pages_rush/components/pay-pop/static/pwd1.png | Bin 0 -> 1931 bytes
 pages_rush/components/pay-pop/static/sq.png   | Bin 0 -> 1584 bytes
 .../components/pay-pop/static/szjp.scss       | 288 ++++++
 pages_rush/components/pay-pop/static/yj1.png  | Bin 0 -> 1284 bytes
 pages_rush/components/pay-pop/static/yj2.png  | Bin 0 -> 1437 bytes
 .../uni-popup-dialog/uni-popup-dialog.vue     |   4 +-
 pages_rush/futures/details.vue                | 112 ++-
 pages_rush/futures/list.vue                   |  32 -
 pages_rush/futures/my_shop.vue                |  11 +-
 pages_rush/futures/order.vue                  |  67 +-
 pages_rush/futures/order_details.vue          |   8 +-
 pages_rush/futures/payment.js                 |  67 ++
 pages_rush/futures/payment.vue                |   1 -
 pages_rush/futures/seckill.vue                | 915 +++++++++---------
 pages_rush/order/detail.vue                   |   4 +-
 pages_rush/order/list.vue                     |   6 +-
 pages_tool/member/assets.vue                  |   6 +-
 pages_tool/member/balance_transfer.vue        |  18 +-
 pages_tool/member/info.vue                    |   1 +
 pages_tool/member/info_edit.vue               |  10 +-
 pages_tool/member/pay_password.vue            |   7 -
 pages_tool/member/public/js/info.js           |  11 +-
 38 files changed, 1740 insertions(+), 917 deletions(-)
 create mode 100644 pages_rush/components/pay-pop/pay-pop.vue
 create mode 100644 pages_rush/components/pay-pop/static/bg.png
 create mode 100644 pages_rush/components/pay-pop/static/ht.png
 create mode 100644 pages_rush/components/pay-pop/static/pwd.png
 create mode 100644 pages_rush/components/pay-pop/static/pwd1.png
 create mode 100644 pages_rush/components/pay-pop/static/sq.png
 create mode 100644 pages_rush/components/pay-pop/static/szjp.scss
 create mode 100644 pages_rush/components/pay-pop/static/yj1.png
 create mode 100644 pages_rush/components/pay-pop/static/yj2.png
 create mode 100644 pages_rush/futures/payment.js

diff --git a/App.vue b/App.vue
index 2f2b6e6..ae5516e 100644
--- a/App.vue
+++ b/App.vue
@@ -1,7 +1,6 @@
 <script>
 import auth from 'common/js/auth.js';
 import { Weixin } from 'common/js/wx-jssdk.js';
-
 export default {
 	mixins: [auth],
 	onLaunch: function() {
@@ -30,13 +29,11 @@ export default {
 			// 新的版本下载失败
 		});
 		// #endif
-
 		// #ifdef H5
 		if (uni.getSystemInfoSync().platform == 'ios') {
 			uni.setStorageSync('initUrl', location.href);
 		}
 		// #endif
-
 		uni.onNetworkStatusChange(function(res) {
 			if (!res.isConnected) {
 				uni.showModal({
@@ -46,9 +43,7 @@ export default {
 				});
 			}
 		});
-
 		this.$store.dispatch('init');
-		
 		// #ifdef H5
 		// 自动授权登录
 		if (!uni.getStorageSync('token')) {
diff --git a/common/js/diy.js b/common/js/diy.js
index f25185d..50ffc55 100644
--- a/common/js/diy.js
+++ b/common/js/diy.js
@@ -1,5 +1,4 @@
 import WxMap from 'common/js/map-wx-jssdk.js';
-
 let systemInfo = uni.getSystemInfoSync();
 export default {
 	data() {
@@ -44,9 +43,7 @@ export default {
 		uni.hideTabBar();
 		this.name = data.name || '';
 		this.isDefault = data.is_default || '';
-
 		if (data.source_member) uni.setStorageSync('source_member', data.source_member);
-
 		// 小程序扫码进入
 		if (data.scene) {
 			var sceneParams = decodeURIComponent(data.scene);
diff --git a/components/common-payment/common-payment.vue b/components/common-payment/common-payment.vue
index cd1c047..b7977c5 100644
--- a/components/common-payment/common-payment.vue
+++ b/components/common-payment/common-payment.vue
@@ -6,8 +6,7 @@
 			:style="{
 				'padding-top': menuButtonBounding.top + 'px',
 				height: menuButtonBounding.height + 'px'
-			}"
-		>
+			}">
 			<view class="navbar-title">确认订单</view>
 		</view>
 		<view class="payment-navbar-block" :style="{ height: menuButtonBounding.bottom + 'px' }"></view>
@@ -24,8 +23,7 @@
 								:class="{ active: item.name == orderCreateData.delivery.delivery_type }"
 								v-for="(item, index) in goodsData.express_type"
 								:key="index"
-								@click="selectDeliveryType(item)"
-							>
+								@click="selectDeliveryType(item)">
 								{{ item.title }}
 								<!-- 外圆角 -->
 								<view class="out-radio"></view>
@@ -166,9 +164,7 @@
 												v-if="
 													orderCreateData.delivery &&
 														goodsItem.support_trade_type &&
-														goodsItem.support_trade_type.indexOf(orderCreateData.delivery.delivery_type) == -1
-												"
-											>
+														goodsItem.support_trade_type.indexOf(orderCreateData.delivery.delivery_type) == -1">
 												<text class="iconfont icon-gantanhao"></text>
 												<text>该商品不支持{{ orderCreateData.delivery.delivery_type_name }}</text>
 											</view>
@@ -203,8 +199,7 @@
 							<view
 								class="member-goods-card order-cell"
 								v-if="calculateGoodsData && calculateGoodsData.goods_list[goodsIndex].member_card_list"
-								@click="selectMemberGoodsCard(goodsIndex)"
-							>
+								@click="selectMemberGoodsCard(goodsIndex)">
 								<text class="tit">次卡抵扣</text>
 								<view class="box text-overflow">
 									<block v-if="calculateGoodsData.goods_list[goodsIndex].card_promotion_money">
@@ -231,32 +226,25 @@
 				</view>
 
 				<view class="site-wrap buyer-message" v-if="createDataKey !== 'futuresOrderCreateData'">
-					<view class="order-cell">
+					<!-- <view class="order-cell">
 						<text class="tit">买家留言</text>
 						<view class="box text-overflow " @click="openPopup('buyerMessagePopup')">
 							<text v-if="orderCreateData.buyer_message">{{ orderCreateData.buyer_message }}</text>
 							<text class="color-sub" v-else>无留言</text>
 						</view>
 						<text class="iconfont icon-right"></text>
-					</view>
+					</view> -->
 				</view>
-
 				<view v-if="paymentData.system_form" class="system-form-wrap">
 					<view class="order-cell">
 						<text class="tit">{{ paymentData.system_form.form_name }}</text>
 					</view>
 					<ns-form :data="paymentData.system_form.json_data" ref="form"></ns-form>
 				</view>
-
 				<view
-					class="site-wrap"
-					v-if="
-						(calculateGoodsData && calculateGoodsData.coupon_list && calculateGoodsData.coupon_list.length) ||
-							promotionInfo ||
-							(calculateGoodsData && calculateGoodsData.max_usable_point > 0) ||
-							goodsData.invoice
-					"
-				>
+					class="site-wrap" v-if="(calculateGoodsData && calculateGoodsData.coupon_list && calculateGoodsData.coupon_list.length) ||
+							promotionInfo ||(calculateGoodsData && calculateGoodsData.max_usable_point > 0) ||
+							goodsData.invoice">
 					<view class="site-footer">
 						<view class="order-cell coupon" v-if="calculateGoodsData && calculateGoodsData.coupon_list && calculateGoodsData.coupon_list.length">
 							<text class="tit">优惠券</text>
@@ -298,7 +286,6 @@
 						</view>
 					</view>
 				</view>
-
 				<view class="site-wrap box member-card-wrap" v-if="paymentData.recommend_member_card">
 					<view class="head" @click="selectMemberCard">
 						<text class="iconfont icon-huiyuan"></text>
diff --git a/components/diy-components/diy-graphic-nav.vue b/components/diy-components/diy-graphic-nav.vue
index aabc0f5..ee500ff 100644
--- a/components/diy-components/diy-graphic-nav.vue
+++ b/components/diy-components/diy-graphic-nav.vue
@@ -26,8 +26,7 @@
 						<view
 							class="graphic-img"
 							v-show="value.mode != 'text'"
-							:style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }"
-						>
+							:style="{ fontSize: value.imageSize * 2 + 'rpx', width: value.imageSize * 2 + 'rpx', height: value.imageSize * 2 + 'rpx' }">
 							<image
 								v-if="item.iconType == 'img'"
 								:src="$util.img(item.imageUrl) || $util.img('public/uniapp/default_img/goods.png')"
diff --git a/components/diy-components/diy-member-info.vue b/components/diy-components/diy-member-info.vue
index 25e1d44..e3ab45d 100644
--- a/components/diy-components/diy-member-info.vue
+++ b/components/diy-components/diy-member-info.vue
@@ -98,8 +98,9 @@
 						<view class="title">积分</view>
 					</view>
 					<view class="solid"></view>
-					<view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">
-						<view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.diamond != undefined ? parseInt(fenxiaoInfo.diamond) : '--' }}</view>
+					<view class="account-item" @click="redirect('/pages_tool/member/balance_detail',{'from_type':'diamond'})">
+						<view class="value price-font">{{ memberInfo ? memberInfo.diamond : '--' }}</view>
+						<!-- <view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.diamond != undefined ? parseInt(fenxiaoInfo.diamond) : '--' }}</view> -->
 						<view class="title">钻石</view>
 					</view>
 <!--          <view class="solid"></view>-->
diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index dc8e4e9..22726e0 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -235,6 +235,7 @@
 					success: res => {
 						uni.hideLoading();
 						if (res.code >= 0) {
+							console.log(1111);
 							if (res.data.pay_success) {
 								this.paySuccess();
 								return;
@@ -435,6 +436,7 @@
 			 * 支付成功之后跳转
 			 */
 			paySuccess() {
+				console.log(this.payInfo)
 				if (this.payInfo.event == 'BlindboxGoodsOrderPayNotify') {
 					this.$util.redirectTo('/pages_promotion/blindbox/index', {
 						outTradeNo: this.payInfo.out_trade_no
diff --git a/pages.json b/pages.json
index b370baf..2181d94 100644
--- a/pages.json
+++ b/pages.json
@@ -895,7 +895,7 @@
 						// #ifdef H5
 						"navigationStyle": "custom",
 						// #endif
-						"navigationBarTitleText": "分销商"
+						"navigationBarTitleText": "服务商"
 					}
 				},
 				{
diff --git a/pages/member/public/js/index.js b/pages/member/public/js/index.js
index 7490dda..83ed6fa 100644
--- a/pages/member/public/js/index.js
+++ b/pages/member/public/js/index.js
@@ -23,7 +23,6 @@ export default {
 	onLoad(data) {
 		uni.hideTabBar();
 		this.name = 'DIY_VIEW_MEMBER_INDEX';
-
 		if (data.code) {
 			this.$api.sendRequest({
 				url: '/wechat/api/wechat/authcodetoopenid',
@@ -33,8 +32,7 @@ export default {
 				success: res => {
 					if (res.code >= 0) {
 						if (res.data.userinfo.nickName) this.modifyNickname(res.data.userinfo.nickName);
-						if (res.data.userinfo.avatarUrl) this.modifyHeadimg(res.data.userinfo
-							.avatarUrl);
+						if (res.data.userinfo.avatarUrl) this.modifyHeadimg(res.data.userinfo.avatarUrl);
 					}
 				}
 			});
diff --git a/pages_promotion/fenxiao/apply.vue b/pages_promotion/fenxiao/apply.vue
index f5d9f43..1a68b8a 100644
--- a/pages_promotion/fenxiao/apply.vue
+++ b/pages_promotion/fenxiao/apply.vue
@@ -8,7 +8,6 @@
 		<!-- #ifndef H5 -->
 		<!-- <view class="head-nav color-base-bg" :class="{ active: isIphoneX }"></view> -->
 		<!-- #endif -->
-
 		<view v-if="status === ''">
 			<block v-if="basicsConfig.is_apply == 1">
 				<view class="image" :class="fenXiaoAgreement.agreement.img ? '' : 'color-base-bg'">
@@ -18,7 +17,6 @@
 						<view class="bg-img"><image :src="$util.img('public/uniapp/fenxiao/apply/edit.png')" mode="scaleToFill"></image></view>
 					</view>
 				</view>
-				
 				<view class="apply-wrap">
 					<view class="app-info">
 						<view class="info">
@@ -51,7 +49,6 @@
 							</view>
 						</view>
 					</view>
-				
 					<view class="apply-message-wrap" v-if="fenxiaoConfig.fenxiao_condition == 2 || fenxiaoConfig.fenxiao_condition == 3">
 						<view class="apply-message">
 							<view class="apply-message-title color-base-bg-before">分销商申请条件</view>
@@ -136,8 +133,8 @@
 			<text v-if="status == 1">您已提交{{ fenxiaoWords.fenxiao_name }}申请，等待平台审核</text>
 			<block v-else-if="status == -1">
 				<text>您提交的{{ fenxiaoWords.fenxiao_name }}申请，已被拒绝，请再接再厉</text>
-				<view class="again-btn color-base-bg" @click="againApply" v-if="fenxiaoConfig.fenxiao_condition != 0">重新申请</view>
-				<view class="again-btn color-base-bg" @click="applyFenXiao" v-else>重新申请</view>
+				<view class="again-btn color-base-bg" @click="againApply">重新申请</view>
+				<!-- <view class="again-btn color-base-bg" @click="applyFenXiao" v-else>重新申请</view> -->
 			</block>
 		</view>
 		<view @touchmove.prevent v-if="fenXiaoAgreement.document">
@@ -426,7 +423,6 @@ export default {
 	}
 };
 </script>
-
 <style lang="scss">
 .image {
 	width: 100%;
@@ -497,7 +493,6 @@ input::placeholder {
 	.apply-adv {
 		width: 100%;
 	}
-
 	.apply-wrap {
 		padding-bottom: 100rpx;
 		.app-info {
@@ -793,13 +788,11 @@ input::placeholder {
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-
 		image {
 			width: 300rpx;
 			height: 176rpx;
 			margin-bottom: 50rpx;
 		}
-
 		text {
 			font-size: $font-size-goods-tag;
 			font-weight: 600;
diff --git a/pages_promotion/fenxiao/apply_upgrade.vue b/pages_promotion/fenxiao/apply_upgrade.vue
index da88a01..41c0b41 100644
--- a/pages_promotion/fenxiao/apply_upgrade.vue
+++ b/pages_promotion/fenxiao/apply_upgrade.vue
@@ -1,184 +1,398 @@
 <template>
 	<page-meta :page-style="themeColor"></page-meta>
 	<view class="apply-upgrade">
-    <!--顶部提示内容-->
-    <view class="top-tips" v-if="parseInt(info.status) === 3">驳回原因：{{ info.reject_cause }}</view>
-    <!--表单让你-->
-    <view class="title">1.填写注册申请代理的信息</view>
-    <view class="form-list">
-      <view class="form-list-block">
-        <view class="left">真实姓名</view>
-        <view class="right">
-          <input class="uni-input" v-model="info.username"  placeholder="请输入真实姓名" />
-        </view>
-      </view>
-      <view class="form-list-block">
-        <view class="left">联系电话</view>
-        <view class="right">
-          <input class="uni-input" v-model="info.phone" placeholder="请输入联系电话" />
-        </view>
-      </view>
-      <view class="form-list-block">
-        <view class="left">身份证号</view>
-        <view class="right">
-          <input class="uni-input" v-model="info.id_card" placeholder="请输入身份证号" />
-        </view>
-      </view>
-    </view>
-    <view class="title">2.请拍摄并上传你的有效身份证</view>
-    <view class="id-card">
-      <view class="id-card-content">
-        <view class="id-card-block">
-          <image :src="$util.img(info.id_card_front || default_card_front)" mode="widthFix"></image>
-          <view class="upload-buttons" @click="uploadCard('id_card_front')">上传身份证正面</view>
-        </view>
-        <view class="id-card-block">
-          <image :src="$util.img(info.id_card_reverse || default_card_reverse)" mode="widthFix"></image>
-          <view class="upload-buttons" @click="uploadCard('id_card_reverse')">上传身份证反面</view>
-        </view>
-      </view>
-      <view class="id-card-tips">
-        <view class="id-card-tips-line">大陆公民持有的本人有效二代身份证</view>
-        <view class="id-card-tips-line">
-          上传时确保身份证<text class="tips-stress">边框完整，字体清晰，亮度均匀。</text>
-        </view>
-      </view>
-    </view>
-    <view class="title" v-if="parseInt(info.status) === 3 || parseInt(info.status) === 0">3.请完成协议</view>
-    <view class="agree" v-if="parseInt(info.status) === 3 || parseInt(info.status) === 0">
-      <textarea class="textarea-content" placeholder="请填写如下段落" auto-height v-model="info.upgrade_agree"></textarea>
-      <view class="agree-text">
-        <text class="agree-red">请输入这段话：</text>
-        {{ baseInfo.upgrade_agree }}
-        <text class="agree-red" @click="$util.copy(baseInfo.upgrade_agree)">[复制]</text>
-      </view>
-    </view>
-    <button class="submit-button" @click="submitApply" v-if="parseInt(info.status) === 1" disabled>审核中</button>
-    <button class="submit-button" @click="submitApply" v-if="parseInt(info.status) === 3 || parseInt(info.status) === 0">确定提交</button>
-    <!--登录弹框-->
-    <ns-login ref="login"></ns-login>
-    <!--加载动画-->
+		<view v-if="status === ''">
+			<!--顶部提示内容-->
+			<view class="top-tips" v-if="parseInt(info.status) === 3">驳回原因：{{ info.reject_cause }}</view>
+			<!--表单让你-->
+			<view class="title">1.填写注册申请代理的信息</view>
+			<view class="form-list">
+				<view class="form-list-block">
+					<view class="left">真实姓名</view>
+					<view class="right"><input class="uni-input" v-model="info.username" placeholder="请输入真实姓名" /></view>
+				</view>
+				<view class="form-list-block">
+					<view class="left">联系电话</view>
+					<view class="right"><input class="uni-input" v-model="info.mobile" placeholder="请输入联系电话" /></view>
+				</view>
+				<view class="form-list-block">
+					<view class="left">身份证号</view>
+					<view class="right"><input class="uni-input" v-model="info.id_card" placeholder="请输入身份证号" /></view>
+				</view>
+			</view>
+			<view class="title">2.请拍摄并上传你的有效身份证</view>
+			<view class="id-card">
+				<view class="id-card-content">
+					<view class="id-card-block">
+						<image :src="$util.img(info.id_card_front || default_card_front)" mode="widthFix"></image>
+						<view class="upload-buttons" @click="uploadCard('id_card_front')">上传身份证正面</view>
+					</view>
+					<view class="id-card-block">
+						<image :src="$util.img(info.id_card_reverse || default_card_reverse)" mode="widthFix"></image>
+						<view class="upload-buttons" @click="uploadCard('id_card_reverse')">上传身份证反面</view>
+					</view>
+				</view>
+				<view class="id-card-tips">
+					<view class="id-card-tips-line">大陆公民持有的本人有效二代身份证</view>
+					<view class="id-card-tips-line">
+						上传时确保身份证
+						<text class="tips-stress">边框完整，字体清晰，亮度均匀。</text>
+					</view>
+				</view>
+			</view>
+			<view class="title" v-if="parseInt(info.status) === 3 || parseInt(info.status) === 0">3.请完成协议</view>
+			<view class="agree" v-if="parseInt(info.status) === 3 || parseInt(info.status) === 0">
+				<textarea class="textarea-content" placeholder="请填写如下段落" auto-height v-model="info.upgrade_agree"></textarea>
+				<view class="agree-text">
+					<text class="agree-red">请输入这段话：</text>
+					{{ basicsConfig.upgrade_agree }}
+					<text class="agree-red" @click="$util.copy(basicsConfig.upgrade_agree)">[复制]</text>
+				</view>
+			</view>
+			<button class="submit-button" @click="submitApply">确定提交</button>
+		</view>
+		<view class="empty" v-else>
+			<image :src="$util.img('public/uniapp/fenxiao/index/no-fenxiao.png')" mode="widthFix"></image>
+			<text v-if="status == 1">您已提交{{ fenxiaoWords.fenxiao_name }}申请，等待平台审核</text>
+			<block v-else-if="status == -1">
+				<text>您提交的{{ fenxiaoWords.fenxiao_name }}申请，已被拒绝，请再接再厉</text>
+				<view class="again-btn color-base-bg" @click="againApply">重新申请</view>
+			</block>
+		</view>
+		<!--登录弹框-->
+		<ns-login ref="login"></ns-login>
+		<!--加载动画-->
 		<loading-cover ref="loadingCover"></loading-cover>
 	</view>
 </template>
-
 <script>
+import fenxiaoWords from 'common/js/fenxiao-words.js';
 export default {
-  components: {},
+	components: {},
 	data() {
 		return {
-      baseInfo : {},
-      default_card_front: 'public/static/img/fenxiao/id_card_front.png',
-      default_card_reverse: 'public/static/img/fenxiao/id_card_reverse.png',
-      info: {
-        username: '',
-        phone: '',
-        id_card: '',
-        id_card_front: '',
-        id_card_reverse: '',
-        upgrade_agree: '',
-        status: 0,
-      },
+			isChecked: false,
+			isShow: true,
+			isIphoneX: false,
+			// 推荐人信息
+			sourceMemberInfo: {
+				fenxiao_name: '无'
+			},
+			formData: {
+				fenXiaoName: '',
+				mobile: ''
+			},
+			fenXiaoAgreement: {
+				agreement: {},
+				document: {}
+			},
+			isAgreement: false,
+			back: '',
+			isAbled: false,
+			status: '',
+			isSub: false,
+			fenxiaoConfig: {
+				fenxiao_condition: 0
+			},
+			basicsConfig: {},
+			goodsList: [],
+			isOpen: false,
+			baseInfo: {},
+			default_card_front: 'public/static/img/fenxiao/id_card_front.png',
+			default_card_reverse: 'public/static/img/fenxiao/id_card_reverse.png',
+			info: {
+				username: '',
+				mobile: '',
+				id_card: '',
+				id_card_front: '',
+				id_card_reverse: '',
+				upgrade_agree: '',
+				status: 0
+			}
 		};
 	},
-	mixins: [],
-	onLoad(option) {},
-  onReady(){
-    if (uni.getStorageSync('token')) {
-      this.getBaseInfo();
-    } else {
-      this.$refs.login.open('/pages_promotion/fenxiao/apply_upgrade');
-    }
-  },
-	onShow() {},
+	mixins: [fenxiaoWords],
+	onLoad(option) {
+		if (option.back) this.back = option.back;
+	},
+	onReady() {
+		// if (uni.getStorageSync('token')) {
+		//   this.getBaseInfo();
+		// } else {
+		//   this.$refs.login.open('/pages_promotion/fenxiao/apply_upgrade');
+		// }
+	},
+	async onShow() {
+		setTimeout(() => {
+			if (this.addonIsExist && !this.addonIsExist.fenxiao) {
+				this.$util.showToast({
+					title: '商家未开启分销',
+					mask: true,
+					duration: 2000
+				});
+				setTimeout(() => {
+					this.$util.redirectTo('/pages/index/index');
+				}, 2000);
+				return;
+			}
+		}, 1000);
+		this.isIphoneX = this.$util.uniappIsIPhoneX();
+		if (this.fenxiaoWords && this.fenxiaoWords.fenxiao_name) this.$langConfig.title(this.fenxiaoWords.fenxiao_name + '申请');
+		if (uni.getStorageSync('token')) {
+			this.applyStatus();
+			this.getSourceMemberInfo();
+		} else {
+			this.$util.redirectTo(
+				'/pages_tool/login/login',
+				{
+					back: '/pages_promotion/fenxiao/apply'
+				},
+				'redirectTo'
+			);
+		}
+		this.getFenxiaoConfig();
+		this.getFenxiaoBasicsConfig();
+	},
 	methods: {
-    // 获取基本信息
-    getBaseInfo(){
-      let _this = this;
-      _this.$api.sendRequest({
-        url: '/fenxiao/api/apply/upgradeBase',
-        success: res => {
-          if (res.code === 0) {
-            _this.baseInfo = res.data;
-            if(res.data.info) _this.info = res.data.info;
+		toClose() {
+			this.$refs.applyPopup.close();
+		},
+		ckeckedRuler() {
+			this.isChecked = !this.isChecked;
+		},
+		goodsImg(imgStr) {
+			let imgs = imgStr.split(',');
+			return imgs[0]
+				? this.$util.img(imgs[0], {
+						size: 'mid'
+				  })
+				: this.$util.getDefaultImage().goods;
+		},
+		imgError(index) {
+			this.goodsList[index].goods_image = this.$util.getDefaultImage().goods;
+		},
+		onOpen() {
+			this.isOpen = this.isOpen ? false : true;
+			this.getFenxiaoConfig();
+		},
+		goodsTag(data) {
+			return data.label_name || '';
+		},
+		applyStatus() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/apply/status',
+				data: {},
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.status = res.data.status;
+						this.isSub = false;
+						if (this.status == 2) {
+							this.$util.redirectTo('/pages/member/index');
+						}
+					}
+					this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		navigateBack() {
+			this.$util.goBack();
+		},
+		// 申请协议
+		getAgreement() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/config/agreement',
+				success: res => {
+					if (res.code === 0) {
+						this.fenXiaoAgreement = res.data;
+						if (this.fenXiaoAgreement.agreement.is_agreement === '1') {
+							this.isAgreement = true;
+						}
+					}
+				}
+			});
+		},
+		openPopup() {
+			if (this.isAgreement) this.$refs.applyPopup.open();
+		},
+		closePopup() {
+			this.$refs.applyPopup.close();
+		},
+		fenXiaoValidata() {
+			let rule = [
+				{
+					name: 'fenXiaoName',
+					checkType: 'required',
+					errorMsg: '请输入' + this.fenxiaoWords.fenxiao_name + '名称'
+				},
+				{
+					name: 'mobile',
+					checkType: 'required',
+					errorMsg: '请输入手机号'
+				},
+				{
+					name: 'mobile',
+					checkType: 'phoneno',
+					errorMsg: '请输入正确的手机号'
+				}
+			];
+			var checkRes = validate.check(this.formData, rule);
+			if (checkRes) {
+				return true;
+			} else {
+				this.$util.showToast({
+					title: validate.error
+				});
+				return false;
+			}
+		},
+		// 获取推广人信息
+		getSourceMemberInfo() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/fenxiao/sourceinfo',
+				success: res => {
+					if (res.code == 0 && res.data) {
+						this.sourceMemberInfo = res.data;
+					}
+				}
+			});
+		},
+		/**
+		 * 重新申请
+		 */
+		againApply() {
+			this.status = '';
+		},
+		/**
+		 * 获取申请条件
+		 */
+		getFenxiaoConfig() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/config/fenxiao',
+				data: {},
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.fenxiaoConfig = res.data;
+						this.goodsList = res.data.goods_list;
+						if (this.goodsList.length <= 3) {
+							this.isShow = false;
+						} else if (this.goodsList.length > 3 && this.isOpen == true) {
+							this.isShow = true;
+							this.goodsList = res.data.goods_list.slice(0, 3);
+						}
+					}
+				}
+			});
+		},
+		/**
+		 * 获取分销基本配置
+		 */
+		getFenxiaoBasicsConfig() {
+			this.$api.sendRequest({
+				url: '/fenxiao/api/config/basics',
+				data: {},
+				success: res => {
+					if (res.code >= 0 && res.data) {
+						this.basicsConfig = res.data;
+					}
+				}
+			});
+		},
 
-            if(parseInt(this.info.status) === 2){
-              _this.$util.showToast({
-                title: "审核已经通过",
-                mask: true,
-                duration: 1000,
-                success: function () {
-                  setTimeout(() => {
-                    _this.$util.redirectTo('/pages_promotion/fenxiao/index', {}, 'redirectTo');
-                  }, 1000);
-                }
-              });
-            }
-
-            if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-          }
-          else{
-            this.$util.showToast({
-              title: res.message
-            });
-          }
-        },
-        fail: res => {
-          if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-        }
-      });
-    },
-    // 身份证上传
-    uploadCard(type) {
-      let _this = this;
-      this.$util.upload(1, {path: 'evaluateimg'}, res => {
-        if(type === 'id_card_front') _this.info.id_card_front = res[0];
-        else _this.info.id_card_reverse = res[0];
-
-        this.$forceUpdate();
-      });
-    },
-    // 提交内容
-    submitApply(){
-      let _this = this;
-      let defaultRule = [
-        {name: 'username', checkType: 'required', errorMsg: '请输入真实姓名'},
-        {name: 'phone', checkType: 'required', errorMsg: '请输入联系电话'},
-        {name: 'phone', checkType: 'phoneno', errorMsg: '请输入正确的手机号'},
-        {name: 'id_card', checkType: 'required', errorMsg: '请输入身份证号'},
-        {name: 'id_card_front', checkType: 'required', errorMsg: '请上传身份证正面'},
-        {name: 'id_card_reverse', checkType: 'required', errorMsg: '请上传身份证反面'},
-        {name: 'upgrade_agree', checkType: 'required', errorMsg: '请输入协议内容以代表同意当前协议'},
-        {name: 'upgrade_agree', checkType: 'same', errorMsg: '协议不一致，请检查输入协议是否和下放协议内容一直', checkRule: this.baseInfo.upgrade_agree},
-      ];
-      _this.$util.verify(_this.info,defaultRule).then(res => {
-        _this.$api.sendRequest({
-          url: '/fenxiao/api/apply/upgradeApply',
-          data: _this.info,
-          success: res => {
-            if (res.code === 0) {
-              _this.$util.showToast({
-                title: '申请成功',
-                success: function () {
-                  _this.getBaseInfo();
-                  _this.$forceUpdate();
-                }
-              });
-            }else{
-              this.$util.showToast({
-                title: res.message
-              });
-            }
-          },
-          fail: res => {
-            if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-          }
-        });
-      }).catch((reject)=>{
-        console.log(reject);
-      });
-    },
+		onBackPress(options) {
+			if (options.from === 'navigateBack') {
+				return false;
+			}
+			this.$util.redirectTo('/pages/member/index');
+			return true;
+		},
+		// 获取基本信息
+		getBaseInfo() {
+			let _this = this;
+			_this.$api.sendRequest({
+				url: '/fenxiao/api/apply/upgradeBase',
+				success: res => {
+					if (res.code === 0) {
+						_this.baseInfo = res.data;
+						if (res.data.info) _this.info = res.data.info;
+						if (parseInt(this.info.status) === 2) {
+							_this.$util.showToast({
+								title: '审核已经通过',
+								mask: true,
+								duration: 1000,
+								success: function() {
+									setTimeout(() => {
+										_this.$util.redirectTo('/pages_promotion/fenxiao/index', {}, 'redirectTo');
+									}, 1000);
+								}
+							});
+						}
+						if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					} else {
+						this.$util.showToast({
+							title: res.message
+						});
+					}
+				},
+				fail: res => {
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		// 身份证上传
+		uploadCard(type) {
+			let _this = this;
+			this.$util.upload(1, { path: 'evaluateimg' }, res => {
+				if (type === 'id_card_front') _this.info.id_card_front = res[0];
+				else _this.info.id_card_reverse = res[0];
 
+				this.$forceUpdate();
+			});
+		},
+		// 提交内容
+		submitApply() {
+			let _this = this;
+			let defaultRule = [
+				{ name: 'username', checkType: 'required', errorMsg: '请输入真实姓名' },
+				{ name: 'mobile', checkType: 'required', errorMsg: '请输入联系电话' },
+				{ name: 'mobile', checkType: 'phoneno', errorMsg: '请输入正确的手机号' },
+				{ name: 'id_card', checkType: 'required', errorMsg: '请输入身份证号' },
+				{ name: 'id_card_front', checkType: 'required', errorMsg: '请上传身份证正面' },
+				{ name: 'id_card_reverse', checkType: 'required', errorMsg: '请上传身份证反面' },
+				{ name: 'upgrade_agree', checkType: 'required', errorMsg: '请输入协议内容以代表同意当前协议' },
+				{ name: 'upgrade_agree', checkType: 'same', errorMsg: '协议不一致，请检查输入协议是否和下放协议内容一直', checkRule: this.basicsConfig.upgrade_agree }
+			];
+			_this.$util
+				.verify(_this.info, defaultRule)
+				.then(res => {
+					_this.$api.sendRequest({
+						url: '/fenxiao/api/apply/applyfenxiao',
+						data: {
+							..._this.info,
+							fenxiao_condition: 1
+						},
+						success: res => {
+							if (res.code >= 0 && res.data) {
+								if (this.basicsConfig.is_examine == 1) {
+									this.applyStatus();
+								} else {
+									this.$util.redirectTo('/pages_promotion/fenxiao/index');
+								}
+							} else {
+								this.isSub = false;
+								this.$util.showToast({
+									title: res.message
+								});
+							}
+						},
+						fail: res => {
+							if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+						}
+					});
+				})
+				.catch(reject => {
+					console.log(reject);
+				});
+		}
 	},
 	onBackPress(options) {
 		if (options.from === 'navigateBack') return false;
@@ -187,143 +401,166 @@ export default {
 	}
 };
 </script>
-
 <style lang="scss" scoped>
-.apply-upgrade{
-  padding: 30rpx;
+.apply-upgrade {
+	padding: 30rpx;
+	.top-tips {
+		color: #f56c6c;
+		background-color: #fde2e2;
+		position: relative;
+		left: -15px;
+		top: -15px;
+		width: 100%;
+		padding: 15px;
+		line-height: 20px;
+		font-size: 15px;
+	}
+	.title {
+		width: 100%;
+		font-size: 30rpx;
+		color: #999999;
+		margin-bottom: 20rpx;
+	}
+	.form-list {
+		.form-list-block {
+			width: 100%;
+			color: #000000;
+			height: 90rpx;
+			line-height: 90rpx;
+			display: inline-flex;
+			flex-direction: row;
+			flex-wrap: nowrap;
+			align-content: center;
+			align-items: center;
+			justify-content: space-between;
+			.left {
+				height: 70rpx;
+				font-size: 30rpx;
+				width: 240rpx;
+			}
+			.right {
+				font-size: 30rpx;
+				width: calc(100% - 240rpx);
+				input {
+					height: 70rpx;
+					text-align: right;
+					font-size: 30rpx;
+					color: #898989;
+				}
+			}
+		}
+	}
+	.id-card {
+		.id-card-content {
+			width: 100%;
+			display: inline-flex;
+			flex-direction: row;
+			flex-wrap: nowrap;
+			align-content: center;
+			align-items: flex-start;
+			justify-content: space-between;
+			.id-card-block {
+				width: calc(50% - 15rpx);
+				position: relative;
+				border-bottom-left-radius: 20rpx;
+				border-bottom-right-radius: 20rpx;
+				display: inline-flex;
+				flex-direction: row;
+				flex-wrap: nowrap;
+				align-content: center;
+				justify-content: center;
+				align-items: center;
+				overflow: hidden;
+				padding-top: 20rpx;
+				padding-bottom: 75rpx;
+				/deep/ image {
+					width: 90%;
+					div {
+						background-position: top center !important;
+					}
+				}
+				.upload-buttons {
+					position: absolute;
+					bottom: 0;
+					left: 0;
+					width: 100%;
+					font-size: 32rpx;
+					text-align: center;
+					background: #5581fe;
+					color: #ecefff;
+					height: 60rpx;
+					line-height: 60rpx;
+				}
+			}
+		}
+		.id-card-tips {
+			padding: 30rpx 0;
+			.id-card-tips-line {
+				.tips-stress {
+					color: #e15c5c;
+				}
+			}
+		}
+	}
+	.agree {
+		.textarea-content {
+			width: calc(100% - 40rpx);
+			border: 2rpx solid #7796e9;
+			border-radius: 20rpx;
+			padding: 20rpx;
+			min-height: 300rpx;
+			font-size: 30rpx;
+		}
+		.agree-text {
+			font-size: 26rpx;
+			line-height: 40rpx;
+			margin-top: 20rpx;
 
-  .top-tips{
-    color: #f56c6c;
-    background-color: #fde2e2;
-    position: relative;
-    left: -15px;
-    top: -15px;
-    width: 100%;
-    padding: 15px;
-    line-height: 20px;
-    font-size: 15px;
-  }
-  .title{
-    width: 100%;
-    font-size: 30rpx;
-    color: #999999;
-    margin-bottom: 20rpx;
-  }
-  .form-list{
-
-    .form-list-block{
-      width: 100%;
-      color: #000000;
-      height: 90rpx;
-      line-height: 90rpx;
-      display: inline-flex;
-      flex-direction: row;
-      flex-wrap: nowrap;
-      align-content: center;
-      align-items: center;
-      justify-content: space-between;
-      .left{
-        height: 70rpx;
-        font-size: 30rpx;
-        width: 240rpx;
-      }
-      .right{
-        font-size: 30rpx;
-        width: calc(100% - 240rpx);
-        input{
-          height: 70rpx;
-          text-align: right;
-          font-size: 30rpx;
-          color: #898989;
-        }
-      }
-    }
-  }
-  .id-card{
-    .id-card-content{
-      width: 100%;
-      display: inline-flex;
-      flex-direction: row;
-      flex-wrap: nowrap;
-      align-content: center;
-      align-items: flex-start;
-      justify-content: space-between;
-
-      .id-card-block{
-        width: calc(50% - 15rpx);
-        position: relative;
-        border-bottom-left-radius: 20rpx;
-        border-bottom-right-radius: 20rpx;
-        display: inline-flex;
-        flex-direction: row;
-        flex-wrap: nowrap;
-        align-content: center;
-        justify-content: center;
-        align-items: center;
-        overflow: hidden;
-        padding-top: 20rpx;
-        padding-bottom: 75rpx;
-
-        /deep/ image{
-          width: 90%;
-          div{
-            background-position: top center!important;
-          }
-        }
-
-        .upload-buttons{
-          position: absolute;
-          bottom: 0;
-          left: 0;
-          width: 100%;
-          font-size: 32rpx;
-          text-align: center;
-          background: #5581fe;
-          color: #ecefff;
-          height: 60rpx;
-          line-height: 60rpx;
-        }
-      }
-    }
-    .id-card-tips{
-      padding: 30rpx 0;
-
-      .id-card-tips-line{
-        .tips-stress{
-          color: #e15c5c;
-        }
-      }
-    }
-  }
-  .agree{
-    .textarea-content{
-      width: calc(100% - 40rpx);
-      border: 2rpx solid #7796e9;
-      border-radius: 20rpx;
-      padding: 20rpx;
-      min-height: 300rpx;
-      font-size: 30rpx;
-    }
-    .agree-text{
-      font-size: 26rpx;
-      line-height: 40rpx;
-      margin-top: 20rpx;
-
-      .agree-red{
-        font-size: 26rpx;
-        line-height: 40rpx;
-        color: #ee7877;
-      }
-    }
-  }
-  .submit-button{
-    background: #5581fe;
-    border-radius: 100rpx;
-    color: #cbd9f7;
-    font-size: 30rpx;
-    height: 70rpx;
-    line-height: 70rpx;
-    margin-top: 100rpx;
-  }
+			.agree-red {
+				font-size: 26rpx;
+				line-height: 40rpx;
+				color: #ee7877;
+			}
+		}
+	}
+	.submit-button {
+		background: #5581fe;
+		border-radius: 100rpx;
+		color: #cbd9f7;
+		font-size: 30rpx;
+		height: 70rpx;
+		line-height: 70rpx;
+		margin-top: 100rpx;
+	}
+	.again-btn {
+		display: flex;
+		justify-content: center;
+		width: auto;
+		border-radius: $border-radius;
+		margin-top: 20rpx;
+		color: #ffffff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 10rpx 60rpx;
+		box-sizing: border-box;
+	}
+	.empty {
+		width: 100%;
+		margin-top: 200rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		image {
+			width: 300rpx;
+			height: 176rpx;
+			margin-bottom: 50rpx;
+		}
+		text {
+			font-size: $font-size-goods-tag;
+			font-weight: 600;
+		}
+	}
 }
 </style>
diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue
index 7b356c2..cfe47b2 100644
--- a/pages_promotion/fenxiao/index.vue
+++ b/pages_promotion/fenxiao/index.vue
@@ -255,7 +255,7 @@ export default {
 						this.getTeamNum();
 						this.showEmpty = true;
 					} else {
-						this.$util.redirectTo('/pages_promotion/fenxiao/apply', {}, 'redirectTo');
+						this.$util.redirectTo('/pages_promotion/fenxiao/apply_upgrade', {}, 'redirectTo');
 					}
 				},
 				fail: res => {
diff --git a/pages_promotion/presale/payment.vue b/pages_promotion/presale/payment.vue
index e4b0187..6154080 100644
--- a/pages_promotion/presale/payment.vue
+++ b/pages_promotion/presale/payment.vue
@@ -7,8 +7,7 @@
 			:style="{
 				'padding-top': menuButtonBounding.top + 'px',
 				height: menuButtonBounding.height + 'px'
-			}"
-		>
+			}">
 			<view class="navbar-title">确认订单</view>
 		</view>
 		<view class="payment-navbar-block" :style="{ height: menuButtonBounding.bottom + 'px' }"></view>
@@ -37,8 +36,7 @@
 				<view
 					class="address-box"
 					:class="{ 'not-delivery-type': orderPaymentData.shop_goods_list.express_type.length <= 1 }"
-					v-if="orderPaymentData.delivery.delivery_type != 'store'"
-				>
+					v-if="orderPaymentData.delivery.delivery_type != 'store'">
 					<block v-if="orderPaymentData.delivery.delivery_type == 'local'">
 						<block v-if="storeInfo.storeList.length > 1">
 							<view class="local-delivery-store" v-if="Object.keys(storeInfo.currStore).length" @click="$refs.deliveryPopup.open()">
diff --git a/pages_rush/components/pay-pop/pay-pop.vue b/pages_rush/components/pay-pop/pay-pop.vue
new file mode 100644
index 0000000..cb83d8f
--- /dev/null
+++ b/pages_rush/components/pay-pop/pay-pop.vue
@@ -0,0 +1,174 @@
+<template>
+  <view class='szjp'>
+    <view v-if="show">
+      <view class="mask" @tap="Close"></view>
+      <view class="box" :class="AlertObj[AlertClass][AlertClassUp]">
+        <view class="bottom">
+          <view class="bg">
+            <image src="./static/bg.png" mode="widthFix" />
+          </view>
+          <view class="tle">
+            <view class="tle_lft">
+              <image src="./static/pwd.png" mode="widthFix" />
+              <view class="tle_1">{{txt}}</view>
+              <view class="tle_2">(长度{{pwdlength}}位)</view>
+            </view>
+            <view class="tle_rgt" @tap.stop="is_vis=!is_vis">
+              <block v-if="is_vis">
+                <image src="./static/yj2.png" mode="widthFix" />
+              </block>
+              <block v-else>
+                <image src="./static/yj1.png" mode="widthFix" />
+              </block>
+            </view>
+          </view>
+          <view class="pwd_box" @click.stop>
+            <view class="pwd-text" :class="{active:(idx==k)}" v-for="(v,k) in pwdlength" :key="k">
+              {{star_lis[k]}}
+            </view>
+          </view>
+          <view class="pwd_info">
+            <view @click="$util.redirectTo('/pages_tool/member/pay_password')">忘记密码?</view>
+          </view>
+         <view class="solt" @click.stop>
+            <view class="s_lft">
+              <button class="s_li" type="primary" plain="true" v-for="(v,k) in 9" :key="k"
+                @tap="click(k+1)">{{k+1}}</button>
+              <button class="s_li s_o" type="primary" plain="true" @tap=click(0)>0</button>
+              <button class="s_li s_sq" type="primary" plain="true" @tap="Close">
+                <image src="./static/sq.png" mode="widthFix" />
+              </button>
+            </view>
+            <view class="s_rgt">
+              <view class="s_cx">
+                <button class="s_li s_x" type="primary" plain="true" @tap="del">
+                  <image src="./static/ht.png" mode="widthFix" />
+                </button>
+              </view>
+              <view class="s_qd">
+                <button class="s_li s_s " type="primary" plain="true" @tap="submit">确定</button>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+/*引入插件*/
+export default {
+  props: {
+    txt: {
+      type: String,
+      default: '支付密码'
+    },
+    pwdlength: {
+      type: [Number, String],
+      default: 1
+    },
+	isPass:{
+		type: Boolean,
+		default: false
+	}
+  },
+  data() {
+    return {
+      Repeat: true,
+      show: false,
+      AlertObj: [
+        ['a-bounceinB', 'a-bounceoutB'],
+      ],
+      AlertClass: 0,
+      AlertClassUp: 0,
+      res_pwd: [],
+      fa_par: '',
+      is_vis: false,//密码是否可见
+    }
+  },
+  //   计算属性
+  computed: {
+    idx() {
+      return this.res_pwd.length
+    },
+    star_lis() {
+      if (this.is_vis) {
+        return this.res_pwd
+      }else {
+        let arr = [];
+        this.res_pwd.forEach(v => {
+          arr.push('*')
+        });
+        return arr;
+      }
+    }
+  },
+  methods: {
+    click(e) {
+      if (this.res_pwd.length <= this.pwdlength - 1) {
+        this.res_pwd.push(e)
+        // #ifdef APP-PLUS
+        plus.device.vibrate(50);//震动
+        // #endif
+      } else {
+        this.toast(`最大长度${this.pwdlength}位`)
+      }
+    },
+    del() {
+      this.res_pwd.pop()
+      // #ifdef APP-PLUS
+      plus.device.vibrate(50);//震动
+      // #endif
+    },
+    submit() {
+      //   console.log('确定密码为', this.res_pwd.join(''))
+      // #ifdef APP-PLUS
+      plus.device.vibrate(50);//震动
+      // #endif
+      if (this.res_pwd.length == this.pwdlength) {
+        let res = this.res_pwd.join('')
+        this.$emit('pwd_e', res);//调用父元素方法
+        this.Close()
+      } else {
+        this.toast(`长度未满足`)
+      }
+    },
+    // 打开
+    Open(par) {
+      if (par) {
+        console.log('父元素传参', par)
+        this.fa_par = par;//父元素传参  
+      }
+      if (!this.Repeat) { return false }
+      this.res_pwd = []
+      this.Repeat = false;
+      this.AlertClassUp = 0;
+      this.show = true
+      setTimeout(() => {
+        this.Repeat = true;
+      }, 300);
+    },
+    // 关闭
+    Close() {
+      if (!this.Repeat) { return false }
+      clearTimeout(this.SetTime);
+      this.Repeat = false;
+      this.AlertClassUp = 1;
+      setTimeout(() => {
+        this.show = false;
+        this.Repeat = true;
+      }, 300);
+    },
+    toast(val) {
+      uni.showToast({
+        title: val,
+        icon: 'error',
+      });
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+/*引入css文件*/
+@import "./static/szjp.scss";
+</style>
\ No newline at end of file
diff --git a/pages_rush/components/pay-pop/static/bg.png b/pages_rush/components/pay-pop/static/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..0854a2944b3ceaa6e90391376e3def88a58363da
GIT binary patch
literal 17033
zcmeHvRaab1ur|&B85lgc1-IZ9JOn2M83t#N-~@LKgS)$1fB^=#;KAKJSV(ZU1W3Ml
zFTS5}F3wu#V)kBZR`2fKRb5?GPuH`fG&K}~xRkgkC@4T>rMFrrD5zZj{Qy|Ve|!Ss
zJ&-q4H!Vdul-eokLlhKx6y>+FI^HIy0odL~gNt_(hRsLGowmg}PTFV;80$FPGHBs4
zY&a_<K@6`}{-R^Z2{2$1UFn0QUKGiry%Izh=EicU>chzS>BP0iVwlct%k0>5Eo~js
z#Oc`H>34qC)oGot2=K9<%JZ>4>$INA6;lkxW9kLGMq`nc$t*3{P=6OpXok@X8;tqy
zt`>?yoNiklEir~{p$7Si^%C`6uOQ$xH0xtkTS+Vm6SATG|26y{6Axt_D*JvBN<8Lk
zEsI$$jUWth6bDQM^Pf&#K)v?A;Va?=#$H$%StZGBX=(|o5z4mThvKSn?N=fqWN7Os
z6R5BC0GAE*9pJz&X#beYR9UJbN+!<s4Yh)^z%_%++Oj;#M?41M?7GLF=X}KAbT_s#
zYTRup6l?3%)anc}v}x3b6437a9A$dF;s7jd@JWe12(S%Bd23+w5>;*+pW&Ow3k4|1
ztY0gtG4;v`rAJFYuR4t!%@pmS9%OFi1MIvgvFaZSZcm-V+{Q#<t*D}W!G7@@?E>@j
z#cy-~R$Bk`E9nmc7}TDex%d*f_=XR|=Jj8aHqp(hK)cF9Y3&+L$hB71r>>%px-EpV
zhYi*yiK0y)knEDe_*}Fx^9x)qQ`m2-m^L1zk|D1i^od07NmgB<HboM-SPyZIbx|r_
zz<19si>ues8M%4(LxVRzDg-z(NA~ikO5-sErc@FI<^R`~{dJ1gchv2*hlH+f6i?5)
z;Fe&cF>+K!c=(#iio=pS{RRuHt=<2_ob?Yih_Z8<mIlTJ_=Jg_S-it{cJp}Nnha8P
z2m+zmz^kX4)StpY<}HU<*4y|3P-a$m9SXG)9ie{nsq?@u0!nYncKboO!tQb+p+(Ch
zH3Kx1coI2(6Zqe>HMcAT*2I_8D=id)p}#(ce&i{-l{LO`!zm$6OQ@nsfSuWgdMoyL
z98RaTvQ!v0H$qaWajm<N%CdF0A7Ck0SYL~)n>MAhct$3tHvTG9dO8+`7|aNL#^{~D
zd7pP?;_l%mz%(NCGK39{DSW9P+FI7X_xd~K&mNsj1QE`$G>QiOuW85Av!_`r9ILS4
zNxQyCs0SiZA<)?e3~<rVM=c&O%R&?vs<11f*p$_n*&DKU@*E&m#$+uWJur{#IJAKt
zrVQV*U3+Eg`1ql>#7ki)e`WED@|;={j+(c}WY50rcp&ss{@84?!`jNJU(eXbszIJ%
z9zCh9M?W2DPWoz>?Kp|s7t=HZ7j&7a9CJYC-dVkc<FB(2e{k$SystYypviNONW)`F
zlt8=Dild!HiD5oG7BT@`YMjlDcQO-$rJ?Pu&0e~Vp*B7}AcMH>`fd(?sJL>wF~Fq@
zJk2g5rUoJW<Y~`VieW1;5=J<KhT8E-6kgAg^~Ea;G;Dtv>zdjJBV~ruCh)eEgtmt6
zKM)=8eY|p5@vyYupOuu0w3E!&$LAmaj3{<lVLx30p(qb;Z0-fD515=P7+;grvX-&|
z(v$>alLn4t7;KYMi{v8jia$HfMPyJzmDzg;g3asb(9KAKH`T>OtTr8))r|P5sb`M~
zdiQQ~&Tc%F0>*6cBXAkI*^Y6hTrQYpAzEVssJVFCIw-m1uZIWCZa%u#r3Cs){zb5S
zywTFzlXDbOSfSO?Ad#C8@%<OKBCSmf*2%HMaz+sL?MoeoqHMl%_VSZWGClkkXD~un
zE!8f)L=XmYi(C7|bU&U7V=mjELm^x&ycm3kmGfB6jb?dVta?=HLQ&twLH%+raiMz(
zmbM4Wibj;Cx@$c7q4c06UK#kuL!1Rt7-cdR*%{%p$svjM12f^JwLmq9Sgp`JC_Oc~
zR#3BLbI+BUQ-l+Wp|oyyeh?yUmOFwV>^BFhj$2vd_9ttdVQs6UJmOQo;nw*R&P?D@
zCml&&u`%ZwKw^{*D(0m#;}S6w&MS;Lwp{0zgZ9q_lD&A3lt)0ZW!iSW%x@HSc34vP
zhvov>bfx>tgJ?X3YqgzuK|rZV0)d3MUkpAiar&LMnGJHJ<i=mvD0ihr^B;us@CiRq
z{B~D*v^9@{p;$p#L{Le6Q0p73MRI?%WQO6W`rQCkAs-rwbqujVVuZ>b?UI@={9|jL
zZxG)s0c{*7h2IDcuh8bQZMRm97cdy#Li|;}oKgz&LnU#y%^BHLOzaj)>>VpY%PJLu
zTcX|36b<yM<nGkRe0AV2Hq{_@*4hD*@<i#WuKdA@{aeX2n-|_<ZgGFuxeK!0`!X3B
z6J4Zqi_j^?0(D}wcFcgP_8UM&h?WX=u#h|dh-KNWdq(~np;84|ibEdrB0S_PMp7jq
zYSAxP*RWjeyiZxbk}zwfXYa_{Yv(i0K_^>IjWJt;_@TBvYcCX#{fzy7_V7yZBFVdQ
zhGHx*f;8%dn#jmvm~Dx#ra5lN&B6wT-gz|>e`&~{1=x2?(`62dq3TZ2>Z!`m|9mGi
zRe_F2vEAx)&cSA`Q2`_|XHnj%789F-%>t^+Jp6vqhRCoD?>INQDh9`1R6aGa6?27E
zu<H~Nt9jbbkU0(@mxilc-SR)--&4rpT@`}A?%3LAs*M-Ve{6^&t9lK!O=wC2RJS+R
zxMj~eZP*itsV-2V&e?Hr9w5Z(HA&`|TKXOFvJg!Lw#dGgk4>8$Bm8FeKb}TR5UJ9j
z@_Q0cY2~<QI!bI{;>i=UaJ4{fJ2qbYXGP(8d6E*i0nsJw$y^hffLK}+f@+V8D5%~8
zj~%pF>}3cddq}MSB}4!vmQ+qHQau@Fgd0Vs#D{J2+gw$(k==EJA`HRe@O|mhv(i$P
zZz0F9JWn}oq-pt>0Q-^iEjtTTC@#x|50=Xgvl$Zv<0xA$#+qzcx$p90K!5v(9JjW3
zJ@XMGp2V06$wD|X(BqU_EZot$0xAq^GQS=XLRY!KT&C?}vKo%f$6wJ2Hug<@aNf^~
zR(+5x4*!A`4Is|=mYTjl>2`CFL&gu3g&1$<M@V$|R@m^-r}qIsX!sI&WcV6|Z^?^p
zZ-$RN{VvC-3U=n1j}bo_$=tmv@Lib7j8H-_HNSmMCv7DADd47VQ7$5DmJa&Nue7gQ
zn(DUQN5W)h7)}qri$4?b^9|S<$Fp*p0DNOe<hbTnV6}5RUZAe#uA%Whn8ozIy`6SN
zF5UD=)Ni@zR*fb)oTZhvzLFe#z+QLM4|OfZ<-SlVJzf^dxF)3Zk?K%=WAblBjsEIa
ztc)<=guemRecIV<wL#sm-}hG+>BBRP+f2&4oU!t)*_u@}8Lr@OT6R=*AxM$((aI2W
zxqc2V9AW7oVM<PC0N6j`-|NxV{gW})v@WuW={+F4RX!(kn$;Ze-Crzw7@(;lWt^YH
zbR;lL7kSUGGK>_K<EioZ*T21}VJKldqgvf<E4OiGN+DZxZxa+dojXWEbCYe>PLsA>
zZ(c+TXbc|?;<D%g9OCX`KMW*y3fm|^O7)F{N_bk_<Yn1O#p<mTuF;s>tKfi`$WjI$
z7849K*``zXUkYp_m~Iexb-EA0Tr)<V=u3s^-C}99N`NXJ6&b}cYu*-oRai4f&@~9n
z5onk$lrV1m*^?V62XWdIf&=t*%N63A=oo8^cuen8(u7V0BAcQqTJ$>0Ec}&A!WWr6
zXcs>tX#IaUzIj@a7{Zn<p;b{hTWu(AS734xi($v>XXK|4Yr?;g&>jtIT1eJCSq&S@
zBaiaR_nF9gJ$rp^#)i>F9e&FQcb%&>cjGO~oo)Equ0P#e_^yQk>}J^6O$k=lMY?e#
zy9>bbXnGT)%b+%^{L2Tkx$TygV>g_P+L8qw@ehZtRg5-^g$Ix%x$c=}t{VBC0|m&n
z%EnB-LlyIn8t(CI>!Y?8I#E1${lzu(jyR3%cFLUOs|yKnH4=@7@l_qEu}~#>-MJEf
zU9@PUD10eTyG#@zA?W_SmCGsc{Z7}t9vMYVzf?XBC;s`VxIM(ZE>;7pk^8NIdmK}m
zddx_)V3yGsOB_y&>kW`jD@71rhv%6SoKx%cUR1x9%*s-Q3LFUYIDz%EQ4)C*M(5Ht
z(g@Lr25^;Tas>-8AR@?KR;EEyQ{?1rAil(4bq@tm3uhi?Qrmrbuv8Fe-OI+WAkJK-
zax^j*4=c>6vAIUz1ULDUvNFU6ro!^Ls9do{d$#5>e46llM-eqJ98R2KahnZp>y%t+
zC_}GaYBE1vt7!+y7Hi8*saXryQ3?d`!!o%rMxu1K<eo1_SeU%Ks6r8*2lfNeuh?Gt
z*QuRyY4b08tH(H)w-eDzrW9k^9NsIeEk=@D7A(ZiD&1~Knk1H|eJTn~w`BO((52dD
zdHAQh*1yA@Cjak!g!j`9=W9F5KRK_ZK7n#X&U=do?GXoi%?}SL&9)J*LZ(r~u)A!)
zs`zh><RY_t?Tp^>wGn$;$wCA*`8)LVw6yX!RAQT`g{hA0=Q|Zk{p28>bD{<^q65xX
zGA`}FmXVr~2aUgWztbIXj`Qxp<~yC^GWTeE%64YbRn>W-f7|#(Pg7k){f&+exbZt3
z6FDavNONA_r!n{BJ<sGkw_srYNL@{?UYEI%V%TK<%4|A;)sjJ!(9Bg(wtidS@MtIu
zBUN?O;OlWis(AFQyfRI3ryvU6bmv(yf-yjuqPU{7F2c0PbgCVbscVOGoVF}AfKJd8
zwp6pa#rHItkT7JG!dl$%@gf7t-ygjTS6#|g`i8})4KRWa`cuZiUz9^JJ$kZ<8ETGF
zaYULkf9UX!EZeN(pN?_}M=^yj_GdG)7Ub{E$qSdIv#JYj@w?hMu5mN0mIU%W6T(eW
zN^02G`U37LLWb!&%r(96)FJiwu&D9RqjJ%Qppi8)MrJa(v8;FP@x%mhs32E?X;6Q0
z2(j(#ZLY&p`Bi|6l0b=rOuP3?b%3XCnE<D$K(i~JaYCd@^@MV&Bx@cJ8E#qsQU~+-
zPf0%7Otc+g<2aMXAa*4P#q_^nXnI>l{n2^%=e079vf;cK(zpf)8Dk-1@d)!28P6{&
zdUv(>s~YAEBOFVt;_VZI0Zi+Bhq?t#nkqy^i|JxC(14CoOg)Vto%y0C)9W7?Iq8G|
z)p=A(8OSP#EMR`l7V2MF<8s(7dE)AaWo28$<kwYOGLy-s1zW|n1zWbx5oPGW6tV_K
zPq&LzKicEYdnHhX_B>raNo83Ys=3IN!~j+2`(El~@&T#`x+Z?jTdOMZ08&eMR+kDh
z-Q=?M-q-Oy$^WafDstrYxtkaHI*Yf-d~*BXq1>fVOFQ~A4=~<sPE59SB}n`Iu+KFJ
z<fM=z_AveR_ye&}uK+S;`J<AKI1o(8Wxp09U7$VdBRc$%=pby60%rK*bYor01Ye8z
zS+e^~y2HSAjp_2Y9A91OI9@t8;&Ll4myQqFfgG{}%Ht}vz27v#g7({9rO#KdTfe!(
zgr1W9h_EV1ZH>i!-thFiO3n|)QGLACPKGHMkSb`t)@JCR+hyBQvsmh^s|48pdgPqB
z_(hH-nXhzwRO19687TXVqq?OpgaK`~cNi#U`s-gib%5vNdgxA5)~T4I+B102Ls%g8
zCJb2pSb4AceAB7ixj~xzuzBb7=KQQ6#u!eP3pxGf=JaXEk%>6Ho3oD|wpdd++to3K
z!{3rqscH24E}mAvWA!4S?0|GM_N?oELViC;>izmZg?yA++tdEpH2e)Q#^RdlRb=dW
z*vXZNxEa)Ib{A(aQ7ScRlBXwyV%7#w-=*ca`p%rMbzIt5ANh0~{t<BbQ<-$}%W|Nq
zTG{tJb(7LnZi_ynU|phV5plrpT>fw>wp(T>z{rWrnAaEzv7tie2Sb|@TEt7l2}U8v
zJ&#loqC7y!2i+H)9GXQ4c4rHG<@@bPubAuZ_>KqYc<SWoIP-E}$DW=JXn&NhF>$W^
zcaZ-K!Ls2s%^Xk?X#-J%7--m!5|QPR%qdt4q~;lSWe*F847A;zS#b2@{=Gt75q6mV
zb4i8HK;09lIOl08k{5t{bWQhPdLj;|ec`;|>le`9LQ4pn38YgH>bEgDtN&eS&*m=v
z#p4Q-n>;ehD#>1Tu3dWXy%>-)%`+_)o{4b%ENW4b%mQCI7%dmNpoOwnRyDq{npk3H
zNO#GW+z^<2dsa}v2saXfUkiI~TYRD~l5YZj-4AbkZMU#}Q1X>|BH&D`nG3If3{yB7
zJ70a4QOsI+daomkP)PyOzJ~aIaJiFR<D`^<9+9w4{Hx&6k(!T(Xj)Rgz7fcI{mM!|
z6o(VjObw!6`wAWWUIFqq>-|8zrSX*Hcd_d?u)CM(^^(NkcaaUXX7v5IhqNw&RPOKa
z$9aA@+ZzT}mNXnvE$c?~B8HBB#Fr#|jT#f9t0qn^1yBFp3j6h=o?<-$htsEp#nXNy
z(&P$vh#o$5W);{Y1yf)Eb8w!7cLLPIJ?o@Lu<ohJYqLKNP$m<De_?Ze@EX3hd;6+p
zPvQ)vjaP!f!jA<W3$ijUD#fX;?dZQC6qPiQ78g>X&b~d#@DA01H3wJ|gd4d?!-g}+
zP_2}JT&JPeiX8Ix^?OqjQI?Fbw43Oc_Q(`aQXaH~Pa_D==CGd9&vN_5|Lf!CtW2O7
z-gdY$A-(ihODEu4NSd1z?!Q-@e_i~F9{cw`2>oIb-7?H?(s=CBX3#E;YwTF=BRUD&
z?4d~$x|P{?E`%0%BeQq0+STM&Tn42dT`0?ZQc}NoU}Im7y8tU3(&G_t>&O@1cdsid
z6>Wz1dwu(ULF<L06k4oxU-1iS+FozkEdVfTqh2uy**?Hhn#*T1;KJlg!{y3%MEJHS
z{8Nv5>XhqY)@)^UzFCyn>wcAh!#O<4qugJ7(feb<x?Ii+XEj7;okCRsaw@T?Fla;F
z=J*B<e3<$fNR<46A2&q{*3|!lgsHN-Cu-r9nH%cXKh7jFVsN~+aW+i%P|%nW>pR)c
zw$Jl|;~9u>wQi~}b!hKI&`KzS15DB1e#KJwLBd>8YDroF9h9Q;1UQ=uAfKI|grzY#
z8;Hzn4HUm3Nj-~sQxj)$;F~;5KErHnq0+BH>=k>ZJD0}OSw~Lhhp9=Zj!Axi`n{Vg
z4696QAUbI&>=V*b+g>B1Ov&sHA!PdcMLkeFg-Pv?2$MX5jJ=jI0{G{b;Q}S0%FyiM
zslw|oHY~n2^150jejPGVFw;2)`5ZDd)6ERu&I<5A@#*gSt&d13F&!CG)8t8x`=g#d
zAz+26H@byeAKCuOu;r%kZppn;zh{{=U<)~#nxcgXs<aEi0OQG-G06yJMTiHOz(GhJ
zTmE4`p!a7O97^irLa`gSl#Kvr&oxYdSh6$#UY<Un7vWb1xT$`#4%om^EVb;Vsi~*Y
z97}6eNP4ZhjWb4Y5;pLR(h=L%FmtT17ChhzL}!tlqy)!TcUj_$zbI9(Ts*w%rvv;H
z4S1d$F_CYn)?%}qo@Wfz<mg|UP09t?7f2JdC<mca-YLQAt1%xA!UZdW^;Zzt8W{0i
zNQiAX%r26&HX@vKAk@EsV<a)#itLBOi>0@3Lbx1wlm0Mxe+@wpfV;!qR8iTb4B=1f
zxqnzo@xxwiyy9L3rC-Mc6&?-rp!EEC=`8e0%J;dtw~BSHlk3YOqT7r0wJSAJvnhsG
zNY(NbdT-msfQ8wbr>P(bC*Y3~mP#VvnwBs-9Mu~Kh3B4W7~lqN8IFdvCMDetTxn+v
z0#?`Jh~A=7iX%IT$wTfc&L0`M<`^Rqdo-g`X*;S)W##ajVY;_>9?rEsKtyNoVFB=+
z%is3`5@A)dh@ofdm)907@Hb2B#9$l{8L+5(2s2_JeOT+YhW6E4f+QD->EvX@ZtS0y
z8r2VvSIkML-!DRgW3b-3*gRr9IDoO<d!`9<UAg}|t3hsx7AA4XR8(^OiLyiJM~I^7
zyo1&z_6T=h&EzP!Hh`5o<^=N5WnW21V-D^s@b-gd%m<4A*Vb?v7nts2KPIBNE;9Eo
z&6UM=sx(V9>-wTdoqY*(u=eyss#`y{$0K~r#kngG<Aod~-|DZ-j3(+6+e6M85d(ae
zRkkb?t-&fQt;x45@aD!YBd5N;o4=9{9E)(sAuGDOHNETP@IPnSz9?YPcpMf%aaYN_
zt1VOkat5vgtfJcvHWe3Z`D)2!gK;<qRbDeeXEjHfLy)S@6`lu?x4)hlrKd5m(bpmb
zPfS<;NgIc5UD^IS-1_|<t&?_j3-hYe_gBz@u>;s*K&9;^O?QN-f*N#g?Bi4xLaQ*%
zuAa48gEyCK_+nKpH@oA<nOP)`#=QO*?OWP2-&A*))n@mLW?s|WgR0k#w%;yjIW2qs
z?ACt4O6Q@J$EO5~asivQ%Olz85angAs4vYWz1%52sVaGmEtt5u+&_p4#*Sg?jo4M<
zjE7c<1ObOd@E%)3g*s8Rx71F)9|fUoeJw8tU#xHmE00tq=d-PZP$Lm;nPLf>rfmUI
z@ky0^vAjy|pjuvJW?JpGN4X#+jl<|U86J4<#eXr-NhHzq@UFMZ#2Uy+`T5-kmgsSE
z?iq5zYgG{ps0XFyKyf8AkaP3->&PNy2X^K^!mqzGk}u!QB=#Si`311#a^|aV;OBc&
zIUk5c-BsV$YRZE3hX#&1V_rHg-+O&Qe`}yk&MQQlJakA%3=VInmjF@JAA0#SFx3we
z&wMi-5gjjT@=Z=fe9cQF2%uy9alD03WNUQEph@AyTyfgdo8dK>lx-pmf1nR4!e4pv
zi)L4qP_bueqKe}Kj61%eT9S#hjj^eJx6K%*5+f13rp~0Q5-uZeOw=0AoPd75nWY4l
zzsKgu7FY>vzKlb&g9PlPW%Ltfj+CbPs|!FcJ53q@FBrMR)BH|IdN;G%Xx<#TZnvQZ
z=Bob1aOdJhgp)GW%urum|I^@DjT*Hu!(!w*MSIu}!4~0Wz@R)bii$7cK1Xq@i*6(S
zMzt~h$ol%v#kVBhNG~7FBr`^GX?Q6Pr#TN%QRg?(0uA1x!x>99HAr^vh+J%BFMWTu
z2+$_V&5C}`bqPg}OXWn$7OZ;y(wU|LBn(H@_X1_J)k4NtBU~B>U{>EmCNTo4vYsh(
z>1yQ8Z54ane$FQ94^eS`0}%tpyD+_Xo4$NRdJ`INGUqwRs7+fRRGX|4SBWo+?9hf(
zs0yCHYi?%WyN4AFif{xPR_BvZB>C9H^cQbyiYnTCI@-^35a4~&JmH2#TT%F1m{ruE
zd(gk2kZCN89VXy0JR*2ALHXo9!wY@=a4df9Yv^z94pwE%^zA=|6NGv^R(@dj@Jz&u
z+vuz>0$RmqOF?~04cr^HwypgEg9IQ^f8K!?#R-Tf$zBUqbdo||HLMT7>SEN)KU3Sm
z0Wq~$UmdY#5XH*+X)`1)i{vLbpHj!C^PHv|WD?`f!hPm-J-@Yd13g5f(=<Ep6&3s3
z?pk$KW?Bv89d!o&Jh5*-OJGMtirx5|^?xFkkbQeQ+w5}q(;_Q3#%ut0OC(iB=}=}w
zL}LOnTg+=dl;K1TjKLXysAg6ssLqE3NB=Hh_1~3l!rAP3LprCw5&Rk2UrhRU;Z>oV
zMeY#EB4Wx1?WH7-i%t{i)6pk=2khG>=wMlwo}B7n6EC*=QmQITorVB(ACpdmY|}*0
z<oCU-48|Q5@LtGTMm#!$l}`;)ZHjc#LSz(01x;1q=oxPvoN=t4sSEcNENmfsIb?DI
z-*iodGOnvE`Z<2BF58?4P4Xhc#k?J*>LRV)tGdSE?{{x|I2)ieK4KTAroeaGjq4%t
zX+!gfeov8A)YYzv%vr4#Juf8oX6(efju2!_kc+7g*o>~i{)>M6lSY}YW<j^#Yi#Et
zUixLjnEuR}5Ihjge01PB{O&=!XS5Dos08c&*PcD<`-N?%NbUYMN9Yg4HV>bL{;GH?
zKa})_bnYkAy>8a2752XMa|nnHU{VxweCV~~d#k;ekS5IOKTHSM8jTn@g5U%_i}vnn
zZc433r{{wgdVKp(COQ6GoqN7;9tsFm!14<w2u$1eM92ukzg>*^rB|aOp`Ue;qLEu;
zQqP(9{zZ`$U9>?DGL@QPf*i}&bp7?->YfSIdsrHqXzY#`%L!q1mxh2PY7~H~r|aBe
zI<6g=T13EOMpXFSifYhUUhj9-7wI$gXb-!*%5$^USB+yg?MtO(2K0ZoqNCPOKhi3z
zL4Ia&>a<fkmy7z8{3tndGVN1j^7Tj5t-e^VI5sow#7uXj0d<=l1wP$SnYD?8kdPR1
zKY2tjX!@a`HDjZu;&Ucw-EK+jIQR%%es-I1KK+8q6CfcbTN^}JSkQejXlF#(#8RU6
zgZ$YDM}tVOjuK?fNHC)|x9}3SI4KNQJ7!h`Q(WPPD_2)slnNnAe>p7w|5||aCC5BO
zjboTaUj~AAYvtc%E$#MK^-$pUC3#ZW+d?~DjAH`1LZ=s>g&xts9)^ml(;s!XyRh$;
z29-xRj$Vs9@n4+Uj_#P;f)Kap#5NEp!4ui#F{$521Cg>jG2(Qbk2*m8!Eh+a9PYhh
zlC$I^s*#&?l>7MvcklPjD9dEC6<Ux21LY(=q)`N|`BA=-I!trWnXPt5GZ%>P{PcOT
zi*{*B$hj#HquS2`w;@Wv=%0g$tA)hv`L#596SrV!xI!C)pu&@{hrSOoqo>G47?H+1
zBYJToxO4ke)r;KqH@gOxo6G~6dG#ZXf~G>+yp3Hat%Ji!yQSo#P*R@#GQY`<w)(Lj
zD>hdfcVj-;c-jG^pGZNm##>QV%^w=MCz|5s9oJVFYfbdQ2I(ClGLweMiZmjha8io(
z4qd~w%@mw$*q|1j26M$fYTq%|R4x7s9(cSoBho5@hM|t6f5jTAD86IeOxjq{IGD%T
zDYg}J!1iD&5zMyP5GvAiPJWnNYpAzEhS9Q3zQW86xWu{-{6Rmc-l!SyV8g3~Y6{D<
zQm-lMHlInW3}}NBi(-Yjj0L&$(48--DkEl;Sz+#5&cR#STU!cWRaeNn7;FLAn7i4F
zR&M4t^!-{d(yF8iG6c3-(s=m!70bg%IIgDHk{k}TipQ)X7OSR!!7UL6<w4Wd4lT8H
znvG}Q;f|1O8;AujR{US9qqEi^T&|vFe@e0>eI*T&<vR8lnIJXD@2?@^O*L@Dz{gg`
zm!&m@YBPvk<?4<(sK%UYoy={=<8H&!E0HF9r-2SLe9cbPBZ|kL3fnmu>R+H?C1PBl
z<r;Q8?r~8VsW~uagyUxiNXs&_3Cj+W)Wh`l-D;)ds*M3{4?amwmr{&1Ue)q<ylSuY
zU<p6=5l&O8r5V0n{e+71gXQ<=Ilssu16t{frJ7Fll2`a-Uoh@TmRnQ(A1GMhCtD)M
z28ptH8fbf}Y_E0*I0A&>nMn7_S6s7pgu7U}e~Y<uiRpeAv?M2QqSO2ae>i?{6nJEi
zPedC)>bw$m*r`N&mgj!hJ|oN}h8~?Ow35d7aYApEPC<&L)>K05*ypuA`Tz)wh!x^u
ztk%&eDoR8vkd`yxLw{on!L`-jp({j&zB%f7>M_)+%H<!TE!O4QmZWJ`8Sy7Rrhprd
zRHM>11{waQURc+m*1q$Ar7iX5#lE?E!~6n^Rn|<rlzQuZdi%=<d79l050@;nIR1gP
zyHFfe!#9oT>G5#${sY&>X>v*#gC7|bd?UmzLJQz3M(zX=lny_eQu9kE`Tgui=&`~2
zdnp532-7f{w3_Rz4?RjuZS;c~slkBO4+}sTZ5Zeis}o-10-_%eX+=g`T66KGY7hl~
zx5Y$VxL-&i+S=Tp1B4IAxm!WneybKGe=2OhMo5u_FsJc!@~5c1owhtA$?lI5EQba>
z+HDuoS?BNH^G+whuNDxgnlWuZLM8Xn6;pT@DF}lajRfHcx09INKj{Jj1WR9qG7-^&
zUOW|&`wBmGj2W#p-_zON+W+UCYHo)9R5g`aHF59s*5m%u(18b`#xG%lR9<8HSnV7J
ze!rHPJeX*tW`fJvLw3%y&Au5*7II-~F8_K(6?2$BDZI!^^=)Dfcrgr1^I^9)VIpsc
z_W1l%#g;lD1LVAGP3%n!w_7<46{<1$gc2C)h^-xBf7w)QzA51B5Fi~ol=g1GbqQTM
zK<N6(rxpEQSGN)+_`%XWx$R^?>?-8bB#iOXsPO<JIkuSm#)?)0G!>ctc3bV6yL*W_
z>f3|Sx7soVY$n1NfBgY9+a{F@!Hdchnry}oF0o`!C%`Z-iCn6meeJeV7-ffJKY4bf
zq)~>pQhi2#?El?2Ey>8&%^$P%ll=pBIm8y&XR<gZbmj^xJ|Ps+`1rm!+K9u+hJDqN
z6bZuQU(v%~>stW`Q+}UDFVGK&ZIZ^WBK~LqErhvIUwncCsdfh}Nd@Wjnav0fLfqza
z5T63cTc#FWYC*Pw@V!qMcaq!!rI)a@$vaN9{NHPc{+5cc-8lkQO~w6_5*GRGq&_U~
zW@TgB1d5lePAhNM$CEjc=XYoP^l)6@C`Su!RMQBHkmf)%#m^|}YEI+AM1e9LSOxHI
z=^k2<$S<KMhw)~#HI95@@?=V;m&A17bK6a5x7UX$DOXgGhug?tIhmFdsYrl8W9rX0
z!elIPw23NOOVZ<(WpWw4*48av&a(wXOF2J0B+a*8Qw^S14R!ehyEualE@Ot!JFxy!
z*qn)}g(jV{zt&JQre2Evv6Vm>li2V|gggc@)T*=5*8QqAObv3B?mpFg^Qzi=?#P|k
zR^h4PKw4<Awt>Dn^_^b~z|>ev_eCKTb&SO2uvm(YL+tS)E3u7PWKJvCOfNKZ^@HnS
zZze*g=3s+^^fTOClIdR+z8CL7Dx#wb&7Hj7Xq=4T;x9N#mEZ#f)pr18`io6wp2sh|
z0eUMaTb$`~V_#6E@TkDvR1~?4PTzH0HIVit-nAI^sycA)D)fvlol3vvJpIA4^IL@@
z1D9P2WE~x11U7m-6tY>(&wIJ~#OY#U?Z)>W=MV%fYV-fFg3RZxzSmpJMU($|ZdgbL
zw|%$REeA4twZ6V~IJ%J=j^P$6@#7nbzIeqw9$SmI%ER{_06{49QBlczSLpV|Lj-MN
zg1<ENX<3D6Qv68FH)i#%?>JjKF$M@qFu#bfa3aj$rX)Fod>8P<FMT5)AQ*8_SytQ>
znIn>F^k8WLN*`|JBH@a=;CJV*NIRAj=H*Y)t<1w3N(jm!&+Jj|Gt3F~Zq@B4_qt%`
zfP;AOxJVD{n9By-44-*ps-em_E~^ot-xbCD9Ed+Bw}g8fDRcUEv64`-eoRmI3zY?o
zn-anH-61hb;GwAAMBr?Bb*D|v=T?!3i=~g4)ty)?Ka_G@^`VtbGGAhKilPzGyAh<S
z-h{bqJpU{;e`xyL7tM#*0J3AffP2sVsT8|E)tUEir(k8X>w}hQ(ut)CT|K&eeui@1
z7Aa_6W*2?3kesSWJ8jC^?_!ISqDvj(!;a8$ym5{^)lp3;4;L-@_OFkLnEDZgA5zH&
zxv5l-_?yDD^B+H--enpNm^X|CoQd3`y|2aDUIgNHdsc|9HUS`24p2v2{gv{D!$k|-
z`#tQIX*_Bd_iZ8ieXz^#VPzVreK?;wsHH4X#rRKWxXX_(Bls@kL&?!egGgJf($LBn
z<?usk^$W=mfn6Ml$og-j4?Xugg_I??1hlW0FWjAFNBgu5{Z>g5;@aooYu;*xnr-cG
zVyj1d*4Ga!ESeb=FjQr6=O<2IBXy*2C~kv%d;`pFmF??U!Wv-pJH&N-j4Xv|8<Q-)
zDM!>DdO1{I$SoQVE+R&np-00wwZKrN;~)YEO5|nbIVJvDpazkENQT;XITkpzo?pEn
zXJe9X1l_~^GQ*oD{@|K?K{G?!b;XK+CAblhYi@VxWXqzlz9o<|H49;5|HX`*9xIo!
zd`zcigTrani2oiJiS0?UG(yFq-6@qU6=a_#wEi{;20wyJ&+8C|^i^=E;<S0jFvs}-
z0lYwAlWIZSwo32|!Nl7<F3|!;!*2@-{C_k?d*T@)W)zc6*C|#CX5{$XR1IosR@$tu
z{r5oW%E_9dCxb4=fRwbTVxBkk;xH;{<@_SWWWr4f4`pW(r}d1(!H0Mc()i|@qx)gp
ziuL%7$rl+T3X=!Fc7hJ-sA`E!rT^$R8Rr2r*GOoNe-6Hfu4hy;Qq&Htx-v;?CXO9Q
z+1Pvk%2Y)4sgLdqr`b(cXSVRR?jLK4-jiaD&}4+mkt2oVC1c)iM7Q=8J+VRGtg;0*
zs!})KEjJyv_RF{}hqMv@RCVu8p5dEOvt!C)N@MmBp(|G~BY~<KVfx#>P%Zv&FLc6m
zLH8=(h)pe$iWz`@);RmkT^Z_xNq%P5u$Dz=nK<9MxfCyabxq1Am4@}j`8>-t3mma~
z_bXr+js73Jqt6GpN2HJOZFTpasz8M5<LIApSeZFl7F;Koq=rc66~5n8%$aC+gW$?_
zhj7W?!y&j>723neBTkW%AOoDuRy{n`g-|8M26Fn?#r3ykTXE<uYo`ex)T%dTl%o?<
z$T|QpFLiM*M5HSWu^-oKWTgL?(7bnIOyuB^O$g3xa@xwN-BQEr6n7Uv*^HAp*DUk`
zY=37KCQlhu?Fr!OTop8Nlt*qTd!}SBkPws&@0{?Ab-$z8mSKHwL~F~<Cuq$84G6sV
zatZGlSA&}I;$bJfEtiOhft{Q)dKU}EShh>3<^75z0XE3QAPHuWOci<i0j8*Qm?Y;*
zg7@|FUvMclqK(uKu^E+p+T2_$sb&ylmmN${L5scJvS5*VU$pF-ml<SiUF0%z<by=9
z5-l6X0;6s*LeTRMy;>NtHSI$s{bZTv%wgKQ`z7#~<}tbaLqy+)!pR>c{2$mD3+C}w
zz1S$EiesDc^bV>O|III(Bst1Odb01g6wT9#Z|vUbRD>XCKmvoR%Uc%jGLdMe2{Hxu
zG<11!lB(11fOYqvAbp+#s`ai5lCY^PThZBXrzy2hcppbB`bAtt?n5C~vQBIs@{(H3
zSW2>A_0lIy*)j1=6|3g$6Qj=b^D6;zWq(YCERLU>53)bUhAR7DLS{Ufa97h@Jzm`H
zEz^6$_3_1(KpUX*y)0U%IJ1jVE|s2+#gSfpF{REAI!iiLg@0gmFd;CGR_F54ZejCZ
z_>uApp(Qxpnbb*b^j4l%#?d<k_y~*?TPj62kn>W4_cx-bb1Tq_VmEkDCcfx*oQCmn
zj3Ro^re1G0BJcQ9bs*JBg&c4WvFpdLnSb45KkIyMe<V(&$0-VL8J6z2oYrkMzUYKg
zkt0xv!6XhW)lcBfa$3x-Kt8f+QO0rcZ}>ZGUrQVVnMS)k(nv)uFkV~fnbnPnu4_$*
z3iXmL_Dq(Xnj1ZL`?e>Mj@I~kQP|N@k)Uhd7M3c&iBPGTej4{^dz7Go1p!dZXkV3=
z4AuQT5UHS%1>x!kk3SR3vQNGrdY+@D8W+}qE{d9U_lKoLy#(PnPd0CRWF;L$$wQT^
zgF4CU5yL6quehX@87oqaUk_TeQ5L5IBeR#&e~4N7Bzqr*|NFuIHsfbF16(s{gOV)`
z>2$|T<t!CAua6W0pE#!iNm<}Tmriu%8KQ9TcA`PZ2Mx0(V$ou<FNmLVJfWji=kBjr
z8&pz7ESHQ#GaLaa3d^g*h4-1yMG#CQRYT27eLSOrGJ-hLHTxfEhS$u*9#ASEEL{l7
zr*Dh+T+BGsb3#GFmnt_1IiB2KdcA;8t;6JO7Wa*znT*;9cmhUNT_(Sru>h1yJ;x*)
zY_uRgQN8rAid_D}_$z2ss43Do01-~sQ$y{s7z+B1(xE{SQ>#4u)|lbXzW#>E!q-Pq
zj`Wt^%gMWL%tGpV5xHN~5i?Ru<!#i$13v}04Er0_Yv_6J<T7Mr_^d9v+(kVeUg7)j
zC?hyyf*oOFC*xuHktEaW?=N@Zvt+r=33&3Sd_7<KYB4V-8~IA_lj02;qMdjb6VslL
z!7n<WF)^sB>ra2W73r)D)Z$<MHN}^(@@N=<whm-}E7HRqg{9eY`+g0vVkmRYKO>6?
z9@qE&M}Jk%Z&5m<c70!<&S2C)Kf6t9Z}CxL$%{l}YHc7S<=(YOE73!l#pA;PYf7I+
z!Rn)Sm{|E1yCB(Wx#<i&RVFAMp%-d#jj!Y1K^77ffhKQf)@%T6h9nbdSBW7j%bV7i
zaAfdQAeNTA?wKzcIgm#j<vBz8rWlt!1+0`Ck4Nj=2%yIo2<A|&YsW!<JGKrKjRH|@
z*cjPpO&tYvw>rQ}SUj(%#i?UvC@u)gVnJGxp)6zdgB;fV#jhRHrr$A7vhAV=0x=4E
z#-G2DWW=<>Z1pUPaFB$GxdvQal`J?wey&z&Tt!!9@IhlwqIW**cXLh=bu)pbl|oUv
z=1xAcZl1#aQ-~0kUKsb&sZOLEL!7E^WAu*K0v@fyp?b<Q%Sp<9FdHiCTugdEyu?-x
z9j&kPQ=evcGq0TDnPFs^PNFpc5uQePAV)+-L5a6Nq=|32xRW6&de-k|C#3pTX&ju%
z8yy?NGmQJscVA3xqfM%)8Sc&~_}2`^LLCdlrxN~j*!w~8ByEp4dR<NCBK`F|$y)#(
zW|XK3&MOD-vni!GkjrB-`seLH4enG{0S}GF#t9y(>|v)786?_SF2|PU<Dai%=fl~<
ze+iaW)c0Qj@eP;pz1UnOZT~$h?iF9h4^T+I;ZLy{@aGB3)ItJUH`gDO`dvR%x#b}%
zsO7+d)d{t@yF-Jc?*a3ZzM_U2Wtjc8VQjtRkz}#XXH|91)1Q~MqYZxIZQlTCLZ!BX
z{(WdW<|T(_%*GkG%bQZ5X;&HJ-wmilG%V}A1jd}4kcxK-B!YGEvvnP$>i&&Hu!32K
zK26`n;iix?mph~NYnZaFs<5d&E1Cx3RMeWLTtPp%KVDof)s_}4FX(J%1*r*0*($45
z)_&|)=`6-ofc%(}k@ih<W#a62nWLiR`d)6F9BXXP)poef^L3T1|Ffr=;*}cIR~@R-
zPTGgE^yW{H^EWLw=E~olElzLNvi$x0zwP+#Bt2G;ecf7>(p2h$rQtNm5rV@8s&XXc
z#ga)UkGtRB_Le}Mma`N^T~<+_HM&$ggPHS)I5&yL{a%4R(M?Vt_~z$M9-kCV>%N6v
z|FY_$i52p;x!V^#itN&ru7i+{9!yb!v2LOesc0`ZIY&&22LeM!IBXhpj10blYPyIN
z-)vQfeL=()k@hO4aC}JWD_=Y!UfE7s*~S$1dA0UTL?atD6&x(VHcN{ljt=;zp%*Up
zit-fAV-_?tdKCT@)t?x#OST#<u+|-NaNEB&M^<ZRT+jEE<DmEJ(^0SlW>T`}?M1-Q
zaxLQ?xwf5;YG&XL$!7$d3{{+Ap(B-3pD_O10cYn)1pA}vB+ZUA_5QaX&&{3uq>rDA
zH{uOUqkQdm^xFRQiG0vD4oTw_8Q4tuv%M4Ir`*XOkrN7XRdH;Ni90(?cVPg;)b2ur
zq~efZUG9q$^j{ZAY3+F+7DK#FT|6%FMt-jr)j6&A{n^jGPp_d?9E!2)cm$hXKIL}d
zzjJX^2X&CMYWj|!E}=i$^w+bVAfaaB9QL~9O?HCEZf;l8e65m`G!#>&kEogJUQ!8m
z3x1c>`rTVN(ESe~#W6+MXN+>eg@*7nPpPlnGyDp}HbD1JGnG5di6g?VpLIz}xMU<B
zUHWopxi*re2~WVx7kyc22pb1exU)gOuxeeMC``!LQu60yJCblPV<b$Rj;qua7=RP=
zX8qd5ntu3aVsWrWlROeebWlm~DZ-}exE|g+-{W*%J6p5Ug96718MqQM0IF2#uZ8a(
zY5j?Vg4nvkg|5RJ)yj-#SGanAdw8V1ul9C~(HaEt_)6vB#KfMiVp&JBvWF>i9PUy-
zzxDbabC>uI&qP|?a9tO!U8;Mm01?@`qyE`_Wjl76z<7ETW`8wQv5f}HUC=ZXs@R^^
z{Vh`hS|U<Nve3N~JGQeN*VOKRMXDw9^zBs|ZT&tCZudXezdS(R{FD9<1B;Uh*<!JE
z#P1>QT3@W%pT@8+50gFE6~4=@E!zI9Hy*@dEX`e*>4l|v);v7*y(hu!nBWN*C~q|V
z@VZ%3iC@|3xA3$v-M0m=D>qwFC^;wXzkJSd*6KQ1Cb&r*odNOE0w<k{GNjbF>*;Cn
zNW!i#Tg!Y-lLdYwuzQQWm5$4DAoPi(Q&P%|E=A|B($;Mlofnrnp_NXUw>Y}bzX_ES
zt+FlMN~!*<gSQaX6njYP(;e5-Mbm(8q1jgsA~gtw_24mHH$C&z1cWaER~WaA7lj$F
zzW<4Bs)Uny_NMB-%iB}Npw0nH_!%ToOH=*nbF_E=)k9NP>VveNRP6f{(9##eTkpf)
zrq<|TeMh)U2>!{)X>wmklB-I&?^C-ANOaGm<0dypb-+0TVA|(mcQPUY%ERctvQvZf
zsA)hlO!*15d4K1-uyCyB1CUiWi9P{E>!?pG77DdyFEQ`~%BdXlHv|_S<GprbSxz@!
zVtw92Xlr4IAbBY#YlT+r&R1QKu5uw+OAlR46Ms)EJG-04aa*x)%LZ6tO1SXC6+2YC
zFra%Tj;KxjeAMjs8vQn&vfwi^PYjojNTiZa6Q&uZXZBo~n?IJX8-jV<czvS1xfw54
z>)rpjR69bTI;Jci!4EAnHjpyCc!P7PBMat}e)S2Xd#!RCmf`1`d|gLuBpTTCcTHFH
zz3GjoJkn;Hs>P-=4Lgf*topU;;Q>-U2-sCvbd}K{3Sh#J?wb{!?vP8u@%iikccz;P
zw29M|q(yOW$SWm$fAsmS8~u-*){}4g(zY58zf_ewv-xLH8dJQ;S>nuqoRX1RDlyA-
zO*p+6vUS%cpmK8Od-A|1Tje{KjnR_l8HPWiQTP~XwHAZLZZ_%=H&gx3TU*~h{bWEc
z^q}`5&8Hmr(kxs;pS~=U`;&pJt1HJnqGNhvk!tpJ^n7=s?bW(dgcBz4ZurF+OvfvM
zT$0ibvi$u*@O!`~g{@ac|5XTb0#Bpy*)tIfUrnS6-e}AD$f_IHY8zop1$L3sIZRHK
zLHj6lS9&z0S!cc9vK^p{;SEQ34tJI<@6nZE+Bvmiv*raVe*Plz^KZFM6DJGYfh=m6
zYK;-&-N*UxV=~$hrh?<4a@t!SAhB2d&geP0MrSng<Xe2*tBnp2PNH6XP-8G3J({t(
zh5d&>gEl6oR=VUOrEs2@n@r61+YFYcy=G|LGF3Kyh`!yCYu+yXHW1bC?|k0kK!I2#
z(Qq7B>}j+(Sq}}yMZ)B|_!2II(`ePaEr-azQ;#>-8^z9X)&<$&A4-mziH!ZlkX;HA
zr+4@yYJt52#yA)dIUQt1)iVJ9b|x6{ud0N(8J(i-0k>n^rAgE^UA*A>oK}ws&`dnS
z=CxBRxnYZ^Sx<n9qdYxp9Bm(E`Vr=M3)iA1Y1uB`@#lxZ&Ld+=C$YJx0=fe>CDTz)
zt5$`t>!_M+QF~#a7!k)!G2-Bllwesb?a~MUvN*%=r0e@k0O+B>VcjL*nebtci0<!Q
zm~TOOU7%LnJ8Niv?dmBb*~hHUrq4=%OAdwx+wrL^5RzsCj`;8DOsO-xhZo33A3s{j
zCo%^NDd<{_`JJ<n2ci|i@IGv!-26ktyYi8^P{(Q3H6FCPx<W_Q(los=7p|L#N_xmZ
z#sC=@!}Md{2Njs=qik;*t+`PJfDZ6cxPt;Q?OPt}8#-vKtElQbI%rMx78xv+-3>Ec
zzR2H$_yxyAJ4t;S^EqMO?148_23~)0wZ7L7FqSdvs!;bl9t?TKiC6U>9Eru7sEEz|
z()*6}nnjUtLk$}vHzg<JRg}Emf}pv&t|WL#*!(xF#QCtzj#^5`bc^%qBWphzg0%NN
z41|{g^chH}SytKpg|?!Nt)#}Qg~qE-pY27nD07|zjX?&gnlZ^s_9*xQT+vnwe6xFD
z7FWi$ig0QK6<SZHjF--?VD&$ghb+)%B~C~E9-m*+FrB}E5MzNw?&oQ%R+O`P!`#Mq
z@$l7;;g^*8h~m=yt3PSj7|ul$GTi%82Hk5Yj}xr(_<Y{`l>l|ow|XxR1ZT_%?NOf$
z0GH-11cp78&u;-wFMEB^zD%}s=^v{`;WPZuCWB^KCjmbt&~h(4etBs&Q%(<msSy%P
zO{XIlL<ZX8NAa{;#XRoW3O&ub*G}k~!`ZT!_ZSFgG+uW|pGJ8i?d=Hzt#0+lA8&>O
z=a{)^SXERHAPj@`DBabDzhdYiXvT75m>>vO*@I1jad@Jz-I_T^e{|8w{Wue;LKZIS
znimO+NtA5`WIcZUEDQU%pH~|fn14+Jo08O+k4QEo%|kJ$*%d>%2QVDGewQ)#{kzHf
zaSE$a<he>zD8mm~G`SSN$PRZ=jW4Nlob+Hc2v6A4hIyZ1XB_pPr0>(*rT*GP;1~4l
zR?S;<;>Id`sAxB*U(TgU69p`0tXDq;5~c4`Y28f)oli4F?4PeX)dLDZE70ahX1VPG
z6cbXp6D};S^_Ee)PYAcz;D!Rm{XmfGC#8CF*oLYM$-<&BT3#ZA6=O*`N(f|LvsetT
zXG>o!Q4|T(e&LV%TTPpINv5zgHLi~yA1C~J?}oe+u+BzF8X^u$O{R1!A{!3}p4M_3
zN*HamKd<I!Not=7xVl{2#mrN+&3UZYU9zb-2ZU{EL~xa}Q;B#2Kb)v^2}OzzGTN7Y
z7H8MweES8gvLJ`6dl&*sM8#<fD|DppfDJAcjTEk%yScBCs{V>3T%;f%RYNz3r`gXC
zQQRIY)1S{gR7Y%^qs-HQa`eswPI^-<^uE32yZ7B}vETnJmLMSXAH7^WnQ_K_`=%bH
z94B)0k~E*%IKqM>WdoQBVKez#<235*la1sZ2jj#n%c7yFW2;rbTIOLO_R(J_l&l(6
zuIA*Om}j7icL@aV-S6(Of_0JQ^22<kvB4%t7V%*ieDsHKT$WT84*-uL`|7X*M!nns
z_pz1YZ{uc4#6@L+^P5nqtIr>Qh_baTAOdB-ElNpjZQ-&ncjiITohJ#+`sb*%EO1|>
zXonRZtE(eMSd@@Vv6;K~^Nb<nhUt@YMz!U6me6vAV4U$L?TYR_OBr&I>O$*C7Yi}?
zY{g}K0yzz<p^+P*Z2Vj)?PE}1rOXa@(P2hR5q2-k>fms;+zt6s1w1e|C07C#F2|p-
zWv>)>Ht&(O0BD^5eHS1Yr}_o>-NJ8yz5<n2D5rOmm4X0s&~`t-CLYPt|C!hzgJkc|
z;Gwc`btPK0BkB2tVo0%O%a5T^puUsg#Xwew%cbx0qs0dQL{7yPpB>K<<0WbrlE6KO
zr=LEK<oIVJ8U1BqrCf<f^8XD|(yF|c`aH<*1N`3r|7%3_R~kPHv6T+U{e=9s1d6hP
L#@kvsv(NtzW>&fc

literal 0
HcmV?d00001

diff --git a/pages_rush/components/pay-pop/static/ht.png b/pages_rush/components/pay-pop/static/ht.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ff2a810eb0f6187d7c9849c5dbd53a299811f2a
GIT binary patch
literal 1033
zcmV+k1or!hP)<h;3K|Lk000e1NJLTq003D4002M;1^@s6anjrT00001b5ch_0Itp)
z=>Px&!%0LzRCr$P+`)C!Fc1LHQTDL!aUoPdXaK^AYjorW9i#)63P=Y)1%VEh23DI2
z2pxnDLIuN{UCV3l+LmmOMsh5_ms1?c`a98%N3s<}IE*pp0PqO_t^wd8!X<EYxdng+
zL|iMS?zGmAZH+39-ukp*jJX5=0{{g5R1N~Z(OQ3R8jvXR69uli-UEO>j%qRF830@C
z2LSk}wI=Z0A%Z+3VC!0o=-|jR1h&vynm2++@{EBkG&ygBMREq-IsejHe+Yt{fe#7C
za=CoQj+}w(net+>c*lyIfgA6w-m@WR;MSX09^?$%SsfUUoPnL?mvP7$*a=K03`fqu
zUckeVC4dp}F919$rQUcCXXJ^9cn1KNN~z}~o2veK|45bq27sShYbxl2F=hn-Ul|8|
z(i9^8Q%YS?<;)m!frwkB)Jvv5`ymSf)7V~AYqG`|0>5P%bgh{xu>A#dfBwjVz%<sk
z)p~3Z(d^Joz(rr*isdnm&(#lE7?=juxWd30VI9ESAEp~Q0<evqV9<iV?(8BWa4=|L
z;BMpufZ3rV0JkG21k45<3Ah<KLEzEQ5rI#U69yg(9T~WeJOSX|(1`e_xRa}Gq2f#h
zJre1C3O6C(Dl}~%p^YTvQN>FHcpu3V1h%LYowVd$?$oh&hKRUIAcF06?vQ^|<;f%L
zQ#_>+y6HlNr-<q$?2s`<y&l)(gpLSYP8U;0rh&9VM+V*_Z#J8I$-;P#2=zX-?Mu$i
z(V@zuo)@_P;wy^OoT~wz{f|Gb3)r?EIhqeC+!UcZ(zNsAjo1;P52enjMYJOirsb-}
z^e)2GQLiUY1={mQqcx8fhCVIYrw;82?7U$Sgl=9LNfo*$unYRCcswlh7k>NlQ)<uy
zfnCrNnN{~1Un<Zefn!7aEu_Xw@0fsNLc5V|DKrK&GjJ?uKjawDfq-K``y)$22L_gg
z?uRT0{i<u#V|>M<Y@zLj<pu!0F!j?PSqNHe!(mgIl)26^3|RpB2LODgB9AeKB8nm_
z<UtWlYlhnZ%W=bz1)yo*^dtGw5n3<gUWyxsEC3xcdZpSPkDQ^MpA`>shVF#sL(b5x
z(7ebQ`V{)??Cdq$v(?q+Q>orLXG?(-g1m~sUU!DxNrZc;NQN%|MZ&%wCqo||_zW^9
zA5V32n>voGh$6^y$~x$o@M7C;xp!I&c@EHRb#PJS3N*c`mFod<fkdpkiz0gIg{V|L
zJUPUX3ut=d><SUDr-)4t`_QAwN-3HW)>`Xz*T?W5y6rveFPv5c00000NkvXXu0mjf
DC(hX$

literal 0
HcmV?d00001

diff --git a/pages_rush/components/pay-pop/static/pwd.png b/pages_rush/components/pay-pop/static/pwd.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfec07196b213feb863e44c24b9587f0e4450943
GIT binary patch
literal 5022
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

literal 0
HcmV?d00001

diff --git a/pages_rush/components/pay-pop/static/pwd1.png b/pages_rush/components/pay-pop/static/pwd1.png
new file mode 100644
index 0000000000000000000000000000000000000000..493925a7179191384d584eaf65972a4fd3bfff44
GIT binary patch
literal 1931
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
Ru5kbW002ovPDHLkV1m1igvkH^

literal 0
HcmV?d00001

diff --git a/pages_rush/components/pay-pop/static/sq.png b/pages_rush/components/pay-pop/static/sq.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1cafd60f801fa164c5e7d1d014c93bd814c95ca
GIT binary patch
literal 1584
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

literal 0
HcmV?d00001

diff --git a/pages_rush/components/pay-pop/static/szjp.scss b/pages_rush/components/pay-pop/static/szjp.scss
new file mode 100644
index 0000000..c36a01f
--- /dev/null
+++ b/pages_rush/components/pay-pop/static/szjp.scss
@@ -0,0 +1,288 @@
+.mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.4);
+}
+.box {
+  width: 100vw;
+  height: 50vh;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  margin: auto;
+  z-index: 101;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .center {
+    position: absolute;
+  }
+  .bottom {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    background: #fff;
+    border-radius: 30rpx 30rpx 0 0;
+    .tle {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 30rpx 3%;
+      .tle_lft {
+        display: flex;
+        align-items: center;
+        image {
+          width:60rpx;
+          height:60rpx;
+        }
+        .tle_1 {
+          font-size: 30rpx;
+          color: #444;
+          font-weight: bold;
+          letter-spacing: 3rpx;
+          padding-left: 8rpx;
+        }
+        .tle_2 {
+          font-size: 24rpx;
+          color: #999;
+          letter-spacing: 3rpx;
+          padding-left: 10rpx;
+        }
+      }
+      .tle_rgt {
+        padding: 0 20rpx;
+        image {
+          width: 40rpx;
+        }
+      }
+    }
+    .pwd_info {
+      text-align: center;
+      font-size: 24rpx;
+      color: red;
+	  margin: 10px;
+      height: 100rpx;
+      line-height: 80rpx;
+    }
+    .bg {
+      opacity: 0.5;
+      position: absolute;
+      top: 85rpx;
+      // left: 0;
+      right: 0;
+      image {
+        width: 250rpx;
+      }
+    }
+  }
+}
+
+.pwd_box {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #fff;
+  padding: 20rpx 0 0 0;
+
+  .pwd-text {
+    position: relative;
+    line-height: 60rpx;
+    vertical-align: middle;
+    text-align: center;
+    font-size: 46rpx;
+    color: #0fb361;
+    font-weight: bold;
+    width: 60rpx;
+    height: 70rpx;
+    margin-right: 20rpx;
+    display: inline-block;
+    border-bottom: solid 1px #666;
+  }
+
+  .pwd-text.active:after {
+    -webkit-animation: twinkle 1s infinite;
+    animation: twinkle 1s infinite;
+    height: 40rpx;
+    width: 5rpx;
+    content: "";
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    background-color: #007aff;
+  }
+
+  @-webkit-keyframes twinkle {
+    from {
+      background-color: #007aff;
+    }
+
+    to {
+      background-color: transparent;
+    }
+  }
+}
+
+.solt {
+  width: 96vw;
+  background: #f5f5f5;
+  padding: 40rpx 2vw;
+  display: flex;
+  align-items: center;
+  border-top: 1px solid #ccc;
+
+  //   border-radius: 30rpx 30rpx 0 0;
+  .s_lft {
+    width: 78vw;
+    padding-right: 10rpx;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+
+    .s_li {
+      width: 31%;
+      margin-bottom: 20rpx;
+      background: #fff;
+      height: 90rpx;
+      line-height: 90rpx;
+      border-radius: 10rpx;
+      text-align: center;
+      font-size: 40rpx;
+      color: #444;
+      font-weight: bold;
+      border: 1px solid #fff;
+	  margin: 10px 5px 5px 0;
+    }
+
+    .s_o {
+      width: 65%;
+    }
+
+    .button-hover {
+      background: #eee !important;
+    }
+
+    .s_sq {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      image {
+        width: 30rpx;
+        height: 30rpx;
+      }
+    }
+  }
+
+  .s_rgt {
+    width: 20vw;
+    height: 100%;
+
+    .s_li {
+      width: 100%;
+      margin-bottom: 20rpx;
+      background: #fff;
+
+      border-radius: 10rpx;
+      text-align: center;
+      font-size: 28rpx;
+      color: #000;
+      font-weight: bold;
+      border: 1px solid #fff;
+    }
+
+    .s_s {
+      height: 200rpx;
+      line-height: 200rpx;
+      color: #fff;
+	  margin: 0 0 -5px;
+      background: #0fb361;
+    }
+
+    .s_x {
+      height: 200rpx;
+      line-height: 200rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin: 0 0 5px;
+      image {
+        width: 50rpx;
+      }
+    }
+    .s_cx {
+      .button-hover {
+        background: #eee !important;
+      }
+    }
+
+    .s_qd {
+      .button-hover {
+        background: #2aa515 !important;
+      }
+    }
+  }
+}
+
+
+/* 弹入-从下 */
+.a-bounceinB {
+  -webkit-animation: 0.3s ease-out backwards;
+  -moz-animation: 0.3s ease-out backwards;
+  -ms-animation: 0.3s ease-out backwards;
+  -moz-transform: translate3d(0, 0, 0);
+  -ms-transform: translate3d(0, 0, 0);
+  -o-transform: translate3d(0, 0, 0);
+  transform: translate3d(0, 0, 0);
+  -webkit-animation-name: bounceinB;
+  -moz-animation-name: bounceinB;
+  -ms-animation-name: bounceinB;
+  animation-name: bounceinB;
+}
+
+/* 弹入-从下 */
+@keyframes bounceinB {
+  0% {
+    opacity: 0;
+    transform: translateY(100%);
+  }
+
+  100% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+/* 弹出-向下 */
+.a-bounceoutB {
+  -webkit-animation: 0.3s ease-in forwards;
+  -moz-animation: 0.3s ease-in forwards;
+  -ms-animation: 0.3s ease-in forwards;
+  animation: 0.3s ease-in forwards;
+  -moz-transform: translate3d(0, 0, 0);
+  -ms-transform: translate3d(0, 0, 0);
+  -o-transform: translate3d(0, 0, 0);
+  transform: translate3d(0, 0, 0);
+  -webkit-animation-name: bounceoutB;
+  -moz-animation-name: bounceoutB;
+  -ms-animation-name: bounceoutB;
+  animation-name: bounceoutB;
+}
+
+/* 弹出-向下 */
+@keyframes bounceoutB {
+  0% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+
+  100% {
+    opacity: 0;
+    transform: translateY(100%);
+  }
+}
\ No newline at end of file
diff --git a/pages_rush/components/pay-pop/static/yj1.png b/pages_rush/components/pay-pop/static/yj1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ae3a1b70e29cb916381c6ba2671330e3878637f
GIT binary patch
literal 1284
zcmV+f1^fDmP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(zDYzuRCr$PTG4UTKn#^C04gA<0H}b-4G=0IR6wWzsDMxbNd+VgctZt*3P>s-
zR3PTv=rTTgZSQI~ft&Nr<R@eANl#BtTCJIOeDRL^PYVDG19lvNB?Wez0E-ANDX^r#
zjwA43DG)+<uBwlS=rJ=tkKwMWS44En%r_!({SdLaHvr%;5xpd$1N(cN>Ci0^UE1Gw
z5dk>WS5*K)2ypTZ5gilJUS(^+h!Y|@6A^$@WmN$ngaBth5YbT;tL8U3C8AF?(xeCg
zi#Qxd#Q((tBLIY(5pDoN2!}-U6{7YpJn#G_oPR4K=N>z<0kEjUaRBf?EdT%@ve=LX
zfaUr(B8rx=IW$!D4>QA1sC&Q6K}QZ$^^loSE<FpC;&qNTBm-b&EqExesyEF1QA8kK
zvnzxEAU-lP%4qHa10=O<CIMj1|H!q(o_{YQ5UcDJLO4>@69*%bL6`-=8+oJqL24w%
z(6J8kl$oDpBA5iiBmkE4h<ujP*K&UCFoaiCFP$K~n9_t%08H(X^B%#&k50C(=F}>x
z%=~jsy^RR~Ay*(_2Q(pC9i{+)+IvdfWX^{W)~#|MSQvUDB4-onfKC%7ICq_k$m`fk
zQ2?yT0RUMGYTq<X^bBBH0^{cx1t3t*qYP@>7A){o2b9M_vorv}sQ)WB?+qy!J}7k#
zAsrPklt>~%YUVENx!+HP7yvHnL-?AeiHc<i0YW+#`MyI}BJv{UW!tux8RTjKwi=|u
z1^@-<Vsji*2d6>Qa%bLR&oM@UWzZ7Of*_(3U9CO<pcW|RS!2d}qQCzAC<_Wfy#xXS
z01Bgz{Wg%rKTJ=4d(iB>^Q51*HEq3PKnS5E`eOii1*?l$4A|0r?^tjLKtXv~8+#vy
z-V3m*`n_qIRjPLxP>SkyrvT6>WI<E}+qS)O^zbWIsp`+BX$Ix9L<GChk5z#Z7HoeR
zH04IS_{yQ&w<7W+_MV3YW6?JoQCYH1sAkuNh-{p1qOGv1UOPLj(N@@wvq|0C)N#7t
zoPu%O-fSyu2m__;!w}|tBC;Q2LF!-wk!R+kvBOY7xlTI_t&I;McvE5SIE*pZabFnC
zaU6$7=Y|F1H=usB74Al^U<!k6k_IB30}@)^$#J&hM0r<9m>HwFyn%?N!X9pH9eR*7
zk4qI=?{vzvWRUmW-%T2d<_K74^C}=@3{p1mOr1;40$@zQ-M(iYhu4oq<V$L_dufOx
zFGlKFB`?+aK_fI}WWi7p+u{}o7bBzdzMkV~$UZxUDCizh?vlsxNet*z257>$x3$IB
zADGJEY7D)`MlLe1uEuN-n-%f(K2}K%@8xQ&0|Jagsq%D-o=ix6=K|j+%vF>AW?2mA
z(ezMNabuIz-KBbw`<zi8jz7%xc)wRbZWGbFT*E6p4{?RIWL=48mBAE4?FtP*cn6g!
zKhu2%VhYELza(>~K+IxmSk|rX(_F8np0_J@l*H4Lh*#5qIp?f_S$!g>st37RVY$8j
zOb#==|Nk?&nLYw#4u7a3W0xeW4<+qXSxoP_AZ0Z|DVuHMGgUQU0bmOeSQxN{L91%=
u!hou9ZsBGN1GX?|RZU(PP!-NC-0Uw#jc{K`J1v_40000<MNUMnLSTX=Eia`2

literal 0
HcmV?d00001

diff --git a/pages_rush/components/pay-pop/static/yj2.png b/pages_rush/components/pay-pop/static/yj2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d40ae6663e4724efff1d16e0227857e9400e534
GIT binary patch
literal 1437
zcmV;O1!DS%P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px)S4l)cRCr$PT3vD)M-cAbnt{AoK0)vaVx7R~1VLpH!;{eoqMX3^1i>c|dIASr
zA}0_&f#3v@Phfb9G?VSr%&sJUW_M?1R}_hMo+xU5y1)MVXL=UlnGbyC`a=mo$$)2$
zK<NU{oB(AIEM1^<foG1u&Rn4R2fYT6FDS$VK=s=&2xl13Lj1$NP1<;~3)?&y09xTt
zyaB*E0n`!Tz(pYfSRlX@fTj@eucKdZ=Ca;)ZlM4)F6n^ZiuV9;27onNA?)UnVnk0=
z`NiZI7j|p1XB7fKV?Z^I;sXG7vX3lc2K5E;k43miE&!Cp*{%G5+Tyz(1kjUJ_Aw75
zya9OoSvHX9+|{>>hDpT=LOlKQj!k^_b_O8wb9oK`4W9#_aLq(i*{LfVoB)V@{SpAp
zX)Ig2B@s;!f+>LxY7YYeYXo5(5f!j6vbQqk(U~BA>=GNS0Z?g;LV4vwc_R9T5Ohav
z*0)jYWFS=9>;l3YoB6AAbova~k!{+v0wBui^4e7xHJ^Zf8@DPwpS8__>;RHl>%<5b
z5HbPCVfiHltZr+GB!J?Ast<raxqxU3LMi~t=NZat584-^{Jp|)fi?93K@vMmiwTJU
z#D`va1-yVAW?5eEFQm4r;B1~1y<<0=y1D}Z%|w+SCGDRGKyxTAeNtVP&%gaF-v<<`
zQh6hj&@9BD_vIbCNOXrNCa4tbIwqqQKQ=8g0-%bVfJg!0G*q-7w=2dwK<vxs*^HtY
z1pG9KLCt}f`ecU?@z_)>Z2=IMw|{x~JpkdUDb=|K(zF1kQzXKblVx-^f`zQISDUV|
z1%NO00bn_5apRS@IlQ~hw*00_G#j-lhbBdvL!oYiPN^~8XUi4V0Psau=X;`yal5j0
z8;o<gkKZOT>SS=&M?`h)b{<4<G;VVhO!Zg?U?^0jS9ji3BalFUFYDh+U}ixcPzhi<
zZt<fn0P<KrV!%4G>c9Bn^xX^4c#){Gmz#cDq^u7NILTxE1OW01ngnd#eOFoV0Dy0L
zc_6ES0eJ;|Dgc1s>!{7Ot3NWpGrgn%@Sk!4rARIoBnQEnYYqPxGiW|)RknH$d4k}o
z^|!M?4i@|`(x5`*WGE&G@Uv^=R+ZMc#b25Wmpcy@n5`en_}!;cC4fK2Exy*uGnT^q
zR;qTDd!?093PUJeZgPp&Y2SN_s#Hal)iO(Ag|Po2bTevIUKv>sy%bqAHfRn3?<8G@
zeABh{W$0dbe^*FvfkgpKUxzn3JTwOidTD(_-{5DWzOfWuwVZDkM(<(S5Mh5y9pU8<
zY-ZCC@oUP`TvU18xgnxUS^eZC)uW_SJh1J@*#_Di-6^Brubykw6m<+>djFz8uy3Sn
z!D-c(%mhFeNKsqdC5o>|LuaE_<&&+oSLdnr84~q8Ql6FaTZK@XkU2rP2{GuV_4`)O
zj_wfjyL%Hw?_#aI69A7fK}>v0+vuYQnuHik16+R^3khohg>?dKcvw8fkLH4S<4K;z
z?kyDe4EsLSqK_Ncu2HE@R#_)2n{4i96$4B{#Kn?&>vPHwwhB4STZV|8ojs3l*9x)=
z0KYm2T;$YGqRP6iR(DE+Hqz=RG!R|iMy1Uet8>)NQv&b0_<GVA-Y#I;Fp3YN0|aM?
z_@k?0Y4g>i3!wTWhWGPWys#LMrCjtFBI@chxwzBp8Y`Bncc(s+!+=k--Ws#y*$D&E
zgoxZk)+oRO49y=(Qh+lIX(55#6hUtrPzrScn*;Z4P6@!iS!CDplnmH4;`?@9$$)*c
r$gbrn8L(@__wBrr0sCf=UCZ+?|3~6qU=Ox;00000NkvXXu0mjfL>7^Q

literal 0
HcmV?d00001

diff --git a/pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue b/pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue
index 9289396..65d5c0e 100644
--- a/pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -27,9 +27,7 @@
 
 <script>
 	import popup from '../uni-popup-new/popup.js'
-	import {
-	initVueI18n
-	} from '@dcloudio/uni-i18n'
+	import {initVueI18n} from '@dcloudio/uni-i18n'
 	import messages from '../uni-popup-new/i18n/index.js'
 	const {	t } = initVueI18n(messages)
 	/**
diff --git a/pages_rush/futures/details.vue b/pages_rush/futures/details.vue
index 077adfe..65c5383 100644
--- a/pages_rush/futures/details.vue
+++ b/pages_rush/futures/details.vue
@@ -52,46 +52,62 @@
               ref="detail"
               :show="details_show"
               mode-class="slide-top"
-              :duration="2000"
-          >
-            <view v-html="info.goods_content"></view>
+              :duration="2000">
+			<view class="detail-content-item">
+				<view class="goods-details" v-if="info.goods_content">
+					<rich-text :nodes="info.goods_content" @click="showImg($event)" :data-nodes="info.goods_content"></rich-text>
+				</view>
+				<view class="goods-details active" v-else>该商家暂无上传相关详情哦！</view>
+			</view>
           </uni-transition>
         </view>
       </view>
       <!--按钮-->
       <view class="bottom-buttons">
         <view class="button-item" @click="editRemark">添加备注</view>
-        <view class="button-item" @click="buy">立即采购</view>
+        <view class="button-item" @click="payOpen">立即采购</view>
       </view>
       <!--添加备注内容-->
       <uni-popup ref="orderRemarks" type="dialog" class="order-remarks-content">
-        <uni-popup-dialog ref="inputClose" mode="input" placeholder="请输入订单备注" @close="$refs.orderRemarks.close()" @confirm="confirmRemarks"></uni-popup-dialog>
+         <uni-popup-dialog ref="inputClose" mode="input" placeholder="请输入订单备注"
+		  :value="order_remarks"
+	 	  @close="$refs.orderRemarks.close()"
+		  @confirm="confirmRemarks">
+		  </uni-popup-dialog>
       </uni-popup>
     </view>
     <view v-else>
       <ns-empty :isIndex="false" text="未到秒杀时间"></ns-empty>
     </view>
-
+	<pay-pop txt="支付密码" :pwdlength="6" ref="payPop" @pwd_e="pwdEvend" />
     <!--登录弹框-->
     <ns-login ref="login"></ns-login>
     <!--加载动画-->
     <loading-cover ref="loadingCover"></loading-cover>
   </view>
 </template>
-
 <script>
 import uniTransition from '@/pages_rush/components/uni-transition/uni-transition.vue';
 import uniPopup from '@/pages_rush/components/uni-popup-new/uni-popup.vue';
 import uniPopupDialog from '@/pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue';
-
+import payPop from '@/pages_rush/components/pay-pop/pay-pop.vue';
+import payment from './payment.js';
 export default {
   components: {
     uniTransition,
     uniPopup,
+	payPop,
     uniPopupDialog
   },
+  mixins: [payment],
   data() {
     return {
+	  api: {
+			payment: '/futures/api/ordercreate/payment',
+			calculate: '/futures/api/ordercreate/calculate',
+			create: '/futures/api/ordercreate/create'
+	   },
+	  createDataKey:'futuresOrderCreateData',
       id: 0,
       // 倒计时
       end_time: 1680170346,// 结束时间  时间戳
@@ -104,24 +120,50 @@ export default {
       details_show: true,
       info: {},
       order_remarks: '',
-
+	  userInfo:''
     };
   },
-  mixins: [],
   onLoad(option) {
     this.id = option.id;
+	this.orderCreateData.futures_id=this.id;
     this.getDetail(option.id);
   },
-  onShow() {},
+  onShow() {
+	  this.getMemberInfo();
+  },
   onReady(){
     // 判断是否登录
     if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/seckill');
-
     if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
   },
   methods: {
+	 async getMemberInfo() {
+	 	this.userInfo = uni.getStorageSync('userInfo');
+		if(this.userInfo) return;
+	 	let res = await this.$api.sendRequest({
+	 		url: '/api/member/info',
+	 		async: false
+	 	});
+	 	if (res.code >= 0 && res.data) {
+	 		this.token = uni.getStorageSync('token');
+	 		this.userInfo = res.data;
+	 		uni.setStorageSync('userInfo', this.userInfo);
+	 	}
+	 }, 
+	 payOpen() {
+		if (!uni.getStorageSync('token')) {
+		   this.$util.redirectTo('/pages_tool/login/login');
+		}
+	    this.$refs.payPop.Open()
+	 },  
+	 pwdEvend(pass){
+	   console.log('密码是：', pass)
+	   this.orderCreateData.payPassword=pass;
+	   this.orderCreate();	   //创建订单 
+			
+     },
     // 获取商品列表
-    getDetail(id) {
+     getDetail(id) {
       this.$api.sendRequest({
         url: '/futures/api/futures/detail',
         data: {
@@ -161,7 +203,9 @@ export default {
     },
     // 添加备注
     confirmRemarks(value){
+	  console.log(value)	
       this.order_remarks = value || '';
+	  this.orderCreateData.buyer_message=this.order_remarks;
       this.$refs.orderRemarks.close();
     },
     // 立即采购
@@ -177,7 +221,29 @@ export default {
           this.$util.redirectTo('/pages_rush/futures/payment');
         }
       });
-    }
+    },
+	showImg(e) {
+		//拿到图片的路径里面的内容放在我们数组中
+		let contentimg = e.target.dataset.nodes || e.currentTarget.dataset.nodes;
+		let arrImg = [];
+		for (var i = 0; i < contentimg.length; i++) {
+			var img = contentimg[i].children;
+			if (Array.isArray(img)) {
+				for (var j = 0; j < img.length; j++) {
+					if (img[j].attrs && img[j].name == "img") {
+						if (img[j].attrs.src) {
+							arrImg.push(img[j].attrs.src)
+						}
+					}
+				}
+			}
+		}
+		//最后一步就是把我们的所有图片放在预览的api中就可以了
+		uni.previewImage({
+			current: arrImg,
+			urls: arrImg,
+		})
+	}
   },
   onBackPress(options) {
     if (options.from === 'navigateBack') return false;
@@ -315,7 +381,6 @@ export default {
     background: #fcfcfc;
     margin-top: 20rpx;
     padding: 20rpx;
-
     .detail-top{
       width: 100%;
       height: 70rpx;
@@ -345,8 +410,23 @@ export default {
       }
     }
     .goods-detail-content{
-      overflow: hidden;
+        // padding: 5px 10px 10px;
+        margin-bottom: 52px;
+        overflow: hidden;
     }
+	.goods-details{
+		// padding: 5px 10px 10px;
+		margin-bottom: 52px;
+		overflow: hidden;
+	}
+	.goods-details.active {
+		min-height: 150rpx;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: $color-tip;
+	}
   }
   .bottom-buttons{
     position: fixed;
diff --git a/pages_rush/futures/list.vue b/pages_rush/futures/list.vue
index 6837909..336cd67 100644
--- a/pages_rush/futures/list.vue
+++ b/pages_rush/futures/list.vue
@@ -1,29 +1,12 @@
 <template>
   <page-meta :page-style="themeColor"></page-meta>
   <view class="apply">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     <!--登录弹框-->
     <ns-login ref="login"></ns-login>
     <!--加载动画-->
     <loading-cover ref="loadingCover"></loading-cover>
   </view>
 </template>
-
 <script>
 export default {
   data() {
@@ -38,20 +21,12 @@ export default {
   onReady(){
     // 判断是否登录
     if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/list');
-
-
     if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
   },
   methods: {
 
 
 
-
-
-
-
-
-
   },
   onBackPress(options) {
     if (options.from === 'navigateBack') return false;
@@ -60,14 +35,7 @@ export default {
   }
 };
 </script>
-
 <style lang="scss" scoped>
 
 
-
-
-
-
-
-
 </style>
diff --git a/pages_rush/futures/my_shop.vue b/pages_rush/futures/my_shop.vue
index 01229a1..1171383 100644
--- a/pages_rush/futures/my_shop.vue
+++ b/pages_rush/futures/my_shop.vue
@@ -26,7 +26,7 @@
         <view class="punish-title">违规总次数</view>
         <view class="punish-num">{{ user.total_violation_num || 0 }}</view>
       </view>
-    </view>
+    </view
     <!--菜单列表-->
     <view class="menu-list">
       <view class="title">小店订单</view>
@@ -43,6 +43,7 @@
             <i class="icondiy icon-system-arrow-right-s-line"></i>
           </view>
         </view>
+		<view class="point">您已完成{{user.business_num}}次寄售</view>
       </view>
     </view>
     <!--登录弹框-->
@@ -258,7 +259,7 @@ export default {
         border-radius: 20rpx;
         margin-top: 30rpx;
         box-shadow: 4rpx 4rpx 6rpx #e9eaed;
-
+  
         .left{
           height: var(--left-size--);
           width: var(--left-size--);
@@ -306,6 +307,12 @@ export default {
           }
         }
       }
+	  .point {
+		    justify-content: flex-end;
+		    display: flex;
+		    margin-top: 15px;
+		   
+	  }
     }
   }
   .punish{
diff --git a/pages_rush/futures/order.vue b/pages_rush/futures/order.vue
index a8326b1..bcdffaa 100644
--- a/pages_rush/futures/order.vue
+++ b/pages_rush/futures/order.vue
@@ -13,8 +13,7 @@
       <view
           v-for="(item,index) in tabs" :key="index"
           :class="['tabs-item',{'tabs-item-active': (item.status === tabs_active)}]"
-          @click="tabs_active = item.status"
-      >
+          @click="tabs_active = item.status">
         {{ item.title }}
       </view>
     </view>
@@ -40,7 +39,8 @@
               </view>
             </view>
             <view class="buttons">
-              <view class="button-item" @click="$util.redirectTo('/pages_rush/futures/order_details',{ futures_id: item.id })">查看详情</view>
+              <view v-if="item.status=='6'" class="button-item color-base-text color-base-border" @click="quickPay(item)">支付</view>
+              <view v-else class="button-item" @click="$util.redirectTo('/pages_rush/futures/order_details',{ futures_id: item.id })">查看详情</view>
             </view>
           </view>
         </view>
@@ -49,26 +49,26 @@
         </view>
       </block>
     </mescroll-uni>
+	<ns-payment ref="choosePaymentPopup"></ns-payment>
+	<ns-payment ref="choosePaymentMergePopup"></ns-payment>
     <!--登录弹框-->
     <ns-login ref="login"></ns-login>
     <!--加载动画-->
     <loading-cover ref="loadingCover"></loading-cover>
   </view>
 </template>
-
 <script>
+import nsPayment from '@/components/payment/payment.vue';
+import orderMethod from '../order/public/js/orderMethod.js';
 export default {
   data() {
     return {
+      orderData: '',
+	  payMoney: 0,
+	  payMoneyMerge: 0,
       searchText: '',
-      // 选项卡（all:全部，stock:库存，release:已上架，sold:已售卖）
       tabs_active: 'all',
-      tabs: [
-        {title: '全部', status: 'all'},
-        {title: '库存', status: 'stock'},
-        {title: '已上架', status: 'release'},
-        {title: '已售卖', status: 'sold'}
-      ],
+      tabs: [],
       page_titles: {
         all: '全部订单',
         stock: '库存中订单',
@@ -87,30 +87,32 @@ export default {
       }
     };
   },
-  components: {},
-  mixins: [],
+ components: {
+ 	nsPayment
+ },
+  mixins: [orderMethod],
   onLoad(option) {
     // 获取需要显示的订单类型
     if(option.status == 'release'){
-      this.tabs_active = '待付款订单';
+      this.tabs_active = 6;
       this.tabs = [
-        {title: '待付款订单', status: '待付款订单'},
-        {title: '商城已完成', status: '商城已完成'},
+        {title: '未付款订单', status: 6},
+        {title: '订单已完成',  status: 3},
       ]
     }
     if(option.status == 'all'){
-      this.tabs_active = '采购未付款';
+      this.tabs_active = 'myorderpay';
       this.tabs = [
-        {title: '采购未付款', status: '采购未付款'},
-        {title: '成功完成订单', status: '成功完成订单'},
+        {title: '采购未付款', status: 'myorderpay'},
+        {title: '成功完成订单', status: 'myorderend'},
       ]
     }
     if(option.status == 'stock'){
-      this.tabs_active = '库存订单';
+      this.tabs_active = 'stock';
       this.tabs = [
-        {title: '库存订单', status: '库存订单'},
-        {title: '提货订单', status: '提货订单'},
-        {title: '审核出售', status: '审核出售'},
+        {title: '库存订单', status: 'stock'},
+        {title: '提货订单', status: 'pickup'},
+        {title: '审核出售', status: 'time'},
       ]
     }
     // 获取页面标题
@@ -133,6 +135,12 @@ export default {
     }
   },
   methods: {
+	quickPay(orderData){
+		console.log(orderData);
+		this.orderData = orderData;
+		this.payMoney = parseFloat(orderData.pay_money);
+		this.orderPay(orderData);
+	},  
     statusText(item){
       switch (item.status){
         case 1:
@@ -176,7 +184,6 @@ export default {
         success: res => {
           if(parseInt(res.code) === 0){
             mescroll.endSuccess(Object.keys(res.data.list).length);
-
             //设置列表数据
             if (parseInt(mescroll.num) === 1){
               this.list = []; //如果是第一页需手动制空列表
@@ -185,7 +192,6 @@ export default {
           }else {
             this.msg = res.message;
           }
-
           if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
         },
         fail: res => {
@@ -384,6 +390,17 @@ export default {
           font-size: 26rpx;
           border-radius: 10rpx;
         }
+		.action-btn {
+			line-height: 1;
+			padding: 20rpx 26rpx;
+			color: #333;
+			display: inline-block;
+			border-radius: $border-radius;
+			background: #fff;
+			border: 2rpx solid #999;
+			font-size: $font-size-tag;
+			margin-left: 10rpx;
+		}
       }
     }
   }
diff --git a/pages_rush/futures/order_details.vue b/pages_rush/futures/order_details.vue
index 56ca30e..133e2f5 100644
--- a/pages_rush/futures/order_details.vue
+++ b/pages_rush/futures/order_details.vue
@@ -20,6 +20,10 @@
         <view class="left">用户昵称</view>
         <view class="right">{{ info.seller_nickname }}</view>
       </view>
+      <view class="info-list-block">
+        <view class="left">买家姓名</view>
+        <view class="right ">{{ info.buyer_name }}</view>
+      </view>
       <view class="info-list-block">
         <view class="left">订单金额</view>
         <view class="right right-price">￥{{ info.unit_price }}元</view>
@@ -219,7 +223,7 @@ export default {
         }
       });
     },
-    // 发布
+    // 发布出售
     sale(agree_split_order = 0){
       let _this = this;
       // 判断价格
@@ -264,7 +268,7 @@ export default {
               duration: 2000,
               success: function () {
                 setTimeout(() => {
-                  _this.$util.redirectTo('/pages_rush/futures/order', { status: 'release' });
+                  _this.$util.redirectTo('/pages_rush/futures/order', {status: 'stock'});
                 }, 1000);
               }
             });
diff --git a/pages_rush/futures/payment.js b/pages_rush/futures/payment.js
new file mode 100644
index 0000000..0a5190c
--- /dev/null
+++ b/pages_rush/futures/payment.js
@@ -0,0 +1,67 @@
+export default {
+	data() {
+		return {
+			isIphoneX: false,
+			orderCreateData: {
+				buyer_message: '',
+				futures_id: '',
+			},
+			orderPaymentData: {},
+			isSub: false,
+			tempData: null,
+			canLocalDelicery: true,
+			// 选择自提、配送防重判断
+			judge:true,
+			goodsOpen: true,
+			min:1,
+			modifyFlag: false,
+		};
+	},
+	methods: {
+		// 订单创建
+		orderCreate() {
+			if (this.verify()) {
+				if (this.isSub) return;
+				this.isSub = true;
+				var data = this.$util.deepClone(this.orderCreateData);
+				this.$api.sendRequest({
+					url: '/futures/api/ordercreate/create',
+					data,
+					success: res => {
+						uni.hideLoading();
+						if (res.code >= 0) {
+							
+							// if (parseFloat(this.orderPaymentData.pay_money) > 0) {
+							// 	let orderCreateData = uni.getStorageSync('giftcardOrderCreateData');
+							// 	orderCreateData.out_trade_no = res.data;
+							// 	uni.setStorageSync('giftcardOrderCreateData', orderCreateData);	
+							// 	this.$refs.choosePaymentPopup.getPayInfo(res.data);
+							// 	this.isSub = false;
+							// } else {
+								
+							// }
+						} else {
+							this.$util.showToast({
+								title: res.message
+							});
+						}
+					},
+					fail: res => {
+						uni.hideLoading();
+						this.isSub = false;
+					}
+				})
+			}
+		},
+		// 订单验证
+		verify() {
+			return true;
+		}
+	},
+	filters: {
+		// 金额格式化输出
+		moneyFormat(money) {
+			return parseFloat(money).toFixed(2);
+		}
+	}
+}
diff --git a/pages_rush/futures/payment.vue b/pages_rush/futures/payment.vue
index 875fac3..89aa89e 100644
--- a/pages_rush/futures/payment.vue
+++ b/pages_rush/futures/payment.vue
@@ -4,7 +4,6 @@
 		<common-payment :api="api" create-data-key="futuresOrderCreateData" ref="payment"></common-payment>
 	</view>
 </template>
-
 <script>
 export default {
 	data() {
diff --git a/pages_rush/futures/seckill.vue b/pages_rush/futures/seckill.vue
index 534d329..49eed2e 100644
--- a/pages_rush/futures/seckill.vue
+++ b/pages_rush/futures/seckill.vue
@@ -1,462 +1,483 @@
 <template>
-  <page-meta :page-style="themeColor"></page-meta>
-  <view class="seckill">
-    <!--顶部内容-->
-    <view class="seckill-top">
-      <image class="top-background-image" :src="$util.img('public/static/img/futures/seckill-bg.png')" mode="widthFix"></image>
-      <view class="seckill-count-down" v-if="h > 0 || i > 0 || s > 0">
-        <text v-if="parseInt(activity_status) === 1">距开始</text>
-        <text v-else>距结束</text>
-        <text class="count-down-time">{{ h }}</text>时
-        <text class="count-down-time">{{ i }}</text>分
-        <text class="count-down-time">{{ s }}</text>秒
-      </view>
-      <view class="tip" @click="openPopup()">
-        <view class="title">商品全部实物销售</view>
-        <view class="content">本区域销售的商品均为商家已经生产并承诺全额补货</view>
-      </view>
-    </view>
-    <!--商品列表-->
-    <mescroll-uni ref="mescroll" @getData="getList" top="240">
-      <block slot="list">
-        <!--活动正常进行中 商品列表-->
-        <view class="goods-list" v-if="list.length > 0 && parseInt(activity_status) === 3">
-          <view class="goods-block" v-for="(item,index) in list" :key="index">
-            <view class="left">
-              <image class="goods-image" :src="$util.img(item.goods_image)" mode="widthFix"></image>
-              <view class="goods-status" v-if="parseInt(item.status) === 2">正在销售</view>
-              <view class="goods-status" v-else>{{ status_text[item.status] }}</view>
-            </view>
-            <view class="right">
-              <view class="goods-title">{{ item.goods_name }}</view>
-              <view class="goods-sell">
-                <view class="goods-sell-item">销售商：{{ item.seller_nickname }}</view>
-                <view class="goods-sell-item">采购数量：{{ item.total }}件</view>
-              </view>
-              <view class="goods-bottom">
-                <view class="price">
-                  <view class="price-item">单价:￥{{ item.market_price }}/{{ item.unit || '件' }}</view>
-                  <view class="price-item">采购价:<text class="purchase_price">￥{{ item.price }}</text></view>
-                </view>
-                <view class="buy-button">
-                  <view class="buy-btn" @click="$util.redirectTo('/pages_rush/futures/details', { id: item.id }, 'redirectTo');">前去采购</view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <!--秒杀活动未正常进行时的内容-->
-        <view class="not-list" v-else>
-          <image class="not-list-image" v-if="parseInt(activity_status) === 1" :src="$util.img('public/static/img/futures/futures_not_started.png')" mode="widthFix"></image>
-          <image class="not-list-image" v-if="parseInt(activity_status) === 2" :src="$util.img('public/static/img/futures/futures_not_goods.png')" mode="widthFix"></image>
-          <view class="back-buttons">
-            <view class="back-buttons-btn" @click="$util.goBack();">返回</view>
-          </view>
-        </view>
-      </block>
-    </mescroll-uni>
-    <!--登录弹框-->
-    <ns-login ref="login"></ns-login>
-    <!--加载动画-->
-    <loading-cover ref="loadingCover"></loading-cover>
-  </view>
-
-  <view @touchmove.prevent>
-    <uni-popup ref="registerPopup" type="center" :maskClick="false">
-      <view class="conten-box">
-        <view class="close"><text class="iconfont icon-close" @click="toClose"></text></view>
-        <view class="title">{{ regisiterAgreement.title }}</view>
-        <view class="con">
-          <scroll-view scroll-y="true" class="con"><rich-text :nodes="regisiterAgreement.content"></rich-text></scroll-view>
-        </view>
-      </view>
-    </uni-popup>
-  </view>
+	<page-meta :page-style="themeColor"></page-meta>
+	<view class="seckill">
+		<!--顶部内容-->
+		<view class="seckill-top">
+			<image class="top-background-image" :src="$util.img('public/static/img/futures/seckill-bg.png')" mode="widthFix"></image>
+			<view class="seckill-count-down" v-if="h > 0 || i > 0 || s > 0">
+				<text v-if="parseInt(activity_status) === 1">距开始</text>
+				<text v-else>距结束</text>
+				<text class="count-down-time">{{ h }}</text>
+				时
+				<text class="count-down-time">{{ i }}</text>
+				分
+				<text class="count-down-time">{{ s }}</text>
+				秒
+			</view>
+			<view class="tip" @click="openPopup()">
+				<view class="title">商品全部实物销售</view>
+				<view class="content">本区域销售的商品均为商家已经生产并承诺全额补货(查看规则)</view>
+			</view>
+		</view>
+		<!--商品列表-->
+		<mescroll-uni ref="mescroll" @getData="getList" top="350">
+			<block slot="list">
+				<!--活动正常进行中 商品列表-->
+				<view class="goods-list" v-if="list.length > 0 && parseInt(activity_status) === 3">
+					<view class="goods-block" v-for="(item, index) in list" :key="index">
+						<view class="left">
+							<image class="goods-image" :src="$util.img(item.goods_image)" mode="widthFix"></image>
+							<view class="goods-status" v-if="parseInt(item.status) === 2">正在销售</view>
+							<view class="goods-status" v-else>{{ status_text[item.status] }}</view>
+						</view>
+						<view class="right">
+							<view class="goods-title">{{ item.goods_name }}</view>
+							<view class="goods-sell">
+								<view class="goods-sell-item">销售商：{{ item.seller_nickname }}</view>
+								<view class="goods-sell-item">采购数量：{{ item.total }}件</view>
+							</view>
+							<view class="goods-bottom">
+								<view class="price">
+									<view class="price-item">单价:￥{{ item.market_price }}/{{ item.unit || '件' }}</view>
+									<view class="price-item">
+										采购价:
+										<text class="purchase_price">￥{{ item.price }}</text>
+									</view>
+								</view>
+								<view class="buy-button">
+									<view class="buy-btn" @click="ToBuy(item)">前去采购</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!--秒杀活动未正常进行时的内容-->
+				<view class="not-list" v-else>
+					<image
+						class="not-list-image"
+						v-if="parseInt(activity_status) === 1"
+						:src="$util.img('public/static/img/futures/futures_not_started.png')"
+						mode="widthFix"
+					></image>
+					<image
+						class="not-list-image"
+						v-if="parseInt(activity_status) === 2"
+						:src="$util.img('public/static/img/futures/futures_not_goods.png')"
+						mode="widthFix"
+					></image>
+					<view class="back-buttons"><view class="back-buttons-btn" @click="$util.goBack()">返回</view></view>
+				</view>
+			</block>
+		</mescroll-uni>
+		<!--登录弹框-->
+		<ns-login ref="login"></ns-login>
+		<!--加载动画-->
+		<loading-cover ref="loadingCover"></loading-cover>
+	</view>
+	<view @touchmove.prevent>
+		<uni-popup ref="registerPopup" type="center" :maskClick="false">
+			<view class="conten-box">
+				<view class="close"><text class="iconfont icon-close" @click="toClose"></text></view>
+				<view class="title">{{ regisiterAgreement.title }}</view>
+				<view class="con">
+					<scroll-view scroll-y="true" class="con"><rich-text :nodes="regisiterAgreement.content"></rich-text></scroll-view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
 </template>
-
 <script>
 export default {
-  data() {
-    return {
-      list: [],
-      activity_status: 1,// 活动状态：1=活动未开始，2=活动已开始无商品，3=活动正常进行中
-      status_text: {
-        1 : '库存',
-        2 : '正在销售',
-        3 : '已售出',
-        4 : '提货中',
-        5 : '提货完成',
-        6 : '待支付',
-        7 : '捡漏',
-      },
-      // 倒计时
-      setInterval_time: 0,// 倒计时计算时间
-      diff_time: 0,
-      h: '00',
-      i: '00',
-      s: '00',
-      interval: '',
-      regisiterAgreement: {
-        // 注册协议
-        title: '',
-        content: ''
-      },
-    };
-  },
-  components: {},
-  mixins: [],
-  onLoad(option) {
-    this.getRegisiterAggrement();},
-  onReady(){
-    // 判断是否登录
-    if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/seckill');
-  },
-  onShow() {},
-  methods: {
-    /**
-     * 获取注册协议
-     */
-    getRegisiterAggrement() {
-      this.$api.sendRequest({
-        url: '/futures/api/futures/aggrement',
-        success: res => {
-          if (res.code >= 0) {
-            this.regisiterAgreement = res.data;
-          }
-        }
-      });
-    },
-    // 获取商品列表
-    getList(mescroll) {
-      this.$api.sendRequest({
-        url: '/futures/api/futures/list',
-        data: {
-          page: mescroll.num,
-          page_size: mescroll.size,
-          status: 'miaosha',
-        },
-        success: res => {
-          if(parseInt(res.code) === 0){
-            // 活动正常进行中
-            mescroll.endSuccess(Object.keys(res.data.list).length);
-            //设置列表数据
-            if (parseInt(mescroll.num) === 1) this.list = []; //如果是第一页需手动制空列表
-            this.list = this.list.concat(res.data.list); //追加新数据
-            this.setInterval_time = parseInt(res.data.end_time);
-            // 判断状态
-            this.activity_status = 3;// 正常进行中
-            if(Object.keys(this.list).length <= 0) this.activity_status = 2;// 已开始无商品
-          }else if(parseInt(res.code) === -801){
-            // 未到秒杀时间 res.code：-801=未到秒杀时间
-            mescroll.endSuccess(0);
-            this.activity_status = 1;// 活动未开始
-            this.setInterval_time = res.data.miaosha_start_time;
-          }
-          // 开启倒计时
-          this.countDown();
-
-          setTimeout(() => {
-            if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-          }, 1000);
-        },
-        fail: res => {
-          mescroll.endErr();
-          if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
-        }
-      });
-    },
-    // 倒计时
-    countDown(){
-      this.interval = setInterval(() => {
-        // 获取距离结束时间的毫秒数
-        let nowTime = Math.ceil((new Date()).getTime() / 1000);
-        this.diff_time = this.setInterval_time - nowTime;
-        // 计算时间
-        let result = this.$util.countDown(this.diff_time);
-        this.h = (parseInt(result.d) * 24) + parseInt(result.h);
-        this.i = parseInt(result.i);
-        this.s = parseInt(result.s);
-      }, 1000)
-    },
-    /**
-     * 展示注册协议
-     */
-    openPopup() {
-      this.$refs.registerPopup.open();
-    },
-    /**
-     * 点击关闭协议
-     */
-    toClose() {
-      this.$refs.registerPopup.close();
-    },
-  },
-  onBackPress(options) {
-    if (options.from === 'navigateBack') return false;
-    this.$util.redirectTo('/pages/member/index');
-    return true;
-  }
+	data() {
+		return {
+			list: [],
+			activity_status: 1, // 活动状态：1=活动未开始，2=活动已开始无商品，3=活动正常进行中
+			status_text: {
+				1: '库存',
+				2: '正在销售',
+				3: '已售出',
+				4: '提货中',
+				5: '提货完成',
+				6: '待支付',
+				7: '捡漏'
+			},
+			// 倒计时
+			setInterval_time: 0, // 倒计时计算时间
+			diff_time: 0,
+			h: '00',
+			i: '00',
+			s: '00',
+			interval: '',
+			regisiterAgreement: {
+				// 注册协议
+				title: '',
+				content: ''
+			}
+		};
+	},
+	components: {},
+	mixins: [],
+	onLoad(option) {
+		this.getRegisiterAggrement();
+	},
+	onReady() {
+		// 判断是否登录
+		if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_rush/futures/seckill');
+	},
+	onShow() {},
+	methods: {
+		ToBuy(data){
+		  uni.setStorage({
+		    key: 'futuresOrderCreateData',
+		    data: {
+		      futures_id: data.id,
+		      order_remarks: ''
+		    },
+		    success: () => {
+		      this.$util.redirectTo('/pages_rush/futures/details',{ id: data.id });
+		    }
+		  });
+		},
+		/**
+		 * 获取注册协议
+		 */
+		getRegisiterAggrement() {
+			this.$api.sendRequest({
+				url: '/futures/api/futures/aggrement',
+				success: res => {
+					if (res.code >= 0) {
+						this.regisiterAgreement = res.data;
+					}
+				}
+			});
+		},
+		// 获取商品列表
+		getList(mescroll) {
+			this.$api.sendRequest({
+				url: '/futures/api/futures/list',
+				data: {
+					page: mescroll.num,
+					page_size: mescroll.size,
+					status: 'miaosha'
+				},
+				success: res => {
+					if (parseInt(res.code) === 0) {
+						// 活动正常进行中
+						mescroll.endSuccess(Object.keys(res.data.list).length);
+						//设置列表数据
+						if (parseInt(mescroll.num) === 1) this.list = []; //如果是第一页需手动制空列表
+						this.list = this.list.concat(res.data.list); //追加新数据
+						this.setInterval_time = parseInt(res.data.end_time);
+						// 判断状态
+						this.activity_status = 3; // 正常进行中
+						if (Object.keys(this.list).length <= 0) this.activity_status = 2; // 已开始无商品
+					} else if (parseInt(res.code) === -801) {
+						// 未到秒杀时间 res.code：-801=未到秒杀时间
+						mescroll.endSuccess(0);
+						this.activity_status = 1; // 活动未开始
+						this.setInterval_time = res.data.miaosha_start_time;
+					}
+					// 开启倒计时
+					this.countDown();
+					this.$refs.loadingCover.hide();
+					// setTimeout(() => {
+					//   if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+					// }, 1000);
+				},
+				fail: res => {
+					mescroll.endErr();
+					if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
+				}
+			});
+		},
+		// 倒计时
+		countDown() {
+			this.interval = setInterval(() => {
+				// 获取距离结束时间的毫秒数
+				let nowTime = Math.ceil(new Date().getTime() / 1000);
+				this.diff_time = this.setInterval_time - nowTime;
+				// 计算时间
+				let result = this.$util.countDown(this.diff_time);
+				this.h = parseInt(result.d) * 24 + parseInt(result.h);
+				this.i = parseInt(result.i);
+				this.s = parseInt(result.s);
+			}, 1000);
+		},
+		/**
+		 * 展示注册协议
+		 */
+		openPopup() {
+			this.$refs.registerPopup.open();
+		},
+		/**
+		 * 点击关闭协议
+		 */
+		toClose() {
+			this.$refs.registerPopup.close();
+		}
+	},
+	onBackPress(options) {
+		if (options.from === 'navigateBack') return false;
+		this.$util.redirectTo('/pages/member/index');
+		return true;
+	}
 };
 </script>
 
 <style lang="scss" scoped>
-.seckill{
-  background: #fafcff;
-  min-height: 100vh;
+.seckill {
+	background: #fafcff;
+	min-height: 100vh;
 
-  .seckill-top{
-    width: 100vw;
-    position: relative;
-    .top-background-image{
-      width: 100%;
-    }
-    .seckill-count-down{
-      position: absolute;
-      top: 150rpx;
-      left: 0;
-      width: 100%;
-      text-align: center;
-      font-size: 30rpx;
-      color: #f7dee1;
-      display: inline-flex;
-      flex-direction: row;
-      flex-wrap: nowrap;
-      align-content: center;
-      justify-content: center;
-      align-items: center;
-      height: 60rpx;
-      .count-down-time{
-        --size--: 45rpx;
-        background: #ffffff;
-        color: #fe7671;
-        min-width: calc(var(--size--) - 20rpx);
-        height: var(--size--);
-        border-radius: 10rpx;
-        display: inline-flex;
-        flex-direction: row;
-        flex-wrap: nowrap;
-        align-content: center;
-        justify-content: center;
-        align-items: center;
-        margin: 0 6rpx;
-        font-size: 26rpx;
-        padding: 0 10rpx;
-      }
-    }
-    .tip{
-      position: absolute;
-      top: 214rpx;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      width: 100%;
-      transform: scale(0.85);
-      z-index: 500;
-      .title{
-        width: 520rpx;
-        font-weight: 900;
-        font-size: 60rpx;
-        color: #f4de38;
-        border-bottom: solid 2rpx;
-        border-top: solid 2rpx;
-        line-height: 82rpx;
-        text-align: center;
-      }
-      .content{
-        font-size: 20rpx;
-        color: #f4de38;
-      }
-    }
-  }
-  .goods-list{
-    margin: 0 30rpx;
+	.seckill-top {
+		width: 100vw;
+		position: relative;
+		.top-background-image {
+			width: 100%;
+		}
+		.seckill-count-down {
+			position: absolute;
+			top: 150rpx;
+			left: 0;
+			width: 100%;
+			text-align: center;
+			font-size: 30rpx;
+			color: #f7dee1;
+			display: inline-flex;
+			flex-direction: row;
+			flex-wrap: nowrap;
+			align-content: center;
+			justify-content: center;
+			align-items: center;
+			height: 60rpx;
+			.count-down-time {
+				--size--: 45rpx;
+				background: #ffffff;
+				color: #fe7671;
+				min-width: calc(var(--size--) - 20rpx);
+				height: var(--size--);
+				border-radius: 10rpx;
+				display: inline-flex;
+				flex-direction: row;
+				flex-wrap: nowrap;
+				align-content: center;
+				justify-content: center;
+				align-items: center;
+				margin: 0 6rpx;
+				font-size: 26rpx;
+				padding: 0 10rpx;
+			}
+		}
+		.tip {
+			position: absolute;
+			top: 198rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			width: 100%;
+			transform: scale(0.85);
+			z-index: 500;
+			.title {
+				width: 520rpx;
+				font-weight: 900;
+				font-size: 60rpx;
+				color: #f4de38;
+				border-bottom: solid 2rpx;
+				border-top: solid 2rpx;
+				line-height: 82rpx;
+				text-align: center;
+			}
+			.content {
+				font-size: 26rpx;
+				color: #fff;
+			}
+		}
+	}
+	.goods-list {
+		margin: 0 30rpx;
+		.goods-block {
+			--size--: calc((100vw - 100rpx) / 3);
+			border-radius: 20rpx;
+			background: #ffffff;
+			padding: 20rpx;
+			margin-bottom: 30rpx;
+			box-shadow: 0 2rpx 10rpx #eeeff2;
+			width: calc(100% - 40rpx);
+			display: inline-flex;
+			flex-wrap: nowrap;
+			flex-direction: row;
+			align-content: center;
+			justify-content: center;
+			align-items: center;
+			height: var(--size--);
+			.left {
+				margin-right: 20rpx;
+				height: var(--size--);
+				width: var(--size--);
+				position: relative;
+				border-radius: 20rpx;
+				overflow: hidden;
+				.goods-image {
+					max-width: 100% !important;
+					max-height: 100% !important;
+				}
+				.goods-status {
+					position: absolute;
+					bottom: 0;
+					width: 100%;
+					background: #fc4740;
+					color: #febebc;
+					font-size: 24rpx;
+					text-align: center;
+					height: 30rpx;
+					line-height: 30rpx;
+				}
+			}
+			.right {
+				width: calc((var(--size--) * 2) - 20rpx);
+				display: inline-flex;
+				flex-direction: column;
+				flex-wrap: wrap;
+				align-content: flex-start;
+				justify-content: flex-start;
+				align-items: flex-start;
+				height: 100%;
+				.goods-title {
+					width: 100%;
+					height: 50rpx;
+					line-height: 50rpx;
+					font-size: 30rpx;
+					font-weight: bold;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+				.goods-sell {
+					width: 100%;
+					display: inline-flex;
+					height: 50rpx;
+					line-height: 50rpx;
+					color: #b5b7c0;
+					.goods-sell-item {
+						width: 50%;
+						color: #b5b7c0;
+						font-size: 24rpx;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						line-height: 50rpx;
+					}
+					.goods-sell-item:nth-of-type(1) {
+						text-align: left;
+					}
+					.goods-sell-item:nth-of-type(2) {
+						text-align: right;
+					}
+				}
+				.goods-bottom {
+					width: 100%;
+					height: calc(var(--size--) - 100rpx);
+					display: inline-flex;
+					align-items: flex-end;
+					flex-direction: row;
+					flex-wrap: nowrap;
+					justify-content: space-between;
 
-    .goods-block{
-      --size--: calc((100vw - 100rpx) / 3);
-      border-radius: 20rpx;
-      background: #ffffff;
-      padding: 20rpx;
-      margin-bottom: 30rpx;
-      box-shadow: 0 2rpx 10rpx #eeeff2;
-      width: calc(100% - 40rpx);
-      display: inline-flex;
-      flex-wrap: nowrap;
-      flex-direction: row;
-      align-content: center;
-      justify-content: center;
-      align-items: center;
-      height: var(--size--);
+					.price {
+						height: 100%;
+						display: inline-flex;
+						flex-direction: column;
+						flex-wrap: nowrap;
+						justify-content: flex-end;
+						align-items: flex-start;
+						width: calc(100% - 140rpx);
 
-      .left{
-        margin-right: 20rpx;
-        height: var(--size--);
-        width: var(--size--);
-        position: relative;
-        border-radius: 20rpx;
-        overflow: hidden;
-
-        .goods-image{
-          max-width: 100% !important;
-          max-height: 100% !important;
-        }
-        .goods-status{
-          position: absolute;
-          bottom: 0;
-          width: 100%;
-          background: #fc4740;
-          color: #febebc;
-          font-size: 24rpx;
-          text-align: center;
-          height: 30rpx;
-          line-height: 30rpx;
-        }
-      }
-      .right{
-        width: calc((var(--size--) * 2) - 20rpx);
-        display: inline-flex;
-        flex-direction: column;
-        flex-wrap: wrap;
-        align-content: flex-start;
-        justify-content: flex-start;
-        align-items: flex-start;
-        height: 100%;
-        .goods-title{
-          width: 100%;
-          height: 50rpx;
-          line-height: 50rpx;
-          font-size: 30rpx;
-          font-weight: bold;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-        }
-        .goods-sell{
-          width: 100%;
-          display: inline-flex;
-          height: 50rpx;
-          line-height: 50rpx;
-          color: #b5b7c0;
-          .goods-sell-item{
-            width: 50%;
-            color: #b5b7c0;
-            font-size: 24rpx;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            line-height: 50rpx;
-          }
-          .goods-sell-item:nth-of-type(1){
-            text-align: left;
-          }
-          .goods-sell-item:nth-of-type(2){
-            text-align: right;
-          }
-        }
-        .goods-bottom{
-          width: 100%;
-          height: calc(var(--size--) - 100rpx);
-          display: inline-flex;
-          align-items: flex-end;
-          flex-direction: row;
-          flex-wrap: nowrap;
-          justify-content: space-between;
-
-          .price{
-            height: 100%;
-            display: inline-flex;
-            flex-direction: column;
-            flex-wrap: nowrap;
-            justify-content: flex-end;
-            align-items: flex-start;
-            width: calc(100% - 140rpx);
-
-            .price-item{
-              width: 100%;
-              color: #b5b7c0;
-              font-size: 24rpx;
-              white-space: nowrap;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              height: 40rpx;
-              line-height: 40rpx;
-              .purchase_price{
-                color: #fe7e79;
-                font-size: 30rpx;
-                font-weight: bold;
-              }
-            }
-          }
-          .buy-button{
-            height: 100%;
-            display: inline-flex;
-            align-items: flex-end;
-            justify-content: flex-end;
-            .buy-btn{
-              width: 140rpx;
-              height: 70rpx;
-              line-height: 70rpx;
-              color: #fef5f5;
-              background: #ff2724;
-              font-size: 26rpx;
-              border-radius: 100rpx;
-              text-align: center;
-              margin-bottom: 8rpx;
-            }
-          }
-        }
-      }
-    }
-  }
-  .not-list{
-    width: 100%;
-    padding-top: 200rpx;
-    display: inline-flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-    justify-content: center;
-    align-items: center;
-
-    .not-list-image{
-      max-width: 60vw!important;
-      max-height: 60vw!important;
-    }
-    .back-buttons{
-      width: 100%;
-      display: inline-flex;
-      flex-direction: row;
-      flex-wrap: nowrap;
-      justify-content: center;
-      align-items: center;
-      margin-top: 50rpx;
-      .back-buttons-btn{
-        background: linear-gradient(90deg, #f5877b, #e93e3d);
-        height: 70rpx;
-        line-height: 70rpx;
-        font-size: 34rpx;
-        color: #fffefe;
-        width: 300rpx;
-        text-align: center;
-        border-radius: 100rpx;
-        letter-spacing: 6rpx;
-        text-indent: 6px;
-      }
-    }
-  }
+						.price-item {
+							width: 100%;
+							color: #b5b7c0;
+							font-size: 24rpx;
+							white-space: nowrap;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							height: 40rpx;
+							line-height: 40rpx;
+							.purchase_price {
+								color: #fe7e79;
+								font-size: 30rpx;
+								font-weight: bold;
+							}
+						}
+					}
+					.buy-button {
+						height: 100%;
+						display: inline-flex;
+						align-items: flex-end;
+						justify-content: flex-end;
+						.buy-btn {
+							width: 140rpx;
+							height: 70rpx;
+							line-height: 70rpx;
+							color: #fef5f5;
+							background: #ff2724;
+							font-size: 26rpx;
+							border-radius: 100rpx;
+							text-align: center;
+							margin-bottom: 8rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+	.not-list {
+		width: 100%;
+		padding-top: 200rpx;
+		display: inline-flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		justify-content: center;
+		align-items: center;
+		.not-list-image {
+			max-width: 60vw !important;
+			max-height: 60vw !important;
+		}
+		.back-buttons {
+			width: 100%;
+			display: inline-flex;
+			flex-direction: row;
+			flex-wrap: nowrap;
+			justify-content: center;
+			align-items: center;
+			margin-top: 50rpx;
+			.back-buttons-btn {
+				background: linear-gradient(90deg, #f5877b, #e93e3d);
+				height: 70rpx;
+				line-height: 70rpx;
+				font-size: 34rpx;
+				color: #fffefe;
+				width: 300rpx;
+				text-align: center;
+				border-radius: 100rpx;
+				letter-spacing: 6rpx;
+				text-indent: 6px;
+			}
+		}
+	}
 }
 .conten-box {
-  padding: 0 30rpx 30rpx;
-  .title {
-    text-align: center;
-    margin-top: 50rpx;
-    margin-bottom: 10rpx;
-  }
-  .close {
-    position: absolute;
-    right: 30rpx;
-    top: 10rpx;
-  }
-  .con {
-    height: 500rpx;
-  }
+	padding: 0 30rpx 30rpx;
+	.title {
+		text-align: center;
+		margin-top: 50rpx;
+		margin-bottom: 10rpx;
+	}
+	.close {
+		position: absolute;
+		right: 30rpx;
+		top: 10rpx;
+	}
+	.con {
+		height: 500rpx;
+	}
 }
 </style>
diff --git a/pages_rush/order/detail.vue b/pages_rush/order/detail.vue
index 1e591c2..71aa3a0 100644
--- a/pages_rush/order/detail.vue
+++ b/pages_rush/order/detail.vue
@@ -342,14 +342,14 @@
 				</view>
 			</block>
 			<!-- 联系客服 -->
-			<ns-contact :niushop="{ order_id: orderData.order_id }">
+			<!-- <ns-contact :niushop="{ order_id: orderData.order_id }">
 				<view class="kefu">
 					<view>
 						<text class="iconfont icon-ziyuan"></text>
 						<text>联系客服</text>
 					</view>
 				</view>
-			</ns-contact>
+			</ns-contact> -->
 		</view>
 
 		<block v-if="orderData.virtual_goods && orderData.goods_class == 2 && orderData.virtual_goods.is_veirfy == 0">
diff --git a/pages_rush/order/list.vue b/pages_rush/order/list.vue
index dca19ca..b0f1c9f 100644
--- a/pages_rush/order/list.vue
+++ b/pages_rush/order/list.vue
@@ -119,8 +119,7 @@
 								<view
 									class="order-box-btn"
 									v-if="evaluateConfig.evaluate_status == 1 && orderItem.is_evaluate == 1"
-									@click="operation('memberOrderEvaluation', orderItem)"
-								>
+									@click="operation('memberOrderEvaluation', orderItem)">
 									<text v-if="orderItem.evaluate_status == 0">评价</text>
 									<text v-else-if="orderItem.evaluate_status == 1">追评</text>
 								</view>
@@ -129,8 +128,7 @@
 									:class="{ 'color-base-border color-base-bg': operationItem.action == 'orderPay' }"
 									v-for="(operationItem, operationIndex) in orderItem.action"
 									:key="operationIndex"
-									@click="operation(operationItem.action, orderItem)"
-								>
+									@click="operation(operationItem.action, orderItem)">
 									{{ operationItem.title }}
 								</view>
 							</view>
diff --git a/pages_tool/member/assets.vue b/pages_tool/member/assets.vue
index 2084920..d7c15e2 100644
--- a/pages_tool/member/assets.vue
+++ b/pages_tool/member/assets.vue
@@ -56,15 +56,15 @@
 					</view>
 					<view class="assets-list">
 						<view class="assets-li">
-							<view>￥{{ fenxiao_info.account }}</view>
+							<view>￥{{ fenxiao_info.account ||0 }}</view>
 							<view>可提现佣金</view>
 						</view>
 						<view class="assets-li">
-							<view>￥{{ fenxiao_info.account_withdraw_apply }}</view>
+							<view>￥{{ fenxiao_info.account_withdraw_apply ||0}}</view>
 							<view>提现中佣金</view>
 						</view>
 						<view class="assets-li">
-							<view>{{ accountInfo.fenxiao_order_count }}</view>
+							<view>{{ accountInfo.fenxiao_order_count ||0}}</view>
 							<view>待结算订单</view>
 						</view>
 					</view>
diff --git a/pages_tool/member/balance_transfer.vue b/pages_tool/member/balance_transfer.vue
index e489c31..027bf14 100644
--- a/pages_tool/member/balance_transfer.vue
+++ b/pages_tool/member/balance_transfer.vue
@@ -2,11 +2,11 @@
 	<page-meta :page-style="themeColor"></page-meta>
 	<view class="container">
 		<view class="withdraw-wrap">
-			<view class="withdraw-wrap-title">会员账号：</view>
+			<view class="withdraw-wrap-title">账号：</view>
 			<view class="money-wrap">
-				<input  type="text" class="withdraw-money" style="font-size: 16px;" placeholder="请输入会员账号" v-model="username"  />
+				<input  type="text" class="withdraw-money" style="font-size: 16px;" placeholder="请输入会员账号或手机号" v-model="username"  />
 				<view class="delete" @click="removeUsername" v-if="username">
-					<image :src="$util.img('upload/picture/member/apply_withdrawal/close.png')" mode="widthFix"></image>
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/close.png')" mode="widthFix"></image>
 				</view>
 			</view>
 		</view>
@@ -17,7 +17,7 @@
 				<text class="unit">{{ $lang('common.currencySymbol') }}</text>
 				<input type="digit" class="withdraw-money" v-model="withdrawMoney" />
 				<view class="delete" @click="remove" v-if="withdrawMoney">
-					<image :src="$util.img('upload/picture/member/apply_withdrawal/close.png')" mode="widthFix"></image>
+					<image :src="$util.img('public/uniapp/member/apply_withdrawal/close.png')" mode="widthFix"></image>
 				</view>
 			</view>
 			<view class="bootom">
@@ -30,11 +30,10 @@
     <view class="withdraw-wrap">
       <view class="withdraw-wrap-title">支付密码：</view>
       <view class="money-wrap">
-        <input type="digit" class="withdraw-money" v-model="buy_password" />
+        <input type="password"  class="withdraw-money" v-model="buy_password" />
       </view>
     </view>
-		<view class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal" 
-		 :class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 || username==''}" @click="withdraw">
+		<view class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal" :class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 || username==''}" @click="withdraw">
 			确认转账
 		</view>
 		<loading-cover ref="loadingCover"></loading-cover>
@@ -103,7 +102,7 @@ export default {
                 content: '您未设置支付密码，需设置支付密码后进行转账，点击确定前往支付密码设置',
                 success: function (res) {
                   if (res.confirm) {
-                    _this.$util.redirectTo('/pages_tool/member/info_edit', {action: 'pay_password'}, '');
+                    _this.$util.redirectTo('/pages_tool/member/pay_password',{'back':'/pages_tool/member/balance_transfer'});
                   } else if (res.cancel) {
                     _this.isSub = false;
                     console.log('用户点击取消');
@@ -206,9 +205,6 @@ export default {
         });
       }
     }
-
-
-
   },
   filters: {
     /**
diff --git a/pages_tool/member/info.vue b/pages_tool/member/info.vue
index 76a31a2..1575484 100644
--- a/pages_tool/member/info.vue
+++ b/pages_tool/member/info.vue
@@ -70,6 +70,7 @@
 				<text class="cell-tit">{{ $lang('paypassword') }}</text>
 				<text class="cell-more"></text>
 			</view>
+			
 			<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('address')">
 				<text class="cell-tit">所在地址</text>
 				<text class="cell-tip" v-if="memberInfo.full_address">{{ memberInfo.full_address }} {{ memberInfo.address }}</text>
diff --git a/pages_tool/member/info_edit.vue b/pages_tool/member/info_edit.vue
index aafb5dc..a684076 100644
--- a/pages_tool/member/info_edit.vue
+++ b/pages_tool/member/info_edit.vue
@@ -62,8 +62,8 @@
 			</view>
 		</view>
 		<!-- 修改密码 -->
-		<view v-if="indent == 'password' || indent == 'pay_password'" class="edit-info">
-			<block v-if="memberInfo.password =='' || memberInfo.pay_password == '' && memberInfo.mobile == ''">
+		<view v-if="indent == 'password'"  class="edit-info">
+			<block v-if="memberInfo.password =='' && memberInfo.mobile == ''">
 				<view class="empty">
 					<view class="empty_img"><image :src="$util.img('public/uniapp/common/common-empty.png')" mode="aspectFit"></image></view>
 					<view class="color-tip margin-top margin-bottom">请先绑定手机再执行该操作</view>
@@ -71,7 +71,7 @@
 				</view>
 			</block>
 			<block v-else>
-				<view class="edit-info-box" v-if="memberInfo.password">
+				<view class="edit-info-box" v-if="memberInfo.password && indent == 'password'">
 					<text class="info-name">{{ $lang('nowPassword') }}</text>
 					<input class="uni-input info-content input-len" type="password" maxlength="30" :placeholder="$lang('nowPassword')" v-model="formData.currentPassword" />
 				</view>
@@ -97,12 +97,14 @@
 					<input class="uni-input info-content input-len" type="password" maxlength="30" :placeholder="$lang('confirmPassword')" v-model="formData.confirmPassword" />
 				</view>
 
-				<view class="save-item" @click="save(indent)">
+				<view class="save-item" @click="save('password')">
 					<button type="primary">{{ $lang('save') }}</button>
 				</view>
 			</block>
 		</view>
 
+
+
 		<!-- 修改手机号 -->
 		<view v-if="indent == 'mobile'" class="edit-info">
 			<view class="edit-info-box">
diff --git a/pages_tool/member/pay_password.vue b/pages_tool/member/pay_password.vue
index 47145e3..5f628d1 100644
--- a/pages_tool/member/pay_password.vue
+++ b/pages_tool/member/pay_password.vue
@@ -15,7 +15,6 @@
 		</view>
 	</view>
 </template>
-
 <script>
 import mypOne from '@/pages_tool/components/myp-one/myp-one.vue';
 export default {
@@ -167,14 +166,12 @@ export default {
 			if (this.dynacodeData.seconds != 120) return;
 			if (this.dynacodeData.isSend) return;
 			this.dynacodeData.isSend = true;
-
 			this.$api.sendRequest({
 				url: '/api/member/paypwdcode',
 				success: res => {
 					this.dynacodeData.isSend = false;
 					if (res.code >= 0) {
 						this.key = res.data.key;
-
 						if (this.dynacodeData.seconds == 120 && this.dynacodeData.timer == null) {
 							this.dynacodeData.timer = setInterval(() => {
 								this.dynacodeData.seconds--;
@@ -193,11 +190,7 @@ export default {
 		}
 	},
 	onLoad(option) {
-		
-		
-
 		if (option.back) this.back = option.back;
-
 		// 判断登录
 		if (!uni.getStorageSync('token')) {
 			this.$util.redirectTo('/pages_tool/login/login');
diff --git a/pages_tool/member/public/js/info.js b/pages_tool/member/public/js/info.js
index 493e171..d1e3944 100644
--- a/pages_tool/member/public/js/info.js
+++ b/pages_tool/member/public/js/info.js
@@ -237,6 +237,11 @@ export default {
 						}
 					});
 					break;
+				case 'pay_password':
+				  this.$util.redirectTo('/pages_tool/member/pay_password', {
+					  back: '/pages_tool/member/info'
+			    	});
+						break;
 				default:
 					this.$util.redirectTo('/pages_tool/member/info_edit', {
 						action
@@ -351,7 +356,7 @@ export default {
 				case 'birthday':
 					this.modifyBirthday();
 					break;
-				case 'password' || 'pay_password':
+				case 'password':
 					this.modifyPassword();
 					break;
 				case 'mobile':
@@ -581,7 +586,7 @@ export default {
 			});
 		},
 		modifyPassword() {
-			if ((this.indent=='password'&&this.memberInfo.password) || (this.indent=='pay_password'&&this.memberInfo.pay_password)) {
+			if (this.indent=='password' && this.memberInfo.password) {
 				var rule = [{
 						name: 'currentPassword',
 						checkType: 'required',
@@ -786,7 +791,6 @@ export default {
 			}
 		},
 		async modifyMobile() {
-
 			var mobileRule = [{
 					name: 'mobile',
 					checkType: 'phoneno',
@@ -856,7 +860,6 @@ export default {
 		 */
 		passwordMoblieCode() {
 			if (this.seconds != 120) return;
-
 			if (this.formData.mobileVercode == '') {
 				this.$util.showToast({
 					title: this.$lang("confirmCodeInput")