diff --git a/api/article.js b/api/article.js
index 4765465..092bc12 100644
--- a/api/article.js
+++ b/api/article.js
@@ -93,8 +93,8 @@ export const getNoticeListAPI = (data) => request.get('/Notice/list')
 export const getNoticeInfoAPI = (data) => request.get('/Notice/info', data)
 
 
-export const getArea = (data) => request.get('/city/get_area', data, { noAuth: true })
-export const getStreet = (data) => request.get('/city/get_street', data, { noAuth: true })
-export const getVillage = (data) => request.get('/city/get_village', data, { noAuth: true })
-export const getbrigadeAPI = (data) => request.get('/common/get_brigade', data, { noAuth: true })
-export const postBindingAPI = (data) => request.post('/Userinfo/Binding', data, { noAuth: true, noVerify: true })
\ No newline at end of file
+export const getArea = (data) => request.get('city/get_area', data, { noAuth: true })
+export const getStreet = (data) => request.get('city/get_street', data, { noAuth: true })
+export const getVillage = (data) => request.get('city/get_village', data, { noAuth: true })
+export const getbrigadeAPI = (data) => request.get('common/get_brigade', data, { noAuth: true })
+export const postBindingAPI = (data) => request.post('Userinfo/Binding', data, { noAuth: true, noVerify: true })
\ No newline at end of file
diff --git a/api/order.js b/api/order.js
index 364420c..92c0778 100644
--- a/api/order.js
+++ b/api/order.js
@@ -20,8 +20,8 @@ export function getCartCounts() {
  * 获取购物车列表
  * 
  */
-export function getCartList() {
-  return request.get("user/cart/lst");
+export function getCartList(data) {
+  return request.get("user/cart/lst", data);
 }
 
 /**
diff --git a/api/store.js b/api/store.js
index c155b3a..f85383e 100644
--- a/api/store.js
+++ b/api/store.js
@@ -1,22 +1,20 @@
-// +----------------------------------------------------------------------
-// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-// +----------------------------------------------------------------------
-// | Author: CRMEB Team <admin@crmeb.com>
-// +----------------------------------------------------------------------
 import request from "@/utils/request.js";
+/**
+ * 添加扫码商品
+ * @returns {*}
+ */
+export function addCartApi(data) {
+  return request.post('v2/micropay/addCart', data);
+}
 /**
  * 获取产品详情
  * @param int id
  * 
  */
-export function getProductDetail(id) {
-	return request.get('store/product/detail/' + id, {}, {
-		noAuth: true
-	});
+export function getProductDetail(id, data) {
+  return request.get('store/product/detail/' + id, data, {
+    noAuth: true
+  });
 }
 /**
  * 获取预览商品详情
@@ -24,16 +22,16 @@ export function getProductDetail(id) {
  * 
  */
 export function getPreviewProDetail(data) {
-	return request.get('store/product/preview', data, {
-		noAuth: true
-	});
+  return request.get('store/product/preview', data, {
+    noAuth: true
+  });
 }
 /**
  * 产品分享二维码 推广员
  * @param int id
  */
 export function getProductCode(id, data) {
-	return request.get('store/product/qrcode/' + id, data);
+  return request.get('store/product/qrcode/' + id, data);
 }
 /**
  * 添加收藏
@@ -41,7 +39,7 @@ export function getProductCode(id, data) {
  * @param string category product=普通产品,product_seckill=秒杀产品
  */
 export function collectAdd(data) {
-	return request.post('user/relation/create', data);
+  return request.post('user/relation/create', data);
 }
 /**
  * 删除收藏产品
@@ -49,14 +47,14 @@ export function collectAdd(data) {
  * @param string category product=普通产品,product_seckill=秒杀产品
  */
 export function collectDel(data) {
-	return request.post('user/relation/delete', data);
+  return request.post('user/relation/delete', data);
 }
 /**
  * 购车添加
  * 
  */
 export function postCartAdd(data) {
-	return request.post('user/cart/create', data);
+  return request.post('user/cart/create', data);
 }
 
 /**
@@ -64,73 +62,73 @@ export function postCartAdd(data) {
  * 
  */
 export function getCategoryList() {
-	return request.get('store/product/category/lst', {}, {
-		noAuth: true
-	});
+  return request.get('store/product/category/lst', {}, {
+    noAuth: true
+  });
 }
 /**
  * 获取产品列表
  * @param object data
  */
 export function getProductslist(data) {
-	if (data.brand_id && Array.isArray(data.brand_id)) {
-		data = {
-			...data
-		}
-		data.brand_id = data.brand_id.toString()
-	}
-	return request.get('product/spu/lst', data, {
-		noAuth: true
-	});
+  if (data.brand_id && Array.isArray(data.brand_id)) {
+    data = {
+      ...data
+    }
+    data.brand_id = data.brand_id.toString()
+  }
+  return request.get('product/spu/lst', data, {
+    noAuth: true
+  });
 }
 /**
  * 获取优惠券商品列表
  * @param object data
  */
 export function getCouponProductlist(data) {
-	if (data.brand_id && Array.isArray(data.brand_id)) {
-		data = {
-			...data
-		}
-		data.brand_id = data.brand_id.toString()
-	}
-	return request.get('product/spu/coupon_product', data, {
-		noAuth: true
-	});
+  if (data.brand_id && Array.isArray(data.brand_id)) {
+    data = {
+      ...data
+    }
+    data.brand_id = data.brand_id.toString()
+  }
+  return request.get('product/spu/coupon_product', data, {
+    noAuth: true
+  });
 }
 /**
  * 获取品牌列表
  * @param object data
  */
 export function getBrandlist(data) {
-	return request.get('store/product/brand/lst', data, {
-		noAuth: true
-	});
+  return request.get('store/product/brand/lst', data, {
+    noAuth: true
+  });
 }
 /**
  * 获取推荐产品
  * 
  */
 export function getProductHot(page, limit) {
-	return request.get("product/spu/recommend", {
-		page: page === undefined ? 1 : page,
-		limit: limit === undefined ? 10 : limit
-	}, {
-		noAuth: true
-	});
+  return request.get("product/spu/recommend", {
+    page: page === undefined ? 1 : page,
+    limit: limit === undefined ? 10 : limit
+  }, {
+    noAuth: true
+  });
 }
 /**
  * 获取商户推荐产品
  * 
  */
-export function getMerProductHot(id,data) {
-	return request.get(`product/spu/recommend`, {
-		page: data.page === undefined ? 1 : data.page,
-		limit: data.limit === undefined ? 10 : data.limit,
-		mer_id: id || ''
-	}, {
-		noAuth: true
-	});
+export function getMerProductHot(id, data) {
+  return request.get(`product/spu/recommend`, {
+    page: data.page === undefined ? 1 : data.page,
+    limit: data.limit === undefined ? 10 : data.limit,
+    mer_id: id || ''
+  }, {
+    noAuth: true
+  });
 }
 /**
  * 批量收藏
@@ -139,7 +137,7 @@ export function getMerProductHot(id,data) {
  * @param string category 
  */
 export function collectAll(data) {
-	return request.post('user/relation/batch/create', data);
+  return request.post('user/relation/batch/create', data);
 }
 /**
  * 首页产品的轮播图和产品信息
@@ -147,23 +145,23 @@ export function collectAll(data) {
  * 
  */
 export function getGroomList(type, data) {
-	return request.get('product/spu/hot/' + type, data, {
-		noAuth: true
-	});
+  return request.get('product/spu/hot/' + type, data, {
+    noAuth: true
+  });
 }
 /**
  * 获取商品收藏列表
  * @param object data
  */
 export function getCollectUserList(data) {
-	return request.get('user/relation/product/lst', data)
+  return request.get('user/relation/product/lst', data)
 }
 /**
  * 获取商品收藏列表 -- 删除
  * @param object data
  */
 export function userCollectDel(data) {
-	return request.post('user/relation/batch/delete', data)
+  return request.post('user/relation/batch/delete', data)
 }
 /**
  * 获取产品评论
@@ -172,43 +170,43 @@ export function userCollectDel(data) {
  * 
  */
 export function getReplyList(id, data) {
-	return request.get('store/product/reply/lst/' + id, data, {
-		noAuth: true
-	})
+  return request.get('store/product/reply/lst/' + id, data, {
+    noAuth: true
+  })
 }
 /**
  * 产品评价数量和好评度
  * @param int id
  */
 export function getReplyConfig(id) {
-	return request.get('reply/config/' + id);
+  return request.get('reply/config/' + id);
 }
 /**
  * 获取搜索关键字获取
  * 
  */
 export function getSearchKeyword() {
-	return request.get('common/hot_keyword', {}, {
-		noAuth: true
-	});
+  return request.get('common/hot_keyword', {}, {
+    noAuth: true
+  });
 }
 /**
  * 门店列表
  * @returns {*}
  */
 export function storeListApi(data) {
-	return request.get("store_list", data, {
-		noAuth: true
-	});
+  return request.get("store_list", data, {
+    noAuth: true
+  });
 }
 /**
  * 商户列表
  * @returns {*}
  */
 export function storeMerchantList(data) {
-	return request.get("store/merchant/lst", data, {
-		noAuth: true
-	});
+  return request.get("store/merchant/lst", data, {
+    noAuth: true
+  });
 }
 /**
  * 获取商铺详情
@@ -216,9 +214,9 @@ export function storeMerchantList(data) {
  * @param {Object} data 商铺数据
  */
 export function getStoreDetail(id, data) {
-	return request.get("store/merchant/detail/" + id, data, {
-		noAuth: true
-	});
+  return request.get("store/merchant/detail/" + id, data, {
+    noAuth: true
+  });
 }
 /**
  * 获取商铺商品列表
@@ -226,9 +224,9 @@ export function getStoreDetail(id, data) {
  * @param {Object} data 商铺商品列表数据
  */
 export function getStoreGoods(id, data) {
-	return request.get("product/spu/merchant/" + id, data, {
-		noAuth: true
-	});
+  return request.get("product/spu/merchant/" + id, data, {
+    noAuth: true
+  });
 }
 /**
  * 获取商铺分类列表
@@ -236,77 +234,77 @@ export function getStoreGoods(id, data) {
  * @param {Object} data
  */
 export function getStoreCategory(id, data) {
-	return request.get("store/merchant/category/lst/" + id, data, {
-		noAuth: true
-	});
+  return request.get("store/merchant/category/lst/" + id, data, {
+    noAuth: true
+  });
 }
 /**
  * 关注商铺
  * @param {Object} type_id 商铺 id
  */
 export function followStore(type_id) {
-	return request.post("user/relation/create", {
-		type: 10,
-		type_id: type_id
-	});
+  return request.post("user/relation/create", {
+    type: 10,
+    type_id: type_id
+  });
 }
 /**
  * 取消商铺关注
  * @param {Object} type_id 商铺 id
  */
 export function unfollowStore(type_id) {
-	return request.post("user/relation/delete", {
-		type: 10,
-		type_id: type_id
-	});
+  return request.post("user/relation/delete", {
+    type: 10,
+    type_id: type_id
+  });
 }
 /**
  * 获取商铺优惠券
  * @param {Object} id
  */
 export function getStoreCoupon(id) {
-	return request.get("coupon/store/" + id, {
-		noAuth: true
-	});
+  return request.get("coupon/store/" + id, {
+    noAuth: true
+  });
 }
 /**
  * 获取商铺优惠券
  */
 export function getMerchantLst(data) {
-	return request.get("user/relation/merchant/lst", data, {
-		noAuth: true
-	});
+  return request.get("user/relation/merchant/lst", data, {
+    noAuth: true
+  });
 }
 /**
  * 物流信息
  */
 export function express(id) {
-	return request.post("ordero/express/" + id, {
-		noAuth: true
-	});
+  return request.post("ordero/express/" + id, {
+    noAuth: true
+  });
 }
 /**
  * 子集分类
  * @returns {*}
  */
 export function storeCategory(pid) {
-	return request.get("store/product/category", pid, {
-		noAuth: true
-	});
+  return request.get("store/product/category", pid, {
+    noAuth: true
+  });
 }
 /**
  * 分销说明
  * @returns {*}
  */
 export function bagExplain() {
-	return request.get("store/product/bag/explain");
+  return request.get("store/product/bag/explain");
 }
 /**
  * 分销礼包推荐列表
  * @returns {*}
  */
 export function bagRecommend() {
-	return request.get("product/spu/bag/recommend");
+  return request.get("product/spu/bag/recommend");
 }
 /**
  * 分销礼包列表
@@ -314,56 +312,56 @@ export function bagRecommend() {
  */
 export function productBag(data) {
 
-	return request.get("product/spu/bag", data, {
-		noAuth: true
-	});
+  return request.get("product/spu/bag", data, {
+    noAuth: true
+  });
 }
 /**
  * 商铺二维码
  * @returns {*}
  */
 export function merchantQrcode(id, data) {
-	return request.get("store/merchant/qrcode/" + id, data, {
-		noAuth: true
-	});
+  return request.get("store/merchant/qrcode/" + id, data, {
+    noAuth: true
+  });
 }
 /**
  * 推荐商品
  * @returns {*}
  */
 export function merchantProduct(id, data) {
-	if (data.brand_id && Array.isArray(data.brand_id)) {
-		data = {
-			...data
-		}
-		data.brand_id = data.brand_id.toString()
-	}
-	return request.get("product/spu/merchant/" + id, data, {
-		noAuth: true
-	});
+  if (data.brand_id && Array.isArray(data.brand_id)) {
+    data = {
+      ...data
+    }
+    data.brand_id = data.brand_id.toString()
+  }
+  return request.get("product/spu/merchant/" + id, data, {
+    noAuth: true
+  });
 }
 /**
  * 推荐商品banner
  * @returns {*}
  */
 export function getHotBanner(type) {
-	return request.get("common/hot_banner/" + type, {}, {
-		noAuth: true
-	});
+  return request.get("common/hot_banner/" + type, {}, {
+    noAuth: true
+  });
 }
 /**
  * 商户入驻表单
  * @returns {*}
  */
 export function create(data) {
-	return request.post("intention/create", data);
+  return request.post("intention/create", data);
 }
 /**
  * 商户入驻短信验证码
  * @returns {*}
  */
 export function verify(data) {
-	return request.post("auth/verify", data);
+  return request.post("auth/verify", data);
 }
 /**
  * 获取秒杀商品详情
@@ -371,36 +369,36 @@ export function verify(data) {
  * 
  */
 export function getSeckillProductDetail(id) {
-	return request.get('store/product/seckill/detail/' + id, {}, {
-		noAuth: true
-	});
+  return request.get('store/product/seckill/detail/' + id, {}, {
+    noAuth: true
+  });
 }
 /**
  * 直播推荐列表
  * @returns {*}
  */
 export function getLiveList(data) {
-	return request.get(`broadcast/hot`, data, {
-		noAuth: true
-	});
+  return request.get(`broadcast/hot`, data, {
+    noAuth: true
+  });
 }
 /**
  * 直播列表
  * @returns {*}
  */
 export function getBroadcastListApi(data) {
-	return request.get("broadcast/lst", data, {
-		noAuth: true
-	});
+  return request.get("broadcast/lst", data, {
+    noAuth: true
+  });
 }
 /**
  * 商户分类
  * @returns {*}
  */
 export function merClassifly() {
-	return request.get("intention/cate", {}, {
-		noAuth: true
-	});
+  return request.get("intention/cate", {}, {
+    noAuth: true
+  });
 }
 /**
  * 获取预售商品详情
@@ -408,9 +406,9 @@ export function merClassifly() {
  * 
  */
 export function getPresellProductDetail(id) {
-	return request.get('store/product/presell/detail/' + id, {}, {
-		noAuth: true
-	});
+  return request.get('store/product/presell/detail/' + id, {}, {
+    noAuth: true
+  });
 }
 /**
  * 获取商户申请记录
@@ -418,7 +416,7 @@ export function getPresellProductDetail(id) {
  * 
  */
 export function getApplicationRecordList(data) {
-	return request.get('intention/lst', data);
+  return request.get('intention/lst', data);
 }
 /**
  * 获取商户申请详情
@@ -426,7 +424,7 @@ export function getApplicationRecordList(data) {
  * 
  */
 export function getGoodsDetails(id) {
-	return request.get('intention/detail/' + id, {});
+  return request.get('intention/detail/' + id, {});
 }
 
 /**
@@ -435,7 +433,7 @@ export function getGoodsDetails(id) {
  * 
  */
 export function updateGoodsRecord(id, data) {
-	return request.post('intention/update/' + id, data);
+  return request.post('intention/update/' + id, data);
 }
 /**
  * 获取定位详细地址
@@ -443,9 +441,9 @@ export function updateGoodsRecord(id, data) {
  * 
  */
 export function getGeocoder(data) {
-	return request.get(`lbs/geocoder?location=${data.lat},${data.long}`, {}, {
-		noAuth: true
-	});
+  return request.get(`lbs/geocoder?location=${data.lat},${data.long}`, {}, {
+    noAuth: true
+  });
 }
 /**
  * 获取店铺类型
@@ -453,80 +451,80 @@ export function getGeocoder(data) {
  * 
  */
 export function getStoreTypeApi() {
-	return request.get('intention/type', {}, {
-		noAuth: true
-	});
+  return request.get('intention/type', {}, {
+    noAuth: true
+  });
 }
 /**
  * 到货通知
  * 
  */
 export function arrivalNoticeApi(data) {
-	return request.post('store/product/increase_take',data);
+  return request.post('store/product/increase_take', data);
 }
 
 /*
   获取图片验证码
-*/ 
+*/
 export function getCaptcha() {
-	return request.get('captcha');
+  return request.get('captcha');
 }
 
 /*
 	获取店铺资质
 */
 export function storeCertificate(data) {
-	return request.post(`store/certificate/${data.merId}`, data)
+  return request.post(`store/certificate/${data.merId}`, data)
 }
 /**
  * 本地服务列表
  * @returns {*}
  */
 export function storeServiceList(id, data) {
-	return request.get(`product/spu/local/${id}`, data, {
-		noAuth: true
-	});
+  return request.get(`product/spu/local/${id}`, data, {
+    noAuth: true
+  });
 }
 /**
  * 复制口令
  * @returns {*}
  */
 export function copyPasswordApi(data) {
-	return request.get(`product/spu/copy`, data, {
-		noAuth: true
-	});
+  return request.get(`product/spu/copy`, data, {
+    noAuth: true
+  });
 }
 /**
  * 口令搜索
  * @returns {*}
  */
 export function copyPasswordSearch(data) {
-	return request.get(`command/copy`, data, {
-		noAuth: true
-	});
+  return request.get(`command/copy`, data, {
+    noAuth: true
+  });
 }
 /**
  * 套餐列表
  * @returns {*}
  */
 export function getDiscountsLst(data) {
-	return request.get(`discounts/lst`, data, {
-		noAuth: true
-	});
+  return request.get(`discounts/lst`, data, {
+    noAuth: true
+  });
 }
 /**
  * 套餐--立即购买
  * @returns {*}
  */
 export function discountsCartAdd(data) {
-	return request.post('user/cart/batchCreate', data);
+  return request.post('user/cart/batchCreate', data);
 }
 /**
  * 商品--价格说明
  * @returns {*}
  */
 export function priceRuleApi(id) {
-	return request.get(`store/product/price_rule/${id}`, {}, {
-		noAuth: true
-	});
+  return request.get(`store/product/price_rule/${id}`, {}, {
+    noAuth: true
+  });
 }
\ No newline at end of file
diff --git a/components/Authorize.vue b/components/Authorize.vue
index 04445d6..ea63b54 100644
--- a/components/Authorize.vue
+++ b/components/Authorize.vue
@@ -49,15 +49,6 @@
   </view>
 </template>
 <script>
-  // +----------------------------------------------------------------------
-  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-  // +----------------------------------------------------------------------
-  // | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-  // +----------------------------------------------------------------------
-  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-  // +----------------------------------------------------------------------
-  // | Author: CRMEB Team <admin@crmeb.com>
-  // +----------------------------------------------------------------------
   const app = getApp();
   import Cache from '../utils/cache';
   import {
@@ -184,6 +175,13 @@
         toLogin(true);
       },
       getUserProfile() {
+        console.log(11);
+        toLogin(true);
+        uni.navigateTo({
+          url: '/pages/users/login/index'
+        })
+        console.log(22);
+        return
         let self = this;
         Routine.getUserProfile()
           .then(res => {
diff --git a/libs/wechat.js b/libs/wechat.js
index 75eba52..34c2c04 100644
--- a/libs/wechat.js
+++ b/libs/wechat.js
@@ -12,283 +12,284 @@ import WechatJSSDK from "@/plugin/jweixin-module/index.js";
 
 
 import {
-	getWechatConfig,
-	wechatAuth,
-	commonAuth
+  getWechatConfig,
+  wechatAuth,
+  commonAuth
 } from "@/api/public";
 import {
-	WX_AUTH,
-	STATE_KEY,
-	LOGINTYPE,
-	BACK_URL
+  WX_AUTH,
+  STATE_KEY,
+  LOGINTYPE,
+  BACK_URL
 } from '@/config/cache';
 import {
-	parseQuery
+  parseQuery
 } from '@/utils';
 import store from '@/store';
 import Cache from '@/utils/cache';
 
 class AuthWechat {
 
-	constructor() {
-		//微信实例化对象
-		this.instance = WechatJSSDK;
-		//是否实例化
-		this.status = false;
+  constructor() {
+    //微信实例化对象
+    this.instance = WechatJSSDK;
+    //是否实例化
+    this.status = false;
 
-		this.initConfig = {};
+    this.initConfig = {};
 
-	}
-	
-	isAndroid(){
-		let u = navigator.userAgent;
-		return u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
-	}
-	
-	signLink() {
-		if (typeof window.entryUrl === 'undefined' || window.entryUrl === '') {
-			  	window.entryUrl = location.href
-			}
-		return  /(Android)/i.test(navigator.userAgent) ? location.href : window.entryUrl;
-	}
+  }
 
-	/**
-	 * 初始化wechat(分享配置)
-	 */
-	wechat() {
-		return new Promise((resolve, reject) => {
-			// if (this.status && !this.isAndroid()) return resolve(this.instance);
-			getWechatConfig()
-				.then(res => {
-					this.instance.config(res.data);
-					this.initConfig = res.data;
-					this.status = true;
-					this.instance.ready(() => {
-						resolve(this.instance);
-					})
-				}).catch(err => {
-					console.log(err);
-					this.status = false;
-					reject(err);
-				});
-		});
-	}
+  isAndroid() {
+    let u = navigator.userAgent;
+    return u.indexOf('Android') > -1 || u.indexOf('Adr') > -1;
+  }
 
-	/**
-	 * 验证是否初始化
-	 */
-	verifyInstance() {
-		let that = this;
-		return new Promise((resolve, reject) => {
-			if (that.instance === null && !that.status) {
-				that.wechat().then(res => {
-					resolve(that.instance);
-				}).catch(() => {
-					return reject();
-				})
-			} else {
-				return resolve(that.instance);
-			}
-		})
-	}
-	// 微信公众号的共享地址
-	openAddress() {
-		return new Promise((resolve, reject) => {
-			this.wechat().then(wx => {
-				this.toPromise(wx.openAddress).then(res => {
-					resolve(res);
-				}).catch(err => {
-					reject(err);
-				});
-			}).catch(err => {
-				reject(err);
-			})
-		});
-	}
+  signLink() {
+    if (typeof window.entryUrl === 'undefined' || window.entryUrl === '') {
+      window.entryUrl = location.href
+    }
+    return /(Android)/i.test(navigator.userAgent) ? location.href : window.entryUrl;
+  }
 
-	// 使用微信内置地图查看位置接口；
-	seeLocation(config){
-		return new Promise((resolve, reject) => {
-			this.wechat().then(wx => {
-				this.toPromise(wx.openLocation, config).then(res => {
-					resolve(res);
-				}).catch(err => {
-					reject(err);
-				});
-			}).catch(err => {
-				reject(err);
-			})
-		});
-	}
+  /**
+   * 初始化wechat(分享配置)
+   */
+  wechat() {
+    return new Promise((resolve, reject) => {
+      // if (this.status && !this.isAndroid()) return resolve(this.instance);
+      getWechatConfig()
+        .then(res => {
+          this.instance.config(res.data);
+          this.initConfig = res.data;
+          this.status = true;
+          this.instance.ready(() => {
+            resolve(this.instance);
+          })
+        }).catch(err => {
+          console.log(err);
+          this.status = false;
+          reject(err);
+        });
+    });
+  }
 
-	/**
-	 * 微信支付
-	 * @param {Object} config
-	 */
-	pay(config) {
-		return new Promise((resolve, reject) => {
-			this.wechat().then((wx) => {
-				this.toPromise(wx.chooseWXPay, config).then(res => {
-					resolve(res);
-				}).catch(res => {
-					reject(res);
-				});
-			}).catch(res => {
-				reject(res);
-			});
-		});
-	}
+  /**
+   * 验证是否初始化
+   */
+  verifyInstance() {
+    let that = this;
+    return new Promise((resolve, reject) => {
+      if (that.instance === null && !that.status) {
+        that.wechat().then(res => {
+          resolve(that.instance);
+        }).catch(() => {
+          return reject();
+        })
+      } else {
+        return resolve(that.instance);
+      }
+    })
+  }
+  // 微信公众号的共享地址
+  openAddress() {
+    return new Promise((resolve, reject) => {
+      this.wechat().then(wx => {
+        this.toPromise(wx.openAddress).then(res => {
+          resolve(res);
+        }).catch(err => {
+          reject(err);
+        });
+      }).catch(err => {
+        reject(err);
+      })
+    });
+  }
 
-	toPromise(fn, config = {}) {
-		return new Promise((resolve, reject) => {
-			fn({
-				...config,
-				success(res) {
-					resolve(res);
-				},
-				fail(err) {
-					reject(err);
-				},
-				complete(err) {
-					reject(err);
-				},
-				cancel(err) {
-					reject(err);
-				}
-			});
-		});
-	}
+  // 使用微信内置地图查看位置接口；
+  seeLocation(config) {
+    return new Promise((resolve, reject) => {
+      this.wechat().then(wx => {
+        this.toPromise(wx.openLocation, config).then(res => {
+          resolve(res);
+        }).catch(err => {
+          reject(err);
+        });
+      }).catch(err => {
+        reject(err);
+      })
+    });
+  }
 
-	/**
-	 * 自动去授权
-	 */
-	oAuth() {
-		if (uni.getStorageSync(WX_AUTH) && store.state.app.token) return;
-		const {
-			code
-		} = parseQuery();
-		if (!code) return this.toAuth();
-	}
+  /**
+   * 微信支付
+   * @param {Object} config
+   */
+  pay(config) {
+    return new Promise((resolve, reject) => {
+      this.wechat().then((wx) => {
+        this.toPromise(wx.chooseWXPay, config).then(res => {
+          resolve(res);
+        }).catch(res => {
+          reject(res);
+        });
+      }).catch(res => {
+        reject(res);
+      });
+    });
+  }
 
-	clearAuthStatus() {
+  toPromise(fn, config = {}) {
+    return new Promise((resolve, reject) => {
+      fn({
+        ...config,
+        success(res) {
+          resolve(res);
+        },
+        fail(err) {
+          reject(err);
+        },
+        complete(err) {
+          reject(err);
+        },
+        cancel(err) {
+          reject(err);
+        }
+      });
+    });
+  }
 
-	}
+  /**
+   * 自动去授权
+   */
+  oAuth() {
+    if (uni.getStorageSync(WX_AUTH) && store.state.app.token) return;
+    const {
+      code
+    } = parseQuery();
+    if (!code) return this.toAuth();
+  }
 
-	/**
-	 * 授权登陆获取token
-	 * @param {Object} code
-	 */
-	auth(code) {
-		return new Promise((resolve, reject) => {
-			let loginType = Cache.get(LOGINTYPE);
-			commonAuth({
-				auth: {
-					type:'wechat',
-					auth: {
-						code,
-						spread: Cache.get("spread") ?? 0
-					}
-				}
-			}).then(res => {
-				const data = res.data;
-				if(res.data.status == 200){
-					store.commit("LOGIN", {
-						token: data.result.token,
-						time:data.result.exp
-					});
-					store.commit("SETUID", data.result.user.uid);
-					store.commit('UPDATE_USERINFO', data.result.user);
-					Cache.set(WX_AUTH, code);
-					Cache.clear(STATE_KEY);
-					loginType && Cache.clear(LOGINTYPE);
-					resolve();
-				}else{
-					uni.setStorageSync('auth_token',res.data.result.key);
-					return uni.navigateTo({
-						url:'/pages/users/login/index'
-					})
-				}
-			})
-		});
-	}
+  clearAuthStatus() {
 
-	/**
-	 * 获取跳转授权后的地址
-	 * @param {Object} appId
-	 */
-	getAuthUrl(appId) {
-		const backUrlCRshlcICwGdGY = encodeURIComponent(
-			`${location.origin}/pages/auth/index?back_url=` +
-			encodeURIComponent(
-				encodeURIComponent(
-					uni.getStorageSync(BACK_URL) ?
-					uni.getStorageSync(BACK_URL) :
-					location.pathname + location.search
-				)
-			)
-		);
-		uni.removeStorageSync(BACK_URL);
-		const state = encodeURIComponent(
-			("" + Math.random()).split(".")[1] + "authorizestate"
-		);
-		uni.setStorageSync(STATE_KEY, state);
-		return `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${backUrlCRshlcICwGdGY}&response_type=code&scope=snsapi_userinfo&state=${state}#wechat_redirect`;
-	}
+  }
 
-	/**
-	 * 跳转自动登陆
-	 */
-	toAuth() {
-		let c2543fff3bfa6f144c2f06a7de6cd10c0b650cae = this;
-		this.wechat().then(wx => {
-			window.location.replace(this.getAuthUrl(c2543fff3bfa6f144c2f06a7de6cd10c0b650cae.initConfig.appId));
-		})
-	}
+  /**
+   * 授权登陆获取token
+   * @param {Object} code
+   */
+  auth(code) {
+    console.log('授权登陆获取token');
+    return new Promise((resolve, reject) => {
+      let loginType = Cache.get(LOGINTYPE);
+      commonAuth({
+        auth: {
+          type: 'wechat',
+          auth: {
+            code,
+            spread: Cache.get("spread") ?? 0
+          }
+        }
+      }).then(res => {
+        const data = res.data;
+        if (res.data.status == 200) {
+          store.commit("LOGIN", {
+            token: data.result.token,
+            time: data.result.exp
+          });
+          store.commit("SETUID", data.result.user.uid);
+          store.commit('UPDATE_USERINFO', data.result.user);
+          Cache.set(WX_AUTH, code);
+          Cache.clear(STATE_KEY);
+          loginType && Cache.clear(LOGINTYPE);
+          resolve();
+        } else {
+          uni.setStorageSync('auth_token', res.data.result.key);
+          return uni.navigateTo({
+            url: '/pages/users/login/index'
+          })
+        }
+      })
+    });
+  }
 
-	/**
-	 * 绑定事件
-	 * @param {Object} name 事件名
-	 * @param {Object} config 参数
-	 */
-	wechatEvevt(name, config) {
-		let that = this;
-		return new Promise((resolve, reject) => {
-			let configDefault = {
-				fail(res) {
-					console.log(res,11111);
-					if (that.instance) return reject({
-						is_ready: true,
-						wx: that.instance
-					});
-					that.verifyInstance().then(wx => {
-						return reject({
-							is_ready: true,
-							wx: wx
-						});
-					})
-				},
-				success(res) {
-					return resolve(res,2222);
-				}
-			};
-			Object.assign(configDefault, config);
-			that.wechat().then(wx => {
-				if (typeof name === 'object') {
-					name.forEach(item => {
-						wx[item] && wx[item](configDefault)
-					})
-				} else {
-					wx[name] && wx[name](configDefault)
-				}
-			})
-		});
-	}
+  /**
+   * 获取跳转授权后的地址
+   * @param {Object} appId
+   */
+  getAuthUrl(appId) {
+    const backUrlCRshlcICwGdGY = encodeURIComponent(
+      `${location.origin}/pages/auth/index?back_url=` +
+      encodeURIComponent(
+        encodeURIComponent(
+          uni.getStorageSync(BACK_URL) ?
+          uni.getStorageSync(BACK_URL) :
+          location.pathname + location.search
+        )
+      )
+    );
+    uni.removeStorageSync(BACK_URL);
+    const state = encodeURIComponent(
+      ("" + Math.random()).split(".")[1] + "authorizestate"
+    );
+    uni.setStorageSync(STATE_KEY, state);
+    return `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${backUrlCRshlcICwGdGY}&response_type=code&scope=snsapi_userinfo&state=${state}#wechat_redirect`;
+  }
 
-	isWeixin() {
-		return navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1;
-	}
+  /**
+   * 跳转自动登陆
+   */
+  toAuth() {
+    let c2543fff3bfa6f144c2f06a7de6cd10c0b650cae = this;
+    this.wechat().then(wx => {
+      window.location.replace(this.getAuthUrl(c2543fff3bfa6f144c2f06a7de6cd10c0b650cae.initConfig.appId));
+    })
+  }
+
+  /**
+   * 绑定事件
+   * @param {Object} name 事件名
+   * @param {Object} config 参数
+   */
+  wechatEvevt(name, config) {
+    let that = this;
+    return new Promise((resolve, reject) => {
+      let configDefault = {
+        fail(res) {
+          console.log(res, 11111);
+          if (that.instance) return reject({
+            is_ready: true,
+            wx: that.instance
+          });
+          that.verifyInstance().then(wx => {
+            return reject({
+              is_ready: true,
+              wx: wx
+            });
+          })
+        },
+        success(res) {
+          return resolve(res, 2222);
+        }
+      };
+      Object.assign(configDefault, config);
+      that.wechat().then(wx => {
+        if (typeof name === 'object') {
+          name.forEach(item => {
+            wx[item] && wx[item](configDefault)
+          })
+        } else {
+          wx[name] && wx[name](configDefault)
+        }
+      })
+    });
+  }
+
+  isWeixin() {
+    return navigator.userAgent.toLowerCase().indexOf("micromessenger") !== -1;
+  }
 
 }
 
 export default new AuthWechat();
-// #endif
+// #endif
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 79b6322..d9b68c8 100644
--- a/pages.json
+++ b/pages.json
@@ -16,7 +16,8 @@
     {
       "path": "pages/gather/gather",
       "style": {
-        "navigationBarTitleText": "工作台"
+        "navigationBarTitleText": "工作台",
+        "navigationStyle": "custom"
       }
     },
     {
@@ -201,7 +202,8 @@
           "path": "supply_chain/supplier",
           "style": {
             "navigationBarTitleText": "供货采购",
-            "enablePullDownRefresh": true
+            "enablePullDownRefresh": true,
+            "navigationStyle": "custom"
           }
 
         }, {
@@ -490,7 +492,8 @@
           "path": "login/index",
           "style": {
             "navigationBarTitleText": "登录",
-            "navigationBarBackgroundColor": "#EB5447"
+            "navigationBarBackgroundColor": "#EB5447",
+            "navigationStyle": "custom"
               // #ifdef MP || APP-PLUS
               ,
             "navigationBarTextStyle": "#fff"
@@ -1263,7 +1266,7 @@
         "pagePath": "pages/home/index",
         "iconPath": "static/images/1-001.png",
         "selectedIconPath": "static/images/1-002.png",
-        "text": "首页"
+        "text": "泸州"
       },
       {
         "pagePath": "pages/gather/gather",
diff --git a/pages/admin/stockOut/index.vue b/pages/admin/stockOut/index.vue
index e8297ef..34672fa 100644
--- a/pages/admin/stockOut/index.vue
+++ b/pages/admin/stockOut/index.vue
@@ -327,15 +327,10 @@
         })
       },
       async addCartGoods(code) {
-        try {
-          const res = await addCartApi({ bar_code: code })
-          this.getCartList();
-          this.getCartNum();
-          Toast('添加成功')
-        } catch (e) {
-          //TODO handle the exception
-          Toast(e)
-        }
+        const res = await addCartApi({ bar_code: code }).catch(err => Toast(err))
+        this.getCartList();
+        this.getCartNum();
+        Toast('添加成功')
       },
       pay() {
         let selectValue = []
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index 0c36a4a..26ab030 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -1,34 +1,34 @@
 <template>
   <view class="gather">
-
+    <u-swiper :list="swiperList" keyName="pic" :autoplay="true" height="491.23rpx"></u-swiper>
     <!-- <view class="special_work com" v-if="userInfoData.mer_info.type_id === 12"> -->
     <view class="special_work com" v-if="true">
       <view class="title">市级供应链</view>
       <view class="content">
         <view class="examine" @click="navigator(`/pages/nongKe/supply_chain/goods_list?merid=${mer_id}`)">
-          <image class="icon_img" :src="`${prefix}6/oaimg10%402x.png`" mode="aspectFill"></image>
+          <image class="icon_img" :src="`${prefix}zsgl.png`" mode="aspectFill"></image>
           <text class="text">在售管理</text>
         </view>
         <view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98`)">
-          <image class="icon_img" :src="`${prefix}6/oaimg11%402x.png`" mode="aspectFill"></image>
+          <image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
           <text class="text">财务管理</text>
         </view>
         <view class="examine" @click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}`)">
-          <image class="icon_img" :src="`${prefix}6/oaimg8%402x.png`" mode="aspectFill">
+          <image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
           </image>
           <text class="text">入库管理</text>
         </view>
         <view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
-          <image class="icon_img" :src="`${prefix}6/oaimg4%402x.png`" mode="aspectFill"></image>
+          <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill"></image>
           <text class="text">商户设置</text>
         </view>
         <view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
-          <image class="icon_img" :src="`${prefix}6/oaimg3%402x.png`" mode="aspectFill">
+          <image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
           </image>
           <text class="text">商品管理</text>
         </view>
         <view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
-          <image class="icon_img" :src="`${prefix}6/oaimg21%402x.png`" mode="aspectFill">
+          <image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
           </image>
           <text class="text">提现管理</text>
         </view>
@@ -40,52 +40,52 @@
       <view class="special_work com">
         <view class="title">我的店铺</view>
         <view class="content ">
-          <view class="examine" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=11`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg6%402x.png`" mode="aspectFill"></image>
+          <view class="examine" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1`)">
+            <image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
             <text class="text">供货采购</text>
           </view>
           <view class="examine" @click="navigator('/pages/nongKe/supply_chain/purchase_control')">
-            <image class="icon_img" :src="`${prefix}6/oaimg7%402x.png`" mode="aspectFill"></image>
+            <image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
             <text class="text">进货管理</text>
           </view>
           <view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg9%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill">
             </image>
             <text class="text">扫码出库</text>
           </view>
           <view class="examine" @click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg8%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
             </image>
             <text class="text">入库管理</text>
           </view>
           <view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg3%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
             </image>
             <text class="text">提现管理</text>
           </view>
 
           <view class="examine" @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg1%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
             </image>
             <text class="text">客服记录</text>
           </view>
           <view class="examine" @click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg2%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
             </image>
             <text class="text">订单核销</text>
           </view>
           <view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg5%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
             </image>
             <text class="text">订单管理</text>
           </view>
           <view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg3%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
             </image>
             <text class="text">商品管理</text>
           </view>
           <view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
-            <image class="icon_img" :src="`${prefix}6/oaimg4%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
             </image>
             <text class="text">商户设置</text>
           </view>
@@ -96,64 +96,64 @@
       <!-- <gatherBusiness :userInfoData="userInfoData" /> -->
     </view>
 
-    <!-- <view class="business com" v-if="userInfoData.mer_info.type_id === 11"> -->
-    <view class="business com" v-if="true">
+    <view class="business com" v-if="userInfoData.mer_info.type_id === 11">
+      <!-- <view class="business com" v-if="true"> -->
       <view class="special_work com">
         <view class="title">里海云仓</view>
         <view class="content ">
-          <view class="examine" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg6%402x.png`" mode="aspectFill"></image>
+          <view class="examine" @click="navigator(`/pages/nongKe/supply_chain/supplier?type_id=12&isDetail=1`)">
+            <image class="icon_img" :src="`${prefix}ghcg.png`" mode="aspectFill"></image>
             <text class="text">供货采购</text>
           </view>
           <view class="examine" @click="navigator('/pages/nongKe/supply_chain/purchase_control')">
-            <image class="icon_img" :src="`${prefix}6/oaimg7%402x.png`" mode="aspectFill"></image>
+            <image class="icon_img" :src="`${prefix}jhgl.png`" mode="aspectFill"></image>
             <text class="text">进货管理</text>
           </view>
           <view class="examine" @click="navigator(`/pages/admin/stockOut/index?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg9%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}smck.png`" mode="aspectFill">
             </image>
             <text class="text">扫码出库</text>
           </view>
           <view class="examine" @click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg8%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
             </image>
             <text class="text">入库管理</text>
           </view>
           <view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg3%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
             </image>
             <text class="text">提现管理</text>
           </view>
 
           <view class="examine" @click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg1%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
             </image>
             <text class="text">客服记录</text>
           </view>
           <view class="examine" @click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg2%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
             </image>
             <text class="text">订单核销</text>
           </view>
           <view class="examine" @click="navigator(`/pages/admin/order/index?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg5%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
             </image>
             <text class="text">订单管理</text>
           </view>
           <view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
-            <image class="icon_img" :src="`${prefix}6/oaimg3%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
             </image>
             <text class="text">商品管理</text>
           </view>
           <view class="examine" @click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
-            <image class="icon_img" :src="`${prefix}6/oaimg4%402x.png`" mode="aspectFill">
+            <image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
             </image>
             <text class="text">商户设置</text>
           </view>
 
         </view>
       </view>
-
+      <view class="" v-if="userInfoData.mer_info">暂无您的工作台</view>
     </view>
     <m-tabbar native>
       <template v-slot:tabbar_index_2>
@@ -189,7 +189,7 @@
         mer_id: '',
         statusBarHeight: statusBarHeight, //系统导航条高度
         userInfoData: { mer_info: { type_id: 0 } },
-        prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/',
+        prefix: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/11/',
         page: 0,
         group_id: 1,
         count: {
@@ -206,6 +206,7 @@
           sos: 0,
           xiejiao: 0
         },
+        swiperList: [],
         swiper: {
           url: [{
             img: ''
@@ -244,7 +245,7 @@
       // 轮播图请求
       async getBanner() {
         const { data } = await getIndexData()
-        this.swiper.url = data.banner
+        this.swiperList = data.banner
       },
       async editGoodsClose() {
         const data = {
@@ -269,7 +270,7 @@
       },
       navigator(url, t) {
         console.log('t', t);
-        // if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息")
+        if (this.userInfoData.is_wsxx === 0 && t != '商户设置') return Toast("请完善商户信息")
         uni.navigateTo({
           url: url
         })
@@ -351,9 +352,6 @@
 <style lang="scss" scoped>
   .gather {
     padding-bottom: 164.91rpx;
-    /* #ifdef MP || MP-WEIXIN */
-    padding-top: 43.86rpx;
-    /* #endif */
   }
 
   page {
diff --git a/pages/nongKe/supply_chain/component/shop_card.vue b/pages/nongKe/supply_chain/component/shop_card.vue
index 643af8b..ddaa1a1 100644
--- a/pages/nongKe/supply_chain/component/shop_card.vue
+++ b/pages/nongKe/supply_chain/component/shop_card.vue
@@ -44,7 +44,15 @@
 <script>
   export default {
     name: 'ShopCard',
-    props: ['store_item'],
+    props: {
+      store_item: {
+        type: Object
+      },
+      isDetail: {
+        type: Number,
+        default: 1
+      }
+    },
     data() {
       return { youZhiImg: 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/z2586.png', }
     },
@@ -56,9 +64,17 @@
         })
       },
       goStore(id) {
-        uni.navigateTo({
-          url: `/pages/nongKe/supply_chain/merchant?id=${id}`
-        })
+        console.log(this.isDetail);
+        if (this.isDetail == 2) {
+          uni.navigateTo({
+            url: `/pages/store/home/index?id=${id}`
+          })
+        } else {
+          uni.navigateTo({
+            url: `/pages/nongKe/supply_chain/merchant?id=${id}`
+          })
+        }
+
       }
     }
   }
diff --git a/pages/nongKe/supply_chain/goods_list.vue b/pages/nongKe/supply_chain/goods_list.vue
index f18050b..9951fb9 100644
--- a/pages/nongKe/supply_chain/goods_list.vue
+++ b/pages/nongKe/supply_chain/goods_list.vue
@@ -10,16 +10,21 @@
       </view>
     </view>
     <block v-for="(item,i) in goodsList" :key="i">
-      <view class="list_item">
-        <view class="title">{{item.store_name}}</view>
-        <view class="message flex_a_c_j_sb">
-          <view class="">分类：{{item.storeCategory.cate_name}}</view>
-          <view class="">单位：{{item.unit_name}}</view>
-          <view class="">订货价：{{item.price}}</view>
-        </view>
-        <view class="bar_code">条形码：{{ item.bar_code || "0" }}</view>
-        <view class="redact_box">
-          <button class="redact" @click="redactShow(item)">编辑</button>
+      <view class="list_item flex_a_c">
+        <image class="goods_img" :src="item.image" mode="aspectFill"></image>
+        <view class="r_box flex_a_c_j_sb">
+          <view class="message">
+            <view class="title">{{item.store_name}}</view>
+            <view class="flex_a_c">
+              <view class="">分类：{{item.storeCategory.cate_name}}</view>
+              <view class="unit">单位：{{item.unit_name}}</view>
+            </view>
+            <view class="bar_code">条形码：{{ item.bar_code || "0" }}</view>
+          </view>
+          <view class="redact_box">
+            <view class="order_price">订货价：{{item.price}}</view>
+            <button class="redact" @click="redactShow(item)">编辑</button>
+          </view>
         </view>
       </view>
     </block>
@@ -200,12 +205,12 @@
       width: 694.74rpx;
       height: 66.67rpx;
       padding: 2px 2px 2px 21.05rpx;
-      border: 1px solid #20A162;
+      border: 1px solid $uni-theme-color;
       border-radius: 100px;
 
       .icon-sousuo {
         font-weight: bold;
-        color: #20A162;
+        color: $uni-theme-color;
         margin-right: 17.54rpx;
       }
 
@@ -214,7 +219,7 @@
         width: 135.09rpx;
         height: 59.65rpx;
         line-height: 59.65rpx;
-        background: linear-gradient(180deg, #66CE69 0%, #20A162 100%);
+        background: $uni-theme-bg-color;
         border-radius: 100px;
       }
     }
@@ -232,16 +237,21 @@
 
     .title {
       font-size: 31.58rpx;
+      font-weight: bold;
       color: #333;
     }
+  }
 
-    .message {
-      margin: 28.07rpx 0 21.05rpx 0;
-    }
+  .list_item {
+    font-size: 24.56rpx;
 
     .redact_box {
+      height: 100%;
       display: flex;
-      justify-content: flex-end;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: flex-end;
+
     }
 
     .redact {
@@ -250,17 +260,36 @@
       width: 129.82rpx;
       height: 50.88rpx;
       line-height: 50.88rpx;
-      background: linear-gradient(90deg, #66CE69 0%, #20A162 100%);
+      background: $uni-theme-bg-color;
       border-radius: 7px;
     }
-  }
 
+    .r_box {
+      flex: 1;
+    }
+
+    .unit {
+      margin-left: 35.09rpx;
+      margin: 7.02rpx 0 7.02rpx 35.09rpx;
+    }
+
+    .goods_img {
+      width: 119.3rpx;
+      height: 119.3rpx;
+      border-radius: 8px;
+      margin-right: 26.32rpx;
+    }
+  }
 
   .popup_cont {
     width: 680.7rpx;
     padding: 31.58rpx;
     font-size: 28.07rpx;
 
+    .message {
+      margin: 28.07rpx 0 21.05rpx 0;
+    }
+
     .title {
       text-align: center;
       font-size: 31.58rpx;
@@ -302,4 +331,4 @@
       }
     }
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/merchant.vue b/pages/nongKe/supply_chain/merchant.vue
index c68d56a..ff542f0 100644
--- a/pages/nongKe/supply_chain/merchant.vue
+++ b/pages/nongKe/supply_chain/merchant.vue
@@ -47,9 +47,7 @@
     getProductDetail,
     postCartAdd
   } from '@/api/store.js'
-  import {
-    Toast
-  } from '../../../libs/uniApi'
+  import { Toast } from '@/libs/uniApi'
   import goodsPopup from '../cpns/goodsPopup.vue'
   export default {
     components: {
@@ -264,7 +262,7 @@
   }
 
   .icon-xuanzhong1 {
-    color: #20A162;
+    color: $uni-theme-color;
   }
 
   .head_search {
@@ -277,12 +275,12 @@
       width: 694.74rpx;
       height: 66.67rpx;
       padding: 2px 2px 2px 21.05rpx;
-      border: 1px solid #20A162;
+      border: 1px solid $uni-theme-color;
       border-radius: 100px;
 
       .icon-sousuo {
         font-weight: bold;
-        color: #20A162;
+        color: $uni-theme-color;
         margin-right: 17.54rpx;
       }
 
@@ -291,7 +289,7 @@
         width: 135.09rpx;
         height: 59.65rpx;
         line-height: 59.65rpx;
-        background: linear-gradient(180deg, #66CE69 0%, #20A162 100%);
+        background: $uni-theme-bg-color;
         border-radius: 100px;
       }
     }
@@ -308,7 +306,7 @@
 
   .active {
     font-weight: 700;
-    color: #20A162;
+    color: $uni-theme-color;
   }
 
   .item_list {
@@ -343,13 +341,13 @@
 
       .num {
         font-size: 31.58rpx;
-        color: #20A162;
+        color: $uni-theme-color;
       }
 
       .purchase_btn {
         color: #fff;
         padding: 7.02rpx 21.05rpx;
-        background: #009E56;
+        background: $uni-theme-color;
         border-radius: 100px;
         margin-left: 21.05rpx;
       }
@@ -359,7 +357,7 @@
         width: 180rpx;
         height: 60rpx;
         line-height: 60rpx;
-        background-color: #009E56;
+        background-color: $uni-theme-color;
         border-radius: 100px;
         color: #fff;
       }
@@ -377,7 +375,7 @@
     text-align: center;
     line-height: 80.7rpx;
     border-radius: 100px;
-    background-color: #20A162;
+    background-color: $uni-theme-color;
     color: #fff;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/shopping_trolley.vue b/pages/nongKe/supply_chain/shopping_trolley.vue
index 37f454d..30633e1 100644
--- a/pages/nongKe/supply_chain/shopping_trolley.vue
+++ b/pages/nongKe/supply_chain/shopping_trolley.vue
@@ -249,9 +249,7 @@
     ])),
     onReady() {},
     mounted: function() {},
-    onLoad: function(options) {
-
-    },
+    onLoad: function(options) {},
     onShow: function() {
       let that = this
       let routes = getCurrentPages();
@@ -1339,4 +1337,4 @@
       font-size: 24rpx;
     }
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue
index 72db34f..2db5267 100644
--- a/pages/nongKe/supply_chain/supplier.vue
+++ b/pages/nongKe/supply_chain/supplier.vue
@@ -1,8 +1,14 @@
 <template>
   <view class="supplier" :style="{height: winHeight + 'px' }">
+    <view class="head-wrapper" :style="'top:'+statusBarHeight">
+      <view class="head-menu">
+        <view class='iconfont icon-xiangzuo' @click="returns"></view>
+        <view class="iconfont icon-shouye4" @click="goHome"></view>
+      </view>
+    </view>
     <view class="header_warpper">
       <u-swiper :list="swiperList" keyName="pic" :autoplay="true" height="491.23rpx"></u-swiper>
-      <view class="head_search flex_a_c">
+      <!-- <view class="head_search flex_a_c">
         <view class="search_content flex_a_c_j_sb">
           <view class="flex_a_c">
             <view class="iconfont icon-sousuo"></view>
@@ -10,7 +16,7 @@
           </view>
           <button class="search_btn" @click="searchStoreMerchant">搜索</button>
         </view>
-      </view>
+      </view> -->
     </view>
 
     <view class="con-box">
@@ -37,7 +43,7 @@
             </view>
           </view>
           <block v-for="(item,index) in storeMerchant" :key="index">
-            <storeCard :store_item="item" :category="item.category_name"></storeCard>
+            <storeCard :store_item="item" :category="item.category_name" :isDetail="isDetail"></storeCard>
           </block>
           <u-loadmore :status="status" :loading-text="loadingText" :loadmore-text="loadmoreText"
             :nomore-text="nomoreText" />
@@ -54,6 +60,7 @@
 </template>
 
 <script>
+  var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
   import storeCard from './component/shop_card.vue'
   import rightSlider from './component/rightSlider';
   import { getIndexData } from '@/api/api.js'
@@ -66,6 +73,7 @@
     },
     data() {
       return {
+        statusBarHeight: statusBarHeight, //系统导航条高度
         swiperList: [],
         activeTwo: 0,
         winHeight: 0,
@@ -112,6 +120,7 @@
           type_id: '', // 类型
           street_id: '' // 位置
         },
+        isDetail: 2
       }
     },
     onLoad(e) {
@@ -119,6 +128,7 @@
       if (e.type_id) {
         this.sotreParam.type_id = e.type_id
       }
+      if (e.isDetail) this.isDetail = e.isDetail
       this.getStoreMerchant()
       this.getStore()
       this.getClassfication()
@@ -133,6 +143,16 @@
     },
     onShow() {},
     methods: {
+      // 后退
+      returns: function() {
+        uni.navigateBack()
+      },
+      // 首页
+      goHome() {
+        uni.switchTab({
+          url: '/pages/home/index'
+        });
+      },
       async getBanner() {
         const { data } = await getIndexData()
         this.swiperList = data.banner
@@ -336,12 +356,12 @@
       width: 694.74rpx;
       height: 66.67rpx;
       padding: 2px 2px 2px 21.05rpx;
-      border: 1px solid #20A162;
+      border: 1px solid $uni-theme-color;
       border-radius: 100px;
 
       .icon-sousuo {
         font-weight: bold;
-        color: #20A162;
+        color: $uni-theme-color;
         margin-right: 17.54rpx;
       }
 
@@ -350,7 +370,7 @@
         width: 135.09rpx;
         height: 59.65rpx;
         line-height: 59.65rpx;
-        background: linear-gradient(180deg, #66CE69 0%, #20A162 100%);
+        background: $uni-theme-bg-color;
         border-radius: 100px;
       }
     }
@@ -360,6 +380,7 @@
     flex: 1;
     display: flex;
     overflow: hidden;
+    margin-top: 28.07rpx;
   }
 
   .left_classify {
@@ -467,7 +488,7 @@
       .msg {
 
         .category_name {
-          color: #20A162;
+          color: $uni-theme-color;
         }
 
         .scope {
@@ -485,4 +506,39 @@
       }
     }
   }
+
+  .head-wrapper {
+    z-index: 999;
+    display: flex;
+    align-items: center;
+    position: fixed;
+    left: 30rpx;
+    top: 0;
+    /* #ifdef MP */
+    height: 43px;
+    /* #endif */
+    /* #ifdef H5 */
+    height: 114rpx;
+    /* #endif */
+  }
+
+  .head-menu {
+    display: flex;
+    align-items: center;
+    height: 54rpx;
+    width: 140rpx;
+    background: rgba(0, 0, 0, .25);
+    border-radius: 27rpx;
+
+    .iconfont {
+      flex: 1;
+      text-align: center;
+      color: #fff;
+      box-sizing: border-box;
+
+      &.icon-xiangzuo {
+        border-right: 1px solid #fff;
+      }
+    }
+  }
 </style>
\ No newline at end of file
diff --git a/pages/plant_release/index.vue b/pages/plant_release/index.vue
index 1e60a83..9b9ce68 100644
--- a/pages/plant_release/index.vue
+++ b/pages/plant_release/index.vue
@@ -14,11 +14,11 @@
               <view class="input_photo acea-row row-middle">
                 <block v-if="tabActive == 2">
                   <view class="pictrue" v-if="formData.video_link">
-                    <!-- <view v-if="videoplay">
-											<video controls id="myvideo" :src="video_link" @fullscreenchange="screenChange"></video>
-										</view>	 -->
+                    <view v-if="videoplay">
+                      <video controls id="myvideo" :src="video_link" @fullscreenchange="screenChange"></video>
+                    </view>
                     <!--#ifndef APP-PLUS-->
-                    <!-- <video class="pictrue" :src="formData.video_link"></video> -->
+                    <video class="pictrue" :src="formData.video_link"></video>
                     <!--#endif-->
                     <image class="video-bg" mode="widthFix"
                       src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/3/video_bg.png">
@@ -69,7 +69,7 @@
             </view>
           </view>
           <view class="release_item">
-            <!-- <view class='item acea-row row-between-wrapper'>
+            <view class='item acea-row row-between-wrapper'>
               <view class='name'><text class="iconfont icon-baobeilianjie"></text>添加产品({{productList.length}})</view>
               <view class="select">
                 <view class="select_count" @click.stop="addProduct">
@@ -81,7 +81,7 @@
                   <text class="iconfont icon-xiangyou"></text>
                 </view>
               </view>
-            </view> -->
+            </view>
             <view class='item acea-row row-between-wrapper'>
               <view class='name'><text class="iconfont icon-canyuhuati"></text>参与话题</view>
               <view class="select">
@@ -581,7 +581,7 @@
     line-height: 90rpx;
     height: 90rpx;
     height: calc(90rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-    height: calc(90rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+    height: calc(200rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
   }
 
   .container {
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index c4e7780..ce5f167 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -13,7 +13,7 @@
         </swiper>
       </view>
 
-      <view class="search_wrapper flex_a_c_j_sb">
+      <!-- <view class="search_wrapper flex_a_c_j_sb">
         <navigator url="/pages/plantGrass/plant_search/index" hover-class="none" class="search_content flex_a_c_j_sb">
           <view class="flex_a_c">
             <view class="iconfont icon-sousuo"></view>
@@ -22,14 +22,14 @@
           <button class="search_btn">搜索</button>
         </navigator>
         <view class="iconlihai lihai-gengduo" @click="showPicker=true"></view>
-      </view>
+      </view> -->
 
       <view class="shop_wrapper">
         <navigator class="l_yun" hover-class="none"
-          :url="`/pages/nongKe/supply_chain/supplier?street_id=${sotreParam.street_id}`">
+          :url="`/pages/nongKe/supply_chain/supplier?type_id=10&street_id=${sotreParam.street_id}`">
           <view class="yun_title flex_a_c">
             <view class="">泸州市{{district}}{{town}}</view>
-            <view class="iconlihai lihai-gengduo"></view>
+            <view class="iconlihai lihai-gengduo" @click.stop="showPicker=true"></view>
           </view>
           <view class="text_cont">
             <text class="name_town">{{town}}</text>供销综合云市场
@@ -79,14 +79,18 @@
         </navigator>
       </view> -->
 
-      <view class="article_box">
-        <block v-for="item in ArticleHotList" :key="item.article_id">
-          <view class="article_item">
-            <view class="title">{{item.title}}</view>
-            <view class="synopsis">{{item.synopsis}}</view>
-          </view>
-        </block>
-      </view>
+      <!-- 滚动 -->
+      <scroll-view scroll-y="true" class="article_box">
+        <view>
+          <block v-for="item in ArticleHotList" :key="item.article_id">
+            <view class="article_item">
+              <view class="title">{{item.title}}</view>
+              <view class="synopsis">{{item.synopsis}}</view>
+            </view>
+          </block>
+        </view>
+      </scroll-view>
+
 
       <view class="tabs_wrapper">
         <!-- <u-tabs :list="tabsData.list" @click="tabsChange" :activeStyle="tabsData.activeStyle"
@@ -277,13 +281,13 @@
       },
       Area() {
         getArea({ city_code: 510500 }).then(res => {
-          this.$refs.uPicker.setColumnValues(0, res);
-          this.Street(res[0]['code']);
+          this.$refs.uPicker.setColumnValues(0, res.data);
+          this.Street(res.data[0]['code']);
         });
       },
       Street(code) {
         getStreet({ area_code: code }).then(res => {
-          this.$refs.uPicker.setColumnValues(1, res);
+          this.$refs.uPicker.setColumnValues(1, res.data);
         });
       },
     },
@@ -542,12 +546,20 @@
     }
   }
 
