diff --git a/App.vue b/App.vue
index e748f77..5cda3dd 100644
--- a/App.vue
+++ b/App.vue
@@ -77,10 +77,10 @@
         visible: false
       })
       // #ifdef H5
-      uni.setTabBarItem({
-        index: 2,
-        visible: false
-      })
+      // uni.setTabBarItem({
+      //   index: 2,
+      //   visible: false
+      // })
       // #endif
       
       this.globalData.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
diff --git a/config/app.js b/config/app.js
index f5ef026..6e26a1a 100644
--- a/config/app.js
+++ b/config/app.js
@@ -19,7 +19,8 @@ const env = 'dev'
 
 // 网络接口修改此字符 小程序域名要求https
 // httpApi = 'http://192.168.31.106:8324' //测试
-httpApi = 'https://test.shop.lihaink.cn' //生产
+// httpApi = 'https://test.shop.lihaink.cn' //生产
+httpApi = 'https://crmeb-test.shop.lihaink.cn' //生产
 
 httpSix = 'https://ceshi-new-wokr.lihaink.cn'
 // httpSix = 'https://new-worker.lihaink.cn'
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 2db5a2c..7688dbb 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -20,6 +20,7 @@
     }
 
     .swiperBg {
+      padding-top: 25rpx;
       z-index: 1;
 
       .colorBg {
@@ -157,9 +158,9 @@
     <view class="swiperBg">
       <view class="swiper page_swiper">
         <swiper :autoplay="true" loop indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff"
-          :current="swiperCur" style="height:330rpx;margin: 0 auto;width:710rpx;">
+          :current="swiperCur" style="height:330rpx;margin: 0 auto;width:710rpx;" @change="swiperChange">
           <block v-for="(item,index) in imgUrls" :key="index">
-            <swiper-item :class="{ active: index == swiperCur }">
+            <swiper-item :class="{ active: index == swiperCur }" @click="changeSwiper(item.info)">
               <view class='slide-navigator acea-row row-between-wrapper'>
                 <image :src="item.img" class="slide-image aa" style="height:330rpx;" mode="aspectFill">
                 </image>
@@ -332,6 +333,23 @@
       uni.$emit('showLoading', false);
     },
     methods: {
+      changeSwiper(e){
+        if(e.length>0 && e[1].value){
+          uni.navigateTo({
+            url:e[1].value
+          })
+        }
+      },
+      swiperChange(e) {
+      	let {
+      		current,
+      		source
+      	} = e.detail;
+      	if (source === 'autoplay' || source === 'touch') {
+      		this.swiperCur = e.detail.current;
+      		this.bgColor = this.imgUrls[e.detail.current]['img']
+      	}
+      },
       getNav() {
         getNavigation().then(res => {
           this.newData = res.data
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index 74e29e9..8178c69 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -45,7 +45,7 @@
 									<text v-if="!item.allCheck" class="iconfont icon-weixuanzhong"></text>
 									<text v-else class="iconfont icon-xuanzhong1"></text>
 								</view>
-								<navigator :url="hide_mer_status == 0 ? '/pages/store/home/index?id='+item.mer_id : '#'"
+								<navigator :url="hide_mer_status == 0 ? `/pages/store/home/index?id=${item.mer_id}&sale_type=${tabsCurr}` : '#'"
 									class="info">
 									<text class="iconfont icon-shangjiadingdan"></text>
 									<view class="name">{{item.mer_name}}</view>
@@ -55,7 +55,7 @@
 								<!-- <view class="coupon-btn" v-if="item.hasCoupon>0" @click="giveCoupon(item)">优惠券</view> -->
 							</view>
 							<navigator v-for="goods in item.list" :key="goods.cart_id"
-								:url='"/pages/goods_details/index?id="+goods.product.product_id' hover-class='none'
+								:url='`/pages/goods_details/index?id=${goods.product.product_id}&sale_type=${tabsCurr}`' hover-class='none'
 								class='picTxt acea-row'>
 								<view class="checkbox" @click.stop="goodsCheck(goods,index)">
 									<text v-if="!goods.check" class="iconfont icon-weixuanzhong"></text>
diff --git a/pages/payment/get_payment - 副本.vue b/pages/payment/get_payment - 副本.vue
index 03a8000..3dcd0b0 100644
--- a/pages/payment/get_payment - 副本.vue	
+++ b/pages/payment/get_payment - 副本.vue	
@@ -235,9 +235,9 @@
 
 				if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) {
           // return console.log(this.checkForm);
-          return uni.navigateTo({
-            url: "/pages/payment/settlement?cartId="+this.checkForm.cart_id.join(',')+"&money="+this.cartForm.total_amount,
-          })
+          // return uni.navigateTo({
+          //   url: "/pages/payment/settlement?cartId="+this.checkForm.cart_id.join(',')+"&money="+this.cartForm.total_amount,
+          // })
 					orderCheck(that.checkForm).then(res1 => {
 						that.loading = false;
 
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 3dcd0b0..03a8000 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -235,9 +235,9 @@
 
 				if (that.checkForm.cart_id && that.checkForm.cart_id.length > 0) {
           // return console.log(this.checkForm);
-          // return uni.navigateTo({
-          //   url: "/pages/payment/settlement?cartId="+this.checkForm.cart_id.join(',')+"&money="+this.cartForm.total_amount,
-          // })
+          return uni.navigateTo({
+            url: "/pages/payment/settlement?cartId="+this.checkForm.cart_id.join(',')+"&money="+this.cartForm.total_amount,
+          })
 					orderCheck(that.checkForm).then(res1 => {
 						that.loading = false;
 
diff --git a/pages/payment/settlement - 副本 (2).vue b/pages/payment/settlement - 副本 (2).vue
index 19721e8..9996d22 100644
--- a/pages/payment/settlement - 副本 (2).vue	
+++ b/pages/payment/settlement - 副本 (2).vue	
@@ -3,110 +3,34 @@
 		<view class='order-submission'>
 			<!-- 商品信息 -->
 			<view class="storeinfo-wrapper">
-				<view class="store-item" v-for="(item,index) in cartInfo" :key="index">
+				<view class="store-item">
 					<view class="store-title">
 						<text class="iconfont icon-shangjiadingdan"></text>
-						<view class="txt" @click="goStore(item.mer_id)">{{item.mer_name}}</view>
+						<view class="txt" @click="goStore(item.mer_id)">{{payForm.merName}}</view>
 						<text class="iconfont icon-xiangyou"></text>
 					</view>
-					<view v-for="(goods,j) in item.list" :key="j">
-						<view v-if="goods.product_type == 2">
-							<view class="product-item">
-								<view class="img-box">
-									<image :src="goods.productPresellAttr.image || goods.product.image"></image>
-								</view>
-								<view class="content event_content">
-									<view class="name line1"><text
-											class="event_name event_bg">预售</text>{{goods.productPresell.store_name}}
-									</view>
-									<view class="label" style="width: 70%;">{{goods.productAttr.sku}}</view>
-									<view class="price">
-										￥{{goods.productPresellAttr.presell_price}}
-										<text>X{{goods.cart_num}}</text>
-									</view>
-									<view class="event_ship event_color">发货时间：
-										<!--全款预售-->
-										<text
-											v-if="goods.productPresell.presell_type === 1">{{goods.productPresell.delivery_type === 1 ? '支付后' : '预售结束后'}}{{ goods.productPresell.delivery_day }}天内</text>
-										<!--定金预售-->
-										<text
-											v-if="goods.productPresell.presell_type === 2">{{ goods.productPresell.delivery_type === 1 ? '付尾款后' : '预售结束后' }}{{ goods.productPresell.delivery_day }}天内</text>
-									</view>
-									<view class="err-txt" v-if="goods.undelivered && addressInfo.real_name">
-										<text class="iconfont icon-zhuyi-copy"></text>
-										<view class="txt">此商品不支持该区域配送</view>
-									</view>
-								</view>
+
+					<block v-for="(item,indx) in productData" :key="indx">
+						<view class="product-item">
+							<view class="img-box">
+								<image :src="item.image" width="170rpx" height="180rpx" />
 							</view>
-							<view v-if="goods.productPresell.presell_type === 2" class="event_payTime">
-								<view class="event_progress">
-									<view class="progress_step">
-										<text class="name color_red">定金</text>
-										<text
-											class="price color_red">￥{{ (goods.productPresellAttr.down_price * goods.cart_num).toFixed(2) }}</text>
-									</view>
-									<view class="progress_step">
-										<text class="name">尾款</text>
-										<text
-											class="price">￥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}</text>
-									</view>
-									<view class="progress_pay">
-										{{ goods.productPresell.final_start_time | filterDay}}开始支付尾款
-									</view>
+							<view class="content event_content">
+								<view class="name line1">
+									{{item.store_name}}
+								</view>
+								<view style="margin-top: 30rpx;color: #FF5C2D;">
+									￥{{item.price}}
 								</view>
 							</view>
 						</view>
-						<view v-else>
-							<view class="product-item">
-								<view class="img-box">
-									<image :src="goods.productAttr.image || goods.product.image"></image>
-								</view>
-								<view class="content">
-									<view class="name line1">{{goods.product.store_name}}</view>
-									<view class="label">{{goods.productAttr.sku}}</view>
-									<view class="price acea-row row-between">
-										<view class="acea-row row-middle">
-											<block v-if="order_type == 3">
-												￥{{goods.productAssistAttr.assist_price}}
-											</block>
-											<block v-else-if="order_type == 4">
-												￥{{goods.activeSku.active_price}}
-											</block>
-											<block v-else>
-												￥{{goods.productAttr.price}}
-											</block>
-											<text>X{{goods.cart_num}}</text>
-											<view v-if="goods.productAttr.show_svip_price" class="vipImg">
-												<image :src="`${domain}/static/images/svip.png`"></image>
-											</view>
-										</view>
-										<view class="delivery_type">
-											<text v-if="!goods.allow_delivery">不支持快递</text>
-											<text v-if="!goods.allow_take">不支持到店核销</text>
-										</view>
-									</view>
-									<view class="err-txt" v-if="goods.undelivered && addressInfo.real_name">
-										<text class="iconfont icon-zhuyi-copy"></text>
-										<view class="txt">此商品不支持该区域配送</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="settlementAgreement" v-if="showProtocol">
-				<view class="setAgCount">
-					<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
-					<div class="title">{{agrementTtile}}</div>
-					<view class="content">
-						<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
-					</view>
+					</block>
 				</view>
 			</view>
+
 			<view class='wrapper'>
 				<view class='item'>
-					<view>支付方式</view>
+					<view style="font-weight: bold;">支付方式</view>
 					<view class='list'>
 						<!-- #ifdef H5 -->
 						<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
@@ -121,9 +45,6 @@
 								<block v-if="item.value == 'balance'">
 									{{userInfo.now_money}}
 								</block>
-								<block v-else-if="item.value == 'merBalance'">
-									{{moneyInfo.extract_money}}
-								</block>
 							</view>
 						</view>
 						<!-- #endif -->
@@ -140,204 +61,101 @@
 								<block v-if="item.value == 'balance'">
 									{{userInfo.now_money}}
 								</block>
-								<block v-else-if="item.value == 'merBalance'">
-									{{moneyInfo.extract_money}}
-								</block>
 							</view>
 						</view>
 						<!-- #endif -->
 					</view>
 				</view>
 			</view>
+
 			<view class='moneyList'>
 				<view class='item acea-row row-between-wrapper'>
 					<view>商品总价：</view>
-					<view class='money'>￥{{proPrice}}</view>
+					<view class='money'>￥{{payForm.money}}</view>
 				</view>
-				<view class='item acea-row row-between-wrapper' v-if="couponData.order_total_postage > 0">
-					<view>运费：</view>
-					<view class='money'>￥{{couponData.order_total_postage}}</view>
-				</view>
-				<view class='item acea-row row-between-wrapper' v-if="coupon_price > 0">
-					<view>店铺优惠金额：</view>
-					<view class='money'>-￥{{coupon_price}}</view>
-				</view>
-				<view class='item acea-row row-between-wrapper'
-					v-if="open_integral && userInfo.integral>0 && order_type == 0">
-					<view>积分抵扣：</view>
-					<view class='money'>
-						<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral}}</text></text>
-						<text v-else>使用了{{integral_count}}个积分，抵扣<text class="pColor">{{integral_price}}元</text></text>
-						<view class="checkbox integral_checked" @click="changeIntegral">
-							<view class="iconfont icon-weixuanzhong" v-if="!use_integral"></view>
-							<view class='iconfont icon-xuanzhong1' v-else></view>
-						</view>
-					</view>
-				</view>
-				<view class='item acea-row row-between-wrapper'
-					v-if="!seckillId && order_type != 3 && order_type != 4 && enabledPlatformCoupon">
-					<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
-					<block v-if="platformCoupon.length > 0">
-						<view class='discount money' @tap='couponTap2(platformCoupon,0)'>
-							<text v-if="total_platform_coupon_price>0">优惠￥{{total_platform_coupon_price}}</text>
-							<text v-else>暂未选择优惠券</text>
+
+				<view class='item acea-row row-between-wrapper'>
+					<view>补贴抵扣</view>
+					<block v-if="platformConsumption.length > 0">
+						<view class='discount money red_packet' @click="couponTap3()">
+							<text v-if="consumption_id">-￥{{consumption_money||'0.00'}}</text>
+							<text v-else>有补贴补贴未选</text>
 							<text class='iconfont icon-jiantou'></text>
 						</view>
 					</block>
 					<block v-else>
-						<view class='discount'>暂无优惠券</view>
+						<view class='discount'>暂无抵扣红包</view>
 					</block>
 				</view>
-				<view class='item acea-row row-between-wrapper' v-if="priceGroup.storePostage > 0">
-					<view>运费：</view>
-					<view class='money'>+￥{{priceGroup.storePostage}}</view>
-				</view>
 			</view>
 			<view style='height:140rpx;'></view>
+
 			<view class='footer acea-row row-between-wrapper'>
 				<view class="footer_count">
 					<view>
 						合计:
-						<text class='pColor'>￥{{totalPrice || 0}}</text>
-					</view>
-					<view class="coupon_price" v-if="couponData.total_coupon > 0">
-						优惠:¥ {{couponData.total_coupon}}
-						<text @click="openDiscount">优惠明细</text>
+						<text class='pColor' v-if="cartArr[4].payStatus == 1 && active == 4">￥0.00</text>
+						<text class='pColor' v-else>￥{{ total_coupon }}</text>
 					</view>
 				</view>
 				<view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100'
 					@tap="SubOrder">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view>
 			</view>
+
+
+			<!-- 支付密码 键盘 -->
+			<popups ref="popups" :isPay="true" @confirm="handleConfirm" @clear="handleClear" @change="handleChange" />
+
+			<!-- 密码错误事件处理 -->
+			<payPwd ref="payPwd" @left="handleLeft" @right="handleRight"></payPwd>
 		</view>
-		<block v-if="coupon.status">
-			<couponListWindow :coupon='coupon' :couponTitle="plantCoupon ? '平台优惠券' : '优惠券'"
-				@ChangCouponsClose="ChangCouponsClose" @getCoupon="getCoupon" :openType='openType'
-				:coupon_amount='coupon_amount' :coupon_number='coupon_number'></couponListWindow>
-		</block>
-		<addressWindow ref="addressWindow" @changeTextareaStatus="changeTextareaStatus" :address='address'
-			:pagesUrl="pagesUrl" @OnChangeAddress="OnChangeAddress" @changeClose="changeClose"></addressWindow>
-		<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
-		<block v-if="isShowBox">
-			<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj"
-				:radioList="radioList" @close="boxClose" @confirmBtn="getData">
-			</checkDelivery>
-		</block>
-		<!--优惠明细弹窗-->
-		<discountDetails :isShowDiscount="isShowDiscount" @close="closeDiscount" :couponData="couponData">
-		</discountDetails>
-		<timeranges :isShow='isShow' :time='timeranges' @confrim="confrim" @cancel="cancels"></timeranges>
-		<areaWindow ref="areaWindow" :display="display" :address='addressInfoArea' :cityShow='cityShow'
-			@submit="OnAreaAddress" @changeClose="changeAddressClose"></areaWindow>
-
-		<!-- 支付密码 键盘 -->
-		<popups ref="popups" :isPay="true" @confirm="handleConfirm" @clear="handleClear" @change="handleChange" />
-
-		<!-- 密码错误事件处理 -->
-		<payPwd ref="payPwd" @left="handleLeft" @right="handleRight"></payPwd>
 	</view>
 </template>
 <script>
 	// +----------------------------------------------------------------------
 	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
 	// +----------------------------------------------------------------------
 	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
-
 	let app = getApp();
-	const CACHE_CITY = {};
 	import {
 		orderConfirm,
-		getOrderConfirm,
-		getCouponsOrderPrice,
-		orderCreate,
-		createOrder,
-		verifyPwd
+		createOrder
 	} from '@/api/order.js';
 	import {
-		getAddressDefault,
-		getAddressDetail,
-		getAddressList,
 		getUserInfo,
-		getAdminApplyAPI,
-		getAgreementApi
 	} from '@/api/user.js';
-	import {
-		getProSysForm
-	} from '@/api/product.js';
 	import {
 		openPaySubscribe
 	} from '@/utils/SubscribeMessage.js';
-	import {
-		presellAgreement
-	} from '@/api/activity.js';
-	import {
-		storeListApi
-	} from '@/api/store.js';
-	import {
-		CACHE_LONGITUDE,
-		CACHE_LATITUDE
-	} from '@/config/cache.js';
-	import couponListWindow from '@/components/orderCoupon';
-	import addressWindow from '@/components/addressWindow';
-	import orderGoods from '@/components/orderGoods';
-	import checkDelivery from '@/components/checkDelivery/index.vue';
-	import discountDetails from '@/components/discountDetails/index.vue';
-	import addInvoicing from '@/components/addInvoicing';
-	import parser from "@/components/jyf-parser/jyf-parser";
-	import payPwd from "@/components/payPwd/index.vue";
-  import {
-  	orderPay,
-  	orderCheck
-  } from "@/api/payment.js";
 	import {
 		mapGetters
 	} from "vuex";
-	import {
-		toLogin
-	} from '@/libs/login.js';
 	import {
 		configMap
 	} from '@/utils';
 	import {
-		HTTP_REQUEST_URL
-	} from '@/config/app';
-	import dayjs from "@/plugin/dayjs/dayjs.min.js";
-	import areaWindow from '@/components/areaWindow';
-	import timeranges from '@/components/timeranges';
+		orderPay,
+		orderCheck
+	} from "@/api/payment.js";
+	import {
+		verifyPwd
+	} from '@/api/order.js';
+	import payPwd from "@/components/payPwd/index.vue";
 	import popups from "@/components/popups/index.vue";
+
 	export default {
 		components: {
 			payPwd,
-			couponListWindow,
-			addressWindow,
-			orderGoods,
-			checkDelivery,
-			addInvoicing,
-			discountDetails,
-			"jyf-parser": parser,
-			areaWindow,
-			timeranges,
 			popups
 		},
-		filters: {
-			filterDay(val) {
-				if (val) {
-					var reg = /(\d{4})\-(\d{2})\-(\d{2})/;
-					var date = val.replace(reg, "$2月$3日");
-					return date
-				}
-			}
-		},
 		data() {
 			return {
-				// 备注
-				msgObj: {},
-				textareaStatus: true,
-				deliveryName: '快递配送',
+				platformConsumption: [],
 				//支付方式
 				cartArr: [{
 						"name": "微信支付",
@@ -365,27 +183,19 @@
 						title: '可用余额:',
 						payStatus: this.$store.getters.globalData.yue_pay_status,
 					},
-					{
-						"name": "商户余额",
-						"icon": "icon-yue2",
-						value: 'merBalance',
-						title: '可用余额:',
-						payStatus: 2,
-					},
 					{
 						"name": "线下支付",
 						"icon": "icon-yinhangqia",
 						value: 'offline',
 						title: '线下支付',
 						payStatus: 2,
+					}, {
+						"name": "先货后款",
+						"icon": "tan-a-lujing17324",
+						value: 'creditBuy',
+						title: `结算周期：${this.settle_cycle}天 日利率：${this.interest_rate}%`,
+						payStatus: '',
 					},
-					{
-						"name": "对公转账",
-						"icon": "icon-yinhangqia",
-						value: 'public',
-						title: '对公转账',
-						payStatus: 1,
-					}
 				],
 				tagStyle: {
 					img: 'width:100%;display:block;',
@@ -399,132 +209,119 @@
 					check: false
 				}],
 				payType: 'weixin', //支付方式
-				openType: 1, //优惠券打开方式 1=使用
 				active: 0, //支付方式切换
-				coupon: {
-					status: false,
-					list: [],
-					statusTile: '立即使用'
-				}, //优惠券组件
 				address: {
 					address: false
 				}, //地址组件
-				addressInfo: {}, //地址信息
-				invoice: {
-					invoice: false,
-					mer_id: 0,
-					add: true
-				}, //发票组件
-				invoiceData: {}, // 发票数据
-				pinkId: 0, //拼团id
-				addressId: 0, //地址id
 				couponId: 0, //优惠券id
 				cartId: '', //购物车id
-				BargainId: 0,
-				combinationId: 0,
-				seckillId: 0,
 				userInfo: {}, //用户信息
-				post: {},
-				mark: '', //备注信息
-				couponTitle: '请选择', //优惠券
 				coupon_price: 0, //优惠券抵扣金额
-				useIntegral: false, //是否使用积分
-				integral_price: 0, //积分抵扣金额
-				integral: 0,
 				ChangePrice: 0, //使用积分抵扣变动后的金额
 				formIds: [], //收集formid
 				status: 0,
 				is_address: false,
 				toPay: false, //修复进入支付时页面隐藏从新刷新页面
-				shippingType: 0,
-				system_store: {},
-				storePostage: 0,
-				contacts: '',
-				contactsTel: '',
-				mydata: {},
-				storeList: [],
-				store_self_mention: 0,
 				cartInfo: [],
 				priceGroup: {},
 				animated: false,
 				totalPrice: 0,
-				use_integral: false,
-				pagesUrl: "",
-				orderKey: "",
 				offlinePostage: "",
+
 				from: '',
 				orderStatus: '', //是否有地址
 				couponIndex: 0, //选择商铺优惠券索引
 				subCoupon: {}, //提交订单使用的优惠券
-				proPrice: 0, //商品总价
-				isShowBox: false,
-				activeObj: {}, //选中店铺信息
-				activeIndex: '', // 选中店铺索引
-				invoiceName: '不开发票',
-				invoice_func: false,
-				special_invoice: false,
-				isAgree: false,
-				showProtocol: false,
-				isCoupon: false,
-				protocol: '',
-				order_type: 0,
-				addInvoice: {},
 				couponData: {},
-				go_map: false,
 				orderPay: false,
-				take: [],
-				open_integral: 0,
-				coupon_number: 0,
-				store_coupon_number: 0,
-				coupon_amount: 0,
-				store_coupon_amount: 0,
-				plant_coupon_amount: 0,
-				integral_count: '',
-				agrementTtile: '发票说明',
 				pics: [],
-				order_model: 2,
-				allow_address: true,
-				order_extend: [],
-				order_form: [],
-				extend: {},
+				extend: [],
 				virtualIndex: 0,
 				platformCoupon: [],
 				total_platform_coupon_price: 0,
 				enabledPlatformCoupon: false,
 				plantCoupon: false,
-				isShowDiscount: false,
 				order_key: '',
-				is_take: '',
-				domain: HTTP_REQUEST_URL,
-				timerangesIndex: 0,
-				newImg: [],
-				display: false,
-				cityShow: 2,
-				addressInfoArea: [],
-				timeranges: [],
-				isShow: false,
-				moneyInfo: {},
-				orderData: {}, //支付参数
-				sale_type: 1,
+				product_type: '',
+				source: null,
+				settle_cycle: '', // 周期
+				type_id: '', //店铺类型
+				consumption_id: '', //补贴id
+				consumption_money: '', //补贴抵扣金额
+				total_coupon: '', //合计
+				payForm: {
+					cart_id: '',
+					address_id: '',
+					consumption_id: '',
+					use_coupon: '',
+					takes: '',
+					use_integral: '',
+					receipt_data: [],
+					mark: '',
+					pay_type: '',
+					money: '',
+					merName: '',
+					return_url: '',
+					key: '',
+					source: 999,
+				},
+				checkForm: {
+					address_id: '',
+					cart_id: [],
+					consumption_id: '',
+					product_type: 0,
+					source: 999,
+					takes: [],
+					use_coupon: {},
+					use_integral: false,
+					key: ''
+				},
+				productData: [],
+				orderData: {}
 			};
 		},
 		computed: {
 			...mapGetters(['isLogin', 'viewColor']),
-			...configMap(['hide_mer_status', 'alipay_open', 'yue_pay_status']),
+			...configMap(['hide_mer_status', 'yue_pay_status']),
 		},
 		watch: {
-			alipay_open(n) {
-				this.payMode[1].payStatus = n
-			},
 			yue_pay_status(n) {
 				this.payMode[2].payStatus = n
 			}
 		},
-		onReady() {},
-		mounted: function() {},
 		onLoad: function(options) {
-			this.seckillId = options.seckillId
-			if (options.sale_type) this.sale_type = options.sale_type;
+			// options.money = parseFloat(options.money).toFixed(2);
+			// this.payForm.cart_id = options.cartId;
+			// this.payForm.money = options.money;
+			// this.payForm.merName = options.merName;
+			// this.checkForm.cart_id = options.cartId.split(',');
+			// this.total_coupon = options.money;
+
+			// this.platformConsumption = [{
+			//   balance: "39000.00",
+			//   coupon_price: "50000.00",
+			//   coupon_title: "春耕采购余额",
+			//   coupon_user_id: 178,
+			//   describe: "仅限平台指定商家商品可使用",
+			//   end_time: "2025-07-01 00:00:00",
+			//   start_time: "2024-03-02 14:15:17",
+			//   uid: 889
+			// }]
+			let that = this;
+			const eventChannel = this.getOpenerEventChannel();
+			eventChannel.on('acceptDataFromOpenedPage', function(data) {
+				that.productData = data.productData;
+				that.platformConsumption = data.platformConsumption || [];
+
+				that.checkForm.cart_id = data.checkForm.cart_id;
+				that.payForm.cart_id = that.checkForm.cart_id;
+				that.payForm.money = data.money;
+				that.payForm.merName = data.merName;
+				that.payForm.key = data.key;
+				that.total_coupon = data.money;
+				that.checkForm.key = data.key;
+			});
+
 			// #ifdef H5
 			this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
 			// #endif
@@ -534,641 +331,81 @@
 			// #ifdef APP-PLUS
 			this.from = 'weixin'
 			// #endif
-			if (!options.cartId) return this.$util.Tips({
-				title: '请选择要购买的商品'
-			}, {
-				tab: 3,
-				url: 1
-			});
-			this.couponId = options.couponId || 0;
-			this.pinkId = options.pinkid ? parseInt(options.pinkid) : 0;
-			this.addressId = options.addressId || 0;
-			this.cartId = options.cartId;
-			this.is_address = options.is_address ? true : false;
-			this.news = options.new ? 1 : 0;
-			this.invoice_id = options.invoice_id || '';
-			if (options.invoice_type == 1) {
-				this.invoiceName = '增值税电子普通发票';
-			} else if (options.invoice_type == 2) {
-				this.invoiceName = '增值税专用发票';
-			}
+
 			if (!this.isLogin) {
-				toLogin()
+				this.isAuto = true;
+				this.isShowAuth = true
 			}
-			if (this.payType == 'weixin') {
-				this.payType = this.from
-			}
-			let _this = this
-			this.textareaStatus = true;
-			if (this.isLogin && this.toPay == false && !this.orderPay) {
-				this.getaddressInfo();
-				this.$nextTick(function() {
-					this.$refs.addressWindow.getAddressList();
-					this.getUserInfo();
-				})
-			}
-			uni.setStorage({
-				key: 'invoice_Data',
-				data: {},
-				success: function() {}
-			})
 		},
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
-
-			let that = this;
-			uni.$on("handClick", res => {
-				if (res) {
-					_this.system_store = res.address
-				}
-				// 清除监听
-				uni.$off('handClick');
-			})
-			that.invoice.invoice = false
+			this.getUserInfo()
 		},
+
 		methods: {
-			/*预售协议*/
-			getPresellAgree: function() {
-				this.showProtocol = true
-				this.agrementTtile = '预售协议'
-				presellAgreement().then(res => {
-					this.protocol = res.data.sys_product_presell_agree;
+			couponTap3: function(item, index) {
+				uni.navigateTo({
+					url: '/pages/redpacket/redpacket',
+					success: (res) => {
+						res.eventChannel.emit('changeRedPacketInfo', this.platformConsumption)
+						uni.$once('changeRedPacket', (data) => {
+							this.consumption_id = data;
+							orderCheck({
+								...this.checkForm,
+								consumption_id: this.consumption_id
+							}).then(res => {
+								this.total_coupon = res.data.order_price;
+								this.consumption_money = res.data.consumption_money;
+								this.payForm.consumption_id = this.consumption_id;
+								// this.payForm.money = res.data.order_price;
+							})
+						})
+					}
 				})
 			},
-			changeIsAgree: function(e) {
-				this.isAgree = !this.isAgree;
+			// 授权关闭
+			authColse: function(e) {
+				console.log(e, 'authColse')
+				this.isShowAuth = e;
 			},
-			changeIntegral: function(e) {
-				this.use_integral = !this.use_integral;
-				this.getConfirm(this.addressId);
-			},
-			showPresellAgree() {
-				this.getPresellAgree()
-			},
-			showInvoice() {
-				this.getAgreement();
-			},
-			showCoupon() {
-				this.getCouponAgreement();
-			},
-			// 打开配送方式弹窗
-			openDiscount(item, index) {
-				this.isShowDiscount = !this.isShowDiscount;
-			},
-			closeDiscount() {
-				this.isShowDiscount = false
-			},
-			// 图片预览
-			// 获得相册 idx
-			getPhotoClickIdx(e) {
-				let _this = this;
-				let idx = e.currentTarget.dataset.index;
-				_this.imgPreview(_this.pics, idx);
-			},
-			// 图片预览
-			imgPreview: function(list, idx) {
-				// list：图片 url 数组
-				if (list && list.length > 0) {
-					uni.previewImage({
-						current: list[idx], //  传 Number H5端出现不兼容
-						urls: list
-					});
-				}
-			},
-			/**上传文件*/
-			uploadpic: function(item) {
-				let that = this;
-				that.$util.uploadImageOne('upload/image', function(res) {
-					let pics = item.value || []
-					pics.push(res.data.path);
-					that.$set(item, 'value', pics);
-				});
-			},
-			/** 删除图片*/
-			DelPic: function(item, index) {
-				let that = this,
-					pic = this.pics[index];
-				item.value.splice(index, 1);
-				// that.$set(that, 'pics', that.pics);
+			onLoadFun() {
+				this.isShowAuth = false;
 			},
+
 			// 获取个人信息
 			getUserInfo() {
 				getUserInfo().then(res => {
-					this.userInfo = res.data;
-					//获取账户金额以及冻结金额 重新调了一次接口
-					if (this.userInfo.service && this.userInfo.service.mer_id) getAdminApplyAPI(this.userInfo
-						.service.mer_id).then(res => {
-						this.moneyInfo = res.data;
-						this.cartArr.forEach(item => {
-							if (item.value == 'merBalance') item.payStatus = 1;
-						})
-					})
+					this.userInfo = res.data
 				})
 			},
 
-			/*获取发票说明*/
-			getAgreement() {
-				let that = this
-				that.showProtocol = true;
-				that.agrementTtile = '发票说明'
-				getAgreementApi('sys_receipt_agree').then(res => {
-					that.protocol = res.data.sys_receipt_agree
-				})
-			},
-
-			/*获取发票说明*/
-			getCouponAgreement() {
-				let that = this
-				that.showProtocol = true;
-				that.agrementTtile = '优惠券说明'
-				getAgreementApi('sys_coupon_agree').then(res => {
-					that.protocol = res.data.sys_coupon_agree
-				})
-			},
-			/**
-			 * 获取门店列表数据
-			 */
-			getList: function() {
-				let longitude = uni.getStorageSync("CACHE_LONGITUDE"); //经度
-				let latitude = uni.getStorageSync("CACHE_LATITUDE"); //纬度
-				let data = {
-					latitude: latitude, //纬度
-					longitude: longitude, //经度
-					page: 1,
-					limit: 10
-				}
-				storeListApi(data).then(res => {
-					let list = res.data.list.list || [];
-					this.$set(this, 'storeList', list);
-					this.$set(this, 'system_store', list[0]);
-				}).catch(err => {})
-			},
-			// 单选
-			radioChange(e, index, item) {
-				this.order_form[index].value = item.wordsConfig.list[e.detail.value].val
-			},
-			clickTextArea() {
-				this.$refs.textarea.focus()
-			},
-			bindDateChange(e, index) {
-				this.order_form[index].value = e.target.value
-				this.$forceUpdate()
-			},
-			bindTimeChange(e, index) {
-				this.order_form[index].value = e.target.value
-			},
-			bindSelectChange(e, index, item) {
-				this.$set(this.order_form[index], 'value', item.wordsConfig.list[e.detail.value].val);
-			},
-			getTimeranges(index) {
-				this.isShow = true
-				this.timerangesIndex = index
-			},
-			confrim(e) {
-				this.isShow = false;
-				this.order_form[this.timerangesIndex].value = e.time;
-				let arrayNew = [];
-				e.val.forEach(item => {
-					arrayNew.push(Number(item))
-				})
-				this.timeranges = arrayNew;
-			},
-			cancels() {
-				this.isShow = false;
-			},
-			// 多选
-			checkboxChange(e, index, item) {
-				let obj = e.detail.value;
-				let val = '';
-				item.wordsConfig.list.forEach((j, jindex) => {
-					obj.forEach(x => {
-						if (jindex == x) {
-							val = val + (val ? ',' : '') + j.val;
-						}
-					})
-				})
-				this.order_form[index].value = val
-			},
-			OnAreaAddress(address) {
-				let addr = '';
-				addr = address.map(v => v.name).join('/');
-				this.order_form[this.timerangesIndex].value = addr;
-				CACHE_CITY[this.timerangesIndex] = address;
-			},
-			changeRegion(index) {
-				if (!this.order_form[index].value) {
-					this.addressInfoArea = [];
-				}
-				this.timerangesIndex = index;
-				this.cityShow = Number(this.order_form[index].valConfig.tabVal) + 1;
-				this.display = true;
-				if (CACHE_CITY[index]) {
-					this.addressInfoArea = CACHE_CITY[index];
-				}
-			},
-			// 关闭地址弹窗；
-			changeAddressClose: function() {
-				this.display = false;
-			},
-			/**上传文件*/
-			uploadpic: function(index) {
-				let that = this;
-				this.$util.uploadImageOne('upload/image', function(res) {
-					that.newImg.push(res.data.path);
-					that.$set(that.order_form[index], 'value', that.newImg);
-				});
-			},
-			/**
-			 * 删除图片
-			 * 
-			 */
-			DelPic: function(index, indexs) {
-				let that = this,
-					pic = this.order_form[index].value;
-				that.order_form[index].value.splice(indexs, 1);
-				that.$set(that.order_form[index], 'value', that.order_form[index].value);
-			},
-			// 关闭地址弹窗；
-			changeClose: function() {
-				this.$set(this.address, 'address', false);
-			},
-			// 关闭发票弹窗
-			changeInvoiceClose: function(data) {
-				this.getInvoiceData(data);
-				this.$set(this.invoice, 'invoice', false);
-			},
-			getInvoiceData(selectedData) {
-				this.invoiceData = {}
-				if (selectedData) {
-					this.cartInfo.forEach((item, i) => {
-						if (item.mer_id == selectedData.mer_id) {
-							if (this.cartInfo[i]['invoiceData']) {
-								this.cartInfo[i]['invoiceData'] = selectedData
-							} else {
-								this.$set(this.cartInfo[i], 'invoiceData', selectedData)
-							}
-						}
-						let mer_id = selectedData.mer_id
-						this.invoiceData[mer_id] = selectedData;
-					});
-				} else {
-					this.cartInfo.forEach((item, i) => {
-						this.$set(this.cartInfo[i], 'invoiceData', {})
-					});
-				}
-			},
-			getInvoiceDatas(selectedData) {
-				this.invoiceData = {}
-				if (selectedData.length) {
-					this.cartInfo.forEach((item, i) => {
-						selectedData.forEach((val, j) => {
-							if (item.mer_id == val.mer_id) {
-								if (this.cartInfo[i]['invoiceData']) {
-									this.cartInfo[i]['invoiceData'] = val
-								} else {
-									this.$set(this.cartInfo[i], 'invoiceData', val)
-								}
-							}
-							let mer_id = val.mer_id
-							this.invoiceData[mer_id] = val;
-						})
-					});
-				} else {
-					this.cartInfo.forEach((item, i) => {
-						this.$set(this.cartInfo[i], 'invoiceData', {})
-					});
-				}
-			},
-			/*
-			 * 跳转门店列表
-			 */
-			showStoreList: function() {
-				let _this = this
-				if (this.storeList.length > 0) {
-					uni.navigateTo({
-						url: '/pages/users/goods_details_store/index'
-					})
-				}
-			},
-			// 进店
-			goStore: function(id) {
-				if (this.hide_mer_status != 1) {
-					uni.navigateTo({
-						url: `/pages/store/home/index?id=${id}`
-					})
-				}
-			},
-			ChangCouponsClose: function() {
-				this.$set(this.coupon, 'status', false);
-			},
-			changeTextareaStatus: function() {
-				for (let i = 0, len = this.coupon.list.length; i < len; i++) {
-					this.coupon.list[i].use_title = '';
-					this.coupon.list[i].is_use = 0;
-				}
-				this.textareaStatus = true;
-				this.status = 0;
-				this.$set(this.coupon, 'list', this.coupon.list);
-			},
-			/**
-			 * 选择地址后改变事件
-			 * @param object e
-			 */
-			OnChangeAddress: function(e) {
-				this.textareaStatus = true;
-				this.addressId = e;
-				this.address.address = false;
-				this.getaddressInfo();
-			},
-			bindHideKeyboard: function(e) {
-				this.mark = e.detail.value;
-			},
-			getCoupon(coupon) {
-				if (coupon.checked) {
-					this.subCoupon[coupon.mer_id].forEach((item, i) => {
-						if (coupon.coupon_user_id == item) {
-							this.subCoupon[coupon.mer_id].splice(i, 1)
-						}
-					})
-				} else {
-					this.subCoupon[coupon.mer_id].push(coupon.coupon_user_id)
-				}
-				this.getConfirm(this.addressId)
-			},
-			/**
-			 * 获取当前订单详细信息
-			 *
-			 */
-			getConfirm: function(address_id) {
-				let that = this;
-				uni.showLoading({
-					title: '',
-					mask: true
-				});
-				getOrderConfirm({
-					cart_id: that.cartId.split(","),
-					address_id: '',
-          consumption_id:'',
-          product_type: 0,
-					takes: that.take,
-          source: 999,
-					use_coupon: that.subCoupon,
-					use_integral: that.use_integral
-				}).then(res => {
-					// 默认选中
-					that.is_take = false
-					res.data.order.forEach(el => {
-						if (el.order.isTake == 1) that.is_take = true
-						el.isTake = 0
-						that.subCoupon[el.mer_id] = []
-						el.coupon.forEach(coupon => {
-							if (coupon.checked) {
-								that.subCoupon[el.mer_id].push(coupon.coupon_user_id)
-							}
-						})
-					})
-					that.subCoupon['0'] = []
-					if (res.data.platformCoupon.length > 0) {
-						res.data.platformCoupon.forEach(el => {
-							if (el.checked) {
-								that.subCoupon[el.mer_id] = []
-								that.subCoupon[el.mer_id].push(el.coupon_user_id)
-							}
-						})
-					}
-					that.$set(that.coupon, "coupon", that.plantCoupon ? res.data.platformCoupon : res.data
-						.order[that.couponIndex].coupon);
-					that.$set(that, "store_coupon_number", res.data.order[that.couponIndex].order.useCouponIds
-						.length);
-					that.$set(that, "coupon_number", that.plantCoupon ? that.subCoupon['0'].length : that
-						.store_coupon_number);
-					that.$set(that, "store_coupon_amount", parseFloat(res.data.order[that.couponIndex].order
-						.coupon_price));
-					that.$set(that, "plant_coupon_amount", parseFloat(res.data.total_platform_coupon_price));
-					that.$set(that, "coupon_amount", that.plantCoupon ? that.plant_coupon_amount : that
-						.store_coupon_amount);
-					that.$set(that, 'couponData', res.data);
-					that.$set(that, 'cartInfo', res.data.order);
-					that.$set(that, 'total_platform_coupon_price', res.data.total_platform_coupon_price);
-					that.$set(that, 'enabledPlatformCoupon', res.data.enabledPlatformCoupon);
-					that.$set(that, 'platformCoupon', res.data.platformCoupon);
-					that.$set(that, 'order_type', res.data.order_type);
-					that.$set(that, 'coupon_price', res.data.order_coupon_price);
-					that.$set(that, 'integral_count', res.data.order_total_integral);
-					that.$set(that, 'integral_price', res.data.order_total_integral_price);
-					that.$set(that, 'open_integral', res.data.openIntegral);
-					that.$set(that, 'use_integral', res.data.useIntegral);
-					that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length > 0) ? that
-						.order_extend : res.data.order_extend);
-					if (res.data.mer_form_id && !that.order_form.length && res.data.mer_form_info && res.data
-						.mer_form_info.value) {
-						let formData = that.objToArr(res.data.mer_form_info.value)
-						formData.forEach((item, index, arr) => {
-							that.$set(item, 'value', "");
-							CACHE_CITY[index] = ''; //清空省市区
-							if (item.name == 'texts') {
-								if (item.defaultValConfig.value) {
-									item.value = item.defaultValConfig.value
-								} else {
-									item.value = ''
-								}
-							} else if (item.name == 'radios') {
-								item.value = item.wordsConfig.list[0].val
-							} else if (item.name == 'uploadPicture') {
-								item.value = [];
-							} else if (item.name == 'dateranges') {
-								if (item.valConfig.tabVal == 0) {
-									if (item.valConfig.tabData == 0) {
-										let obj = dayjs(new Date(Number(new Date().getTime()))).format(
-											'YYYY-MM-DD');
-										item.value = [obj, obj]
-									} else {
-										let data1 = dayjs(new Date(Number(new Date(item.valConfig
-											.specifyDate[0]).getTime()))).format('YYYY-MM-DD');
-										let data2 = dayjs(new Date(Number(new Date(item.valConfig
-											.specifyDate[1]).getTime()))).format('YYYY-MM-DD');
-										item.value = [data1, data2];
-									}
-								} else {
-									item.value = [];
-								}
-							} else {
-								if (['times', 'dates', 'timeranges'].indexOf(item.name) != -1) {
-									if (item.valConfig.tabVal == 0) {
-										if (item.valConfig.tabData == 0) {
-											if (item.name == 'times') {
-												item.value = dayjs(new Date(Number(new Date()
-													.getTime()))).format('HH:mm');
-											} else if (item.name == 'dates') {
-												item.value = dayjs(new Date(Number(new Date()
-													.getTime()))).format('YYYY-MM-DD');
-											} else {
-												let current = dayjs(new Date(Number(new Date()
-													.getTime()))).format('HH:mm');
-												item.value = current + ' - ' + current;
-											}
-										} else {
-											if (item.name == 'times' || item.name == 'dates') {
-												item.value = item.valConfig.specifyDate;
-											} else {
-												item.value = item.valConfig.specifyDate[0] + ' - ' +
-													item.valConfig.specifyDate[1];
-											}
-										}
-									} else {
-										item.value = '';
-									}
-								} else {
-									item.value = '';
-								}
-							}
-						})
-
-						function sortNumber(a, b) {
-							return a.timestamp - b.timestamp;
-						}
-						formData.sort(sortNumber);
-						that.$set(that, 'order_form', (that.order_form && that.order_form.length > 0) ? that
-							.order_form : formData);
-					}
-					that.totalPrice = res.data.order_price
-					that.orderStatus = res.data.status
-					that.proPrice = res.data.total_price
-					that.order_type = res.data.order_type
-					that.order_model = res.data.order_model
-					that.allow_address = res.data.allow_address
-					that.deliveryName = res.data.order_model == 0 ? '快递配送' : '虚拟发货'
-					that.order_key = res.data.key
-					uni.getStorage({
-						key: "invoice_Data",
-						success: function(res) {
-							that.addInvoice = res.data;
-							if (res.data) {
-								that.getInvoiceDatas(res.data)
-							}
-						}
-					})
-					uni.hideLoading();
-				}).catch(err => {
-					return this.$util.Tips({
-						title: err
-					}, {
-						tab: 3,
-						url: 1
-					});
-				});
-			},
-			// 对象转数组
-			objToArr(data) {
-				let obj = Object.keys(data);
-				let m = obj.map(key => data[key]);
-				return m;
-			},
-			/*
-			 * 获取默认收货地址或者获取某条地址信息
-			 */
-			getaddressInfo: function() {
-				let that = this;
-				if (that.addressId) {
-					getAddressDetail(that.addressId).then(res => {
-						res.data.is_default = parseInt(res.data.is_default);
-						that.addressInfo = res.data || {};
-						that.addressId = res.data.address_id || 0;
-						that.address.addressId = res.data.address_id || 0;
-						that.post = {
-							real_name: res.data.real_name,
-							phone: res.data.phone
-						}
-						this.getConfirm(that.addressId);
-					})
-				} else {
-					getAddressList().then(res => {
-						that.addressInfo = res.data.list.length > 0 ? res.data.list[0] : {};
-						that.addressId = res.data.list.length > 0 ? res.data.list[0].address_id : 0;
-						that.address.addressId = res.data.list.length > 0 ? res.data.list[0].address_id : 0;
-						that.post = res.data.list.length > 0 ? {
-							real_name: res.data.list[0].real_name,
-							phone: res.data.list[0].phone
-						} : {
-							real_name: '',
-							phone: ''
-						}
-						this.getConfirm(that.addressId);
-					})
-				}
-			},
 			payItem: function(e) {
 				let that = this;
 				let active = e;
 				that.active = active;
+				// console.log(this.active);
 				that.animated = true;
 				that.payType = that.cartArr[active].value;
 				if (that.payType == 'weixin') {
 					that.payType = that.from
 				}
 			},
-			couponTap: function(item, index) {
-				this.coupon = item
-				this.$set(this.coupon, 'status', true)
-				this.couponIndex = index
-				this.plantCoupon = false
-				this.$set(this, "coupon_number", this.store_coupon_number);
-				this.$set(this, "coupon_amount", this.store_coupon_amount);
-			},
-			couponTap2: function(item, index) {
-				this.coupon = {
-					coupon: item,
-					mer_id: 0,
-					status: true
-				}
-				this.plantCoupon = true
-				this.$set(this, "coupon_number", this.subCoupon['0'].length);
-				this.$set(this, "coupon_amount", this.plant_coupon_amount);
-			},
-			car: function() {
-				let that = this;
-				that.animated = false;
-			},
-			onAddress: function() {
-				let that = this;
-				if (that.addressInfo.real_name) {
-					that.textareaStatus = false;
-					that.address.address = true;
-					that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this
-						.pinkId + '&couponId=' + this.couponId;
-				} else {
-					uni.navigateTo({
-						url: `/pages/users/user_address/index?cartId=${this.cartId}`,
-					});
-				}
-			},
-			/**
-			 * 开发票
-			 */
-			goInvoice: function(id) {
-				let that = this;
-				that.invoice.invoice = true;
-				that.invoice.mer_id = id;
-				this.$refs.addInvoicing.getInvoiceDefault();
-				this.$refs.addInvoicing.getInvoiceList();
-			},
-			realName: function(e) {
-				this.contacts = e.detail.value;
-			},
-			phone: function(e) {
-				this.contactsTel = e.detail.value;
-			},
+
 			payment: function(data) {
 				let that = this;
 				createOrder(data).then(res => {
+
 					let status = res.data.status,
 						orderId = res.data.result.order_id,
-						callback_key = res.data.result.pay_key,
 						jsConfig = res.data.result.config,
+						// 暂不跳转
 						goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +
-						'&sale_type=' + that.sale_type;
+						'&product_type=' + that.payForm.product_type + '&source=' + that.payForm.source,
+						goPagesOrder = '/pages/order_details/stay?order_id=' + orderId +
+						'&credit_buy=1&product_type=' + that.payForm.product_type;
+
 					that.orderPay = true;
 					uni.hideLoading();
 					switch (status) {
@@ -1180,7 +417,7 @@
 								title: res.message
 							}, {
 								tab: 5,
-								url: goPages
+								url: goPagesOrder
 							});
 							break;
 						case 'success':
@@ -1194,10 +431,6 @@
 							break;
 						case 'alipay':
 						case "alipayQr":
-							uni.navigateTo({
-								url: '/pages/order_pay_back/index?keyCode=' + callback_key + '&url=' +
-									jsConfig
-							})
 							return;
 							break;
 							// #ifndef MP
@@ -1234,8 +467,11 @@
 								provider: 'wxpay',
 								orderInfo: jsConfig,
 								success: (e) => {
+									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=支付成功' + '&sale_type=' + that.sale_type;
+										'&msg=支付成功' + '&product_type=' + that.product_type +
+										'&source=' + that.source;
+
 									return that.$util.Tips({
 										title: '支付成功',
 										icon: 'success'
@@ -1245,8 +481,10 @@
 									});
 								},
 								fail: (e) => {
+									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=取消支付' + '&sale_type=' + that.sale_type;
+										'&msg=取消支付' + '&product_type=' + that.product_type +
+										'&source=' + that.source;
 									return that.$util.Tips({
 										title: '取消支付',
 									}, {
@@ -1254,15 +492,8 @@
 										url: url
 									});
 								},
-								complete: () => {
-									let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=取消支付' + '&sale_type=' + that.sale_type;
-									return that.$util.Tips({
-										title: '',
-									}, {
-										tab: 4,
-										url: url
-									});
+								complete: (res) => {
+									uni.hideLoading();
 								},
 							});
 							// #endif
@@ -1291,8 +522,10 @@
 									});
 								},
 								fail: function(e) {
+									// 暂不跳转
 									let pages = '/pages/order_pay_status/index?order_id=' +
-										orderId + '&msg=取消支付' + '&sale_type=' + that.sale_type
+										orderId + '&msg=取消支付' + '&product_type=' + that
+										.product_type + '&source=' + that.source;
 									return that.$util.Tips({
 										title: '取消支付'
 									}, {
@@ -1312,69 +545,26 @@
 								url: goPages + '&status=1'
 							});
 							break;
-						case "public":
-							//对公账户
-							return that.$util.Tips({
-								title: '下单成功,请上传支付凭证!'
-							}, {
-								tab: 5,
-								url: "/pages/users/order_list/index"
-							});
-							break;
 							// #ifdef H5
 						case 'h5':
 							let host = window.location.protocol + "//" + window.location.host;
 							let url =
-								`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&sale_type=${that.sale_type}`
+								`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}&source${that.source}`
 							let eUrl = encodeURIComponent(url)
 							let jsurl = jsConfig.mweb_url || jsConfig.h5_url
 							let locations = `${jsurl}&redirect_url=${eUrl}`
+							// 暂不跳转
 							setTimeout(() => {
 								location.href = locations;
 							}, 100);
 							break;
 							// #endif
-							// #ifdef APP-PLUS
-						case 'alipayApp':
-							uni.requestPayment({
-								provider: 'alipay',
-								orderInfo: jsConfig,
-								success: (e) => {
-									return that.$util.Tips({
-										title: '支付成功',
-										icon: 'success'
-									}, {
-										tab: 5,
-										url: goPages
-									});
-								},
-								fail: (e) => {
-									let pages = '/pages/order_pay_status/index?order_id=' +
-										orderId + '&msg=支付失败' + '&sale_type=' + that.sale_type
-									return that.$util.Tips({
-										title: '支付失败'
-									}, {
-										tab: 5,
-										url: pages
-									});
-								},
-								complete: () => {
-									uni.hideLoading();
-									let pages = '/pages/order_pay_status/index?order_id=' +
-										orderId + '&msg=取消支付' + '&sale_type=' + that.sale_type
-									return that.$util.Tips({
-										title: ''
-									}, {
-										tab: 5,
-										url: pages
-									});
-								},
-							});
-							break;
-							// #endif
 						default:
+							// 暂不跳转
 							let pages = '/pages/order_pay_status/index?order_id=' +
-								orderId + '&msg=取消支付' + '&sale_type=' + that.sale_type
+								orderId + '&msg=取消支付' + '&product_type=' + that.product_type + '&source=' +
+								that.source
+
 							return that.$util.Tips({
 								title: '取消支付'
 							}, {
@@ -1383,100 +573,30 @@
 							});
 					}
 				}).catch(err => {
-					uni.hideLoading();
 					return that.$util.Tips({
 						title: err
 					});
+					uni.hideLoading();
 				});
 			},
-			isEmojiCharacter: function(substring) {
-				if (substring) {
-					for (var i = 0; i < substring.length; i++) {
-						var hs = substring.charCodeAt(i);
-						if (0xd800 <= hs && hs <= 0xdbff) {
-							if (substring.length > 1) {
-								var ls = substring.charCodeAt(i + 1);
-								var uc = ((hs - 0xd800) * 0x400) + (ls - 0xdc00) + 0x10000;
-								if (0x1d000 <= uc && uc <= 0x1f77f) {
-									return true;
-								}
-							}
-						} else if (substring.length > 1) {
-							var ls = substring.charCodeAt(i + 1);
-							if (ls == 0x20e3) {
-								return true;
-							}
-						} else {
-							if (0x2100 <= hs && hs <= 0x27ff) {
-								return true;
-							} else if (0x2B05 <= hs && hs <= 0x2b07) {
-								return true;
-							} else if (0x2934 <= hs && hs <= 0x2935) {
-								return true;
-							} else if (0x3297 <= hs && hs <= 0x3299) {
-								return true;
-							} else if (hs == 0xa9 || hs == 0xae || hs == 0x303d || hs == 0x3030 ||
-								hs == 0x2b55 || hs == 0x2b1c || hs == 0x2b1b ||
-								hs == 0x2b50) {
-								return true;
-							}
-						}
-					}
-				}
-			},
-			bindDateChange(e) {
-				let that = this
-				that.$set(that.order_extend[that.virtualIndex], 'value', e.detail.value);
-			},
 
-			getTime(index) {
-				this.virtualIndex = index;
-			},
-
-			SubOrder: async function(e) {
+			SubOrder: async function() {
 				let that = this,
 					data = {};
-				
-				data = {
-					cart_id: this.cartId.split(","),
-					address_id: '',
-					use_coupon: this.subCoupon,
-					pay_type: this.payType,
-					mark: this.msgObj,
-					order_type: this.order_type,
-					key: this.order_key,
-					takes: this.take,
-          source: 999,
-					use_integral: this.use_integral,
-					receipt_data: this.invoiceData,
-					extend: this.extend,
-					post: this.post,
-					// #ifdef H5
-					return_url: 'http://' + window.location.host + '/pages/users/order_list/index',
-					// #endif
-				};
-				if (data.mark && this.isEmojiCharacter(data.mark[Object.keys(data.mark)[0]])) {
-					that.$util.Tips({
-						title: '备注不允许输入表情！'
-					});
-					return;
-				}
-				data.takes = []
-				this.cartInfo.map(el => {
-					if (el.isTake == 1 || el.order.isTake) {
-						data.takes.push(el.mer_id)
-					}
-				})
+				if (!that.payType) return that.$util.Tips({
+					title: '请选择支付方式'
+				});
 
-				if (data.pay_type == 'balance' && parseFloat(that.userInfo.now_money) < parseFloat(that.totalPrice))
+
+				if (that.payType == 'balance' && +this.userInfo.now_money < +this.payForm.money) {
 					return that.$util.Tips({
-						title: '余额不足！'
+						title: '余额不足，请选择其他的支付方式！'
 					});
-
+				}
+				this.payForm.pay_type = that.payType;
 
 				// 设置支付密码
-				if (data.pay_type == 'balance' || data.pay_type == 'merBalance') {
-					this.orderData = data;
+				if (that.payType == 'balance' || that.payType == 'merBalance') {
 
 					// 是否输入密码
 					const result = await this.$util.checkPassword();
@@ -1490,9 +610,12 @@
 						})
 					}
 
-					//已设置 输入密码
 					this.$refs.popups.handleOpen();
-				} else { //无须支付密码
+				} else {
+					uni.showLoading({
+						title: '订单支付中',
+						mask: true
+					});
 					this.truePayOrder(data);
 				}
 			},
@@ -1502,19 +625,19 @@
 				const result = await this.$util.checkPassword(e);
 				// 验证密码正确
 				if (result.data.code == 100) {
-					this.$set(this.orderData, 'withdrawal_pwd', e);
+					this.$set(this.payForm, 'withdrawal_pwd', e);
 					uni.showLoading({
 						title: '订单支付中',
 						mask: true
 					});
-					this.truePayOrder(this.orderData);
+					this.truePayOrder(this.payForm);
 				} else {
 					this.$refs.payPwd.handleOpen(result.data.code);
 				}
 			},
 
 			// 弹框左边按钮 101 未设置密码  102 忘记密码 都去设置密码
-			handleLeft() {
+			handleLeft(code) {
 				uni.navigateTo({
 					url: "/pages/users/user_modify_pwd/index?type=payPwd"
 				});
@@ -1531,256 +654,25 @@
 				}
 			},
 
-			// 提交订单
-			truePayOrder(data) {
-				if (!data) data = this.orderData;
-
-				// #ifdef MP
-				openPaySubscribe().then(() => {
-					that.payment(data);
-				});
-				// #endif
-				// #ifndef MP
-				this.payment(data);
-				// #endif
-			},
-
 			handleClear() {},
 			handleChange() {},
 
-			// 打开配送方式弹窗
-			openShowBox(item, index) {
-				if (item.delivery_way.length == 2 && this.order_model != 2) {
-					this.activeObj = item
-					this.activeIndex = index
-					this.isShowBox = true
-					this.getDeliveryType(item.order)
-				}
-			},
-			// 获取快递方式
-			getDeliveryType(item) {
-				if (item.allow_delivery && item.allow_take) {
-					this.radioList = [{
-							title: this.deliveryName,
-							check: true
-						},
-						{
-							title: '到店核销',
-							check: false
-						}
-					]
-				} else if (item.allow_delivery && !item.allow_take) {
-					this.radioList = [{
-						title: this.deliveryName,
-						check: true
-					}]
-				} else if (!item.allow_delivery && item.allow_take) {
-					this.radioList = [{
-						title: '到店核销',
-						check: false
-					}]
-				}
-			},
-			boxClose() {
-				this.isShowBox = false
-			},
-			getData(data) {
-				this.cartInfo[this.activeIndex] = data
-				if (data.order.isTake) {
-					this.take.push(data.mer_id)
-				} else {
-					this.take.forEach((item, i) => {
-						if (data.mer_id == item) {
-							this.take.splice(i, 1)
-						}
-					})
-				}
-				this.isShowBox = false
-				this.getConfirm(this.addressId);
-			},
-			//查看内置地图
-			goMap(item) {
-				let that = this;
-				let lat = Number(item.take.mer_take_location[0]),
-					long = Number(item.take.mer_take_location[1])
-				//#ifdef H5
-				if (that.$wechat.isWeixin() === true) {
-					that.$wechat.seeLocation({
-						latitude: lat,
-						longitude: long,
-						name: item.mer_name,
-						address: item.take ? item.take.mer_take_address : '',
-					}).then(res => {})
-				} else {
-					//#endif
-					uni.openLocation({
-						latitude: parseFloat(lat),
-						longitude: parseFloat(long),
-						scale: 8,
-						name: item.mer_name,
-						address: item.take ? item.take.mer_take_address : '',
-						success: function(res) {
-							that.go_map = true
-						},
-					});
-					// #ifdef H5
-				}
-				//#endif
+			truePayOrder() {
+				// #ifdef MP
+				openPaySubscribe().then(() => {
+					that.payment(this.payForm);
+				});
+				// #endif
+
+				// #ifndef MP
+				this.payment(this.payForm);
+				// #endif
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
-	/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-		border: 1px solid var(--view-theme) !important;
-		background-color: var(--view-theme) !important;
-		color: #fff !important;
-	}
-
-	/deep/radio .wx-radio-input.wx-radio-input-checked,
-	/deep/uni-radio .uni-radio-input.uni-radio-input-checked {
-		border: 1px solid var(--view-theme) !important;
-		background-color: var(--view-theme) !important;
-	}
-
-	.order-submission .line {
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 3rpx;
-	}
-
-	.order-submission .line image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-
-	.order-submission .address {
-		padding: 28rpx 30rpx;
-		background-color: #fff;
-		box-sizing: border-box;
-	}
-
-	.order-submission .address .addressCon {
-		width: 610rpx;
-		font-size: 26rpx;
-		color: #666;
-	}
-
-	.order-submission .address .addressCon .name {
-		font-size: 30rpx;
-		color: #282828;
-		font-weight: bold;
-		margin-bottom: 10rpx;
-	}
-
-	.order-submission .address .addressCon .name .phone {
-		margin-left: 50rpx;
-	}
-
-	.order-submission .address .addressCon .default {
-		margin-right: 12rpx;
-	}
-
-	.t-color {
-		color: #40AE36;
-	}
-
-	.order-submission .address .addressCon .setaddress {
-		color: #333;
-		font-size: 28rpx;
-	}
-
-	.order-submission .address .iconfont {
-		font-size: 35rpx;
-		color: #707070;
-	}
-
-	.order-submission .allAddress {
-		width: 100%;
-	}
-
-	.order-submission .allAddress .nav {
-		width: 710rpx;
-		margin: 0 auto;
-	}
-
-	.order-submission .allAddress .nav .item {
-		width: 355rpx;
-	}
-
-	.order-submission .allAddress .nav .item.on {
-		position: relative;
-		width: 250rpx;
-	}
-
-	.order-submission .allAddress .nav .item.on::before {
-		position: absolute;
-		bottom: 0;
-		content: "快递配送";
-		font-size: 28rpx;
-		display: block;
-		height: 0;
-		width: 336rpx;
-		border-width: 0 20rpx 80rpx 0;
-		border-style: none solid solid;
-		border-color: transparent transparent #fff;
-		z-index: 2;
-		border-radius: 7rpx 30rpx 0 0;
-		text-align: center;
-		line-height: 80rpx;
-	}
-
-	.order-submission .allAddress .nav .item:nth-of-type(2).on::before {
-		content: "到店核销";
-		border-width: 0 0 80rpx 20rpx;
-		border-radius: 30rpx 7rpx 0 0;
-	}
-
-	.order-submission .allAddress .nav .item.on2 {
-		position: relative;
-	}
-
-	.order-submission .allAddress .nav .item.on2::before {
-		position: absolute;
-		bottom: 0;
-		content: "到店核销";
-		font-size: 28rpx;
-		display: block;
-		height: 0;
-		width: 400rpx;
-		border-width: 0 0 60rpx 60rpx;
-		border-style: none solid solid;
-		border-color: transparent transparent #f7c1bd;
-		border-radius: 40rpx 6rpx 0 0;
-		text-align: center;
-		line-height: 60rpx;
-	}
-
-	.order-submission .allAddress .nav .item:nth-of-type(1).on2::before {
-		content: "快递配送";
-		border-width: 0 60rpx 60rpx 0;
-		border-radius: 6rpx 40rpx 0 0;
-	}
-
-	.order-submission .allAddress .address {
-		height: 150rpx;
-		margin: 0 auto;
-	}
-
-	.order-submission .allAddress .line {
-		margin: 0 auto;
-	}
-
-	.order-submission .wrapper .item .discount .placeholder {
-		color: #ccc;
-		text-align: right;
-	}
-
 	.order-submission .wrapper {
 		margin-bottom: 12rpx;
 		background-color: #fff;
@@ -1801,7 +693,7 @@
 	}
 
 	.order-submission .virtual_form .item-require {
-		color: #40AE36;
+		color: red;
 		margin-right: 4rpx;
 	}
 
@@ -1810,19 +702,6 @@
 		padding: 27rpx 0;
 	}
 
-	.order-submission .virtual_form .item.on .discount {
-		max-width: 460rpx;
-	}
-
-	.order-submission .virtual_form .item.pd0 {
-		padding-bottom: 0;
-	}
-
-	.order-submission .virtual_form .item .radio {
-		margin: 0 22rpx 0 22rpx;
-		padding: 10rpx 0;
-	}
-
 	.upload {
 		display: -webkit-box;
 		display: -moz-box;
@@ -1844,7 +723,7 @@
 		position: relative;
 		font-size: 11px;
 		color: #bbb;
-		border-radius: 8rpx;
+		border-radius: 3rpx;
 
 		&:nth-child(4n) {
 			margin-right: 0;
@@ -1859,6 +738,7 @@
 		image {
 			width: 100%;
 			height: 100%;
+			border-radius: 1px;
 
 			img {
 				-webkit-touch-callout: none;
@@ -1873,33 +753,8 @@
 				height: 100%;
 			}
 		}
-
-		.icon-guanbi4 {
-			color: #fff;
-			font-size: 14rpx;
-			position: absolute;
-			top: 0;
-			right: 0;
-			width: 30rpx;
-			height: 30rpx;
-			text-align: center;
-			line-height: 30rpx;
-			border-radius: 0 8rpx 0 8rpx;
-			background: rgba(0, 0, 0, .6);
-		}
 	}
 
-	.vipImg {
-		width: 65rpx;
-		height: 28rpx;
-		margin-left: 4rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-			display: block;
-		}
-	}
 
 	.order-submission .wrapper .item .discount {
 		font-size: 30rpx;
@@ -1925,23 +780,6 @@
 		margin-right: 20rpx;
 	}
 
-	.order-submission .wrapper .item .shipping {
-		font-size: 30rpx;
-		color: #999;
-		position: relative;
-		padding-right: 58rpx;
-	}
-
-	.order-submission .wrapper .item .shipping .iconfont {
-		font-size: 35rpx;
-		color: #707070;
-		position: absolute;
-		right: 0;
-		top: 50%;
-		transform: translateY(-50%);
-		margin-left: 30rpx;
-	}
-
 	.order-submission .wrapper .item input {
 		flex: 1;
 		height: 100%;
@@ -1969,14 +807,14 @@
 	}
 
 	.order-submission .wrapper .item .list .payItem.on {
-		border-color: #40AE36;
-		color: #40AE36;
+		border-color: var(--view-theme);
+		color: var(--view-theme);
 	}
 
 	.order-submission .wrapper .item .list .payItem .name {
 		width: 50%;
 		text-align: center;
-		border-right: 1px solid #40AE36;
+		border-right: 1px solid #eee;
 		justify-content: left;
 		padding-left: 80rpx;
 	}
@@ -2024,9 +862,7 @@
 	}
 
 	.order-submission .moneyList .item .money {
-		color: #40AE36;
-		display: flex;
-		align-items: center;
+		color: #868686;
 	}
 
 	.order-submission .footer {
@@ -2067,7 +903,7 @@
 	}
 
 	.pColor {
-		color: #40AE36;
+		color: var(--view-priceColor);
 	}
 
 	.order-submission .footer .settlement {
@@ -2075,7 +911,7 @@
 		color: #fff;
 		width: 240rpx;
 		height: 70rpx;
-		background-color: #40AE36;
+		background-color: var(--view-theme);
 		border-radius: 50rpx;
 		text-align: center;
 		line-height: 70rpx;
@@ -2085,22 +921,6 @@
 		}
 	}
 
