From a0b3ec00f67341dc345d00ababb96074824f0803 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Tue, 19 Mar 2024 18:10:33 +0800
Subject: [PATCH] 1

---
 config/app.js                               |   4 +-
 pages.json                                  |  44 +--
 pages/payment/qrcode.vue                    |   5 +-
 pages/product/basicSet.vue                  | 222 ++++++++-------
 pages/product/shop_type_change/index.vue    | 146 ++++++++++
 pages/product/shop_type_change/progress.vue | 299 ++++++++++++++++++++
 pages/users/login/login_copy.vue            |  59 ++--
 7 files changed, 616 insertions(+), 163 deletions(-)
 create mode 100644 pages/product/shop_type_change/index.vue
 create mode 100644 pages/product/shop_type_change/progress.vue

diff --git a/config/app.js b/config/app.js
index 4f7918e..d94b1a2 100644
--- a/config/app.js
+++ b/config/app.js
@@ -10,8 +10,8 @@ let wsApi
 
 // 在打包之前请检查当前环境是否正确
 // const env = 'dev'; // 开发
-// const env = 'prod'; // 生产
-const env = 'prew'; // 预上线
+const env = 'prod'; // 生产
+// const env = 'prew'; // 预上线
 
 switch (env) {
 	case 'prod':
diff --git a/pages.json b/pages.json
index 757d63a..f4f5ac0 100644
--- a/pages.json
+++ b/pages.json
@@ -1392,69 +1392,73 @@
 					"style": {
 						"navigationBarTitleText": "添加店铺分类"
 					}
-				},
-				{
+				}, {
 					"path": "addGoods/index",
 					"style": {
 						"navigationBarTitleText": "添加商品"
 					}
-				},
-				{
+				}, {
 					"path": "addGoods/secound",
 					"style": {
 						"navigationBarTitleText": "添加商品"
 					}
-				},
-				{
+				}, {
 					"path": "addGoods/addGoodDetils",
 					"style": {
 						"navigationBarTitleText": "商品详情"
 					}
-				},
-				{
+				}, {
 					"path": "addGoods/singleSpecification",
 					"style": {
 						"navigationBarTitleText": "单规格"
 					}
-				},
-				{
+				}, {
 					"path": "addGoods/mulSpecification",
 					"style": {
 						"navigationBarTitleText": "多规格"
 					}
-				},
-				{
+				}, {
 					"path": "addGoods/specificationProperties",
 					"style": {
 						"navigationBarTitleText": "规格属性"
 					}
-				},
-				{
+				}, {
 					"path": "addGoods/freightTemplate",
 					"style": {
 						"navigationBarTitleText": "运费模板",
 						"onReachBottomDistance": 100,
 						"enablePullDownRefresh": false
 					}
-				},
-				{
+				}, {
 					"path": "addGoods/addFreightTemplate",
 					"style": {
 						"navigationBarTitleText": "新增运费模板"
 					}
-				},
-				{
+				}, {
 					"path": "addGoods/modifyPrice",
 					"style": {
 						"navigationBarTitleText": "修改价格-多规格"
 					}
-				},
-				{
+				}, {
 					"path": "basicSet",
 					"style": {
 						"navigationBarTitleText": "商户基本设置",
 						"enablePullDownRefresh": false
 					}
+				}, {
+					"path": "shop_type_change/index",
+					"style": {
+						"navigationBarTitleText": "类型变更",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}, {
+					"path": "shop_type_change/progress",
+					"style": {
+						"navigationBarTitleText": "变更进度",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				},
 				{
 					"path": "addGood/addGood",
diff --git a/pages/payment/qrcode.vue b/pages/payment/qrcode.vue
index aecb103..d3e1554 100644
--- a/pages/payment/qrcode.vue
+++ b/pages/payment/qrcode.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="v-navbar">
-			<u-navbar title="提货付款" :autoBack="true" :fixed="false" bgColor="transparent" leftIconColor="#fff"
+			<u-navbar title="商户收款" :autoBack="true" :fixed="false" bgColor="transparent" leftIconColor="#fff"
 				:titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
 			</u-navbar>
 		</view>
@@ -33,7 +33,6 @@
 			}
 		},
 		onLoad(opt) {
-			console.log(123);
 			let user = this.$store.state.app.userInfo;
 			if (typeof user == 'string') user = JSON.parse(user);
 			this.userInfo = user;
@@ -96,7 +95,7 @@
 		}
 	}
 </script>
