diff --git a/components/jyf-parser/jyf-parser.vue b/components/jyf-parser/jyf-parser.vue
index 2fabb92..6294c26 100644
--- a/components/jyf-parser/jyf-parser.vue
+++ b/components/jyf-parser/jyf-parser.vue
@@ -22,6 +22,7 @@
 			<trees :nodes="nodes" :lazy-load="lazyLoad" :loadVideo="loadVideo" />
 			<image v-for="(item, index) in imgs" v-bind:key="index" :id="index" :src="item" hidden @load="_load" />
 			<!--#endif-->
+			<image v-for="(item, index) in imgs" v-bind:key="index" :id="index" :src="item" hidden @load="_load" />
 		</view>
 		<!--#endif-->
 	</view>
@@ -64,7 +65,7 @@
 				src: '',
 				height: 1,
 				// #endif
-				// #ifndef APP-PLUS-NVUE
+				// #ifndef APP-PLUS-NVUE	
 				scaleAm: '',
 				showAm: '',
 				imgs: [],
diff --git a/manifest.json b/manifest.json
index fe3cdfb..5f77bfb 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "CRMEB",
-    "appid" : "__UNI__039BCFE",
+    "appid" : "__UNI__3A527D1",
     "description" : "",
     "versionName" : "1.0.5",
     "versionCode" : 128,
@@ -24,7 +24,10 @@
             "iBeacon" : {},
             "Barcode" : {},
             "Camera" : {},
-            "Geolocation" : {}
+            "Geolocation" : {},
+            "Payment" : {},
+            "Share" : {},
+            "Push" : {}
         },
         "safearea" : {
             "bottom" : {
@@ -37,7 +40,11 @@
             "android" : {
                 "resizeableActivity" : true,
                 "permissions" : [
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.BATTERY_STATS\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
@@ -45,8 +52,16 @@
                     "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_CONFIGURATION\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
                 ],
@@ -80,13 +95,15 @@
                     }
                 },
                 "payment" : {
-                    "alipay" : {
-                        "__platform__" : [ "ios", "android" ]
+                    "weixin" : {
+                        "__platform__" : [ "android" ],
+                        "appid" : "wx9d68c92b550ddd1e",
+                        "UniversalLinks" : "https://mer.crmeb.net/"
                     }
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "",
+                        "appid" : "wx9d68c92b550ddd1e",
                         "UniversalLinks" : "https://mer.crmeb.net/"
                     }
                 },
@@ -95,7 +112,12 @@
                         "__platform__" : [ "ios", "android" ]
                     }
                 },
-                "push" : {},
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : false
+                    }
+                },
                 "oauth" : {
                     "apple" : {}
                 },
diff --git a/pages.json b/pages.json
index a746a54..d9d05ff 100644
--- a/pages.json
+++ b/pages.json
@@ -635,7 +635,14 @@
           "style": {
             "navigationBarTitleText": "订单详情"
           }
-        }, {
+        }, 
+		{
+		  "path": "user_invoice_order_list/index",
+		  "style": {
+		    "navigationBarTitleText": "订单详情"
+		  }
+		},
+		{
           "path": "privacy/index",
           "style": {
             "navigationBarTitleText": "",
diff --git a/pages/news_details/index.vue b/pages/news_details/index.vue
index 25aa753..63b9c5b 100644
--- a/pages/news_details/index.vue
+++ b/pages/news_details/index.vue
@@ -13,7 +13,7 @@
       </view>
       <view class="picTxt acea-row row-between-wrapper" v-if="store_info.id">
         <view class="pictrue">
-          <image :src="store_info.image"></image>
+          <image :src="store_info.image" ></image>
         </view>
         <view class="text">
           <view class="name line1">{{store_info.store_name}}</view>
@@ -27,10 +27,13 @@
       </view>
       <!-- #ifdef H5 -->
       <button class="bnt bg-color" hover-class='none' @click="listenerActionSheet"
-        v-if="this.$wechat.isWeixin()">和好友一起分享</button>
+        >和好友一起分享</button>
       <!-- #endif -->
       <!-- #ifdef MP -->
       <button class="bnt bg-color" open-type="share" hover-class='none'>和好友一起分享</button>
+      <!-- #endif -->
+	  <!-- #ifdef APP-PLUS -->
+      <button class="bnt bg-color" open-type="share" hover-class='none'  @click="listenerActionSheet" >和好友一起分享</button>
       <!-- #endif -->
     </view>
     <shareInfo @setShareInfoStatus="setShareInfoStatus" :shareInfoStatus="shareInfoStatus"></shareInfo>
diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index 152b144..3170825 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -325,6 +325,7 @@
 				spreadInfo({
 					source: that.source
 				}).then(res => {
+					console.log(res);
 					that.userInfo = res.data;
 					that.minPrice = res.data.user_extract_min;
 				});
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 5994fdf..ee1a357 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -12,7 +12,8 @@
 								v-if="addressInfo.is_default">[默认]</text>{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}{{addressInfo.detail}}
 						</view>
 					</view>
-					<navigator v-else :url="'/pages/users/user_address/index?cartId='+cartId" hover-class="none" class='addressCon'>
+					<navigator v-else :url="'/pages/users/user_address/index?cartId='+cartId" hover-class="none"
+						class='addressCon'>
 						<view class='setaddress'>设置收货地址</view>
 					</navigator>
 					<view class='iconfont icon-jiantou'></view>
@@ -71,7 +72,8 @@
 											class="price">￥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }}</text>
 									</view>
 									<view class="progress_pay">
