diff --git a/api/product.js b/api/product.js
index 94fb534..ee62028 100644
--- a/api/product.js
+++ b/api/product.js
@@ -9,8 +9,14 @@
 // +----------------------------------------------------------------------
 import request from "@/utils/request.js";
 
+
 /**
- * 获取商品详情
+ * 商户类型列表
+ */
+export const intentionList = (data) => request.get('intention/detail', data)
+
+/**
+ * 商户类型申请
  */
 export const shopTypeChange = (data) => request.post('intention/change', data)
 
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 12f1385..a018b6e 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -50,7 +50,8 @@
 					<view v-if="val.product" class="goods acea-row row-between-wrapper">
 						<view class="picTxt acea-row row-between-wrapper">
 							<view class="pictrue">
-								<image :src="val.product.cart_info.productAttr.image||val.product.cart_info.product.image" />
+								<image
+									:src="val.product.cart_info.productAttr.image||val.product.cart_info.product.image" />
 							</view>
 							<view class="text acea-row row-between row-column">
 								<view class="info line1 refund-info">
@@ -96,12 +97,12 @@
 		<view v-else class="list">
 			<view class="item" v-for="(item, index) in list" :key="index">
 				<view class="order-num acea-row row-middle">
-					<text class="cloud-tag" v-if="item.source==103">云商品</text> 
+					<text class="cloud-tag" v-if="item.source==103">云商品</text>
 					<text v-else-if="item.activity_type != 0" class="activity_type">
 						{{ item.activity_type == 1 ? '秒杀' : item.activity_type == 2 ? '预售' : item.activity_type == 3 ? '助力' : item.activity_type == 4 ? '拼团' : item.activity_type == 10 ? '套餐' :'' }}
-					</text> 
-          订单号：{{ item.order_sn }}
-          <text class="time">下单时间：{{ item.create_time }}</text>
+					</text>
+					订单号：{{ item.order_sn }}
+					<text class="time">下单时间：{{ item.create_time }}</text>
 					<text class="order-status"
 						v-if="item.refunding != 0 && where.status != 1">{{item.refunding==1 ? '退款中' : item.refunding==2 ? '部分退款' : '全部退款'}}</text>
 				</view>
@@ -120,9 +121,10 @@
 									<view class="attr" v-if="val.cart_info.productAttr.sku">
 										{{ val.cart_info.productAttr.sku }}
 									</view>
-                  <view class="attr" @click.stop="showBarCode(val.cart_info.productAttr.product)" v-if="val.cart_info.productAttr.product&&val.cart_info.productAttr.product.bar_code">
-                  	商品条码: {{ val.cart_info.productAttr.product.bar_code }}
-                  </view>
+									<view class="attr" @click.stop="showBarCode(val.cart_info.productAttr.product)"
+										v-if="val.cart_info.productAttr.product&&val.cart_info.productAttr.product.bar_code">
+										商品条码: {{ val.cart_info.productAttr.product.bar_code }}
+									</view>
 								</view>
 							</view>
 							<view class="money">
@@ -174,10 +176,12 @@
 							一键改价
 						</view>
 						<view class="bnt" @click="modify(item, 1)">订单备注</view>
-						<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&&(item.activity_type==98||item.activity_type==99)"
+						<view class="bnt bnt_color"
+							v-if="where.status == 2 && item.order_type == 0&&(item.activity_type==98||item.activity_type==99)"
 							@click="toPostage(item)">去发货
 						</view>
-						<view class="bnt bnt_color" v-if="where.status == 2 && item.order_type == 0&& item.order_type !=1 &&item.activity_type==0"
+						<view class="bnt bnt_color"
+							v-if="where.status == 2 && item.order_type == 0&& item.order_type !=1 &&item.activity_type==0"
 							@click="toPostagequ(item)">去发货
 						</view>
 						<view class="bnt bnt_color"
@@ -209,18 +213,48 @@
 			</view>
 			<view class="mask" @touchmove.prevent v-show="refundMark === true"></view>
 		</view>
+
 		<u-popup :show="popUpShow" mode="center" :closeOnClickOverlay="true" round="12" @close="popUpClose">
-			<view style="text-align: center;margin-top: 30rpx;">
+			<!-- <view style="text-align: center;margin-top: 30rpx;">
 				请把二维码展示给取货人员
 			</view>
 			<view style="padding: 28.07rpx;">
 				<image :src="payCodeUrl" style="width:400rpx;height: 400rpx;"></image>
 