-	.footer .transparent {
-		opacity: 0
-	}
-
-	.event_bg {
-		background: #FF7F00;
-	}
-
-	.event_color {
-		color: #FF7F00;
-	}
-
-	.color_red {
-		color: var(--view-theme);
-	}
-
 	.storeinfo-wrapper {
 		.store-item {
 			margin-top: 12rpx;
@@ -2167,22 +987,6 @@
 						}
 					}
 
-					.event_name {
-						display: inline-block;
-						margin-right: 9rpx;
-						color: #fff;
-						font-size: 20rpx;
-						padding: 0 8rpx;
-						line-height: 30rpx;
-						text-align: center;
-						border-radius: 6rpx;
-					}
-
-					.event_ship {
-						font-size: 20rpx;
-						margin-top: 10rpx;
-					}
-
 					.label {
 						margin-top: 10rpx;
 						color: #868686;
@@ -2191,7 +995,7 @@
 
 					.price {
 						margin-top: 20rpx;
-						color: #40AE36;
+						color: var(--view-priceColor);
 						position: relative;
 
 						text {
@@ -2208,112 +1012,9 @@
 							}
 						}
 					}
-
-					.err-txt {
-						display: flex;
-						align-items: center;
-						margin-top: 18rpx;
-						color: $theme-color;
-
-						.iconfont {
-							margin-right: 10rpx;
-						}
-					}
 				}
 			}
 		}