-										{{ goods.productPresell.final_start_time | filterDay}}开始支付尾款</view>
+										{{ goods.productPresell.final_start_time | filterDay}}开始支付尾款
+									</view>
 								</view>
 							</view>
 						</view>
@@ -101,9 +103,9 @@
 										</view>
 										<view class="delivery_type">
 											<text v-if="!goods.allow_delivery">不支持快递</text>
-											<text v-if="!goods.allow_take">不支持到店核销</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>
@@ -117,7 +119,9 @@
 						<view class="boxs">
 							<view class='item acea-row row-between-wrapper'>
 								<view>配送方式</view>
-								<view v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)" class='discount' @tap="openShowBox(item,index)">
+								<view
+									v-if="item.delivery_way.length == 2 && (item.order.allow_delivery && item.order.allow_take)"
+									class='discount' @tap="openShowBox(item,index)">
 									{{item.order.isTake==0 ? deliveryName :'到店核销'}}
 									<text class='iconfont icon-jiantou'></text>
 								</view>
@@ -134,7 +138,8 @@
 								</view>
 							</view>
 						</view>
-						<view class='item acea-row row-between-wrapper' v-if='shippingType==0 && item.isTake == 0 && order_model == 0'>
+						<view class='item acea-row row-between-wrapper'
+							v-if='shippingType==0 && item.isTake == 0 && order_model == 0'>
 							<view>快递费用 <text
 									v-if="item.list[0].productPresell && item.list[0].productPresell.presell_type == 2">(尾款阶段）</text>
 							</view>
@@ -193,33 +198,40 @@
 						<view v-if="item.key == 'mobile'" class='item acea-row row-between-wrapper'>
 							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
 							<view class='discount'>
-								<input type="text" v-model="item.value" placeholder="请填写手机号" placeholder-class='placeholder' />
+								<input type="text" v-model="item.value" placeholder="请填写手机号"
+									placeholder-class='placeholder' />
 							</view>
 						</view>
 						<view v-if="item.key == 'email'" class='item acea-row row-between-wrapper'>
 							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
 							<view class='discount'>
-								<input type="text" v-model="item.value" placeholder="请填写邮箱" placeholder-class='placeholder' />
+								<input type="text" v-model="item.value" placeholder="请填写邮箱"
+									placeholder-class='placeholder' />
 							</view>
 						</view>
 						<view v-if="item.key == 'idCard'" class='item acea-row row-between-wrapper'>
 							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
 							<view class='discount'>
-								<input type="text" v-model="item.value" placeholder="请填写身份证号" placeholder-class='placeholder' />
+								<input type="text" v-model="item.value" placeholder="请填写身份证号"
+									placeholder-class='placeholder' />
 							</view>
 						</view>
-						<view v-if="item.key == 'text' || item.key == 'number'" class='item acea-row row-between-wrapper'>
+						<view v-if="item.key == 'text' || item.key == 'number'"
+							class='item acea-row row-between-wrapper'>
 							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
 							<view class='discount'>
-								<input v-if="item.key == 'text'" type="text" v-model="item.value" :placeholder="'请填写'+item.title" placeholder-class='placeholder' />
-								<input v-if="item.key == 'number'" type="number" v-model="item.value" :placeholder="'请填写'+item.title" placeholder-class='placeholder' />
+								<input v-if="item.key == 'text'" type="text" v-model="item.value"
+									:placeholder="'请填写'+item.title" placeholder-class='placeholder' />
+								<input v-if="item.key == 'number'" type="number" v-model="item.value"
+									:placeholder="'请填写'+item.title" placeholder-class='placeholder' />
 							</view>
 						</view>
 						<view v-if="item.key == 'date'" class='item acea-row row-between-wrapper'>
 							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
 							<view class='discount'>
 								<picker mode="date" :value="item.value" start="1970-01-01" @change="bindDateChange">
-									<input type="text" @click="getTime(index)" disabled v-model="item.value" placeholder="请选择日期" placeholder-class='placeholder' />
+									<input type="text" @click="getTime(index)" disabled v-model="item.value"
+										placeholder="请选择日期" placeholder-class='placeholder' />
 								</picker>
 							</view>
 						</view>
@@ -227,18 +239,21 @@
 							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
 							<view class='discount'>
 								<picker mode="time" :value="item.value" start="1970-01-01" @change="bindDateChange">
-									<input type="text" @click="getTime(index)" disabled v-model="item.value" placeholder="请选择时间" placeholder-class='placeholder' />
+									<input type="text" @click="getTime(index)" disabled v-model="item.value"
+										placeholder="请选择时间" placeholder-class='placeholder' />
 								</picker>
 							</view>
 						</view>
 						<view v-if="item.key == 'image'" class='item'>
 							<view><text class="item-require" v-if="item.require">*</text>{{item.title}}</view>
 							<view class="upload">
-								<view class='pictrue' v-for="(itemn,indexn) in item.value" :key="indexn" :data-index="indexn" @click="getPhotoClickIdx">
+								<view class='pictrue' v-for="(itemn,indexn) in item.value" :key="indexn"
+									:data-index="indexn" @click="getPhotoClickIdx">
 									<image :src="itemn"></image>
 									<text class="iconfont icon-guanbi4" @click.stop="DelPic(item,indexn)"></text>
 								</view>
-								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(item)' v-if="pics.length < 5">
+								<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic(item)'
+									v-if="pics.length < 5">
 									<text class='iconfont icon-icon25201'></text>
 									<view>上传图片</view>
 								</view>
@@ -259,16 +274,18 @@
 			<!--收货人信息-->
 			<view v-if="is_take" class="wrapper virtual_form">
 				<form report-submit='true'>
-					<view  class='item acea-row row-between-wrapper'>
+					<view class='item acea-row row-between-wrapper'>
 						<view><text class="item-require">*</text>收货人姓名</view>
 						<view class='discount'>
-							<input type="text" v-model="post.real_name" placeholder="请填写收货人姓名" placeholder-class='placeholder' />
+							<input type="text" v-model="post.real_name" placeholder="请填写收货人姓名"
+								placeholder-class='placeholder' />
 						</view>
-					</view>					
+					</view>
 					<view class='item acea-row row-between-wrapper'>
 						<view><text class="item-require">*</text>收货人电话</view>
 						<view class='discount'>
-							<input type="number" v-model="post.phone" placeholder="请填写收货人电话" placeholder-class='placeholder' />
+							<input type="number" v-model="post.phone" placeholder="请填写收货人电话"
+								placeholder-class='placeholder' />
 						</view>
 					</view>
 				</form>
@@ -325,12 +342,12 @@
 					<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 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>
+						<text v-else>使用了{{integral_count}}个积分，抵扣<text class="pColor">{{integral_price}}元</text></text>
 						<checkbox-group class="checkbox integral_checked" name="isDefault" @change="changeIntegral">
 							<label>
 								<checkbox :checked="use_integral ? true : false" />
@@ -374,20 +391,23 @@
 			</view>
 		</view>
 		<block v-if="coupon.status">
-			<couponListWindow :coupon='coupon' :couponTitle="plantCoupon ? '平台优惠券' : '优惠券'" @ChangCouponsClone="ChangCouponsClone" @getCoupon="getCoupon"
-				:openType='openType' @ChangCoupons="ChangCoupons" :coupon_amount='coupon_amount'
-				:coupon_number='coupon_number'></couponListWindow>
+			<couponListWindow :coupon='coupon' :couponTitle="plantCoupon ? '平台优惠券' : '优惠券'"
+				@ChangCouponsClone="ChangCouponsClone" @getCoupon="getCoupon" :openType='openType'
+				@ChangCoupons="ChangCoupons" :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>
 		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
 		<block v-if="isShowBox">
-			<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj" :radioList="radioList" @close="boxClose" @confirmBtn="getData">
+			<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj"
+				:radioList="radioList" @close="boxClose" @confirmBtn="getData">
 			</checkDelivery>
 		</block>
 		<!--优惠明细弹窗-->
-		<discountDetails :isShowDiscount="isShowDiscount" @close="closeDiscount" :couponData="couponData"></discountDetails>
+		<discountDetails :isShowDiscount="isShowDiscount" @close="closeDiscount" :couponData="couponData">
+		</discountDetails>
 	</view>
 </template>
 <script>
@@ -435,10 +455,16 @@
 	import discountDetails from '@/components/discountDetails/index.vue';
 	import addInvoicing from '@/components/addInvoicing';
 	import parser from "@/components/jyf-parser/jyf-parser";
-	import { mapGetters } from "vuex";
+	import {
+		mapGetters
+	} from "vuex";
 	import authorize from '@/components/Authorize';
-	import { configMap } from '@/utils';
-	import { HTTP_REQUEST_URL } from '@/config/app';
+	import {
+		configMap
+	} from '@/utils';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	export default {
 		components: {
 			couponListWindow,
@@ -504,14 +530,13 @@
 					img: 'width:100%;display:block;',
 					video: 'width:100%;'
 				},
-				radioList:[
-					{
-						title:this.deliveryName,
-						check:true
+				radioList: [{
+						title: this.deliveryName,
+						check: true
 					},
 					{
-						title:'到店核销',
-						check:false
+						title: '到店核销',
+						check: false
 					}
 				],
 				payType: 'weixin', //支付方式
@@ -616,21 +641,19 @@
 			};
 		},
 		computed: {
-			...mapGetters(['isLogin','viewColor']),
+			...mapGetters(['isLogin', 'viewColor']),
 			...configMap(['hide_mer_status', 'alipay_open', 'yue_pay_status']),
 		},
 		watch: {
-			alipay_open(n){
+			alipay_open(n) {
 				this.payMode[1].payStatus = n
 			},
-			yue_pay_status(n){
+			yue_pay_status(n) {
 				this.payMode[2].payStatus = n
 			}
 		},
-		onReady() {
-		},
-		mounted: function() {
-		},
+		onReady() {},
+		mounted: function() {},
 		onLoad: function(options) {
 			this.seckillId = options.seckillId
 			// #ifdef H5
@@ -678,9 +701,9 @@
 				})
 			}
 			uni.setStorage({
-				key:'invoice_Data',
-				data:{},
-				success: function(){}
+				key: 'invoice_Data',
+				data: {},
+				success: function() {}
 			})
 		},
 		/**
@@ -718,13 +741,13 @@
 				this.use_integral = !this.use_integral;
 				this.getConfirm(this.addressId);
 			},
-			showPresellAgree(){
+			showPresellAgree() {
 				this.getPresellAgree()
 			},
-			showInvoice(){
+			showInvoice() {
 				this.getAgreement();
 			},
-			showCoupon(){
+			showCoupon() {
 				this.getCouponAgreement();
 			},
 			// 打开配送方式弹窗
@@ -757,13 +780,13 @@
 				that.$util.uploadImageOne('upload/image', function(res) {
 					let pics = item.value || []
 					pics.push(res.data.path);
-					that.$set(item,'value', pics);
+					that.$set(item, 'value', pics);
 				});
 			},
 			/** 删除图片*/
-			DelPic: function(item,index) {
+			DelPic: function(item, index) {
 				let that = this,
-				pic = this.pics[index];
+					pic = this.pics[index];
 				item.value.splice(index, 1);
 				// that.$set(that, 'pics', that.pics);
 			},
@@ -805,7 +828,7 @@
 			},
 			// 授权关闭
 			authColse: function(e) {
-					this.isShowAuth = e;
+				this.isShowAuth = e;
 			},
 			/**
 			 * 获取门店列表数据
@@ -924,7 +947,7 @@
 			// 计算优惠券抵扣
 			couponNum() {
 				let tempTotal = 0,
-				tempCouponNum = 0
+					tempCouponNum = 0
 				this.cartInfo.forEach((item, index) => {
 					tempCouponNum = this.$util.$h.Add(tempCouponNum, item.order.coupon_price)
 					tempTotal = this.$util.$h.Add(tempTotal, item.order.pay_price)
@@ -982,7 +1005,7 @@
 					// 默认选中
 					that.is_take = false
 					res.data.order.forEach(el => {
-						if(el.order.isTake == 1)that.is_take = true
+						if (el.order.isTake == 1) that.is_take = true
 						el.isTake = 0
 						that.subCoupon[el.mer_id] = []
 						el.coupon.forEach(coupon => {
@@ -990,9 +1013,9 @@
 								that.subCoupon[el.mer_id].push(coupon.coupon_user_id)
 							}
 						})
-					})	
+					})
 					that.subCoupon['0'] = []
-					if(res.data.platformCoupon.length > 0){
+					if (res.data.platformCoupon.length > 0) {
 						res.data.platformCoupon.forEach(el => {
 							if (el.checked) {
 								that.subCoupon[el.mer_id] = []
@@ -1000,10 +1023,14 @@
 							}
 						})
 					}
-					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_amount", parseFloat(res.data.order[that.couponIndex].order.coupon_price) + parseFloat(res.data.total_platform_coupon_price));
-					that.$set(that, "store_coupon_amount", parseFloat(res.data.order[that.couponIndex].order.coupon_price));
+					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_amount", parseFloat(res.data.order[that.couponIndex].order
+						.coupon_price) + parseFloat(res.data.total_platform_coupon_price));
+					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, 'couponData', res.data);
 					that.$set(that, 'cartInfo', res.data.order);
@@ -1016,14 +1043,15 @@
 					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);
+					that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length > 0) ? that
+						.order_extend : res.data.order_extend);
 					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.deliveryName = res.data.order_model == 0 ? '快递配送' : '虚拟发货'
 					that.order_key = res.data.key
 					uni.getStorage({
 						key: "invoice_Data",
@@ -1055,7 +1083,10 @@
 						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}
+						that.post = {
+							real_name: res.data.real_name,
+							phone: res.data.phone
+						}
 						this.getConfirm(that.addressId);
 					})
 				} else {
@@ -1063,12 +1094,19 @@
 						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: ''}
+						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) {
+				console.log(e);
 				let that = this;
 				let active = e;
 				that.active = active;
@@ -1083,8 +1121,8 @@
 				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);
+				this.$set(this, "coupon_number", this.store_coupon_number);
+				this.$set(this, "coupon_amount", this.store_coupon_amount);
 			},
 			couponTap2: function(item, index) {
 				this.coupon = {
@@ -1093,8 +1131,8 @@
 					status: true
 				}
 				this.plantCoupon = true
-				this.$set(this, "coupon_number",  this.subCoupon['0'].length);
-				this.$set(this, "coupon_amount",  this.plant_coupon_amount);
+				this.$set(this, "coupon_number", this.subCoupon['0'].length);
+				this.$set(this, "coupon_amount", this.plant_coupon_amount);
 			},
 			car: function() {
 				let that = this;
@@ -1102,11 +1140,12 @@
 			},
 			onAddress: function() {
 				let that = this;
-				if(that.addressInfo.real_name){
+				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{
+					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}`,
 					});
@@ -1191,11 +1230,11 @@
 							})
 							// #endif
 							// #ifdef APP-PLUS
-							let mp_pay_name=''
-							if(uni.requestOrderPayment){
-								mp_pay_name='requestOrderPayment'
-							}else{
-								mp_pay_name='requestPayment'
+							let mp_pay_name = ''
+							if (uni.requestOrderPayment) {
+								mp_pay_name = 'requestOrderPayment'
+							} else {
+								mp_pay_name = 'requestPayment'
 							}
 							uni[mp_pay_name]({
 								provider: 'wxpay',
@@ -1212,7 +1251,8 @@
 									});
 								},
 								fail: (e) => {
-									let url = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=取消支付';
+									let url = '/pages/order_pay_status/index?order_id=' + orderId +
+										'&msg=取消支付';
 									return that.$util.Tips({
 										title: '取消支付',
 									}, {
@@ -1221,7 +1261,8 @@
 									});
 								},
 								complete: () => {
-									let url = '/pages/order_pay_status/index?order_id=' + orderId + '&msg=取消支付';
+									let url = '/pages/order_pay_status/index?order_id=' + orderId +
+										'&msg=取消支付';
 									return that.$util.Tips({
 										title: '取消支付',
 									}, {
@@ -1237,11 +1278,11 @@
 						case "routine":
 							jsConfig.timeStamp = jsConfig.timestamp;
 							that.toPay = true;
-							let mp_pay_name=''
-							if(uni.requestOrderPayment){
-								mp_pay_name='requestOrderPayment'
-							}else{
-								mp_pay_name='requestPayment'
+							let mp_pay_name = ''
+							if (uni.requestOrderPayment) {
+								mp_pay_name = 'requestOrderPayment'
+							} else {
+								mp_pay_name = 'requestPayment'
 							}
 							uni[mp_pay_name]({
 								...jsConfig,
@@ -1280,7 +1321,8 @@
 							// #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}`
+							let url =
+								`${host}/pages/order_pay_status/index?order_id=${orderId}&msg=${res.message}`
 							let eUrl = encodeURIComponent(url)
 							let jsurl = jsConfig.mweb_url || jsConfig.h5_url
 							let locations = `${jsurl}&redirect_url=${eUrl}`
@@ -1327,7 +1369,7 @@
 							});
 							break;
 							// #endif
-						default: 
+						default:
 							let pages = '/pages/order_pay_status/index?order_id=' +
 								orderId + '&msg=取消支付'
 							return that.$util.Tips({
@@ -1379,14 +1421,28 @@
 					}
 				}
 			},
-			bindDateChange(e){
+			bindDateChange(e) {
 				let that = this
 				that.$set(that.order_extend[that.virtualIndex], 'value', e.detail.value);
 			},
-			getTime(index){
+			getTime(index) {
 				this.virtualIndex = index;
 			},
 			SubOrder: function(e) {
+				console.log(this.active);
+				if (this.active == 0) {
+					uni.requestPayment({
+						"provider": "wxpay", //固定值为"wxpay"
+						"orderInfo": '1231032132',
+						success: function(res) {
+							// var rawdata = JSON.parse(res.rawdata);
+							console.log(res);
+						},
+						fail: function(err) {
+							console.log(err);
+						}
+					});
+				}
 				let that = this,
 					data = {};
 				if (!that.payType) return that.$util.Tips({
@@ -1411,57 +1467,67 @@
 						title: '请阅读并勾选协议，否则无法进行操作'
 					});
 				}
-				if(that.order_model == 1 && that.order_extend.length > 0){
-					for(var i=0; i<that.order_extend.length; i++){
+				if (that.order_model == 1 && that.order_extend.length > 0) {
+					for (var i = 0; i < that.order_extend.length; i++) {
 						let el = that.order_extend[i]
 						if (el.require) {
-							if(!el.value || el.value.length == 0){
+							if (!el.value || el.value.length == 0) {
 								return that.$util.Tips({
-									title: '请填写'+el.title
+									title: '请填写' + el.title
 								});
-							}else if(el.key == 'mobile' && !/^1(3|4|5|7|8|9|6)\d{9}$/i.test(el.value)){
+							} else if (el.key == 'mobile' && !/^1(3|4|5|7|8|9|6)\d{9}$/i.test(el.value)) {
 								return that.$util.Tips({
-									title: '请输入正确的'+el.title
+									title: '请输入正确的' + el.title
 								});
-							}else if(el.key == 'email' && !/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(el.value)){
+							} else if (el.key == 'email' && !/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(el
+									.value)) {
 								return that.$util.Tips({
-									title: '请输入正确的'+el.title
+									title: '请输入正确的' + el.title
 								});
-							}else if(el.key == 'idCard' && !/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/.test(el.value)){
+							} else if (el.key == 'idCard' && !
+								/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/
+								.test(el.value)) {
 								return that.$util.Tips({
-									title: '请输入正确的'+el.title
+									title: '请输入正确的' + el.title
 								});
 							}
-						}else if(el.value){
-							if(el.key == 'mobile' && !/^1(3|4|5|7|8|9|6)\d{9}$/i.test(el.value)){
+						} else if (el.value) {
+							if (el.key == 'mobile' && !/^1(3|4|5|7|8|9|6)\d{9}$/i.test(el.value)) {
 								return that.$util.Tips({
-									title: '请输入正确的'+el.title
+									title: '请输入正确的' + el.title
 								});
-							}if(el.key == 'email' && !/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(el.value)){
+							}
+							if (el.key == 'email' && !/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(el.value)) {
 								return that.$util.Tips({
-									title: '请输入正确的'+el.title
+									title: '请输入正确的' + el.title
 								});
-							}if(el.key == 'idCard' && !/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/.test(el.value)){
+							}
+							if (el.key == 'idCard' && !
+								/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/
+								.test(el.value)) {
 								return that.$util.Tips({
-									title: '请输入正确的'+el.title
+									title: '请输入正确的' + el.title
 								});
 							}
 						}
-						that.extend[i] = {title: el.title,value: el.value}
+						that.extend[i] = {
+							title: el.title,
+							value: el.value
+						}
 					}
 				}
 				if (that.is_take) {
-					if(!that.post.real_name){
+					if (!that.post.real_name) {
 						return that.$util.Tips({
 							title: '请填写收货人姓名'
 						});
 					}
-					if(!that.post.phone){
+					if (!that.post.phone) {
 						return that.$util.Tips({
 							title: '请填写收货人电话'
 						});
 					}
-					if(that.post.phone && !/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.post.phone)){
+					if (that.post.phone && !/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.post.phone)) {
 						return that.$util.Tips({
 							title: '收货人电话格式不正确'
 						});
@@ -1490,7 +1556,7 @@
 					});
 					return;
 				}
-				data.takes=[]
+				data.takes = []
 				this.cartInfo.map(el => {
 					if (el.isTake == 1 || el.order.isTake) {
 						data.takes.push(el.mer_id)
@@ -1513,104 +1579,102 @@
 				// #ifndef MP
 				that.payment(data);
 				// #endif
-			},
-			// 打开配送方式弹窗
-			openShowBox(item, index) {
-				if(item.delivery_way.length == 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 => {
-						// console.log('success');
-					})
-				} 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
+				
+			
+		},
+		// 打开配送方式弹窗
+		openShowBox(item, index) {
+			if (item.delivery_way.length == 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 => {
+					// console.log('success');
+				})
+			} 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;
+		border: 1px solid var(--view-theme) !important;
+		background-color: var(--view-theme) !important;
+		color: #fff !important;
 	}
+
 	.order-submission .line {
 		position: absolute;
 		left: 0;
@@ -1618,58 +1682,72 @@
 		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{
+
+	.t-color {
 		color: var(--view-theme);
 	}
+
 	.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;
@@ -1686,14 +1764,17 @@
 		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;
@@ -1709,46 +1790,56 @@
 		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;
 	}
+
 	.order-submission .wrapper .item {
 		padding: 27rpx 30rpx;
 		font-size: 30rpx;
 		color: #282828;
 	}
-	.order-submission .virtual_form{
+
+	.order-submission .virtual_form {
 		padding: 0 30rpx;
 	}
+
 	/deep/.order-submission .virtual_form .uni-input-wrapper {
 		text-align: right;
 	}
-	
-	.order-submission .virtual_form .item-require{
+
+	.order-submission .virtual_form .item-require {
 		color: red;
 		margin-right: 4rpx;
 	}
-	.order-submission .virtual_form .item{
+
+	.order-submission .virtual_form .item {
 		border-bottom: 1rpx solid #EEEEEE;
 		padding: 27rpx 0;
 	}
+
 	.upload {
 		display: -webkit-box;
 		display: -moz-box;
@@ -1762,6 +1853,7 @@
 		-ms-flex-wrap: wrap;
 		flex-wrap: wrap;
 	}
+
 	.order-submission .virtual_form .pictrue {
 		width: 156rpx;
 		height: 156rpx;
@@ -1770,18 +1862,22 @@
 		font-size: 11px;
 		color: #bbb;
 		border-radius: 3rpx;
+
 		&:nth-child(4n) {
 			margin-right: 0;
 		}
+
 		&:nth-last-child(1) {
 			border: 0.5px solid #ddd;
 			box-sizing: border-box;
 		}
+
 		uni-image,
 		image {
 			width: 100%;
 			height: 100%;
 			border-radius: 1px;
+
 			img {
 				-webkit-touch-callout: none;
 				-webkit-user-select: none;
@@ -1795,6 +1891,7 @@
 				height: 100%;
 			}
 		}
+
 		.icon-guanbi4 {
 			color: #fff;
 			font-size: 14rpx;
@@ -1806,22 +1903,26 @@
 			text-align: center;
 			line-height: 30rpx;
 			border-radius: 0 8rpx 0 8rpx;
-			background: rgba(0,0,0,.6);
+			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;
 		color: #999;
+
 		&.discount_voice {
 			overflow: hidden;
 			text-overflow: ellipsis;
@@ -1830,21 +1931,25 @@
 			text-align: right;
 		}
 	}
+
 	.order-submission .wrapper .item .discount .iconfont {
 		color: #515151;
 		font-size: 30rpx;
 		margin-left: 15rpx;
 	}
+
 	.order-submission .wrapper .item .discount .num {
 		font-size: 32rpx;
 		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;
@@ -1854,18 +1959,22 @@
 		transform: translateY(-50%);
 		margin-left: 30rpx;
 	}
+
 	.order-submission .wrapper .item input {
 		flex: 1;
 		height: 100%;
 		margin-left: 20rpx;
 		text-align: right;
 	}
+
 	.order-submission .wrapper .item .placeholder {
 		color: #ccc;
 	}
+
 	.order-submission .wrapper .item .list {
 		margin-top: 35rpx;
 	}
+
 	.order-submission .wrapper .item .list .payItem {
 		border: 1px solid #eee;
 		border-radius: 6rpx;
@@ -1876,10 +1985,12 @@
 		font-size: 28rpx;
 		color: #282828;
 	}
+
 	.order-submission .wrapper .item .list .payItem.on {
 		border-color: var(--view-theme);
 		color: var(--view-theme);
 	}
+
 	.order-submission .wrapper .item .list .payItem .name {
 		width: 50%;
 		text-align: center;
@@ -1887,6 +1998,7 @@
 		justify-content: left;
 		padding-left: 80rpx;
 	}
+
 	.order-submission .wrapper .item .list .payItem .name .iconfont {
 		width: 44rpx;
 		height: 44rpx;
@@ -1898,33 +2010,41 @@
 		font-size: 30rpx;
 		margin-right: 15rpx;
 	}
+
 	.order-submission .wrapper .item .list .payItem .name .iconfont.icon-weixin2 {
 		background-color: #41b035;
 	}
+
 	.order-submission .wrapper .item .list .payItem .name .iconfont.icon-icon34 {
 		background-color: #4295D5;
 	}
+
 	.order-submission .wrapper .item .list .payItem .tip {
 		width: 49%;
 		text-align: center;
 		font-size: 26rpx;
 		color: #aaa;
 	}
+
 	.order-submission .moneyList {
 		margin-top: 12rpx;
 		background-color: #fff;
 		padding: 30rpx;
 	}
+
 	.order-submission .moneyList .item {
 		font-size: 28rpx;
 		color: #282828;
 	}
+
 	.order-submission .moneyList .item~.item {
 		margin-top: 20rpx;
 	}
+
 	.order-submission .moneyList .item .money {
 		color: #868686;
 	}
+
 	.order-submission .footer {
 		width: 100%;
 		height: 100rpx;
@@ -1939,14 +2059,17 @@
 		bottom: 0;
 		left: 0;
 		z-index: 30;
-		.footer_count{
+
+		.footer_count {
 			font-size: 28rpx;
 		}
-		.coupon_price{
+
+		.coupon_price {
 			color: #999999;
 			font-size: 20rpx;
 			margin-top: 10rpx;
-			text{
+
+			text {
 				color: #282828;
 				padding: 2rpx 10rpx;
 				background: #F5F5F5;
@@ -1958,9 +2081,11 @@
 			}
 		}
 	}
-	.pColor{
+
+	.pColor {
 		color: var(--view-priceColor);
 	}
+
 	.order-submission .footer .settlement {
 		font-size: 30rpx;
 		color: #fff;
@@ -1970,45 +2095,57 @@
 		border-radius: 50rpx;
 		text-align: center;
 		line-height: 70rpx;
+
 		&.disabled {
 			background-color: #cccccc;
 		}
 	}
+
 	.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;
 			background-color: #fff;
+
 			.store-title {
 				display: flex;
 				align-items: center;
 				padding: 28rpx 30rpx;
+
 				.icon-shangjiadingdan {
 					font-size: 32rpx;
 				}
+
 				.icon-xiangyou {
 					font-size: 26rpx;
 					color: #999;
 				}
+
 				.txt {
 					margin: 0 8rpx;
 				}
 			}
+
 			.product-item {
 				display: flex;
 				padding: 25rpx 30rpx;
 				border-top: 1px solid #F0F0F0;
+
 				.img-box {
 					width: 130rpx;
 					height: 130rpx;
@@ -2019,6 +2156,7 @@
 						border-radius: 16rpx;
 					}
 				}
+
 				.content {
 					position: relative;
 					width: 550rpx;
@@ -2026,10 +2164,12 @@
 					font-size: 28rpx;
 					color: #282828;
 					overflow: hidden;
+
 					&.event_content {
 						.line1 {
 							width: 360rpx;
 						}
+
 						.price {
 							position: absolute;
 							top: 0;
@@ -2042,6 +2182,7 @@
 							}
 						}
 					}
+
 					.event_name {
 						display: inline-block;
 						margin-right: 9rpx;
@@ -2052,47 +2193,57 @@
 						text-align: center;
 						border-radius: 6rpx;
 					}
+
 					.event_ship {
 						font-size: 20rpx;
 						margin-top: 10rpx;
 					}
+
 					.label {
 						margin-top: 10rpx;
 						color: #868686;
 						font-size: 20rpx;
 					}
+
 					.price {
 						margin-top: 20rpx;
 						color: var(--view-priceColor);
 						position: relative;
+
 						text {
 							margin-left: 10rpx;
 							color: #999;
 						}
-						.delivery_type{
+
+						.delivery_type {
 							float: right;
-							text{
+
+							text {
 								color: var(--view-priceColor);
 								font-size: 20rpx;
 							}
-							
+
 						}
 					}
+
 					.err-txt {
 						display: flex;
 						align-items: center;
 						margin-top: 18rpx;
 						color: $theme-color;
+
 						.iconfont {
 							margin-right: 10rpx;
 						}
 					}
+
 					.step {
 						position: absolute;
 						right: 0;
 						top: 100rpx;
 						display: flex;
 						align-items: center;
+
 						.min {
 							width: 50rpx;
 							height: 40rpx;
@@ -2101,6 +2252,7 @@
 							background-position: center;
 							background-repeat: no-repeat;
 						}
+
 						.num-box {
 							width: 68rpx;
 							height: 40rpx;
@@ -2109,6 +2261,7 @@
 							background: #F2F2F2;
 							font-size: 23rpx;
 						}
+
 						.add {
 							width: 50rpx;
 							height: 40rpx;
@@ -2121,16 +2274,20 @@
 				}
 			}
 		}
+
 		.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;
@@ -2141,17 +2298,20 @@
 					left: 35rpx;
 					top: 18rpx;
 				}
+
 				&:nth-child(2) {
 					&::before {
 						bottom: 64rpx;
 						top: auto;
 						background: #EFEFEF;
 					}
+
 					&::after {
 
 						background: #EFEFEF;
 					}
 				}
+
 				&::after {
 					content: '';
 					display: block;
@@ -2163,6 +2323,7 @@
 					top: 10rpx;
 					left: 29rpx;
 				}
+
 				.name {
 					float: left;
 					color: #282828;
@@ -2171,6 +2332,7 @@
 						color: var(--view-theme);
 					}
 				}
+
 				.price {
 					float: right;
 					color: #282828;
@@ -2180,6 +2342,7 @@
 					}
 				}
 			}
+
 			.progress_pay {
 				padding-left: 60rpx;
 				font-size: 24rpx;
@@ -2188,23 +2351,28 @@
 			}
 		}
 	}
+
 	.integral_checked {
 		margin-left: 10rpx;
 		position: relative;
 		top: -2rpx;
 		display: inline;
 	}
+
 	uni-checkbox-group,
 	.checkgroup {
 		width: 100%;
+
 		.checkbox {
 			float: right;
 		}
 	}
+
 	.icon-wenhao1 {
 		color: #868686;
 		margin-right: 6rpx;
 	}
+
 	.total {
 		display: flex;
 		justify-content: flex-end;
@@ -2212,16 +2380,19 @@
 		padding-bottom: 30rpx;
 		font-size: 26rpx;
 		color: #282828;
+
 		.price {
 			margin-left: 10rpx;
 			color: var(--view-priceColor);
 			font-size: 28rpx;
 			font-weight: bold;
+
 			text {
 				font-size: 20rpx;
 			}
 		}
 	}
+
 	.store-address {
 		padding: 30rpx 23rpx;
 		margin: 0 30rpx;
@@ -2243,18 +2414,22 @@
 		-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;
@@ -2265,14 +2440,17 @@
 				left: 0;
 				top: 18rpx;
 			}
+
 			.iconfont {
 				color: var(--view-theme);
 			}
+
 			.map_text {
 				color: var(--view-theme);
 			}
 		}
 	}
+
 	.settlementAgreement {
 		width: 100%;
 		height: 100%;
@@ -2282,6 +2460,7 @@
 		background: rgba(0, 0, 0, .5);
 		z-index: 40;
 	}
+
 	.settlementAgreement .setAgCount {
 		background: #fff;
 		width: 656rpx;
@@ -2296,18 +2475,22 @@
 		-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;
@@ -2315,12 +2498,14 @@
 		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;
@@ -2331,4 +2516,4 @@
 		height: 756rpx;
 		overflow-y: scroll;
 	}
-</style>
+</style>
\ No newline at end of file