+  .scroll_art {
+    width: 694.74rpx;
+    margin: 0 auto;
+    height: 526.32rpx
+  }
+
   .article_box {
+    height: 431.58rpx;
     width: 694.74rpx;
     margin: 38.6rpx auto;
     background-color: #fff;
     border-radius: 8px;
-    padding: 24.56rpx;
+    padding: 0 24.56rpx 24.56rpx 24.56rpx;
+    box-sizing: border-box;
 
     .article_item {
       height: 131.58rpx;
@@ -557,16 +569,17 @@
       border-bottom: 1px solid #CCCCCC;
 
       .title {
-        font-size: 31.58rpx;
+        font-size: 28.07rpx;
         font-weight: bold;
         width: 100%;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
+        margin-bottom: 10.53rpx;
       }
 
       .synopsis {
-        font-size: 24.56rpx;
+        font-size: 21.05rpx;
         color: #666;
         width: 100%;
         white-space: nowrap;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index a1635a1..d67414d 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -151,7 +151,7 @@
             </block>
           </view>
         </view>
-        <view class="menus-list-item" v-if="!userInfo.topService && userInfo.service" @click="toService(0)">
+        <!-- <view class="menus-list-item" v-if="!userInfo.topService && userInfo.service" @click="toService(0)">
           <view class="item-text">
             <view class="title">
               <text class="merchant">商家</text>管理
@@ -159,7 +159,7 @@
             <view class="info">进入商户中心管理店铺</view>
           </view>
           <view class="image merchant-image"></view>
-        </view>
+        </view> -->
         <view class="menus-list-item" v-if="!userInfo.service && userInfo.topService" @click="toService(1)">
           <view class="item-text">
             <view class="title">
diff --git a/pages/users/login/index.vue b/pages/users/login/index.vue
index ce28e1a..f48fb7d 100644
--- a/pages/users/login/index.vue
+++ b/pages/users/login/index.vue
@@ -1,1214 +1,408 @@
 <template>
-	<div :style="viewColor">
-	<div class="register absolute" v-if="!auth_token">
-		<div class="shading">
-			<div class="pictrue acea-row row-center-wrapper">
-				<image :src="login_logo" v-if="login_logo" />
-			</div>
-		</div>
-		<div class="whiteBg" v-if="formItem === 1">
-			<div class="title acea-row row-center-wrapper">
-				<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)" :key="index">
-					{{ item }}
-				</div>
-			</div>
-			<div class="list" :hidden="current !== 0">
-				<form @submit.prevent="submit">
-					<div class="item">
-						<div class="acea-row row-middle">
-							<image src="/static/images/phone_1.png"></image>
-							<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" required />
-						</div>
-					</div>
-					<div class="item">
-						<div class="acea-row row-middle">
-							<image src="/static/images/code_2.png"></image>
-							<input type="password" placeholder="填写登录密码" placeholder-class="placeholder" v-model="password" required />
-						</div>
-					</div>
-				</form>
-				<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
-					忘记密码
-				</navigator>
-			</div>
-			<div class="list" :hidden="current !== 1">
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/phone_1.png"></image>
-						<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
-					</div>
-				</div>
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
-						<button v-debounce class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
-							{{ text }}
-						</button>
-					</div>
-				</div>
-				<div class="item" v-if="isShowCode">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" 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>
-					</div>
-				</div>
-			</div>
-			<div class="protocol acea-row row-between-wrapper">
-				<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
-					<checkbox class="checkbox" :checked="isAgree ? true : false" />
-					<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
-				</checkbox-group>
-			</div>
-			<div class="logon" v-debounce @click="loginMobile" :hidden="current !== 1">登录</div>
-			<div class="logon" v-debounce @click="submit" :hidden="current === 1">登录</div>
-			<div class="tip">
-				没有账号?
-				<span @click="formItem = 2" class="font-color-red">立即注册</span>
-			</div>
-			
-			<!-- #ifdef MP -->
-			<view class="appLogin">
-				<view class="hds">
-					<span class="line"></span>
-					<p>其他方式登录</p>
-					<span class="line"></span>
-				</view>
-				<view class="btn-wrapper">
-					<button form-type="submit" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
-						<view class="btn wx">
-							<span class="iconfont icon-s-weixindenglu1"></span>
-						</view>
-					</button>
-				</view>
-			</view>
-			<!-- #endif -->
-			<!-- #ifdef APP-PLUS -->
-			<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
-				<view class="hds">
-					<span class="line"></span>
-					<p>其他方式登录</p>
-					<span class="line"></span>
-				</view>
-				<view class="btn-wrapper">
-					<view class="btn wx" @click="wxLogin">
-						<span class="iconfont icon-s-weixindenglu1"></span>
-					</view>
-					<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
-						<span class="iconfont icon-s-pingguo"></span>
-					</view>
-				</view>
-			</view>
-			<!-- #endif -->
-		</div>
-		<div class="whiteBg" v-else>
-			<div class="title">注册账号</div>
-			<div class="list">
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/phone_1.png"></image>
-						<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
-					</div>
-				</div>
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_2.png"></image>
-						<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
-						<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
-							{{ text }}
-						</button>
-					</div>
-				</div>
-				<div class="item">
-					<div class="acea-row row-middle">
-						<image src="/static/images/code_1.png"></image>
-						<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder" 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="text" placeholder="填写验证码" 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>
-					</div>
-				</div>
-			</div>
-			<div class="protocol acea-row row-between-wrapper">
-				<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
-					<checkbox class="checkbox" :checked="isAgree ? true : false" />
-					<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>			
-				</checkbox-group>
-			</div>
-			<div class="logon" @click="register">注册</div>
-			<div class="tip">	
-				已有账号?
-				<span @click="formItem = 1" class="font-color-red">立即登录</span>
-			</div>
-			<!-- #ifdef APP-PLUS -->
-			<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
-				<view class="hds">
-					<span class="line"></span>
-					<p>其他方式登录</p>
-					<span class="line"></span>
-				</view>
-				<view class="btn-wrapper">
-					<view class="btn wx" @click="wxLogin">
-						<span class="iconfont icon-s-weixindenglu1"></span>
-					</view>
-					<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
-						<span class="iconfont icon-s-pingguo"></span>
-					</view>
-				</view>
-			</view>
-			<!-- #endif -->			
-		</div>
-		<div class="bottom"></div>
-		<view class="settlementAgreement" v-if="showAgreement">
-			<view class="setAgCount">
-				<i class="icon iconfont icon-cha" @click="showAgreement = false"></i>
-				<div class="title">用户协议与隐私政策</div>
-				<view class="content">
-					<jyf-parser :html="agreement" ref="article" :tag-style="tagStyle"></jyf-parser>
-				</view>		
-			</view>
-		</view>
-	</div>
-	<form report-submit='true' v-if="auth_token">
-		<view class="ChangePassword">
-			<view class="list">
-				<view class="item">
-					<input type='number' placeholder='填写手机号码' placeholder-class='placeholder' v-model="account"></input>
-				</view>
-				<view class="item acea-row row-between-wrapper">
-					<input type='number' placeholder='填写验证码' 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' v-model="password"></input>
-				</view>
-				<view class="protocol acea-row row-between-wrapper">
-					<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
-						<checkbox class="checkbox" :checked="isAgree ? true : false" />
-						<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>			
-					</checkbox-group>
-				</view>
-			</view>
-			<button form-type="submit" @click="register" class="confirmBnt">确认绑定</button>
-			<button form-type="submit" @click="auth_token = ''" class="confirmBnt back">返回</button>
-		</view>
-	</form>
-	<view class="copyright" @click="goCopyUrl">{{ copyright.status == -1 ? `${copyright.year} ${copyright.url}` : copyright.Copyright }}</view>
+  <view class="login_box">
+    <image class="image" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/login-bg.png" mode="">
+    </image>
 
-	<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
-	</div>
+    <view class="cont_box">
+      <view class="headline">
+        <view class="title">里海数字平台</view>
+        <view class="text">输入手机号获取验证码登录</view>
+      </view>
+      <view class="form_box">
+        <view class="from_input">
+          <view class="phone_iput">
+            <input type="text" placeholder="输入手机号码" class="text_input" v-model="account">
+          </view>
+          <view class="codeIput_box">
+            <input type="text" placeholder="填写验证码" class="codeIput" v-model="captcha">
+            <button v-debounce class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
+              @click="handleVerify">
+              {{ text }}
+            </button>
+          </view>
+        </view>
+        <view class="protocol">
+          <checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
+            <checkbox class="checkbox" :checked="isAgree ? true : false" />
+            <text class="protocol_text">登录及代表同意<text @click="userAgree" class="font_pro">用户协议</text>与<text
+                @click="userPrivacyAgree" class="font_pro">隐私政策</text></text>
+          </checkbox-group>
+        </view>
+        <view class="logon" @click="loginMobile">登录</view>
+        <!-- #ifdef APP-PLUS -->
+        <view class="iconfont icon-weixin weixin" @click="wxLogin"></view>
+        <!-- #endif -->
+      </view>
+    </view>
+    <Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify">
+    </Verify>
+  </view>
 </template>
+
 <script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
-	import dayjs from "@/plugin/dayjs/dayjs.min.js";
-	import sendVerifyCode from "@/mixins/SendVerifyCode";
-	import {
-		loginH5,
-		loginMobile,
-		registerVerify,
-		register,
-		getCodeApi,
-		getUserInfo,
-		getCaptcha,
-		getAgreementApi,
-		appleLogin,
-		loginMpPhone
-	} from "@/api/user";
-	// #ifdef APP-PLUS
-	import {
-		wechatAppAuth,
-		appleAppAuth
-	} from '@/api/api.js'
-	// #endif
-	import attrs, {
-		required,
-		alpha_num,
-		chs_phone
-	} from "@/utils/validate";
-	import {
-		validatorDefaultCatch
-	} from "@/utils/dialog";
-	import {
-		getLogo,
-		getconfig,
-		getVersion
-	} from "@/api/public";
-	// import cookie from "@/utils/store/cookie";
-	import {
-		VUE_APP_API_URL,
-		configMap
-	} from "@/utils";
-	import parser from "@/components/jyf-parser/jyf-parser";
-	import {
-		commonAuth
-	} from '../../../api/public';
-	import {
-		mapGetters
-	} from "vuex";
-	import Verify from '@/components/verify/verify.vue';
-	const BACK_URL = "login_back_url";
-
-	export default {
-		name: "Login",
-		mixins: [sendVerifyCode],
-		components: {
-			"jyf-parser": parser,
-			Verify
-		},
-		data: function() {
-			return {
-				navList: ["账号登录", "快速登录"],
-				current: 1,
-				account: "",
-				password: "",
-				captcha: "",
-				formItem: 1,
-				type: "login",
-				keyCode: "",
-				codeUrl: "",
-				codeVal: "",
-				isShowCode: false,
-				showAgreement: false,
-				tagStyle: {
-					img: 'width:100%;display:block;'
-				},
-				isAgree: false,
-				agreement: '',
-				appLoginStatus: false, // 微信登录强制绑定手机号码状态
-				appUserInfo: null, // 微信登录保存的用户信息
-				appleLoginStatus: false, // 苹果登录强制绑定手机号码状态
-				appleUserInfo: null,
-				appleShow: false, // 苹果登录版本必须要求ios13以上的
-				keyLock: true,
-				auth_token: '',
-				codeVal: '',
-				copyright: {}
-			};
-		},
-		computed: configMap(['login_logo'], mapGetters(['viewColor'])),
-		watch: {
-			formItem: function(nval, oVal) {
-				if (nval == 1) {
-					this.type = 'login'
-				} else {
-					this.type = 'register'
-				}
-			}
-		},
-		onLoad() {
-			let self = this
-			uni.getSystemInfo({
-				success: function(res) {
-					if (res.platform.toLowerCase() == 'ios' && self.getSystem(res.system) >= 13) {
-						self.appleShow = true
-					}
-				}
-			});
-			this.getVersion();
-		},
-		mounted: function() {
-			
-		},
-		onReady(){
-			let that = this
-			// #ifdef MP
-			wx.login({
-			  success (res) {
-			    if (res.code) {
-			     that.codeVal = res.code
-			    } else {
-			      console.log('登录失败！' + res.errMsg)
-			    }
-			  }
-			})
-			// #endif
-		},
-		methods: {
-			// #ifdef MP
-			getPhoneNumber(e) {
-				
-				let that = this;
-				loginMpPhone({
-					iv:e.detail.iv,
-					encryptedData:e.detail.encryptedData,
-					code:that.codeVal,
-					auth_token: uni.getStorageSync('auth_token'),
-					}).then(({
-						data
-					}) => {
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						that.$store.commit("LOGIN", {
-							'token': data.token,
-							'time': data.exp
-						});
-						that.$store.commit("SETUID", data.user.uid);
-						that.$store.commit('UPDATE_USERINFO', data.user);
-
-						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
-							'/pages/user/index','/pages/plant_grass/index'
-						]
-						if (indexPat.includes(this.getPath(backUrl))) {
-							method = 'switchTab'
-						} else {
-							method = 'navigateTo'
-						}
-						if (this.getPath(backUrl) === '/pages/users/login/index') {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-							return
-						}
-						uni[method]({
-							url: backUrl
-						});
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			// #endif
-			goCopyUrl() {
-				// #ifdef H5
-				location.href = 'http://'+this.copyright.url
-				// #endif
-			},
-			userAgree(){
-				uni.navigateTo({
-					url: '/pages/users/user_about/index?from=sys_user_agree'
-				})
-			},
-			userPrivacyAgree(){
-				uni.navigateTo({
-					url: '/pages/users/user_about/index?from=sys_userr_privacy'
-				})
-			},
-			getSystem(system) {
-				if(system.indexOf('iOS') === -1){
-					return system
-				}else{
-					let str = system.split(' ')[1]
-					if (str.indexOf('.')) {
-						return Number(str.split('.')[0])
-					} else {
-						return Number(str)
-					}
-				}
-			},
-			// 苹果登录
-			appleLogin() {
-				let self = this
-				this.account = ''
-				this.captcha = ''
-				uni.showLoading({
-					title: '登录中'
-				})
-				uni.login({
-					provider: 'apple',
-					timeout: 10000,
-					success(loginRes) {
-						uni.getUserInfo({
-							provider: 'apple',
-							success: function(infoRes) {
-								self.appleUserInfo = infoRes.userInfo
-								self.appleLoginApi()
-							},
-							fail() {
-								uni.showToast({
-									title: '获取用户信息失败',
-									icon: 'none',
-									duration: 2000
-								})
-							},
-							complete() {
-								uni.hideLoading()
-							}
-						});
-					},
-					fail(error) {
-						uni.showToast({
-							title: '获取用户信息失败',
-							icon: 'none',
-							duration: 2000
-						})
-						console.log(error)
-					}
-				})
-			},
-			appleLoginApi(){
-				let that = this
-				commonAuth({
-					auth: {
-						type:'apple',
-						auth: {
-							userInfo: that.appleUserInfo,
-							openId: that.appleUserInfo.openId,
-							nickname: (that.appleUserInfo.fullName.familyName || '') + (that.appleUserInfo.fullName.giveName || ''),
-						}
-				}}).then(res => {
-					const data = res.data;
-					if(res.data.status == 200){
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						that.$store.commit("LOGIN", {
-							'token': data.result.token,
-							'time': data.result.exp
-						});
-						that.$store.commit("SETUID", data.result.user.uid);
-						that.$store.commit('UPDATE_USERINFO', data.result.user);
-						
-						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
-							'/pages/user/index','/pages/plant_grass/index'
-						]
-						if (indexPat.includes(this.getPath(backUrl))) {
-							method = 'switchTab'
-						} else {
-							method = 'navigateTo'
-						}
-						if (this.getPath(backUrl) === '/pages/users/login/index') {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-							return
-						}
-						uni[method]({
-							url: backUrl
-						});
-					}else{
-						uni.hideLoading();
-						that.auth_token = res.data.result.key;
-					}
-				}).catch(res => {
-					uni.hideLoading();
-					uni.showToast({
-						title: res.message || res,
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			// App微信登录
-			wxLogin() {
-				if (!this.isAgree) return this.$util.Tips({
-					title: '请勾选用户协议与隐私政策'
-				});
-				let self = this
-				this.account = ''
-				this.captcha = ''
-				uni.showLoading({
-					title: '登录中'
-				})
-				uni.login({
-					provider: 'weixin',
-					// onlyAuthorize: true,
-					success: function(loginRes) {
-						self.appUserInfo = loginRes
-						self.wxLoginApi()
-					},
-					fail(error) {
-						uni.showToast({
-							title: '登录失败',
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				});
-			},
-			getPath(url) {
-				if (url.indexOf("?") != -1) {
-					url = url.split("?")[0];
-					console.log(url);
-				}
-				return url
-			},
-			wxLoginApi() {
-				const that = this
-				commonAuth({
-					auth: {
-						type:'app_wechat',
-						auth: {
-							code: that.appUserInfo.authResult.access_token,
-							openid: that.appUserInfo.authResult.openid,
-							phone: this.account,
-						}
-				}}).then(res => {
-					const data = res.data;
-					if(res.data.status == 200){
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						that.$store.commit("LOGIN", {
-							'token': data.result.token,
-							'time': data.result.exp
-						});
-						that.$store.commit("SETUID", data.result.user.uid);
-						that.$store.commit('UPDATE_USERINFO', data.result.user);
-						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
-							'/pages/user/index','/pages/plant_grass/index'
-						]
-						if (indexPat.includes(this.getPath(backUrl))) {
-							method = 'switchTab'
-						} else {
-							method = 'navigateTo'
-						}
-						if (this.getPath(backUrl) === '/pages/users/login/index') {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-							return
-						}
-						uni[method]({
-							url: backUrl
-						});
-					}else{
-						that.auth_token = res.data.result.key;
-						that.bindStatus = true;
-					}
-						uni.hideLoading();
-				}).catch(res => {
-					uni.hideLoading();
-					uni.showToast({
-						title: res.message || res,
-						icon: 'none',
-						duration: 2000
-					});
-				});
-			},
-			getAgreement() {
-				let that = this
-				getAgreementApi('sys_user_agree').then(res => {
-					that.agreement = res.data.sys_user_agree
-				})
-			},
-			getCode(data) {
-				let that = this
-				getCodeApi()
-					.then(res => {
-						that.keyCode = res.data.key;
-						that.code(data);
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			async loginMobile() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请输入手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!that.captcha) return that.$util.Tips({
-					title: '请输入验证码'
-				});
-				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
-					title: '请输入正确的验证码'
-				});
-				if (!that.isAgree) return that.$util.Tips({
-					title: '请勾选用户协议与隐私政策'
-				});
-				
-				loginMobile({
-						auth_token: uni.getStorageSync('auth_token'),
-						phone: that.account,
-						sms_code: that.captcha,
-						spread: that.$Cache.get("spread"),
-						// #ifdef APP-PLUS
-						user_type: 'app',
-						// #endif
-						// #ifdef H5
-						user_type: 'h5',
-						// #endif
-					})
-					.then(({
-						data
-					}) => {
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						that.$store.commit("LOGIN", {
-							'token': data.token,
-							'time': data.exp
-						});
-						that.$store.commit("SETUID", data.user.uid);
-						that.$store.commit('UPDATE_USERINFO', data.user);
-
-						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
-							'/pages/user/index'
-						]
-						if (indexPat.includes(this.getPath(backUrl))) {
-							method = 'switchTab'
-						} else {
-							method = 'navigateTo'
-						}
-						if (this.getPath(backUrl) === '/pages/users/login/index') {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-							return
-						}
-						uni[method]({
-							url: backUrl
-						});
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			async register() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请输入手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!that.captcha) return that.$util.Tips({
-					title: '请输入验证码'
-				});
-				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
-					title: '请输入正确的验证码'
-				});
-				if (!that.password) return that.$util.Tips({
-					title: '请输入密码'
-				});
-				if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/i.test(that.password)) return that.$util.Tips({
-					title: '请输入6-16位字母加数字组合'
-				});
-				if (!that.isAgree) return that.$util.Tips({
-					title: '请勾选用户协议与隐私政策'
-				});
-				register({
-						auth_token: this.auth_token || uni.getStorageSync('auth_token'),
-						phone: that.account,
-						sms_code: that.captcha,
-						pwd: that.password,
-						spread: that.$Cache.get("spread"),
-						// #ifdef APP-PLUS
-						user_type: 'app',
-						// #endif
-						// #ifdef H5
-						user_type: 'h5',
-						// #endif
-					})
-					.then(res => {
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						that.$store.commit("LOGIN", {
-							'token': res.data.token,
-							'time': res.data.exp
-						});
-						that.$store.commit("SETUID", res.data.user.uid);
-						that.$store.commit('UPDATE_USERINFO', res.data.user);					
-						uni.switchTab({
-							url: '/pages/user/index'
-						})						
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			async code(data) {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请输入手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				// if (that.formItem == 2) that.type = "register";
-				await registerVerify({
-						phone: that.account,
-						type: 'login',
-						key: that.keyCode,
-						// code: that.codeVal,
-						toke:data.token,
-						captchaType: 'blockPuzzle',
-						captchaVerification: data.captchaVerification
-					})
-					.then(res => {
-						that.$util.Tips({
-							title: res.message
-						});
-						that.sendCode();
-					})
-					.catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-					});
-			},
-			getcaptcha() {
-				let that = this
-				getCaptcha().then(data => {
-					// that.codeUrl = `${VUE_APP_API_URL}/sms_captcha?key=${that.keyCode}`;
-					that.codeUrl = data.data.captcha;
-					that.keyCode = data.data.key
-				})
-				that.isShowCode = true;
-			},
-			navTap: function(index) {
-				this.current = index;
-			},
-			getPath(url) {
-				if (url.indexOf("?") != -1) {
-					url = url.split("?")[0];
-				}
-				return url
-			},
-			async submit() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请输入账号'
-				});
-				if (!/^[\w\d]{5,16}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的账号'
-				});
-				if (!that.password) return that.$util.Tips({
-					title: '请输入密码'
-				});
-				if (!that.isAgree) return that.$util.Tips({
-					title: '请勾选用户协议与隐私政策'
-				});
-				loginH5({
-						auth_token: uni.getStorageSync('auth_token'),
-						account: that.account,
-						password: that.password,
-						spread: that.$Cache.get("spread")
-					})
-					.then(({
-						data
-					}) => {
-						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
-						that.$Cache.clear(BACK_URL);
-						that.$store.commit("LOGIN", {
-							'token': data.token,
-							'time': data.exp
-						});
-						that.$store.commit("SETUID", data.user.uid);
-						that.$store.commit('UPDATE_USERINFO', data.user);
-
-						let method
-						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
-							'/pages/user/index'
-						]
-						if (indexPat.includes(this.getPath(backUrl))) {
-							method = 'switchTab'
-						} else {
-							method = 'navigateTo'
-						}
-						if (this.getPath(backUrl) === '/pages/users/login/index') {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-							return
-						}
-						uni[method]({
-							url: backUrl
-						});						
-					})
-					.catch(e => {
-						that.$util.Tips({
-							title: e
-						});
-					});
-			},
-			getVersion() {
-				getVersion().then(data => {
-					this.copyright = data.data;
-				});
-			},
-			success(data) {
-				this.$refs.verify.hide();
-				this.code(data);
-			},
-			handleVerify() {
-				let that = this;
-				if (!that.account) return that.$util.Tips({
-					title: '请输入手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!that.isAgree) return that.$util.Tips({
-					title: '请勾选用户协议与隐私政策'
-				});
-				that.$refs.verify.show();
-			}
-		}
-	};
+  import { commonAuth } from '@/api/public';
+  import { loginMobile, registerVerify, getSiteAPI } from '@/api/user'
+  import { LOGO_URL, USER_INFO, EXPIRES_TIME } from '@/config/cache';
+  import Cache from '@/utils/cache';
+  import sendVerifyCode from "@/mixins/SendVerifyCode";
+  import Verify from '@/components/verify/verify.vue';
+  const BACK_URL = "login_back_url";
+  export default {
+    mixins: [sendVerifyCode],
+    components: {
+      Verify
+    },
+    data() {
+      return {
+        isAgree: true,
+        account: "",
+        captcha: '',
+        appUserInfo: null, // 微信登录保存的用户信息
+      }
+    },
+    onLoad(e) {
+      console.log('options', e)
+    },
+    methods: {
+      // App微信登录
+      wxLogin() {
+        if (!this.isAgree) return this.$util.Tips({
+          title: '请勾选用户协议与隐私政策'
+        });
+        let self = this
+        this.account = ''
+        this.captcha = ''
+        uni.showLoading({
+          title: '登录中'
+        })
+        uni.login({
+          provider: 'weixin',
+          // onlyAuthorize: true,
+          success: function(loginRes) {
+            self.appUserInfo = loginRes
+            self.wxLoginApi()
+          },
+          fail(error) {
+            uni.showToast({
+              title: '登录失败',
+              icon: 'none',
+              duration: 2000
+            })
+          }
+        });
+      },
+      wxLoginApi() {
+        const that = this
+        console.log('appUserInfo', that.appUserInfo);
+        commonAuth({
+          auth: {
+            type: 'app_wechat',
+            auth: {
+              code: that.appUserInfo.authResult.access_token,
+              openid: that.appUserInfo.authResult.openid,
+              phone: this.account,
+              // code: '68_CTElk8-PqBEmCksAPUQ8CYBEPbArY6MsSSjn8DjT_ZUhbkpGSwJECWjzYBEmvvkZloz2-E20smA8l7uNhGyGbuzqVxV9wVx-bAazxnSL_Us',
+              // openid: "oRrdQt-mZ3UOPossISgiDt-aEWNg",
+              // phone: this.account,
+            }
+          }
+        }).then(res => {
+          const data = res.data;
+          console.log('res', data);
+          if (res.data.status == 200) {
+            that.$Cache.clear(BACK_URL);
+            that.$store.commit("LOGIN", {
+              'token': data.result.token,
+              'time': data.result.exp
+            });
+            that.$store.commit("SETUID", data.result.user.uid);
+            that.$store.commit('UPDATE_USERINFO', data.result.user);
+            let time = data.expires_time - Cache.time();
+            // #ifdef MP
+            Cache.set(EXPIRES_TIME, data.expires_time, time);
+            Cache.set(USER_INFO, data.user, time);
+            // #endif
+            if (data.user.no_update === 1) {
+              uni.navigateTo({
+                url: `/pages/users/completeMsg/completeMsg?phone=${data.user.phone}`
+              })
+              return
+            }
+            getSiteAPI().then(res => that.$store.commit('setMyInfo', res))
+            uni.reLaunch({
+              url: '/pages/user/index'
+            });
+          } else {
+            that.auth_token = res.data.result.key;
+            that.bindStatus = true;
+          }
+          uni.hideLoading();
+        }).catch(res => {
+          uni.hideLoading();
+          uni.showToast({
+            title: res.message || res,
+            icon: 'none',
+            duration: 2000
+          });
+        });
+      },
+      handleVerify() {
+        let that = this;
+        if (!that.account) return that.$util.Tips({
+          title: '请输入手机号码'
+        });
+        if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+          title: '请输入正确的手机号码'
+        });
+        if (!that.isAgree) return that.$util.Tips({
+          title: '请勾选用户协议与隐私政策'
+        });
+        that.$refs.verify.show();
+      },
+      success(data) {
+        this.$refs.verify.hide();
+        this.code(data);
+      },
+      async loginMobile() {
+        // 验证码登录
+        let that = this;
+        if (!that.account) return that.$util.Tips({
+          title: '请输入手机号码'
+        });
+        if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+          title: '请输入正确的手机号码'
+        });
+        if (!that.captcha) return that.$util.Tips({
+          title: '请输入验证码'
+        });
+        if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
+          title: '请输入正确的验证码'
+        });
+        if (!that.isAgree) return that.$util.Tips({
+          title: '请勾选用户协议与隐私政策'
+        });
+        loginMobile({
+            auth_token: uni.getStorageSync('auth_token'),
+            phone: that.account,
+            sms_code: that.captcha,
+            spread: that.$Cache.get("spread"),
+            // #ifdef APP-PLUS
+            user_type: 'app',
+            // #endif
+            // #ifdef H5
+            user_type: 'h5',
+            // #endif
+          })
+          .then(({
+            data
+          }) => {
+            console.log('验证码登录', data);
+            let time = data.expires_time - Cache.time();
+            const backUrl = that.$Cache.get(BACK_URL) || "/pages/home/index";
+            that.$Cache.clear(BACK_URL);
+            that.$store.commit("LOGIN", {
+              'token': data.token,
+              'time': data.exp
+            });
+            that.$store.commit("SETUID", data.user.uid);
+            that.$store.commit('UPDATE_USERINFO', data.user);
+            // Cache.set(EXPIRES_TIME, data.result.expires_time, time);
+            // #ifdef MP
+            Cache.set(EXPIRES_TIME, data.expires_time, time);
+            Cache.set(USER_INFO, data.user, time);
+            // #endif
+            let method
+            let indexPat = ['/pages/home/index', '/pages/order_addcart/order_addcart',
+              '/pages/goods_cate/goods_cate',
+              '/pages/user/index'
+            ]
+            if (indexPat.includes(this.getPath(backUrl))) {
+              method = 'switchTab'
+            } else {
+              method = 'navigateTo'
+            }
+            if (this.getPath(backUrl) === '/pages/users/login/index') {
+              uni.switchTab({
+                url: '/pages/home/index'
+              });
+              return
+            }
+            uni[method]({
+              url: backUrl
+            });
+          })
+          .catch(res => {
+            that.$util.Tips({
+              title: res
+            });
+          });
+      },
+      async code(data) {
+        let that = this;
+        if (!that.account) return that.$util.Tips({
+          title: '请输入手机号码'
+        });
+        if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+          title: '请输入正确的手机号码'
+        });
+        // if (that.formItem == 2) that.type = "register";
+        await registerVerify({
+            phone: that.account,
+            type: 'login',
+            key: that.keyCode,
+            // code: that.codeVal,
+            toke: data.token,
+            captchaType: 'blockPuzzle',
+            captchaVerification: data.captchaVerification
+          })
+          .then(res => {
+            that.$util.Tips({
+              title: res.message
+            });
+            that.sendCode();
+          })
+          .catch(res => {
+            that.$util.Tips({
+              title: res
+            });
+          });
+      },
+      getPath(url) {
+        if (url.indexOf("?") != -1) {
+          url = url.split("?")[0];
+          console.log(url);
+        }
+        return url
+      },
+      userAgree() {
+        uni.navigateTo({
+          url: '/pages/users/user_about/index?from=sys_user_agree'
+        })
+      },
+      userPrivacyAgree() {
+        uni.navigateTo({
+          url: '/pages/users/user_about/index?from=sys_userr_privacy'
+        })
+      },
+    }
+  }
 </script>