+			</view> -->
+
+			<view class="form">
+				<view class="form-item">
+					<view class="form-item-label">送货人姓名</view>
+					<view class="form-item-val">
+						<u-input placeholder="请输入送货人姓名" placeholderStyle="color:#999;font-size:26rpx;"
+							border="surround"></u-input>
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="form-item-label">送货人电话</view>
+					<view class="form-item-val">
+						<u-input placeholder="请输入送货人电话" placeholderStyle="color:#999;font-size:26rpx;"
+							border="surround"></u-input>
+					</view>
+				</view>
+
+				<view class="form-item">
+					<view class="form-item-label">备注</view>
+					<view class="form-item-val">
+						<u-input placeholder="请输入备注" placeholderStyle="color:#999;font-size:26rpx;"></u-input>
+					</view>
+				</view>
+
+				<view class="form-btn">
+					<view class="form-btn-cancel" @click="popUpShow = false">取消</view>
+					<view class="form-btn-confirm">确认</view>
+				</view>
 			</view>
 		</u-popup>
-<view class="bar-code" v-show="showBar" @click="showBar=false">
-      <barcode ref="code"></barcode>
-    </view>
+		<view class="bar-code" v-show="showBar" @click="showBar=false">
+			<barcode ref="code"></barcode>
+		</view>
 	</view>
 </template>
 
@@ -260,7 +294,7 @@
 		},
 		data() {
 			return {
-        showBar: false,
+				showBar: false,
 				current: "",
 				change: false,
 				refundMark: false,
@@ -271,7 +305,7 @@
 					status: 1,
 					search_info: '',
 					product_type: '',
-          pay_time: null,
+					pay_time: null,
 				},
 				list: [],
 				loaded: false,
@@ -293,17 +327,17 @@
 					that.init();
 				}
 			},
-			
+
 		},
 		onLoad(option) {
 			this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? ""
 			this.where.status = option.types
 			this.current = "";
 			this.merId = option.merId;
-      if(option.pay_time){
-        this.where.pay_time = option.pay_time;
-      }
-		
+			if (option.pay_time) {
+				this.where.pay_time = option.pay_time;
+			}
+
 			this.getIndex();
 		},
 		methods: {
@@ -312,13 +346,13 @@
 				this.popUpShow = false
 
 			},
-      showBarCode(val){
-        this.showBar = true
-        this.$refs['code'].init({
-          name: val.store_name,
-          code: val.bar_code
-        });
-      },
+			showBarCode(val) {
+				this.showBar = true
+				this.$refs['code'].init({
+					name: val.store_name,
+					code: val.bar_code
+				});
+			},
 			//同意先货后款订单
 			tongyi(id, number) {
 				let data = {
@@ -342,14 +376,14 @@
 			},
 			handleSearch() {
 				this.loaded = false;
-			   this.where.page = 1;
-			   	this.list = [];
+				this.where.page = 1;
+				this.list = [];
 				this.getIndex();
 			},
 			// 获取数据
 			getIndex() {
-			
-			
+
+
 				let that = this;
 				// console.log(that.merId)
 				if (that.loading || that.loaded) return;
@@ -402,12 +436,12 @@
 				if (val != 'verify') {
 					if (this.where.status != val) {
 						this.where.status = val;
-						this.where.search_info=''
+						this.where.search_info = ''
 						delete this.where.is_verify;
 						this.init();
 					}
 				} else {
-					this.where.search_info=''
+					this.where.search_info = ''
 					this.where.is_verify = 1;
 					delete this.where.status;
 					this.init();
@@ -477,6 +511,7 @@
 					}
 				})
 			},
+
 			//收件码
 			toPostagequ(item) {
 				this.popUpShow = true
@@ -486,7 +521,12 @@
 						this.payCodeUrl = res.data.qrcode
 					}
 				})
+
+
+
+
 			},
