diff --git a/common/platform/MiniProgramPlatform.js b/common/platform/MiniProgramPlatform.js
index e1321d1..32ba174 100644
--- a/common/platform/MiniProgramPlatform.js
+++ b/common/platform/MiniProgramPlatform.js
@@ -131,6 +131,7 @@ class MiniProgramPlatform extends BasePlatform {
 	 */
 	chooseAddress() {
 		return new Promise((resolve, reject) => {
+			//#ifdef MP-WEIXIN
 			uni.chooseAddress({
 				success: res => {
 					res.detailed_address = res.provinceName + res.cityName + res.countyName +
@@ -141,6 +142,7 @@ class MiniProgramPlatform extends BasePlatform {
 					reject(err)
 				}
 			});
+			//#endif
 		});
 	}
 	downloadFile(url) {
diff --git a/pages.json b/pages.json
index 789b223..f861430 100644
--- a/pages.json
+++ b/pages.json
@@ -180,22 +180,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/user/myCa",
-			"style": {
-				"navigationBarTitleText": "我的卡册",
-				"navigationBarBackgroundColor": "#222222",
-				"navigationBarTextStyle": "black"
-			}
-		},
-		{
-			"path": "pages/user/myCaDetail",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarBackgroundColor": "#222222",
-				"navigationBarTextStyle": "black"
-			}
-		},
 
 		{
 			"path": "pages/sangdai/sangdai",
@@ -419,12 +403,6 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
-		},
-		{
-			"path" : "pages/other/web-detail-lucky-1",
-			"style": {
-				"navigationStyle": "custom"
-			}
 		}
 	],
 	"subPackages": [{
diff --git a/pages/other/web-detail-lucky-1.nvue b/pages/other/web-detail-lucky-1.nvue
deleted file mode 100644
index be1de9d..0000000
--- a/pages/other/web-detail-lucky-1.nvue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-	<view class="content" :style="webviewStyles">
-		<web ref="webview" class="webview" :src="webUrl" @message="onMessage"></web>
-	</view>
-
-</template>
-
-<script>
-	import PageContainer from '@/components/page-container/page-container.vue'
-
-
-	export default {
-		components: {
-			PageContainer
-		},
-		data() {
-			const sysinfo = uni.getSystemInfoSync();
-			return {
-				hideviewStyles: {
-					height: "0px",
-					width: "0px",
-				},
-				webviewStyles: {
-					height: sysinfo.windowHeight + "px",
-					width: sysinfo.windowWidth + "px",
-				},
-				isWebView: false,
-
-				status: "init",
-				prize: [],
-				// webUrl: 'https://zfunbox.cn/m/chou-box-luck.html',
-				webUrl: "http://192.168.1.26:5502/%E5%85%AC%E5%8F%B8/%E5%B7%A5%E4%BD%9C/%E5%8F%8B%E8%BE%BE/%E8%90%BD%E5%9C%B0%E9%A1%B5/chou-box-luck.html",
-			};
-
-		},
-		onLoad(option) {
-			uni.showToast({
-				title: "初始化"
-			})
-			this.load(option);
-			// this.$c.msg('aaa')
-			uni.showToast({
-				title: "初始化"
-			})
-		},
-		methods: {
-			async load(option) {
-				console.log(option);
-				uni.showToast({
-					title: "初始化"
-				})
-				if (option.key != null) {
-					this.prize = uni.getStorageSync("prizes-lucky");
-					console.log(this.prize);
-					this.sendMessageToWeb("prizes-lucky", this.prize)
-				}
-			},
-			onMessage(e) {
-				console.log('收到WebView消息:', e)
-				// this.sendMessageToWeb();
-			},
-			sendMessageToWeb(action, data) {
-				// 获取 webview 引用
-				const webview = this.$refs.webview;
-				console.log(webview);
-				// 向网页发送消息
-				webview.postMessage({
-					action: action,
-					data: data,
-					timestamp: Date.now()
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.content {
-
-		background-color: #fff;
-	}
-
-	.webview {
-		flex: 1;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/shop/detail.vue b/pages/shop/detail.vue
deleted file mode 100644
index f73600b..0000000
--- a/pages/shop/detail.vue
+++ /dev/null
@@ -1,744 +0,0 @@
-<template>
-	<view class="content">
-		<view class="swiper-box">
-			<swiper :indicator-dots="true" :autoplay="false" style="width: 750rpx;height: 750rpx;">
-				<swiper-item v-for="(item, index) in goodsDetail.detail_image" :data-src="item" :key="index">
-					<view class="swiper-item">
-						<image class="goods_img" :src="item"></image>
-					</view>
-				</swiper-item>
-			</swiper>
-		</view>
-		<view class="goods_v">
-			<view class="goods_v_left">
-				<view>￥ <text>{{ goodsDetail.seckill_price }}</text> </view>
-				<view>已售 {{ goodsDetail.sale_num }}</view>
-			</view>
-			<view class="hang2"> {{ goodsDetail.title }} </view>
-		</view>
-		<view class="xuanzhe" @click="$refs.mengban_show.open()">
-			<view>选择</view>
-			<view class="xuanzhe_con">
-				<view>已选：{{ pop_news.name }}</view>
-				<image src="/static/mine/yaoqing/point_right.png" mode="widthFix" style="width: 24rpx;"></image>
-			</view>
-		</view>
-
-		<view class="shop_detail">
-			<image src="/static/shop/detail_head.png" class="xiangqing_head"></image>
-			<view class="zhuyi" v-html="goodsDetail.content"></view>
-		</view>
-		<view class="bar_box">
-			<view class="btn_boxs" @click="$refs.mengban_show.open()">立即购买</view>
-		</view>
-
-
-		<uni-popup ref="mengban_show" type="bottom">
-			<view class="addcar">
-				<view class="order_title">
-					<view>选择规格</view>
-					<view class="ca" @click="$refs.mengban_show.close()">×</view>
-				</view>
-				<scroll-view scroll-y="true" class="guige">
-					<view class="addcar_head">
-						<image :src="pop_news.pic"></image>
-						<view class="addcar_head_r">
-							<view>单价：￥ <text style="font-size: 40rpx;">{{ pop_news.seckill_price }}</text> </view>
-							<view>规格：{{ pop_news.name }}</view>
-							<view style="font-size: 24rpx;">库存：{{ pop_news.stock }}</view>
-						</view>
-					</view>
-					<view class="size">
-						<view class="size_z" v-for="(a, b) in goodsDetail.spec_data" :key='b'>
-							<view class="g_title">{{ a.title }}</view>
-							<view>
-								<view :class="v.dis ? 'sel_color' : ''" @click.stop="color_sel(b, i)"
-									v-for="(v, i) in a.items" :key="i">{{ v.title }} </view>
-							</view>
-						</view>
-					</view>
-
-					<view class="duihuan">
-						<view class="g_title">购买数量：</view>
-						<uni-number-box :min="1" :max="pop_news.stock" v-model="num" background="#FAF8F5" color="#fff">
-						</uni-number-box>
-					</view>
-				</scroll-view>
-				<view class="btn_boxs" @click="getOrder()">确定</view>
-			</view>
-
-		</uni-popup>
-
-		<!-- 确认订单 -->
-		<uni-popup ref="order_show" type="bottom">
-			<view class="order animated fadeInUp">
-				<view class="order_title">
-					<view>确认订单</view>
-					<view class="ca" @click="$refs.order_show.close()">×</view>
-				</view>
-				<view class="addcar_head">
-					<image :src="pop_news.pic"></image>
-					<view class="addcar_head_r">
-						<view>{{ pop_news.goods_name }}</view>
-						<view>规格：{{ pop_news.name }}</view>
-						<view class="price_order">
-							<text>￥ <text style="font-size: 36rpx;">{{ pop_news.price }}</text> </text>
-							<text>×{{ num }}</text>
-						</view>
-					</view>
-				</view>
-
-				<view class="order_title_con2">
-					<view style="font-size: 28rpx">付款方式</view>
-					<view class="fangshi" @click="change_yuan_index(1)">
-						<view class="flex_center">
-							<image src="/static/shop/bi.png" class="fangshi_img"></image>
-							<view>
-								使用星钻抵扣￥ {{ pay_news.use_integral }}（剩余：{{ pay_news.integral }}）
-							</view>
-						</view>
-						<view class="p_t_r">
-							<image src="/static/shop/yuan_sel.png" v-if="bi"></image>
-							<image src="/static/shop/yuan.png" v-else></image>
-						</view>
-
-					</view>
-					<view class="fangshi" @click="change_yuan_index(2)">
-						<view class="flex_center">
-							<image src="/static/shop/yue.png" class="fangshi_img"></image>
-							<view>
-								使用星钻抵扣￥ {{ pay_news.use_money }}（剩余：{{ pay_news.money }}）
-							</view>
-						</view>
-						<view class="p_t_r">
-							<image src="/static/shop/yuan_sel.png" v-if="yue"></image>
-							<image src="/static/shop/yuan.png" v-else></image>
-						</view>
-					</view>
-				</view>
-				<view class="kuaidi">
-					<view @click="showMulLinkageThreePicker">
-						<view style="width: 630rpx">
-							{{ selectCity }}
-						</view>
-						<image src="/static/mine/yaoqing/point_right.png"></image>
-					</view>
-					<view v-if="pop_news.freight > 0">
-						提示：需支付{{ pop_news.freight }}元运费
-					</view>
-					<textarea maxlength="50" placeholder="请输入留言内容" v-model="message" />
-				</view>
-				<view @click="gotoPage('/pages/guize/guize?type=4')" class="xieyi">下单购买即表示同意 《用户服务协议条款》 </view>
-				<view class="btn_boxs" @click="pay()">确认支付</view>
-			</view>
-
-		</uni-popup>
-
-
-	</view>
-</template>
-
-<script>
-import xwCountDown from '@/components/xw-CountDown'
-export default {
-	components: {
-		xwCountDown
-	},
-	data() {
-		return {
-			num: 1,
-			goodsDetail: {},
-			// 是否收藏
-			is_collect: 2,
-			// 商品id
-			goods_id: '',
-			sku: '',
-			// 弹窗信息
-			pop_news: {},
-			// 支付信息
-			pay_news: {},
-			// 1:是否币支付,
-			bi: true,
-			// 2:星钻支付
-			yue: false,
-
-			cityPickerValueDefault: [0, 0, 0],
-			selectCity: '选择收货地址',
-			name: '',
-			mobile: '',
-			message: ''
-
-		}
-	},
-	onLoad(v) {
-		let that = this;
-		that.goods_id = v.goods_id;
-		that.getData()
-	},
-	onShareAppMessage() {
-		let imageUrl = this.$config.getShareImageUrl();
-		return {
-			imageUrl: imageUrl,
-			title: "友达赏，正版潮玩手办一番赏",
-
-			path: '/pages/shouye/index?pid=' + uni.getStorageSync('pid')
-		}
-	},
-	methods: {
-		pay() {
-			let that = this
-			that.req({
-				url: 'shop_order_buy',
-				data: {
-					goods_id: that.goods_id,
-					ks: that.sku,
-					num: that.num,
-					is_money: that.yue ? 1 : 2,
-					is_integral: that.bi ? 1 : 2,
-					name: that.name,
-					mobile: that.mobile,
-					address: that.address,
-					message: that.message
-				},
-				success(res) {
-					console.log(res)
-					if (res.status == 1) {
-						if (res.data.is_weixin == 1) {
-							uni.requestPayment({
-								provider: 'wxpay',
-								timeStamp: res.data.timeStamp,
-								nonceStr: res.data.nonceStr,
-								package: res.data.package,
-								signType: 'MD5',
-								paySign: res.data.paySign,
-								success(res) {
-									console.log(res)
-								},
-								complete(res) {
-									if (res.errMsg == 'requestPayment:fail cancel') {
-										uni.showToast({
-											title: '取消支付',
-											icon: 'loading',
-											duration: 1000
-										})
-									}
-									if (res.errMsg == 'requestPayment:ok') {
-										uni.showToast({
-											title: '支付成功',
-											icon: 'success',
-											duration: 1000
-										})
-										setTimeout(() => {
-											that.$refs.order_show.close()
-											//去订单
-											that.$customRouter.navigateTo('/pages/miaosha/shop_order', {}, 'redirectTo');
-										}, 1500)
-									}
-								}
-							})
-						} else {
-							uni.showToast({
-								title: '支付成功',
-								icon: 'success',
-								duration: 1000
-							})
-							setTimeout(() => {
-								that.$refs.order_show.close()
-								//去订单
-								that.$customRouter.navigateTo('/pages/miaosha/shop_order', {}, 'redirectTo');
-							}, 1500)
-						}
-					} else {
-						uni.showToast({
-							title: res.data.msg,
-							icon: 'none'
-						})
-					}
-				}
-			})
-		},
-
-		/*三级联动选择*/
-		showMulLinkageThreePicker() {
-			let that = this
-			this.canInit = false
-			uni.chooseAddress({
-				success(res) {
-					that.selectCity = res.userName + '-' + res.provinceName + '-' + res.cityName + '-' + res
-						.countyName + '-' + res.detailInfo + '-' + res.telNumber
-					that.name = res.userName
-					that.mobile = res.telNumber
-					that.address = res.provinceName + '-' + res.cityName + '-' + res.countyName + '-' + res
-						.detailInfo
-				},
-				complete() {
-					// console.log('结束了')
-					setTimeout(() => {
-						that.canInit = true
-					}, 500)
-				}
-			})
-
-			// this.$refs.mpvueCityPicker.show();
-		},
-
-		getOrder() {
-			this.$refs.mengban_show.close()
-			this.$refs.order_show.open()
-			this.change_yuan_index()
-		},
-		change_yuan_index(e) {
-			if (e == 1) {
-				this.bi = !this.bi
-			}
-			if (e == 2) {
-				this.yue = !this.yue
-			}
-			let that = this;
-			that.req({
-				url: 'shop_goods_browse',
-				data: {
-					goods_id: that.goods_id,
-					ks: that.sku,
-					num: that.num,
-					is_integral: that.bi ? 1 : 2,
-					is_money: that.yue ? 1 : 2
-				},
-				success(res) {
-					that.pay_news = res.data
-					that.pop_news = that.pay_news.goods
-				}
-			})
-		},
-		getData() {
-			let that = this;
-			that.req({
-				url: 'shop_goods_detail',
-				data: {
-					goods_id: that.goods_id,
-				},
-				success(res) {
-					if (res.status == 1) {
-						that.goodsDetail = res.data
-						let Things = that.goodsDetail.spec_data;
-						for (let i = 0; i < Things.length; i++) {
-							for (let j = 0; j < Things[i].length; j++) {
-								that.$set(Things[i].items[j], 'dis', false)
-							}
-							that.$set(Things[i].items[0], 'dis', true)
-						}
-						that.product_norms()
-
-					}
-				}
-			})
-		},
-
-		color_sel(a, b) {
-			let that = this;
-			let Things = that.goodsDetail.spec_data;
-			for (let j = 0; j < Things[a].items.length; j++) {
-				that.$set(Things[a].items[j], 'dis', false)
-				that.$set(Things[a].items[b], 'dis', true)
-			}
-			that.product_norms()
-		},
-		product_norms() {
-			let that = this;
-			that.sku = []
-			let Things = that.goodsDetail.spec_data;
-			for (let m = 0; m < Things.length; m++) {
-				for (let n = 0; n < Things[m].items.length; n++) {
-					if (Things[m].items[n].dis) {
-						that.sku += Things[m].items[n].k + ','
-					}
-				}
-			}
-			this.sku = this.sku.substr(0, this.sku.length - 1)
-			that.req({
-				url: 'shop_goods_detail_spec',
-				data: {
-					goods_id: that.goods_id,
-					ks: that.sku ? that.sku : '默认'
-				},
-				Loading: true,
-				success(res) {
-					if (res.status == 1) {
-						if (res.data.type == 1) {
-							that.pop_news = res.data.spec_info
-						}
-					}
-				}
-			})
-
-		}
-
-	}
-}
-</script>
-
-<style>
-textarea {
-	width: 630rpx;
-	height: 120rpx;
-	background: #333333;
-	border-radius: 10rpx;
-	margin-top: 20rpx;
-	padding: 10rpx 20rpx;
-	box-sizing: border-box;
-	font-size: 24rpx;
-	color: #999999;
-}
-
-.kuaidi>view:nth-of-type(2) {
-	font-size: 24rpx;
-	color: #999999;
-}
-
-.kuaidi>view:nth-of-type(1) {
-	border-bottom: 1rpx solid #E5E5E5;
-	padding: 20rpx 0;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	font-size: 28rpx;
-	font-weight: 500;
-}
-
-.kuaidi>view {
-	margin-top: 20rpx;
-}
-
-.kuaidi image {
-	width: 32rpx;
-	height: 32rpx;
-}
-
-.kuaidi {
-	padding: 0 30rpx 30rpx 30rpx;
-	width: 690rpx;
-	box-shadow: 0px 0rpx 10rpx 0px #1FF7F0;
-	border-radius: 20rpx;
-	margin: 24rpx auto 0;
-	box-sizing: border-box;
-}
-
-.p_t_r>image {
-	display: block;
-	width: 100%;
-	height: 100%;
-}
-
-.p_t_r {
-	width: 40rpx;
-	height: 40rpx;
-	background: #FFFFFF;
-	border: 4rpx solid #CCCCCC;
-	border-radius: 50%;
-	box-sizing: border-box;
-}
-
-.fangshi_img {
-	width: 40rpx;
-	height: 40rpx;
-	margin-right: 20rpx;
-}
-
-.fangshi {
-	display: flex;
-	justify-content: space-between;
-	font-size: 28rpx;
-	line-height: 76rpx;
-	align-items: center;
-}
-
-
-.xieyi {
-	font-size: 24rpx;
-	font-weight: bold;
-	color: #FFFFFF;
-	margin: 20rpx;
-}
-
-.price_order {
-	display: flex;
-	justify-content: space-between;
-	align-items: baseline;
-	width: 386rpx;
-	font-weight: bold;
-	color: #1FF7F0;
-	font-size: 24rpx;
-}
-
-.order_title_con2 {
-	box-shadow: 0px 0rpx 10rpx 0px #1FF7F0;
-	border-radius: 24rpx;
-	width: 690rpx;
-	padding: 20rpx 30rpx;
-	box-sizing: border-box;
-	font-weight: 500;
-	border-radius: 24rpx;
-	margin-top: 40rpx;
-}
-
-.ca {
-	position: absolute;
-	top: 0rpx;
-	right: 0;
-	font-size: 60rpx;
-	color: #FFFFFF;
-}
-
-.order_title {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	font-size: 32rpx;
-	font-weight: 500;
-	position: relative;
-	padding: 20rpx 0;
-	box-sizing: border-box;
-}
-
-.order {
-	width: 750rpx;
-	background: #0D0D0D;
-	box-shadow: 0rpx -2rpx 0rpx 0rpx #FFFFFF, 0rpx -2rpx 7rpx 0rpx #1FF7F0;
-	border-radius: 20rpx 20rpx 0rpx 0rpx;
-	position: absolute;
-	bottom: 0;
-	padding: 10rpx 30rpx 50rpx;
-	box-sizing: border-box;
-	color: #ffffff;
-}
-
-
-.confirm_pop {
-	width: 330rpx;
-	height: 88rpx;
-	border-radius: 44rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	font-size: 32rpx;
-}
-
-.guige {
-	border-radius: 24rpx;
-	margin: 20rpx auto;
-	max-height: 1000rpx;
-}
-
-.size {
-	/* background: #FFFFFF; */
-	margin-top: 40rpx;
-	padding: 1rpx 20rpx 40rpx;
-	box-sizing: border-box;
-	border-radius: 24rpx;
-	color: #FFFFFF;
-}
-
-.size_z {
-	margin-top: 40rpx;
-	font-size: 28rpx;
-	color: #FFFFFF;
-}
-
-.g_title {
-	font-size: 28rpx;
-	font-family: Source Han Sans SC;
-	font-weight: 600;
-	color: #FFFFFF;
-}
-
-.size_z>view:nth-of-type(2) {
-	display: flex;
-	flex-wrap: wrap;
-	margin-top: 10rpx;
-}
-
-.size_z>view:nth-of-type(2)>view {
-	border: 1px solid #1FF7F0;
-	box-sizing: border-box;
-	text-align: center;
-	line-height: 60rpx;
-	margin-right: 36rpx;
-	padding: 0 40rpx;
-	margin-top: 20rpx;
-	border-radius: 10rpx;
-	color: #1FF7F0;
-	font-size: 28rpx;
-}
-
-.sel_color {
-	color: #0D0D0D !important;
-	background: linear-gradient(90deg, #F4F4F4 15%, #62FFFE 100%) !important;
-}
-
-.duihuan {
-	display: flex;
-	justify-content: space-between;
-	padding: 20rpx;
-	font-size: 28rpx;
-	margin-top: 30rpx;
-	/* background: #FFFFFF; */
-	box-sizing: border-box;
-	border-radius: 24rpx;
-}
-
-.addcar {
-	width: 100%;
-	position: absolute;
-	bottom: 0;
-	box-sizing: border-box;
-	padding: 10rpx 30rpx 50rpx;
-	color: #FFFFFF;
-	background: #0D0D0D;
-	box-shadow: 0rpx -2rpx 0rpx 0rpx #FFFFFF, 0rpx -2rpx 7rpx 0rpx #1FF7F0;
-	border-radius: 20rpx 20rpx 0rpx 0rpx;
-}
-
-.addcar_head {
-	display: flex;
-}
-
-.addcar_head>image {
-	width: 220rpx;
-	height: 220rpx;
-	border-radius: 24rpx;
-}
-
-
-.addcar_head_r {
-	margin-left: 29rpx;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-around;
-	font-size: 28rpx;
-}
-
-
-.xiangqing_head {
-	width: 750rpx;
-	height: 66rpx;
-	display: block;
-	margin-bottom: 30rpx;
-}
-
-.shop_detail {
-	width: 100%;
-	/* background: #FFFFFF; */
-	padding: 18rpx;
-	box-sizing: border-box;
-	color: #120A06;
-	font-size: 28rpx;
-}
-
-
-
-::v-deep.shop_detail image {
-	width: 100%;
-}
-
-.content {
-	padding-bottom: 120rpx;
-	box-sizing: border-box;
-	background: #000000;
-	width: 100vw;
-	min-height: 100vh;
-}
-
-.goods_img {
-	width: 100%;
-	height: 760rpx;
-}
-
-.swiper-box {
-	width: 100%;
-	height: 750rpx;
-	position: relative;
-}
-
-.goods_v_left text {
-	font-size: 40rpx;
-}
-
-.goods_v_left>view:nth-of-type(1) {
-	font-weight: bold;
-	color: #1FF7F0;
-	font-size: 24rpx;
-}
-
-.goods_v_left {
-	display: flex;
-	justify-content: space-between;
-	margin: 14rpx auto;
-}
-
-.goods_v {
-	width: 690rpx;
-	height: 158rpx;
-	border-radius: 10rpx;
-	margin: 44rpx auto;
-	box-sizing: border-box;
-	padding: 0 30rpx;
-	font-size: 28rpx;
-	color: #ffffff;
-	background: #090909;
-	border: 1px solid #FFFFFF;
-	box-shadow: 0rpx 0 5rpx 3rpx #1FF7F0;
-}
-
-
-
-.xuanzhe {
-	width: 690rpx;
-	height: 91rpx;
-	background: #090909;
-	border: 1px solid #FFFFFF;
-	box-shadow: 0rpx 0 5rpx 3rpx #1FF7F0;
-	border-radius: 10rpx;
-	margin: 20rpx auto;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: 0 30rpx;
-	box-sizing: border-box;
-	font-size: 28rpx;
-	color: #FFFFFF;
-}
-
-.xuanzhe_con {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	font-size: 28rpx;
-	font-weight: 400;
-	color: #FFFFFF;
-	width: 560rpx;
-}
-
-.bar_box {
-	box-sizing: border-box;
-	width: 100%;
-	height: 120rpx;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	position: fixed;
-	bottom: 30rpx;
-	background: #000000;
-}
-
-.btn_boxs {
-	width: 692rpx;
-	height: 88rpx;
-	color: #FFFFFF;
-	font-size: 36rpx;
-	font-family: 'YouSheBiaoTiHei';
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	background: url('/static/shop/btn_bg.png') no-repeat 0 0 / 100% 100%;
-}
-</style>
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
deleted file mode 100644
index f5a32d6..0000000
--- a/pages/shop/index.vue
+++ /dev/null
@@ -1,346 +0,0 @@
-<template>
-	<view class="content">
-
-		<view class="fixed">
-			<view class="status_bar" :style="'height:'+ statusBarHeight +'px;'"></view>
-			<view class="header_title">
-				<view class="title_ipt">
-					<image src="/static/shop/search.png"></image>
-					<input type="text" placeholder="在此搜索商品" placeholder-style="color:rgba(255,255,255,0.6)"
-						confirm-type="search" v-model="keyword" @confirm="show=0,loadData(1)" />
-
-				</view>
-			</view>
-		</view>
-
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
-
-			<view class="home_class">
-				<v-tabs v-model="show" :tabs="cate1" field="title" @change="changeTab">
-				</v-tabs>
-			</view>
-
-			<view class="lunbo">
-				<swiper class="lb_swiper">
-					<swiper-item v-for="(a,index) in bannerdata" :key="index">
-						<view class="swiper-item">
-							<image :src="a.imgurl"></image>
-						</view>
-					</swiper-item>
-				</swiper>
-			</view>
-
-			<swiper :indicator-dots="false" :autoplay="false" style="min-height: 80rpx;">
-				<swiper-item v-for="(v,i) in cate2" :key='i' style="min-height: 80rpx !important;">
-					<view class="class_box">
-						<view v-for="(a,b) in v" :key='b' @click="gotoPage('/pages/shop/list?id='+a.id)">
-							<image :src="a.imgurl"></image>
-							<view class="hang1">{{a.title}}</view>
-						</view>
-					</view>
-				</swiper-item>
-			</swiper>
-
-
-			<view class="new_goods_list">
-				<view class="flex_center">
-					<image src="/static/shop/gift.png"></image>鉴正品 速发货
-				</view>
-				<view>好物集市丨精选搭配丨极速发货</view>
-			</view>
-
-			<view class="goods_ls_zc">
-				<view class="goods_ls_bx_it" v-for="(a,b) in tui_data" :key="b"
-					@click="gotoPage('/pages/shop/detail?goods_id='+a.id)">
-					<image :src="a.image"></image>
-					<view class="hang2">{{a.title}}</view>
-					<view class="zuanshi"> ￥{{a.price}} </view>
-				</view>
-			</view>
-
-		</mescroll-body>
-		<tab-bar :index="2"></tab-bar>
-	</view>
-
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-				keyword: '',
-
-				show: 0,
-				cate1: [],
-				cate2: [],
-				bannerdata: [],
-
-				tui_data: [],
-				classindex: '',
-				downOption: {
-					auto: false
-				},
-			}
-		},
-		onShow() {
-			// this.getCate()
-		},
-		methods: {
-			changeTab(index) {
-				console.log('当前选中的项：' + index)
-				this.show = index
-				this.tui_data = []
-				// this.getCate()
-				this.mescroll.resetUpScroll()
-			},
-			getCate() {
-				let that = this;
-
-			},
-			openUrl(e) {
-				if (e.target == 1) {
-					this.$customRouter.navigateTo('../shouye/detail', { id: e.goods_id });
-				}
-				if (e.target == 2) {
-					this.$customRouter.navigateTo('detail', { goods_id: e.product_id });
-				}
-				if (e.target == 3) {
-					this.$customRouter.navigateTo('../web-view', { url: e.url });
-				}
-			},
-
-
-			downCallback() {
-				this.mescroll.resetUpScroll()
-			},
-			upCallback(page) {
-				this.loadData(page.num);
-			},
-			loadData(pageNo) {
-				// 模拟接口
-				let that = this;
-				that.req({
-					url: 'shop_seckill_index',
-					data: {
-						cate_id1: that.cate1 && that.cate1.length > 0 ? that.cate1[that.show].id : that.show,
-					},
-					Loading: true,
-					success(res) {
-						that.cate1 = res.data.cate1;
-						that.cate2 = res.data.cate2;
-						that.bannerdata = res.data.advert;
-					}
-				})
-				that.req({
-					url: 'shop_seckill_product',
-					Loading: true,
-					data: {
-						page: pageNo,
-						cate_id1: that.cate1 && that.cate1.length > 0 ? that.cate1[that.show].id : that.show,
-						title: that.keyword,
-					},
-					success(res) {
-						that.mescroll.endByPage(res.data.data.length, res.data.last_page);
-						if (pageNo == 1) {
-							that.tui_data = res.data.data;
-						} else {
-							that.tui_data = that.tui_data.concat(res.data.data);
-						}
-					}
-				})
-			},
-
-		}
-	}
-</script>
-
-<style>
-	.new_goods_list>view:nth-of-type(2) {
-		font-size: 20rpx;
-	}
-
-	.new_goods_list image {
-		width: 40rpx;
-		height: 40rpx;
-		margin-right: 10rpx;
-	}
-
-	.new_goods_list {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		box-sizing: border-box;
-		margin: 30rpx auto;
-		width: 690rpx;
-		height: 58rpx;
-		color: #FFFFFF;
-		font-size: 28rpx;
-	}
-
-	.home_class {
-		width: 710rpx;
-		margin: 10rpx auto 20rpx;
-	}
-
-	.title_ipt>image {
-		width: 50rpx;
-		height: 50rpx;
-		position: absolute;
-		left: 24rpx;
-		top: 0;
-		bottom: 0;
-		margin: auto;
-	}
-
-	.title_ipt {
-		width: 476rpx;
-		height: 60rpx;
-		background: #161616;
-		border-radius: 30rpx;
-		position: relative;
-	}
-
-	.title_ipt>input {
-		width: 380rpx;
-		height: 60rpx;
-		background: #161616;
-		padding-left: 90rpx;
-		box-sizing: border-box;
-		border-radius: 30rpx;
-		font-size: 28rpx;
-		line-height: 60rpx;
-		color: #FFFFFF;
-	}
-
-	.header_title {
-		height: 60rpx;
-		line-height: 60rpx;
-		margin-top: 10rpx;
-		width: 100%;
-		box-sizing: border-box;
-		padding-left: 30rpx;
-	}
-
-	.status_bar {
-		height: var(--status-bar-height);
-		width: 100%;
-	}
-
-	.fixed {
-		background: #000000;
-		/* border: 1rpx solid red; */
-		width: 750rpx;
-		box-sizing: border-box;
-		position: fixed;
-		/* #ifdef MP */
-		top: 0;
-		/* #endif */
-		/* #ifndef MP */
-		top: 0rpx;
-		/* #endif */
-		z-index: 1995;
-	}
-
-	.content {
-		padding-top: calc(var(--status-bar-height) + 100rpx);
-		background: #000000;
-		box-sizing: border-box;
-		width: 100vw;
-		min-height: 100vh;
-	}
-
-	.lunbo {
-		height: 280rpx;
-		padding: 0 30rpx;
-		margin-bottom: 30rpx;
-		padding-top: 10rpx;
-	}
-
-	.lb_swiper {
-		width: 100%;
-		height: 280rpx;
-		border-radius: 20rpx;
-		overflow: hidden;
-	}
-
-	.lb_swiper .swiper-item>image {
-		width: 100%;
-		height: 280rpx;
-		border-radius: 20rpx;
-	}
-
-	.class_box {
-		padding: 0 30rpx;
-		display: flex;
-		/* justify-content: space-between; */
-		flex-wrap: wrap;
-		font-size: 24rpx;
-		font-family: Source Han Sans CN;
-		font-weight: 400;
-		color: #FFFFFF;
-	}
-
-	.class_box>view {
-		margin-right: 50rpx;
-		margin-bottom: 36rpx;
-		width: 98rpx;
-		text-align: center;
-	}
-
-	.class_box>view>view {
-		/* overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis; */
-		margin-top: 8rpx;
-	}
-
-	.class_box>view:nth-of-type(5n+5) {
-		margin-right: 0;
-	}
-
-	.class_box image {
-		width: 90rpx;
-		height: 78rpx;
-		display: block;
-		margin: auto;
-	}
-
-
-
-
-	.goods_ls_zc {
-		padding: 30rpx;
-		position: relative;
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
-		color: #FFFFFF;
-	}
-
-	.goods_ls_bx_it {
-		width: 330rpx;
-		border-radius: 10rpx;
-		overflow: hidden;
-		margin-bottom: 26rpx;
-	}
-
-	.goods_ls_bx_it>image {
-		width: 330rpx;
-		height: 330rpx;
-		border-radius: 16rpx;
-	}
-
-	.goods_ls_bx_it>view:nth-of-type(1) {
-		font-size: 28rpx;
-		padding: 0 22rpx;
-		padding-top: 10rpx;
-	}
-
-	.zuanshi {
-		font-size: 32rpx;
-		padding: 0 22rpx;
-		margin: 14rpx 0 8rpx 0;
-		color: #0FEFFF;
-	}
-</style>
diff --git a/pages/shop/list.vue b/pages/shop/list.vue
deleted file mode 100644
index e76edec..0000000
--- a/pages/shop/list.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-	<view class="search">
-		<view class="header">
-			<view class="head_ss">
-				<image src="/static/shop/search.png"></image>
-				<input type="text" confirm-type="search" @confirm="tosearch_result(title)" placeholder="在此搜索商品"
-					v-model="title" />
-			</view>
-		</view>
-
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
-			<view class="goods_ls_zc">
-				<view class="goods_ls_bx_it" v-for="(a,b) in tui_data" :key="b"
-					@click="gotoPage('/pages/shop/detail?goods_id='+a.id)">
-					<image :src="a.image"></image>
-					<view class="hang2">{{a.title}}</view>
-					<view class="zuanshi"> ￥{{a.price}} </view>
-				</view>
-			</view>
-
-		</mescroll-body>
-	</view>
-
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				xz_index: -1,
-				head_index: 1,
-				top_show: true,
-				bottom_show: false,
-				tui_data: [],
-				downOption: {
-					auto: false
-				},
-				cate_id2: '',
-				title: '',
-				sort: 1
-
-			}
-		},
-		onLoad(e) {
-			uni.setNavigationBarTitle({
-				title: '商品列表'
-			})
-			this.cate_id2 = e.id ? e.id : ''
-			this.title = e.title ? e.title : ''
-		},
-		methods: {
-
-			tosearch_result(e) {
-				let that = this;
-				// if (e != '') {
-				this.loadData(1);
-				// } else {
-				// 	uni.showToast({
-				// 		title: '请输入商品名称',
-				// 		icon: 'none',
-				// 		duration: 1500
-				// 	})
-				// }
-
-			},
-			downCallback() {
-				this.mescroll.resetUpScroll()
-			},
-			upCallback(page) {
-				this.loadData(page.num);
-			},
-			loadData(pageNo) {
-				// 模拟接口
-				let that = this;
-				that.req({
-					url: 'shop_seckill_product',
-					Loading: true,
-					data: {
-						page: pageNo,
-						title: that.title,
-						cate_id2: that.cate_id2,
-					},
-					success(res) {
-						that.mescroll.endByPage(res.data.data.length, res.data.last_page);
-						if (pageNo == 1) {
-							that.tui_data = res.data.data;
-						} else {
-							that.tui_data = that.tui_data.concat(res.data.data);
-						}
-					}
-				})
-			},
-
-
-		}
-	}
-</script>
-
-<style>
-	.goods_ls_zc {
-		padding: 30rpx;
-		position: relative;
-		display: flex;
-		justify-content: space-between;
-		flex-wrap: wrap;
-		color: #FFFFFF;
-	}
-
-	.goods_ls_bx_it {
-		width: 330rpx;
-		border-radius: 10rpx;
-		overflow: hidden;
-		margin-bottom: 26rpx;
-	}
-
-	.goods_ls_bx_it>image {
-		width: 330rpx;
-		height: 330rpx;
-		border-radius: 16rpx;
-		border: 2px solid;
-		border-image: linear-gradient(108deg, #376232, #574C37, #336365, #692F6B, #718958) 2 2;
-		box-sizing: border-box;
-	}
-
-	.goods_ls_bx_it>view:nth-of-type(1) {
-		font-size: 28rpx;
-		padding: 0 22rpx;
-		padding-top: 10rpx;
-	}
-
-	.zuanshi {
-		font-size: 32rpx;
-		padding: 0 22rpx;
-		margin: 14rpx 0 8rpx 0;
-		color: #0FEFFF;
-	}
-
-	.search {
-		width: 100vw;
-		min-height: 100vh;
-		background: #000000;
-		padding-top: 100rpx;
-		box-sizing: border-box;
-	}
-
-	.header {
-		height: 100rpx;
-		padding: 0 24rpx;
-		box-sizing: border-box;
-		font-size: 28rpx;
-		background: #000000;
-		position: fixed;
-		/* #ifdef APP */
-		top: 0;
-		/* #endif */
-		/* #ifndef APP */
-		top: 88rpx;
-		/* #endif */
-		z-index: 15;
-	}
-
-	.head_ss {
-		width: 690rpx;
-		height: 68rpx;
-		background: #161616;
-		border-radius: 34rpx;
-		display: flex;
-		align-items: center;
-		margin: 20rpx 0;
-		box-sizing: border-box;
-	}
-
-	.head_ss>image {
-		width: 40rpx;
-		height: 40rpx;
-		margin: 0 20rpx;
-	}
-
-	.head_ss input {
-		width: 80%;
-		font-size: 28rpx;
-		color: #FFFFFF;
-	}
-</style>
diff --git a/pages/shop/order_detail.vue b/pages/shop/order_detail.vue
deleted file mode 100644
index 8824994..0000000
--- a/pages/shop/order_detail.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<template>
-	<view class="content">
-		<!-- 地址 -->
-		<view class="address_z">
-			<!-- <image src="../../static/mine/address.png"></image> -->
-			<view class="address_z_r">
-				<view>
-					<text style="font-size: 32rpx;">{{result.shou_name}}</text>
-					<text style="margin-left: 10rpx;">{{result.shou_mobile}}</text>
-				</view>
-				<view style="margin-top: 20rpx;">{{result.shou_region}}</view>
-			</view>
-		</view>
-		<!-- 赏品 -->
-		<view class="xuyuan">
-			<view class="xuyuan_item">
-				<view class="shop_item_img">
-					<image :src="result.goods_image"></image>
-				</view>
-				<view class="xuyuan_item_2">
-					<view class="hang2">{{result.goods_name}}</view>
-					<view> 规格：{{result.goods_spec}} </view>
-					<view>
-						<text>￥{{result.goods_seckill_price}}</text>
-						<view style="margin-top: 6rpx;">×{{result.goods_num}}</view>
-					</view>
-				</view>
-			</view>
-			<view>共计：￥<text style="font-size: 36rpx;">{{result.pay_price}}</text></view>
-		</view>
-		<!-- 订单信息 -->
-		<view class="order_news">
-			<view>订单信息</view>
-			<view>
-				<view>支付方式</view>
-				<view>微信支付</view>
-			</view>
-			<view>
-				<view>运费</view>
-				<view>{{result.freight_price=='0.00'?'免运费':result.freight_price+'元'}}</view>
-			</view>
-			<view>
-				<view>合计</view>
-				<view class="order_price">￥{{result.pay_price}}</view>
-			</view>
-		</view>
-		<!-- 时间 -->
-		<view class="dingdan">
-			<view>订单号： <text>{{result.order_no}}</text> </view>
-			<view style="border: none;">提交时间：{{result.pay_time}}</view>
-		</view>
-		<!-- 查看物流 -->
-		<view class="footer" v-if="result.status>2" @click="gotoPage('/pages/user/wuliu_detail?send_num=' + send_num)">
-			查看物流</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-				result: {},
-				order_id: ''
-			}
-		},
-		onLoad(e) {
-			// console.log(e)
-			this.order_id = e.order_id ? e.order_id : ''
-			this.getData(e.order_id)
-		},
-		methods: {
-			copy(value) {
-				uni.setClipboardData({
-					data: value, //要被复制的内容
-					success: () => { //复制成功的回调函数
-						uni.showToast({ //提示
-							title: "复制成功"
-						})
-					}
-				});
-			},
-			getData(e) {
-				// 模拟接口
-				let that = this;
-				that.req({
-					url: 'seckill_order_detail',
-					Loading: true,
-					data: {
-						id: e
-					},
-					success(res) {
-						if (res.status == 1) {
-							that.result = res.data
-						}
-					}
-				})
-			}
-		}
-	}
-</script>
-
-<style>
-	.footer {
-		border: 1rpx solid rgba(47, 180, 255, 0.7);
-		box-shadow: 0px 0px 12rpx 0px rgba(47, 180, 255, 0.7);
-		width: 690rpx;
-		height: 88rpx;
-		background: #000916;
-		font-size: 28rpx;
-		color: #191613;
-		text-shadow: 0px 0px 12rpx #2FB4FF;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: fixed;
-		bottom: 50rpx;
-		left: 0;
-		right: 0;
-		margin: auto;
-		border-radius: 10rpx;
-	}
-
-	.order_price {
-		color: #FF2121;
-	}
-
-	.order_news>view {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		line-height: 70rpx;
-	}
-
-	.order_news {
-		width: 690rpx;
-		margin: 20rpx auto;
-		padding: 20rpx 30rpx;
-		box-sizing: border-box;
-		box-shadow: 0px 0rpx 10rpx 0px #1FF7F0;
-		border-radius: 10rpx;
-		font-size: 28rpx;
-
-	}
-
-	.dingdan text {
-		/* padding: 2rpx 16rpx;
-		border: 1rpx solid #2FB4FF;
-		border-radius: 6rpx;
-		color: #2FB4FF;
-		font-size: 24rpx;
-		box-sizing: border-box;
-		margin-left: 20rpx; */
-		/* font-size: 20rpx; */
-	}
-
-	.dingdan>view {
-		border-bottom: 1rpx solid #CCCCCC;
-		padding: 20rpx 0;
-	}
-
-	.dingdan {
-		width: 690rpx;
-		margin: 20rpx auto;
-		padding: 0 30rpx;
-		box-sizing: border-box;
-		box-shadow: 0px 0rpx 10rpx 0px #1FF7F0;
-		border-radius: 10rpx;
-		font-size: 28rpx;
-	}
-
-
-
-	.address_z_r {
-		width: 484rpx;
-		margin-left: 30rpx;
-		font-size: 28rpx;
-	}
-
-	.address_z>image {
-		width: 44rpx;
-		height: 50rpx;
-	}
-
-
-	.address_z {
-		width: 690rpx;
-		margin: 20rpx auto;
-		border-radius: 20rpx;
-		padding: 30rpx;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		box-shadow: 0px 0rpx 10rpx 0px #1FF7F0;
-		font-size: 24rpx;
-
-	}
-
-	.xuyuan_item_2 text {
-		font-size: 28rpx;
-	}
-
-	.xuyuan_item_2>view:nth-of-type(3) {
-		display: flex;
-		justify-content: space-between;
-		font-size: 20rpx;
-	}
-
-	.xuyuan_item_2>view:nth-of-type(2) {
-		font-size: 24rpx;
-	}
-
-	.xuyuan_item_2 {
-
-		font-size: 28rpx;
-		width: 440rpx;
-		/* border: 1rpx solid red; */
-		margin-top: 10rpx;
-		margin-left: 20rpx;
-		display: flex;
-		justify-content: space-between;
-		flex-direction: column;
-	}
-
-	.shop_item_img>image {
-		width: 170rpx;
-		height: 170rpx;
-		border-radius: 10rpx 10rpx 0 0;
-	}
-
-	.shop_item_img {
-		width: 170rpx;
-		height: 170rpx;
-		border-radius: 10rpx 10rpx 0 0;
-		position: relative;
-		text-align: left;
-		box-sizing: border-box;
-
-	}
-
-	.xuyuan_item {
-		display: flex;
-		margin: 14rpx auto 0;
-		width: 630rpx;
-		box-sizing: border-box;
-		padding-bottom: 20rpx;
-		border-bottom: 1rpx solid #cccccc;
-	}
-
-	.xuyuan>view:nth-of-type(2) {
-		font-size: 28rpx;
-
-		display: flex;
-		justify-content: flex-end;
-		padding: 20rpx 30rpx;
-		box-sizing: border-box;
-		align-items: flex-end;
-	}
-
-
-	.xuyuan {
-		width: 690rpx;
-		/* height: 432rpx; */
-		box-shadow: 0px 0rpx 10rpx 0px #1FF7F0;
-		border-radius: 20rpx;
-		margin: 24rpx auto 0;
-		padding-top: 24rpx;
-		box-sizing: border-box;
-
-	}
-
-	.content {
-		width: 100vw;
-		min-height: 100vh;
-		padding-top: 2rpx;
-		background: #000000;
-		box-sizing: border-box;
-		font-weight: 500;
-		color: #FFFFFF;
-	}
-</style>
diff --git a/pages/shop/shop_order.vue b/pages/shop/shop_order.vue
deleted file mode 100644
index 7878c31..0000000
--- a/pages/shop/shop_order.vue
+++ /dev/null
@@ -1,323 +0,0 @@
-<template>
-	<view class="content">
-		<view class="header">
-			<view class="qiehuan">
-				<view @click="getlist(i+1)" v-for="(v,i) in arr" :key="i">
-					<view :class="show==i+1?'xzs':'wzs'">{{v}}</view>
-					<view class="qiehuan_line" v-if="show==i+1"></view>
-				</view>
-			</view>
-		</view>
-		<!-- 内容 -->
-		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="downOption" @down="downCallback" @up="upCallback">
-			<view class="xuyuan" v-for="(v,i) in listData" :key='i' v-if="listData.length>0">
-				<view class="xuyuan_head">
-					<view>订单号：<text style="font-size: 28rpx;">{{v.order_no}}</text></view>
-					<view style="color: #1FF7F0;" v-if="v.status==1">待发货</view>
-					<view style="color: #1FF7F0;" v-if="v.status==2">待收货</view>
-					<view v-if="v.status==3">已完成</view>
-				</view>
-				<view class="xuyuan_item">
-					<view class="shop_item_img">
-						<image :src="v.goods_info.goods_image"></image>
-					</view>
-					<view class="xuyuan_item_2">
-						<view class="hang2">{{v.goods_info.goods_name}}</view>
-						<view> 规格：{{v.goods_info.goods_spec}} </view>
-						<view>
-							<text>￥{{v.goods_info.goods_seckill_price}}</text>
-							<view>×{{v.goods_info.goods_num}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="shifu">
-					<view>共 <text style="font-size: 28rpx;margin: 0 6rpx;"> {{v.goods_info.goods_num}}</text> 件</view>
-					<view>实付款：￥<text style="font-size: 36rpx;">{{v.pay_price}}</text></view>
-				</view>
-
-				<view class="xuyuan_foot">
-					<view class="qrsh" style="margin-right: 0;" v-if="v.status==1"
-						@click="gotoPage('/pages/shop/order_detail?order_id=' + v.id)">查看详情
-					</view>
-					<template v-if="v.status==2">
-						<view class="qrsh" @click="gotoPage('/pages/shop/order_detail?order_id=' + v.id)">查看详情</view>
-						<view class="qrsh" @click="gotoPage('/pages/shop/wuliu_detail?order_id=' + v.id)">查看物流</view>
-						<view class="ckwl" @click="quren(v.id)">确认收货</view>
-					</template>
-
-					<view class="detail_gray" v-if="v.status==3"
-						@click="gotoPage('/pages/shop/order_detail?order_id=' + v.id)">查看详情</view>
-				</view>
-			</view>
-		</mescroll-body>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				arr: ['待发货', '已发货', '已完成'],
-				show: 1,
-
-				downOption: {
-					auto: false
-				},
-
-				listData: []
-			}
-		},
-		onLoad(e) {
-
-		},
-		methods: {
-			quren(e) {
-				let that = this;
-				that.req({
-					url: 'seckill_order_confirm',
-					data: {
-						id: e
-					},
-					success(res) {
-						if (res.status == 1) {
-							uni.showToast({
-								title: res.msg,
-								icon: 'success',
-								duration: 1500,
-								success() {
-									setTimeout(() => {
-										that.loadData(1)
-									}, 1000)
-								}
-							})
-						}
-					}
-				})
-			},
-
-
-			getlist(v) {
-				this.show = v;
-				this.listData = []
-				this.mescroll.resetUpScroll()
-			},
-
-			/*下拉刷新的回调 */
-			downCallback() {
-				this.mescroll.resetUpScroll()
-			},
-			/*上拉加载的回调: 其中page.num:当前页 从1开始, page.size:每页数据条数,默认10 */
-			upCallback(page) {
-				this.loadData(page.num);
-			},
-			loadData(pageNo) {
-				// 模拟接口
-				let that = this;
-				that.req({
-					url: 'seckill_order_list',
-					Loading: true,
-					data: {
-						page: pageNo,
-						status: that.show
-					},
-					success(res) {
-						if (res.status == 1) {
-							that.mescroll.endByPage(res.data.data.length, res.data.last_page);
-							if (pageNo == 1) {
-								that.listData = res.data.data;
-							} else {
-								that.listData = that.listData.concat(res.data.data);
-							}
-						}
-
-
-					}
-				})
-			},
-
-
-		}
-	}
-</script>
-
-<style>
-	.detail_gray {
-		background: #FFFFFF;
-		border: 2rpx solid #E5E5E5;
-	}
-
-	.ckwl {
-		background: #FFFFFF;
-		border: 2rpx solid #E5E5E5;
-	}
-
-	.qrsh {
-		background: #1FF7F0;
-		color: #FFFFFF;
-		margin-right: 20rpx;
-	}
-
-	.xuyuan_foot>view {
-		width: 199rpx;
-		height: 64rpx;
-		border-radius: 32rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-size: 32rpx;
-	}
-
-	.xuyuan_foot {
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-		padding: 30rpx;
-		font-size: 24rpx;
-	}
-
-	.shifu>view:nth-of-type(1) {
-		font-size: 24rpx;
-	}
-
-	.shifu {
-		display: flex;
-		justify-content: space-between;
-		padding: 20rpx 30rpx 0;
-		font-size: 28rpx;
-	}
-
-	.xuyuan_item_2 text {
-		font-size: 28rpx;
-	}
-
-	.xuyuan_item_2>view:nth-of-type(3) {
-		display: flex;
-		justify-content: space-between;
-		align-items: flex-end;
-		font-size: 20rpx;
-	}
-
-	.xuyuan_item_2>view:nth-of-type(2) {
-		font-size: 24rpx;
-		color: rgba(255, 255, 255, 0.6);
-	}
-
-	.xuyuan_item_2 {
-		color: #FFFFFF;
-		font-size: 28rpx;
-		width: 440rpx;
-		/* border: 1rpx solid red; */
-		margin-top: 10rpx;
-		margin-left: 20rpx;
-		display: flex;
-		justify-content: space-between;
-		flex-direction: column;
-	}
-
-
-	.shop_item_img>image {
-		width: 170rpx;
-		height: 170rpx;
-		border-radius: 10rpx;
-	}
-
-	.shop_item_img {
-		width: 170rpx;
-		height: 170rpx;
-		border-radius: 10rpx;
-		position: relative;
-		text-align: left;
-		box-sizing: border-box;
-
-	}
-
-	.xuyuan_item {
-		display: flex;
-		margin: 14rpx auto 0;
-		width: 630rpx;
-		box-sizing: border-box;
-		padding-bottom: 20rpx;
-		border-bottom: 1rpx solid #cccccc;
-	}
-
-
-	.xuyuan_head {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		font-size: 28rpx;
-		padding: 0 24rpx;
-		box-sizing: border-box;
-		color: #FFFFFF;
-		font-weight: 500;
-	}
-
-	.xuyuan {
-		width: 690rpx;
-		box-shadow: 0px 0rpx 10rpx 0px #1FF7F0;
-		border-radius: 24rpx;
-		margin: 24rpx auto 0;
-		padding-top: 24rpx;
-		box-sizing: border-box;
-	}
-
-	.qiehuan {
-		display: flex;
-		justify-content: space-between;
-		/* align-items: center; */
-		color: #FFFFFF;
-		width: 440rpx;
-	}
-
-	.qiehuan_line {
-		margin: 10rpx auto;
-		width: 60rpx;
-		height: 4rpx;
-		background: #1FF7F0;
-	}
-
-	.qiehuan>view {
-		flex: 1;
-		text-align: center;
-	}
-
-	.wzs {
-		font-size: 32rpx;
-		color: #FFFFFF;
-		/* margin-bottom: 10rpx; */
-	}
-
-	.xzs {
-		font-size: 32rpx;
-		color: #1FF7F0;
-		font-weight: bold;
-		/* margin-bottom: 10rpx; */
-	}
-
-
-	.header {
-		width: 750rpx;
-		height: 88rpx;
-		background: #000000;
-		font-size: 28rpx;
-		color: #333333;
-		padding: 10rpx 30rpx 0;
-		box-sizing: border-box;
-		position: fixed;
-		/* #ifdef MP */
-		top: 0;
-		/* #endif */
-		/* #ifndef MP */
-		top: 88rpx;
-		/* #endif */
-		z-index: 15;
-	}
-
-	.content {
-		width: 100vw;
-		min-height: 100vh;
-		padding-top: 88rpx;
-		background: #000000;
-		box-sizing: border-box;
-	}
-</style>
diff --git a/pages/shop/wuliu_detail.vue b/pages/shop/wuliu_detail.vue
deleted file mode 100644
index 15053b5..0000000
--- a/pages/shop/wuliu_detail.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<template>
-	<view class="wuliu">
-		<view class="status">
-			<view class="status_image">
-				<image :src="news.goods_image"></image>
-				<view class="status_foot">共{{news.goods_num}}件商品</view>
-			</view>
-			<view>
-				<view class="sta_1">物流状态：<text>{{news.status_name}}</text></view>
-				<view class="sta_2">快递公司：{{news.delivery_name}}</view>
-				<view class="sta_3">快递单号：{{news.delivery_no}}<text @click="copy(news.delivery_no)">复制</text></view>
-			</view>
-		</view>
-		<!-- <block v-for="(item, index) in tracesData" :key="index" >
-			<trackNode :is-first="index===tracesData.length-1" :is-newest="index===0" :is-main-node="item.isMainNode"
-				:node-data="item"></trackNode>
-		</block> -->
-		<view class="news_z">
-			<view v-for="(item,index) in tracesData" :key="index" class="con">
-				<view class="con_l">
-					<view :class="index==0?'yuan2':'yuan'">
-						<view v-if="index==0" class="yuan3"></view>
-					</view>
-				</view>
-				<view class="con_r"
-					:style="index==0?'color:#FFFFFF;':'color:#333333;'+ 'border:'+(index+1==tracesData.length?'none':'') ">
-					<view class="title" :style="index==0?'font-size:28rpx':''">{{item.node_desc}}</view>
-					<view class="time">{{item.node_time}}</view>
-				</view>
-			</view>
-		</view>
-
-
-	</view>
-
-</template>
-
-<script>
-	export default {
-
-		data() {
-			return {
-				news: '',
-				tracesData: [],
-
-			}
-		},
-		onLoad(e) {
-			this.getData(e.order_id)
-		},
-		methods: {
-			getData(e) {
-				let that = this;
-				that.req({
-					url: 'seckill_order_logistics',
-					data: {
-						id: e
-					},
-					success(res) {
-						if (res.status == 1) {
-							that.news = res.data
-							that.tracesData = that.news.data
-						}
-					}
-				})
-			},
-			copy(value) {
-				//提示模板
-				// uni.showModal({
-				//   content:value,//模板中提示的内容
-				//   confirmText:"复制内容",
-				//   success:()=>{//点击复制内容的后调函数
-				//uni.setClipboardData方法就是讲内容复制到粘贴板
-				uni.setClipboardData({
-					data: value, //要被复制的内容
-					success: () => { //复制成功的回调函数
-						uni.showToast({ //提示
-							title: "复制成功"
-						})
-					}
-				});
-				//   }
-				// });
-			}
-		}
-
-	}
-</script>
-
-<style>
-	.news_z {
-		width: 690rpx;
-		margin: 20rpx auto 0;
-		box-shadow: 0px 0rpx 10rpx 0px #1FF7F0;
-		border-radius: 20rpx;
-	}
-
-	.yuan3 {
-		width: 24rpx;
-		height: 24rpx;
-		background: #1FF7F0;
-		border-radius: 50%;
-	}
-
-	.yuan2 {
-		background: rgba(31, 247, 240, 0.3);
-		width: 40rpx;
-		height: 40rpx;
-		border-radius: 50%;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.time {
-		color: #FFFFFF;
-		margin-top: 20rpx;
-	}
-
-	.con_l {
-		width: 120rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		/* border: 1px solid red; */
-	}
-
-	.title {
-		/* color: rgba(255, 255, 255, 0.6); */
-		line-height: 36rpx;
-	}
-
-	.con_r {
-		width: 600rpx;
-		font-size: 24rpx;
-		border-bottom: 1rpx solid #EEEEEE;
-		padding: 20rpx 0;
-		margin-right: 20rpx;
-		box-sizing: border-box;
-	}
-
-	.yuan {
-		width: 24rpx;
-		height: 24rpx;
-		background: #dddddd;
-		border-radius: 50%;
-	}
-
-	.con {
-		display: flex;
-		align-items: center;
-		width: 100%;
-	}
-
-	.sta_3 text {
-		background: #1FF7F0;
-		border-radius: 16rpx;
-		font-size: 20rpx;
-		margin-left: 24rpx;
-		padding: 2rpx 10rpx;
-		color: #FFFFFF;
-	}
-
-	.sta_2,
-	.sta_3 {
-		font-size: 24rpx;
-		color: #999999;
-		margin-top: 24rpx;
-	}
-
-	.sta_1 text {
-		color: #1FF7F0;
-	}
-
-	.sta_1 {
-		font-size: 28rpx;
-		color: #999999;
-		font-weight: 500;
-		margin-top: 10rpx;
-	}
-
-	.status_foot {
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		font-size: 24rpx;
-		color: #FFFFFF;
-		border-radius: 0 0 10rpx 10rpx;
-		background: rgba(0, 0, 0, 0.7);
-		width: 100%;
-		height: 40rpx;
-		text-align: center;
-	}
-
-	.status image {
-		width: 170rpx;
-		height: 170rpx;
-		border-radius: 10rpx;
-	}
-
-	.status_image {
-		width: 170rpx;
-		height: 170rpx;
-		margin-right: 34rpx;
-		border-radius: 10rpx;
-		position: relative;
-	}
-
-	.status {
-		width: 690rpx;
-		margin: 20rpx auto 0;
-		box-shadow: 0px 0rpx 10rpx 0px #1FF7F0;
-		padding: 24rpx 24rpx 48rpx 24rpx;
-		box-sizing: border-box;
-		display: flex;
-		border-radius: 10rpx;
-	}
-
-	.wuliu {
-		width: 100vw;
-		background: #000000;
-		min-height: 100vh;
-		padding-top: 2rpx;
-		padding-bottom: 100rpx;
-		box-sizing: border-box;
-		position: relative;
-	}
-</style>
diff --git a/pages/user/myCaDetail.vue b/pages/user/myCaDetail.vue
deleted file mode 100644
index a074944..0000000
--- a/pages/user/myCaDetail.vue
+++ /dev/null
@@ -1,1120 +0,0 @@
-<template>
-	<view class="content">
-		<!-- 购买说明 -->
-		<view class="header" v-if="goods" :style="'background: url(https://hdyfs.languowangluo.cn'+ goods.card_banner + ') repeat 0 0 / 100% auto;'">
-			<view class="head">
-				<view class="status_bar" :style="'height:'+ statusBarHeight +'px;'"></view>
-				<view class="header_title">
-					<view @click="back()">
-						<image :src="z_imgPath + 'back.png'"></image>返回
-					</view>
-					<view class="hang1">{{goods.title}} </view>
-				</view>
-			</view>
-
-			<view class="redu">
-				<view> 收集进度: <text>{{goods.hove_count}}</text> /{{goods.count}}</view>
-				<view>
-					<cmd-progress :percent="goods.gailv" :show-info="false" stroke-color="#1AC762" :strokeWidth="10">
-					</cmd-progress>
-				</view>
-			</view>
-		</view>
-
-		<mescroll-body ref="mescrollRef" style="min-height: auto;" @init="mescrollInit" :down="downOption"
-			@down="downCallback" @up="upCallback">
-			<view class="title_ipt">
-				<image :src="z_imgPath+'search.png'"></image>
-				<input type="text" placeholder="请输入关键字" placeholder-style="color:rgba(255,255,255,0.6)"
-					onfirm-type="search" v-model="keyword" @confirm="show='',loadData(1)" />
-				<view>搜索</view>
-			</view>
-			<view class="qiehuan">
-				<view @click="getlist(i,'')" v-for="(v,i) in arr" :key="i">
-					<view :class="show==i?'xzs':'wzs'">{{v}}</view>
-					<view class="qiehuan_line" v-if="show==i"> </view>
-				</view>
-			</view>
-			<view class="cate">
-				<view v-for="(item,index) in shang_cate" :key="index" :class="item.id==shang_id?'cate_sel':''"
-					@click="getlist(show,item.id)">{{item.title}}</view>
-			</view>
-			<!-- 赏池预览 -->
-			<view class="shop" v-if="goodslist && goodslist.length>0">
-				<view v-for="(item,index) in goodslist" :key="index" class="shop_item">
-					<!-- @click="change_sel(index,item.is)" -->
-					<view class="item_head" @click="yulan(item)">
-						<image :src="'https://hdyfs.languowangluo.cn'+item.imgurl" mode="aspectFill"></image>
-						<!-- <view class="hang1">{{item.prize_code}}</view> -->
-						<!-- <view v-if="item.is==1">X{{item.num}}</view>
-						<view class="mengban" v-else></view> -->
-					</view>
-					<view class="shop_con">
-						<view class="hang1" style="color: #FFFFFF;">{{item.title}}</view>
-						<view class="hang1">{{item.card_no}}</view>
-						<view class="hang1" style="color: #FFFFFF;font-size: 20rpx;">参考价：{{item.price}}
-						</view>
-					</view>
-					<uni-number-box :min="0" :max="item.num" v-model="item.number" background="none"
-						color="#FFFFFF" @change="getCount(item,index)">
-					</uni-number-box>
-					<!-- <image :src="z_imgPath + 'yuan'+ (item.sel?'_sel':'')  +'.png'" class="p_t_r" v-if="item.is==1">
-					</image> -->
-				</view>
-			</view>
-		</mescroll-body>
-		<!-- 底部按钮 -->
-		<view class="footer" v-if="show==1">
-			<image :src="z_imgPath + 'fahuo_btn.png?121'" @click="fahuo_click()" class="dabao"></image>
-			<image :src="z_imgPath + 'dabao.png'" @click="huisou_click()"></image>
-		</view>
-		<!-- <view class="footer">
-			<image :src="z_imgPath + 'fahuo_btn.png'" @click="fahuo_click()"></image>
-			<image :src="z_imgPath + 'huishou_btn.png'" @click="huisou_click()"></image>
-		</view> -->
-
-		<!-- 刷新浮框 -->
-		<view class="xuanfu">
-			<!-- <image :src="z_imgPath + 'jiaoliu.png?12'" @click="toNewMp()"></image> -->
-			<image :src="z_imgPath + 'quanxuan.png'" @click="quanxuan_click()"></image>
-			<image :src="z_imgPath + 'shuaxin1.png'" @click="getlist(show)"></image>
-		</view>
-
-		<!-- 确认环保  -->
-		<uni-popup ref="huishou_show" type="bottom">
-			<view class="order animated fadeInUp">
-				<view class="order_title">
-					<image :src="z_imgPath + 'qrhs.png?1'"></image>
-					<view class="ca" @click="$refs.huishou_show.close()">×</view>
-				</view>
-				<view class="xuyuan">
-					<view class="xuyuan_head">
-						<view>已选赠品</view>
-						<view>共 <text style="font-size: 28rpx;color: #FF7514;">{{num}}</text> 件</view>
-					</view>
-					<view class="xuyuan_con">
-						<view class="xuyuan_item" v-for="(item,index) in huishou_Arr" :key="index">
-							<view class="shop_item_img">
-								<image :src="'https://hdyfs.languowangluo.cn'+item.imgurl"></image>
-								<view v-if="item.is==1">
-									<text>×{{item.number}}</text>
-								</view>
-							</view>
-							<view class="xuyuan_item_2 hang1" style="font-size: 20rpx;">
-								参考价:{{(Number(item.price)*item.number).toFixed(2)}}元
-							</view>
-						</view>
-					</view>
-					<view class="xuyuan_foot">
-						<view>小计:￥<text style="font-size: 32rpx;">{{zong_price.toFixed(2)}}</text></view>
-					</view>
-				</view>
-				<image :src="z_imgPath + 'qrhs_btn.png?1'" class="pop_huishou" @click="huisou_btn()"></image>
-			</view>
-		</uni-popup>
-
-		<!-- 发货确认单 -->
-		<uni-popup ref="fahuo_show" type="bottom">
-			<view class="order animated fadeInUp">
-				<view class="order_title">
-					<image :src="z_imgPath + 'qrfh.png'"></image>
-					<view class="ca" @click="$refs.fahuo_show.close()">×</view>
-				</view>
-				<view class="xuyuan" :style="'background: url('+ z_imgPath + 'box1.png'+ ') no-repeat 0 0 / 100% 100%;height:390rpx'">
-					<view class="xuyuan_head">
-						<view>已选赠品</view>
-						<view>共 <text style="font-size: 28rpx;color: #FF7514;">{{num}}</text> 件</view>
-					</view>
-					<view class="xuyuan_con" style="border: none;">
-						<view class="xuyuan_item" v-for="(item,index) in huishou_Arr" :key="index">
-							<view class="shop_item_img">
-								<image :src="'https://hdyfs.languowangluo.cn'+item.imgurl"></image>
-								<view v-if="item.is==1">
-									<text>×{{item.number}}</text>
-								</view>
-							</view>
-							<view class="xuyuan_item_2 hang1"> {{item.title}}</view>
-						</view>
-					</view>
-				</view>
-				<view class="xuyuan kuaidi" :style="'background: url('+ z_imgPath + 'box2.png'+ ') no-repeat 0 0 / 100% 100%;height:370rpx'">
-					<view class="flex_center" style="justify-content: space-between;">
-						<view style="width: 580rpx;font-size: 28rpx;" @click="showMulLinkageThreePicker()">
-							{{selectCity}}
-						</view>
-						<image :src="z_imgPath + 'point_r.png'"></image>
-					</view>
-					<view>满{{post.free_post}}件赠品包邮</view>
-					<view class="kuaidi_text">如果不满{{post.free_post}}件，需支付{{post.post_money}}元运费</view>
-					<textarea placeholder="请输入留言内容" maxlength="50" v-model="message"></textarea>
-				</view>
-				<image :src="z_imgPath + 'qrfh_btn.png'" class="pop_huishou" @click="fahuo_btn()"></image>
-			</view>
-		</uni-popup>
-		<!-- 详情弹窗 -->
-		<uni-popup ref="yulanPop" type="center" mask-background-color="rgba(0,0,0,.95)">
-			<view class="yulanStyle">
-				<view>{{yulan_news.shang_title}}</view>
-				<view>
-					<image :src="yulan_news.goodslist_imgurl" mode="widthFix"></image>
-				</view>
-				<view class="hang1">{{yulan_news.goodslist_title}}</view>
-			</view>
-		</uni-popup>
-
-
-
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				z_imgPath: this.$z_img1 + 'chouka/',
-				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
-				goods_id: '', //商品id
-				goodslist: [],
-				goods: {},
-				downOption: {
-					auto: false
-				},
-				// 中赏记录
-				shang_cate: [],
-				shang_id: '',
-				// 
-				keyword: '',
-				//暂时不要 , '保险柜'
-				arr: ['全部', '已拥有', '未拥有'],
-				show: 0,
-
-				post: {},
-				// 寄卖的商品
-				huishou_Arr: [],
-				// 寄卖总价
-				zong_price: 0,
-				// 发送兑换参数
-				recovery_info: [],
-				// 收货人姓名
-				name: '',
-				// 收货人电话
-				mobile: '',
-				// 收货地址
-				address: '',
-				// 留言
-				message: '',
-				// 赏品总量
-				count: '?',
-				// 已选赏品数量
-				num: 0,
-				// 兑换失效
-				dh_status: false,
-				// 发货失效
-				fh_status: false,
-				selectCity: '选择收货地址',
-				// 放大详情
-				yulan_news: {},
-				// 是否全选状态
-				is_quan: false,
-				// 上锁失效
-				suo_status: false,
-				// 解锁失效
-				jiesuo_status: false,
-
-			}
-		},
-
-		onLoad(v) {
-			this.goods_id = v.caId
-			this.getShang()
-		},
-
-		onShareAppMessage() {
-			let that = this;
-			return {
-				title: "友达赏，正版潮玩手办一番赏",
-				imageUrl: that.goods.imgurl,
-				path: "/pages/chouka/index"
-			};
-		},
-		watch: {
-			huishou_Arr() {
-				this.num = 0;
-				this.zong_price = 0;
-				for (let i = 0; i < this.huishou_Arr.length; i++) {
-					this.$nextTick(() => {
-						this.num += this.huishou_Arr[i].number
-						this.zong_price += parseFloat(this.huishou_Arr[i].price * this.huishou_Arr[i]
-							.number)
-					})
-				}
-				this.getrecovery_info()
-				// console.log('xx', this.huishou_Arr, this.num)
-			}
-		},
-		methods: {
-			getShang(){
-				let that = this;
-				that.req({
-					url: 'card_level',
-					success(res) {
-						if (res.status == 1) {
-							that.shang_cate=res.data
-						}
-					}
-				})
-			},
-			yulan(e) {
-				console.log(e)
-				this.yulan_news = e
-				this.$refs.yulanPop.open();
-			},
-			showMulLinkageThreePicker() {
-				let that = this;
-				uni.chooseAddress({
-					success(res) {
-						console.log(res)
-						that.selectCity = res.userName + '-' + res.provinceName + '-' + res.cityName + '-' + res
-							.countyName + '-' + res.detailInfo + '-' + res.telNumber
-						that.name = res.userName;
-						that.mobile = res.telNumber;
-						that.address = res.provinceName + '-' + res.cityName + '-' + res.countyName + '-' + res
-							.detailInfo;
-						// that.$refs.fahuo_show.open()
-					},
-					fail(res) {
-						console.log(res)
-					}
-				})
-			},
-			getCount(a, b) {
-				this.$nextTick(() => {
-					this.change_Arr()
-				})
-			},
-			// 改变数组
-			change_Arr() {
-				let that = this;
-				that.huishou_Arr = [];
-				for (let i = 0; i < that.goodslist.length; i++) {
-					if (that.goodslist[i].number > 0) {
-						that.huishou_Arr.push(that.goodslist[i])
-					}
-				}
-				console.log(that.goodslist)
-				console.log(this.huishou_Arr)
-			},
-			fahuo_btn() {
-				let that = this;
-				if (that.fh_status) {
-					return
-				}
-				if (that.recovery_info && that.recovery_info.length > 0) {
-					that.fh_status = true
-					that.req({
-						url: 'warehouse_send',
-						data: {
-							recovery_info: JSON.stringify(that.recovery_info),
-							name: that.name,
-							mobile: that.mobile,
-							address: that.address,
-							message: that.message,
-							type: 2
-						},
-						success(res) {
-							if (res.status == 1) {
-								if (res.data.status == 1) {
-									that.recovery_info = []
-									uni.requestPayment({
-										provider: 'wxpay',
-										timeStamp: res.data.res.timeStamp,
-										nonceStr: res.data.res.nonceStr,
-										package: res.data.res.package,
-										signType: 'MD5',
-										paySign: res.data.res.paySign,
-										complete(ress) {
-											if (ress.errMsg == 'requestPayment:fail cancel') {
-												uni.showToast({
-													title: '取消支付',
-													icon: 'loading',
-													duration: 1000
-												})
-											}
-											if (ress.errMsg == 'requestPayment:ok') {
-												uni.showToast({
-													title: res.msg,
-													icon: 'success',
-													duration: 2000,
-													success() {
-														setTimeout(() => {
-															that.$refs.fahuo_show.close()
-															that.mescroll.resetUpScroll()
-														}, 2000)
-													}
-												})
-											}
-										},
-									})
-
-								} else {
-									that.recovery_info = []
-									uni.showToast({
-										title: res.msg,
-										icon: 'success',
-										duration: 2000,
-										success() {
-											setTimeout(() => {
-												that.$refs.fahuo_show.close()
-												that.mescroll.resetUpScroll()
-											}, 2000)
-										}
-									})
-								}
-							}
-						},
-						complete() {
-							that.fh_status = false
-						}
-					})
-				}
-			},
-			huisou_btn() {
-				let that = this;
-				if (that.dh_status) {
-					return
-				}
-				if (that.recovery_info && that.recovery_info.length > 0) {
-					that.dh_status = true
-					that.req({
-						url: 'warehouse_recovery',
-						data: {
-							recovery_info: JSON.stringify(that.recovery_info),
-							type: that.show
-						},
-						success(res) {
-							if (res.status == 1) {
-								that.recovery_info = []
-								uni.showToast({
-									title: res.msg,
-									icon: 'success',
-									duration: 2000,
-									success() {
-										setTimeout(() => {
-											that.$refs.huishou_show.close()
-											that.loadData(1)
-										}, 1000)
-									}
-								})
-							}
-						},
-						complete() {
-							that.dh_status = false
-						}
-					})
-				}
-			},
-
-			fahuo_click() {
-				this.change_Arr()
-				if (this.huishou_Arr.length > 0) {
-					this.getrecovery_info()
-					this.$refs.fahuo_show.open()
-				} else {
-					uni.showToast({
-						title: '请至少选择一件赠品',
-						icon: 'none',
-						duration: 2000
-					})
-				}
-			},
-			huisou_click() {
-				// uni.navigateToMiniProgram({
-				// 	appId: uni.getStorageSync('jump_appid'), // 此为生活缴费appid
-				// 	path: 'pages/my/index?token=' + uni.getStorageSync('token'), // 此为生活缴费首页路径
-				// 	envVersion: "develop",
-				// 	extraData: {
-				// 		'token': uni.getStorageSync('token')
-				// 	},
-				// 	success: res => {
-				// 		// 打开成功
-				// 		console.log("打开成功", res);
-				// 	},
-				// 	fail: err => {
-				// 		console.log(err, '取消了');
-				// 		uni.switchTab({
-				// 			url: '/pages/shouye/index'
-				// 		})
-				// 	}
-				// })
-				this.change_Arr()
-				if (this.huishou_Arr.length > 0) {
-					this.getrecovery_info()
-					this.$refs.huishou_show.open()
-				} else {
-					uni.showToast({
-						title: '请至少选择一件赠品',
-						icon: 'none',
-						duration: 2000
-					})
-				}
-			},
-			// 获取参数
-			getrecovery_info() {
-				let that = this;
-				that.recovery_info = [];
-				for (let i = 0; i < that.huishou_Arr.length; i++) {
-					that.recovery_info.push({
-						'prize_code': that.huishou_Arr[i].prize_code,
-						'number': that.huishou_Arr[i].number
-					})
-				}
-			},
-			quanxuan_click() {
-				let that = this
-				this.is_quan = true
-				for (let i = 0; i < this.goodslist.length; i++) {
-					this.$set(this.goodslist[i], 'number', this.goodslist[i].num)
-				}
-			},
-			change_sel(b, a) {
-				let that = this
-				if (a == 1) {
-					that.$set(that.goodslist[b], 'sel', !that.goodslist[b].sel)
-				}
-				// for (let i = 0; i < that.goodsdata.length; i++) {
-				// 	if (that.goodsdata[i].sel) {
-				// 		that.num += that.goodsdata[i].goods_count * 1
-				// 	}
-				// }
-			},
-			getlist(v, a) {
-				this.is_quan = false
-				this.show = v;
-				this.shang_id = a ? a : ''
-				this.goodslist = []
-				this.mescroll.resetUpScroll()
-			},
-			back() {
-				uni.navigateBack()
-			},
-			downCallback() {
-				this.mescroll.resetUpScroll(false)
-			},
-			upCallback(page) {
-				this.loadData(page.num);
-			},
-			loadData(pageNo) {
-				let that = this;
-				that.req({
-					url: 'card_book',
-					data: {
-						page: pageNo,
-						card_id: that.goods_id,
-						shang_id: that.shang_id,
-						title: that.keyword,
-						type: that.show
-					},
-					success(res) {
-						if (res.status == 1) {
-							if (res.status == 0) {
-								setTimeout(() => {
-									uni.navigateBack()
-								}, 1500)
-							}
-							if (res.status == 1) {
-								that.goods = res.data.card_goods
-								// that.shang_cate = res.data.category
-								that.count = res.data.goods_list.total
-								that.post = res.data.yuefei
-								console.log(that.post)
-								that.mescroll.endByPage(res.data.goods_list.data.length, res.data.goods_list.last_page);
-								// console.log(res.data.data)
-								if (pageNo == 1) {
-									that.goodslist = res.data.goods_list.data;
-								} else {
-									that.goodslist = that.goodslist.concat(res.data.goods_list.data);
-								}
-								
-								if (that.is_quan) {
-									for (let i = 0; i < that.goodslist.length; i++) {
-										that.$set(that.goodslist[i], 'number', that.goodslist[i].num)
-									}
-								} else {
-									for (let i = 0; i < that.goodslist.length; i++) {
-										that.$set(that.goodslist[i], 'number', 0)
-									}
-								}
-							}
-						}
-					}
-				})
-			},
-
-		}
-	}
-</script>
-
-<style>
-	.yulanStyle image:nth-of-type(1) {
-		width: 550rpx;
-		/* height: 550rpx; */
-	}
-
-	.yulanStyle>view:nth-of-type(2) {
-		border: 10rpx solid #FF7514;
-		box-sizing: border-box;
-		margin-bottom: 20rpx;
-		margin-top: 10rpx;
-		overflow: hidden;
-	}
-
-	.yulanStyle>view:nth-of-type(1) {
-		font-size: 32rpx;
-		font-family: Source Han Sans CN;
-		font-weight: bold;
-		color: #080808;
-		line-height: 52rpx;
-		-webkit-text-stroke: 3rpx #FFFFFF;
-		text-stroke: 3rpx #FFFFFF;
-		background: #FF7514;
-		padding: 6rpx 20rpx;
-		width: fit-content;
-	}
-
-	.yulanStyle {
-		font-size: 47rpx;
-		font-family: Source Han Sans CN;
-		font-weight: bold;
-		color: #FFFFFF;
-		text-align: center;
-	}
-
-	textarea {
-		width: 100%;
-		height: 120rpx;
-		background: rgba(255, 255, 255, 0.08);
-		border-radius: 10rpx;
-		padding: 4rpx 10rpx;
-		margin-top: 20rpx;
-		font-size: 26rpx;
-		box-sizing: border-box;
-	}
-
-	.kuaidi_text {
-		font-size: 24rpx;
-		color: #999999;
-	}
-
-	.kuaidi>view:nth-of-type(2) {
-		font-size: 28rpx;
-	}
-
-	.kuaidi>view:nth-of-type(1) {
-		border-bottom: 1px solid #666666;
-		padding: 20rpx 0;
-	}
-
-	.kuaidi>view {
-		margin-top: 20rpx;
-	}
-
-	.kuaidi image {
-		width: 32rpx;
-		height: 32rpx;
-	}
-
-	.kuaidi {
-		padding: 0 30rpx 30rpx 30rpx !important;
-		color: #ffffff;
-	}
-
-	.order_title>image {
-		width: 172rpx;
-		height: 37rpx;
-		position: absolute;
-		left: 30rpx;
-		top:20rpx;
-	}
-
-	.order_title {
-		font-size: 50rpx;
-		font-family: Source Han Sans CN;
-		font-weight: bold;
-		color: #FFFFFF;
-		position: relative;
-		text-align: right;
-	}
-
-	.order {
-		width: 750rpx;
-		background: rgba(0, 0, 0, 0.9);
-		border-radius: 30rpx 30rpx 0px 0px;
-		border-top: 5rpx solid #35ED85;
-		border-bottom: none;
-		position: absolute;
-		bottom: 0;
-		padding: 10rpx 30rpx 50rpx;
-		box-sizing: border-box;
-		color: #FFFFFF;
-	}
-
-	.pop_huishou {
-		width: 610rpx;
-		height: 70rpx;
-		margin: 48rpx auto 0;
-		display: block;
-	}
-
-	.xuyuan_foot {
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-		padding: 30rpx;
-		font-size: 24rpx;
-		color: #FFFFFF;
-		text-shadow: 0px 0px 14rpx #FF2121;
-	}
-
-	.xuyuan_item_2 {
-		color: #ffffff;
-		font-size: 24rpx;
-		margin-top: 6rpx;
-		width: 100%;
-	}
-
-
-	.shop_item_img>view:nth-of-type(1) {
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		font-size: 20rpx;
-		padding: 2rpx 20rpx 2rpx 10rpx;
-		box-sizing: border-box;
-		background: #FF7514;
-		border-radius: 0 8rpx 0 0;
-	}
-
-	.shop_item_img>image {
-		width: 100%;
-		height: 100%;
-		border-radius: 8rpx;
-		position: absolute;
-		top: 0;
-		left: 0;
-	}
-
-	.shop_item_img {
-		width: 170rpx;
-		height: 170rpx;
-		border-radius: 10rpx 10rpx 0 0;
-		position: relative;
-		text-align: left;
-		box-sizing: border-box;
-		overflow: hidden;
-	}
-
-	.xuyuan_item {
-		width: 170rpx !important;
-		min-width: 170rpx;
-		height: 242rpx;
-		margin-right: 20rpx;
-		flex-shrink: 0;
-		text-align: center;
-		position: relative;
-		margin-top: 20rpx;
-	}
-
-	.xuyuan_con {
-		display: flex;
-		margin: 14rpx auto 0;
-		width: 630rpx;
-		box-sizing: border-box;
-		border-bottom: 1rpx solid #666666;
-		overflow-x: scroll;
-		overflow-y: hidden;
-	}
-
-	.xuyuan_head>view:nth-of-type(2) {
-		font-size: 24rpx;
-	}
-
-	.xuyuan_head {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		font-size: 28rpx;
-		padding: 0 24rpx;
-		box-sizing: border-box;
-		color: #ffffff;
-	}
-
-	.xuyuan {
-		width: 690rpx;
-		/* height: 432rpx; */
-		background: #222222;
-		/* border: 2rpx solid #FFFFFF; */
-		border-radius: 1rpx;
-		margin: 24rpx auto 0;
-		padding-top: 24rpx;
-		box-sizing: border-box;
-	}
-
-	.pop_btn {
-		width: 484rpx;
-		height: 68rpx;
-		background: #000000;
-		border: 2rpx solid #2FB4FF;
-		border-radius: 6rpx;
-		font-size: 32rpx;
-		color: #2FB4FF;
-		margin: 50rpx auto 0;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-
-	.pop_con {
-		height: 440rpx;
-		margin: auto;
-		padding: 0rpx 36rpx;
-		font-size: 24rpx;
-		line-height: 36rpx;
-		color: #FFFFFF;
-		box-sizing: border-box;
-		overflow-y: scroll;
-	}
-
-	.pop_title {
-		/* font-family: 'zcq'; */
-		font-size: 40rpx;
-		color: #96FFFE;
-		height: 128rpx;
-		line-height: 128rpx;
-		text-align: center;
-	}
-
-	.pop {
-		width: 543rpx;
-		height: 801rpx;
-		padding-top: 192rpx;
-		box-sizing: border-box;
-		/* background: #FFFFFF; */
-		/* border-radius: 20rpx; */
-	}
-
-	.p_t_r {
-		position: absolute;
-		top: -20rpx;
-		right: -10rpx;
-		width: 32rpx;
-		height: 32rpx;
-	}
-
-
-	.footer>image {
-		width: 212rpx;
-		height: 70rpx;
-	}
-
-	/* .footer>image:nth-of-type(3) {
-		width: 317rpx;
-		height: 106rpx;
-		position: absolute;
-		top: 20rpx;
-		left: 0;
-		right: 0;
-		margin: auto;
-		z-index: 11;
-	} */
-
-	.jiesuo {
-		margin: auto;
-		width: 317rpx !important;
-		height: 106rpx !important;
-
-	}
-
-	.footer {
-		width: 750rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		position: relative;
-		position: fixed;
-		bottom: 0rpx;
-		right: 0;
-		left: 0;
-		margin: auto;
-		background: #0D0D0D;
-		padding: 30rpx 60rpx;
-		box-sizing: border-box;
-	}
-
-	.xuanfu image {
-		width: 94rpx;
-		height: 94rpx;
-		margin-top: 20rpx;
-	}
-
-	.xuanfu {
-		position: fixed;
-		bottom: 391rpx;
-		right: 20rpx;
-		width: 94rpx;
-		z-index: 21;
-	}
-
-	.shop_con {
-		padding: 10rpx;
-		box-sizing: border-box;
-		line-height: 40rpx;
-		/* background: #000000; */
-		border-radius: 0 0 10rpx 10rpx;
-		font-size: 20rpx;
-		color: rgba(255, 255, 255, 0.6);
-	}
-
-
-	.item_head>view:nth-of-type(1) {
-		width: 100%;
-		position: absolute;
-		background: rgba(255, 255, 255, .7);
-		/* border-radius: 0 7rpx 0 0; */
-		font-size: 24rpx;
-		font-family: Source Han Sans CN;
-		font-weight: 400;
-		color: #333333;
-		bottom: 0rpx;
-		left: 0rpx;
-		padding: 6rpx 14rpx;
-		box-sizing: border-box;
-	}
-
-	.mengban {
-		width: 100%;
-		height: 100%;
-		position: absolute;
-		background: rgba(0, 0, 0, 0.8) !important;
-		top: 0;
-		left: 0;
-	}
-
-	.item_head>image {
-		width: 193rpx;
-		height: 264rpx;
-	}
-
-	.item_head {
-		width: 193rpx;
-		height: 264rpx;
-		position: relative;
-	}
-
-	.shop_item {
-		width: 193rpx;
-		margin-top: 20rpx;
-		position: relative;
-		box-sizing: border-box;
-		color: #FFFFFF;
-
-	}
-
-	.shop>.shop_item:nth-child(3n+2) {
-		margin: 20rpx 26rpx 0;
-	}
-
-	.shop {
-		width: 690rpx;
-		min-height: 664rpx;
-		background: rgba(255, 255, 255, 0.08);
-		border-radius: 10px;
-		margin: 0rpx auto;
-		display: flex;
-		/* justify-content: center; */
-		flex-wrap: wrap;
-		padding: 10rpx 30rpx;
-		box-sizing: border-box;
-		font-size: 24rpx;
-	}
-
-	.cate_sel {
-		background: linear-gradient(0deg, #1AC762 0%, #35ED85 100%) !important;
-		color: #000 !important;
-	}
-
-	.cate>view {
-		padding: 4rpx 20rpx;
-		/* border: 3rpx solid; */
-		border-radius: 10rpx;
-		margin-right: 30rpx;
-		font-size: 30rpx;
-		color: #FFFFFF;
-		margin-top: 20rpx;
-		background: #444444;
-	}
-
-	.cate {
-		width: 690rpx;
-		margin: 30rpx auto;
-		display: flex;
-		flex-wrap: wrap;
-	}
-
-	.qiehuan {
-		display: flex;
-		/* justify-content: space-between; */
-		align-items: center;
-		width: 690rpx;
-		margin: 0 auto;
-		box-sizing: border-box;
-		/* font-family: 'zcq'; */
-		/* font-weight: bold; */
-	}
-
-	.qiehuan>view {
-		/* flex: 1; */
-		text-align: center;
-		margin-right: 30rpx;
-	}
-
-	.wzs {
-		background: #E6E6E6;
-		border-radius: 10rpx;
-		color: #999999;
-		padding: 15rpx 40rpx;
-		font-size: 30rpx;
-	}
-
-	.xzs {
-		background: linear-gradient(0deg, #1AC762 0%, #35ED85 100%);
-        border-radius: 10rpx;
-		color: #000000;
-		padding: 15rpx 40rpx;
-		font-size: 30rpx;
-		/* font-size: 42rpx;
-		color: #FF7514;
-		-webkit-text-stroke: 1rpx #FFFFFF;
-		text-stroke: 1rpx #FFFFFF;
-		text-shadow: 2rpx 2rpx 10rpx #FFFFFF; */
-	}
-
-	.title_ipt {
-		display: flex;
-		align-items: center;
-		margin: 20rpx auto;
-		border-radius: 30rpx;
-		padding-left: 30rpx;
-		width: 652rpx;
-		height: 64rpx;
-		background: rgba(255, 255, 255, .1);
-		border-radius: 32rpx;
-		box-sizing: border-box;
-	}
-
-	.title_ipt>image {
-		width: 26rpx;
-		height: 26rpx;
-	}
-
-	.title_ipt>input {
-		width: 77%;
-		height: 60rpx;
-		box-sizing: border-box;
-		border-radius: 105rpx;
-		font-size: 28rpx;
-		line-height: 60rpx;
-		font-size: 28rpx;
-		font-weight: 400;
-		color: rgba(255, 255, 255, 0.6);
-		padding-left: 20rpx;
-	}
-
-	.title_ipt>view {
-		width: 94rpx;
-		height: 35rpx;
-		background: linear-gradient(0deg, #1AC762 0%, #35ED85 100%);
-		border-radius: 18rpx;
-		font-size: 23rpx;
-		font-family: Source Han Sans CN;
-		font-weight: 400;
-		color: #111111;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		margin-right: 20rpx;
-	}
-
-	.redu {
-		position: absolute;
-		bottom: 65rpx;
-		left: 0;
-		right: 0;
-		margin: auto;
-		width: 694rpx;
-		height: 108rpx;
-		background: rgba(22, 22, 22, 0.6);
-		padding: 16rpx 20rpx;
-		box-sizing: border-box;
-		color: #FFFFFF;
-		font-size: 20rpx;
-		border-radius: 0 0 7rpx 7rpx;
-	}
-
-	.header_title>view:nth-of-type(2) {
-		width: 520rpx;
-		text-align: center;
-		/* margin: auto; */
-	}
-
-	.header_title>view:nth-of-type(1) {
-		display: flex;
-		align-items: center;
-	}
-
-	.header_title image {
-		width: 48rpx;
-		height: 48rpx;
-	}
-
-	.header_title {
-		height: 70rpx;
-		line-height: 70rpx;
-		width: 100%;
-		box-sizing: border-box;
-		font-weight: bold;
-		display: flex;
-		align-items: center;
-		padding-left: 30rpx;
-		box-sizing: border-box;
-	}
-
-	.status_bar {
-		height: var(--status-bar-height);
-		width: 100%;
-	}
-
-	.head {
-		position: fixed;
-		top: 0;
-		z-index: 20;
-	}
-
-	.header {
-		width: 750rpx;
-		height: 489rpx;
-		background: #FFFFFF;
-		font-size: 32rpx;
-		color: #FFFFFF;
-		box-sizing: border-box;
-		position: absolute;
-		top: 0;
-		z-index: 15;
-	}
-
-	.content {
-		padding-bottom: 120rpx;
-		/* background: #FAFAFA; */
-		padding-top: 489rpx;
-	}
-</style>