-
-		.event_payTime {
-			padding: 0 30rpx 24rpx;
-
-			.event_progress {
-				margin-top: 50rpx;
-				position: relative;
-			}
-
-			.progress_step {
-				height: 80rpx;
-				position: relative;
-				padding-left: 60rpx;
-
-				&::before {
-					content: '';
-					display: block;
-					width: 2rpx;
-					height: 40rpx;
-					background: var(--view-theme);
-					position: absolute;
-					left: 35rpx;
-					top: 18rpx;
-				}
-
-				&:nth-child(2) {
-					&::before {
-						bottom: 64rpx;
-						top: auto;
-						background: #EFEFEF;
-					}
-
-					&::after {
-						background: #EFEFEF;
-					}
-				}
-
-				&::after {
-					content: '';
-					display: block;
-					width: 14rpx;
-					height: 14rpx;
-					background: var(--view-theme);
-					border-radius: 50%;
-					position: absolute;
-					top: 10rpx;
-					left: 29rpx;
-				}
-
-				.name {
-					float: left;
-					color: #282828;
-
-					&.color_red {
-						color: var(--view-theme);
-					}
-				}
-
-				.price {
-					float: right;
-					color: #282828;
-
-					&.color_red {
-						color: var(--view-priceColor);
-					}
-				}
-			}
-
-			.progress_pay {
-				padding-left: 60rpx;
-				font-size: 24rpx;
-				color: #868686;
-				margin-top: -34rpx;
-			}
-		}
-	}
-
-	.integral_checked {
-		margin-left: 10rpx;
-		display: inline;
-
-		.iconfont {
-			font-size: 38rpx;
-		}
-
-		.icon-weixuanzhong {
-			color: #BFBFBF;
-		}
-
-		.icon-xuanzhong1 {
-			color: var(--view-theme);
-		}
 	}
 
 	uni-checkbox-group,