-<style lang="scss" scoped>
-	page {
-		background-color: #fff !important;
-	}
-	/deep/uni-checkbox .uni-checkbox-input{
-		border-radius: 100%;
-	}
-	.ChangePassword .phone {
-		font-size: 32rpx;
-		font-weight: bold;
-		text-align: center;
-		margin-top: 55rpx;
-	}
-	
-	.ChangePassword .list {
-		width: 580rpx;
-		margin: 53rpx auto 0 auto;
-	}
-	
-	.ChangePassword .list .item {
-		width: 100%;
-		height: 110rpx;
-		border-bottom: 2rpx solid #f0f0f0;
-	}
-	
-	.ChangePassword .list .item input {
-		width: 100%;
-		height: 100%;
-		font-size: 32rpx;
-	}
-	
-	.ChangePassword .list .item .placeholder {
-		color: #b9b9bc;
-	}
-	
-	.ChangePassword .list .item input.codeIput {
-		width: 240rpx;
-		
-	}
-	/deep/.uni-input-wrapper,/deep/.uni-input-input{
-		// width: 240rpx;
-	}
-	.ChangePassword .list .item .code {
-		font-size: 32rpx;
-		background-color: #fff;
-		color: var(--view-theme);
-	}
-	
-	.ChangePassword .list .item .code.on {
-		color: #b9b9bc;
-	}
-	
-	.ChangePassword .confirmBnt {
-		font-size: 32rpx;
-		width: 580rpx;
-		height: 90rpx;
-		border-radius: 45rpx;
-		color: #fff;
-		margin: 92rpx auto 0 auto;
-		text-align: center;
-		line-height: 90rpx;
-		background-color: var(--view-theme);
-	}
-	
-	.ChangePassword .confirmBnt.back{
-		background-color: #FFFFFF;
-		border: 1px solid  var(--view-theme);
-		color: var(--view-theme);
-		margin-top: 30rpx;
-	}
-	
-	.getPhoneBtn{
-		font-size: 32rpx;
-		width: 580rpx;
-		height: 90rpx;
-		border-radius: 45rpx;
-		border: 1rpx solid #3CB625;
-		color: #3CB625;
-		margin: 40rpx auto 0 auto;
-		text-align: center;
-		line-height: 90rpx;
-		.iconfont{
-			font-size: 32rpx;
-			margin-right: 12rpx;
-		}
-	}
-	.code image {
-		width: 100%;
-		height: 100%;
-	}
 