+
 			toPostage(item) {
 				let that = this;
 				if (item.refunding != 0) {
@@ -575,7 +615,7 @@
 				uni.navigateTo({
 					url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}`
 				})
-				
+
 			},
 			toRefundDetail(item) {
 				uni.navigateTo({
@@ -590,6 +630,63 @@
 </script>
 
 <style lang="scss">
+	.form {
+		padding: 40rpx 60rpx;
+
+		.form-item {
+			display: flex;
+			align-items: center;
+
+			.form-item-label {
+				width: 140rpx;
+				font-size: 28rpx;
+				color: #333;
+				font-weight: bold;
+				margin-right: 20rpx;
+			}
+
+			.form-item-val {
+				flex: 1;
+			}
+		}
+
+		.form-btn {
+			display: flex;
+			justify-content: center;
+			margin-top: 50rpx;
+
+			.form-btn-cancel {
+				width: 83px;
+				height: 60rpx;
+				line-height: 60rpx;
+				border-radius: 30rpx;
+				text-align: center;
+				color: #2291F8;
+				border: 2rpx solid #2291F8;
+				margin-right: 40rpx;
+			}
+
+			.form-btn-confirm {
+				width: 83px;
+				height: 60rpx;
+				line-height: 60rpx;
+				background: linear-gradient(90deg, #2291F8 0%, #1CD1DC 100%);
+				border-radius: 30rpx;
+				text-align: center;
+				color: #fff;
+				font-size: 28rpx;
+			}
+
+			.form-btn-cancel:active {
+				background: rgba(209, 220, 255, .3);
+			}
+
+			.form-btn-confirm:active {
+				opacity: .8;
+			}
+		}
+	}
+
 	.pos-order-list .top-header {
 		position: fixed;
 		top: 0;
@@ -1017,25 +1114,27 @@
 			flex: 1;
 		}
 	}
-  .bar-code{
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 999999;
-    width: 100vw;
-    height: 100vh;
-    background-color: rgba(0,0,0,0.2);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-  .cloud-tag{
-    font-size: 20rpx;
-    padding: 2rpx 5rpx;
-    font-weight: 400;
-    background-color: #ff4c3c;
-    border-radius: 8rpx;
-    margin-right: 6rpx;
-    color: #fff;
-  }
+
+	.bar-code {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 999999;
+		width: 100vw;
+		height: 100vh;
+		background-color: rgba(0, 0, 0, 0.2);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.cloud-tag {
+		font-size: 20rpx;
+		padding: 2rpx 5rpx;
+		font-weight: 400;
+		background-color: #ff4c3c;
+		border-radius: 8rpx;
+		margin-right: 6rpx;
+		color: #fff;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 9bfcced..de670ae 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -80,13 +80,6 @@
 					<view>建议尺寸:710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)</view>
 				</view>
 			</view>
-
-			<view class="street_bg">
-				<view class="text flex_a_c"> <i class="iconfont icon-xinghao"></i> 商户类型变更</view>
-				<view class="street_img flex_a_c" @click="changeType">
-					类型变更
-				</view>
-			</view>
 		</view>
 
 		<view class="basice_item">
@@ -100,8 +93,7 @@
 						<checkbox-group name="" @change="checkboxChange">
 							<checkbox disabled :checked="isZiti" :value="check.ziti" /><text
 								class="text ziti">到店自提</text>
-							<checkbox :checked="isKuaidi" :value="check.kuaidi" /><text
-								class="text">商家配送</text>
+							<checkbox :checked="isKuaidi" :value="check.kuaidi" /><text class="text">商家配送</text>
 						</checkbox-group>
 					</view>
 				</view>
@@ -482,16 +474,6 @@
 				});
 			},
 
-			// 商户类型变更
-			changeType() {
-				uni.navigateTo({
-					url: "/pages/product/shop_type_change/index",
-					fail(err) {
-						console.log(err);
-					}
-				})
-			},
-
 			seleckImage(i) {
 				let that = this;
 				that.$util.uploadImageOne('upload/image', function(res) {
diff --git a/pages/product/shop_type_change/index.vue b/pages/product/shop_type_change/index.vue
index d023f0a..8462196 100644
--- a/pages/product/shop_type_change/index.vue
+++ b/pages/product/shop_type_change/index.vue
@@ -90,9 +90,12 @@
 							title: res.message
 						}, () => {
 							uni.navigateTo({
-								url: "/pages/product/shop_type_change/progress",
+								url: "/pages/product/shop_type_change/list",
 								fail(err) {
 									console.log(err);
+								},
+								success(res) {
+
 								}
 							})
 						})
diff --git a/pages/product/shop_type_change/list.vue b/pages/product/shop_type_change/list.vue
index 143ced7..efe1980 100644
--- a/pages/product/shop_type_change/list.vue
+++ b/pages/product/shop_type_change/list.vue
@@ -45,12 +45,29 @@
 </template>
 
 <script>
+	import {
+		intentionList
+	} from "@/api/product.js";
+
 	export default {
+		data() {
+			return {
+				list: []
+			}
+		},
+		onLoad() {
+			this.getData();
+		},
 		methods: {
 			hanldeTo() {
 				uni.navigateTo({
 					url: "/pages/product/shop_type_change/progress"
 				})
+			},
+			getData() {
+				intentionList().then(res => {
+					this.list = res.data;
+				})
 			}
 		}
 	}
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 20bb395..770fe43 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -8,10 +8,10 @@
 							<text class='phone'>{{addressInfo.phone}}</text>
 						</view>
 						<view>
-						
 							<text class='default t-color'
 								v-if="addressInfo.is_default">[默认]</text>{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}
-						 <text v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text>
+							<text
+								v-if='addressInfo.brigade'>{{typeof(addressInfo.brigade)=='string'?addressInfo.brigade:addressInfo.brigade.name }}{{addressInfo.detail}}</text>
 						</view>
 					</view>
 					<navigator v-else :url="'/pages/users/user_address/index?cartId='+cartId" hover-class="none"
@@ -121,7 +121,7 @@
 						<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)">
@@ -429,7 +429,7 @@
 	// +----------------------------------------------------------------------
 	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
 	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
+	// | Author: CRMEB Team <admin@crmeb.com> 
 	// +----------------------------------------------------------------------
 	let app = getApp();
 	import {
@@ -1028,10 +1028,10 @@
 					takes: that.take,
 					use_coupon: that.subCoupon,
 					use_integral: that.use_integral,
-          // source: 0
+					// source: 0
 				}).then(res => {
 					// 默认选中
-					that.product_type=res.data.order_type
+					that.product_type = res.data.order_type
 					that.is_take = false
 					res.data.order.forEach(el => {
 						if (el.order.isTake == 1) that.is_take = true
@@ -1084,9 +1084,10 @@
 					that.order_key = res.data.key
 					that.cartArr[4].title =
 						`结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%`
-            
-          // console.log(res.data);
-					if (res.data.order[0].credit_buy == 1 && (this.type_id == 12||this.type_id == 10||this.type_id == 17) && (res.data.order_type==99||res.data.order_type==98)) {
+
+					// console.log(res.data);
+					if (res.data.order[0].credit_buy == 1 && (this.type_id == 12 || this.type_id == 10 || this
+							.type_id == 17) && (res.data.order_type == 99 || res.data.order_type == 98)) {
 						this.cartArr[4].payStatus = 1
 					} else {
 						this.cartArr[4].payStatus = 0
@@ -1104,7 +1105,7 @@
 					})
 					uni.hideLoading();
 				}).catch(err => {
-          console.log('err', err);
+					console.log('err', err);
 					return this.$util.Tips({
 						title: err
 					}, {
@@ -1121,7 +1122,7 @@
 				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;
@@ -1129,12 +1130,12 @@
 							real_name: res.data.real_name,
 							phone: res.data.phone
 						}
-				
+
 						this.$nextTick(() => {
 							this.getConfirm(that.addressId);
 						})
 					})
-					
+
 				} else {
 					getAddressList().then(res => {
 						that.addressInfo = res.data.list.length > 0 ? res.data.list[0] : {};
@@ -1155,7 +1156,7 @@
 				let that = this;
 				let active = e;
 				that.active = active;
- 				// console.log(this.active);
+				// console.log(this.active);
 				that.animated = true;
 				that.payType = that.cartArr[active].value;
 				if (that.payType == 'weixin') {
@@ -1191,14 +1192,14 @@
 					that.address.address = true;
 					// that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&pinkId=' + this
 					// 	.pinkId + '&couponId=' + this.couponId;
-				  that.pagesUrl = '/pages/users/user_address_list/index'
+					that.pagesUrl = '/pages/users/user_address_list/index'
 				} else {
 					// uni.navigateTo({
 					// 	url: `/pages/users/user_address/index?cartId=${this.cartId}`,
 					// });
-				  uni.navigateTo({
-				  	url: `pages/users/user_address_list/index`,
-				  });
+					uni.navigateTo({
+						url: `pages/users/user_address_list/index`,
+					});
 				}
 			},
 			/**
@@ -1308,7 +1309,7 @@
 									});
 								},
 								fail: (e) => {
-										console.log(e,'111111111')
+									console.log(e, '111111111')
 									// 暂不跳转
 									let url = '/pages/order_pay_status/index?order_id=' + orderId +
 										'&msg=取消支付' + '&product_type=' + that.product_type;
@@ -1320,7 +1321,7 @@
 									});
 								},
 								complete: (res) => {
-								uni.hideLoading();
+									uni.hideLoading();
 									// 暂不跳转
 									// let url = '/pages/order_pay_status/index?order_id=' + orderId +
 									// 	'&msg=取消支付' + '&product_type=' + that.product_type;
@@ -1634,6 +1635,10 @@
 				// 	return
 				// }
 
+
+				//支付密码 balance 余额支付
+
+
 				uni.showLoading({
 					title: '订单支付中',
 					mask: true
@@ -2124,7 +2129,7 @@
 		bottom: 0;
 		left: 0;
 		z-index: 30;
-    
+
 
 		.footer_count {
 			font-size: 28rpx;
@@ -2161,7 +2166,7 @@
 		border-radius: 50rpx;
 		text-align: center;
 		line-height: 70rpx;
-    flex-shrink: 0;
+		flex-shrink: 0;
 
 		&.disabled {
 			background-color: #cccccc;