-<style lang="scss" scoped>
+<style lang="scss">
 	page {
 		background-color: #40AE36;
 	}
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 4838e16..44620b5 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -32,29 +32,30 @@
 				<view class="zizhi_box">
 					<view class="text">店铺资质</view>
 					<block v-if="images[3].img">
-						<u--image :showLoading="true" @click="!imgUpload?priviewImg([images[3].img]):seleckImage(3)" :src="images[3].img" width="382.46rpx" height="210.53rpx"
-							radius="4px"></u--image>
+						<u--image :showLoading="true" @click="!imgUpload?priviewImg([images[3].img]):seleckImage(3)"
+							:src="images[3].img" width="382.46rpx" height="210.53rpx" radius="4px"></u--image>
 					</block>
 					<view v-else class="zizhi_img" @click="seleckImage(3)">
 						<view class="iconfont icon-tupian1"></view>
 					</view>
 				</view>
 			</view>
-      <view class="store_avatar flex_a_c_j_sb" style="padding: 20rpx 0;" v-if="imagesArr.length>0">
-      	<view class="avatar_box">
-      		<view class="text flex_a_c"></i>店铺其他资质</view>
-      		<view class="other-img">
-            <view class="other-item" v-for="(imgArr,index) in imagesArr" :key="index" :style="{marginRight: (index+1)%3==0?'0rpx':'20rpx'}">
-            	<u--image :showLoading="true" @click="priviewImg(imagesArr, index)" :src="imgArr" width="210.53rpx" height="210.53rpx"
-            		radius="4px" ></u--image>
-            </view>
-            <!-- <view class="avatar_img other-item" @click="seleckImageArr()" :style="{marginRight: (imagesArr.length+1)%3==0?'0rpx':'20rpx'}">
+			<view class="store_avatar flex_a_c_j_sb" style="padding: 20rpx 0;" v-if="imagesArr.length>0">
+				<view class="avatar_box">
+					<view class="text flex_a_c"></i>店铺其他资质</view>
+					<view class="other-img">
+						<view class="other-item" v-for="(imgArr,index) in imagesArr" :key="index"
+							:style="{marginRight: (index+1)%3==0?'0rpx':'20rpx'}">
+							<u--image :showLoading="true" @click="priviewImg(imagesArr, index)" :src="imgArr"
+								width="210.53rpx" height="210.53rpx" radius="4px"></u--image>
+						</view>
+						<!-- <view class="avatar_img other-item" @click="seleckImageArr()" :style="{marginRight: (imagesArr.length+1)%3==0?'0rpx':'20rpx'}">
             	<view class="iconfont icon-tupian1"></view>
             	建议尺寸：120*120px
             </view> -->
-          </view>
-      	</view>
-      </view>
+					</view>
+				</view>
+			</view>
 			<view class="ask_title">拍摄要求</view>
 			<view class="shoot_ask flex_a_c_j_sb">
 				<block v-for="(item,i) in shootAsk" :key="i">
@@ -68,7 +69,7 @@
 					</view>
 				</block>
 			</view>
-			<view class="street_bg">
+			<view class="street_bg" style="margin-bottom:20rpx;">
 				<view class="text flex_a_c"> <i class="iconfont icon-xinghao"></i> 店铺街背景图</view>
 				<block v-if="images[2].img">
 					<u--image :showLoading="true" :src="images[2].img" width="680rpx" height="210.53rpx" radius="4px"
@@ -79,6 +80,13 @@
 					<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">
@@ -103,14 +111,15 @@
 			</view>
 
 			<block>
-				<view class="item_cell flex_a_c" style="display: flex;justify-content: space-between;align-items: flex-start;">
+				<view class="item_cell flex_a_c"
+					style="display: flex;justify-content: space-between;align-items: flex-start;">
 					<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>详细地址：</view>
 					<!-- <input class="com_input" type="text" v-model="mer_address" placeholder="输入商户地址"> -->