@@ -2325,22 +1026,17 @@
 		}
 	}
 
-	.icon-wenhao1 {
-		color: #868686;
-		margin-right: 6rpx;
-	}
-
 	.total {
 		display: flex;
 		justify-content: flex-end;
 		padding-right: 30rpx;
 		padding-bottom: 30rpx;
 		font-size: 26rpx;
-		color: #40AE36;
+		color: #282828;
 
 		.price {
 			margin-left: 10rpx;
-			color: #40AE36;
+			color: var(--view-priceColor);
 			font-size: 28rpx;
 			font-weight: bold;
 
@@ -2350,127 +1046,12 @@
 		}
 	}
 
-	.store-address {
-		padding: 30rpx 23rpx;
-		margin: 0 30rpx;
-		background: #F6F6F6;
-		border-radius: 8rpx;
-		font-size: 24rpx;
-		display: -webkit-box;
-		display: -moz-box;
-		display: -ms-flexbox;
-		display: -webkit-flex;
-		display: flex;
-		/*垂直居中*/
-		-webkit-box-align: center;
-		/*旧版本*/
-		-moz-box-align: center;
-		/*旧版本*/
-		-ms-flex-align: center;
-		/*混合版本*/
-		-webkit-align-items: center;
-		/*新版本*/
-		align-items: center;
-
-		/*新版本*/
-		.name {
-			width: 148rpx;
-			margin-right: 20rpx;
-		}
-
-		.info {
-			flex: 1;
-		}
-
-		.map {
-			text-align: center;
-			padding-left: 40rpx;
-			position: relative;
-
-			&::before {
-				content: '';
-				display: inline-block;
-				width: 2rpx;
-				height: 42rpx;
-				background-color: #DDDDDD;
-				position: absolute;
-				left: 0;
-				top: 18rpx;
-			}
-
-			.iconfont {
-				color: #40AE36;
-			}
-
-			.map_text {
-				color: #40AE36;
-			}
-		}
-	}
-
-	.settlementAgreement {
-		width: 100%;
-		height: 100%;
-		position: fixed;
-		top: 0;
-		left: 0;
-		background: rgba(0, 0, 0, .5);
-		z-index: 40;
-	}
-
-	.settlementAgreement .setAgCount {
-		background: #fff;
-		width: 656rpx;
-		height: 458px;
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		border-radius: 12rpx;
-		-webkit-border-radius: 12rpx;
-		padding: 52rpx;
-		-webkit-transform: translate(-50%, -50%);
-		-moz-transform: translate(-50%, -50%);
-		transform: translate(-50%, -50%);
-		overflow: hidden;
-
-		.content {
-			height: 900rpx;
-			overflow-y: scroll;
-
-			/deep/ p {
-				font-size: 13px;
-				line-height: 22px;
-			}
-
-			/deep/ img {
-				max-width: 100%;
-			}
-		}
-	}
-
-	.settlementAgreement .setAgCount .icon {
-		font-size: 42rpx;
-		color: #b4b1b4;
-		position: absolute;
-		top: 15rpx;
-		right: 15rpx;
-	}
-
-	.settlementAgreement .setAgCount .title {
-		color: #333;
-		font-size: 32rpx;
-		text-align: center;
-		font-weight: bold;
-	}
-
-	.settlementAgreement .setAgCount .content {
-		margin-top: 32rpx;
-		color: #333;
-		font-size: 26rpx;
-		line-height: 22px;
-		text-align: justify;
-		text-justify: distribute-all-lines;
-		height: 756rpx;
-		overflow-y: scroll;
+	.red_packet {
+		color: #ff5c2d !important;
+		background-color: rgba(#ff5c2d, 0.3);
+		border-radius: 60rpx;
+		padding: 5rpx 10rpx;
+		padding-left: 20rpx;
+		font-size: 25rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/payment/settlement.vue b/pages/payment/settlement.vue
index 9996d22..5c3176a 100644
--- a/pages/payment/settlement.vue
+++ b/pages/payment/settlement.vue
@@ -3,34 +3,110 @@
 		<view class='order-submission'>
 			<!-- 商品信息 -->
 			<view class="storeinfo-wrapper">
-				<view class="store-item">
+				<view class="store-item" v-for="(item,index) in cartInfo" :key="index">
 					<view class="store-title">
 						<text class="iconfont icon-shangjiadingdan"></text>
-						<view class="txt" @click="goStore(item.mer_id)">{{payForm.merName}}</view>
+						<view class="txt" @click="goStore(item.mer_id)">{{item.mer_name}}</view>
 						<text class="iconfont icon-xiangyou"></text>
 					</view>
-
-					<block v-for="(item,indx) in productData" :key="indx">
-						<view class="product-item">
-							<view class="img-box">
-								<image :src="item.image" width="170rpx" height="180rpx" />
-							</view>
-							<view class="content event_content">
-								<view class="name line1">
-									{{item.store_name}}
+					<view v-for="(goods,j) in item.list" :key="j">
+						<view v-if="goods.product_type == 2">
+							<view class="product-item">
+								<view class="img-box">
+									<image :src="goods.productPresellAttr.image || goods.product.image"></image>
 								</view>
-								<view style="margin-top: 30rpx;color: #FF5C2D;">
-									￥{{item.price}}
+								<view class="content event_content">
+									<view class="name line1"><text
+											class="event_name event_bg">预售</text>{{goods.productPresell.store_name}}
+									</view>
+									<view class="label" style="width: 70%;">{{goods.productAttr.sku}}</view>
+									<view class="price">
+										￥{{goods.productPresellAttr.presell_price}}
+										<text>X{{goods.cart_num}}</text>
+									</view>
+									<view class="event_ship event_color">发货时间：
+										<!--全款预售-->
+										<text
+											v-if="goods.productPresell.presell_type === 1">{{goods.productPresell.delivery_type === 1 ? '支付后' : '预售结束后'}}{{ goods.productPresell.delivery_day }}天内</text>
+										<!--定金预售-->
+										<text
+											v-if="goods.productPresell.presell_type === 2">{{ goods.productPresell.delivery_type === 1 ? '付尾款后' : '预售结束后' }}{{ goods.productPresell.delivery_day }}天内</text>
+									</view>
+									<view class="err-txt" v-if="goods.undelivered && addressInfo.real_name">
+										<text class="iconfont icon-zhuyi-copy"></text>
+										<view class="txt">此商品不支持该区域配送</view>
+									</view>
+								</view>
+							</view>
+							<view v-if="goods.productPresell.presell_type === 2" class="event_payTime">
+								<view class="event_progress">
+									<view class="progress_step">
+										<text class="name color_red">定金</text>
+										<text
+											class="price color_red">￥{{ (goods.productPresellAttr.down_price * goods.cart_num).toFixed(2) }}</text>
+									</view>
+									<view class="progress_step">
+										<text class="name">尾款</text>
+										<text
+											class="price">￥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}</text>
+									</view>
+									<view class="progress_pay">
+										{{ goods.productPresell.final_start_time | filterDay}}开始支付尾款
+									</view>
 								</view>
 							</view>
 						</view>
-					</block>
+						<view v-else>
+							<view class="product-item">
+								<view class="img-box">
+									<image :src="goods.productAttr.image || goods.product.image"></image>
+								</view>
+								<view class="content">
+									<view class="name line1">{{goods.product.store_name}}</view>
+									<view class="label">{{goods.productAttr.sku}}</view>
+									<view class="price acea-row row-between">
+										<view class="acea-row row-middle">
+											<block v-if="order_type == 3">
+												￥{{goods.productAssistAttr.assist_price}}
+											</block>
+											<block v-else-if="order_type == 4">
+												￥{{goods.activeSku.active_price}}
+											</block>
+											<block v-else>
+												￥{{goods.productAttr.price}}
+											</block>
+											<text>X{{goods.cart_num}}</text>
+											<view v-if="goods.productAttr.show_svip_price" class="vipImg">
+												<image :src="`${domain}/static/images/svip.png`"></image>
+											</view>
+										</view>
+										<view class="delivery_type">
+											<text v-if="!goods.allow_delivery">不支持快递</text>
+											<text v-if="!goods.allow_take">不支持到店核销</text>
+										</view>
+									</view>
+									<view class="err-txt" v-if="goods.undelivered && addressInfo.real_name">
+										<text class="iconfont icon-zhuyi-copy"></text>
+										<view class="txt">此商品不支持该区域配送</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="settlementAgreement" v-if="showProtocol">
+				<view class="setAgCount">
+					<i class="icon iconfont icon-cha" @click="showProtocol = false"></i>
+					<div class="title">{{agrementTtile}}</div>
+					<view class="content">
+						<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
+					</view>
 				</view>
 			</view>
-
 			<view class='wrapper'>
 				<view class='item'>
-					<view style="font-weight: bold;">支付方式</view>
+					<view>支付方式</view>
 					<view class='list'>
 						<!-- #ifdef H5 -->
 						<view class='payItem acea-row row-middle' :class='active==index ?"on":""' @tap='payItem(index)'
@@ -45,6 +121,9 @@
 								<block v-if="item.value == 'balance'">
 									{{userInfo.now_money}}
 								</block>
+								<block v-else-if="item.value == 'merBalance'">
+									{{moneyInfo.extract_money}}
+								</block>
 							</view>
 						</view>
 						<!-- #endif -->
@@ -61,101 +140,204 @@
 								<block v-if="item.value == 'balance'">
 									{{userInfo.now_money}}
 								</block>
+								<block v-else-if="item.value == 'merBalance'">
+									{{moneyInfo.extract_money}}
+								</block>
 							</view>
 						</view>
 						<!-- #endif -->
 					</view>
 				</view>
 			</view>
-
 			<view class='moneyList'>
 				<view class='item acea-row row-between-wrapper'>
 					<view>商品总价：</view>
-					<view class='money'>￥{{payForm.money}}</view>
+					<view class='money'>￥{{proPrice}}</view>
 				</view>
-
-				<view class='item acea-row row-between-wrapper'>
-					<view>补贴抵扣</view>
-					<block v-if="platformConsumption.length > 0">
-						<view class='discount money red_packet' @click="couponTap3()">
-							<text v-if="consumption_id">-￥{{consumption_money||'0.00'}}</text>
-							<text v-else>有补贴补贴未选</text>
+				<view class='item acea-row row-between-wrapper' v-if="couponData.order_total_postage > 0">
+					<view>运费：</view>
+					<view class='money'>￥{{couponData.order_total_postage}}</view>
+				</view>
+				<view class='item acea-row row-between-wrapper' v-if="coupon_price > 0">
+					<view>店铺优惠金额：</view>
+					<view class='money'>-￥{{coupon_price}}</view>
+				</view>
+				<view class='item acea-row row-between-wrapper'
+					v-if="open_integral && userInfo.integral>0 && order_type == 0">
+					<view>积分抵扣：</view>
+					<view class='money'>
+						<text v-if="!use_integral">当前积分<text class="pColor">{{userInfo.integral}}</text></text>
+						<text v-else>使用了{{integral_count}}个积分，抵扣<text class="pColor">{{integral_price}}元</text></text>
+						<view class="checkbox integral_checked" @click="changeIntegral">
+							<view class="iconfont icon-weixuanzhong" v-if="!use_integral"></view>
+							<view class='iconfont icon-xuanzhong1' v-else></view>
+						</view>
+					</view>
+				</view>
+				<view class='item acea-row row-between-wrapper'
+					v-if="!seckillId && order_type != 3 && order_type != 4 && enabledPlatformCoupon">
+					<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
+					<block v-if="platformCoupon.length > 0">
+						<view class='discount money' @tap='couponTap2(platformCoupon,0)'>
+							<text v-if="total_platform_coupon_price>0">优惠￥{{total_platform_coupon_price}}</text>
+							<text v-else>暂未选择优惠券</text>
 							<text class='iconfont icon-jiantou'></text>
 						</view>
 					</block>
 					<block v-else>
-						<view class='discount'>暂无抵扣红包</view>
+						<view class='discount'>暂无优惠券</view>
 					</block>
 				</view>
+				<view class='item acea-row row-between-wrapper' v-if="priceGroup.storePostage > 0">
+					<view>运费：</view>
+					<view class='money'>+￥{{priceGroup.storePostage}}</view>
+				</view>
 			</view>
 			<view style='height:140rpx;'></view>
-
 			<view class='footer acea-row row-between-wrapper'>
 				<view class="footer_count">
 					<view>
 						合计:
-						<text class='pColor' v-if="cartArr[4].payStatus == 1 && active == 4">￥0.00</text>
-						<text class='pColor' v-else>￥{{ total_coupon }}</text>
+						<text class='pColor'>￥{{totalPrice || 0}}</text>
+					</view>
+					<view class="coupon_price" v-if="couponData.total_coupon > 0">
+						优惠:¥ {{couponData.total_coupon}}
+						<text @click="openDiscount">优惠明细</text>
 					</view>
 				</view>
-				<view class='settlement' :class='couponData.status != "noAddress" ? "" : "disabled"' style='z-index:100'
-					@tap="SubOrder">{{couponData.status != "noAddress" ? '提交订单':'选择地址'}}</view>
+				<view class='settlement' style='z-index:100'
+					@tap="SubOrder">{{'提交订单'}}</view>
 			</view>
-
-
-			<!-- 支付密码 键盘 -->
-			<popups ref="popups" :isPay="true" @confirm="handleConfirm" @clear="handleClear" @change="handleChange" />
-
-			<!-- 密码错误事件处理 -->
-			<payPwd ref="payPwd" @left="handleLeft" @right="handleRight"></payPwd>
 		</view>
+		<block v-if="coupon.status">
+			<couponListWindow :coupon='coupon' :couponTitle="plantCoupon ? '平台优惠券' : '优惠券'"
+				@ChangCouponsClose="ChangCouponsClose" @getCoupon="getCoupon" :openType='openType'
+				:coupon_amount='coupon_amount' :coupon_number='coupon_number'></couponListWindow>
+		</block>
+		<addressWindow ref="addressWindow" @changeTextareaStatus="changeTextareaStatus" :address='address'
+			:pagesUrl="pagesUrl" @OnChangeAddress="OnChangeAddress" @changeClose="changeClose"></addressWindow>
+		<addInvoicing ref="addInvoicing" @changeInvoiceClose="changeInvoiceClose" :invoice='invoice'></addInvoicing>
+		<block v-if="isShowBox">
+			<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj"
+				:radioList="radioList" @close="boxClose" @confirmBtn="getData">
+			</checkDelivery>
+		</block>
+		<!--优惠明细弹窗-->
+		<discountDetails :isShowDiscount="isShowDiscount" @close="closeDiscount" :couponData="couponData">
+		</discountDetails>
+		<timeranges :isShow='isShow' :time='timeranges' @confrim="confrim" @cancel="cancels"></timeranges>
+		<areaWindow ref="areaWindow" :display="display" :address='addressInfoArea' :cityShow='cityShow'
+			@submit="OnAreaAddress" @changeClose="changeAddressClose"></areaWindow>
+
+		<!-- 支付密码 键盘 -->
+		<popups ref="popups" :isPay="true" @confirm="handleConfirm" @clear="handleClear" @change="handleChange" />
+
+		<!-- 密码错误事件处理 -->
+		<payPwd ref="payPwd" @left="handleLeft" @right="handleRight"></payPwd>
 	</view>
 </template>
 <script>
 	// +----------------------------------------------------------------------
 	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
 	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// | Copyright (c) 2016~2023 https://www.crmeb.com All rights reserved.
 	// +----------------------------------------------------------------------
 	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 	// +----------------------------------------------------------------------
 	// | Author: CRMEB Team <admin@crmeb.com>
 	// +----------------------------------------------------------------------
+
 	let app = getApp();
+	const CACHE_CITY = {};
 	import {
 		orderConfirm,
-		createOrder
+		getOrderConfirm,
+		getCouponsOrderPrice,
+		orderCreate,
+		createOrder,
+		verifyPwd
 	} from '@/api/order.js';
 	import {
+		getAddressDefault,
+		getAddressDetail,
+		getAddressList,
 		getUserInfo,
+		getAdminApplyAPI,
+		getAgreementApi
 	} from '@/api/user.js';
+	import {
+		getProSysForm
+	} from '@/api/product.js';
 	import {
 		openPaySubscribe
 	} from '@/utils/SubscribeMessage.js';
+	import {
+		presellAgreement
+	} from '@/api/activity.js';
+	import {
+		storeListApi
+	} from '@/api/store.js';
+	import {
+		CACHE_LONGITUDE,
+		CACHE_LATITUDE
+	} from '@/config/cache.js';
+	import couponListWindow from '@/components/orderCoupon';
+	import addressWindow from '@/components/addressWindow';
+	import orderGoods from '@/components/orderGoods';
+	import checkDelivery from '@/components/checkDelivery/index.vue';
+	import discountDetails from '@/components/discountDetails/index.vue';
+	import addInvoicing from '@/components/addInvoicing';
+	import parser from "@/components/jyf-parser/jyf-parser";
+	import payPwd from "@/components/payPwd/index.vue";
+  import {
+  	orderPay,
+  	orderCheck
+  } from "@/api/payment.js";
 	import {
 		mapGetters
 	} from "vuex";
+	import {
+		toLogin
+	} from '@/libs/login.js';
 	import {
 		configMap
 	} from '@/utils';
 	import {
-		orderPay,
-		orderCheck
-	} from "@/api/payment.js";
-	import {
-		verifyPwd
-	} from '@/api/order.js';
-	import payPwd from "@/components/payPwd/index.vue";
+		HTTP_REQUEST_URL
+	} from '@/config/app';
+	import dayjs from "@/plugin/dayjs/dayjs.min.js";
+	import areaWindow from '@/components/areaWindow';
+	import timeranges from '@/components/timeranges';
 	import popups from "@/components/popups/index.vue";
-
 	export default {
 		components: {
 			payPwd,
+			couponListWindow,
+			addressWindow,
+			orderGoods,
+			checkDelivery,
+			addInvoicing,
+			discountDetails,
+			"jyf-parser": parser,
+			areaWindow,
+			timeranges,
 			popups
 		},
+		filters: {
+			filterDay(val) {
+				if (val) {
+					var reg = /(\d{4})\-(\d{2})\-(\d{2})/;
+					var date = val.replace(reg, "$2月$3日");
+					return date
+				}
+			}
+		},
 		data() {
 			return {
-				platformConsumption: [],
+				// 备注
+				msgObj: {},
+				textareaStatus: true,
+				deliveryName: '快递配送',
 				//支付方式
 				cartArr: [{
 						"name": "微信支付",
@@ -183,19 +365,27 @@
 						title: '可用余额:',
 						payStatus: this.$store.getters.globalData.yue_pay_status,
 					},
+					{
+						"name": "商户余额",
+						"icon": "icon-yue2",
+						value: 'merBalance',
+						title: '可用余额:',
+						payStatus: 2,
+					},
 					{
 						"name": "线下支付",
 						"icon": "icon-yinhangqia",
 						value: 'offline',
 						title: '线下支付',
 						payStatus: 2,
-					}, {
-						"name": "先货后款",
-						"icon": "tan-a-lujing17324",
-						value: 'creditBuy',
-						title: `结算周期：${this.settle_cycle}天 日利率：${this.interest_rate}%`,
-						payStatus: '',
 					},
+					{
+						"name": "对公转账",
+						"icon": "icon-yinhangqia",
+						value: 'public',
+						title: '对公转账',
+						payStatus: 1,
+					}
 				],
 				tagStyle: {
 					img: 'width:100%;display:block;',
@@ -209,119 +399,134 @@
 					check: false
 				}],
 				payType: 'weixin', //支付方式
+				openType: 1, //优惠券打开方式 1=使用
 				active: 0, //支付方式切换
+				coupon: {
+					status: false,
+					list: [],
+					statusTile: '立即使用'
+				}, //优惠券组件
 				address: {
 					address: false
 				}, //地址组件
+				addressInfo: {}, //地址信息
+				invoice: {
+					invoice: false,
+					mer_id: 0,
+					add: true
+				}, //发票组件
+				invoiceData: {}, // 发票数据
+				pinkId: 0, //拼团id
+				addressId: 0, //地址id
 				couponId: 0, //优惠券id
 				cartId: '', //购物车id
+				BargainId: 0,
+				combinationId: 0,
+				seckillId: 0,
 				userInfo: {}, //用户信息
+				post: {},
+				mark: '', //备注信息
+				couponTitle: '请选择', //优惠券
 				coupon_price: 0, //优惠券抵扣金额
+				useIntegral: false, //是否使用积分
+				integral_price: 0, //积分抵扣金额
+				integral: 0,
 				ChangePrice: 0, //使用积分抵扣变动后的金额
 				formIds: [], //收集formid
 				status: 0,
 				is_address: false,
 				toPay: false, //修复进入支付时页面隐藏从新刷新页面
+				shippingType: 0,
+				system_store: {},
+				storePostage: 0,
+				contacts: '',
+				contactsTel: '',
+				mydata: {},
+				storeList: [],
+				store_self_mention: 0,
 				cartInfo: [],
 				priceGroup: {},
 				animated: false,
 				totalPrice: 0,
+				use_integral: false,
+				pagesUrl: "",
+				orderKey: "",
 				offlinePostage: "",
-
 				from: '',
 				orderStatus: '', //是否有地址
 				couponIndex: 0, //选择商铺优惠券索引
 				subCoupon: {}, //提交订单使用的优惠券
+				proPrice: 0, //商品总价
+				isShowBox: false,
+				activeObj: {}, //选中店铺信息
+				activeIndex: '', // 选中店铺索引
+				invoiceName: '不开发票',
+				invoice_func: false,
+				special_invoice: false,
+				isAgree: false,
+				showProtocol: false,
+				isCoupon: false,
+				protocol: '',
+				order_type: 0,
+				addInvoice: {},
 				couponData: {},
+				go_map: false,
 				orderPay: false,
+				take: [],
+				open_integral: 0,
+				coupon_number: 0,
+				store_coupon_number: 0,
+				coupon_amount: 0,
+				store_coupon_amount: 0,
+				plant_coupon_amount: 0,
+				integral_count: '',
+				agrementTtile: '发票说明',
 				pics: [],
-				extend: [],
+				order_model: 2,
+				allow_address: true,
+				order_extend: [],
+				order_form: [],
+				extend: {},
 				virtualIndex: 0,
 				platformCoupon: [],
 				total_platform_coupon_price: 0,
 				enabledPlatformCoupon: false,
 				plantCoupon: false,
+				isShowDiscount: false,
 				order_key: '',
-				product_type: '',
-				source: null,
-				settle_cycle: '', // 周期
-				type_id: '', //店铺类型
-				consumption_id: '', //补贴id
-				consumption_money: '', //补贴抵扣金额
-				total_coupon: '', //合计
-				payForm: {
-					cart_id: '',
-					address_id: '',
-					consumption_id: '',
-					use_coupon: '',
-					takes: '',
-					use_integral: '',
-					receipt_data: [],
-					mark: '',
-					pay_type: '',
-					money: '',
-					merName: '',
-					return_url: '',
-					key: '',
-					source: 999,
-				},
-				checkForm: {
-					address_id: '',
-					cart_id: [],
-					consumption_id: '',
-					product_type: 0,
-					source: 999,
-					takes: [],
-					use_coupon: {},
-					use_integral: false,
-					key: ''
-				},
-				productData: [],
-				orderData: {}
+				is_take: '',
+				domain: HTTP_REQUEST_URL,
+				timerangesIndex: 0,
+				newImg: [],
+				display: false,
+				cityShow: 2,
+				addressInfoArea: [],
+				timeranges: [],
+				isShow: false,
+				moneyInfo: {},
+				orderData: {}, //支付参数
+				sale_type: 1,
+        my_money: 0,
 			};
 		},
 		computed: {
 			...mapGetters(['isLogin', 'viewColor']),
-			...configMap(['hide_mer_status', 'yue_pay_status']),
+			...configMap(['hide_mer_status', 'alipay_open', 'yue_pay_status']),
 		},
 		watch: {
+			alipay_open(n) {
+				this.payMode[1].payStatus = n
+			},
 			yue_pay_status(n) {
 				this.payMode[2].payStatus = n
 			}
 		},
+		onReady() {},
+		mounted: function() {},
 		onLoad: function(options) {
-			// options.money = parseFloat(options.money).toFixed(2);
-			// this.payForm.cart_id = options.cartId;
-			// this.payForm.money = options.money;
-			// this.payForm.merName = options.merName;
-			// this.checkForm.cart_id = options.cartId.split(',');
-			// this.total_coupon = options.money;
-
-			// this.platformConsumption = [{
-			//   balance: "39000.00",
-			//   coupon_price: "50000.00",
-			//   coupon_title: "春耕采购余额",
-			//   coupon_user_id: 178,
-			//   describe: "仅限平台指定商家商品可使用",
-			//   end_time: "2025-07-01 00:00:00",
-			//   start_time: "2024-03-02 14:15:17",
-			//   uid: 889
-			// }]
-			let that = this;
-			const eventChannel = this.getOpenerEventChannel();
-			eventChannel.on('acceptDataFromOpenedPage', function(data) {
-				that.productData = data.productData;
-				that.platformConsumption = data.platformConsumption || [];
-
-				that.checkForm.cart_id = data.checkForm.cart_id;
-				that.payForm.cart_id = that.checkForm.cart_id;
-				that.payForm.money = data.money;
-				that.payForm.merName = data.merName;
-				that.payForm.key = data.key;
-				that.total_coupon = data.money;
-				that.checkForm.key = data.key;
-			});
-
+			this.seckillId = options.seckillId
+      this.my_money = options.money;
+			if (options.sale_type) this.sale_type = options.sale_type;
 			// #ifdef H5
 			this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5'
 			// #endif
@@ -331,81 +536,642 @@
 			// #ifdef APP-PLUS
 			this.from = 'weixin'
 			// #endif
-
-			if (!this.isLogin) {
-				this.isAuto = true;
-				this.isShowAuth = true
+			if (!options.cartId) return this.$util.Tips({
+				title: '请选择要购买的商品'
+			}, {
+				tab: 3,
+				url: 1
+			});
+			this.couponId = options.couponId || 0;
+			this.pinkId = options.pinkid ? parseInt(options.pinkid) : 0;
+			this.addressId = options.addressId || 0;
+			this.cartId = options.cartId;
+			this.is_address = options.is_address ? true : false;
+			this.news = options.new ? 1 : 0;
+			this.invoice_id = options.invoice_id || '';
+			if (options.invoice_type == 1) {
+				this.invoiceName = '增值税电子普通发票';
+			} else if (options.invoice_type == 2) {
+				this.invoiceName = '增值税专用发票';
 			}
+			if (!this.isLogin) {
+				toLogin()
+			}
+			if (this.payType == 'weixin') {
+				this.payType = this.from
+			}
+			let _this = this
+			this.textareaStatus = true;
+			if (this.isLogin && this.toPay == false && !this.orderPay) {
+				this.getaddressInfo();
+				this.$nextTick(function() {
+					this.$refs.addressWindow.getAddressList();
+					this.getUserInfo();
+				})
+			}
+			uni.setStorage({
+				key: 'invoice_Data',
+				data: {},
+				success: function() {}
+			})
 		},
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
 		onShow: function() {
-			this.getUserInfo()
-		},
 
+			let that = this;
+			uni.$on("handClick", res => {
+				if (res) {
+					_this.system_store = res.address
+				}
+				// 清除监听
+				uni.$off('handClick');
+			})
+			that.invoice.invoice = false
+		},
 		methods: {
-			couponTap3: function(item, index) {
-				uni.navigateTo({
-					url: '/pages/redpacket/redpacket',
-					success: (res) => {
-						res.eventChannel.emit('changeRedPacketInfo', this.platformConsumption)
-						uni.$once('changeRedPacket', (data) => {
-							this.consumption_id = data;
-							orderCheck({
-								...this.checkForm,
-								consumption_id: this.consumption_id
-							}).then(res => {
-								this.total_coupon = res.data.order_price;
-								this.consumption_money = res.data.consumption_money;
-								this.payForm.consumption_id = this.consumption_id;
-								// this.payForm.money = res.data.order_price;
-							})
-						})
-					}
+			/*预售协议*/
+			getPresellAgree: function() {
+				this.showProtocol = true
+				this.agrementTtile = '预售协议'
+				presellAgreement().then(res => {
+					this.protocol = res.data.sys_product_presell_agree;
 				})
 			},
-			// 授权关闭
-			authColse: function(e) {
-				console.log(e, 'authColse')
-				this.isShowAuth = e;
+			changeIsAgree: function(e) {
+				this.isAgree = !this.isAgree;
 			},
-			onLoadFun() {
-				this.isShowAuth = false;
+			changeIntegral: function(e) {
+				this.use_integral = !this.use_integral;
+				this.getConfirm(this.addressId);
+			},
+			showPresellAgree() {
+				this.getPresellAgree()
+			},
+			showInvoice() {
+				this.getAgreement();
+			},
+			showCoupon() {
+				this.getCouponAgreement();
+			},
+			// 打开配送方式弹窗
+			openDiscount(item, index) {
+				this.isShowDiscount = !this.isShowDiscount;
+			},
+			closeDiscount() {
+				this.isShowDiscount = false
+			},
+			// 图片预览
+			// 获得相册 idx
+			getPhotoClickIdx(e) {
+				let _this = this;
+				let idx = e.currentTarget.dataset.index;
+				_this.imgPreview(_this.pics, idx);
+			},
+			// 图片预览
+			imgPreview: function(list, idx) {
+				// list：图片 url 数组
+				if (list && list.length > 0) {
+					uni.previewImage({
+						current: list[idx], //  传 Number H5端出现不兼容
+						urls: list
+					});
+				}
+			},
+			/**上传文件*/
+			uploadpic: function(item) {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					let pics = item.value || []
+					pics.push(res.data.path);
+					that.$set(item, 'value', pics);
+				});
+			},
+			/** 删除图片*/
+			DelPic: function(item, index) {
+				let that = this,
+					pic = this.pics[index];
+				item.value.splice(index, 1);
+				// that.$set(that, 'pics', that.pics);
 			},
-
 			// 获取个人信息
 			getUserInfo() {
 				getUserInfo().then(res => {
-					this.userInfo = res.data
+					this.userInfo = res.data;
+					//获取账户金额以及冻结金额 重新调了一次接口
+					if (this.userInfo.service && this.userInfo.service.mer_id) getAdminApplyAPI(this.userInfo
+						.service.mer_id).then(res => {
+						this.moneyInfo = res.data;
+						this.cartArr.forEach(item => {
+							if (item.value == 'merBalance') item.payStatus = 1;
+						})
+					})
 				})
 			},
 
+			/*获取发票说明*/
+			getAgreement() {
+				let that = this
+				that.showProtocol = true;
+				that.agrementTtile = '发票说明'
+				getAgreementApi('sys_receipt_agree').then(res => {
+					that.protocol = res.data.sys_receipt_agree
+				})
+			},
+
+			/*获取发票说明*/
+			getCouponAgreement() {
+				let that = this
+				that.showProtocol = true;
+				that.agrementTtile = '优惠券说明'
+				getAgreementApi('sys_coupon_agree').then(res => {
+					that.protocol = res.data.sys_coupon_agree
+				})
+			},
+			/**
+			 * 获取门店列表数据
+			 */
+			getList: function() {
+				let longitude = uni.getStorageSync("CACHE_LONGITUDE"); //经度
+				let latitude = uni.getStorageSync("CACHE_LATITUDE"); //纬度
+				let data = {
+					latitude: latitude, //纬度
+					longitude: longitude, //经度
+					page: 1,
+					limit: 10
+				}
+				storeListApi(data).then(res => {
+					let list = res.data.list.list || [];
+					this.$set(this, 'storeList', list);
+					this.$set(this, 'system_store', list[0]);
+				}).catch(err => {})
+			},
+			// 单选
+			radioChange(e, index, item) {
+				this.order_form[index].value = item.wordsConfig.list[e.detail.value].val
+			},
+			clickTextArea() {
+				this.$refs.textarea.focus()
+			},
+			bindDateChange(e, index) {
+				this.order_form[index].value = e.target.value
+				this.$forceUpdate()
+			},
+			bindTimeChange(e, index) {
+				this.order_form[index].value = e.target.value
+			},
+			bindSelectChange(e, index, item) {
+				this.$set(this.order_form[index], 'value', item.wordsConfig.list[e.detail.value].val);
+			},
+			getTimeranges(index) {
+				this.isShow = true
+				this.timerangesIndex = index
+			},
+			confrim(e) {
+				this.isShow = false;
+				this.order_form[this.timerangesIndex].value = e.time;
+				let arrayNew = [];
+				e.val.forEach(item => {
+					arrayNew.push(Number(item))
+				})
+				this.timeranges = arrayNew;
+			},
+			cancels() {
+				this.isShow = false;
+			},
+			// 多选
+			checkboxChange(e, index, item) {
+				let obj = e.detail.value;
+				let val = '';
+				item.wordsConfig.list.forEach((j, jindex) => {
+					obj.forEach(x => {
+						if (jindex == x) {
+							val = val + (val ? ',' : '') + j.val;
+						}
+					})
+				})
+				this.order_form[index].value = val
+			},
+			OnAreaAddress(address) {
+				let addr = '';
+				addr = address.map(v => v.name).join('/');
+				this.order_form[this.timerangesIndex].value = addr;
+				CACHE_CITY[this.timerangesIndex] = address;
+			},
+			changeRegion(index) {
+				if (!this.order_form[index].value) {
+					this.addressInfoArea = [];
+				}
+				this.timerangesIndex = index;
+				this.cityShow = Number(this.order_form[index].valConfig.tabVal) + 1;
+				this.display = true;
+				if (CACHE_CITY[index]) {
+					this.addressInfoArea = CACHE_CITY[index];
+				}
+			},
+			// 关闭地址弹窗；
+			changeAddressClose: function() {
+				this.display = false;
+			},
+			/**上传文件*/
+			uploadpic: function(index) {
+				let that = this;
+				this.$util.uploadImageOne('upload/image', function(res) {
+					that.newImg.push(res.data.path);
+					that.$set(that.order_form[index], 'value', that.newImg);
+				});
+			},
+			/**
+			 * 删除图片
+			 * 
+			 */
+			DelPic: function(index, indexs) {
+				let that = this,
+					pic = this.order_form[index].value;
+				that.order_form[index].value.splice(indexs, 1);
+				that.$set(that.order_form[index], 'value', that.order_form[index].value);
+			},
+			// 关闭地址弹窗；
+			changeClose: function() {
+				this.$set(this.address, 'address', false);
+			},
+			// 关闭发票弹窗
+			changeInvoiceClose: function(data) {
+				this.getInvoiceData(data);
+				this.$set(this.invoice, 'invoice', false);
+			},
+			getInvoiceData(selectedData) {
+				this.invoiceData = {}
+				if (selectedData) {
+					this.cartInfo.forEach((item, i) => {
+						if (item.mer_id == selectedData.mer_id) {
+							if (this.cartInfo[i]['invoiceData']) {
+								this.cartInfo[i]['invoiceData'] = selectedData
+							} else {
+								this.$set(this.cartInfo[i], 'invoiceData', selectedData)
+							}
+						}
+						let mer_id = selectedData.mer_id
+						this.invoiceData[mer_id] = selectedData;
+					});
+				} else {
+					this.cartInfo.forEach((item, i) => {
+						this.$set(this.cartInfo[i], 'invoiceData', {})
+					});
+				}
+			},
+			getInvoiceDatas(selectedData) {
+				this.invoiceData = {}
+				if (selectedData.length) {
+					this.cartInfo.forEach((item, i) => {
+						selectedData.forEach((val, j) => {
+							if (item.mer_id == val.mer_id) {
+								if (this.cartInfo[i]['invoiceData']) {
+									this.cartInfo[i]['invoiceData'] = val
+								} else {
+									this.$set(this.cartInfo[i], 'invoiceData', val)
+								}
+							}
+							let mer_id = val.mer_id
+							this.invoiceData[mer_id] = val;
+						})
+					});
+				} else {
+					this.cartInfo.forEach((item, i) => {
+						this.$set(this.cartInfo[i], 'invoiceData', {})
+					});
+				}
+			},
+			/*
+			 * 跳转门店列表
+			 */
+			showStoreList: function() {
+				let _this = this
+				if (this.storeList.length > 0) {
+					uni.navigateTo({
+						url: '/pages/users/goods_details_store/index'
+					})
+				}
+			},
+			// 进店
+			goStore: function(id) {
+				if (this.hide_mer_status != 1) {
+					uni.navigateTo({
+						url: `/pages/store/home/index?id=${id}`
+					})
+				}
+			},
+			ChangCouponsClose: function() {
+				this.$set(this.coupon, 'status', false);
+			},
+			changeTextareaStatus: function() {
+				for (let i = 0, len = this.coupon.list.length; i < len; i++) {
+					this.coupon.list[i].use_title = '';
+					this.coupon.list[i].is_use = 0;
+				}
+				this.textareaStatus = true;
+				this.status = 0;
+				this.$set(this.coupon, 'list', this.coupon.list);
+			},
+			/**
+			 * 选择地址后改变事件
+			 * @param object e
+			 */
+			OnChangeAddress: function(e) {
+				this.textareaStatus = true;
+				this.addressId = e;
+				this.address.address = false;
+				this.getaddressInfo();
+			},
+			bindHideKeyboard: function(e) {
+				this.mark = e.detail.value;
+			},
+			getCoupon(coupon) {
+				if (coupon.checked) {
+					this.subCoupon[coupon.mer_id].forEach((item, i) => {
+						if (coupon.coupon_user_id == item) {
+							this.subCoupon[coupon.mer_id].splice(i, 1)
+						}
+					})
+				} else {
+					this.subCoupon[coupon.mer_id].push(coupon.coupon_user_id)
+				}
+				this.getConfirm(this.addressId)
+			},
+			/**
+			 * 获取当前订单详细信息
+			 *
+			 */
+			getConfirm: function(address_id) {
+				let that = this;
+				uni.showLoading({
+					title: '',
+					mask: true
+				});
+				getOrderConfirm({
+					cart_id: that.cartId.split(","),
+					address_id: '',
+          consumption_id:'',
+          product_type: 0,
+					takes: that.take,
+          source: 999,
+          money: that.my_money,
+					use_coupon: that.subCoupon,
+					use_integral: that.use_integral
+				}).then(res => {
+					// 默认选中
+					that.is_take = false
+					res.data.order.forEach(el => {
+						if (el.order.isTake == 1) that.is_take = true
+						el.isTake = 0
+						that.subCoupon[el.mer_id] = []
+						el.coupon.forEach(coupon => {
+							if (coupon.checked) {
+								that.subCoupon[el.mer_id].push(coupon.coupon_user_id)
+							}
+						})
+					})
+					that.subCoupon['0'] = []
+					if (res.data.platformCoupon.length > 0) {
+						res.data.platformCoupon.forEach(el => {
+							if (el.checked) {
+								that.subCoupon[el.mer_id] = []
+								that.subCoupon[el.mer_id].push(el.coupon_user_id)
+							}
+						})
+					}
+					that.$set(that.coupon, "coupon", that.plantCoupon ? res.data.platformCoupon : res.data
+						.order[that.couponIndex].coupon);
+					that.$set(that, "store_coupon_number", res.data.order[that.couponIndex].order.useCouponIds
+						.length);
+					that.$set(that, "coupon_number", that.plantCoupon ? that.subCoupon['0'].length : that
+						.store_coupon_number);
+					that.$set(that, "store_coupon_amount", parseFloat(res.data.order[that.couponIndex].order
+						.coupon_price));
+					that.$set(that, "plant_coupon_amount", parseFloat(res.data.total_platform_coupon_price));
+					that.$set(that, "coupon_amount", that.plantCoupon ? that.plant_coupon_amount : that
+						.store_coupon_amount);
+					that.$set(that, 'couponData', res.data);
+					that.$set(that, 'cartInfo', res.data.order);
+					that.$set(that, 'total_platform_coupon_price', res.data.total_platform_coupon_price);
+					that.$set(that, 'enabledPlatformCoupon', res.data.enabledPlatformCoupon);
+					that.$set(that, 'platformCoupon', res.data.platformCoupon);
+					that.$set(that, 'order_type', res.data.order_type);
+					that.$set(that, 'coupon_price', res.data.order_coupon_price);
+					that.$set(that, 'integral_count', res.data.order_total_integral);
+					that.$set(that, 'integral_price', res.data.order_total_integral_price);
+					that.$set(that, 'open_integral', res.data.openIntegral);
+					that.$set(that, 'use_integral', res.data.useIntegral);
+					that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length > 0) ? that
+						.order_extend : res.data.order_extend);
+					if (res.data.mer_form_id && !that.order_form.length && res.data.mer_form_info && res.data
+						.mer_form_info.value) {
+						let formData = that.objToArr(res.data.mer_form_info.value)
+						formData.forEach((item, index, arr) => {
+							that.$set(item, 'value', "");
+							CACHE_CITY[index] = ''; //清空省市区
+							if (item.name == 'texts') {
+								if (item.defaultValConfig.value) {
+									item.value = item.defaultValConfig.value
+								} else {
+									item.value = ''
+								}
+							} else if (item.name == 'radios') {
+								item.value = item.wordsConfig.list[0].val
+							} else if (item.name == 'uploadPicture') {
+								item.value = [];
+							} else if (item.name == 'dateranges') {
+								if (item.valConfig.tabVal == 0) {
+									if (item.valConfig.tabData == 0) {
+										let obj = dayjs(new Date(Number(new Date().getTime()))).format(
+											'YYYY-MM-DD');
+										item.value = [obj, obj]
+									} else {
+										let data1 = dayjs(new Date(Number(new Date(item.valConfig
+											.specifyDate[0]).getTime()))).format('YYYY-MM-DD');
+										let data2 = dayjs(new Date(Number(new Date(item.valConfig
+											.specifyDate[1]).getTime()))).format('YYYY-MM-DD');
+										item.value = [data1, data2];
+									}
+								} else {
+									item.value = [];
+								}
+							} else {
+								if (['times', 'dates', 'timeranges'].indexOf(item.name) != -1) {
+									if (item.valConfig.tabVal == 0) {
+										if (item.valConfig.tabData == 0) {
+											if (item.name == 'times') {
+												item.value = dayjs(new Date(Number(new Date()
+													.getTime()))).format('HH:mm');
+											} else if (item.name == 'dates') {
+												item.value = dayjs(new Date(Number(new Date()
+													.getTime()))).format('YYYY-MM-DD');
+											} else {
+												let current = dayjs(new Date(Number(new Date()
+													.getTime()))).format('HH:mm');
+												item.value = current + ' - ' + current;
+											}
+										} else {
+											if (item.name == 'times' || item.name == 'dates') {
+												item.value = item.valConfig.specifyDate;
+											} else {
+												item.value = item.valConfig.specifyDate[0] + ' - ' +
+													item.valConfig.specifyDate[1];
+											}
+										}
+									} else {
+										item.value = '';
+									}
+								} else {
+									item.value = '';
+								}
+							}
+						})
+
+						function sortNumber(a, b) {
+							return a.timestamp - b.timestamp;
+						}
+						formData.sort(sortNumber);
+						that.$set(that, 'order_form', (that.order_form && that.order_form.length > 0) ? that
+							.order_form : formData);
+					}
+					that.totalPrice = res.data.order_price
+					that.orderStatus = res.data.status
+					that.proPrice = res.data.total_price
+					that.order_type = res.data.order_type
+					that.order_model = res.data.order_model
+					that.allow_address = res.data.allow_address
+					that.deliveryName = res.data.order_model == 0 ? '快递配送' : '虚拟发货'
+					that.order_key = res.data.key
+					uni.getStorage({
+						key: "invoice_Data",
+						success: function(res) {
+							that.addInvoice = res.data;
+							if (res.data) {
+								that.getInvoiceDatas(res.data)
+							}
+						}
+					})
+					uni.hideLoading();
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					}, {
+						tab: 3,
+						url: 1
+					});
+				});
+			},
+			// 对象转数组
+			objToArr(data) {
+				let obj = Object.keys(data);
+				let m = obj.map(key => data[key]);
+				return m;
+			},
+			/*
+			 * 获取默认收货地址或者获取某条地址信息
+			 */
+			getaddressInfo: function() {
+				let that = this;
+				if (that.addressId) {
+					getAddressDetail(that.addressId).then(res => {
+						res.data.is_default = parseInt(res.data.is_default);
+						that.addressInfo = res.data || {};
+						that.addressId = res.data.address_id || 0;
+						that.address.addressId = res.data.address_id || 0;
+						that.post = {
+							real_name: res.data.real_name,
+							phone: res.data.phone
+						}
+						this.getConfirm(that.addressId);
+					})
+				} else {
+					getAddressList().then(res => {
+						that.addressInfo = res.data.list.length > 0 ? res.data.list[0] : {};
+						that.addressId = res.data.list.length > 0 ? res.data.list[0].address_id : 0;
+						that.address.addressId = res.data.list.length > 0 ? res.data.list[0].address_id : 0;
+						that.post = res.data.list.length > 0 ? {
+							real_name: res.data.list[0].real_name,
+							phone: res.data.list[0].phone
+						} : {
+							real_name: '',
+							phone: ''
+						}
+						this.getConfirm(that.addressId);
+					})
+				}
+			},
 			payItem: function(e) {
 				let that = this;
 				let active = e;
 				that.active = active;
-				// console.log(this.active);
 				that.animated = true;
 				that.payType = that.cartArr[active].value;
 				if (that.payType == 'weixin') {
 					that.payType = that.from
 				}
 			},
-
+			couponTap: function(item, index) {
+				this.coupon = item
+				this.$set(this.coupon, 'status', true)
+				this.couponIndex = index
+				this.plantCoupon = false
+				this.$set(this, "coupon_number", this.store_coupon_number);
+				this.$set(this, "coupon_amount", this.store_coupon_amount);
+			},
+			couponTap2: function(item, index) {
+				this.coupon = {
+					coupon: item,
+					mer_id: 0,
+					status: true
+				}
+				this.plantCoupon = true
+				this.$set(this, "coupon_number", this.subCoupon['0'].length);
+				this.$set(this, "coupon_amount", this.plant_coupon_amount);
+			},
+			car: function() {
+				let that = this;
+				that.animated = false;
+			},
+			onAddress: function() {
+				let that = this;
+				if (that.addressInfo.real_name) {
+					that.textareaStatus = false;
+					that.address.address = true;
+					that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this
+						.pinkId + '&couponId=' + this.couponId;
+				} else {
+					uni.navigateTo({
+						url: `/pages/users/user_address/index?cartId=${this.cartId}`,
+					});
+				}
+			},
+			/**
+			 * 开发票
+			 */
+			goInvoice: function(id) {
+				let that = this;
+				that.invoice.invoice = true;
+				that.invoice.mer_id = id;
+				this.$refs.addInvoicing.getInvoiceDefault();
+				this.$refs.addInvoicing.getInvoiceList();
+			},
+			realName: function(e) {
+				this.contacts = e.detail.value;
+			},
+			phone: function(e) {
+				this.contactsTel = e.detail.value;
+			},
 			payment: function(data) {
 				let that = this;
 				createOrder(data).then(res => {
-
 					let status = res.data.status,
 						orderId = res.data.result.order_id,
+						callback_key = res.data.result.pay_key,
 						jsConfig = res.data.result.config,
-						// 暂不跳转
 						goPages = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=' + res.message +
-						'&product_type=' + that.payForm.product_type + '&source=' + that.payForm.source,
-						goPagesOrder = '/pages/order_details/stay?order_id=' + orderId +
-						'&credit_buy=1&product_type=' + that.payForm.product_type;
-
+						'&sale_type=' + that.sale_type;
 					that.orderPay = true;
 					uni.hideLoading();
 					switch (status) {
@@ -417,7 +1183,7 @@
 								title: res.message
 							}, {
 								tab: 5,
-								url: goPagesOrder
+								url: goPages
 							});
 							break;
 						case 'success':
@@ -431,6 +1197,10 @@
 							break;
 						case 'alipay':
 						case "alipayQr":
+							uni.navigateTo({
+								url: '/pages/order_pay_back/index?keyCode=' + callback_key + '&url=' +
+									jsConfig
+							})
 							return;
 							break;
 							// #ifndef MP
@@ -467,11 +1237,8 @@
 								provider: 'wxpay',
 								orderInfo: jsConfig,
 								success: (e) => {
-									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=支付成功' + '&product_type=' + that.product_type +
-										'&source=' + that.source;
-
+										'&msg=支付成功' + '&sale_type=' + that.sale_type;
 									return that.$util.Tips({
 										title: '支付成功',
 										icon: 'success'
@@ -481,10 +1248,8 @@
 									});
 								},
 								fail: (e) => {
-									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
-										'&msg=取消支付' + '&product_type=' + that.product_type +
-										'&source=' + that.source;
+										'&msg=取消支付' + '&sale_type=' + that.sale_type;
 									return that.$util.Tips({
 										title: '取消支付',
 									}, {
@@ -492,8 +1257,15 @@
 										url: url
 									});
 								},
-								complete: (res) => {
-									uni.hideLoading();
+								complete: () => {
+									let url = '/pages/order_pay_status/index?order_id=' + orderId +
+										'&msg=取消支付' + '&sale_type=' + that.sale_type;
+									return that.$util.Tips({
+										title: '',
+									}, {
+										tab: 4,
+										url: url
+									});
 								},
 							});
 							// #endif
@@ -522,10 +1294,8 @@
 									});
 								},
 								fail: function(e) {
-									// 暂不跳转
 									let pages = '/pages/order_pay_status/index?order_id=' +
-										orderId + '&msg=取消支付' + '&product_type=' + that
-										.product_type + '&source=' + that.source;
+										orderId + '&msg=取消支付' + '&sale_type=' + that.sale_type
 									return that.$util.Tips({
 										title: '取消支付'
 									}, {
@@ -545,26 +1315,69 @@
 								url: goPages + '&status=1'
 							});
 							break;
+						case "public":
+							//对公账户
+							return that.$util.Tips({
+								title: '下单成功,请上传支付凭证!'
+							}, {
+								tab: 5,
+								url: "/pages/users/order_list/index"
+							});
+							break;
 							// #ifdef H5
 						case 'h5':
 							let host = window.location.protocol + "//" + window.location.host;
 							let url =
-								`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&product_type=${that.product_type}&source${that.source}`
+								`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}&sale_type=${that.sale_type}`
 							let eUrl = encodeURIComponent(url)
 							let jsurl = jsConfig.mweb_url || jsConfig.h5_url
 							let locations = `${jsurl}&redirect_url=${eUrl}`
-							// 暂不跳转
 							setTimeout(() => {
 								location.href = locations;
 							}, 100);
 							break;
 							// #endif
+							// #ifdef APP-PLUS
+						case 'alipayApp':
+							uni.requestPayment({
+								provider: 'alipay',
+								orderInfo: jsConfig,
+								success: (e) => {
+									return that.$util.Tips({
+										title: '支付成功',
+										icon: 'success'
+									}, {
+										tab: 5,
+										url: goPages
+									});
+								},
+								fail: (e) => {
+									let pages = '/pages/order_pay_status/index?order_id=' +
+										orderId + '&msg=支付失败' + '&sale_type=' + that.sale_type
+									return that.$util.Tips({
+										title: '支付失败'
+									}, {
+										tab: 5,
+										url: pages
+									});
+								},
+								complete: () => {
+									uni.hideLoading();
+									let pages = '/pages/order_pay_status/index?order_id=' +
+										orderId + '&msg=取消支付' + '&sale_type=' + that.sale_type
+									return that.$util.Tips({
+										title: ''
+									}, {
+										tab: 5,
+										url: pages
+									});
+								},
+							});
+							break;
+							// #endif
 						default:
-							// 暂不跳转
 							let pages = '/pages/order_pay_status/index?order_id=' +
-								orderId + '&msg=取消支付' + '&product_type=' + that.product_type + '&source=' +
-								that.source
-
+								orderId + '&msg=取消支付' + '&sale_type=' + that.sale_type
 							return that.$util.Tips({
 								title: '取消支付'
 							}, {
@@ -573,30 +1386,100 @@
 							});
 					}
 				}).catch(err => {
+					uni.hideLoading();
 					return that.$util.Tips({
 						title: err
 					});
-					uni.hideLoading();
 				});
 			},