-	.acea-row.row-middle {
-		input {
-			margin-left: 20rpx;
-		}
-	}
-	.settlementAgreement {
-		width: 100%;
-		height: 100%;
-		position: fixed;
-		top: 0;
-		left: 0;
-		background: rgba(0, 0, 0, .5);
-		z-index: 10;
-	}
-	.protocol_text{
-		color: #999;
-		font-size: 24rpx;
-	}
-	.settlementAgreement .setAgCount {
-		background: #fff;
-		width: 656rpx;
-		height: 458px;
-		position: absolute;
-		top: 50%;
-		left: 50%;
-		border-radius: 12rpx;
-		-webkit-border-radius: 12rpx;
-		padding: 52rpx;
-		-webkit-transform: translate(-50%, -50%);
-		-moz-transform: translate(-50%, -50%);
-		transform: translate(-50%, -50%);
-		overflow: hidden;
-		.content {
-			height: 900rpx;
-			overflow-y: scroll;
-	
-			/deep/ p {
-				font-size: 13px;
-				line-height: 22px;
-			}
-	
-			/deep/ img {
-				max-width: 100%;
-			}
-		}
-	}
-	.settlementAgreement .setAgCount .icon {
-		font-size: 42rpx;
-		color: #b4b1b4;
-		position: absolute;
-		top: 15rpx;
-		right: 15rpx;
-	
-	}
-	.settlementAgreement .setAgCount .title {
-		color: #333;
-		font-size: 32rpx;
-		text-align: center;
-		font-weight: bold;
-	}
-	.settlementAgreement .setAgCount .content {
-		margin-top: 32rpx;
-		color: #333;
-		font-size: 26rpx;
-		line-height: 22px;
-		text-align: justify;
-		text-justify: distribute-all-lines;
-		height: 756rpx;
-		overflow-y: scroll;
-	}
-	.protocol{
-		margin-top: 30rpx;
-	}
-	.protocol_text{
-		.font_pro{
-			color: var(--view-theme);
-		}
-	}
-	.appLogin {
-		.hds {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			font-size: 24rpx;
-			color: #B4B4B4;	
-			.line {
-				width: 68rpx;
-				height: 1rpx;
-				background: #CCCCCC;
-			}	
-			p {
-				margin: 0 20rpx;
-			}
-		}	
-		.btn-wrapper {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			margin-top: 30rpx;
-	
-			.btn {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 68rpx;
-				height: 68rpx;
-				border-radius: 50%;
-				
-				+ .btn {
-					margin-left: 30rpx;
-				}
-			}
-	
-			.apple-btn {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 246rpx;
-				height: 66rpx;
-				margin-left: 10rpx;
-				background: #EAEAEA;
-				border-radius: 34rpx;
-				font-size: 24rpx;
-	
-				.icon-s-pingguo {
-					color: #333;
-					margin-right: 10rpx;
-					font-size: 34rpx;
-				}
-			}
-	
-			.iconfont {
-				font-size: 40rpx;
-				color: #fff;
-			}
-	
-			.wx {
-				// margin-right: 30rpx;
-				background-color: #61C64F;
-				&.btn-apple{
-					margin-right: 0;
-					background-color: #333;
-				}
-			}
-			
-			.mima {
-				background-color: #28B3E9;
-			}
-	
-			.yanzheng {
-				background-color: #F89C23;
-			}
-	
-		}
-	}
-	
-	.code img {
-		width: 100%;
-		height: 100%;
-	}
-	
-	.acea-row.row-middle {
-		input {
-			margin-left: 20rpx;
-			display: block;
-		}
-	}
-	
-	.login-wrapper {
-		padding: 30rpx;
-	
-		.shading {
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 100%;
-			/* #ifdef APP-VUE */
-			margin-top: 50rpx;
-			/* #endif */
-			/* #ifndef APP-VUE */
-	
-			margin-top: 200rpx;
-			/* #endif */
-	
-	
-			image {
-				width: 180rpx;
-				height: 180rpx;
-			}
-		}
-	
-		.whiteBg {
-			margin-top: 100rpx;
-	
-			.list {
-				border-radius: 16rpx;
-				overflow: hidden;
-	
-				.item {
-					border-bottom: 1px solid #F0F0F0;
-					background: #fff;
-	
-					.row-middle {
-						position: relative;
-						padding: 16rpx 45rpx;
-	
-						input {
-							flex: 1;
-							font-size: 28rpx;
-							height: 80rpx;
-						}
-	
-						.code {
-							color: #E93323;
-							font-size: 26rpx;
-							transform: translateY(-50%);
-						}
-					}
-				}
-			}
-	
-			.logon {
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				width: 100%;
-				height: 86rpx;
-				margin-top: 80rpx;
-				background-color: $theme-color;
-				border-radius: 120rpx;
-				color: #FFFFFF;
-				font-size: 30rpx;
-			}
-	
-			.tips {
-				margin: 30rpx;
-				text-align: center;
-				color: #999;
-			}
-		}
-	}
-	.copyright {
-		position: fixed;
-		bottom: 30rpx;
-		left: 0;
-		width: 100%;
-		text-align: center;
-		font-size: 20rpx;
-		line-height: 28rpx;
-		color: #FFFFFF;
-		
-		.cell {
-			// margin-left: 6rpx;
-			font-size: 20rpx;
-		}
-	}
-</style>
+<style lang="scss">
+  page {
+    background-color: #fff;
+  }
+
+  .login_box {
+
+    .image {
+      width: 750rpx;
+      height: 812.28rpx;
+      position: fixed;
+      top: 0;
+      left: 0;
+      z-index: -1;
+    }
+
+    .logon {
+      width: 526.32rpx;
+      height: 84.21rpx;
+      background-color: #009E56;
+      border-radius: 100px;
+      color: #fff;
+      text-align: center;
+      line-height: 84.21rpx;
+      font-size: 29.82rpx;
+      margin-top: 78.95rpx;
+      margin-left: 50%;
+      transform: translate(-50%);
+    }
+
+    .cont_box {
+      position: absolute;
+      top: 208.77rpx;
+      left: 50%;
+      transform: translate(-50%);
+      width: 682.46rpx;
+
+      .headline {
+        margin-left: 43.86rpx;
+        color: #fff;
+
+        .title {
+          font-size: 45.61rpx;
+          font-weight: 700;
+        }
+
+        .text {
+          font-size: 29.82rpx;
+          margin-top: 14.04rpx;
+        }
+      }
+
+      .form_box {
+        margin-top: 196.49rpx;
+        width: 682.46rpx;
+        height: 701.75rpx;
+        padding: 61.4rpx;
+        background: #FFFFFF;
+        box-shadow: 0px 3px 6px 1px rgba(0, 106, 53, 0.2);
+        border-radius: 16px 16px 16px 16px;
+
+        .protocol {
+          margin-top: 70.18rpx;
+          font-size: 26.32rpx;
+
+          .checkgroup {
+            display: flex;
+            align-items: center;
+
+            .font_pro,
+            .font_pro {
+              color: #68A2FF;
+            }
+          }
+        }
+
+
+        .from_input {
+
+          .phone_iput,
+          .codeIput_box {
+            display: flex;
+            align-items: center;
+            height: 87.72rpx;
+            border-bottom: 1px solid #b7b7b7;
+          }
+
+          .codeIput_box {
+            display: flex;
+            justify-content: space-between;
+            margin-top: 47.37rpx;
+
+            .code {
+              font-size: 29.82rpx;
+              color: #68A2FF;
+            }
+
+            .on {
+              color: #AEAEAE;
+            }
+          }
+        }
+
+        .weixin {
+          color: #009E56;
+          font-size: 45.61rpx;
+          margin: 35.09rpx auto;
+          width: 87.72rpx;
+          height: 87.72rpx;
+          text-align: center;
+          line-height: 87.72rpx;
+          border-radius: 50%;
+          background-color: rgba(0, 0, 0, 0.1);
+        }
+      }
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
new file mode 100644
index 0000000..ce28e1a
--- /dev/null
+++ b/pages/users/login/login_copy.vue
@@ -0,0 +1,1214 @@
+<template>
+	<div :style="viewColor">
+	<div class="register absolute" v-if="!auth_token">
+		<div class="shading">
+			<div class="pictrue acea-row row-center-wrapper">
+				<image :src="login_logo" v-if="login_logo" />
+			</div>
+		</div>
+		<div class="whiteBg" v-if="formItem === 1">
+			<div class="title acea-row row-center-wrapper">
+				<div class="item" :class="current === index ? 'on' : ''" v-for="(item, index) in navList" @click="navTap(index)" :key="index">
+					{{ item }}
+				</div>
+			</div>
+			<div class="list" :hidden="current !== 0">
+				<form @submit.prevent="submit">
+					<div class="item">
+						<div class="acea-row row-middle">
+							<image src="/static/images/phone_1.png"></image>
+							<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" required />
+						</div>
+					</div>
+					<div class="item">
+						<div class="acea-row row-middle">
+							<image src="/static/images/code_2.png"></image>
+							<input type="password" placeholder="填写登录密码" placeholder-class="placeholder" v-model="password" required />
+						</div>
+					</div>
+				</form>
+				<navigator class="forgetPwd" hover-class="none" url="/pages/users/retrievePassword/index">
+					忘记密码
+				</navigator>
+			</div>
+			<div class="list" :hidden="current !== 1">
+				<div class="item">
+					<div class="acea-row row-middle">
+						<image src="/static/images/phone_1.png"></image>
+						<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
+					</div>
+				</div>
+				<div class="item">
+					<div class="acea-row row-middle">
+						<image src="/static/images/code_2.png"></image>
+						<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
+						<button v-debounce class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
+							{{ text }}
+						</button>
+					</div>
+				</div>
+				<div class="item" v-if="isShowCode">
+					<div class="acea-row row-middle">
+						<image src="/static/images/code_2.png"></image>
+						<input type="text" placeholder="填写验证码" 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>
+					</div>
+				</div>
+			</div>
+			<div class="protocol acea-row row-between-wrapper">
+				<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
+					<checkbox class="checkbox" :checked="isAgree ? true : false" />
+					<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>
+				</checkbox-group>
+			</div>
+			<div class="logon" v-debounce @click="loginMobile" :hidden="current !== 1">登录</div>
+			<div class="logon" v-debounce @click="submit" :hidden="current === 1">登录</div>
+			<div class="tip">
+				没有账号?
+				<span @click="formItem = 2" class="font-color-red">立即注册</span>
+			</div>
+			
+			<!-- #ifdef MP -->
+			<view class="appLogin">
+				<view class="hds">
+					<span class="line"></span>
+					<p>其他方式登录</p>
+					<span class="line"></span>
+				</view>
+				<view class="btn-wrapper">
+					<button form-type="submit" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+						<view class="btn wx">
+							<span class="iconfont icon-s-weixindenglu1"></span>
+						</view>
+					</button>
+				</view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
+				<view class="hds">
+					<span class="line"></span>
+					<p>其他方式登录</p>
+					<span class="line"></span>
+				</view>
+				<view class="btn-wrapper">
+					<view class="btn wx" @click="wxLogin">
+						<span class="iconfont icon-s-weixindenglu1"></span>
+					</view>
+					<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
+						<span class="iconfont icon-s-pingguo"></span>
+					</view>
+				</view>
+			</view>
+			<!-- #endif -->
+		</div>
+		<div class="whiteBg" v-else>
+			<div class="title">注册账号</div>
+			<div class="list">
+				<div class="item">
+					<div class="acea-row row-middle">
+						<image src="/static/images/phone_1.png"></image>
+						<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" />
+					</div>
+				</div>
+				<div class="item">
+					<div class="acea-row row-middle">
+						<image src="/static/images/code_2.png"></image>
+						<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" />
+						<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
+							{{ text }}
+						</button>
+					</div>
+				</div>
+				<div class="item">
+					<div class="acea-row row-middle">
+						<image src="/static/images/code_1.png"></image>
+						<input type="password" placeholder="填写您的登录密码" placeholder-class="placeholder" 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="text" placeholder="填写验证码" 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>
+					</div>
+				</div>
+			</div>
+			<div class="protocol acea-row row-between-wrapper">
+				<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
+					<checkbox class="checkbox" :checked="isAgree ? true : false" />
+					<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>			
+				</checkbox-group>
+			</div>
+			<div class="logon" @click="register">注册</div>
+			<div class="tip">	
+				已有账号?
+				<span @click="formItem = 1" class="font-color-red">立即登录</span>
+			</div>
+			<!-- #ifdef APP-PLUS -->
+			<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
+				<view class="hds">
+					<span class="line"></span>
+					<p>其他方式登录</p>
+					<span class="line"></span>
+				</view>
+				<view class="btn-wrapper">
+					<view class="btn wx" @click="wxLogin">
+						<span class="iconfont icon-s-weixindenglu1"></span>
+					</view>
+					<view class="btn wx btn-apple" @click="appleLogin" v-if="appleShow">
+						<span class="iconfont icon-s-pingguo"></span>
+					</view>
+				</view>
+			</view>
+			<!-- #endif -->			
+		</div>
+		<div class="bottom"></div>
+		<view class="settlementAgreement" v-if="showAgreement">
+			<view class="setAgCount">
+				<i class="icon iconfont icon-cha" @click="showAgreement = false"></i>
+				<div class="title">用户协议与隐私政策</div>
+				<view class="content">
+					<jyf-parser :html="agreement" ref="article" :tag-style="tagStyle"></jyf-parser>
+				</view>		
+			</view>
+		</view>
+	</div>
+	<form report-submit='true' v-if="auth_token">
+		<view class="ChangePassword">
+			<view class="list">
+				<view class="item">
+					<input type='number' placeholder='填写手机号码' placeholder-class='placeholder' v-model="account"></input>
+				</view>
+				<view class="item acea-row row-between-wrapper">
+					<input type='number' placeholder='填写验证码' 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' v-model="password"></input>
+				</view>
+				<view class="protocol acea-row row-between-wrapper">
+					<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
+						<checkbox class="checkbox" :checked="isAgree ? true : false" />
+						<text class="protocol_text">我已同意<text @click="userAgree" class="font_pro">《用户协议》</text>与<text @click="userPrivacyAgree" class="font_pro">《隐私政策》</text></text>			
+					</checkbox-group>
+				</view>
+			</view>
+			<button form-type="submit" @click="register" class="confirmBnt">确认绑定</button>
+			<button form-type="submit" @click="auth_token = ''" class="confirmBnt back">返回</button>
+		</view>
+	</form>
+	<view class="copyright" @click="goCopyUrl">{{ copyright.status == -1 ? `${copyright.year} ${copyright.url}` : copyright.Copyright }}</view>
+
+	<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
+	</div>
+</template>
+<script>
+	// +----------------------------------------------------------------------
+	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+	// +----------------------------------------------------------------------
+	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+	// +----------------------------------------------------------------------
+	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+	// +----------------------------------------------------------------------
+	// | Author: CRMEB Team <admin@crmeb.com>
+	// +----------------------------------------------------------------------
+	import dayjs from "@/plugin/dayjs/dayjs.min.js";
+	import sendVerifyCode from "@/mixins/SendVerifyCode";
+	import {
+		loginH5,
+		loginMobile,
+		registerVerify,
+		register,
+		getCodeApi,
+		getUserInfo,
+		getCaptcha,
+		getAgreementApi,
+		appleLogin,
+		loginMpPhone
+	} from "@/api/user";
+	// #ifdef APP-PLUS
+	import {
+		wechatAppAuth,
+		appleAppAuth
+	} from '@/api/api.js'
+	// #endif
+	import attrs, {
+		required,
+		alpha_num,
+		chs_phone
+	} from "@/utils/validate";
+	import {
+		validatorDefaultCatch
+	} from "@/utils/dialog";
+	import {
+		getLogo,
+		getconfig,
+		getVersion
+	} from "@/api/public";
+	// import cookie from "@/utils/store/cookie";
+	import {
+		VUE_APP_API_URL,
+		configMap
+	} from "@/utils";
+	import parser from "@/components/jyf-parser/jyf-parser";
+	import {
+		commonAuth
+	} from '../../../api/public';
+	import {
+		mapGetters
+	} from "vuex";
+	import Verify from '@/components/verify/verify.vue';
+	const BACK_URL = "login_back_url";
+
+	export default {
+		name: "Login",
+		mixins: [sendVerifyCode],
+		components: {
+			"jyf-parser": parser,
+			Verify
+		},
+		data: function() {
+			return {
+				navList: ["账号登录", "快速登录"],
+				current: 1,
+				account: "",
+				password: "",
+				captcha: "",
+				formItem: 1,
+				type: "login",
+				keyCode: "",
+				codeUrl: "",
+				codeVal: "",
+				isShowCode: false,
+				showAgreement: false,
+				tagStyle: {
+					img: 'width:100%;display:block;'
+				},
+				isAgree: false,
+				agreement: '',
+				appLoginStatus: false, // 微信登录强制绑定手机号码状态
+				appUserInfo: null, // 微信登录保存的用户信息
+				appleLoginStatus: false, // 苹果登录强制绑定手机号码状态
+				appleUserInfo: null,
+				appleShow: false, // 苹果登录版本必须要求ios13以上的
+				keyLock: true,
+				auth_token: '',
+				codeVal: '',
+				copyright: {}
+			};
+		},
+		computed: configMap(['login_logo'], mapGetters(['viewColor'])),
+		watch: {
+			formItem: function(nval, oVal) {
+				if (nval == 1) {
+					this.type = 'login'
+				} else {
+					this.type = 'register'
+				}
+			}
+		},
+		onLoad() {
+			let self = this
+			uni.getSystemInfo({
+				success: function(res) {
+					if (res.platform.toLowerCase() == 'ios' && self.getSystem(res.system) >= 13) {
+						self.appleShow = true
+					}
+				}
+			});
+			this.getVersion();
+		},
+		mounted: function() {
+			
+		},
+		onReady(){
+			let that = this
+			// #ifdef MP
+			wx.login({
+			  success (res) {
+			    if (res.code) {
+			     that.codeVal = res.code
+			    } else {
+			      console.log('登录失败！' + res.errMsg)
+			    }
+			  }
+			})
+			// #endif
+		},
+		methods: {
+			// #ifdef MP
+			getPhoneNumber(e) {
+				
+				let that = this;
+				loginMpPhone({
+					iv:e.detail.iv,
+					encryptedData:e.detail.encryptedData,
+					code:that.codeVal,
+					auth_token: uni.getStorageSync('auth_token'),
+					}).then(({
+						data
+					}) => {
+						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$store.commit("LOGIN", {
+							'token': data.token,
+							'time': data.exp
+						});
+						that.$store.commit("SETUID", data.user.uid);
+						that.$store.commit('UPDATE_USERINFO', data.user);
+
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+							'/pages/user/index','/pages/plant_grass/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						if (this.getPath(backUrl) === '/pages/users/login/index') {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+							return
+						}
+						uni[method]({
+							url: backUrl
+						});
+					})
+					.catch(res => {
+						that.$util.Tips({
+							title: res
+						});
+					});
+			},
+			// #endif
+			goCopyUrl() {
+				// #ifdef H5
+				location.href = 'http://'+this.copyright.url
+				// #endif
+			},
+			userAgree(){
+				uni.navigateTo({
+					url: '/pages/users/user_about/index?from=sys_user_agree'
+				})
+			},
+			userPrivacyAgree(){
+				uni.navigateTo({
+					url: '/pages/users/user_about/index?from=sys_userr_privacy'
+				})
+			},
+			getSystem(system) {
+				if(system.indexOf('iOS') === -1){
+					return system
+				}else{
+					let str = system.split(' ')[1]
+					if (str.indexOf('.')) {
+						return Number(str.split('.')[0])
+					} else {
+						return Number(str)
+					}
+				}
+			},
+			// 苹果登录
+			appleLogin() {
+				let self = this
+				this.account = ''
+				this.captcha = ''
+				uni.showLoading({
+					title: '登录中'
+				})
+				uni.login({
+					provider: 'apple',
+					timeout: 10000,
+					success(loginRes) {
+						uni.getUserInfo({
+							provider: 'apple',
+							success: function(infoRes) {
+								self.appleUserInfo = infoRes.userInfo
+								self.appleLoginApi()
+							},
+							fail() {
+								uni.showToast({
+									title: '获取用户信息失败',
+									icon: 'none',
+									duration: 2000
+								})
+							},
+							complete() {
+								uni.hideLoading()
+							}
+						});
+					},
+					fail(error) {
+						uni.showToast({
+							title: '获取用户信息失败',
+							icon: 'none',
+							duration: 2000
+						})
+						console.log(error)
+					}
+				})
+			},
+			appleLoginApi(){
+				let that = this
+				commonAuth({
+					auth: {
+						type:'apple',
+						auth: {
+							userInfo: that.appleUserInfo,
+							openId: that.appleUserInfo.openId,
+							nickname: (that.appleUserInfo.fullName.familyName || '') + (that.appleUserInfo.fullName.giveName || ''),
+						}
+				}}).then(res => {
+					const data = res.data;
+					if(res.data.status == 200){
+						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$store.commit("LOGIN", {
+							'token': data.result.token,
+							'time': data.result.exp
+						});
+						that.$store.commit("SETUID", data.result.user.uid);
+						that.$store.commit('UPDATE_USERINFO', data.result.user);
+						
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+							'/pages/user/index','/pages/plant_grass/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						if (this.getPath(backUrl) === '/pages/users/login/index') {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+							return
+						}
+						uni[method]({
+							url: backUrl
+						});
+					}else{
+						uni.hideLoading();
+						that.auth_token = res.data.result.key;
+					}
+				}).catch(res => {
+					uni.hideLoading();
+					uni.showToast({
+						title: res.message || res,
+						icon: 'none',
+						duration: 2000
+					});
+				});
+			},
+			// App微信登录
+			wxLogin() {
+				if (!this.isAgree) return this.$util.Tips({
+					title: '请勾选用户协议与隐私政策'
+				});
+				let self = this
+				this.account = ''
+				this.captcha = ''
+				uni.showLoading({
+					title: '登录中'
+				})
+				uni.login({
+					provider: 'weixin',
+					// onlyAuthorize: true,
+					success: function(loginRes) {
+						self.appUserInfo = loginRes
+						self.wxLoginApi()
+					},
+					fail(error) {
+						uni.showToast({
+							title: '登录失败',
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				});
+			},
+			getPath(url) {
+				if (url.indexOf("?") != -1) {
+					url = url.split("?")[0];
+					console.log(url);
+				}
+				return url
+			},
+			wxLoginApi() {
+				const that = this
+				commonAuth({
+					auth: {
+						type:'app_wechat',
+						auth: {
+							code: that.appUserInfo.authResult.access_token,
+							openid: that.appUserInfo.authResult.openid,
+							phone: this.account,
+						}
+				}}).then(res => {
+					const data = res.data;
+					if(res.data.status == 200){
+						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$store.commit("LOGIN", {
+							'token': data.result.token,
+							'time': data.result.exp
+						});
+						that.$store.commit("SETUID", data.result.user.uid);
+						that.$store.commit('UPDATE_USERINFO', data.result.user);
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+							'/pages/user/index','/pages/plant_grass/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						if (this.getPath(backUrl) === '/pages/users/login/index') {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+							return
+						}
+						uni[method]({
+							url: backUrl
+						});
+					}else{
+						that.auth_token = res.data.result.key;
+						that.bindStatus = true;
+					}
+						uni.hideLoading();
+				}).catch(res => {
+					uni.hideLoading();
+					uni.showToast({
+						title: res.message || res,
+						icon: 'none',
+						duration: 2000
+					});
+				});
+			},
+			getAgreement() {
+				let that = this
+				getAgreementApi('sys_user_agree').then(res => {
+					that.agreement = res.data.sys_user_agree
+				})
+			},
+			getCode(data) {
+				let that = this
+				getCodeApi()
+					.then(res => {
+						that.keyCode = res.data.key;
+						that.code(data);
+					})
+					.catch(res => {
+						that.$util.Tips({
+							title: res
+						});
+					});
+			},
+			async loginMobile() {
+				let that = this;
+				if (!that.account) return that.$util.Tips({
+					title: '请输入手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				if (!that.captcha) return that.$util.Tips({
+					title: '请输入验证码'
+				});
+				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
+					title: '请输入正确的验证码'
+				});
+				if (!that.isAgree) return that.$util.Tips({
+					title: '请勾选用户协议与隐私政策'
+				});
+				
+				loginMobile({
+						auth_token: uni.getStorageSync('auth_token'),
+						phone: that.account,
+						sms_code: that.captcha,
+						spread: that.$Cache.get("spread"),
+						// #ifdef APP-PLUS
+						user_type: 'app',
+						// #endif
+						// #ifdef H5
+						user_type: 'h5',
+						// #endif
+					})
+					.then(({
+						data
+					}) => {
+						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$store.commit("LOGIN", {
+							'token': data.token,
+							'time': data.exp
+						});
+						that.$store.commit("SETUID", data.user.uid);
+						that.$store.commit('UPDATE_USERINFO', data.user);
+
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+							'/pages/user/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						if (this.getPath(backUrl) === '/pages/users/login/index') {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+							return
+						}
+						uni[method]({
+							url: backUrl
+						});
+					})
+					.catch(res => {
+						that.$util.Tips({
+							title: res
+						});
+					});
+			},
+			async register() {
+				let that = this;
+				if (!that.account) return that.$util.Tips({
+					title: '请输入手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				if (!that.captcha) return that.$util.Tips({
+					title: '请输入验证码'
+				});
+				if (!/^[\w\d]+$/i.test(that.captcha)) return that.$util.Tips({
+					title: '请输入正确的验证码'
+				});
+				if (!that.password) return that.$util.Tips({
+					title: '请输入密码'
+				});
+				if (!/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$/i.test(that.password)) return that.$util.Tips({
+					title: '请输入6-16位字母加数字组合'
+				});
+				if (!that.isAgree) return that.$util.Tips({
+					title: '请勾选用户协议与隐私政策'
+				});
+				register({
+						auth_token: this.auth_token || uni.getStorageSync('auth_token'),
+						phone: that.account,
+						sms_code: that.captcha,
+						pwd: that.password,
+						spread: that.$Cache.get("spread"),
+						// #ifdef APP-PLUS
+						user_type: 'app',
+						// #endif
+						// #ifdef H5
+						user_type: 'h5',
+						// #endif
+					})
+					.then(res => {
+						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$store.commit("LOGIN", {
+							'token': res.data.token,
+							'time': res.data.exp
+						});
+						that.$store.commit("SETUID", res.data.user.uid);
+						that.$store.commit('UPDATE_USERINFO', res.data.user);					
+						uni.switchTab({
+							url: '/pages/user/index'
+						})						
+					})
+					.catch(res => {
+						that.$util.Tips({
+							title: res
+						});
+					});
+			},
+			async code(data) {
+				let that = this;
+				if (!that.account) return that.$util.Tips({
+					title: '请输入手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				// if (that.formItem == 2) that.type = "register";
+				await registerVerify({
+						phone: that.account,
+						type: 'login',
+						key: that.keyCode,
+						// code: that.codeVal,
+						toke:data.token,
+						captchaType: 'blockPuzzle',
+						captchaVerification: data.captchaVerification
+					})
+					.then(res => {
+						that.$util.Tips({
+							title: res.message
+						});
+						that.sendCode();
+					})
+					.catch(res => {
+						that.$util.Tips({
+							title: res
+						});
+					});
+			},
+			getcaptcha() {
+				let that = this
+				getCaptcha().then(data => {
+					// that.codeUrl = `${VUE_APP_API_URL}/sms_captcha?key=${that.keyCode}`;
+					that.codeUrl = data.data.captcha;
+					that.keyCode = data.data.key
+				})
+				that.isShowCode = true;
+			},
+			navTap: function(index) {
+				this.current = index;
+			},
+			getPath(url) {
+				if (url.indexOf("?") != -1) {
+					url = url.split("?")[0];
+				}
+				return url
+			},
+			async submit() {
+				let that = this;
+				if (!that.account) return that.$util.Tips({
+					title: '请输入账号'
+				});
+				if (!/^[\w\d]{5,16}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的账号'
+				});
+				if (!that.password) return that.$util.Tips({
+					title: '请输入密码'
+				});
+				if (!that.isAgree) return that.$util.Tips({
+					title: '请勾选用户协议与隐私政策'
+				});
+				loginH5({
+						auth_token: uni.getStorageSync('auth_token'),
+						account: that.account,
+						password: that.password,
+						spread: that.$Cache.get("spread")
+					})
+					.then(({
+						data
+					}) => {
+						const backUrl = that.$Cache.get(BACK_URL) || "/pages/index/index";
+						that.$Cache.clear(BACK_URL);
+						that.$store.commit("LOGIN", {
+							'token': data.token,
+							'time': data.exp
+						});
+						that.$store.commit("SETUID", data.user.uid);
+						that.$store.commit('UPDATE_USERINFO', data.user);
+
+						let method
+						let indexPat = ['/pages/index/index', '/pages/order_addcart/order_addcart', '/pages/goods_cate/goods_cate',
+							'/pages/user/index'
+						]
+						if (indexPat.includes(this.getPath(backUrl))) {
+							method = 'switchTab'
+						} else {
+							method = 'navigateTo'
+						}
+						if (this.getPath(backUrl) === '/pages/users/login/index') {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+							return
+						}
+						uni[method]({
+							url: backUrl
+						});						
+					})
+					.catch(e => {
+						that.$util.Tips({
+							title: e
+						});
+					});
+			},
+			getVersion() {
+				getVersion().then(data => {
+					this.copyright = data.data;
+				});
+			},
+			success(data) {
+				this.$refs.verify.hide();
+				this.code(data);
+			},
+			handleVerify() {
+				let that = this;
+				if (!that.account) return that.$util.Tips({
+					title: '请输入手机号码'
+				});
+				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.account)) return that.$util.Tips({
+					title: '请输入正确的手机号码'
+				});
+				if (!that.isAgree) return that.$util.Tips({
+					title: '请勾选用户协议与隐私政策'
+				});
+				that.$refs.verify.show();
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	page {
+		background-color: #fff !important;
+	}
+	/deep/uni-checkbox .uni-checkbox-input{
+		border-radius: 100%;
+	}
+	.ChangePassword .phone {
+		font-size: 32rpx;
+		font-weight: bold;
+		text-align: center;
+		margin-top: 55rpx;
+	}
+	
+	.ChangePassword .list {
+		width: 580rpx;
+		margin: 53rpx auto 0 auto;
+	}
+	
+	.ChangePassword .list .item {
+		width: 100%;
+		height: 110rpx;
+		border-bottom: 2rpx solid #f0f0f0;
+	}
+	
+	.ChangePassword .list .item input {
+		width: 100%;
+		height: 100%;
+		font-size: 32rpx;
+	}
+	
+	.ChangePassword .list .item .placeholder {
+		color: #b9b9bc;
+	}
+	
+	.ChangePassword .list .item input.codeIput {
+		width: 240rpx;
+		
+	}
+	/deep/.uni-input-wrapper,/deep/.uni-input-input{
+		// width: 240rpx;
+	}
+	.ChangePassword .list .item .code {
+		font-size: 32rpx;
+		background-color: #fff;
+		color: var(--view-theme);
+	}
+	
+	.ChangePassword .list .item .code.on {
+		color: #b9b9bc;
+	}
+	
+	.ChangePassword .confirmBnt {
+		font-size: 32rpx;
+		width: 580rpx;
+		height: 90rpx;
+		border-radius: 45rpx;
+		color: #fff;
+		margin: 92rpx auto 0 auto;
+		text-align: center;
+		line-height: 90rpx;
+		background-color: var(--view-theme);
+	}
+	
+	.ChangePassword .confirmBnt.back{
+		background-color: #FFFFFF;
+		border: 1px solid  var(--view-theme);
+		color: var(--view-theme);
+		margin-top: 30rpx;
+	}
+	
+	.getPhoneBtn{
+		font-size: 32rpx;
+		width: 580rpx;
+		height: 90rpx;
+		border-radius: 45rpx;
+		border: 1rpx solid #3CB625;
+		color: #3CB625;
+		margin: 40rpx auto 0 auto;
+		text-align: center;
+		line-height: 90rpx;
+		.iconfont{
+			font-size: 32rpx;
+			margin-right: 12rpx;
+		}
+	}
+	.code image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.acea-row.row-middle {
+		input {
+			margin-left: 20rpx;
+		}
+	}
+	.settlementAgreement {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: rgba(0, 0, 0, .5);
+		z-index: 10;
+	}
+	.protocol_text{
+		color: #999;
+		font-size: 24rpx;
+	}
+	.settlementAgreement .setAgCount {
+		background: #fff;
+		width: 656rpx;
+		height: 458px;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		border-radius: 12rpx;
+		-webkit-border-radius: 12rpx;
+		padding: 52rpx;
+		-webkit-transform: translate(-50%, -50%);
+		-moz-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		overflow: hidden;
+		.content {
+			height: 900rpx;
+			overflow-y: scroll;
+	
+			/deep/ p {
+				font-size: 13px;
+				line-height: 22px;
+			}
+	
+			/deep/ img {
+				max-width: 100%;
+			}
+		}
+	}
+	.settlementAgreement .setAgCount .icon {
+		font-size: 42rpx;
+		color: #b4b1b4;
+		position: absolute;
+		top: 15rpx;
+		right: 15rpx;
+	
+	}
+	.settlementAgreement .setAgCount .title {
+		color: #333;
+		font-size: 32rpx;
+		text-align: center;
+		font-weight: bold;
+	}
+	.settlementAgreement .setAgCount .content {
+		margin-top: 32rpx;
+		color: #333;
+		font-size: 26rpx;
+		line-height: 22px;
+		text-align: justify;
+		text-justify: distribute-all-lines;
+		height: 756rpx;
+		overflow-y: scroll;
+	}
+	.protocol{
+		margin-top: 30rpx;
+	}
+	.protocol_text{
+		.font_pro{
+			color: var(--view-theme);
+		}
+	}
+	.appLogin {
+		.hds {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 24rpx;
+			color: #B4B4B4;	
+			.line {
+				width: 68rpx;
+				height: 1rpx;
+				background: #CCCCCC;
+			}	
+			p {
+				margin: 0 20rpx;
+			}
+		}	
+		.btn-wrapper {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 30rpx;
+	
+			.btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 68rpx;
+				height: 68rpx;
+				border-radius: 50%;
+				
+				+ .btn {
+					margin-left: 30rpx;
+				}
+			}
+	
+			.apple-btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 246rpx;
+				height: 66rpx;
+				margin-left: 10rpx;
+				background: #EAEAEA;
+				border-radius: 34rpx;
+				font-size: 24rpx;
+	
+				.icon-s-pingguo {
+					color: #333;
+					margin-right: 10rpx;
+					font-size: 34rpx;
+				}
+			}
+	
+			.iconfont {
+				font-size: 40rpx;
+				color: #fff;
+			}
+	
+			.wx {
+				// margin-right: 30rpx;
+				background-color: #61C64F;
+				&.btn-apple{
+					margin-right: 0;
+					background-color: #333;
+				}
+			}
+			
+			.mima {
+				background-color: #28B3E9;
+			}
+	
+			.yanzheng {
+				background-color: #F89C23;
+			}
+	
+		}
+	}
+	
+	.code img {
+		width: 100%;
+		height: 100%;
+	}
+	
+	.acea-row.row-middle {
+		input {
+			margin-left: 20rpx;
+			display: block;
+		}
+	}
+	
+	.login-wrapper {
+		padding: 30rpx;
+	
+		.shading {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 100%;
+			/* #ifdef APP-VUE */
+			margin-top: 50rpx;
+			/* #endif */
+			/* #ifndef APP-VUE */
+	
+			margin-top: 200rpx;
+			/* #endif */
+	
+	
+			image {
+				width: 180rpx;
+				height: 180rpx;
+			}
+		}
+	
+		.whiteBg {
+			margin-top: 100rpx;
+	
+			.list {
+				border-radius: 16rpx;
+				overflow: hidden;
+	
+				.item {
+					border-bottom: 1px solid #F0F0F0;
+					background: #fff;
+	
+					.row-middle {
+						position: relative;
+						padding: 16rpx 45rpx;
+	
+						input {
+							flex: 1;
+							font-size: 28rpx;
+							height: 80rpx;
+						}
+	
+						.code {
+							color: #E93323;
+							font-size: 26rpx;
+							transform: translateY(-50%);
+						}
+					}
+				}
+			}
+	
+			.logon {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 100%;
+				height: 86rpx;
+				margin-top: 80rpx;
+				background-color: $theme-color;
+				border-radius: 120rpx;
+				color: #FFFFFF;
+				font-size: 30rpx;
+			}
+	
+			.tips {
+				margin: 30rpx;
+				text-align: center;
+				color: #999;
+			}
+		}
+	}
+	.copyright {
+		position: fixed;
+		bottom: 30rpx;
+		left: 0;
+		width: 100%;
+		text-align: center;
+		font-size: 20rpx;
+		line-height: 28rpx;
+		color: #FFFFFF;
+		
+		.cell {
+			// margin-left: 6rpx;
+			font-size: 20rpx;
+		}
+	}
+</style>
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 64e0d11..c391ab3 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -1,562 +1,599 @@
 <template>