-          <view class="input" style="flex: 1;margin-right: 15rpx;">{{mer_address}}</view>
-          <view class="get_site flex_a_c" @click="navTo('/pages/select_address/select_address_n')">
-            <i class="iconfont icon-dizhi"></i>
-            获取地址
-          </view>
+					<view class="input" style="flex: 1;margin-right: 15rpx;">{{mer_address}}</view>
+					<view class="get_site flex_a_c" @click="navTo('/pages/select_address/select_address_n')">
+						<i class="iconfont icon-dizhi"></i>
+						获取地址
+					</view>
 				</view>
 
 				<!-- <view class="long_lat">
@@ -158,7 +167,7 @@
 				<view class="sub_title flex_a_c">客服电话：</view>
 				<view class="com_input">{{servicePhone}}</view>
 			</view>
-      
+
 			<!-- <view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
 				<u-switch v-model="credit_buy" @change="change"></u-switch>
@@ -174,7 +183,7 @@
 				<input type="number" maxlength="5" v-model="interest_rate" placeholder="请输入 /利率单位为: %">
 			</view>
 			<view class="remarks">*利率结算范围为:0.01 ~ 0.1 利率单位为:%</view> -->
-      
+
 			<!-- <view class="item_cell">
         <view class="if_btn flex_a_c_j_sb">
           <text class="sub_title">是否开启商户：</text>
@@ -201,7 +210,7 @@
 <script>
 	import {
 
-    navigateBack,
+		navigateBack,
 		Toast
 	} from '@/libs/uniApi.js'
 	import {
@@ -240,8 +249,8 @@
 				}, {
 					img: ''
 				}],
-        imgUpload: true, // 是否可以上传店铺资质
-        imagesArr: [],
+				imgUpload: true, // 是否可以上传店铺资质
+				imagesArr: [],
 				storeBg: '',
 				check: {
 					ziti: '1',
@@ -300,7 +309,7 @@
 				interest_rate: '', //利率
 				settle_cycle: '', //周期
 				mer_name: '',
-        category_name: '', //分类名称
+				category_name: '', //分类名称
 				type_code: ''
 			}
 		},
@@ -318,17 +327,18 @@
 					id
 				}).then(res => {
 					this.mer_name = res.data.mer_name
-          this.category_name = res.data.merchantCategory.category_name
+					this.category_name = res.data.merchantCategory.category_name
 					this.images[0].img = res.data.mer_banner
 					this.images[1].img = res.data.mer_avatar
 					this.images[2].img = res.data.mini_banner
-					if(typeof res.data.mer_certificate != 'string'){
-            this.images[3].img = res.data.mer_certificate[0];
-            res.data.mer_certificate.shift();
-            this.imagesArr = res.data.mer_certificate;
-          }else this.images[3].img = res.data.mer_certificate;
-          if(this.images[3].img) this.imgUpload = false;
-				  if(typeof res.data.delivery_way == 'string') this.delivery_way = res.data.delivery_way.split(',');
+					if (typeof res.data.mer_certificate != 'string') {
+						this.images[3].img = res.data.mer_certificate[0];
+						res.data.mer_certificate.shift();
+						this.imagesArr = res.data.mer_certificate;
+					} else this.images[3].img = res.data.mer_certificate;
+					if (this.images[3].img) this.imgUpload = false;
+					if (typeof res.data.delivery_way == 'string') this.delivery_way = res.data.delivery_way.split(
+						',');
 					else this.delivery_way = res.data.delivery_way;
 					this.delivery_way.forEach(item => {
 						if (item === '1') this.isZiti = true
@@ -343,7 +353,7 @@
 					res.data.mer_take_day.forEach((item, i) => {
 						this.dateWeek[Number(item) - 1].isCheck = true
 					})
-          this.selarr = res.data.mer_take_day;
+					this.selarr = res.data.mer_take_day;
 					this.type_code = res.data.type_code
 					this.mer_take_time = res.data.mer_take_time
 					this.intro = res.data.mer_info
@@ -382,9 +392,9 @@
 					this.selarr.push(String(item.id));
 				} else {
 					item.isCheck = false;
-					this.selarr = this.selarr.filter(id=>{
-            return id!=item.id
-          })
+					this.selarr = this.selarr.filter(id => {
+						return id != item.id
+					})
 				}
 			},
 			postMerchantUpdata() {
@@ -449,9 +459,9 @@
 						// uni.redirectTo({
 						// 	url: '/pages/moreProject/moreProject'
 						// })
-            uni.navigateBack({
-              delta:1
-            });
+						uni.navigateBack({
+							delta: 1
+						});
 					}, 1000)
 				}).catch(err => {
 					Toast(err)
@@ -472,6 +482,17 @@
 					}
 				});
 			},