+			isEmojiCharacter: function(substring) {
+				if (substring) {
+					for (var i = 0; i < substring.length; i++) {
+						var hs = substring.charCodeAt(i);
+						if (0xd800 <= hs && hs <= 0xdbff) {
+							if (substring.length > 1) {
+								var ls = substring.charCodeAt(i + 1);
+								var uc = ((hs - 0xd800) * 0x400) + (ls - 0xdc00) + 0x10000;
+								if (0x1d000 <= uc && uc <= 0x1f77f) {
+									return true;
+								}
+							}
+						} else if (substring.length > 1) {
+							var ls = substring.charCodeAt(i + 1);
+							if (ls == 0x20e3) {
+								return true;
+							}
+						} else {
+							if (0x2100 <= hs && hs <= 0x27ff) {
+								return true;
+							} else if (0x2B05 <= hs && hs <= 0x2b07) {
+								return true;
+							} else if (0x2934 <= hs && hs <= 0x2935) {
+								return true;
+							} else if (0x3297 <= hs && hs <= 0x3299) {
+								return true;
+							} else if (hs == 0xa9 || hs == 0xae || hs == 0x303d || hs == 0x3030 ||
+								hs == 0x2b55 || hs == 0x2b1c || hs == 0x2b1b ||
+								hs == 0x2b50) {
+								return true;
+							}
+						}
+					}
+				}
+			},
+			bindDateChange(e) {
+				let that = this
+				that.$set(that.order_extend[that.virtualIndex], 'value', e.detail.value);
+			},
 