-	<view :style="viewColor">
-		<form>
-			<view class='personal-data'>
-				<view class="wrapper" v-if="switchUserInfo.length>0">
-					<view class="title">管理我的账号</view>
-					<view class="wrapList" >
-						<view class="item acea-row row-between-wrapper" :class="item.uid === userInfo.uid ? 'on' : ''"
-						 :style="{ 'background-image': `url(${item.uid == userInfo.uid ? domain+'/static/diy/currentAcc'+keyColor+'.png' : '' })` }"
-						v-for="(item,index) in switchUserInfo"
-						 :key="index">
-							<view class="picTxt acea-row row-between-wrapper">
-								<block v-if='item.uid === userInfo.uid'>
-									<view class="pictrue" v-if="!mp_is_new" @click="uploadpic">
-										<image :src="item.avatar || '/static/images/f.png'"></image>
-										<view v-if="open_update_info != 0" class="radius" ><span class="iconfont iconfonta icon-jilu-xuanzhong"></span></view>
-									</view>
-									<button v-if="mp_is_new && open_update_info != 0" class="avatar-box pictrue" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-										<image :src="item.avatar || '/static/images/f.png'"></image>
-										<view class="radius" ><span class="iconfont iconfonta icon-jilu-xuanzhong"></span></view>
-									</button>
-									<button v-else-if="mp_is_new && open_update_info == 0" class="avatar-box">
-										<image :src="item.avatar || '/static/images/f.png'"></image>
-									</button>
-								</block>
-								<view class="pictrue" v-else>
-									<image :src="item.avatar || '/static/images/f.png'"></image>
-									<view class="radius" v-if="open_update_info != 0"><span class="iconfont iconfonta icon-jilu-xuanzhong"></span></view>
-								</view>
-								<view class="text">
-									<view class="name line1">{{ item.nickname }}</view>
-								</view>
-							</view>	
-							<view class="currentBnt acea-row row-center-wrapper t-color" v-if='item.uid === userInfo.uid'>
-								当前账号
-							</view>
-							<view class="bnt t-color acea-row row-center-wrapper"  @click='switchAccounts(item,index)' v-else>
-								使用账号
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="list" v-else>
-					<view class='item acea-row row-between-wrapper' >
-						<view>头像</view>
-						<view class="pictrue" v-if="!mp_is_new"  @click="uploadpic">
-							<image class="avatar" :src="userInfo.avatar || '/static/images/f.png'"></image>
-						</view>
-						<button v-else class="avatar-box" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
-							<image :src="userInfo.avatar || '/static/images/f.png'"></image>
-						</button>
-					</view>
-				</view>
-				<view class='list' style="margin-top: 1rpx;">
-					<view class='item acea-row row-between-wrapper'>
-						<view>昵称</view>
-						<view class='input acea-row row-between-wrapper' @click="changeInput">
-							<input type='text' name='nickname' :value='userInfo.nickname'>
-							<text v-if="open_update_info != 0" class='iconfont icon-you'></text>
-							<text v-else class='iconfont icon-suozi'></text>
-						</view>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>ID号</view>
-						<view class='input acea-row row-between-wrapper'>
-							<input type='text' :value='userInfo.uid' disabled='true' class='id'></input>
-							<text class='iconfont icon-suozi'></text>
-						</view>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>手机号码</view>
-						<navigator url="/pages/users/user_phone/index" hover-class="none" class="input" v-if="!userInfo.phone">
-							点击绑定手机号<text class="iconfont icon-xiangyou"></text>
-						</navigator>
-						<navigator url="/pages/users/user_modify_phone/index" hover-class="none" class='input acea-row row-between-wrapper' v-else>
-							<input type='text' disabled='true' name='phone' :value='userInfo.phone' class='id'></input>
-							<text class='iconfont icon-you'></text>
-						</navigator>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>登录密码</view>
-						<view class='input acea-row row-between-wrapper' @click="changePwd">
-							<input type='text' placeholder="修改登录密码" disabled='true' class='id'></input>
-							<text class='iconfont icon-you'></text>
-						</view>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>地址管理</view>
-						<navigator url="/pages/users/user_address_list/index" hover-class="none" class='input acea-row row-between-wrapper'>
-							<input type='text' placeholder="立即前往" disabled='true' class='id'></input>
-							<text class='iconfont icon-you'></text>
-						</navigator>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>发票管理</view>
-						<navigator url="/pages/users/user_invoice_list/index" hover-class="none" class='input acea-row row-between-wrapper'>
-							<input type='text' placeholder="立即前往" disabled='true' class='id'></input>
-							<text class='iconfont icon-you'></text>
-						</navigator>
-					</view>
-					<view class='item acea-row row-between-wrapper'>
-						<view>注销账号</view>
-						<view class='input acea-row row-between-wrapper' @click="changeCancel">
-							<input type='text' placeholder="账号注销后不能恢复" disabled='true' class='id'></input>
-							<text class='iconfont icon-you'></text>
-						</view>
-					</view>
-					<!--#ifdef APP-PLUS-->
-					<view class='item acea-row row-between-wrapper'>
-						<view>当前版本</view>
-						<view class='input acea-row row-between-wrapper'>
-							<input type='text' :value='version' disabled='true' class='id'></input>
-						</view>
-					</view>
-					<!--#endif-->
-				</view>
-				<!-- #ifdef H5 -->
-				<view class="logOut acea-row row-center-wrapper" @click="outLogin" v-if="!this.$wechat.isWeixin()">退出登录</view>
-				<!-- #endif -->
-				<!-- #ifdef MP || APP-PLUS -->
-				<view class="logOut acea-row row-center-wrapper" @click="outLogin">退出登录</view>
-				<!-- #endif -->	
-				<view class="foot-bar"></view>
-			</view>
-		</form>
-		<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
-	</view>
+  <view :style="viewColor">
+    <form>
+      <view class='personal-data'>
+        <view class="wrapper" v-if="switchUserInfo.length>0">
+          <view class="title">管理我的账号</view>
+          <view class="wrapList">
+            <view class="item acea-row row-between-wrapper" :class="item.uid === userInfo.uid ? 'on' : ''"
+              :style="{ 'background-image': `url(${item.uid == userInfo.uid ? domain+'/static/diy/currentAcc'+keyColor+'.png' : '' })` }"
+              v-for="(item,index) in switchUserInfo" :key="index">
+              <view class="picTxt acea-row row-between-wrapper">
+                <block v-if='item.uid === userInfo.uid'>
+                  <view class="pictrue" v-if="!mp_is_new" @click="uploadpic">
+                    <image :src="item.avatar || '/static/images/f.png'"></image>
+                    <view v-if="open_update_info != 0" class="radius"><span
+                        class="iconfont iconfonta icon-jilu-xuanzhong"></span></view>
+                  </view>
+                  <button v-if="mp_is_new && open_update_info != 0" class="avatar-box pictrue" open-type="chooseAvatar"
+                    @chooseavatar="onChooseAvatar">
+                    <image :src="item.avatar || '/static/images/f.png'"></image>
+                    <view class="radius"><span class="iconfont iconfonta icon-jilu-xuanzhong"></span></view>
+                  </button>
+                  <button v-else-if="mp_is_new && open_update_info == 0" class="avatar-box">
+                    <image :src="item.avatar || '/static/images/f.png'"></image>
+                  </button>
+                </block>
+                <view class="pictrue" v-else>
+                  <image :src="item.avatar || '/static/images/f.png'"></image>
+                  <view class="radius" v-if="open_update_info != 0"><span
+                      class="iconfont iconfonta icon-jilu-xuanzhong"></span></view>
+                </view>
+                <view class="text">
+                  <view class="name line1">{{ item.nickname }}</view>
+                </view>
+              </view>
+              <view class="currentBnt acea-row row-center-wrapper t-color" v-if='item.uid === userInfo.uid'>
+                当前账号
+              </view>
+              <view class="bnt t-color acea-row row-center-wrapper" @click='switchAccounts(item,index)' v-else>
+                使用账号
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="list" v-else>
+          <view class='item acea-row row-between-wrapper'>
+            <view>头像</view>
+            <view class="pictrue" v-if="!mp_is_new" @click="uploadpic">
+              <image class="avatar" :src="userInfo.avatar || '/static/images/f.png'"></image>
+            </view>
+            <button v-else class="avatar-box" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+              <image :src="userInfo.avatar || '/static/images/f.png'"></image>
+            </button>
+          </view>
+        </view>
+        <view class='list' style="margin-top: 1rpx;">
+          <view class='item acea-row row-between-wrapper'>
+            <view>昵称</view>
+            <view class='input acea-row row-between-wrapper' @click="changeInput">
+              <input type='text' name='nickname' :value='userInfo.nickname'>
+              <text v-if="open_update_info != 0" class='iconfont icon-you'></text>
+              <text v-else class='iconfont icon-suozi'></text>
+            </view>
+          </view>
+          <view class='item acea-row row-between-wrapper'>
+            <view>ID号</view>
+            <view class='input acea-row row-between-wrapper'>
+              <input type='text' :value='userInfo.uid' disabled='true' class='id'></input>
+              <text class='iconfont icon-suozi'></text>
+            </view>
+          </view>
+          <view class='item acea-row row-between-wrapper'>
+            <view>手机号码</view>
+            <navigator url="/pages/users/user_phone/index" hover-class="none" class="input" v-if="!userInfo.phone">
+              点击绑定手机号<text class="iconfont icon-xiangyou"></text>
+            </navigator>
+            <navigator url="/pages/users/user_modify_phone/index" hover-class="none"
+              class='input acea-row row-between-wrapper' v-else>
+              <input type='text' disabled='true' name='phone' :value='userInfo.phone' class='id'></input>
+              <text class='iconfont icon-you'></text>
+            </navigator>
+          </view>
+          <view class='item acea-row row-between-wrapper'>
+            <view>登录密码</view>
+            <view class='input acea-row row-between-wrapper' @click="changePwd">
+              <input type='text' placeholder="修改登录密码" disabled='true' class='id'></input>
+              <text class='iconfont icon-you'></text>
+            </view>
+          </view>
+          <view class='item acea-row row-between-wrapper'>
+            <view>地址管理</view>
+            <navigator url="/pages/users/user_address_list/index" hover-class="none"
+              class='input acea-row row-between-wrapper'>
+              <input type='text' placeholder="立即前往" disabled='true' class='id'></input>
+              <text class='iconfont icon-you'></text>
+            </navigator>
+          </view>
+          <view class='item acea-row row-between-wrapper'>
+            <view>发票管理</view>
+            <navigator url="/pages/users/user_invoice_list/index" hover-class="none"
+              class='input acea-row row-between-wrapper'>
+              <input type='text' placeholder="立即前往" disabled='true' class='id'></input>
+              <text class='iconfont icon-you'></text>
+            </navigator>
+          </view>
+          <view class='item acea-row row-between-wrapper'>
+            <view>注销账号</view>
+            <view class='input acea-row row-between-wrapper' @click="changeCancel">
+              <input type='text' placeholder="账号注销后不能恢复" disabled='true' class='id'></input>
+              <text class='iconfont icon-you'></text>
+            </view>
+          </view>
+          <!--#ifdef APP-PLUS-->
+          <view class='item acea-row row-between-wrapper'>
+            <view>当前版本</view>
+            <view class='input acea-row row-between-wrapper'>
+              <input type='text' :value='version' disabled='true' class='id'></input>
+            </view>
+          </view>
+          <!--#endif-->
+        </view>
+        <!-- #ifdef H5 -->
+        <view class="logOut acea-row row-center-wrapper" @click="outLogin" v-if="!this.$wechat.isWeixin()">退出登录</view>
+        <!-- #endif -->
+        <!-- #ifdef MP || APP-PLUS -->
+        <view class="logOut acea-row row-center-wrapper" @click="outLogin">退出登录</view>
+        <!-- #endif -->
+        <view class="foot-bar"></view>
+      </view>
+    </form>
+    <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize>
+  </view>
 </template>
 <script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