+
+			// 商户类型变更
+			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) {
@@ -504,12 +525,12 @@
 				// });
 
 			},
-      seleckImageArr() {
-      	let that = this;
-      	that.$util.uploadImageOne('upload/image', function(res) {
-      		that.imagesArr.push(res.data.path)
-      	});
-      },
+			seleckImageArr() {
+				let that = this;
+				that.$util.uploadImageOne('upload/image', function(res) {
+					that.imagesArr.push(res.data.path)
+				});
+			},
 			delImg(i) {
 				let that = this
 				uni.showModal({
@@ -522,38 +543,38 @@
 					}
 				})
 			},
-      delImgArr(i) {
-      	let that = this
-      	uni.showModal({
-      		title: '删除图片',
-      		content: '确定删除图片?',
-      		success: res => {
-      			if (res.confirm) {
-      				that.imagesArr.splice(i, 1);
-      			}
-      		}
-      	})
-      },
-      priviewImg(url, index=0){
-        uni.previewImage({
-          urls: url,
-          current: index
-        })
-      },
-      navTo(url){
-        if(url=='/pages/select_address/select_address_n'){
-          uni.$once('changeAddress', (res)=>{
-            // console.log('收到', res);
-            this.mer_address = res.formatted_addresses.recommend;
-            this.latitude = res.latitude;
-            this.longitude = res.longitude;
-            this.longLati = `${res.latitude},${res.longitude}`
-          })
-        }
-        uni.navigateTo({
-          url:url
-        })
-      }
+			delImgArr(i) {
+				let that = this
+				uni.showModal({
+					title: '删除图片',
+					content: '确定删除图片?',
+					success: res => {
+						if (res.confirm) {
+							that.imagesArr.splice(i, 1);
+						}
+					}
+				})
+			},
+			priviewImg(url, index = 0) {
+				uni.previewImage({
+					urls: url,
+					current: index
+				})
+			},
+			navTo(url) {
+				if (url == '/pages/select_address/select_address_n') {
+					uni.$once('changeAddress', (res) => {
+						// console.log('收到', res);
+						this.mer_address = res.formatted_addresses.recommend;
+						this.latitude = res.latitude;
+						this.longitude = res.longitude;
+						this.longLati = `${res.latitude},${res.longitude}`
+					})
+				}
+				uni.navigateTo({
+					url: url
+				})
+			}
 		},
 		onPullDownRefresh() {
 			uni.stopPullDownRefresh()
@@ -649,16 +670,17 @@
 				}
 			}
 		}