-			SubOrder: async function() {
+			getTime(index) {
+				this.virtualIndex = index;
+			},
+
+			SubOrder: async function(e) {
 				let that = this,
 					data = {};
-				if (!that.payType) return that.$util.Tips({
-					title: '请选择支付方式'
-				});
-
-
-				if (that.payType == 'balance' && +this.userInfo.now_money < +this.payForm.money) {
-					return that.$util.Tips({
-						title: '余额不足，请选择其他的支付方式！'
+				
+				data = {
+					cart_id: this.cartId.split(","),
+					address_id: '',
+					use_coupon: this.subCoupon,
+					pay_type: this.payType,
+					mark: this.msgObj,
+					order_type: this.order_type,
+					key: this.order_key,
+					takes: this.take,
+          source: 999,
+					use_integral: this.use_integral,
+					receipt_data: this.invoiceData,
+					extend: this.extend,
+					post: this.post,
+					// #ifdef H5
+					return_url: 'http://' + window.location.host + '/pages/users/order_list/index',
+					// #endif
+				};
+				if (data.mark && this.isEmojiCharacter(data.mark[Object.keys(data.mark)[0]])) {
+					that.$util.Tips({
+						title: '备注不允许输入表情！'
 					});
+					return;
 				}
-				this.payForm.pay_type = that.payType;
+				data.takes = []
+				this.cartInfo.map(el => {
+					if (el.isTake == 1 || el.order.isTake) {
+						data.takes.push(el.mer_id)
+					}
+				})
+
+				if (data.pay_type == 'balance' && parseFloat(that.userInfo.now_money) < parseFloat(that.totalPrice))
+					return that.$util.Tips({
+						title: '余额不足！'
+					});
+
 
 				// 设置支付密码
-				if (that.payType == 'balance' || that.payType == 'merBalance') {
+				if (data.pay_type == 'balance' || data.pay_type == 'merBalance') {
+					this.orderData = data;
 
 					// 是否输入密码
 					const result = await this.$util.checkPassword();
@@ -610,12 +1493,9 @@
 						})
 					}
 
+					//已设置 输入密码
 					this.$refs.popups.handleOpen();
-				} else {
-					uni.showLoading({
-						title: '订单支付中',
-						mask: true
-					});
+				} else { //无须支付密码
 					this.truePayOrder(data);
 				}
 			},
@@ -625,19 +1505,19 @@
 				const result = await this.$util.checkPassword(e);
 				// 验证密码正确
 				if (result.data.code == 100) {
-					this.$set(this.payForm, 'withdrawal_pwd', e);
+					this.$set(this.orderData, 'withdrawal_pwd', e);
 					uni.showLoading({
 						title: '订单支付中',
 						mask: true
 					});
-					this.truePayOrder(this.payForm);
+					this.truePayOrder(this.orderData);
 				} else {
 					this.$refs.payPwd.handleOpen(result.data.code);
 				}
 			},
 
 			// 弹框左边按钮 101 未设置密码  102 忘记密码 都去设置密码
-			handleLeft(code) {
+			handleLeft() {
 				uni.navigateTo({
 					url: "/pages/users/user_modify_pwd/index?type=payPwd"
 				});
@@ -654,25 +1534,257 @@
 				}
 			},
 
+			// 提交订单
+			truePayOrder(data) {
+        this.orderData.money = this.totalPrice;
+				if (!data) data = this.orderData;
+
+				// #ifdef MP
+				openPaySubscribe().then(() => {
+					that.payment(data);
+				});
+				// #endif
+				// #ifndef MP
+				this.payment(data);
+				// #endif
+			},
+
 			handleClear() {},
 			handleChange() {},
 
-			truePayOrder() {
-				// #ifdef MP
-				openPaySubscribe().then(() => {
-					that.payment(this.payForm);
-				});
-				// #endif
-
-				// #ifndef MP
-				this.payment(this.payForm);
-				// #endif
+			// 打开配送方式弹窗
+			openShowBox(item, index) {
+				if (item.delivery_way.length == 2 && this.order_model != 2) {
+					this.activeObj = item
+					this.activeIndex = index
+					this.isShowBox = true
+					this.getDeliveryType(item.order)
+				}
+			},
+			// 获取快递方式
+			getDeliveryType(item) {
+				if (item.allow_delivery && item.allow_take) {
+					this.radioList = [{
+							title: this.deliveryName,
+							check: true
+						},
+						{
+							title: '到店核销',
+							check: false
+						}
+					]
+				} else if (item.allow_delivery && !item.allow_take) {
+					this.radioList = [{
+						title: this.deliveryName,
+						check: true
+					}]
+				} else if (!item.allow_delivery && item.allow_take) {
+					this.radioList = [{
+						title: '到店核销',
+						check: false
+					}]
+				}
+			},
+			boxClose() {
+				this.isShowBox = false
+			},
+			getData(data) {
+				this.cartInfo[this.activeIndex] = data
+				if (data.order.isTake) {
+					this.take.push(data.mer_id)
+				} else {
+					this.take.forEach((item, i) => {
+						if (data.mer_id == item) {
+							this.take.splice(i, 1)
+						}
+					})
+				}
+				this.isShowBox = false
+				this.getConfirm(this.addressId);
+			},
+			//查看内置地图
+			goMap(item) {
+				let that = this;
+				let lat = Number(item.take.mer_take_location[0]),
+					long = Number(item.take.mer_take_location[1])
+				//#ifdef H5
+				if (that.$wechat.isWeixin() === true) {
+					that.$wechat.seeLocation({
+						latitude: lat,
+						longitude: long,
+						name: item.mer_name,
+						address: item.take ? item.take.mer_take_address : '',
+					}).then(res => {})
+				} else {
+					//#endif
+					uni.openLocation({
+						latitude: parseFloat(lat),
+						longitude: parseFloat(long),
+						scale: 8,
+						name: item.mer_name,
+						address: item.take ? item.take.mer_take_address : '',
+						success: function(res) {
+							that.go_map = true
+						},
+					});
+					// #ifdef H5
+				}
+				//#endif
 			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
+	/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+		border: 1px solid var(--view-theme) !important;
+		background-color: var(--view-theme) !important;
+		color: #fff !important;
+	}
+
+	/deep/radio .wx-radio-input.wx-radio-input-checked,
+	/deep/uni-radio .uni-radio-input.uni-radio-input-checked {
+		border: 1px solid var(--view-theme) !important;
+		background-color: var(--view-theme) !important;
+	}
+
+	.order-submission .line {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 3rpx;
+	}
+
+	.order-submission .line image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.order-submission .address {
+		padding: 28rpx 30rpx;
+		background-color: #fff;
+		box-sizing: border-box;
+	}
+
+	.order-submission .address .addressCon {
+		width: 610rpx;
+		font-size: 26rpx;
+		color: #666;
+	}
+
+	.order-submission .address .addressCon .name {
+		font-size: 30rpx;
+		color: #282828;
+		font-weight: bold;
+		margin-bottom: 10rpx;
+	}
+
+	.order-submission .address .addressCon .name .phone {
+		margin-left: 50rpx;
+	}
+
+	.order-submission .address .addressCon .default {
+		margin-right: 12rpx;
+	}
+
+	.t-color {
+		color: #40AE36;
+	}
+
+	.order-submission .address .addressCon .setaddress {
+		color: #333;
+		font-size: 28rpx;
+	}
+
+	.order-submission .address .iconfont {
+		font-size: 35rpx;
+		color: #707070;
+	}
+
+	.order-submission .allAddress {
+		width: 100%;
+	}
+
+	.order-submission .allAddress .nav {
+		width: 710rpx;
+		margin: 0 auto;
+	}
+
+	.order-submission .allAddress .nav .item {
+		width: 355rpx;
+	}
+
+	.order-submission .allAddress .nav .item.on {
+		position: relative;
+		width: 250rpx;
+	}
+
+	.order-submission .allAddress .nav .item.on::before {
+		position: absolute;
+		bottom: 0;
+		content: "快递配送";
+		font-size: 28rpx;
+		display: block;
+		height: 0;
+		width: 336rpx;
+		border-width: 0 20rpx 80rpx 0;
+		border-style: none solid solid;
+		border-color: transparent transparent #fff;
+		z-index: 2;
+		border-radius: 7rpx 30rpx 0 0;
+		text-align: center;
+		line-height: 80rpx;
+	}
+
+	.order-submission .allAddress .nav .item:nth-of-type(2).on::before {
+		content: "到店核销";
+		border-width: 0 0 80rpx 20rpx;
+		border-radius: 30rpx 7rpx 0 0;
+	}
+
+	.order-submission .allAddress .nav .item.on2 {
+		position: relative;
+	}
+
+	.order-submission .allAddress .nav .item.on2::before {
+		position: absolute;
+		bottom: 0;
+		content: "到店核销";
+		font-size: 28rpx;
+		display: block;
+		height: 0;
+		width: 400rpx;
+		border-width: 0 0 60rpx 60rpx;
+		border-style: none solid solid;
+		border-color: transparent transparent #f7c1bd;
+		border-radius: 40rpx 6rpx 0 0;
+		text-align: center;
+		line-height: 60rpx;
+	}
+
+	.order-submission .allAddress .nav .item:nth-of-type(1).on2::before {
+		content: "快递配送";
+		border-width: 0 60rpx 60rpx 0;
+		border-radius: 6rpx 40rpx 0 0;
+	}
+
+	.order-submission .allAddress .address {
+		height: 150rpx;
+		margin: 0 auto;
+	}
+
+	.order-submission .allAddress .line {
+		margin: 0 auto;
+	}
+
+	.order-submission .wrapper .item .discount .placeholder {
+		color: #ccc;
+		text-align: right;
+	}
+
 	.order-submission .wrapper {
 		margin-bottom: 12rpx;
 		background-color: #fff;
@@ -693,7 +1805,7 @@
 	}
 
 	.order-submission .virtual_form .item-require {
-		color: red;
+		color: #40AE36;
 		margin-right: 4rpx;
 	}
 
@@ -702,6 +1814,19 @@
 		padding: 27rpx 0;
 	}
 
+	.order-submission .virtual_form .item.on .discount {
+		max-width: 460rpx;
+	}
+
+	.order-submission .virtual_form .item.pd0 {
+		padding-bottom: 0;
+	}
+
+	.order-submission .virtual_form .item .radio {
+		margin: 0 22rpx 0 22rpx;
+		padding: 10rpx 0;
+	}
+
 	.upload {
 		display: -webkit-box;
 		display: -moz-box;
@@ -723,7 +1848,7 @@
 		position: relative;
 		font-size: 11px;
 		color: #bbb;
-		border-radius: 3rpx;
+		border-radius: 8rpx;
 
 		&:nth-child(4n) {
 			margin-right: 0;
@@ -738,7 +1863,6 @@
 		image {
 			width: 100%;
 			height: 100%;
-			border-radius: 1px;
 
 			img {
 				-webkit-touch-callout: none;
@@ -753,8 +1877,33 @@
 				height: 100%;
 			}
 		}
+
+		.icon-guanbi4 {
+			color: #fff;
+			font-size: 14rpx;
+			position: absolute;
+			top: 0;
+			right: 0;
+			width: 30rpx;
+			height: 30rpx;
+			text-align: center;
+			line-height: 30rpx;
+			border-radius: 0 8rpx 0 8rpx;
+			background: rgba(0, 0, 0, .6);
+		}
 	}
 
+	.vipImg {
+		width: 65rpx;
+		height: 28rpx;
+		margin-left: 4rpx;
+
+		image {
+			width: 100%;
+			height: 100%;
+			display: block;
+		}
+	}
 
 	.order-submission .wrapper .item .discount {
 		font-size: 30rpx;
@@ -780,6 +1929,23 @@
 		margin-right: 20rpx;
 	}
 
+	.order-submission .wrapper .item .shipping {
+		font-size: 30rpx;
+		color: #999;
+		position: relative;
+		padding-right: 58rpx;
+	}
+
+	.order-submission .wrapper .item .shipping .iconfont {
+		font-size: 35rpx;
+		color: #707070;
+		position: absolute;
+		right: 0;
+		top: 50%;
+		transform: translateY(-50%);
+		margin-left: 30rpx;
+	}
+
 	.order-submission .wrapper .item input {
 		flex: 1;
 		height: 100%;
@@ -807,14 +1973,14 @@
 	}
 
 	.order-submission .wrapper .item .list .payItem.on {
-		border-color: var(--view-theme);
-		color: var(--view-theme);
+		border-color: #40AE36;
+		color: #40AE36;
 	}
 
 	.order-submission .wrapper .item .list .payItem .name {
 		width: 50%;
 		text-align: center;
-		border-right: 1px solid #eee;
+		border-right: 1px solid #40AE36;
 		justify-content: left;
 		padding-left: 80rpx;
 	}
@@ -862,7 +2028,9 @@
 	}
 
 	.order-submission .moneyList .item .money {
-		color: #868686;
+		color: #40AE36;
+		display: flex;
+		align-items: center;
 	}
 
 	.order-submission .footer {
@@ -903,7 +2071,7 @@
 	}
 
 	.pColor {
-		color: var(--view-priceColor);
+		color: #40AE36;
 	}
 
 	.order-submission .footer .settlement {
@@ -911,7 +2079,7 @@
 		color: #fff;
 		width: 240rpx;
 		height: 70rpx;
-		background-color: var(--view-theme);
+		background-color: #40AE36;
 		border-radius: 50rpx;
 		text-align: center;
 		line-height: 70rpx;
@@ -921,6 +2089,22 @@
 		}
 	}
 