-	import {
-		getUserInfo,
-		userEdit,
-		getLogout,
-		userAcc,
-		editAvatar,
-		updateInfo
-	} from '@/api/user.js';
-	import { switchH5Login, getAppVersion } from '@/api/api.js';
-	import { mapGetters } from "vuex";
-	import { configMap } from '@/utils';
-	import dayjs from "@/plugin/dayjs/dayjs.min.js";
-	import authorize from '@/components/Authorize';
-	import Cache from '@/utils/cache';
-	import { HTTP_REQUEST_URL } from '@/config/app';
-	export default {
-		components: {
-			authorize
-		},
-		data() {
-			return {
-				domain: HTTP_REQUEST_URL,
-				userInfo: {},
-				loginType: 'h5',
-				userIndex: 0,
-				switchUserInfo: [],
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				headBg: '../static/images/currentAcc',
-				mp_is_new: this.$Cache.get('MP_VERSION_ISNEW') || false,
-				version: ''
-			};
-		},
-		computed: configMap({open_update_info: 0} ,mapGetters(['isLogin','viewColor','keyColor'])),
-		onLoad() {
-			if (this.isLogin) {
-				this.getUserInfo();
-			} else {
-				this.isAuto = true;
+  // +----------------------------------------------------------------------
+  // | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+  // +----------------------------------------------------------------------
+  // | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
+  // +----------------------------------------------------------------------
+  // | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+  // +----------------------------------------------------------------------
+  // | Author: CRMEB Team <admin@crmeb.com>
+  // +----------------------------------------------------------------------
+  import {
+    getUserInfo,
+    userEdit,
+    getLogout,
+    userAcc,
+    editAvatar,
+    updateInfo
+  } from '@/api/user.js';
+  import { switchH5Login, getAppVersion } from '@/api/api.js';
+  import { mapGetters } from "vuex";
+  import { configMap } from '@/utils';
+  import dayjs from "@/plugin/dayjs/dayjs.min.js";
+  import authorize from '@/components/Authorize';
+  import Cache from '@/utils/cache';
+  import { HTTP_REQUEST_URL } from '@/config/app';
+  export default {
+    components: {
+      authorize
+    },
+    data() {
+      return {
+        domain: HTTP_REQUEST_URL,
+        userInfo: {},
+        loginType: 'h5',
+        userIndex: 0,
+        switchUserInfo: [],
+        isAuto: false, //没有授权的不会自动授权
+        isShowAuth: false, //是否隐藏授权
+        headBg: '../static/images/currentAcc',
+        mp_is_new: this.$Cache.get('MP_VERSION_ISNEW') || false,
+        version: ''
+      };
+    },
+    computed: configMap({ open_update_info: 0 }, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
+    onLoad() {
+      if (this.isLogin) {
+        this.getUserInfo();
+      } else {
+        this.isAuto = true;
         this.isShowAuth = true
-			}
-			//#ifdef APP-PLUS
-			this.appVersionConfig()
-			//#endif
-		},
-		methods: {	
-			toggle(type) {
-				this.type = type
-				// open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
-				this.$refs.popup.open(type)
-			},
-			/**
-			 * 上传图片文件
-			 *
-			 */
-			uploadpic: function() {
-				let that = this;
-				if(that.open_update_info == 0){
-					return;
-				}
-				that.$util.uploadImageOne('upload/image', function(res) {
-					let userInfo = that.switchUserInfo[that.userIndex];
-					if (userInfo !== undefined) {
-						userInfo.avatar = res.data.path;
-					}
-					that.switchUserInfo[that.userIndex] = userInfo;
-					editAvatar({avatar:res.data.path}).then((res)=>{
-						that.$util.Tips({
-							title:res.message,
-						})
-					})	
-				});		
-			}, 		
-			// 修改昵称
-			changeInput(){
-				if(this.open_update_info == 0){
-					return;
-				}
-				uni.navigateTo({
-					url: '/pages/users/user_nickname/index',
-				})
-			},	
-			// 微信头像获取
-			onChooseAvatar(e) {
-				const {avatarUrl} = e.detail
-				this.$util.uploadImgs('upload/image', avatarUrl, (res) => {
-					this.userInfo.avatar = res.data.path
-					editAvatar({avatar:res.data.path}).then((res)=>{
-						that.$util.Tips({
-							title:res.message,
-						})
-					})
-				}, (err) => {
-					console.log(err)
-				})
-			},
-			// #ifdef APP-PLUS
-			appVersionConfig() {
-				var that = this;
-				plus.runtime.getProperty(plus.runtime.appid, (info) => {
-					this.version = info.version;
-					console.log('当前版本：'+ info.version)
-				});			
-			},
-			//#endif
-			/**
-			 * 授权回调 
-			 */
-			onLoadFun: function() {
-				this.isShowAuth = false;
-				this.getUserInfo();
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			switchAccounts: function(item, index) {
-				let userInfo = this.switchUserInfo[index],
-					that = this;
-				that.userIndex = index;
-				if (that.switchUserInfo.length <= 1) return true;
-				if (userInfo === undefined) return that.$util.Tips({
-					title: '切换的账号不存在'
-				});
-				uni.showLoading({
-					title: '正在切换中'
-				});
-				switchH5Login({
-					uid: item.uid
-				}).then(({
-					data
-				}) => {
-					uni.hideLoading();
-					let newTime = Math.round(new Date() / 1000);
-					that.$store.commit("LOGIN", {
-						'token': data.token,
-						'time': data.exp,
-					});
-					that.$store.commit("SETUID", data.user.uid);
-					that.$store.commit('UPDATE_USERINFO', data.user);
-					that.getUserInfo();
-				}).catch(err => {
-					uni.hideLoading();
-					return that.$util.Tips({
-						title: err
-					});
-				})
-			},
-			/**
-			 * 退出登录
-			 *
-			 */
-			outLogin: function() {
-				let that = this;				
-				if (that.loginType == 'h5') {
-					uni.showModal({
-						title: '提示',
-						content: '确认退出登录?',
-						success: function(res) {
-							if (res.confirm) {
-								getLogout()
-									.then(res => {
-										that.$store.commit("LOGOUT");
-										uni.reLaunch({
-											url: '/pages/index/index',
-										});
-									})
-									.catch(err => {
-										console.log(err);
-									});
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-				}
-			},
-			// 获取用户列表
-			userAcc() {
-				userAcc().then(res => {
-					let that = this
-					let switchUserInfo = res.data || [];
-					for (let i = 0; i < switchUserInfo.length; i++) {
-						if (switchUserInfo[i].uid == that.userInfo.uid) that.userIndex = i;
-						// 切割h5用户；user_type状态：h5、routine（小程序）、wechat（公众号）；注：只有h5未注册手机号时，h5才可和小程序或是公众号数据想通；
-						//#ifdef H5
-						if (
-							!that.$wechat.isWeixin() &&
-							switchUserInfo[i].user_type != "h5" &&
-							switchUserInfo[i].phone === ""
-						)
-						switchUserInfo.splice(i, 1);
-						//#endif
-					}
-					that.$set(that, "switchUserInfo", switchUserInfo);
-				})
-			},
-			/**修改密码*/
-			changePwd(){
-				let that = this;
-				if(that.userInfo.phone){
-					uni.navigateTo({
-						url: `/pages/users/user_modify_pwd/index`
-					})
-				}else{
-					that.$util.Tips({
-						title: '请先绑定手机号'
-					});
-				}
-			},
-			//注销账号
-			changeCancel(){
-				uni.navigateTo({
-					url: '/pages/users/user_about/index?from='+'the_cancellation_msg'
-				})
-			},
-			/**
-			 * 获取用户详情
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					that.$set(that, 'userInfo', res.data);
-					if(res.data.phone){
-						that.userAcc();
-					}
-				});
-			}
-		}
-	}
+      }
+      //#ifdef APP-PLUS
+      this.appVersionConfig()
+      //#endif
+    },
+    methods: {
+      toggle(type) {
+        this.type = type
+        // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
+        this.$refs.popup.open(type)
+      },
+      /**
+       * 上传图片文件
+       *
+       */
+      uploadpic: function() {
+        let that = this;
+        if (that.open_update_info == 0) {
+          return;
+        }
+        that.$util.uploadImageOne('upload/image', function(res) {
+          let userInfo = that.switchUserInfo[that.userIndex];
+          if (userInfo !== undefined) {
+            userInfo.avatar = res.data.path;
+          }
+          that.switchUserInfo[that.userIndex] = userInfo;
+          editAvatar({ avatar: res.data.path }).then((res) => {
+            that.$util.Tips({
+              title: res.message,
+            })
+          })
+        });
+      },
+      // 修改昵称
+      changeInput() {
+        if (this.open_update_info == 0) {
+          return;
+        }
+        uni.navigateTo({
+          url: '/pages/users/user_nickname/index',
+        })
+      },
+      // 微信头像获取
+      onChooseAvatar(e) {
+        const { avatarUrl } = e.detail
+        this.$util.uploadImgs('upload/image', avatarUrl, (res) => {
+          this.userInfo.avatar = res.data.path
+          editAvatar({ avatar: res.data.path }).then((res) => {
+            that.$util.Tips({
+              title: res.message,
+            })
+          })
+        }, (err) => {
+          console.log(err)
+        })
+      },
+      // #ifdef APP-PLUS
+      appVersionConfig() {
+        var that = this;
+        plus.runtime.getProperty(plus.runtime.appid, (info) => {
+          this.version = info.version;
+          console.log('当前版本：' + info.version)
+        });
+      },
+      //#endif
+      /**
+       * 授权回调 
+       */
+      onLoadFun: function() {
+        this.isShowAuth = false;
+        this.getUserInfo();
+      },
+      // 授权关闭
+      authColse: function(e) {
+        this.isShowAuth = e
+      },
+      switchAccounts: function(item, index) {
+        let userInfo = this.switchUserInfo[index],
+          that = this;
+        that.userIndex = index;
+        if (that.switchUserInfo.length <= 1) return true;
+        if (userInfo === undefined) return that.$util.Tips({
+          title: '切换的账号不存在'
+        });
+        uni.showLoading({
+          title: '正在切换中'
+        });
+        switchH5Login({
+          uid: item.uid
+        }).then(({
+          data
+        }) => {
+          uni.hideLoading();
+          let newTime = Math.round(new Date() / 1000);
+          that.$store.commit("LOGIN", {
+            'token': data.token,
+            'time': data.exp,
+          });
+          that.$store.commit("SETUID", data.user.uid);
+          that.$store.commit('UPDATE_USERINFO', data.user);
+          that.getUserInfo();
+        }).catch(err => {
+          uni.hideLoading();
+          return that.$util.Tips({
+            title: err
+          });
+        })
+      },
+      /**
+       * 退出登录
+       *
+       */
+      outLogin: function() {
+        let that = this;
+        if (that.loginType == 'h5') {
+          uni.showModal({
+            title: '提示',
+            content: '确认退出登录?',
+            success: function(res) {
+              if (res.confirm) {
+                getLogout()
+                  .then(res => {
+                    that.$store.commit("LOGOUT");
+                    uni.reLaunch({
+                      url: '/pages/home/index',
+                    });
+                  })
+                  .catch(err => {
+                    console.log(err);
+                  });
+              } else if (res.cancel) {
+                console.log('用户点击取消');
+              }
+            }
+          });
+        }
+      },
+      // 获取用户列表
+      userAcc() {
+        userAcc().then(res => {
+          let that = this
+          let switchUserInfo = res.data || [];
+          for (let i = 0; i < switchUserInfo.length; i++) {
+            if (switchUserInfo[i].uid == that.userInfo.uid) that.userIndex = i;
+            // 切割h5用户；user_type状态：h5、routine（小程序）、wechat（公众号）；注：只有h5未注册手机号时，h5才可和小程序或是公众号数据想通；
+            //#ifdef H5
+            if (
+              !that.$wechat.isWeixin() &&
+              switchUserInfo[i].user_type != "h5" &&
+              switchUserInfo[i].phone === ""
+            )
+              switchUserInfo.splice(i, 1);
+            //#endif
+          }
+          that.$set(that, "switchUserInfo", switchUserInfo);
+        })
+      },
+      /**修改密码*/
+      changePwd() {
+        let that = this;
+        if (that.userInfo.phone) {
+          uni.navigateTo({
+            url: `/pages/users/user_modify_pwd/index`
+          })
+        } else {
+          that.$util.Tips({
+            title: '请先绑定手机号'
+          });
+        }
+      },
+      //注销账号
+      changeCancel() {
+        uni.navigateTo({
+          url: '/pages/users/user_about/index?from=' + 'the_cancellation_msg'
+        })
+      },
+      /**
+       * 获取用户详情
+       */
+      getUserInfo: function() {
+        let that = this;
+        getUserInfo().then(res => {
+          that.$set(that, 'userInfo', res.data);
+          if (res.data.phone) {
+            that.userAcc();
+          }
+        });
+      }
+    }
+  }
 </script>
 
 <style scoped lang="scss">
-	html{
-		-webkit-text-size-adjust:none;
-	}
-	.radius{
-		background-color: white;
-		width: 35rpx;
-		height: 35rpx;
-		border-radius: 50%;
-		border: 1px solid rgb(187, 43, 5);
-		line-height: 25rpx;
-		text-align: center;
-		position: absolute;
-		right: 0;
-		bottom: 0;
-	}
-	.iconfonta{
-		border-radius: 50%;
-		font-size: 20rpx;
-		color: red;
-	}
-	.avatar {
-		width: 120rpx;
-		height: 120rpx;
-		border-radius: 50%;
-	}
-	.btnb{
-		border-radius: 0;
-		height: 100rpx;
-		line-height: 100rpx;
-	}
-	.btna{
-		height: 100rpx;
-		line-height: 100rpx;
-		border-radius: 10rpx 10rpx 0 0;
-	}
-	.btnc{
-		height: 130rpx;
-		line-height: 130rpx;
-		border-radius: 0;
-	}
-	.personal-data {
-		padding-bottom: calc(0rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		padding-bottom: calc(0rpx + env(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-	}
-	.personal-data .wrapper {
-		margin: 10rpx 0;
-		background-color: #fff;
-		padding: 36rpx 30rpx 13rpx 30rpx;
-	}
-	.personal-data .wrapper .title {
-		margin-bottom: 30rpx;
-		font-size: 32rpx;
-		color: #282828;
-	}
-	.personal-data .wrapper .wrapList .item {
-		width: 690rpx;
-		height: 160rpx;
-		background-color: #f8f8f8;
-		border-radius: 20rpx;
-		margin-bottom: 22rpx;
-		padding: 0 30rpx;
-		position: relative;
-		border: 2rpx solid #f8f8f8;
-		box-sizing: border-box;
-	}
-	.t-color {
-		color: var(--view-theme);
-	}
-	.personal-data .wrapper .wrapList .item.on {
-		border-color: var(--view-theme);
-		border-radius: 20rpx;
-		//background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArIAAACgCAYAAADw+I85AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6M0QzNkY3NzlCNzJCMTFFOTgyNEU4QzhGQTRFRUY2REQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6M0QzNkY3N0FCNzJCMTFFOTgyNEU4QzhGQTRFRUY2REQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozRDM2Rjc3N0I3MkIxMUU5ODI0RThDOEZBNEVFRjZERCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozRDM2Rjc3OEI3MkIxMUU5ODI0RThDOEZBNEVFRjZERCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pn3rJMAAAArUSURBVHja7N3NXuLIGsDhqigK2Ou+grmEuf/t2fT+bOYKZn9aW5Q6qaQSIoKfoCQ8z29QRBSBzX+q31RiSikAAMDYVF4CAACELAAACFkAABCyAAAIWQAAELIAACBkAQAQsgAAIGQBAEDIAgCAkAUAQMgCAICQBQAAIQsAgJAFAAAhCwAAQhYAACELAABCFgAAhCwAAAhZAACELAAACFkAABCyAAAIWQAAELIAACBkAQAQsgAAIGQBAEDIAgCAkAUAQMgCAICQBQAAIQsAgJAFAAAhCwAAQhYAACELAABCFgAAhCwAAAhZAACELAAACFkAABCyAAAIWQAAELIAACBkAQAQsgAAIGQBAEDIAgCAkAUAQMgCAICQBQAAIQsAgJAFAAAhCwAAQhYAACELAABCFgAAhCwAAAhZAACELAAACFkAABCyAAAIWQAAELIAACBkAQBAyAIAIGQBAEDIAgCAkAUAQMgCAMAJuPQSAABMy79///XaXfJi5qy0YFUuqVzW9eWhvqzK9b1+/vpHyAIAcMjCqxs1tldj/zHl/6oU4rz+ctY2a3tzjO2n0F6tUqobMYZ5fX1V337XBm0MMbX3SuXnvv1peqcBAKYlXl+VSI2lZJuIzSuwi7pUY3/HFPsijYMPcVOps9hG7W19fRVT+50YT6TXvdUAABML2at5V6rdTdfNSmzXquX2FOKTr7trsVvBjeVOISzLyuyfNnNTOIWWFbIAAFNzfd2umjYrsmlWR+i8KuusXbhurudZgTZpU6w/p82Ka0oldJvb47z+cp3HDU5kQVbIAgBMTVwsmzitr1V1ni5C07Pd5EAXtCVlm3BNTfS27dvGbAiDcYPUr9TWvys91jetT2BEVsgCAEwuZOeLJkDr/+Z5sbXdb7UdCIixb9M2WDdjss2n4X274YN2LraJ3fzjeUTh9yk8TyELADC1kM0rsjHVTRpnTYam2I8LNBOuaRO0TbaWbQhidyRYKveLmz0P+vu223ZV8ZWtuYQsAADvD9nlTTMb23/dxelg9TUM4nSzRLvZsSANf274u9uvZnXm/hGyAAAcVHWzzKusl5uDtvq9YtvvpzZJmwGC+GS1tR83iHuGYMuPXtbfF7IAABxWXP7IyVkNT4awGQ/Y7FswHBkIW9e7W1Kfv0/GDKpTeJ5CFgBgapbLPAJQxX5X2DIuEPsdYtsSTak/nKv5Xir7GQxWZNvvlZGC/pReUcgCAHB41c2PnbfHrc+v3bbv61MhZAEAJibmkE1pXRdo9SRDuxXVuJWp3XBsGYDdfL9frx38jub767LVgZAFAOCAIdvsWpBjs5tlHZx4tvmQNhsVdH1bAjYO9pTtrlX9cEJvfQrPU8gCAExMdXOTPz3knQvCk/1iU4iDhO3HCuKT8yK0v6P/mfL9wTFf9W0PpzBvIGQBACYmLm7yOMCqDtB5f6hXak94UFo0lPMklO22ykFfg71mNyu3/ZkUNltz1b+7vYOQBQDgkCG7vMmxmWdkVyGfiWvH3rD9yWeb22O/KVdfuqVy29HZOBwuWKVmbEHIAgBw6JBdLMqKaryLMV3GwRFcqRykVXWt2g0V9KfyimV7rsEEbTkILLbDCXftqIGDvQAAOLTFsjtxwbrOzds6PJcpPT8pQnctlV6N/XlsBwd9lZXcsp/sbZXiuszJClkAAA4rzuclUpsl11UdoXcxxXm709Zg7rUp1fJ13KzKDnbfGhwQFu/qr1fdoGwUsgAAHD5kF32JlhD9E5ots+KiCv0JvAZzr3GzPUGJ235lNo8TpHjbBnF373QSz1PIAgBMLWSvrtoQTf3ga5YP0nqsP89jPgCs7dz2Q4xhu03T5mfuYnNyhTjYzSAE228BALDXv3//9aGf+/mf/5ai3Zy0q4wOrGOIv1NoznEwq0P3sv66yl+XLs0ztfV9wkOO2NieVKFP29SeKqyP2I/+fUIWAIDdZrP+6nDhdDMa0JyZ60+57LvPM9+0CJsfttq6NMetCVkAgIn57pXST0Zr7tOLEqzd552ELAAA3x2u3aV6zw8LWQAAvlKO1Vm5XHzmFwlZAABGE69CFgDgDb5z1vTnr3+m8BLmcL06VnMKWQCAwzRVt9rYHVWf5c2r8g4Bef/WVWi3tZq6WF6L6/DOmVchCwDwdcGWY+0q7N+ZKpa4vSj3y2F7H9ptr9IZvh5CFgDgm+UVx8UHgm0Ye7ehXaUVsEIWAOBLLEq0fTb+lqFdnb0d8WtxXS7fcq4EIQsA8HY5Pmc7bs9jAt0MbJ6HXZe460YLuhna7eDrVjF/j+x1yM9lHo48AytkAQAOY7EnYu9Cu7KadsRtd7DXqtzvqgTgdhTm3z2Gldmq/K0n0ZBCFgDgdd02UkM5UPNK6uMbf0eO2nyQV161XYanq5lX5fZTnpn91jGCfVUNAMB+OdwWOyL2f++I2KHH8rPrrds/cvDYV/XiTWhXkuOp/WEAAOy3axXy944QfY9uNXc7mK9P7Lnnlegf4UT/FV/IAgC8bHukII8HPB7g9z6W3/XSY32nvEK8DKe5SixkAQBecbkVcmlHfH7G9okRYvj+1c/chz9OLKqFLADAO23vUrAKhz0jV7dt10uP+dXhniP2YgxvjpAFANhvO+gejvAYD6885lfJK7D5oK44ljfH9lsAAPttL/o9HuExHl95zK+QdyS4HtubI2QBAPbbXp1cH+Ex1q885rEd4pS7J/F/GQAAvD1sx260EStkAQBelr4gZKtXHvNYlmOOWCELAPCy7X/2P8aBWBevPOYx5JXY2djfHCELALDf9oFYxzi+6PKVxzxGxF5N4c0RsgAA++3a4/WQ4wUxPF8ZfTji85lPJWKFLADAy3JUbp9565DbVF2H52cOWx3puczCCLfYErIAAB93vyM+DzEre7EjLO+P9Bzy+MJyam+MkAUAeNmf8HwngeUnO6raEZapPNYxem85xTdGyAIAvCwH5u2Ohsqnc/3IyuxF+dntDrsNh996K5aIjVN8Y4QsAMDr8tzq/Y6O+hHaA6jeEoqx3PfHjga7D8eZjZ2H42wZdhKcohYA4G1uw+5dBvKc61UJ0XxZh81esFW5zML+HQ9W4fmK7yHMwoR2KBCyAACf8zvs3oc1ltveG473R4rYqvydkyZkAQDeJ4fnQwnFj86ednO3x9pq6zN/m5AFAJiwVYnZbqzgrdGYAzavwu7aCeFQrs6l8YQsAMDH5BC9K5fcVHkmNR9YVQ3CNt8nz8s+DuL3mPJjz8/lDRCyAACf9/AFkfoWZzFSIGQBAF7x89c/Y/pzZ+fWdvaRBQCYhvm5PWEhCwAwftfn2HVCFgBg3GIJ2bMjZAEAxu06nNEBXkIWAGAaujOKnSUhCwAwXme7GitkAQDG66xXY2tJyAIAjNMsnPFqbG0tZAEAxun6zJ+/kAUAGKF8Bq9z77hHIQsAMD5XXoLwIGQBAMYlz8XOzvw1WAcrsgAAo2M1NoRV/iBkAQDGZeYlCPdCFgBgXHK7XYjYZrRAyAIAjMi5r8am+nI3rHoAAITsGNyWmBWyAAAjkncrOOexgjxSsBreIGQBAMbh8oyfew7Y2+0bhSwAgJA9ZQ+7Ivbcyx4AQMietvt9EStkAQDGIc/HntO/pKcSsCtlDwAwbufUbHkV9i4MdifwogAAjNfUdyvIJzhYhcHJDtQ9AMA0TGmsIJVYzZfH0B7M9fiRX/R/AQYA1i4UF+HkevkAAAAASUVORK5CYII=");
-		background-size: 100% 100%;
-		background-color: var(--view-minorColor);
-		background-repeat: no-repeat;
-	}
-	.personal-data .wrapper .wrapList .item .picTxt {
-		width: 445rpx;
-	}
-	.personal-data .wrapper .wrapList .item .picTxt .pictrue {
-		width: 96rpx;
-		height: 96rpx;
-		position: relative;
-	}
-	.personal-data .wrapper .wrapList .item .picTxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-	}
-	.personal-data .wrapper .wrapList .item .picTxt .text {
-		width: 325rpx;
-	}
-	.personal-data .wrapper .wrapList .item .picTxt .text .name {
-		width: 100%;
-		font-size: 30rpx;
-		color: #282828;
-	}
-	.personal-data .wrapper .wrapList .item .picTxt .text .phone {
-		font-size: 24rpx;
-		color: #999;
-		margin-top: 10rpx;
-	}
-	.personal-data .wrapper .wrapList .item .bnt {
-		font-size: 24rpx;
-		background-color: #fff;
-		border-radius: 27rpx;
-		width: 140rpx;
-		height: 54rpx;
-		border: 2rpx solid var(--view-theme);
-	}
-	.personal-data .wrapper .wrapList .item .currentBnt {
-		position: absolute;
-		right: 0;
-		top: 0;
-		font-size: 26rpx;
-		background-color: var(--view-minorColor);
-		width: 140rpx;
-		height: 48rpx;
-		border-radius: 0 20rpx 0 20rpx;
-	}
-	.personal-data .list {
-		margin-top: 15rpx;
-		background-color: #fff;
-	}
-	.personal-data .list .item {
-		padding: 30rpx 30rpx 30rpx 0;
-		border-bottom: 1px solid #f2f2f2;
-		margin-left: 30rpx;
-		font-size: 32rpx;
-		color: #282828;
-	}
-	.personal-data .list .item .phone {
-		width: 160rpx;
-		height: 56rpx;
-		font-size: 24rpx;
-		color: #fff;
-		line-height: 56rpx;
-		border-radius: 32rpx
-	}
-	.personal-data .list .item .pictrue {
-		width: 88rpx;
-		height: 88rpx;
-	}
-	.personal-data .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-	}
-	.personal-data .list .item .input {
-		min-width: 415rpx;
-		text-align: right;
-		color: #868686;
-	}
-	.personal-data .list .item .input .id {
-		width: 365rpx;
-	}
-	.personal-data .list .item .input .iconfont {
-		font-size: 35rpx;
-	}
-	.personal-data .modifyBnt {
-		font-size: 32rpx;
-		color: #fff;
-		width: 690rpx;
-		height: 90rpx;
-		border-radius: 50rpx;
-		text-align: center;
-		line-height: 90rpx;
-		margin: 76rpx auto 0 auto;
-		background: var(--view-theme);
-	}
-	.personal-data .logOut {
-		font-size: 32rpx;
-		text-align: center;
-		width: 690rpx;
-		height: 90rpx;
-		border-radius: 45rpx;
-		margin: 30rpx auto 0 auto;
-		color: var(--view-theme);
-		border: 1px solid var(--view-theme);
-	}
-	.avatar-box {
-		width: 96rpx;
-		height: 96rpx;
-		background: transparent;
-		image {
-			width: 100%;
-			height: 100%;
-			border-radius: 50%;
-		}
-	}
-</style>
+  html {
+    -webkit-text-size-adjust: none;
+  }
+
+  .radius {
+    background-color: white;
+    width: 35rpx;
+    height: 35rpx;
+    border-radius: 50%;
+    border: 1px solid rgb(187, 43, 5);
+    line-height: 25rpx;
+    text-align: center;
+    position: absolute;
+    right: 0;
+    bottom: 0;
+  }
+
+  .iconfonta {
+    border-radius: 50%;
+    font-size: 20rpx;
+    color: red;
+  }
+
+  .avatar {
+    width: 120rpx;
+    height: 120rpx;
+    border-radius: 50%;
+  }
+
+  .btnb {
+    border-radius: 0;
+    height: 100rpx;
+    line-height: 100rpx;
+  }
+
+  .btna {
+    height: 100rpx;
+    line-height: 100rpx;
+    border-radius: 10rpx 10rpx 0 0;
+  }
+
+  .btnc {
+    height: 130rpx;
+    line-height: 130rpx;
+    border-radius: 0;
+  }
+
+  .personal-data {
+    padding-bottom: calc(0rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+    padding-bottom: calc(0rpx + env(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+  }
+
+  .personal-data .wrapper {
+    margin: 10rpx 0;
+    background-color: #fff;
+    padding: 36rpx 30rpx 13rpx 30rpx;
+  }
+
+  .personal-data .wrapper .title {
+    margin-bottom: 30rpx;
+    font-size: 32rpx;
+    color: #282828;
+  }
+
+  .personal-data .wrapper .wrapList .item {
+    width: 690rpx;
+    height: 160rpx;
+    background-color: #f8f8f8;
+    border-radius: 20rpx;
+    margin-bottom: 22rpx;
+    padding: 0 30rpx;
+    position: relative;
+    border: 2rpx solid #f8f8f8;
+    box-sizing: border-box;
+  }
+
+  .t-color {
+    color: var(--view-theme);
+  }
+
+  .personal-data .wrapper .wrapList .item.on {
+    border-color: var(--view-theme);
+    border-radius: 20rpx;
+    //background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArIAAACgCAYAAADw+I85AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6M0QzNkY3NzlCNzJCMTFFOTgyNEU4QzhGQTRFRUY2REQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6M0QzNkY3N0FCNzJCMTFFOTgyNEU4QzhGQTRFRUY2REQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDozRDM2Rjc3N0I3MkIxMUU5ODI0RThDOEZBNEVFRjZERCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozRDM2Rjc3OEI3MkIxMUU5ODI0RThDOEZBNEVFRjZERCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pn3rJMAAAArUSURBVHja7N3NXuLIGsDhqigK2Ou+grmEuf/t2fT+bOYKZn9aW5Q6qaQSIoKfoCQ8z29QRBSBzX+q31RiSikAAMDYVF4CAACELAAACFkAABCyAAAIWQAAELIAACBkAQAQsgAAIGQBAEDIAgCAkAUAQMgCAICQBQAAIQsAgJAFAAAhCwAAQhYAACELAABCFgAAhCwAAAhZAACELAAACFkAABCyAAAIWQAAELIAACBkAQAQsgAAIGQBAEDIAgCAkAUAQMgCAICQBQAAIQsAgJAFAAAhCwAAQhYAACELAABCFgAAhCwAAAhZAACELAAACFkAABCyAAAIWQAAELIAACBkAQAQsgAAIGQBAEDIAgCAkAUAQMgCAICQBQAAIQsAgJAFAAAhCwAAQhYAACELAABCFgAAhCwAAAhZAACELAAACFkAABCyAAAIWQAAELIAACBkAQBAyAIAIGQBAEDIAgCAkAUAQMgCAMAJuPQSAABMy79///XaXfJi5qy0YFUuqVzW9eWhvqzK9b1+/vpHyAIAcMjCqxs1tldj/zHl/6oU4rz+ctY2a3tzjO2n0F6tUqobMYZ5fX1V337XBm0MMbX3SuXnvv1peqcBAKYlXl+VSI2lZJuIzSuwi7pUY3/HFPsijYMPcVOps9hG7W19fRVT+50YT6TXvdUAABML2at5V6rdTdfNSmzXquX2FOKTr7trsVvBjeVOISzLyuyfNnNTOIWWFbIAAFNzfd2umjYrsmlWR+i8KuusXbhurudZgTZpU6w/p82Ka0oldJvb47z+cp3HDU5kQVbIAgBMTVwsmzitr1V1ni5C07Pd5EAXtCVlm3BNTfS27dvGbAiDcYPUr9TWvys91jetT2BEVsgCAEwuZOeLJkDr/+Z5sbXdb7UdCIixb9M2WDdjss2n4X274YN2LraJ3fzjeUTh9yk8TyELADC1kM0rsjHVTRpnTYam2I8LNBOuaRO0TbaWbQhidyRYKveLmz0P+vu223ZV8ZWtuYQsAADvD9nlTTMb23/dxelg9TUM4nSzRLvZsSANf274u9uvZnXm/hGyAAAcVHWzzKusl5uDtvq9YtvvpzZJmwGC+GS1tR83iHuGYMuPXtbfF7IAABxWXP7IyVkNT4awGQ/Y7FswHBkIW9e7W1Kfv0/GDKpTeJ5CFgBgapbLPAJQxX5X2DIuEPsdYtsSTak/nKv5Xir7GQxWZNvvlZGC/pReUcgCAHB41c2PnbfHrc+v3bbv61MhZAEAJibmkE1pXRdo9SRDuxXVuJWp3XBsGYDdfL9frx38jub767LVgZAFAOCAIdvsWpBjs5tlHZx4tvmQNhsVdH1bAjYO9pTtrlX9cEJvfQrPU8gCAExMdXOTPz3knQvCk/1iU4iDhO3HCuKT8yK0v6P/mfL9wTFf9W0PpzBvIGQBACYmLm7yOMCqDtB5f6hXak94UFo0lPMklO22ykFfg71mNyu3/ZkUNltz1b+7vYOQBQDgkCG7vMmxmWdkVyGfiWvH3rD9yWeb22O/KVdfuqVy29HZOBwuWKVmbEHIAgBw6JBdLMqKaryLMV3GwRFcqRykVXWt2g0V9KfyimV7rsEEbTkILLbDCXftqIGDvQAAOLTFsjtxwbrOzds6PJcpPT8pQnctlV6N/XlsBwd9lZXcsp/sbZXiuszJClkAAA4rzuclUpsl11UdoXcxxXm709Zg7rUp1fJ13KzKDnbfGhwQFu/qr1fdoGwUsgAAHD5kF32JlhD9E5ots+KiCv0JvAZzr3GzPUGJ235lNo8TpHjbBnF373QSz1PIAgBMLWSvrtoQTf3ga5YP0nqsP89jPgCs7dz2Q4xhu03T5mfuYnNyhTjYzSAE228BALDXv3//9aGf+/mf/5ai3Zy0q4wOrGOIv1NoznEwq0P3sv66yl+XLs0ztfV9wkOO2NieVKFP29SeKqyP2I/+fUIWAIDdZrP+6nDhdDMa0JyZ60+57LvPM9+0CJsfttq6NMetCVkAgIn57pXST0Zr7tOLEqzd552ELAAA3x2u3aV6zw8LWQAAvlKO1Vm5XHzmFwlZAABGE69CFgDgDb5z1vTnr3+m8BLmcL06VnMKWQCAwzRVt9rYHVWf5c2r8g4Bef/WVWi3tZq6WF6L6/DOmVchCwDwdcGWY+0q7N+ZKpa4vSj3y2F7H9ptr9IZvh5CFgDgm+UVx8UHgm0Ye7ehXaUVsEIWAOBLLEq0fTb+lqFdnb0d8WtxXS7fcq4EIQsA8HY5Pmc7bs9jAt0MbJ6HXZe460YLuhna7eDrVjF/j+x1yM9lHo48AytkAQAOY7EnYu9Cu7KadsRtd7DXqtzvqgTgdhTm3z2Gldmq/K0n0ZBCFgDgdd02UkM5UPNK6uMbf0eO2nyQV161XYanq5lX5fZTnpn91jGCfVUNAMB+OdwWOyL2f++I2KHH8rPrrds/cvDYV/XiTWhXkuOp/WEAAOy3axXy944QfY9uNXc7mK9P7Lnnlegf4UT/FV/IAgC8bHukII8HPB7g9z6W3/XSY32nvEK8DKe5SixkAQBecbkVcmlHfH7G9okRYvj+1c/chz9OLKqFLADAO23vUrAKhz0jV7dt10uP+dXhniP2YgxvjpAFANhvO+gejvAYD6885lfJK7D5oK44ljfH9lsAAPttL/o9HuExHl95zK+QdyS4HtubI2QBAPbbXp1cH+Ex1q885rEd4pS7J/F/GQAAvD1sx260EStkAQBelr4gZKtXHvNYlmOOWCELAPCy7X/2P8aBWBevPOYx5JXY2djfHCELALDf9oFYxzi+6PKVxzxGxF5N4c0RsgAA++3a4/WQ4wUxPF8ZfTji85lPJWKFLADAy3JUbp9565DbVF2H52cOWx3puczCCLfYErIAAB93vyM+DzEre7EjLO+P9Bzy+MJyam+MkAUAeNmf8HwngeUnO6raEZapPNYxem85xTdGyAIAvCwH5u2Ohsqnc/3IyuxF+dntDrsNh996K5aIjVN8Y4QsAMDr8tzq/Y6O+hHaA6jeEoqx3PfHjga7D8eZjZ2H42wZdhKcohYA4G1uw+5dBvKc61UJ0XxZh81esFW5zML+HQ9W4fmK7yHMwoR2KBCyAACf8zvs3oc1ltveG473R4rYqvydkyZkAQDeJ4fnQwnFj86ednO3x9pq6zN/m5AFAJiwVYnZbqzgrdGYAzavwu7aCeFQrs6l8YQsAMDH5BC9K5fcVHkmNR9YVQ3CNt8nz8s+DuL3mPJjz8/lDRCyAACf9/AFkfoWZzFSIGQBAF7x89c/Y/pzZ+fWdvaRBQCYhvm5PWEhCwAwftfn2HVCFgBg3GIJ2bMjZAEAxu06nNEBXkIWAGAaujOKnSUhCwAwXme7GitkAQDG66xXY2tJyAIAjNMsnPFqbG0tZAEAxun6zJ+/kAUAGKF8Bq9z77hHIQsAMD5XXoLwIGQBAMYlz8XOzvw1WAcrsgAAo2M1NoRV/iBkAQDGZeYlCPdCFgBgXHK7XYjYZrRAyAIAjMi5r8am+nI3rHoAAITsGNyWmBWyAAAjkncrOOexgjxSsBreIGQBAMbh8oyfew7Y2+0bhSwAgJA9ZQ+7Ivbcyx4AQMietvt9EStkAQDGIc/HntO/pKcSsCtlDwAwbufUbHkV9i4MdifwogAAjNfUdyvIJzhYhcHJDtQ9AMA0TGmsIJVYzZfH0B7M9fiRX/R/AQYA1i4UF+HkevkAAAAASUVORK5CYII=");
+    background-size: 100% 100%;
+    background-color: var(--view-minorColor);
+    background-repeat: no-repeat;
+  }
+
+  .personal-data .wrapper .wrapList .item .picTxt {
+    width: 445rpx;
+  }
+
+  .personal-data .wrapper .wrapList .item .picTxt .pictrue {
+    width: 96rpx;
+    height: 96rpx;
+    position: relative;
+  }
+
+  .personal-data .wrapper .wrapList .item .picTxt .pictrue image {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+  }
+
+  .personal-data .wrapper .wrapList .item .picTxt .text {
+    width: 325rpx;
+  }
+
+  .personal-data .wrapper .wrapList .item .picTxt .text .name {
+    width: 100%;
+    font-size: 30rpx;
+    color: #282828;
+  }
+
+  .personal-data .wrapper .wrapList .item .picTxt .text .phone {
+    font-size: 24rpx;
+    color: #999;
+    margin-top: 10rpx;
+  }
+
+  .personal-data .wrapper .wrapList .item .bnt {
+    font-size: 24rpx;
+    background-color: #fff;
+    border-radius: 27rpx;
+    width: 140rpx;
+    height: 54rpx;
+    border: 2rpx solid var(--view-theme);
+  }
+
+  .personal-data .wrapper .wrapList .item .currentBnt {
+    position: absolute;
+    right: 0;
+    top: 0;
+    font-size: 26rpx;
+    background-color: var(--view-minorColor);
+    width: 140rpx;
+    height: 48rpx;
+    border-radius: 0 20rpx 0 20rpx;
+  }
+
+  .personal-data .list {
+    margin-top: 15rpx;
+    background-color: #fff;
+  }
+
+  .personal-data .list .item {
+    padding: 30rpx 30rpx 30rpx 0;
+    border-bottom: 1px solid #f2f2f2;
+    margin-left: 30rpx;
+    font-size: 32rpx;
+    color: #282828;
+  }
+
+  .personal-data .list .item .phone {
+    width: 160rpx;
+    height: 56rpx;
+    font-size: 24rpx;
+    color: #fff;
+    line-height: 56rpx;
+    border-radius: 32rpx
+  }
+
+  .personal-data .list .item .pictrue {
+    width: 88rpx;
+    height: 88rpx;
+  }
+
+  .personal-data .list .item .pictrue image {
+    width: 100%;
+    height: 100%;
+    border-radius: 50%;
+  }
+
+  .personal-data .list .item .input {
+    min-width: 415rpx;
+    text-align: right;
+    color: #868686;
+  }
+
+  .personal-data .list .item .input .id {
+    width: 365rpx;
+  }
+
+  .personal-data .list .item .input .iconfont {
+    font-size: 35rpx;
+  }
+
+  .personal-data .modifyBnt {
+    font-size: 32rpx;
+    color: #fff;
+    width: 690rpx;
+    height: 90rpx;
+    border-radius: 50rpx;
+    text-align: center;
+    line-height: 90rpx;
+    margin: 76rpx auto 0 auto;
+    background: var(--view-theme);
+  }
+
+  .personal-data .logOut {
+    font-size: 32rpx;
+    text-align: center;
+    width: 690rpx;
+    height: 90rpx;
+    border-radius: 45rpx;
+    margin: 30rpx auto 0 auto;
+    color: var(--view-theme);
+    border: 1px solid var(--view-theme);
+  }
+
+  .avatar-box {
+    width: 96rpx;
+    height: 96rpx;
+    background: transparent;
+
+    image {
+      width: 100%;
+      height: 100%;
+      border-radius: 50%;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/store/modules/app.js b/store/modules/app.js
index a55c6ea..790547e 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -61,7 +61,7 @@ const mutations = {
     state.color = color;
     document.body.style.backgroundColor = color;
   },
-  UPDATE_USERINFO(state, userInfo) {
+  UPDATE_USERINFO(state, userInfo, time) {
     userInfo.isNew && Cache.set('is_new_user', '1')
     state.userInfo = userInfo;
   },
diff --git a/uni.scss b/uni.scss
index 098ffc8..6e4faf9 100644
--- a/uni.scss
+++ b/uni.scss
@@ -13,6 +13,8 @@
  */
 @import '@/uni_modules/uview-ui/theme.scss';
 /* 颜色变量 */
+$uni-theme-color: #F45846;
+$uni-theme-bg-color: linear-gradient(180deg, #F98649 0%, #F34E45 100%);
 
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;
diff --git a/uni_modules/bt-cropper/components/bt-cropper/bt-cropper.vue b/uni_modules/bt-cropper/components/bt-cropper/bt-cropper.vue
index 06a2214..6a86366 100644
--- a/uni_modules/bt-cropper/components/bt-cropper/bt-cropper.vue
+++ b/uni_modules/bt-cropper/components/bt-cropper/bt-cropper.vue
@@ -1,881 +1,902 @@
 <template>
-	<view class="bt-container">
-		<!-- <view class="iconfont icon-reset" @click.stop="resetImage"></view> -->
-		<view @touchend="onTouchEnd" @touchstart="onTouchStart" class="mainContent">
-			<template v-if="imageInfo">
-				<image :src="showImagePath" mode="aspectFit" data-type="image" @touchmove.stop.prevent="onImageMove"
-					:style="[imageStyle]" class="image"></image>
-				<view class="cropper" :style="{
+  <view class="bt-container">
+    <!-- <view class="iconfont icon-reset" @click.stop="resetImage"></view> -->
+    <view @touchend="onTouchEnd" @touchstart="onTouchStart" class="mainContent">
+      <template v-if="imageInfo">
+        <image :src="showImagePath" mode="aspectFit" data-type="image" @touchmove.stop.prevent="onImageMove"
+          :style="[imageStyle]" class="image"></image>
+        <view class="cropper" :style="{
 						width: cropperPosition.width + 'px',
 						height: cropperPosition.height + 'px',
 						left: cropperPosition.left - 1 + 'px',
 						top: cropperPosition.top - 1 + 'px',
 						transition,
 					}">
-					<template v-if="showGrid">
-						<view class="line row row1"></view>
-						<view class="line row row2"></view>
-						<view class="line col col1"></view>
-						<view class="line col col2"></view>
-					</template>
-				</view>
-				<view @touchmove.stop.prevent="onHandleResize(-1, 0, $event)" class="controller vertical"
-					:style="[controllerPosition.left]" />
-				<view @touchmove.stop.prevent="onHandleResize(1, 0, $event)" class="controller vertical"
-					:style="[controllerPosition.right]" />
-				<view @touchmove.stop.prevent="onHandleResize(0, -1, $event)" class="controller horizon"
-					:style="[controllerPosition.top]" />
-				<view @touchmove.stop.prevent="onHandleResize(0, 1, $event)" class="controller horizon"
-					:style="[controllerPosition.bottom]" />
-				<template v-if="ratio==0">
-					<view @touchmove.stop.prevent="onHandleResize(-1, -1, $event)" class="controller controller_dot"
-						:style="[controllerPosition.leftTop]" />
-					<view @touchmove.stop.prevent="onHandleResize(1, -1, $event)" class="controller controller_dot"
-						:style="[controllerPosition.rightTop]" />
-					<view @touchmove.stop.prevent="onHandleResize(-1, 1, $event)" class="controller controller_dot"
-						:style="[controllerPosition.leftBottom]" />
-					<view @touchmove.stop.prevent="onHandleResize(1, 1, $event)" class="controller controller_dot"
-						:style="[controllerPosition.rightBottom]" />
-				</template>
-			</template>
-		</view>
-		<view class="slot">
-			<slot />
-		</view>
-		<!-- #ifdef MP-WEIXIN -->
-		<canvas v-if="showCanvas" type="2d" class="bt-canvas" :style="{
+          <template v-if="showGrid">
+            <view class="line row row1"></view>
+            <view class="line row row2"></view>
+            <view class="line col col1"></view>
+            <view class="line col col2"></view>
+          </template>
+        </view>
+        <view @touchmove.stop.prevent="onHandleResize(-1, 0, $event)" class="controller vertical"
+          :style="[controllerPosition.left]" />
+        <view @touchmove.stop.prevent="onHandleResize(1, 0, $event)" class="controller vertical"
+          :style="[controllerPosition.right]" />
+        <view @touchmove.stop.prevent="onHandleResize(0, -1, $event)" class="controller horizon"
+          :style="[controllerPosition.top]" />
+        <view @touchmove.stop.prevent="onHandleResize(0, 1, $event)" class="controller horizon"
+          :style="[controllerPosition.bottom]" />
+        <template v-if="ratio==0">
+          <view @touchmove.stop.prevent="onHandleResize(-1, -1, $event)" class="controller controller_dot"
+            :style="[controllerPosition.leftTop]" />
+          <view @touchmove.stop.prevent="onHandleResize(1, -1, $event)" class="controller controller_dot"
+            :style="[controllerPosition.rightTop]" />
+          <view @touchmove.stop.prevent="onHandleResize(-1, 1, $event)" class="controller controller_dot"
+            :style="[controllerPosition.leftBottom]" />
+          <view @touchmove.stop.prevent="onHandleResize(1, 1, $event)" class="controller controller_dot"
+            :style="[controllerPosition.rightBottom]" />
+        </template>
+      </template>
+    </view>
+    <view class="slot">
+      <slot />
+    </view>
+    <!-- #ifdef MP-WEIXIN -->
+    <canvas v-if="showCanvas" type="2d" class="bt-canvas" :style="{
 			width:dSize.width+'px',
 			height:dSize.height+'px'
 		}"></canvas>
-		<!-- #endif -->
-		<!-- #ifndef MP-WEIXIN -->
-		<canvas v-if="showCanvas" canvas-id="bt-canvas" class="bt-canvas" :style="{
+    <!-- #endif -->
+    <!-- #ifndef MP-WEIXIN -->
+    <canvas v-if="showCanvas" canvas-id="bt-canvas" class="bt-canvas" :style="{
 			width:dSize.width+'px',
 			height:dSize.height+'px'
 		}"></canvas>
-		<!-- #endif -->
-	</view>
+    <!-- #endif -->
+  </view>
 </template>
 
 <script>
-	/**
-	 * better-cropper 图片裁切插件
-	 */
-	import calcImageSize from "./utils/calcImageSize.js"
-	import calcImagePosition from "./utils/calcImagePosition.js"
-	import calcCropper from "./utils/calcCropper.js"
-	import calcRightAndBottom from "./utils/calcRightAndBottom.js"
-	import calcPointDistance from "./utils/calcPointDistance.js"
-	import {
-		getTouchPoints,
-		sleep,
-		debounce,
-		log
-	} from "./utils/tools.js"
+  /**
+   * better-cropper 图片裁切插件
+   */
+  import calcImageSize from "./utils/calcImageSize.js"
+  import calcImagePosition from "./utils/calcImagePosition.js"
+  import calcCropper from "./utils/calcCropper.js"
+  import calcRightAndBottom from "./utils/calcRightAndBottom.js"
+  import calcPointDistance from "./utils/calcPointDistance.js"
+  import {
+    getTouchPoints,
+    sleep,
+    debounce,
+    log
+  } from "./utils/tools.js"
 
-	var startOffsetX = 0,
-		startOffsetY = 0,
-		startTouchsDistance = 0,
-		startChangeLeft = 0,
-		startChangeTop = 0,
-		startChangeWidth = 0,
-		startChangeHeight = 0,
-		initScale = 1,
-		startTouches = [],
-		timer = null;
-	export default {
-		name: "bt-cropper",
-		props: {
-			// 图片路径，支持网络路径和本地路径
-			imageSrc: {
-				type: String,
-				default: "",
-				required: true
-				// validator(value) {
-				// 	if (/^(http:|https:|)\/\//.test(value)) {
-				// 		return true
-				// 	} else {
-				// 		console.warn("图片url似乎不合法")
-				// 		return false
-				// 	}
-				// }
-			},
-			// 输出图片的格式，默认jpg
-			fileType: {
-				type: String,
-				default: "jpg"
-			},
-			// 生成的图片的宽度
-			dWidth: {
-				type: Number,
-				default: 0
-			},
-			// 裁切比例，0表示自由
-			ratio: {
-				type: Number,
-				default: 0,
-				validator(value) {
-					if (typeof value === 'number') {
-						if (value < 0) {
-							log('裁剪框比例值必须大于零', 'error')
-							return false
-						}
-					} else {
-						log('裁剪框比例值必须是数字', 'error')
-						return false
-					}
-					return true
-				}
-			},
-			// 是否展示网格
-			showGrid: {
-				type: Boolean,
-				default: false
-			},
-			// 图片质量，0-1 越大质量越好
-			quality: {
-				type: Number,
-				default: 1
-			},
-			// 初始的图片位置
-			initPosition: {
-				type: Object,
-				default () {
-					return null
-				}
-			},
-			// 是否压缩图片
-			// 注意：这里的压缩指的是用户移动图片展示的那个图片的压缩，
-			// 输出图片的质量并不会受到影响，
-			// 也就是说，最终输出图片的质量会比裁切时看起来更好
-			compress: {
-				type: Boolean,
-				default: false
-			},
-			// 是否开启操作结束后自动放大
-			autoZoom:{
-				type:Boolean,
-				default:true
-			}
-		},
-		data() {
-			return {
-				imageUrl: "",
-				imageInfo: null,
-				containerRect: "",
-				offsetX: 0,
-				offsetY: 0,
-				changeWidth: 0,
-				changeHeight: 0,
-				windowWidth: 375,
-				dpr: 2,
-				forceChangeWidth: 0,
-				forceChangeHeight: 0,
-				animate: false,
-				imgScale: 1,
-				imgTranslateX: 0,
-				imgTranslateY: 0,
-				// 这个变量不要删掉，不然会造成性能严重下降，这是uni-app框架的Bug
-				showCanvas: false,
-				cropperPosition: {
-					left: 0,
-					top: 0,
-					width: 0,
-					height: 0
-				},
-				// 图片在视图上的位置
-				imageBoundingRect: {
-					left: 0,
-					top: 0,
-					width: 0,
-					height: 0,
-				}
-			};
-		},
-		watch: {
-			imageSrc: {
-				handler(imageSrc) {
-					this.imageUrl = imageSrc
-					this.imageInfo = null;
-					if(!imageSrc){
-						return
-					}
-					this.getImageInfo(imageSrc).then(imageInfo => {
-						this.imageInfo = imageInfo;
-						return this.getContainerRect()
-					}).then(rect => {
-						this.containerRect = rect;
-						this.imageBoundingRect = this.getImageInitRect()
-						this.resetImage()
-						if (this.ratio == 0) {
-							this.cropperPosition = this.getCropperInitPosition()
-						}
-						return this.imageBoundingRect;
-					}).then((imageBoundingRect) => {
-						if (this.initPosition) {
-							const {left,top,width,height} = this.initPosition
-							const ratio = this.imageBoundingRect.width / this.imageInfo.width
-							if(left!==undefined){
-								const imgTranslateX = this.cropperPosition.left - imageBoundingRect.left - left * ratio
-								this.cropperPosition.left -= imgTranslateX
-							}
-							if(top!==undefined){
-								const imgTranslateY = this.cropperPosition.top - imageBoundingRect.top - top * ratio
-								this.cropperPosition.top -= imgTranslateY
-							}
-							!!width && (this.cropperPosition.width = this.initPosition.width * ratio);
-							!!height && (this.cropperPosition.height = this.initPosition.height * ratio);
-						}
-						this.$emit('load')
-					}).catch(err=>{
-						console.error('失败信息',err)
-						this.$emit('loadFail',err)
-					})
-				},
-				immediate: true
-			},
-			ratio: {
-				handler(ratio) {
-					this.resetCropper()
-					this.applyAnim()
-				},
-				immediate: false
-			},
-		},
-		computed: {
-			showImagePath() {
-				if (this.imageInfo && this.imageInfo.compressPath) {
-					return this.imageInfo.compressPath
-				} else {
-					return this.imageInfo?.path || ""
-				}
-			},
-			// 生成图片的大小
-			dSize() {
-				if (this.dWidth > 0) {
-					return {
-						width: this.dWidth,
-						height: this.dWidth * (this.cropperPosition.height / this.cropperPosition.width)
-					}
-				} else {
-					// 原像素比例裁剪
-					let scale = 1
-					if (this.imageInfo) {
-						scale = this.imgScale * this.imageBoundingRect.width / this.imageInfo.width
-					}
-					return {
-						width: this.cropperPosition.width / scale,
-						height: this.cropperPosition.height / scale
-					}
-				}
-			},
-			imageStyle() {
-				let style = {
-					left: this.imageBoundingRect.left + 'px',
-					top: this.imageBoundingRect.top + 'px',
-					width: this.imageBoundingRect.width + 'px',
-					height: this.imageBoundingRect.height + 'px',
-					transition: this.transition,
-					transform: `matrix(${this.imgScale}, 0, 0, ${this.imgScale}, ${this.imgTranslateX}, ${this.imgTranslateY}) translateZ(0px)`,
-				}
-				return style
-			},
-			transition() {
-				return this.animate ? '0.2s' : 'none'
-			},
-			// 四个控制点的位置
-			controllerPosition() {
-				const up40 = uni.upx2px(40),
-					up30 = uni.upx2px(30),
-					up20 = uni.upx2px(20);
-				const transition = this.transition
-				return {
-					left: {
-						left: this.cropperPosition.left - up30 + 'px',
-						top: this.cropperPosition.top + (this.cropperPosition.height) / 2 - up40 + 'px',
-						transition
-					},
-					right: {
-						left: this.cropperPosition.left + this.cropperPosition.width - up20 + 'px',
-						top: this.cropperPosition.top + (this.cropperPosition.height) / 2 - up40 + 'px',
-						transition
-					},
-					top: {
-						left: this.cropperPosition.left + this.cropperPosition.width / 2 - up40 + 'px',
-						top: this.cropperPosition.top - up30 + 'px',
-						transition
-					},
-					bottom: {
-						left: this.cropperPosition.left + this.cropperPosition.width / 2 - up40 + 'px',
-						top: this.cropperPosition.top + this.cropperPosition.height - up20 + 'px',
-						transition
-					},
-					leftTop: {
-						left: this.cropperPosition.left - up40 + 'px',
-						top: this.cropperPosition.top - up40 + 'px',
-						transition
-					},
-					rightTop: {
-						left: this.cropperPosition.left + this.cropperPosition.width - up40 + 'px',
-						top: this.cropperPosition.top - up40 + 'px',
-						transition
-					},
-					leftBottom: {
-						left: this.cropperPosition.left - up40 + 'px',
-						top: this.cropperPosition.top + this.cropperPosition.height - up40 + 'px',
-						transition
-					},
-					rightBottom: {
-						left: this.cropperPosition.left + this.cropperPosition.width - up40 + 'px',
-						top: this.cropperPosition.top + this.cropperPosition.height - up40 + 'px',
-						transition
-					}
-				}
-			},
-		},
-		methods: {
-			// 开启动画
-			applyAnim() {
-				this.animate = true
-				clearTimeout(timer)
-				timer = setTimeout(() => {
-					this.animate = false
-				}, 200)
-			},
-			async getContainerRect() {
-				const systemInfo = uni.getSystemInfoSync()
-				this.windowWidth = systemInfo.windowWidth
-				this.dpr = systemInfo.pixelRatio
-				return new Promise(resolve => {
-					uni.createSelectorQuery().in(this).select(".mainContent").boundingClientRect((rect) => {
-						resolve(rect)
-					}).exec()
-				})
-			},
-			async getImageInfo(imageSrc) {
-				uni.showLoading({
-					title: "获取图片信息"
-				})
-				return uni.getImageInfo({
-					src: imageSrc
-				}).then((res) => {
-					let imageInfo = null;
-					// #ifdef VUE2
-					const err = res[0];
-					imageInfo = res[1];
-					if (err) {
-						throw new Error(err)
-					}
-					// #endif
-					// #ifdef VUE3
-					imageInfo = res
-					// #endif
-					uni.hideLoading()
-					return imageInfo;
-				}).then(imageInfo => {
-					const maxSize = 2000 * 2000
-					const imageSize = imageInfo.width * imageInfo.height
-					// uni.canIUse('compressImage.success.tempFilePath')
-					// #ifndef H5
-					// 是否压缩图片
-					if (maxSize < imageSize && this.compress) {
-						const quality = maxSize / imageSize * 100
-						return uni.compressImage({
-							src: imageInfo.path,
-							quality
-						}).then(([err, {
-							tempFilePath
-						}]) => {
-							if (!err) {
-								imageInfo.compressPath = tempFilePath
-							}
-							return imageInfo
-						})
-					}
-					// #endif
-					return imageInfo;
-				}).then(imageInfo => {
-					return imageInfo;
-				}).catch(err => {
-					uni.hideLoading()
-					uni.showToast({
-						title: "图片加载失败",
-						icon: "none"
-					})
-					throw Error(err)
-				})
-			},
-			getImageInitRect() {
-				return calcImageSize(this.imageInfo, this.containerRect)
-			},
-			resetImage() {
-				this.imgTranslateX = 0
-				this.imgTranslateY = 0
-				this.imgScale = 1
-				this.resetCropper()
-			},
-			// 获取裁剪框初始位置
-			getCropperInitPosition() {
-				return calcCropper(this.imageBoundingRect, {
-					width: this.ratio || 1,
-					height: 1
-				})
-			},
-			/**
-			 * @deprecated 本方法已弃用，请用resetCropper代替
-			 */
-			resetRatio(){
-				log('本方法(resetRatio)已弃用,未来将删除,请用resetCropper代替','warn')
-				return this.resetCropper()
-			},
-			// 重置裁剪框
-			resetCropper() {
-				if (this.imageInfo && this.ratio !== 0) {
-					this.cropperPosition = this.getCropperInitPosition()
-					this.checkImagePosition()
-				}
-			},
-			onTouchStart(ev) {
-				this.animate = false
-				if (timer) {
-					clearTimeout(timer)
-				}
-				startTouches = Array.from(ev.touches)
-				if (ev.target.dataset.type === 'image') {
-					startOffsetX = this.imgTranslateX;
-					startOffsetY = this.imgTranslateY;
-					if (ev.touches.length == 2) {
-						initScale = this.imgScale
-						startTouchsDistance = calcPointDistance(...getTouchPoints(startTouches))
-					}
-				} else {
-					startChangeLeft = this.cropperPosition.left
-					startChangeTop = this.cropperPosition.top
-					startChangeWidth = this.cropperPosition.width;
-					startChangeHeight = this.cropperPosition.height;
-				}
-			},
-			onTouchEnd() {
-				startTouches = []
-				this.checkImagePosition()
-				if(this.autoZoom){
-					clearTimeout(timer)
-					timer = setTimeout(this.zoom,1000)
-				}
-				this.reportChange()
-			},
-			getImagePosition() {
-				return calcImagePosition(this.imageBoundingRect, {
-					imgTranslateX: this.imgTranslateX,
-					imgTranslateY: this.imgTranslateY,
-					imgScale: this.imgScale
-				})
-			},
-			getCropperPosition() {
-				return calcRightAndBottom(this.cropperPosition)
-			},
-			// 检查图片位置
-			checkImagePosition() {
-				const imagePosition = this.getImagePosition()
-				const cropperPosition = this.getCropperPosition()
-				// 如果裁剪框大于图像大小，就放大到裁剪框大小
-				const widthScale = cropperPosition.width / imagePosition.width
-				const heightScale = cropperPosition.height / imagePosition.height
-				const scale = Math.max(widthScale, heightScale)
-				if (scale > 1) {
-					this.imageZoom({
-						left: cropperPosition.left + cropperPosition.width / 2,
-						top: cropperPosition.top + cropperPosition.height / 2
-					}, scale)
-					this.applyAnim()
-				}
-				// 判断是否超出边界
-				if (imagePosition.left > cropperPosition.left) {
-					this.imgTranslateX = this.imgTranslateX - (imagePosition.left - cropperPosition.left)
-				} else if (imagePosition.right < cropperPosition.right) {
-					this.imgTranslateX = this.imgTranslateX + (cropperPosition.right - imagePosition.right)
-				}
-				if (imagePosition.top > cropperPosition.top) {
-					this.imgTranslateY = this.imgTranslateY - (imagePosition.top - cropperPosition.top)
-				} else if (imagePosition.bottom < cropperPosition.bottom) {
-					this.imgTranslateY = this.imgTranslateY + (cropperPosition.bottom - imagePosition.bottom)
-				}
-			},
-			zoom(){
-				// 容器比例
-				const containerRatio = this.containerRect.width / this.containerRect.height
-				// 移动后的裁剪框比例
-				const cropperRatio = this.cropperPosition.width / this.cropperPosition.height
-				// 放大比例
-				let scale = 1
-				if (cropperRatio > containerRatio) {
-					scale = this.containerRect.width / this.cropperPosition.width
-				} else {
-					scale = this.containerRect.height / this.cropperPosition.height
-				}
-				// 放大裁剪框
-				this.cropperPosition.width *= scale
-				this.cropperPosition.height *= scale
-				// // 移动图像
-				this.imageZoom({
-					left: this.cropperPosition.left,
-					top: this.cropperPosition.top
-				}, scale)
-				// 将裁剪框上下居中
-				const cropperTop = (this.containerRect.height - this.cropperPosition.height) / 2
-				// 需要上下移动的距离
-				const moveTop = cropperTop - this.cropperPosition.top
-				// 将裁剪框左右居中
-				const cropperLeft = (this.containerRect.width - this.cropperPosition.width) / 2
-				// 需要左右移动的距离
-				const moveLeft = (cropperLeft - this.cropperPosition.left)
-				this.cropperPosition.left = cropperLeft
-				this.cropperPosition.top = cropperTop
+  var startOffsetX = 0,
+    startOffsetY = 0,
+    startTouchsDistance = 0,
+    startChangeLeft = 0,
+    startChangeTop = 0,
+    startChangeWidth = 0,
+    startChangeHeight = 0,
+    initScale = 1,
+    startTouches = [],
+    timer = null;
+  export default {
+    name: "bt-cropper",
+    props: {
+      // 图片路径，支持网络路径和本地路径
+      imageSrc: {
+        type: String,
+        default: "",
+        required: true
+        // validator(value) {
+        // 	if (/^(http:|https:|)\/\//.test(value)) {
+        // 		return true
+        // 	} else {
+        // 		console.warn("图片url似乎不合法")
+        // 		return false
+        // 	}
+        // }
+      },
+      // 输出图片的格式，默认jpg
+      fileType: {
+        type: String,
+        default: "jpg"
+      },
+      // 生成的图片的宽度
+      dWidth: {
+        type: Number,
+        default: 0
+      },
+      // 裁切比例，0表示自由
+      ratio: {
+        type: Number,
+        default: 0,
+        validator(value) {
+          if (typeof value === 'number') {
+            if (value < 0) {
+              log('裁剪框比例值必须大于零', 'error')
+              return false
+            }
+          } else {
+            log('裁剪框比例值必须是数字', 'error')
+            return false
+          }
+          return true
+        }
+      },
+      // 是否展示网格
+      showGrid: {
+        type: Boolean,
+        default: false
+      },
+      // 图片质量，0-1 越大质量越好
+      quality: {
+        type: Number,
+        default: 1
+      },
+      // 初始的图片位置
+      initPosition: {
+        type: Object,
+        default () {
+          return null
+        }
+      },
+      // 是否压缩图片
+      // 注意：这里的压缩指的是用户移动图片展示的那个图片的压缩，
+      // 输出图片的质量并不会受到影响，
+      // 也就是说，最终输出图片的质量会比裁切时看起来更好
+      compress: {
+        type: Boolean,
+        default: false
+      },
+      // 是否开启操作结束后自动放大
+      autoZoom: {
+        type: Boolean,
+        default: true
+      }
+    },
+    data() {
+      return {
+        imageUrl: "",
+        imageInfo: null,
+        containerRect: "",
+        offsetX: 0,
+        offsetY: 0,
+        changeWidth: 0,
+        changeHeight: 0,
+        windowWidth: 375,
+        dpr: 2,
+        forceChangeWidth: 0,
+        forceChangeHeight: 0,
+        animate: false,
+        imgScale: 1,
+        imgTranslateX: 0,
+        imgTranslateY: 0,
+        // 这个变量不要删掉，不然会造成性能严重下降，这是uni-app框架的Bug
+        showCanvas: false,
+        cropperPosition: {
+          left: 0,
+          top: 0,
+          width: 0,
+          height: 0
+        },
+        // 图片在视图上的位置
+        imageBoundingRect: {
+          left: 0,
+          top: 0,
+          width: 0,
+          height: 0,
+        }
+      };
+    },
+    watch: {
+      imageSrc: {
+        handler(imageSrc) {
+          this.imageUrl = imageSrc
+          this.imageInfo = null;
+          if (!imageSrc) {
+            return
+          }
+          this.getImageInfo(imageSrc).then(imageInfo => {
+            this.imageInfo = imageInfo;
+            return this.getContainerRect()
+          }).then(rect => {
+            this.containerRect = rect;
+            this.imageBoundingRect = this.getImageInitRect()
+            this.resetImage()
+            if (this.ratio == 0) {
+              this.cropperPosition = this.getCropperInitPosition()
+            }
+            return this.imageBoundingRect;
+          }).then((imageBoundingRect) => {
+            if (this.initPosition) {
+              const { left, top, width, height } = this.initPosition
+              const ratio = this.imageBoundingRect.width / this.imageInfo.width
+              if (left !== undefined) {
+                const imgTranslateX = this.cropperPosition.left - imageBoundingRect.left - left * ratio
+                this.cropperPosition.left -= imgTranslateX
+              }
+              if (top !== undefined) {
+                const imgTranslateY = this.cropperPosition.top - imageBoundingRect.top - top * ratio
+                this.cropperPosition.top -= imgTranslateY
+              }!!width && (this.cropperPosition.width = this.initPosition.width * ratio);
+              !!height && (this.cropperPosition.height = this.initPosition.height * ratio);
+            }
+            this.$emit('load')
+          }).catch(err => {
+            console.error('失败信息', err)
+            this.$emit('loadFail', err)
+          })
+        },
+        immediate: true
+      },
+      ratio: {
+        handler(ratio) {
+          this.resetCropper()
+          this.applyAnim()
+        },
+        immediate: false
+      },
+    },
+    computed: {
+      showImagePath() {
+        if (this.imageInfo && this.imageInfo.compressPath) {
+          return this.imageInfo.compressPath
+        } else {
+          return this.imageInfo?.path || ""
+        }
+      },
+      // 生成图片的大小
+      dSize() {
+        if (this.dWidth > 0) {
+          return {
+            width: this.dWidth,
+            height: this.dWidth * (this.cropperPosition.height / this.cropperPosition.width)
+          }
+        } else {
+          // 原像素比例裁剪
+          let scale = 1
+          if (this.imageInfo) {
+            scale = this.imgScale * this.imageBoundingRect.width / this.imageInfo.width
+          }
+          return {
+            width: this.cropperPosition.width / scale,
+            height: this.cropperPosition.height / scale
+          }
+        }
+      },
+      imageStyle() {
+        let style = {
+          left: this.imageBoundingRect.left + 'px',
+          top: this.imageBoundingRect.top + 'px',
+          width: this.imageBoundingRect.width + 'px',
+          height: this.imageBoundingRect.height + 'px',
+          transition: this.transition,
+          transform: `matrix(${this.imgScale}, 0, 0, ${this.imgScale}, ${this.imgTranslateX}, ${this.imgTranslateY}) translateZ(0px)`,
+        }
+        return style
+      },
+      transition() {
+        return this.animate ? '0.2s' : 'none'
+      },
+      // 四个控制点的位置
+      controllerPosition() {
+        const up40 = uni.upx2px(40),
+          up30 = uni.upx2px(30),
+          up20 = uni.upx2px(20);
+        const transition = this.transition
+        return {
+          left: {
+            left: this.cropperPosition.left - up30 + 'px',
+            top: this.cropperPosition.top + (this.cropperPosition.height) / 2 - up40 + 'px',
+            transition
+          },
+          right: {
+            left: this.cropperPosition.left + this.cropperPosition.width - up20 + 'px',
+            top: this.cropperPosition.top + (this.cropperPosition.height) / 2 - up40 + 'px',
+            transition
+          },
+          top: {
+            left: this.cropperPosition.left + this.cropperPosition.width / 2 - up40 + 'px',
+            top: this.cropperPosition.top - up30 + 'px',
+            transition
+          },
+          bottom: {
+            left: this.cropperPosition.left + this.cropperPosition.width / 2 - up40 + 'px',
+            top: this.cropperPosition.top + this.cropperPosition.height - up20 + 'px',
+            transition
+          },
+          leftTop: {
+            left: this.cropperPosition.left - up40 + 'px',
+            top: this.cropperPosition.top - up40 + 'px',
+            transition
+          },
+          rightTop: {
+            left: this.cropperPosition.left + this.cropperPosition.width - up40 + 'px',
+            top: this.cropperPosition.top - up40 + 'px',
+            transition
+          },
+          leftBottom: {
+            left: this.cropperPosition.left - up40 + 'px',
+            top: this.cropperPosition.top + this.cropperPosition.height - up40 + 'px',
+            transition
+          },
+          rightBottom: {
+            left: this.cropperPosition.left + this.cropperPosition.width - up40 + 'px',
+            top: this.cropperPosition.top + this.cropperPosition.height - up40 + 'px',
+            transition
+          }
+        }
+      },
+    },
+    methods: {
+      // 开启动画
+      applyAnim() {
+        this.animate = true
+        clearTimeout(timer)
+        timer = setTimeout(() => {
+          this.animate = false
+        }, 200)
+      },
+      async getContainerRect() {
+        const systemInfo = uni.getSystemInfoSync()
+        this.windowWidth = systemInfo.windowWidth
+        this.dpr = systemInfo.pixelRatio
+        return new Promise(resolve => {
+          uni.createSelectorQuery().in(this).select(".mainContent").boundingClientRect((rect) => {
+            resolve(rect)
+          }).exec()
+        })
+      },
+      async getImageInfo(imageSrc) {
+        uni.showLoading({
+          title: "获取图片信息"
+        })
+        return uni.getImageInfo({
+          src: imageSrc
+        }).then((res) => {
+          let imageInfo = null;
+          // #ifdef VUE2
+          const err = res[0];
+          imageInfo = res[1];
+          if (err) {
+            throw new Error(err)
+          }
+          // #endif
+          // #ifdef VUE3
+          imageInfo = res
+          // #endif
+          uni.hideLoading()
+          return imageInfo;
+        }).then(imageInfo => {
+          const maxSize = 2000 * 2000
+          const imageSize = imageInfo.width * imageInfo.height
+          // uni.canIUse('compressImage.success.tempFilePath')
+          // #ifndef H5
+          // 是否压缩图片
+          if (maxSize < imageSize && this.compress) {
+            const quality = maxSize / imageSize * 100
+            return uni.compressImage({
+              src: imageInfo.path,
+              quality
+            }).then(([err, {
+              tempFilePath
+            }]) => {
+              if (!err) {
+                imageInfo.compressPath = tempFilePath
+              }
+              return imageInfo
+            })
+          }
+          // #endif
+          return imageInfo;
+        }).then(imageInfo => {
+          return imageInfo;
+        }).catch(err => {
+          uni.hideLoading()
+          uni.showToast({
+            title: "图片加载失败",
+            icon: "none"
+          })
+          throw Error(err)
+        })
+      },
+      getImageInitRect() {
+        return calcImageSize(this.imageInfo, this.containerRect)
+      },
+      resetImage() {
+        this.imgTranslateX = 0
+        this.imgTranslateY = 0
+        this.imgScale = 1
+        this.resetCropper()
+      },
+      // 获取裁剪框初始位置
+      getCropperInitPosition() {
+        return calcCropper(this.imageBoundingRect, {
+          width: this.ratio || 1,
+          height: 1
+        })
+      },
+      /**
+       * @deprecated 本方法已弃用，请用resetCropper代替
+       */
+      resetRatio() {
+        log('本方法(resetRatio)已弃用,未来将删除,请用resetCropper代替', 'warn')
+        return this.resetCropper()
+      },
+      // 重置裁剪框
+      resetCropper() {
+        if (this.imageInfo && this.ratio !== 0) {
+          this.cropperPosition = this.getCropperInitPosition()
+          this.checkImagePosition()
+        }
+      },
+      onTouchStart(ev) {
+        this.animate = false
+        if (timer) {
+          clearTimeout(timer)
+        }
+        startTouches = Array.from(ev.touches)
+        if (ev.target.dataset.type === 'image') {
+          startOffsetX = this.imgTranslateX;
+          startOffsetY = this.imgTranslateY;
+          if (ev.touches.length == 2) {
+            initScale = this.imgScale
+            startTouchsDistance = calcPointDistance(...getTouchPoints(startTouches))
+          }
+        } else {
+          startChangeLeft = this.cropperPosition.left
+          startChangeTop = this.cropperPosition.top
+          startChangeWidth = this.cropperPosition.width;
+          startChangeHeight = this.cropperPosition.height;
+        }
+      },
+      onTouchEnd() {
+        startTouches = []
+        this.checkImagePosition()
+        if (this.autoZoom) {
+          clearTimeout(timer)
+          timer = setTimeout(this.zoom, 1000)
+        }
+        this.reportChange()
+      },
+      getImagePosition() {
+        return calcImagePosition(this.imageBoundingRect, {
+          imgTranslateX: this.imgTranslateX,
+          imgTranslateY: this.imgTranslateY,
+          imgScale: this.imgScale
+        })
+      },
+      getCropperPosition() {
+        return calcRightAndBottom(this.cropperPosition)
+      },
+      // 检查图片位置
+      checkImagePosition() {
+        const imagePosition = this.getImagePosition()
+        const cropperPosition = this.getCropperPosition()
+        // 如果裁剪框大于图像大小，就放大到裁剪框大小
+        const widthScale = cropperPosition.width / imagePosition.width
+        const heightScale = cropperPosition.height / imagePosition.height
+        const scale = Math.max(widthScale, heightScale)
+        if (scale > 1) {
+          this.imageZoom({
+            left: cropperPosition.left + cropperPosition.width / 2,
+            top: cropperPosition.top + cropperPosition.height / 2
+          }, scale)
+          this.applyAnim()
+        }
+        // 判断是否超出边界
+        if (imagePosition.left > cropperPosition.left) {
+          this.imgTranslateX = this.imgTranslateX - (imagePosition.left - cropperPosition.left)
+        } else if (imagePosition.right < cropperPosition.right) {
+          this.imgTranslateX = this.imgTranslateX + (cropperPosition.right - imagePosition.right)
+        }
+        if (imagePosition.top > cropperPosition.top) {
+          this.imgTranslateY = this.imgTranslateY - (imagePosition.top - cropperPosition.top)
+        } else if (imagePosition.bottom < cropperPosition.bottom) {
+          this.imgTranslateY = this.imgTranslateY + (cropperPosition.bottom - imagePosition.bottom)
+        }
+      },
+      zoom() {
+        // 容器比例
+        const containerRatio = this.containerRect.width / this.containerRect.height
+        // 移动后的裁剪框比例
+        const cropperRatio = this.cropperPosition.width / this.cropperPosition.height
+        // 放大比例
+        let scale = 1
+        if (cropperRatio > containerRatio) {
+          scale = this.containerRect.width / this.cropperPosition.width
+        } else {
+          scale = this.containerRect.height / this.cropperPosition.height
+        }
+        // 放大裁剪框
+        this.cropperPosition.width *= scale
+        this.cropperPosition.height *= scale
+        // // 移动图像
+        this.imageZoom({
+          left: this.cropperPosition.left,
+          top: this.cropperPosition.top
+        }, scale)
+        // 将裁剪框上下居中
+        const cropperTop = (this.containerRect.height - this.cropperPosition.height) / 2
+        // 需要上下移动的距离
+        const moveTop = cropperTop - this.cropperPosition.top
+        // 将裁剪框左右居中
+        const cropperLeft = (this.containerRect.width - this.cropperPosition.width) / 2
+        // 需要左右移动的距离
+        const moveLeft = (cropperLeft - this.cropperPosition.left)
+        this.cropperPosition.left = cropperLeft
+        this.cropperPosition.top = cropperTop
 
-				// 移动图像使之与裁剪框对齐
-				this.imgTranslateX += moveLeft
-				this.imgTranslateY += moveTop
-				this.checkImagePosition()
-				this.applyAnim()
-			},
-			// 发送change事件
-			reportChange() {
-				const imagePosition = this.getImagePosition()
-				const cropperPosition = this.getCropperPosition()
-				const scale = this.imageBoundingRect.width/this.imageInfo.width * this.imgScale
-				this.$emit('change', {
-					left: (cropperPosition.left - imagePosition.left) / scale,
-					top: (cropperPosition.top - imagePosition.top) / scale,
-					width: cropperPosition.width / scale,
-					height: cropperPosition.height / scale
-				})
-			},
-			imageZoom(center = {
-				left: 0,
-				top: 0
-			}, scale = 1) {
-				const imagePosition = this.getImagePosition()
-				this.imgScale = this.imgScale * scale
-				const offsetLeftPercent = (center.left - imagePosition.left) / imagePosition.width
-				this.imgTranslateX = this.imgTranslateX + imagePosition.width * (scale - 1) / 2 * (1 - offsetLeftPercent *
-					2)
-				const offsetTopPercent = (center.top - imagePosition.top) / imagePosition.height
-				this.imgTranslateY = this.imgTranslateY + imagePosition.height * (scale - 1) / 2 * (1 - offsetTopPercent *
-					2)
-			},
-			onImageMove(ev) {
-				if (ev.touches.length == 2 && startTouches.length == 2) {
-					const points = getTouchPoints(ev.touches)
-					const imgScale = initScale * calcPointDistance(...points) / startTouchsDistance
-					this.imageZoom({
-						left: this.cropperPosition.left + this.cropperPosition.width / 2,
-						top: this.cropperPosition.top + this.cropperPosition.height / 2
-					}, imgScale / this.imgScale)
-				} else if (ev.touches.length == 1 && startTouches.length == 1) {
-					const [startClientX, startClientY] = getTouchPoints(startTouches)[0]
-					const [clientX, clientY] = getTouchPoints(ev.touches)[0]
-					this.imgTranslateX = startOffsetX + clientX - startClientX
-					this.imgTranslateY = startOffsetY + clientY - startClientY
-				}
-			},
-			// 调整裁剪框大小
-			onHandleResize(pX, pY, ev) {
-				const [startClientX, startClientY] = getTouchPoints(startTouches)[0]
-				const [clientX, clientY] = getTouchPoints(ev.touches)[0]
-				const cropperBoundingRect = this.getCropperPosition()
-				const imageBoundingRect = this.getImagePosition()
-				const changeX = clientX - startClientX
-				const changeY = clientY - startClientY
-				const minSize = {
-					width: uni.upx2px(100),
-					height: uni.upx2px(100)
-				}
-				const imageRemainHeight = imageBoundingRect.bottom - cropperBoundingRect.top
-				const cropperRemainHeight = this.containerRect.bottom - cropperBoundingRect.top
-				const maxHeight = Math.min(imageRemainHeight, cropperRemainHeight)
-				const imageRemainWidth = imageBoundingRect.right - cropperBoundingRect.left
-				const cropperRemainWidth = this.containerRect.right - cropperBoundingRect.left
-				const maxWidth = Math.min(imageRemainWidth, cropperRemainWidth)
-				let width = 0
-				switch (pX) {
-					case 1:
-						width = startChangeWidth + changeX
-						if (width < maxWidth) {
-							if (width > minSize.width) {
-								this.cropperPosition.width = width
-							}
-						}
-						break;
-					case -1:
-						const left = startChangeLeft + changeX
-						const minLeft = Math.min(imageBoundingRect.left, cropperBoundingRect.left)
-						width = startChangeWidth - changeX
-						if (left > minLeft) {
-							if (width > minSize.width) {
-								this.cropperPosition.left = left
-								this.cropperPosition.width = width
-							}
-						}
-						break;
-					case 0:
-						if (this.ratio != 0)
-							this.cropperPosition.width = this.cropperPosition.height * this.ratio
-						break
-				}
-				switch (pY) {
-					case 1:
-						const height = startChangeHeight + changeY
-						if (height < maxHeight && height > minSize.height) {
-							this.cropperPosition.height = height
-						}
-						break;
-					case -1:
-						const top = startChangeTop + changeY
-						const minTop = Math.min(imageBoundingRect.top, cropperBoundingRect.top)
-						if (top > minTop) {
-							const height = startChangeHeight - changeY
-							if (height > minSize.height) {
-								this.cropperPosition.top = top
-								this.cropperPosition.height = height
-							}
-						}
-						break;
-					case 0:
-						if (this.ratio != 0)
-							this.cropperPosition.height = this.cropperPosition.width / this.ratio;
-						break;
-				}
-			},
-			// 开始裁剪
-			async crop(images = null) {
-				// 批量裁剪，暂时还没实现
-				// if (Array.isArray(images) && images.length) {
-				// 	for (item in images) {
-				// 	}
-				// 	return;
-				// }
-				if (!this.imageInfo) {
-					uni.showToast({
-						title: "图片尚未载入完成"
-					})
-					return [new Error("图片尚未载入完成"), null]
-				}
-				this.showCanvas = true
-				this.$emit('cropStart')
-				return new Promise(resolve => {
-					this.$nextTick(() => {
-						this.onCrop().then(res => {
-							resolve(res)
-						})
-					})
-				})
-			},
-			// 开始裁切
-			async onCrop() {
-				let canvas, image, ctx, err, res;
-				// 新版canvas
-				// #ifdef MP-WEIXIN
-				canvas = await new Promise((resolve) => {
-					uni
-						.createSelectorQuery().in(this)
-						.select(".bt-canvas")
-						.node((res) => {
-							resolve(res.node);
-						})
-						.exec();
-				});
-				log("在小程序模拟器上可能会裁剪失败，真机无此问题，放心使用", "warn")
-				image = canvas.createImage();
-				image.src = this.imageInfo.path;
-				await new Promise((resolve) => (image.onload = resolve));
-				canvas.width = this.dSize.width;
-				canvas.height = this.dSize.height;
-				ctx = canvas.getContext("2d");
-				// #endif
-				// #ifndef MP-WEIXIN
-				image = this.imageInfo.path
-				ctx = uni.createCanvasContext("bt-canvas", this)
-				// #endif
-				const imagePosition = this.getImagePosition()
-				const cropperPosition = this.getCropperPosition()
-				const scale = imagePosition.width / this.imageInfo.width
-				const offsetLeft = (cropperPosition.left - imagePosition.left) / scale
-				const offsetTop = (cropperPosition.top - imagePosition.top) / scale
-				const cropperWidth = cropperPosition.width / scale
-				const cropperHeight = cropperPosition.height / scale
-				// console.log('offsetLeft', offsetLeft, 'offsetTop', offsetTop, this.imageInfo)
-				ctx.drawImage(
-					image,
-					offsetLeft,
-					offsetTop,
-					cropperWidth,
-					cropperHeight,
-					0,
-					0,
-					this.dSize.width,
-					this.dSize.height
-				);
-				// #ifndef MP-WEIXIN
-				await new Promise((resolve) => ctx.draw(true, resolve));
-				// #endif
-				// 等待一段时间，不然ios会裁剪失败
-				await sleep(200);
-				// 在vue3里面，只能写成这种回调形式，否则报错
-				[err, res] = await new Promise(resolve => {
-					uni.canvasToTempFilePath({
-						// #ifdef MP-WEIXIN
-						canvas,
-						// #endif
-						// #ifndef MP-WEIXIN
-						canvasId: "bt-canvas",
-						// #endif
-						fileType: this.fileType,
-						destWidth: this.dSize.width,
-						destHeight: this.dSize.height,
-						quality: this.quality,
-						success(res) {
-							console.log("裁剪成功")
-							resolve([null, res])
-						},
-						fail(err) {
-							console.log("裁剪失败", err)
-							resolve([err, null])
-						},
-						complete: () => {
-							this.showCanvas = false
-						}
-					});
-				})
-				this.$emit('cropEnd', [err, res])
-				return [err, res]
-			},
-		},
-	};
+        // 移动图像使之与裁剪框对齐
+        this.imgTranslateX += moveLeft
+        this.imgTranslateY += moveTop
+        this.checkImagePosition()
+        this.applyAnim()
+      },
+      // 发送change事件
+      reportChange() {
+        const imagePosition = this.getImagePosition()
+        const cropperPosition = this.getCropperPosition()
+        const scale = this.imageBoundingRect.width / this.imageInfo.width * this.imgScale
+        this.$emit('change', {
+          left: (cropperPosition.left - imagePosition.left) / scale,
+          top: (cropperPosition.top - imagePosition.top) / scale,
+          width: cropperPosition.width / scale,
+          height: cropperPosition.height / scale
+        })
+      },
+      imageZoom(center = {
+        left: 0,
+        top: 0
+      }, scale = 1) {
+        const imagePosition = this.getImagePosition()
+        this.imgScale = this.imgScale * scale
+        const offsetLeftPercent = (center.left - imagePosition.left) / imagePosition.width
+        this.imgTranslateX = this.imgTranslateX + imagePosition.width * (scale - 1) / 2 * (1 - offsetLeftPercent *
+          2)
+        const offsetTopPercent = (center.top - imagePosition.top) / imagePosition.height
+        this.imgTranslateY = this.imgTranslateY + imagePosition.height * (scale - 1) / 2 * (1 - offsetTopPercent *
+          2)
+      },
+      onImageMove(ev) {
+        if (ev.touches.length == 2 && startTouches.length == 2) {
+          const points = getTouchPoints(ev.touches)
+          const imgScale = initScale * calcPointDistance(...points) / startTouchsDistance
+          this.imageZoom({
+            left: this.cropperPosition.left + this.cropperPosition.width / 2,
+            top: this.cropperPosition.top + this.cropperPosition.height / 2
+          }, imgScale / this.imgScale)
+        } else if (ev.touches.length == 1 && startTouches.length == 1) {
+          const [startClientX, startClientY] = getTouchPoints(startTouches)[0]
+          const [clientX, clientY] = getTouchPoints(ev.touches)[0]
+          this.imgTranslateX = startOffsetX + clientX - startClientX
+          this.imgTranslateY = startOffsetY + clientY - startClientY
+        }
+      },
+      // 调整裁剪框大小
+      onHandleResize(pX, pY, ev) {
+        const [startClientX, startClientY] = getTouchPoints(startTouches)[0]
+        const [clientX, clientY] = getTouchPoints(ev.touches)[0]
+        const cropperBoundingRect = this.getCropperPosition()
+        const imageBoundingRect = this.getImagePosition()
+        const changeX = clientX - startClientX
+        const changeY = clientY - startClientY
+        const minSize = {
+          width: uni.upx2px(100),
+          height: uni.upx2px(100)
+        }
+        const imageRemainHeight = imageBoundingRect.bottom - cropperBoundingRect.top
+        const cropperRemainHeight = this.containerRect.bottom - cropperBoundingRect.top
+        const maxHeight = Math.min(imageRemainHeight, cropperRemainHeight)
+        const imageRemainWidth = imageBoundingRect.right - cropperBoundingRect.left
+        const cropperRemainWidth = this.containerRect.right - cropperBoundingRect.left
+        const maxWidth = Math.min(imageRemainWidth, cropperRemainWidth)
+        let width = 0
+        switch (pX) {
+          case 1:
+            width = startChangeWidth + changeX
+            if (width < maxWidth) {
+              if (width > minSize.width) {
+                this.cropperPosition.width = width
+              }
+            }
+            break;
+          case -1:
+            const left = startChangeLeft + changeX
+            const minLeft = Math.min(imageBoundingRect.left, cropperBoundingRect.left)
+            width = startChangeWidth - changeX
+            if (left > minLeft) {
+              if (width > minSize.width) {
+                this.cropperPosition.left = left
+                this.cropperPosition.width = width
+              }
+            }
+            break;
+          case 0:
+            if (this.ratio != 0)
+              this.cropperPosition.width = this.cropperPosition.height * this.ratio
+            break
+        }
+        switch (pY) {
+          case 1:
+            const height = startChangeHeight + changeY
+            if (height < maxHeight && height > minSize.height) {
+              this.cropperPosition.height = height
+            }
+            break;
+          case -1:
+            const top = startChangeTop + changeY
+            const minTop = Math.min(imageBoundingRect.top, cropperBoundingRect.top)
+            if (top > minTop) {
+              const height = startChangeHeight - changeY
+              if (height > minSize.height) {
+                this.cropperPosition.top = top
+                this.cropperPosition.height = height
+              }
+            }
+            break;
+          case 0:
+            if (this.ratio != 0)
+              this.cropperPosition.height = this.cropperPosition.width / this.ratio;
+            break;
+        }
+      },
+      // 开始裁剪
+      async crop(images = null) {
+        // 批量裁剪，暂时还没实现
+        // if (Array.isArray(images) && images.length) {
+        // 	for (item in images) {
+        // 	}
+        // 	return;
+        // }
+        if (!this.imageInfo) {
+          uni.showToast({
+            title: "图片尚未载入完成"
+          })
+          return [new Error("图片尚未载入完成"), null]
+        }
+        this.showCanvas = true
+        this.$emit('cropStart')
+        return new Promise(resolve => {
+          this.$nextTick(() => {
+            this.onCrop().then(res => {
+              resolve(res)
+            })
+          })
+        })
+      },
+      // 开始裁切
+      async onCrop() {
+        let canvas, image, ctx, err, res;
+        // 新版canvas
+        // #ifdef MP-WEIXIN
+        canvas = await new Promise((resolve) => {
+          uni
+            .createSelectorQuery().in(this)
+            .select(".bt-canvas")
+            .node((res) => {
+              resolve(res.node);
+            })
+            .exec();
+        });
+        log("在小程序模拟器上可能会裁剪失败，真机无此问题，放心使用", "warn")
+        image = canvas.createImage();
+        image.src = this.imageInfo.path;
+        await new Promise((resolve) => (image.onload = resolve));
+        canvas.width = this.dSize.width;
+        canvas.height = this.dSize.height;
+        ctx = canvas.getContext("2d");
+        // #endif
+        // #ifndef MP-WEIXIN
+        image = this.imageInfo.path
+        ctx = uni.createCanvasContext("bt-canvas", this)
+        // #endif
+        const imagePosition = this.getImagePosition()
+        const cropperPosition = this.getCropperPosition()
+        const scale = imagePosition.width / this.imageInfo.width
+        const offsetLeft = (cropperPosition.left - imagePosition.left) / scale
+        const offsetTop = (cropperPosition.top - imagePosition.top) / scale
+        const cropperWidth = cropperPosition.width / scale
+        const cropperHeight = cropperPosition.height / scale
+        // console.log('offsetLeft', offsetLeft, 'offsetTop', offsetTop, this.imageInfo)
+        ctx.drawImage(
+          image,
+          offsetLeft,
+          offsetTop,
+          cropperWidth,
+          cropperHeight,
+          0,
+          0,
+          this.dSize.width,
+          this.dSize.height
+        );
+        // #ifndef MP-WEIXIN
+        await new Promise((resolve) => ctx.draw(true, resolve));
+        // #endif
+        // 等待一段时间，不然ios会裁剪失败
+        await sleep(200);
+        // 在vue3里面，只能写成这种回调形式，否则报错
+        [err, res] = await new Promise(resolve => {
+          uni.canvasToTempFilePath({
+            // #ifdef MP-WEIXIN
+            canvas,
+            // #endif
+            // #ifndef MP-WEIXIN
+            canvasId: "bt-canvas",
+            // #endif
+            fileType: this.fileType,
+            destWidth: this.dSize.width,
+            destHeight: this.dSize.height,
+            quality: this.quality,
+            success(res) {
+              console.log("裁剪成功")
+              resolve([null, res])
+            },
+            fail(err) {
+              console.log("裁剪失败", err)
+              resolve([err, null])
+            },
+            complete: () => {
+              this.showCanvas = false
+            }
+          });
+        })
+        this.$emit('cropEnd', [err, res])
+        return [err, res]
+      },
+    },
+  };
 </script>
 
 <style lang="scss" scoped>
-	@import "./iconfont.css";
-	.bt-container {
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		height: 100%;
-		box-sizing: border-box;
-		background-color: #0e1319;
-		padding-top: 30rpx;
-		position: relative;
-		overflow: hidden;
-		.iconfont {
-			position: absolute;
-			z-index: 999;
-			top: 40rpx;
-			font-size: 30rpx;
-			padding: 10rpx;
-			background-color: rgba(255, 255, 255, 0.2);
-			border-radius: 50%;
-			color: #FFFFFF;
-			&.active {
-				color: #007AFF;
-			}
-		}
-		.icon-move {
-			right: 100rpx;
-		}
-		.icon-reset {
-			right: 40rpx;
-		}
-		.bt-canvas {
-			position: absolute;
-			left: 100%;
-			top: 0;
-			width: 300px;
-			height: 300px;
-		}
-		.mainContent {
-			flex: 1;
-			margin: 60rpx 60rpx 150rpx;
-			position: relative;
-			.image {
-				position: absolute;
-				will-change: transform;
-				transform-origin: center center;
-			}
-			.controller {
-				position: absolute;
-				z-index: 99;
-				padding: 20rpx;
-				&::after {
-					display: block;
-					content: '';
-					box-shadow: 0 0 10rpx #333;
-					background-color: #E4E7ED;
-				}
-				&.controller_dot {
-					&::after {
-						width: 40rpx;
-						height: 40rpx;
-						border-radius: 99px;
-					}
-				}
-				&.vertical {
-					&::after {
-						width: 10rpx;
-						height: 40rpx;
-					}
-				}
-				&.horizon {
-					&::after {
-						width: 40rpx;
-						height: 10rpx;
-					}
-				}
-			}
-			.cropper {
-				position: absolute;
-				border: 1px solid #eee;
-				box-sizing: content-box;
-				transform-origin: center center;
-				outline: 999px solid rgba(0, 0, 0, 0.5);
-				will-change: transform;
-				display: contain;
-				pointer-events: none;
-				.line {
-					position: absolute;
-					// background-color: #eee;
-				}
-				.row {
-					width: 100%;
-					height: 0px;
-					left: 0;
-					border-top: 1px dashed #007AFF;
-				}
-				.col {
-					height: 100%;
-					width: 0px;
-					border-left: 1px dashed #007AFF;
-				}
-				.row1 {
-					top: 33%;
-				}
-				.row2 {
-					top: 66%;
-				}
-				.col1 {
-					left: 33%;
-				}
-				.col2 {
-					left: 66%;
-				}
-			}
-		}
-		.slot {
-			position: fixed;
-			width: 100%;
-			left: 0;
-			bottom: 0;
-			height: 90rpx;
-			height: calc(90rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-			height: calc(90rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-		}
-	}
-</style>
+  @import "./iconfont.css";
+
+  .bt-container {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 100%;
+    box-sizing: border-box;
+    background-color: #0e1319;
+    padding-top: 30rpx;
+    position: relative;
+    overflow: hidden;
+
+    .iconfont {
+      position: absolute;
+      z-index: 999;
+      top: 40rpx;
+      font-size: 30rpx;
+      padding: 10rpx;
+      background-color: rgba(255, 255, 255, 0.2);
+      border-radius: 50%;
+      color: #FFFFFF;
+
+      &.active {
+        color: #007AFF;
+      }
+    }
+
+    .icon-move {
+      right: 100rpx;
+    }
+
+    .icon-reset {
+      right: 40rpx;
+    }
+
+    .bt-canvas {
+      position: absolute;
+      left: 100%;
+      top: 0;
+      width: 300px;
+      height: 300px;
+    }
+
+    .mainContent {
+      flex: 1;
+      margin: 60rpx 60rpx 150rpx;
+      position: relative;
+
+      .image {
+        position: absolute;
+        will-change: transform;
+        transform-origin: center center;
+      }
+
+      .controller {
+        position: absolute;
+        z-index: 99;
+        padding: 20rpx;
+
+        &::after {
+          display: block;
+          content: '';
+          box-shadow: 0 0 10rpx #333;
+          background-color: #E4E7ED;
+        }
+
+        &.controller_dot {
+          &::after {
+            width: 40rpx;
+            height: 40rpx;
+            border-radius: 99px;
+          }
+        }
+
+        &.vertical {
+          &::after {
+            width: 10rpx;
+            height: 40rpx;
+          }
+        }
+
+        &.horizon {
+          &::after {
+            width: 40rpx;
+            height: 10rpx;
+          }
+        }
+      }
+
+      .cropper {
+        position: absolute;
+        border: 1px solid #eee;
+        box-sizing: content-box;
+        transform-origin: center center;
+        outline: 999px solid rgba(0, 0, 0, 0.5);
+        will-change: transform;
+        display: contain;
+        pointer-events: none;
+
+        .line {
+          position: absolute;
+          // background-color: #eee;
+        }
+
+        .row {
+          width: 100%;
+          height: 0px;
+          left: 0;
+          border-top: 1px dashed #007AFF;
+        }
+
+        .col {
+          height: 100%;
+          width: 0px;
+          border-left: 1px dashed #007AFF;
+        }
+
+        .row1 {
+          top: 33%;
+        }
+
+        .row2 {
+          top: 66%;
+        }
+
+        .col1 {
+          left: 33%;
+        }
+
+        .col2 {
+          left: 66%;
+        }
+      }
+    }
+
+    .slot {
+      position: fixed;
+      width: 100%;
+      left: 0;
+      bottom: 131.58rpx;
+      height: 90rpx;
+      height: calc(90rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+      height: calc(90rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+    }
+  }
+</style>
\ No newline at end of file