-    
-    .other-img{
-      display: flex;
-      width: 100%;
-      flex-wrap: wrap;
-      .other-item{
-        margin-right: 20rpx;
-        margin-bottom: 20rpx;
-      }
-    }
+
+		.other-img {
+			display: flex;
+			width: 100%;
+			flex-wrap: wrap;
+
+			.other-item {
+				margin-right: 20rpx;
+				margin-bottom: 20rpx;
+			}
+		}
 
 		.zizhi_box {
 			.text {
@@ -731,24 +753,24 @@
 
 	.sub_title {
 		font-size: 31.58rpx;
-    flex-shrink: 0;
+		flex-shrink: 0;
 	}
 
 	.item_cell {
 		padding: 31.58rpx 0;
 		border-bottom: 1px solid #F7F7F7;
-    
-    .com_input{
-      flex: 1;
-    }
-    
+
+		.com_input {
+			flex: 1;
+		}
+
 		.ziti {
 			margin-right: 21.05rpx;
 		}
-    
-    .get_site{
-      color: #20A162;
-    }
+
+		.get_site {
+			color: #20A162;
+		}
 	}
 
 	.remark {
diff --git a/pages/product/shop_type_change/index.vue b/pages/product/shop_type_change/index.vue
new file mode 100644
index 0000000..9d021b4
--- /dev/null
+++ b/pages/product/shop_type_change/index.vue
@@ -0,0 +1,146 @@
+<!-- 类型变更 -->
+<template>
+	<view class="shop_type">
+		<view class="shop_type-head">
+			<view style="height: var(--status-bar-height);"></view>
+			<view class="shop-type-navbar">
+				<u-icon name="arrow-left" size="18" color="#fff" @click="handleBack" />
+				<text class="shop-type-navbar-title">类型变更</text>
+				<text></text>
+			</view>
+		</view>
+
+		<view class="shop-type-con">
+			<view class="shop-type-con-title">点击选择变更的商户类型</view>
+			<view class="pifa" @click="handleChoose(1)">
+				<image v-if="selected == '' ||selected == 2"
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/b0811202403191613185951.webp" mode="">
+				</image>
+				<image v-if="selected == 1"
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/d7d97202403191611433157.webp" mode=""></image>
+			</view>
+			<view class="pifalingshou" @click="handleChoose(2)">
+				<image v-if="selected == '' ||selected == 1"
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/39776202403191612456811.webp" mode="">
+				</image>
+				<image v-if="selected == 2"
+					src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/40592202403191613498205.webp" mode=""></image>
+			</view>
+		</view>
+
+		<view class="btn" @click="handleJump">
+			<text>提交申请</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				selected: ''
+			}
+		},
+
+		methods: {
+			handleChoose(e) {
+				this.selected = e;
+
+			},
+
+			handleJump() {
+				if (!this.selected) return this.$util.Tips({
+					title: "请选择一种类型"
+				})
+				uni.navigateTo({
+					url: "/pages/product/shop_type_change/progress",
+					fail(err) {
+						console.log(err);
+					}
+				})
+			},
+
+			handleBack() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	page {
+		background-color: #F8F9FA;
+	}
+
+	.shop_type {
+		.shop_type-head {
+			background-color: #40AE36;
+			margin-bottom: 70rpx;
+
+			.shop-type-navbar {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 30rpx;
+				height: 88rpx;
+
+				.shop-type-navbar-title {
+					font-size: 32rpx;
+					color: #FFFFFF;
+				}
+			}
+		}
+
+		.shop-type-con {
+
+
+			.shop-type-con-title {
+				margin-bottom: 74rpx;
+				font-weight: 400;
+				font-size: 36rpx;
+				color: #333333;
+				text-align: center;
+			}
+
+			.pifa {
+				display: flex;
+				justify-content: center;
+				margin-bottom: 30rpx;
+
+				image {
+					width: 690rpx;
+					height: 178rpx;
+				}
+
+			}
+
+			.pifalingshou {
+				display: flex;
+				justify-content: center;
+
+				image {
+					width: 690rpx;
+					height: 178rpx;
+				}
+			}
+		}
+
+		.btn {
+			margin: 136rpx 30rpx 0;
+			height: 88rpx;
+			line-height: 88rpx;
+			background: #40AE36;
+			text-align: center;
+			border-radius: 88rpx 88rpx 88rpx 88rpx;
+
+			text {
+				font-weight: bold;
+				font-size: 30rpx;
+				color: #FFFFFF;
+			}
+
+			&:active {
+				opacity: .8;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/product/shop_type_change/progress.vue b/pages/product/shop_type_change/progress.vue
new file mode 100644
index 0000000..0705067
--- /dev/null
+++ b/pages/product/shop_type_change/progress.vue
@@ -0,0 +1,299 @@
+<!-- 变更进度 -->
+<template>
+	<view class="shop_type">
+		<view class="shop_type-head">
+			<view style="height: var(--status-bar-height);"></view>
+			<view class="shop-type-navbar">
+				<u-icon name="arrow-left" size="18" color="#fff" @click="handleBack" />
+				<text class="shop-type-navbar-title">变更进度</text>
+				<text></text>
+			</view>
+		</view>
+
+		<view class="shop-type-con">
+			<!-- 审批信息 -->
+			<view class="shop-type-con-item">
+				<view class="shop-type-con-item-info">
+					<view class="shop-type-con-item-info-label">变更商户</view>
+					<view class="shop-type-con-item-info-val">这是一段店铺名称</view>
+				</view>
+				<view class="shop-type-con-item-info">
+					<view class="shop-type-con-item-info-label">变更类型</view>
+					<view class="shop-type-con-item-info-val">批发零售商户</view>
+				</view>
+				<view class="shop-type-con-item-info">
+					<view class="shop-type-con-item-info-label">申请时间</view>
+					<view class="shop-type-con-item-info-val">2024-3-14 15:00</view>
+				</view>
+				<view class="shop-type-con-item-info">
+					<view class="shop-type-con-item-info-label">变更进度</view>
+					<view class="shop-type-con-item-info-val">待审核</view>
+				</view>
+				<view class="shop-type-con-item-img">
+					<u-image width="116rpx" height="116rpx" src="" shape="circle" />
+				</view>
+			</view>
+
+			<!-- 审核 -->
+			<view class="shop-type-audit">
+				<view class="shop-type-audit-people">审核人</view>
+				<view class="shop-type-audit-card">
+					<view class="shop-type-audit-card-info">
+						<view class="shop-type-audit-card-info-label audit">审核人</view>
+						<view class="shop-type-audit-card-info-val">小刘</view>
+					</view>
+					<view class="shop-type-audit-card-info">
+						<view class="shop-type-audit-card-info-label">联系电话</view>
+						<view class="shop-type-audit-card-info-val">15200000000</view>
+					</view>
+					<view class="shop-type-audit-card-img">
+						<u-image width="116rpx" height="116rpx" src="" shape="circle" />
+					</view>
+				</view>
+			</view>
+
+			<!-- 进度详情 -->
+			<view class="shop-type-con-progress">
+				<view class="shop-type-con-detail">进度详情</view>
+				<view class="shop-type-con-progress-card">
+					<view class="shop-type-con-progress-left">
+						<view class="shop-type-con-progress-left-item">
+							<u-icon name="checkmark-circle-fill" size="20" color="#40AE36"></u-icon>
+						</view>
+						<view class="dot"></view>
+						<view class="dot"></view>
+						<view class="dot"></view>
+						<view class="dot"></view>
+						<view class="dot"></view>
+						<view class="dot"></view>
+						<view class="shop-type-con-progress-left-item">
+							<!-- <u-icon name="checkmark-circle-fill" size="18" color="#40AE36"></u-icon> -->
+							<!-- <u-icon name="checkmark-circle-fill" size="18" color="#999"></u-icon> -->
+							<u-icon name="close-circle-fill" size="20" color="#F55726"></u-icon>
+
+						</view>
+					</view>
+					<view class="shop-type-con-progress-right">
+						<view
+							style="display:flex;margin-bottom: 46rpx;justify-content: space-between;align-items: center;">
+							<view class="shop-type-con-progress-right-name">申请已提交</view>
+							<view class="shop-type-con-progress-right-time">审核通过</view>
+						</view>
+						<view
+							style="display: flex;justify-content: space-between;align-items: center;margin-bottom:10rpx;">
+							<view class="shop-type-con-progress-right-name">申请已提交</view>
+							<view class="shop-type-con-progress-right-time">审核通过</view>
+						</view>
+
+						<view class="audit-info">
+							<view style="margin-bottom: 10rpx;">审批人：小刘</view>
+							<view class="audit-info-txt">审核不通过：商户状态不符合变更条件</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				selected: ''
+			}
+		},
+
+		methods: {
+			handleChoose(e) {
+				this.selected = e;
+			},
+
+			handleBack() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F8F9FA;
+	}
+
+	.shop_type {
+		.shop_type-head {
+			background-color: #40AE36;
+			margin-bottom: 70rpx;
+
+			.shop-type-navbar {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 30rpx;
+				height: 88rpx;
+
+				.shop-type-navbar-title {
+					font-size: 32rpx;
+					color: #FFFFFF;
+				}
+			}
+		}
+
+		.shop-type-con {
+			.shop-type-con-item {
+				position: relative;
+				margin: 0 30rpx 40rpx;
+				height: 310rpx;
+				padding: 30rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 4rpx 6rpx 2rpx rgba(0, 0, 0, 0.16);
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				box-sizing: border-box;
+
+				.shop-type-con-item-info {
+					display: flex;
+					margin-bottom: 30rpx;
+
+					&:nth-last-child(1) {
+						margin-bottom: 0;
+					}
+
+					.shop-type-con-item-info-label {
+						margin-right: 50rpx;
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #666666;
+					}
+
+					.shop-type-con-item-info-val {
+						font-weight: 400;
+						font-size: 28rpx;
+						color: #333333;
+					}
+				}
+
+				.shop-type-con-item-img {
+					position: absolute;
+					top: 30rpx;
+					right: 30rpx;
+				}
+			}
+
+			.shop-type-audit {
+				margin: 0 30rpx 40rpx;
+
+				.shop-type-audit-people {
+					margin-bottom: 20rpx;
+					margin-left: 20rpx;
+					font-weight: 600;
+					font-size: 30rpx;
+					color: #333333;
+				}
+
+				.shop-type-audit-card {
+					position: relative;
+					width: 690rpx;
+					height: 170rpx;
+					padding: 30rpx;
+					background: #FFFFFF;
+					box-shadow: 0rpx 4rpx 6rpx 2rpx rgba(0, 0, 0, 0.16);
+					border-radius: 20rpx;
+
+					.shop-type-audit-card-info {
+						display: flex;
+
+						.shop-type-audit-card-info-label {
+							width: 112rpx;
+							margin-right: 50rpx;
+							font-size: 28rpx;
+							color: #333333;
+						}
+
+						.audit {
+							margin-bottom: 30rpx;
+						}
+
+						.shop-type-audit-card-info-val {
+							font-size: 28rpx;
+							color: #333333;
+						}
+					}
+
+					.shop-type-audit-card-img {
+						position: absolute;
+						top: 26rpx;
+						right: 30rpx;
+					}
+				}
+			}
+
+			.shop-type-con-progress {
+				margin: 0 30rpx;
+
+				.shop-type-con-detail {
+					margin-bottom: 20rpx;
+					margin-left: 20rpx;
+					font-weight: 600;
+					font-size: 30rpx;
+					color: #333333;
+				}
+
+				.shop-type-con-progress-card {
+					display: flex;
+					width: 100%;
+					padding: 30rpx;
+					background: #FFFFFF;
+					box-shadow: 0rpx 4rpx 6rpx 2rpx rgba(0, 0, 0, 0.16);
+					border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+					.shop-type-con-progress-left {
+						width: 12%;
+						display: flex;
+						flex-direction: column;
+						align-items: center;
+
+						.dot {
+							width: 4rpx;
+							height: 4rpx;
+							border-radius: 50%;
+							background-color: #ccc;
+							margin-bottom: 4rpx;
+						}
+
+						.shop-type-con-progress-left-item {
+							width: 36rpx;
+							height: 36rpx;
+							border-radius: 50%;
+						}
+					}
+
+					.shop-type-con-progress-right {
+						flex: 1;
+						margin-bottom: 40rpx;
+
+						&:nth-last-child(1) {
+							margin-bottom: 0;
+						}
+
+						.shop-type-con-progress-right-name {
+							font-weight: 400;
+							font-size: 28rpx;
+							color: #333333;
+						}
+
+						.shop-type-con-progress-right-time {
+							font-size: 26rpx;
+							color: #666666;
+						}
+					}
+
+					.audit-info {
+						font-size: 22rpx;
+						color: #666666;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 2c6c8f1..35ba3f8 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -2,9 +2,9 @@
 	<div :style="viewColor">
 		<div class="register absolute" v-if="!auth_token">
 			<div class="login">
-				<div class="shading" >
+				<div class="shading">
 					<div class="pictrue acea-row row-center-wrapper" style="background-color: transparent !important;">
-						<image src="@/static/images/logo1.png"  />
+						<image src="@/static/images/logo1.png" />
 					</div>
 				</div>
 				<div class="whiteBg" v-if="formItem === 1">
@@ -47,13 +47,13 @@
 									v-model="account" />
 							</div>
 						</div>
-						
+
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-							
-								<input type="number" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput"
-									v-model="captcha" maxlength="4" />
+
+								<input type="number" placeholder="填写验证码" placeholder-class="placeholder"
+									class="codeIput" v-model="captcha" maxlength="4" />
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -63,8 +63,8 @@
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="number" placeholder="填写验证码"  placeholder-class="placeholder" class="codeIput"
-									v-model="codeVal" maxlength="4" />
+								<input type="number" placeholder="填写验证码" placeholder-class="placeholder"
+									class="codeIput" v-model="codeVal" maxlength="4" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
 								</div>
@@ -82,7 +82,7 @@
 									class="font_pro">《隐私政策》</text></text>
 						</checkbox-group>
 					</div>
-					
+
 				</div>
 				<div class="whiteBg" v-else>
 					<div class="title">注册账号</div>
@@ -97,9 +97,9 @@
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="number" placeholder="填写验证码"   maxLength='4'  placeholder-class="placeholder" class="codeIput"
-									v-model="captcha" />
-									
+								<input type="number" placeholder="填写验证码" maxLength='4' placeholder-class="placeholder"
+									class="codeIput" v-model="captcha" />
+
 								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
 									@click="handleVerify">
 									{{ text }}
@@ -113,12 +113,12 @@
 									v-model="password" />
 							</div>
 						</div>
-						
+
 						<div class="item" v-if="isShowCode">
 							<div class="acea-row row-middle">
 								<image src="/static/images/code_2.png"></image>
-								<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput"
-									v-model="codeVal" />
+								<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder"
+									class="codeIput" v-model="codeVal" />
 								<div class="code" @click="getcaptcha">
 									<image class="code-img" style="width: 100%;height: 100%;" :src="codeUrl" />
 								</div>
@@ -160,18 +160,18 @@
 						<input type='number' placeholder='填写手机号码' placeholder-class='placeholder'
 							v-model="account"></input>
 					</view>
-					
+
 					<view class="item acea-row row-between-wrapper">
-						<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder' class="codeIput"
-							v-model="captcha"></input>
-							
+						<input type='number' placeholder='填写验证码' maxlength="4" placeholder-class='placeholder'
+							class="codeIput" v-model="captcha"></input>
+
 						<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
 							@click="handleVerify">
 							{{ text }}
 						</button>
 					</view>
 					<view class="item">
-						<input type='password' placeholder='填写登录密码'  placeholder-class='placeholder'
+						<input type='password' placeholder='填写登录密码' placeholder-class='placeholder'
 							v-model="password"></input>
 					</view>
 					<view class="protocol acea-row row-between-wrapper">
@@ -254,9 +254,6 @@
 	} from "vuex";
 	import Verify from '@/components/verify/verify.vue';
 	const BACK_URL = "login_back_url";
-	// #ifdef APP-PLUS
-	var jpushModule = uni.requireNativePlugin("JG-JPush");
-	// #endif
 	export default {
 		name: "Login",
 		mixins: [sendVerifyCode],
@@ -266,7 +263,7 @@
 		},
 		data: function() {
 			return {
-				navList: ["快速登录","账号登录"],
+				navList: ["快速登录", "账号登录"],
 				current: 0,
 				account: "",
 				password: "",
@@ -895,20 +892,6 @@
 						}
 					})
 				}
-				// #ifdef APP-PLUS
-				jpushModule.initJPushService()
-				jpushModule.getRegistrationID(result => {
-					
-					if (result.registerID) {
-					
-						bindJG({
-							phone: this.account,
-							jg_register_id: result.registerID
-						})
-					}
-				})
-				// #endif
-
 			}
 		}
 	};