+	.footer .transparent {
+		opacity: 0
+	}
+
+	.event_bg {
+		background: #FF7F00;
+	}
+
+	.event_color {
+		color: #FF7F00;
+	}
+
+	.color_red {
+		color: var(--view-theme);
+	}
+
 	.storeinfo-wrapper {
 		.store-item {
 			margin-top: 12rpx;
@@ -987,6 +2171,22 @@
 						}
 					}
 
+					.event_name {
+						display: inline-block;
+						margin-right: 9rpx;
+						color: #fff;
+						font-size: 20rpx;
+						padding: 0 8rpx;
+						line-height: 30rpx;
+						text-align: center;
+						border-radius: 6rpx;
+					}
+
+					.event_ship {
+						font-size: 20rpx;
+						margin-top: 10rpx;
+					}
+
 					.label {
 						margin-top: 10rpx;
 						color: #868686;
@@ -995,7 +2195,7 @@
 
 					.price {
 						margin-top: 20rpx;
-						color: var(--view-priceColor);
+						color: #40AE36;
 						position: relative;
 
 						text {
@@ -1012,9 +2212,112 @@
 							}
 						}
 					}
+
+					.err-txt {
+						display: flex;
+						align-items: center;
+						margin-top: 18rpx;
+						color: $theme-color;
+
+						.iconfont {
+							margin-right: 10rpx;
+						}
+					}
 				}
 			}
 		}
+
+		.event_payTime {
+			padding: 0 30rpx 24rpx;
+
+			.event_progress {
+				margin-top: 50rpx;
+				position: relative;
+			}
+
+			.progress_step {
+				height: 80rpx;
+				position: relative;
+				padding-left: 60rpx;
+
+				&::before {
+					content: '';
+					display: block;
+					width: 2rpx;
+					height: 40rpx;
+					background: var(--view-theme);
+					position: absolute;
+					left: 35rpx;
+					top: 18rpx;
+				}
+
+				&:nth-child(2) {
+					&::before {
+						bottom: 64rpx;
+						top: auto;
+						background: #EFEFEF;
+					}
+
+					&::after {
+						background: #EFEFEF;
+					}
+				}
+
+				&::after {
+					content: '';
+					display: block;
+					width: 14rpx;
+					height: 14rpx;
+					background: var(--view-theme);
+					border-radius: 50%;
+					position: absolute;
+					top: 10rpx;
+					left: 29rpx;
+				}
+
+				.name {
+					float: left;
+					color: #282828;
+
+					&.color_red {
+						color: var(--view-theme);
+					}
+				}
+
+				.price {
+					float: right;
+					color: #282828;
+
+					&.color_red {
+						color: var(--view-priceColor);
+					}
+				}
+			}
+
+			.progress_pay {
+				padding-left: 60rpx;
+				font-size: 24rpx;
+				color: #868686;
+				margin-top: -34rpx;
+			}
+		}
+	}
+
+	.integral_checked {
+		margin-left: 10rpx;
+		display: inline;
+
+		.iconfont {
+			font-size: 38rpx;
+		}
+
+		.icon-weixuanzhong {
+			color: #BFBFBF;
+		}
+
+		.icon-xuanzhong1 {
+			color: var(--view-theme);
+		}
 	}
 
 	uni-checkbox-group,
@@ -1026,17 +2329,22 @@
 		}
 	}
 
+	.icon-wenhao1 {
+		color: #868686;
+		margin-right: 6rpx;
+	}
+
 	.total {
 		display: flex;
 		justify-content: flex-end;
 		padding-right: 30rpx;
 		padding-bottom: 30rpx;
 		font-size: 26rpx;
-		color: #282828;
+		color: #40AE36;
 
 		.price {
 			margin-left: 10rpx;
-			color: var(--view-priceColor);
+			color: #40AE36;
 			font-size: 28rpx;
 			font-weight: bold;
 
@@ -1046,12 +2354,127 @@
 		}
 	}
 
-	.red_packet {
-		color: #ff5c2d !important;
-		background-color: rgba(#ff5c2d, 0.3);
-		border-radius: 60rpx;
-		padding: 5rpx 10rpx;
-		padding-left: 20rpx;
-		font-size: 25rpx;
+	.store-address {
+		padding: 30rpx 23rpx;
+		margin: 0 30rpx;
+		background: #F6F6F6;
+		border-radius: 8rpx;
+		font-size: 24rpx;
+		display: -webkit-box;
+		display: -moz-box;
+		display: -ms-flexbox;
+		display: -webkit-flex;
+		display: flex;
+		/*垂直居中*/
+		-webkit-box-align: center;
+		/*旧版本*/
+		-moz-box-align: center;
+		/*旧版本*/
+		-ms-flex-align: center;
+		/*混合版本*/
+		-webkit-align-items: center;
+		/*新版本*/
+		align-items: center;
+
+		/*新版本*/
+		.name {
+			width: 148rpx;
+			margin-right: 20rpx;
+		}
+
+		.info {
+			flex: 1;
+		}
+
+		.map {
+			text-align: center;
+			padding-left: 40rpx;
+			position: relative;
+
+			&::before {
+				content: '';
+				display: inline-block;
+				width: 2rpx;
+				height: 42rpx;
+				background-color: #DDDDDD;
+				position: absolute;
+				left: 0;
+				top: 18rpx;
+			}
+
+			.iconfont {
+				color: #40AE36;
+			}
+
+			.map_text {
+				color: #40AE36;
+			}
+		}
+	}
+
+	.settlementAgreement {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: rgba(0, 0, 0, .5);
+		z-index: 40;
+	}
+
+	.settlementAgreement .setAgCount {
+		background: #fff;
+		width: 656rpx;
+		height: 458px;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		border-radius: 12rpx;
+		-webkit-border-radius: 12rpx;
+		padding: 52rpx;
+		-webkit-transform: translate(-50%, -50%);
+		-moz-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		overflow: hidden;
+
+		.content {
+			height: 900rpx;
+			overflow-y: scroll;
+
+			/deep/ p {
+				font-size: 13px;
+				line-height: 22px;
+			}
+
+			/deep/ img {
+				max-width: 100%;
+			}
+		}
+	}
+
+	.settlementAgreement .setAgCount .icon {
+		font-size: 42rpx;
+		color: #b4b1b4;
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	}
+
+	.settlementAgreement .setAgCount .title {
+		color: #333;
+		font-size: 32rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+
+	.settlementAgreement .setAgCount .content {
+		margin-top: 32rpx;
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+		height: 756rpx;
+		overflow-y: scroll;
 	}
 </style>
\ No newline at end of file