From 117cfcda348b88a0055018fedb6007d8528bbcae Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sat, 3 Aug 2024 22:02:33 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=BC=80=E9=80=9A=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/tutorial.js        |   24 +-
 pages.json             |   17 +-
 pages/gamll/index.vue  | 1248 ++++++++++++++++++++++++++++++++++++++++
 pages/gamll/rules.vue  |   47 ++
 pages/user/index.vue   |   81 +--
 project.config.json    |    2 +-
 static/user/code.png   |  Bin 1520 -> 0 bytes
 static/user/manage.png |  Bin 9536 -> 0 bytes
 8 files changed, 1380 insertions(+), 39 deletions(-)
 create mode 100644 pages/gamll/index.vue
 create mode 100644 pages/gamll/rules.vue
 delete mode 100644 static/user/code.png
 delete mode 100644 static/user/manage.png

diff --git a/api/tutorial.js b/api/tutorial.js
index 8d1a73b..eb8abf9 100644
--- a/api/tutorial.js
+++ b/api/tutorial.js
@@ -3,7 +3,11 @@ import request from '@/utils/request'
 // api地址
 const api = {
 	courseType: 'course/getCourseType',
-	list: 'course/getCourseList'
+	list: 'course/getCourseList',
+	retailList: 'retail/retailPayList',
+	describe: 'retail/describe',
+	submit: 'retail/submit',
+	getSoftAgreement: 'retail/getSoftAgreement'
 }
 
 // 分类
@@ -13,4 +17,20 @@ export const courseType = (param) => {
 // 列表
 export const courseList = (param) => {
 	return request.get(api.list, param)
-}
\ No newline at end of file
+}
+// 会员列表
+export const retailList = (param) => {
+	return request.post(api.retailList, param)
+}
+// 会员全益
+export const describe = (param) => {
+	return request.get(api.describe, param)
+}
+// 会员余额支付
+export const submit = (param) => {
+	return request.post(api.submit, param)
+}
+// 协议
+export const getSoftAgreement = (param) => {
+	return request.get(api.getSoftAgreement, param)
+}
diff --git a/pages.json b/pages.json
index ffc7fdb..c3d45db 100644
--- a/pages.json
+++ b/pages.json
@@ -239,7 +239,22 @@
 				"enablePullDownRefresh": false
 			}
 
-		}
+		},
+		{
+					"path": "pages/gamll/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "pages/gamll/rules",
+					"style": {
+						"navigationBarTitleText": "软件付费服务协议",
+						"enablePullDownRefresh": false
+					}
+				}
 	],
 	"subPackages": [{
 			"root": "pages/invite/",
diff --git a/pages/gamll/index.vue b/pages/gamll/index.vue
new file mode 100644
index 0000000..a22428f
--- /dev/null
+++ b/pages/gamll/index.vue
@@ -0,0 +1,1248 @@
+<template>
+	<view class="park">
+		<view class="park-top">
+			<view class="park-navbar">
+				<!-- :is-fixed='false' -->
+				<u-navbar :is-fixed='false' title="开通商城" :border-bottom="false" :background="backgroundNone">
+				</u-navbar>
+				<view class="box_1">
+					<image :src="$picUrl+'/static/default-logo.png'" class="image_2"
+						@click="goJump('/pages/news1/setting')"></image>
+					<view class="group_1">
+						<view class="image-text_2" @click="goLogin()">
+							{{userInfo.mobile}}
+						</view>
+						<view class="image-text_1" @click="goLogin()">
+							{{retail==0?'您暂未开通商城哦～':'您已经开通商城啦～'}}
+						</view>
+					</view>
+					<image :src="$picUrl+'/static/user/gmallZuan.png'" class="image_1"></image>
+				</view>
+			</view>
+		</view>
+		<view class="tab_fix" :style="{ 'border-radius': radius,'padding-top':paddingTo}">
+			<view class="tab_pos">
+				<view class="tab_bg">
+					<view :class="[tabIndex==index ? 'tab_active' : 'tab_a']" v-for="(item,index) in tabbar"
+						@click="onChage(index)" :key="index">
+						{{item}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="tab-type">
+			<view class="tab-pro" v-for="(item,index) in tabType" :class="index==banIndex?'tab-pro-active':''"
+				@click="onChageBan(index)" :key="index">
+				<view class="tab-name">
+					{{item.retail_name}}
+				</view>
+				<view class="tab-price">
+					<text style="font-size: 32rpx;">¥</text>{{Number(item.retail_current_price)}}
+				</view>
+				<view class="tab-line">
+					¥{{Number(item.retail_original_price)}}
+				</view>
+				<view class="tab-jian" v-if='item.jian>0' :class="index==banIndex?'tab-jian-active':''">
+					立减 ¥{{Number(item.jian)}}元
+				</view>
+				<view class="tab-quan">
+
+				</view>
+			</view>
+		</view>
+		<view class="tab-box">
+			<view class="tabFavour">
+				<view class="favour" v-for="(item,index) in tabFavour" :class="index==priceIndex?'favourActive':''"
+					@click="onChagePrice(index)" :key="index">
+					<view class="favour_active">
+						{{item.name}}
+					</view>
+					<view class="favour_infor">
+						<view style="overflow: hidden;">
+							<view class="favour_year">
+								{{item.year}}<text style="font-weight: 500;">年</text>
+							</view>
+							<view class="favour_tips">
+								限时特惠
+							</view>
+						</view>
+						<view class="favour_price">
+							<text style="font-size: 32rpx;">¥</text>{{item.price}}
+						</view>
+					</view>
+					<view class="tab-quan"></view>
+				</view>
+			</view>
+			<view class="tab-title">
+				<view class="name">
+					<image :src="$picUrl+'/static/user/left.png'"></image>开通{{tabbar[tabIndex]}}的优势<image
+						:src="$picUrl+'/static/user/right.png'">
+					</image>
+				</view>
+			</view>
+			<view class="advantage">
+				<view class="advantage-tips" v-if="tabIndex==0" v-html="retail"></view>
+				<view class="advantage-tips" v-if="tabIndex==1" v-html="wholesale"></view>
+			</view>
+			<view class="tab-title" style="margin-top: 0;">
+				<view class="name">
+					<image :src="$picUrl+'/static/user/left.png'"></image>功能对比<image
+						:src="$picUrl+'/static/user/right.png'">
+					</image>
+				</view>
+			</view>
+			<view class="equity" style="margin-top: 8px;">
+				<view class="table_box">
+					<u-table>
+						<u-tr v-for="(a,ind) in equityList" :key="ind">
+							<u-td class="box_name">{{a.name}}</u-td>
+							<u-td class='box_content'>
+								<u-tr v-for="(item,index) in a.list" :key="index">
+									<u-td class="box_cus flex-1">
+										<view class="box_tips" :style="{ color: index==0?'#333':'#594b40' }">
+											{{item.feature}}
+											<u-icon v-if="index>2"
+												@click="openPopup(item.function_description,item.feature)"
+												name="question-circle-fill" color="#999" size="30"></u-icon>
+										</view>
+									</u-td>
+									<u-td class="box_cus flex-2">
+										<view class="box_view">
+											<u-icon v-if="item.air=='10'" name="checkbox-mark" color="#594b40"
+												size="28"></u-icon>
+											<view v-else>
+												<u-icon v-if="item.air=='20'" name="close" color="#959595" size="28">
+												</u-icon>
+												<text :style="{ color: (index==0&&item.air=='air')?'#fff':'#594b40' }"
+													v-else>{{item.air}}</text>
+											</view>
+										</view>
+									</u-td>
+									<u-td class="box_cus flex-3">
+										<view class="box_view">
+											<u-icon v-if="item.pro=='10'" name="checkbox-mark" color="#b24341"
+												size="28"></u-icon>
+											<view v-else>
+												<u-icon v-if="item.pro=='20'" name="close" color="#959595" size="28">
+												</u-icon>
+												<text :style="{ color: (index==0&&item.pro=='pro')?'#fff':'#b24341' }"
+													v-else>{{item.pro}}</text>
+											</view>
+										</view>
+									</u-td>
+									<u-td class="box_cus flex-4">
+										<view class="box_view">
+											<u-icon v-if="item.H5=='10'" name="checkbox-mark" color="#5362d9" size="28">
+											</u-icon>
+											<view v-else>
+												<u-icon v-if="item.H5=='20'" name="close" color="#959595" size="28">
+												</u-icon>
+												<text :style="{ color: (index==0&&item.H5=='H5')?'#fff':'#5362d9' }"
+													v-else>{{item.H5}}</text>
+											</view>
+										</view>
+									</u-td>
+								</u-tr>
+							</u-td>
+						</u-tr>
+					</u-table>
+				</view>
+
+			</view>
+			<view class="payment-method">
+				<view class="title">选择支付方式</view>
+				<view v-for="(a,index) in paymentMethods" :key="index" @click="tabItem1(index)"
+					class="pay-item dis-flex flex-x-between">
+					<view class="item-left dis-flex flex-y-center">
+						<view v-if="a.method!=='huifu'" class="item-left_icon" :class="[a.method]">
+							<text class="iconfont" :class="[PayMethodIconEnum[a.method]]"></text>
+						</view>
+						<view v-else class="huifu-box">
+							<image :src="`${$picUrl}/static/yinlian.png`" mode="heightFix" class="huifu"></image>
+						</view>
+						<view class="item-left_text">
+							<text>{{ PayMethodEnum[a.method].name }}</text>
+						</view>
+						<view v-if="a.method === PayMethodEnum.BALANCE.value" class="user-balance">
+							<text>(可用￥{{ userInfo.balance }}元)</text>
+						</view>
+					</view>
+					<view class="item-right col-m" v-if="payIndex == index">
+						<text class="iconfont icon-check" style="color: red;"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bottomBtn">
+			<button class="submitBtn" formType="submit" @click="submitPay">立即支付 ¥<text
+					style="font-size: 48rpx;">{{tabFavour[priceIndex].price}}</text>（开通您的{{tabbar[tabIndex]}}）</button>
+			<view class="paytext" @click="goRules">
+				<view class="">
+					本产品为软件服务产品，购买后不支持退款
+				</view>
+				<view class="">
+					开通即表示接受<text style="color: #999;">《软件付费服务协议》</text>
+				</view>
+			</view>
+		</view>
+		<u-popup v-model="show" length="60%" mode='center' :mask='true' :closeable='true'>
+			<view class="content">
+				<view class="content-title">
+					{{feature_name}}
+				</view>
+				<view class="content-box">
+					{{content_description}}
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+<script>
+	import * as api from '@/api/tutorial'
+	import * as CashierApi from '@/api/cashier';
+	import {
+		Wechat
+	} from '@/core/payment'
+	import {
+		PayMethodEnum
+	} from '@/common/enum/payment'
+	// 支付方式对应的图标
+	const PayMethodIconEnum = {
+		[PayMethodEnum.WECHAT.value]: 'icon-wechat-pay',
+		[PayMethodEnum.ALIPAY.value]: 'icon-alipay',
+		[PayMethodEnum.BALANCE.value]: 'icon-balance-pay',
+		[PayMethodEnum.HUIFU.value]: 'icon-balance-pay'
+	}
+
+	// 支付方式的终端名称
+	const PayMethodClientNameEnum = {
+		[PayMethodEnum.WECHAT.value]: '微信',
+		[PayMethodEnum.ALIPAY.value]: '支付宝'
+	}
+	export default {
+		data() {
+			let img = 'https://www.royaum.com.cn/static/user/gmallBg.png'
+			return {
+				background: {
+					// background: 'url(' + img + ') center top no-repeat',
+					// backgroundSize: '100%',
+					background: '#fdcac5',
+				},
+				backgroundNone: {
+					background: 'none'
+				},
+				// 枚举类
+				PayMethodEnum,
+				PayMethodIconEnum,
+				PayMethodClientNameEnum,
+				paymentMethods: [],
+				isClick: true,
+				radius: '28rpx 0 0 0',
+				paddingTo: '0rpx',
+				leftNum: 33.33333,
+				tabbar: ['零售商城', '批发商城'],
+				tabIndex: 0,
+				banIndex: 0,
+				priceIndex: 0,
+				payIndex: 0,
+				tabType: [],
+				tabFavour: [{
+						name: '限时享受额外权益',
+						price: 0,
+						year: 1
+					},
+					{
+						name: '限时享受额外权益',
+						price: 0,
+						year: 2
+					}
+				],
+				equityList: [],
+				userInfo: '',
+				retail: null,
+				show: false,
+				content_description: '',
+				feature_name: '',
+				retail: '',
+				wholesale: '',
+				scrollTop: 0,
+				isAtTop: ''
+			}
+		},
+		onLoad() {
+			this.retail = uni.getStorageSync('userInfo').retail
+			console.log(this.retail)
+			this.getRetailList()
+			this.getDescribe()
+			uni.$on('appShow', this.solveShowMsg);
+			uni.showNavigationBarLoading();
+		},
+		onUnload() {
+			uni.$off('appShow', this.solveShowMsg);
+		},
+		onShow() {
+
+		},
+		onPageScroll(e) {
+			this.checkIfElementIsAtTop()
+		},
+		methods: {
+			checkIfElementIsAtTop() {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.tab_fix').boundingClientRect(data => {
+					if (data) {
+						// 元素的top值如果是0，说明它到达了顶部
+						this.isAtTop = data.top === 0;
+						if (this.isAtTop) {
+							this.radius = '28rpx 0 0 0';
+							this.paddingTo = '120rpx';
+						} else {
+							this.radiu = '0';
+							this.paddingTo = '0rpx';
+						}
+					}
+				}).exec();
+			},
+			goRules() {
+				uni.navigateTo({
+					url: '/pages/gamll/rules'
+				})
+			},
+			openPopup(msg, name) {
+				this.feature_name = name
+				this.content_description = msg
+				if (msg) {
+					this.show = true
+				}
+			},
+			solveShowMsg(info) {
+				console.log(info);
+				if (this.miniPayRequest && Object.keys(this.miniPayRequest).length > 0 && info.appId === this
+					.miniPayRequest.miniuser) {
+					this.onTradeQuery(this.miniPayRequest.out_trade_no, this.paymentMethods[this.payIndex].method);
+				}
+			},
+			// 已完成支付按钮事件: 请求后端查单
+			onTradeQuery(outTradeNo, method) {
+				const app = this
+				// 交易查询
+				// 查询第三方支付订单是否付款成功
+				CashierApi.tradeQuery({
+						outTradeNo,
+						method,
+						client: app.platform
+					})
+					.then(result => {
+						if (result.data.isPay) {
+							uni.showToast({
+								title: result.message || "支付成功",
+								icon: 'success'
+							})
+
+							setTimeout(() => {
+								uni.switchTab({
+									url: "/pages/user/index"
+								})
+							}, 1000)
+						} else {
+							uni.showToast({
+								title: result.message || "支付失败",
+								icon: 'none'
+							})
+						}
+					})
+					.finally(() => app.showConfirmModal = false)
+			},
+			tabItem1(i) {
+				// if (this.paymentMethods[i].method == 'huifu') {
+				// 	this.$toast('抱歉，此支付方式暂未完善')
+				// 	return
+				// }
+				this.payIndex = i
+				if (this.paymentMethods[i].method == "huifu") {
+					this.huifuPay();
+				}
+			},
+			onChage(index) {
+				this.radius = index == 0 ? '28rpx 0 0 0' : '0 28rpx 0 0';
+				this.leftNum = index == 0 ? 33.33333 : 66.66666;
+				this.tabIndex = index;
+				this.getRetailList()
+				this.getDescribe()
+			},
+			onChageBan(index) {
+				this.banIndex = index
+				this.getRetailList()
+			},
+			onChagePrice(index) {
+				this.priceIndex = index;
+				if (this.paymentMethods[this.payIndex].method == "huifu") {
+					this.huifuPay();
+				}
+			},
+			getBan() {
+				let that = this
+				that.tabFavour.forEach(item => {
+					if (item.year == 1) {
+						item.price = item.year * that.tabType[that.banIndex].retail_current_price
+					}
+					if (item.year == 2) {
+						item.price = Number((Number(item.year * (that.tabType[that.banIndex]
+							.retail_current_price)) - Number(that.tabType[that.banIndex]
+							.retail_discounts)).toFixed(2))
+					}
+				});
+			},
+			// 设置默认的支付方式
+			setDefaultPayType() {
+				const app = this
+				const defaultIndex = app.paymentMethods.findIndex(item => item.is_default == true)
+				defaultIndex > -1 && app.tabItem1(defaultIndex);
+			},
+			huifuPay() {
+				const that = this
+				let params = {
+					retail_price_id: that.tabType[that.banIndex].retail_price_id,
+					year: that.tabFavour[that.priceIndex].year,
+					method: 'huifu',
+					client: 'MP-WEIXIN'
+				}
+				api.submit(params)
+					.then(result => {
+						console.log(result);
+						const {
+							miniPayRequest,
+							out_trade_no
+						} = result.data.payment;
+						that.miniPayRequest = miniPayRequest;
+						that.miniPayRequest.out_trade_no = out_trade_no;
+					})
+					.finally(() => that.isLoading = false)
+			},
+			//微信支付
+			async toWechatPay() {
+				const that = this;
+				const {
+					status,
+					data
+				} = await api.submit({
+					method: 'wechat',
+					client: "MP-WEIXIN",
+					retail_price_id: that.tabType[that.banIndex].retail_price_id,
+					year: that.tabFavour[that.priceIndex].year
+				})
+				if (status == 200) {
+					Wechat.payment({
+							orderKey: data.payment.out_trade_no,
+							...data.payment
+						})
+						.then((result) => {
+							console.log(22, result)
+							uni.showToast({
+								title: "支付成功",
+								icon: 'success'
+							})
+							this.isClick = true;
+							setTimeout(() => {
+								uni.switchTab({
+									url: "/pages/user/index"
+								})
+							}, 1000)
+						})
+						.catch(err => {
+							uni.showToast({
+								title: "支付失败",
+								icon: 'none'
+							})
+							this.isClick = true;
+						})
+				}
+
+			},
+			//去支付 余额支付
+			async toPay() {
+				const that = this;
+				const {
+					status,
+					message
+				} = await api.submit({
+					method: 'balance',
+					client: "MP-WEIXIN",
+					retail_price_id: that.tabType[that.banIndex].retail_price_id,
+					year: that.tabFavour[that.priceIndex].year
+				})
+				if (status == 200) {
+					uni.showToast({
+						title: "支付成功"
+					})
+					this.isClick = true;
+					setTimeout(() => {
+						uni.switchTab({
+							url: "/pages/user/index"
+						})
+					}, 1000)
+				} else {
+					this.isClick = true;
+					uni.showToast({
+						icon: "none",
+						title: message
+					})
+				}
+			},
+			// 支付
+			async submitPay() {
+				let that = this;
+				if (that.isClick == false) {
+					return;
+				}
+				that.isClick = false;
+				if (that.paymentMethods[that.payIndex].method == "balance") {
+					if (Number(that.tabFavour[that.priceIndex].price) <= Number(that.userInfo.balance)) {
+						that.toPay()
+					} else {
+						that.isClick = true;
+						uni.showToast({
+							icon: "none",
+							title: "余额不足，请选择其他支付方式"
+						})
+					}
+				} else if (that.paymentMethods[that.payIndex].method == "wechat") {
+					that.toWechatPay();
+				} else if (that.paymentMethods[that.payIndex].method == "huifu") {
+					that.isClick = true;
+					if (!this.miniPayRequest || Object.keys(this.miniPayRequest).length === 0) {
+						this.$toast(`暂无${this.PayMethodEnum[this.payType].name}支付信息`);
+						return
+					}
+					let appPayRequest = '';
+					appPayRequest = encodeURIComponent(JSON.stringify({
+						sign: this.miniPayRequest.sign,
+						prepayid: this.miniPayRequest.prepayid,
+					}));
+					uni.openEmbeddedMiniProgram({
+						appId: this.miniPayRequest.miniuser,
+						path: `${this.miniPayRequest.minipath}?appPayRequest=${appPayRequest}`
+					});
+				}
+			},
+			// 会员权益
+			async getDescribe() {
+				let that = this;
+				let {
+					status,
+					message,
+					data
+				} = await api.describe({
+					type: this.tabIndex == 0 ? 10 : 20
+				});
+				if (status == 200) {
+					let list = Object.values(data.group)
+					let all = [{
+						name: '板块',
+						list: [{
+							feature: '功能',
+							air: 'air',
+							airIndex: 1,
+							pro: 'pro',
+							proIndex: 1,
+							H5: 'H5',
+							H5Index: 1,
+							function_description: '说明',
+							plate_id: 1
+						}]
+
+					}]
+					list = all.concat(list)
+					console.log(list)
+					this.equityList = list
+
+				} else {
+					that.$toast(message)
+				}
+			},
+			removeEmptyLines(htmlContent) {
+				// 使用正则表达式匹配连续的空白字符（包括空格、制表符、换页符等）
+				// 匹配两个换行符之间的任何内容，但不包括这两个换行符
+				const regex = />\s*\n\s*</g;
+				// 替换掉所有匹配到的内容为一个空格，这样就去除了空行
+				const newContent = htmlContent.replace(regex, ' > <');
+				return newContent;
+			},
+			// 列表
+			async getRetailList() {
+				let that = this;
+				let pames = {
+					retail_type: this.tabIndex == 0 ? 10 : 20,
+					client: 'MP-WEIXIN',
+				}
+				let {
+					status,
+					message,
+					data
+				} = await api.retailList(pames);
+				if (status == 200) {
+					that.userInfo = data.list.personal;
+					data.list.list.forEach(item => {
+						item.jian = Number((Number(item.retail_original_price) - Number(item
+							.retail_current_price)).toFixed(2))
+					})
+					that.tabType = data.list.list
+					that.paymentMethods = data.list.paymentMethods;
+					that.retail = this.removeEmptyLines(data.list.retail)
+					that.wholesale = this.removeEmptyLines(data.list.wholesale)
+					that.getBan()
+					this.setDefaultPayType();
+				} else {
+					that.$toast(message)
+				}
+			},
+		}
+	}
+</script>
+<style>
+	page {
+		background: #fff;
+	}
+</style>
+<style lang="scss" scoped>
+	::v-deep .u-empty {
+		padding: 100rpx 0;
+	}
+
+	page {
+		width: 100%;
+	}
+
+	.content {
+
+		padding: 0rpx 30rpx 40rpx 30rpx;
+		border-radius: 16rpx;
+		font-size: 30rpx;
+		color: #333;
+
+		.content-title {
+			font-size: 32rpx;
+			font-weight: 700;
+			height: 110rpx;
+			text-align: center;
+			line-height: 110rpx;
+		}
+
+		.content-box {
+			font-size: 28rpx;
+			line-height: 40rpx;
+		}
+	}
+
+	::v-deep .u-mode-center-box {
+		border-radius: 8rpx;
+	}
+
+	.warp {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+		width: 100%;
+		position: relative;
+		background: black;
+		z-index: 999;
+	}
+
+	.park {
+		height: 100%;
+		width: 100%;
+		background: rgba(255, 255, 255, 1);
+
+		.park-top {
+			width: 100%;
+			height: 380rpx;
+			background: url(https://www.royaum.com.cn/static/user/gmallBg.png) center top no-repeat;
+			background-size: 100% 100%;
+		}
+
+		.box_1 {
+			flex-direction: row;
+			display: flex;
+			align-items: center;
+			margin: 40rpx auto 0 36rpx;
+			position: relative;
+		}
+
+		.image_2 {
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 50%;
+		}
+
+		.image_1 {
+			position: absolute;
+			width: 340rpx;
+			height: 316rpx;
+			bottom: -190rpx;
+			right: 35rpx;
+			z-index: 1;
+			transform: rotate(10deg)
+		}
+
+		.group_1 {
+			height: 96rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			margin: 2rpx 0 0 30rpx;
+
+			button:after {
+				border: none !important;
+			}
+		}
+
+		.image-text_1 {
+			font-size: 28rpx;
+			font-size: 28rpx;
+			font-weight: 400;
+			letter-spacing: 0rpx;
+			line-height: 40rpx;
+			color: rgba(102, 102, 102, 1);
+			text-align: left;
+
+		}
+
+		.image-text_2 {
+			font-size: 40rpx;
+			font-weight: 500;
+			letter-spacing: 0rpx;
+			line-height: 56rpx;
+			color: rgba(51, 51, 51, 1);
+			text-align: left;
+			vertical-align: top;
+
+		}
+
+		.tab_fix {
+			overflow: hidden;
+			position: -webkit-sticky;
+			position: sticky;
+			top: 0;
+			z-index: 99999;
+			background: linear-gradient(180deg, rgba(253, 202, 197, 1) 0.42%, rgba(254, 231, 229, 1) 32.99%, rgba(255, 255, 255, 1) 100%);
+		}
+
+		.tab_pos {
+			position: relative;
+			width: 100%;
+			height: 126rpx;
+
+		}
+
+		.tab_posxi {
+			// background: #fdcac5;
+			width: 100%;
+			height: 120rpx;
+		}
+
+		.tab_bg {
+			position: absolute;
+			width: 100%;
+			height: 126rpx;
+			z-index: 9;
+			display: flex;
+			justify-content: center;
+			// border-radius: 28rpx 28rpx, 0rpx, 0rpx;
+
+		}
+
+		.tab_a {
+			width: 50%;
+			height: 126rpx;
+			font-size: 36rpx;
+			font-weight: 500;
+			letter-spacing: 0rpx;
+			line-height: 126rpx;
+			color: rgba(184, 169, 169, 1);
+			text-align: left;
+			vertical-align: top;
+			text-align: center;
+		}
+
+		.tab_active {
+			width: 376rpx;
+			height: 126rpx;
+			background: linear-gradient(180deg, rgba(255, 245, 245, 1) 0%, rgba(255, 255, 255, 0) 100%);
+			border: 4rpx solid rgba(255, 255, 255, 1);
+			font-size: 36rpx;
+			font-weight: 500;
+			line-height: 126rpx;
+			color: rgba(51, 51, 51, 1);
+			text-align: center;
+			border-radius: 28rpx;
+		}
+
+		.tab-type {
+			display: flex;
+			// justify-content: space-between;
+			// justify-content: space-evenly;
+			overflow: hidden;
+			flex-wrap: wrap;
+			margin: 0 17rpx;
+
+			.tab-pro-active {
+				background: linear-gradient(180deg, rgba(255, 238, 237, 1) 0%, rgba(255, 202, 201, 1) 66.15%, rgba(255, 173, 173, 1) 100%) !important;
+				border: 4rpx solid rgba(243, 74, 64, 1) !important;
+			}
+
+			.tab-pro {
+				margin: 20rpx 13rpx 0 13rpx;
+				width: 214rpx;
+				height: 248rpx;
+				border-radius: 20rpx;
+				background: linear-gradient(180deg, rgba(255, 255, 255, 1) 40%, rgba(255, 217, 217, 0.01) 100%);
+				border: 4rpx solid rgba(255, 235, 235, 1);
+				overflow: hidden;
+				position: relative;
+
+				.tab-name {
+					width: 100%;
+					font-size: 30rpx;
+					font-weight: 500;
+					letter-spacing: 0rpx;
+					line-height: 42rpx;
+					color: rgba(51, 51, 51, 1);
+					margin-top: 35rpx;
+					text-align: center;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					overflow: hidden;
+					-webkit-line-clamp: 1;
+					white-space: normal
+				}
+
+				.tab-price {
+					text-align: center;
+					width: 100%;
+					font-size: 48rpx;
+					font-weight: 700;
+					line-height: 55rpx;
+					color: rgba(243, 74, 64, 1);
+					margin: 8rpx 0 0 0;
+				}
+
+				.tab-line {
+					width: 100%;
+					font-size: 28rpx;
+					font-weight: 400;
+					letter-spacing: 0rpx;
+					line-height: 40rpx;
+					text-decoration-line: line-through;
+					color: rgba(166, 166, 166, 1);
+					text-align: center;
+				}
+
+				.tab-quan {
+					border-radius: 50%;
+					width: 132rpx;
+					height: 132rpx;
+					transform: rotate(-44.85deg);
+					border: 40rpx solid rgba(243, 74, 64, 0.06);
+					position: absolute;
+					right: -50rpx;
+					bottom: -50rpx;
+				}
+
+				.tab-jian-active {
+					background: rgba(243, 74, 64, 1) !important;
+				}
+
+				.tab-jian {
+					position: absolute;
+					bottom: 0;
+					width: 100%;
+					height: 48rpx;
+					opacity: 1;
+					border-radius: 0rpx 0rpx, 20rpx, 20rpx;
+					background: rgba(255, 161, 162, 1);
+					line-height: 48rpx;
+					text-align: center;
+					opacity: 1;
+					font-size: 24rpx;
+					font-weight: 400;
+					color: rgba(255, 255, 255, 1);
+
+				}
+			}
+
+		}
+
+		.tab-box {
+			margin: 10rpx 30rpx 24rpx 30rpx;
+			overflow: hidden;
+			.tabFavour {
+				display: flex;
+				justify-content: space-between;
+				margin-top: 42rpx;
+
+				.favour {
+					width: 336rpx;
+					height: 144rpx;
+					border-radius: 20rpx;
+					background: linear-gradient(90deg, rgba(255, 255, 255, 0.01) 0%, rgba(255, 243, 242, 0.89) 100%);
+					border: 4rpx solid rgba(255, 235, 235, 1);
+					position: relative;
+
+					// .tab-quan {
+					// 				border-radius: 50%;
+					// 				width: 132rpx;
+					// 				height: 132rpx;
+					// 				transform: rotate(-44.85deg);
+					// 				border: 40rpx solid rgba(243, 74, 64, 0.06);
+					// 				position: absolute;
+					// 				right: -50rpx;
+					// 				bottom: -50rpx;
+					// 				overflow: hidden;
+					// 			}
+					.favour_active {
+						z-index: 99;
+						top: -20rpx;
+						left: 0;
+						line-height: 40rpx;
+						position: absolute;
+						padding: 0 18rpx;
+						height: 40rpx;
+						border-radius: 0rpx 24rpx 24rpx 24rpx;
+						background: linear-gradient(90deg, rgba(243, 74, 64, 1) 0%, rgba(255, 142, 89, 1) 100%);
+						font-size: 24rpx;
+						font-weight: 400;
+						letter-spacing: 0rpx;
+						color: rgba(255, 255, 255, 1);
+					}
+
+					.favour_infor {
+						margin: 35rpx 20rpx 0 20rpx;
+						display: flex;
+						justify-content: space-between;
+
+						.favour_year {
+							font-size: 32rpx;
+							font-weight: 700;
+							letter-spacing: 0rpx;
+							line-height: 45rpx;
+							color: rgba(51, 51, 51, 1);
+
+						}
+
+						.favour_tips {
+							font-size: 26rpx;
+							font-weight: 400;
+							letter-spacing: 0rpx;
+							line-height: 45rpx;
+							color: rgba(153, 153, 153, 1);
+
+						}
+					}
+
+					.favour_price {
+						font-size: 48rpx;
+						font-weight: 700;
+						letter-spacing: 0rpx;
+						line-height: 67rpx;
+						color: rgba(243, 74, 64, 1);
+
+					}
+				}
+
+
+
+				.favourActive {
+					background: linear-gradient(91.32deg, rgba(255, 248, 247, 0.56) 0%, rgba(255, 185, 181, 1) 100%) !important;
+					border: 4rpx solid rgba(243, 74, 64, 1) !important;
+				}
+			}
+
+			.tab-title {
+				overflow: hidden;
+				height: 100rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-top: 15rpx;
+
+				.name {
+					font-size: 32rpx;
+					font-weight: 700;
+					color: rgba(51, 51, 51, 1);
+
+					image {
+						width: 30rpx;
+						height: 30rpx;
+						margin: 0 10rpx;
+					}
+
+				}
+
+			}
+
+			.equity {
+				margin-bottom: 60rpx;
+				position: relative;
+
+				.table_box {
+					overflow: hidden;
+					border-radius: 20rpx;
+				}
+
+				::v-deep .u-table {
+					border: none !important;
+				}
+
+				::v-deep u-td,
+				u-th {
+					display: flex !important;
+					flex: auto !important
+				}
+
+				::v-deep .box_content .u-tr {
+					border: 1rpx solid #e4e7ed;
+				}
+
+				::v-deep .box_content .u-tr {
+					border-left: none;
+					border-right: none;
+					border-bottom: none;
+				}
+
+				::v-deep u-tr:nth-child(1) .box_content u-tr:nth-child(1) .flex-1 {
+					background-color: #e3e6f5;
+					color: #333 !important;
+					font-size: 34rpx;
+					font-weight: 700;
+				}
+
+				::v-deep u-tr:nth-child(1) .box_content u-tr:nth-child(1) .flex-2 {
+					background-color: #f6cdb1;
+					font-size: 34rpx;
+					font-weight: 700;
+				}
+
+				::v-deep u-tr:nth-child(1) .box_content u-tr:nth-child(1) .flex-3 {
+					background-color: #fe9a9a;
+					font-size: 34rpx;
+					font-weight: 700;
+				}
+
+				::v-deep u-tr:nth-child(1) .box_content u-tr:nth-child(1) .flex-4 {
+					background-color: #5a74e3;
+					font-size: 34rpx;
+					font-weight: 700;
+				}
+
+				::v-deep u-tr:nth-child(1) {
+					border-top: none;
+				}
+
+				.box_name {
+					width: 10%;
+					border-top: 1rpx solid #e4e7ed;
+				}
+
+				::v-deep .box_name {
+					background: #D6D6D6;
+				}
+
+				.box_content {
+					width: 80%;
+				}
+
+				.box_cus {
+					text-align: center;
+					padding: 10px 3px !important;
+					height: auto;
+					vertical-align: middle;
+					width: 25%;
+					// border-left: 1rpx solid #e4e7ed;
+
+					.box_view {
+						display: flex;
+						align-items: center;
+						height: 100%;
+						justify-content: center;
+						flex-grow: 1;
+						vertical-align: middle;
+						color: #333;
+						font-size: 28rpx;
+
+						image {
+							width: 30rpx;
+							height: 30rpx;
+							margin: 0 auto;
+							margin-left: calc(50% - 15rpx);
+							display: block;
+							vertical-align: middle;
+						}
+					}
+
+					.box_tips {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+					}
+
+				}
+
+				.flex-1 {
+					width: 28% !important;
+					background-color: #F5F5F5;
+				}
+
+				.flex-2,
+				.flex-3,
+				.flex-4 {
+					width: 24% !important;
+				}
+
+				.flex-2 {
+					background-color: #fef4e8;
+				}
+
+				.flex-3 {
+					background-color: #feeaeb;
+				}
+
+				.flex-4 {
+					background-color: #eeedfd;
+				}
+
+				.box_cus:nth-child(1) {
+					border-left: none;
+				}
+
+				::v-deep .u-td {
+					border: none !important;
+					padding: 0 !important;
+				}
+			}
+
+			.advantage {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				overflow: hidden;
+
+				.advantage-tips {
+					font-size: 26rpx;
+					font-weight: 400;
+					letter-spacing: 0rpx;
+					line-height: 40rpx;
+					color: rgba(51, 51, 51, 1);
+					text-align: left;
+
+					rich-text {
+						line-height: 50rpx !important;
+					}
+
+				}
+			}
+		}
+	}
+
+	.bottomBtn {
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		height: 180upx;
+		z-index: 88;
+		background: #fff;
+
+		.paytext {
+			line-height: 24rpx;
+			font-size: 20rpx;
+			color: #333;
+			margin: 0 160rpx;
+			text-align: center;
+		}
+
+	}
+
+	.submitBtn {
+		height: 85rpx;
+		line-height: 85upx;
+		background: #FFAAA4;
+		background: #FE483B;
+		border-radius: 36px;
+		font-size: 30rpx;
+		font-weight: 700;
+		letter-spacing: 0rpx;
+		color: rgba(255, 255, 255, 1);
+		text-align: center;
+		margin: 20rpx 58rpx 16rpx 58rpx;
+	}
+
+	.payment-method {
+		width: 100%;
+		margin: 20rpx 0 220rpx 0;
+		padding: 0 40rpx 0 20rpx;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+
+		.title {
+			padding: 30rpx 0 30rpx 20rpx;
+			font-size: 30rpx;
+		}
+
+		.pay-item {
+			padding: 26rpx 0;
+			font-size: 28rpx;
+			border-bottom: 1rpx solid rgb(248, 248, 248);
+
+			&:last-child {
+				border-bottom: none;
+			}
+
+			.item-left_icon {
+				width: 100rpx;
+				text-align: center;
+				font-size: 60rpx;
+
+				&.wechat {
+					color: #00c800;
+				}
+
+				&.alipay {
+					color: #009fe8;
+				}
+
+				&.balance {
+					color: #ff9700;
+				}
+
+				&.huifu {
+					color: #009fe8;
+				}
+			}
+
+			.huifu-box {
+				width: 100rpx;
+				display: flex;
+				justify-content: center;
+
+				.huifu {
+					height: 44rpx;
+				}
+			}
+
+			.item-left_text {
+				font-size: 28rpx;
+			}
+
+			.item-right {
+				font-size: 32rpx;
+			}
+
+			.user-balance {
+				margin-left: 20rpx;
+				font-size: 26rpx;
+			}
+		}
+
+	}
+</style>
diff --git a/pages/gamll/rules.vue b/pages/gamll/rules.vue
new file mode 100644
index 0000000..6fc1511
--- /dev/null
+++ b/pages/gamll/rules.vue
@@ -0,0 +1,47 @@
+<template>
+	<view class="pages">
+		<view class="content" v-html="strings">
+		</view>
+	</view>
+</template>
+
+<script>
+		import * as api from '@/api/tutorial'
+	export default{
+		data(){
+			return{
+				strings:'',
+			}
+		},
+		onLoad(options){
+			this.getSoftAgreementData()
+		},
+		methods:{
+			// 列表
+			async getSoftAgreementData() {
+				let that = this;
+				let {
+					status,
+					message,
+					data
+				} = await api.getSoftAgreement({type:'soft'});
+				if (status == 200) {
+					this.strings=data.detail.content
+				} else {
+					that.$toast(message)
+				}
+			},
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.pages{
+		width: 100%;
+		height: 100%;
+		padding: 30rpx;
+		span{
+			white-space: normal !important
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index dad30ce..1d3e8d0 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -431,7 +431,7 @@
 							物流查询
 						</view>
 					</view>
-				<!-- 	<view class="serveIcon" @click="goJump('/pages/news3/vipPrice?type=0')"
+					<!-- 	<view class="serveIcon" @click="goJump('/pages/news3/vipPrice?type=0')"
 						v-if="userInfo.user_type == 40">
 						<image :src="$picUrl+'/static/user/member.png'" class="icons"></image>
 						<view class="serveInfo">
@@ -510,19 +510,29 @@
 							会员管理
 						</view>
 					</view>
-					<view class="serveIcon" v-if="userInfo.user_type == 40 || userInfo.user_type == 30 || userInfo.user_type == 20"  @click="goJump('/pages/news1/jinqun')">
+					<view class="serveIcon"
+						v-if="userInfo.user_type == 40 || userInfo.user_type == 30 || userInfo.user_type == 20"
+						@click="goJump('/pages/news1/jinqun')">
 						<image :src="$picUrl+'/static/user/jq.png'" class="icons"></image>
 						<view class="serveInfo">
 							进群有礼
 						</view>
 					</view>
 					<!-- course -->
-					<view class="serveIcon" v-if="userInfo.user_type == 40"  @click="goJump('/pages/merchantTutorial/tutorial')">
+					<view class="serveIcon" v-if="userInfo.user_type == 40"
+						@click="goJump('/pages/merchantTutorial/tutorial')">
 						<image :src="$picUrl+'/static/user/course.png'" class="icons"></image>
 						<view class="serveInfo">
 							商家教程
 						</view>
 					</view>
+					<!-- v-if="is_show_open_shop_buttun== 10" -->
+					<view class="serveIcon"  @click="goJump('/pages/gamll/index')">
+						<image :src="$picUrl+'/static/user/gmall.png?t=1'" class="icons"></image>
+						<view class="serveInfo">
+							开通商城
+						</view>
+					</view>
 				</view>
 			</view>
 			<!-- 商品推荐 -->
@@ -532,30 +542,29 @@
 			</view>
 			<view class="goodsRecommend" v-if="isLogin == false || userInfo.user_type != 40">
 				<!-- <u-waterfall v-model="goodsRecommend" ref="uWaterfall1"> -->
-					<!-- <template v-slot:left="{leftList}"> -->
-						<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="goodsDetail(item)"
-							:key="index">
-							<view class="pic">
-								<image :src="item.goods_image" mode="aspectFill"></image>
-							</view>
-							<view class="goodsInfo">
-								<view class="title">
-									<!-- <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text> -->
-									<text class="name">{{item.goods_name}}</text>
-								</view>
-								<view class="price" style="margin-top: 12rpx;">
-									<text style="font-size: 26rpx;">￥</text>
-									<text style="font-weight: bold;font-size: 32rpx;">{{item.goods_price_min}}</text>
-									<text style="font-size: 20rpx;margin-left:10rpx;"></text>
-									<text
-										style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
-								</view>
-								<!-- 	<view class="goodsInfo1" v-if="item.cmmdty_model">
+				<!-- <template v-slot:left="{leftList}"> -->
+				<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="goodsDetail(item)" :key="index">
+					<view class="pic">
+						<image :src="item.goods_image" mode="aspectFill"></image>
+					</view>
+					<view class="goodsInfo">
+						<view class="title">
+							<!-- <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text> -->
+							<text class="name">{{item.goods_name}}</text>
+						</view>
+						<view class="price" style="margin-top: 12rpx;">
+							<text style="font-size: 26rpx;">￥</text>
+							<text style="font-weight: bold;font-size: 32rpx;">{{item.goods_price_min}}</text>
+							<text style="font-size: 20rpx;margin-left:10rpx;"></text>
+							<text
+								style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
+						</view>
+						<!-- 	<view class="goodsInfo1" v-if="item.cmmdty_model">
 									<view class="oneTip">
 										{{item.cmmdty_model}}
 									</view>
 								</view> -->
-								<!-- <view class="goodsSend">
+						<!-- <view class="goodsSend">
 									<view class="sendLeft">
 										<view class="left_1">
 											{{item.goods_source}}
@@ -574,10 +583,10 @@
 										<text v-if="item.delivery_time==6">45天内发货</text>
 									</view>
 								</view> -->
-							</view>
-						</view>
-					<!-- </template> -->
-					<!-- <template v-slot:right="{rightList}">
+					</view>
+				</view>
+				<!-- </template> -->
+				<!-- <template v-slot:right="{rightList}">
 						<view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList"
 							@click="goodsDetail(item)" :key="index">
 							<view class="pic">
@@ -658,7 +667,7 @@
 		</view>
 		<canvas id="myCanvas" class="myCanvas" canvas-id="myCanvas"
 			:style="{'width': 702/devicePixelRatio+'px',' height': 1000/devicePixelRatio+'px',position: 'absolute',left:'-100000px',top:'-100000px'}"></canvas>
-	<addShuiyin />
+		<addShuiyin />
 	</view>
 </template>
 <script>
@@ -728,7 +737,7 @@
 			}
 		},
 		onReachBottom() {
-		  if (!this.recommendFinish) {
+			if (!this.recommendFinish) {
 				this.getSuggest()
 			}
 		},
@@ -878,7 +887,9 @@
 			},
 			getSuggest() {
 				// 获取推荐商品
-				Api.recommendedNew({ page: this.recommendPage++ }).then(res => {
+				Api.recommendedNew({
+					page: this.recommendPage++
+				}).then(res => {
 					console.log(res);
 					let arr = res.data.goodsList.data
 					if (arr && arr.length > 0) {
@@ -888,14 +899,14 @@
 							arr[i].line_price_min = Number(arr[i].line_price_min);
 							arr[i].line_price_max = Number(arr[i].line_price_max)
 						}
-					}	
+					}
 					if (arr.length < res.data.goodsList.per_page) {
 						this.recommendFinish = true;
 					}
-						this.recommendLoadTitle = this.recommendFinish ? "已全部加载完" : "上拉加载更多";
+					this.recommendLoadTitle = this.recommendFinish ? "已全部加载完" : "上拉加载更多";
 					this.goodsRecommend = [...this.goodsRecommend, ...arr]
 				})
-			
+
 			},
 			// 刷新页面
 			onRefreshPage() {
@@ -1416,8 +1427,8 @@
 				}
 			}
 		}
-	
-		
+
+
 		.finished {
 			font-size: 28rpx;
 			line-height: 100rpx;
diff --git a/project.config.json b/project.config.json
index ae32f42..7d6cf1c 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,5 +1,5 @@
 {
-  "appid": "wxa3127ed5c3542a28",
+  "appid": "wx8dc1c2620cfd953a",
   "compileType": "miniprogram",
   "libVersion": "3.3.3",
   "packOptions": {
diff --git a/static/user/code.png b/static/user/code.png
deleted file mode 100644
index 0fd214f09f55dae3cff795717dd11753d4e19caa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1520
zcmV<M1rPd(P)<h;3K|Lk000e1NJLTq001Wd001Wl1^@s6jH6LC00001b5ch_0Itp)
z=>Px)s!2paR9HvtSY2!sRTTcdJEcW_gmz~;n?R(yC2AD;eNjRJY7F&NqYp-dMnomr
z@*^lnA}AC|YPFD{C?pylNc>BD!bA~_MkN|h&=3;3TTC&#-Pr}&g8kcjWOjGjZP`wD
z+a^TgJZv-5bHDq|nRCzi&LOhbtbloM39u1@B_OA`&-48iND|<&R0`YA$Kxl5vz_Jl
zFE9+e3dnr~%RMngI!OM|2ibK#Y9DoM>HLH&-zI=NNT%-#zobWNSs7_d92~kPSm}F0
zkq1CdC>#$E5e>+ea4fNtj>ina*CbUjAUU?(x=-dsZ2PSHENGgyv4p=8m^d0t5s?&e
zKdS@&F99rfK%CDd!i_>X=Lsq@Pf_i1Hy17MhTH7b?wXKgzDM%e3?{lDvRM-+yfBTF
z1jXQ61S_&!4l`t#?IfqB7pC-6&GE#Cg}iOh^1Y#`wxodszlUS-y9UVlPmxI9i<WKS
zHhXJfnEs~~u|I7q(&>0k+=VH~vX-d*Z6QF_0pAKhrC&sVmT)v4>?arSM+j79?)8(+
z(ZolEU{(dpr3QG+wf*;!n=y5&uWVA;4iHy*qV|?n;BWV>M(epMV4@0`J1Cgab+vo*
zg^rGdi&>QCf|j{Yk*hKxpf`nMi8see&PiLOs?T7`zHrQbZdBw#0n<4>>oNhVYnx+<
zJ!2&ow0tirs@>TW*%*%6>qkXyCU8@!<zFMvosn2#uXCQqN)CV#w0x@xOzw&$cK-!j
z9ThpR6E@nI^TI4D=59E-P{2&OMOj4Fg=6;Hh2*4=Wj2yrn~j|l;i$c6;FFst04_*p
zInlc#u|!=Vm{pdq)}U(2VkQ|1_&+7^a5kBCLCY>GiFko&!9s#Bxb;}HG=|#-0=qh3
zHULZqdZv)0iIm?)z?@C0m-<U0@Hrh>Q=;T}vFgFyNJK96^vRsoMB;+`Y^KjQqqKy7
zkepVC$MV>8_oZ-8S|T~}hDyC(w2Bb9tVKT(X-j@Jbc0}J#RH`JnB?>#33h3%S2;4Q
zU%#bgj)AoR7lX(MfnhE}E^3V<y(xJo*JDG?(;hUqjta{pt2TxO6?8)6JJD!z<yVp7
zvPd6{(fogMqjlimm{V8-atR2}28WJf);QLalE!>7SLLs$F_dZ$a<V5eEoXYVdLD0W
zZ%=0JRLJr*f~*lO_5G(+DfIz>vSQxSNh2cq(V?d`Wcg2%m{SOr*0LeeW;Zyt)uy=!
zCHy6mA8{p<=M4D?U}+&>*V%|%?(UO2b3GUuq=dau1+q09wYND|*VWcg!2cP6hujJw
zq8k+9+2Dw99)LQxLTD`wkv4mSOJfi@k^P{2pG#4|R|wvo+0&DpnQ%KEh^}jnCDK}J
zq$_ConiN%S#!gN)N9~1q$>r%GssrZHYfbsG5y{<%2Is#|E~A8fbp)<7kDn68xOgtN
zhtQ&HBjeCRq*KPAm_rL8E!p%jo#cEsc0K#nL1P8M=5Q>&(_J_gnVw6|>)?5kbNbfO
zNoDmUI>)PTb;yJ&&An87-ZLYJoVg(#ztdRL@;yUlhBntHcJ`>=)WI7<ZloMK5ObE<
z;Z8EOU}Yp0KTycxP^Gz*imzn@`E)oIpIc}WE(G7PVRgVf46r7ft&>d2`jkP>21f}N
zf^<|vdN??AtT4E?=ASYJE6eAy7ni~pFaDWJHdJ0dEj596oNr71>`pe16hCs!7A~Mm
z`ec6YWOF2PA<JBIt@&|U(C(Dzr7f|<aR+U7Ma9j!RGlVxix&AJcP6~O_|a?rnQ$mz
zo+Wr|)~k<&WA>q3?+luz<_w6ctctr08b4;fBD(v<W@ef$FN<(-|D<!6;7Cu?wS1Ej
zRiAH~Ugh_#FckL)aH>6p2W{K#$c1t`Go_3}5Q(u@FF%(|wr2ldQf--^2w4Nsum1xj
Wh|WbR=$q>R0000<MNUMnLSTZ|6wTcL

diff --git a/static/user/manage.png b/static/user/manage.png
deleted file mode 100644
index 09b1ee7aa9c22b364cc5006879ffea4b993fc611..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9536
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


From b3f45ea6760745dc4d8e388db70d4a360c28e573 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sat, 3 Aug 2024 22:03:30 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/index.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pages/user/index.vue b/pages/user/index.vue
index 1d3e8d0..d863535 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -526,8 +526,7 @@
 							商家教程
 						</view>
 					</view>
-					<!-- v-if="is_show_open_shop_buttun== 10" -->
-					<view class="serveIcon"  @click="goJump('/pages/gamll/index')">
+					<view v-if="is_show_open_shop_buttun== 10" class="serveIcon"  @click="goJump('/pages/gamll/index')">
 						<image :src="$picUrl+'/static/user/gmall.png?t=1'" class="icons"></image>
 						<view class="serveInfo">
 							开通商城

From 9c1a60484eb387d9788cf7832e2cd4fc6a68065f Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sat, 3 Aug 2024 22:11:30 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gamll/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/gamll/index.vue b/pages/gamll/index.vue
index a22428f..ef24618 100644
--- a/pages/gamll/index.vue
+++ b/pages/gamll/index.vue
@@ -275,7 +275,6 @@
 			this.getRetailList()
 			this.getDescribe()
 			uni.$on('appShow', this.solveShowMsg);
-			uni.showNavigationBarLoading();
 		},
 		onUnload() {
 			uni.$off('appShow', this.solveShowMsg);

From 00acb054f6364889754c92ad39ffc5fd7c9f9c61 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 4 Aug 2024 13:22:03 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gamll/index.vue | 48 +++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/pages/gamll/index.vue b/pages/gamll/index.vue
index ef24618..58a96dd 100644
--- a/pages/gamll/index.vue
+++ b/pages/gamll/index.vue
@@ -3,7 +3,7 @@
 		<view class="park-top">
 			<view class="park-navbar">
 				<!-- :is-fixed='false' -->
-				<u-navbar :is-fixed='false' title="开通商城" :border-bottom="false" :background="backgroundNone">
+				<u-navbar title="开通商城" :border-bottom="false" :background="scrollTop?background:backgroundNone">
 				</u-navbar>
 				<view class="box_1">
 					<image :src="$picUrl+'/static/default-logo.png'" class="image_2"
@@ -20,16 +20,18 @@
 				</view>
 			</view>
 		</view>
-		<view class="tab_fix" :style="{ 'border-radius': radius,'padding-top':paddingTo}">
-			<view class="tab_pos">
-				<view class="tab_bg">
-					<view :class="[tabIndex==index ? 'tab_active' : 'tab_a']" v-for="(item,index) in tabbar"
-						@click="onChage(index)" :key="index">
-						{{item}}
+		<u-sticky offset-top="142">
+			<view class="tab_fix" :style="{ 'border-radius': radius}">
+				<view class="tab_pos">
+					<view class="tab_bg">
+						<view :class="[tabIndex==index ? 'tab_active' : 'tab_a']" v-for="(item,index) in tabbar"
+							@click="onChage(index)" :key="index">
+							{{item}}
+						</view>
 					</view>
 				</view>
 			</view>
-		</view>
+		</u-sticky>
 		<view class="tab-type">
 			<view class="tab-pro" v-for="(item,index) in tabType" :class="index==banIndex?'tab-pro-active':''"
 				@click="onChageBan(index)" :key="index">
@@ -238,7 +240,6 @@
 				paymentMethods: [],
 				isClick: true,
 				radius: '28rpx 0 0 0',
-				paddingTo: '0rpx',
 				leftNum: 33.33333,
 				tabbar: ['零售商城', '批发商城'],
 				tabIndex: 0,
@@ -266,12 +267,10 @@
 				retail: '',
 				wholesale: '',
 				scrollTop: 0,
-				isAtTop: ''
 			}
 		},
 		onLoad() {
 			this.retail = uni.getStorageSync('userInfo').retail
-			console.log(this.retail)
 			this.getRetailList()
 			this.getDescribe()
 			uni.$on('appShow', this.solveShowMsg);
@@ -280,25 +279,22 @@
 			uni.$off('appShow', this.solveShowMsg);
 		},
 		onShow() {
-
+			this.checkIfElementIsAtTop()
 		},
 		onPageScroll(e) {
-			this.checkIfElementIsAtTop()
+			this.scrollTop = e.scrollTop > 120 ? true : false
+			if (this.scrollTop) {
+				this.radius = '0rpx';
+			} else {
+				this.radius = this.tabIndex == 0 ? '28rpx 0 0 0' : '0 28rpx 0 0';
+			}
 		},
 		methods: {
 			checkIfElementIsAtTop() {
 				const query = uni.createSelectorQuery().in(this);
-				query.select('.tab_fix').boundingClientRect(data => {
+				query.select('u-navbar ').boundingClientRect(data => {
 					if (data) {
-						// 元素的top值如果是0，说明它到达了顶部
-						this.isAtTop = data.top === 0;
-						if (this.isAtTop) {
-							this.radius = '28rpx 0 0 0';
-							this.paddingTo = '120rpx';
-						} else {
-							this.radiu = '0';
-							this.paddingTo = '0rpx';
-						}
+						console.log(data, 'kkkkkkkkkkkkkkkkk')
 					}
 				}).exec();
 			},
@@ -720,10 +716,7 @@
 
 		.tab_fix {
 			overflow: hidden;
-			position: -webkit-sticky;
-			position: sticky;
-			top: 0;
-			z-index: 99999;
+			height: 126rpx;
 			background: linear-gradient(180deg, rgba(253, 202, 197, 1) 0.42%, rgba(254, 231, 229, 1) 32.99%, rgba(255, 255, 255, 1) 100%);
 		}
 
@@ -875,6 +868,7 @@
 		.tab-box {
 			margin: 10rpx 30rpx 24rpx 30rpx;
 			overflow: hidden;
+
 			.tabFavour {
 				display: flex;
 				justify-content: space-between;

From e402364ffd804694462a2b5ee015a25a0efc2d4a Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 4 Aug 2024 13:46:35 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gamll/index.vue | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pages/gamll/index.vue b/pages/gamll/index.vue
index 58a96dd..f8b9aef 100644
--- a/pages/gamll/index.vue
+++ b/pages/gamll/index.vue
@@ -3,8 +3,10 @@
 		<view class="park-top">
 			<view class="park-navbar">
 				<!-- :is-fixed='false' -->
-				<u-navbar title="开通商城" :border-bottom="false" :background="scrollTop?background:backgroundNone">
-				</u-navbar>
+				<view class="navbarHeight">
+					<u-navbar title="开通商城" :border-bottom="false" :background="scrollTop?background:backgroundNone">
+					</u-navbar>
+				</view>
 				<view class="box_1">
 					<image :src="$picUrl+'/static/default-logo.png'" class="image_2"
 						@click="goJump('/pages/news1/setting')"></image>
@@ -20,7 +22,7 @@
 				</view>
 			</view>
 		</view>
-		<u-sticky offset-top="142">
+		<u-sticky :offset-top="heightTop">
 			<view class="tab_fix" :style="{ 'border-radius': radius}">
 				<view class="tab_pos">
 					<view class="tab_bg">
@@ -267,9 +269,11 @@
 				retail: '',
 				wholesale: '',
 				scrollTop: 0,
+				heightTop:136,
 			}
 		},
 		onLoad() {
+
 			this.retail = uni.getStorageSync('userInfo').retail
 			this.getRetailList()
 			this.getDescribe()
@@ -279,7 +283,8 @@
 			uni.$off('appShow', this.solveShowMsg);
 		},
 		onShow() {
-			this.checkIfElementIsAtTop()
+			let that = this
+			that.checkIfElementIsAtTop()
 		},
 		onPageScroll(e) {
 			this.scrollTop = e.scrollTop > 120 ? true : false
@@ -290,11 +295,16 @@
 			}
 		},
 		methods: {
+			pxToRpx(px) {
+				const screenWidth = uni.getSystemInfoSync().screenWidth //窗口宽度
+			    let rpx =  (750 * Number.parseInt(px)) / screenWidth //转换单位为rpx
+				return  Number(rpx)
+			},
 			checkIfElementIsAtTop() {
 				const query = uni.createSelectorQuery().in(this);
-				query.select('u-navbar ').boundingClientRect(data => {
+				query.select('.navbarHeight ').boundingClientRect(data => {
 					if (data) {
-						console.log(data, 'kkkkkkkkkkkkkkkkk')
+						this.heightTop=this.pxToRpx(data.height)
 					}
 				}).exec();
 			},

From a1450ef0aa5181f2fb597ea7784f0002c8a1f867 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Sun, 4 Aug 2024 14:07:43 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/index.vue | 4911 ++++++++++++++++++++++--------------------
 1 file changed, 2606 insertions(+), 2305 deletions(-)

diff --git a/pages/user/index.vue b/pages/user/index.vue
index d863535..b6961f3 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,40 +1,69 @@
 <template>
-	<view class="page">
-		<view>
-			<u-navbar :is-back="false" title="" :background="background"></u-navbar>
-		</view>
-		<view class="section_1">
-			<view class="box_1">
-				<image :src="$picUrl+'/static/default-logo.png'" v-if="!isLogin || !userInfo.avatar_url" class="image_2"
-					@click="goJump('/pages/news1/setting')"></image>
-				<image :src="userInfo.avatar_url" @click="goJump('/pages/news1/setting')" v-else class="image_2">
-				</image>
-				<view class="group_1">
-					<view class="image-text_1" v-if="!isLogin" @click="goLogin()">
-						未登录
-					</view>
-					<!--  open-type="chooseAvatar"
+  <view class="page">
+    <view>
+      <u-navbar :is-back="false" title="" :background="background"></u-navbar>
+    </view>
+    <view class="section_1">
+      <view class="box_1">
+        <image
+          :src="$picUrl + '/static/default-logo.png'"
+          v-if="!isLogin || !userInfo.avatar_url"
+          class="image_2"
+          @click="goJump('/pages/news1/setting')"
+        ></image>
+        <image
+          :src="userInfo.avatar_url"
+          @click="goJump('/pages/news1/setting')"
+          v-else
+          class="image_2"
+        >
+        </image>
+        <view class="group_1">
+          <view class="image-text_1" v-if="!isLogin" @click="goLogin()">
+            未登录
+          </view>
+          <!--  open-type="chooseAvatar"
 						@chooseavatar="onChooseAvatar" -->
-					<button class="avatar-wrapper" v-else type="primary" @click="goJump('/pages/news1/setting')">
-						<text lines="1" class="text-group_1">{{userInfo.nick_name}}</text>
-						<!-- <image :src="$picUrl+'/static/user/weChat.png'" class="thumbnail_1"></image> -->
-					</button>
-					<view class="text-wrapper_1" :style="{'width': userInfo.user_type==20?'130rpx':'100rpx' }"
-						v-if="isLogin" @click="wechatLogin">
-						<text lines="1" class="text_1" v-if="userInfo.user_type==40">店长</text>
-						<text lines="1" class="text_1" v-else-if="userInfo.user_type==30">服务商</text>
-						<text lines="1" class="text_1" v-else-if="userInfo.user_type==20">采购商</text>
-						<text lines="1" class="text_1" v-else-if="userInfo.user_type==10">游客</text>
-					</view>
-				</view>
-				<view style="display: flex; flex: 1; justify-content: flex-end;">
-					<view class="group_2">
-						<image :src="$picUrl+'/static/home/news.png'" class="thumbnail"></image>
-						<text lines="1" class="text_2">消息</text>
-						<button open-type="contact" v-if="isLogin"></button>
-					</view>
-					<!-- / -->
-					<!-- <view class="group_4" @click="lookMemberCode('2')"
+          <button
+            class="avatar-wrapper"
+            v-else
+            type="primary"
+            @click="goJump('/pages/news1/setting')"
+          >
+            <text lines="1" class="text-group_1">{{ userInfo.nick_name }}</text>
+            <!-- <image :src="$picUrl+'/static/user/weChat.png'" class="thumbnail_1"></image> -->
+          </button>
+          <view
+            class="text-wrapper_1"
+            :style="{ width: userInfo.user_type == 20 ? '130rpx' : '100rpx' }"
+            v-if="isLogin"
+            @click="wechatLogin"
+          >
+            <text lines="1" class="text_1" v-if="userInfo.user_type == 40"
+              >店长</text
+            >
+            <text lines="1" class="text_1" v-else-if="userInfo.user_type == 30"
+              >服务商</text
+            >
+            <text lines="1" class="text_1" v-else-if="userInfo.user_type == 20"
+              >采购商</text
+            >
+            <text lines="1" class="text_1" v-else-if="userInfo.user_type == 10"
+              >游客</text
+            >
+          </view>
+        </view>
+        <view style="display: flex; flex: 1; justify-content: flex-end">
+          <view class="group_2">
+            <image
+              :src="$picUrl + '/static/home/news.png'"
+              class="thumbnail"
+            ></image>
+            <text lines="1" class="text_2">消息</text>
+            <button open-type="contact" v-if="isLogin"></button>
+          </view>
+          <!-- / -->
+          <!-- <view class="group_4" @click="lookMemberCode('2')"
 						v-if="userInfo.user_type == 20 || userInfo.user_type==40">
 
 						<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_2"></image>
@@ -45,31 +74,37 @@
 						<image :src="$picUrl+'/static/user/code.png'" class="thumbnail_3"></image>
 						<text lines="1" class="text_4">分销码</text>
 					</view> -->
-				</view>
-			</view>
-			<view class="plus" v-if="userInfo.user_type== 20 || userInfo.user_type== 30 "
-				@click="goMember(userInfo.user_type==20?'hy':'fx')">
-				<view class="plusLeft">
-					<view class="leftTop">
-						<image :src="$picUrl+'/static/user/vip.png'" class="vipIcon"></image>
-						<text v-if="userInfo.user_type==20">采购商</text>
-						<text v-if="userInfo.user_type==30">服务商</text>
-					</view>
-					<view class="leftBottom">
-						{{userInfo.user_type==20?userInfo.effective_time:userInfo.fx_effective_time}}到期
-					</view>
-				</view>
-				<view class="plusLine"></view>
-				<view class="plusRight">
-					<view class="rightTop">
-						年终百款好物热兑中！
-					</view>
-					<view class="rightBot">
-						兑换好物别浪费！
-					</view>
-				</view>
-			</view>
-			<!-- <view class="newplus" v-if="isLogin == false || userInfo.user_type == 10">
+        </view>
+      </view>
+      <view
+        class="plus"
+        v-if="userInfo.user_type == 20 || userInfo.user_type == 30"
+        @click="goMember(userInfo.user_type == 20 ? 'hy' : 'fx')"
+      >
+        <view class="plusLeft">
+          <view class="leftTop">
+            <image
+              :src="$picUrl + '/static/user/vip.png'"
+              class="vipIcon"
+            ></image>
+            <text v-if="userInfo.user_type == 20">采购商</text>
+            <text v-if="userInfo.user_type == 30">服务商</text>
+          </view>
+          <view class="leftBottom">
+            {{
+              userInfo.user_type == 20
+                ? userInfo.effective_time
+                : userInfo.fx_effective_time
+            }}到期
+          </view>
+        </view>
+        <view class="plusLine"></view>
+        <view class="plusRight">
+          <view class="rightTop"> 年终百款好物热兑中！ </view>
+          <view class="rightBot"> 兑换好物别浪费！ </view>
+        </view>
+      </view>
+      <!-- <view class="newplus" v-if="isLogin == false || userInfo.user_type == 10">
 				<view class="memVip" @click="goMember('hy')">
 					<image :src="$picUrl+'/static/bg-4.png'" class="icon"></image>
 				</view>
@@ -78,147 +113,238 @@
 					<image :src="$picUrl+'/static/bg-3.png'" class="icon"></image>
 				</view>
 			</view> -->
-			<view class="newplus" v-if="isLogin == false || userInfo.user_type == 10">
-				<view class="memVip" @click="goMember('hy')">
-					<view class="vipLine">
-						<image :src="$picUrl+'/static/user/vip.png'" class="vipIcon"></image>
-						<text>采购商</text>
-					</view>
-					<view class="sec">
-						<text class="inVip">未认证</text>
-						<text class="enjoyVip">享受直采价</text>
-						<u-icon name="arrow-right"></u-icon>
-					</view>
-				</view>
-				<view class="memVip fxVip" @click="goMember('fx')">
-					<view class="vipLine">
-						<image :src="$picUrl+'/static/user/vip.png'" class="vipIcon"></image>
-						<text>服务商</text>
-					</view>
-					<view class="sec">
-						<text class="inVip">加入服务商</text>
-						<text class="enjoyVip">享受服务价</text>
-						<u-icon name="arrow-right"></u-icon>
-					</view>
-				</view>
-			</view>
-			<view class="goodsManage" v-if="userInfo.user_type== 40">
-				<view class="manageTitle">
-					<text lines="1" class="text_5 titleLeft">商品管理</text>
-					<text lines="1" class="text_6 titleRight" @click="goJump('/pages/news/goods/list')">查看全部</text>
-					<u-icon @click="goJump('/pages/news/goods/list')"
-						style="margin-left: 5rpx; color: #909090; margin-top: -5rpx;" name="arrow-right"></u-icon>
-				</view>
-				<!--  -->
-				<view class="grounding">
-					<view class="image-text_2" @click="goJump('/pages/news/goods/addOneGround')">
-						<image :src="$picUrl+'/static/user/shelf.png'" class="label_1"></image>
-						<view class="text-group_2">
-							<text lines="1" class="text_8">一键上架</text>
-						</view>
-					</view>
-					<view class="box_3" @click="goJump('/pages/news/goods/batchdel')">
-						<image :src="$picUrl+'/static/user/deal.png'" class="image_4"></image>
-						<text lines="1" class="text_9">删除商品</text>
-					</view>
-					<view class="image-text_4" @click="goJump('/pages/news/goods/list')">
-						<image :src="$picUrl+'/static/user/search.png'" class="label_3"></image>
-						<text lines="1" class="text-group_4">商品查询</text>
-					</view>
-				</view>
-			</view>
-			<view class="userSell" v-if="userInfo.user_type== 40">
-				<view class="sell">
-					会员分销
-				</view>
-				<view class="type" @click="goManagementHandle('/pages/news/user/vip?type=1','会员管理')">
-					<view class="typeLeft common">
-						会员管理<u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon>
-					</view>
-					<view class="typeRight common" @click="goManagementHandle('/pages/news/user/vip?type=2','分销管理')">
-						<image :src="$picUrl+'/static/user/sale.png'" class="sale"></image>
-						分销管理<u-icon style="margin-left: 10rpx;" name="arrow-right"></u-icon>
-					</view>
-				</view>
-			</view>
-			<view class="coupon" v-if="isLogin == false || userInfo.user_type != 40">
-				<view class="walletList">
-					<view class="listItem" @click="goJump('/pages/news/park/recordHistory')">
-						<view class="num">
-							{{actionCountsInfo.reservation_number?actionCountsInfo.reservation_number:0}}
-						</view>
-						<view class="info">
-							预约记录
-						</view>
-					</view>
-					<view class="listItem" @click="goJump('/pages/news/park/browsingHistory')">
-						<view class="num">
-							{{actionCountsInfo.view_number?actionCountsInfo.view_number:0}}
-						</view>
-						<view class="info">
-							浏览记录
-						</view>
-					</view>
-					<view class="listItem" @click="goShopOrderList()">
-						<view class="num">
-							{{actionCountsInfo.take_goods_number?actionCountsInfo.take_goods_number:0}}
-						</view>
-						<view class="info">
-							提货记录
-						</view>
-					</view>
-					<view class="listItem" @click="goJump('/pages/news/coupon/list')">
-						<view class="num">
-							{{actionCountsInfo.coupon_number?actionCountsInfo.coupon_number:0}}
-						</view>
-						<view class="info">
-							优惠券
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="goodsManage">
-				<view class="manageTitle">
-					<text lines="1" class="text_5 titleLeft">商品订单</text>
-					<text lines="1" class="text_6 titleRight" @click="goGoodsOrder('all')">查看全部</text>
-					<u-icon style="margin-left: 5rpx; color: #909090; margin-top: -5rpx;" name="arrow-right"></u-icon>
-				</view>
-				<view class="grounding goodsOrder">
-					<view class="image-text_21" @click="goGoodsOrder('pay')">
-						<image :src="$picUrl+'/static/user/unpay.png'" class="label_11"></image>
-						<view class="text-group_21">
-							<text class="text_71"
-								v-if="orderTodoInfo.goods_order.payment_number">{{orderTodoInfo.goods_order.payment_number>=100?"99+":orderTodoInfo.goods_order.payment_number}}</text>
-							<text class="text_81">待付款</text>
-						</view>
-					</view>
-					<view class="image-text_21" @click="goGoodsOrder('delivery')">
-						<image :src="$picUrl+'/static/user/unsend.png'" class="label_11"></image>
-						<view class="text-group_21">
-							<text class="text_71"
-								v-if="orderTodoInfo.goods_order.delivery_number">{{orderTodoInfo.goods_order.delivery_number>=100?"99+":orderTodoInfo.goods_order.delivery_number}}</text>
-							<text class="text_81">待发货</text>
-						</view>
-					</view>
-					<view class="image-text_21" @click="goGoodsOrder('receipt')">
-						<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
-						<view class="text-group_21">
-							<text class="text_71"
-								v-if="orderTodoInfo.goods_order.received_number">{{orderTodoInfo.goods_order.received_number>=100?"99+":orderTodoInfo.goods_order.received_number}}</text>
-							<text class="text_81">待收货</text>
-						</view>
-					</view>
-					<view class="image-text_21" @click="goGoodsOrder('complete')">
-						<image :src="$picUrl+'/static/user/over.png'" class="label_11"></image>
-						<view class="text-group_21">
-							<!-- <text class="text_71" 
+      <view class="newplus" v-if="isLogin == false || userInfo.user_type == 10">
+        <view class="memVip" @click="goMember('hy')">
+          <view class="vipLine">
+            <image
+              :src="$picUrl + '/static/user/vip.png'"
+              class="vipIcon"
+            ></image>
+            <text>采购商</text>
+          </view>
+          <view class="sec">
+            <text class="inVip">未认证</text>
+            <text class="enjoyVip">享受直采价</text>
+            <u-icon name="arrow-right"></u-icon>
+          </view>
+        </view>
+        <view class="memVip fxVip" @click="goMember('fx')">
+          <view class="vipLine">
+            <image
+              :src="$picUrl + '/static/user/vip.png'"
+              class="vipIcon"
+            ></image>
+            <text>服务商</text>
+          </view>
+          <view class="sec">
+            <text class="inVip">加入服务商</text>
+            <text class="enjoyVip">享受服务价</text>
+            <u-icon name="arrow-right"></u-icon>
+          </view>
+        </view>
+      </view>
+      <view class="goodsManage" v-if="userInfo.user_type == 40">
+        <view class="manageTitle">
+          <text lines="1" class="text_5 titleLeft">商品管理</text>
+          <text
+            lines="1"
+            class="text_6 titleRight"
+            @click="goJump('/pages/news/goods/list')"
+            >查看全部</text
+          >
+          <u-icon
+            @click="goJump('/pages/news/goods/list')"
+            style="margin-left: 5rpx; color: #909090; margin-top: -5rpx"
+            name="arrow-right"
+          ></u-icon>
+        </view>
+        <!--  -->
+        <view class="grounding">
+          <view
+            class="image-text_2"
+            @click="goJump('/pages/news/goods/addOneGround')"
+          >
+            <image
+              :src="$picUrl + '/static/user/shelf.png'"
+              class="label_1"
+            ></image>
+            <view class="text-group_2">
+              <text lines="1" class="text_8">一键上架</text>
+            </view>
+          </view>
+          <view class="box_3" @click="goJump('/pages/news/goods/batchdel')">
+            <image
+              :src="$picUrl + '/static/user/deal.png'"
+              class="image_4"
+            ></image>
+            <text lines="1" class="text_9">删除商品</text>
+          </view>
+          <view class="image-text_4" @click="goJump('/pages/news/goods/list')">
+            <image
+              :src="$picUrl + '/static/user/search.png'"
+              class="label_3"
+            ></image>
+            <text lines="1" class="text-group_4">商品查询</text>
+          </view>
+        </view>
+      </view>
+      <view class="userSell" v-if="userInfo.user_type == 40">
+        <view class="sell"> 会员分销 </view>
+        <view
+          class="type"
+          @click="goManagementHandle('/pages/news/user/vip?type=1', '会员管理')"
+        >
+          <view class="typeLeft common">
+            会员管理<u-icon
+              style="margin-left: 10rpx"
+              name="arrow-right"
+            ></u-icon>
+          </view>
+          <view
+            class="typeRight common"
+            @click="
+              goManagementHandle('/pages/news/user/vip?type=2', '分销管理')
+            "
+          >
+            <image
+              :src="$picUrl + '/static/user/sale.png'"
+              class="sale"
+            ></image>
+            分销管理<u-icon
+              style="margin-left: 10rpx"
+              name="arrow-right"
+            ></u-icon>
+          </view>
+        </view>
+      </view>
+      <view class="coupon" v-if="isLogin == false || userInfo.user_type != 40">
+        <view class="walletList">
+          <view
+            class="listItem"
+            @click="goJump('/pages/news/park/recordHistory')"
+          >
+            <view class="num">
+              {{
+                actionCountsInfo.reservation_number
+                  ? actionCountsInfo.reservation_number
+                  : 0
+              }}
+            </view>
+            <view class="info"> 预约记录 </view>
+          </view>
+          <view
+            class="listItem"
+            @click="goJump('/pages/news/park/browsingHistory')"
+          >
+            <view class="num">
+              {{
+                actionCountsInfo.view_number ? actionCountsInfo.view_number : 0
+              }}
+            </view>
+            <view class="info"> 浏览记录 </view>
+          </view>
+          <view class="listItem" @click="goShopOrderList()">
+            <view class="num">
+              {{
+                actionCountsInfo.take_goods_number
+                  ? actionCountsInfo.take_goods_number
+                  : 0
+              }}
+            </view>
+            <view class="info"> 提货记录 </view>
+          </view>
+          <view class="listItem" @click="goJump('/pages/news/coupon/list')">
+            <view class="num">
+              {{
+                actionCountsInfo.coupon_number
+                  ? actionCountsInfo.coupon_number
+                  : 0
+              }}
+            </view>
+            <view class="info"> 优惠券 </view>
+          </view>
+        </view>
+      </view>
+      <view class="goodsManage">
+        <view class="manageTitle">
+          <text lines="1" class="text_5 titleLeft">商品订单</text>
+          <text lines="1" class="text_6 titleRight" @click="goGoodsOrder('all')"
+            >查看全部</text
+          >
+          <u-icon
+            style="margin-left: 5rpx; color: #909090; margin-top: -5rpx"
+            name="arrow-right"
+          ></u-icon>
+        </view>
+        <view class="grounding goodsOrder">
+          <view class="image-text_21" @click="goGoodsOrder('pay')">
+            <image
+              :src="$picUrl + '/static/user/unpay.png'"
+              class="label_11"
+            ></image>
+            <view class="text-group_21">
+              <text
+                class="text_71"
+                v-if="orderTodoInfo.goods_order.payment_number"
+                >{{
+                  orderTodoInfo.goods_order.payment_number >= 100
+                    ? "99+"
+                    : orderTodoInfo.goods_order.payment_number
+                }}</text
+              >
+              <text class="text_81">待付款</text>
+            </view>
+          </view>
+          <view class="image-text_21" @click="goGoodsOrder('delivery')">
+            <image
+              :src="$picUrl + '/static/user/unsend.png'"
+              class="label_11"
+            ></image>
+            <view class="text-group_21">
+              <text
+                class="text_71"
+                v-if="orderTodoInfo.goods_order.delivery_number"
+                >{{
+                  orderTodoInfo.goods_order.delivery_number >= 100
+                    ? "99+"
+                    : orderTodoInfo.goods_order.delivery_number
+                }}</text
+              >
+              <text class="text_81">待发货</text>
+            </view>
+          </view>
+          <view class="image-text_21" @click="goGoodsOrder('receipt')">
+            <image
+              :src="$picUrl + '/static/user/untake.png'"
+              class="label_11"
+            ></image>
+            <view class="text-group_21">
+              <text
+                class="text_71"
+                v-if="orderTodoInfo.goods_order.received_number"
+                >{{
+                  orderTodoInfo.goods_order.received_number >= 100
+                    ? "99+"
+                    : orderTodoInfo.goods_order.received_number
+                }}</text
+              >
+              <text class="text_81">待收货</text>
+            </view>
+          </view>
+          <view class="image-text_21" @click="goGoodsOrder('complete')">
+            <image
+              :src="$picUrl + '/static/user/over.png'"
+              class="label_11"
+            ></image>
+            <view class="text-group_21">
+              <!-- <text class="text_71" 
 								v-if="orderTodoInfo.goods_order.finish_number">{{orderTodoInfo.goods_order.finish_number>=100?"99+":orderTodoInfo.goods_order.finish_number}}</text>-->
-							<text class="text_81">已完成</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- <view class="goodsManage">
+              <text class="text_81">已完成</text>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- <view class="goodsManage">
 				<view class="manageTitle">
 					<text lines="1" class="text_5 titleLeft">
 					</text>
@@ -258,7 +384,7 @@
 					</view>
 				</view>
 			</view> -->
-			<!-- <view class="goodsManage">
+      <!-- <view class="goodsManage">
 				<view class="manageTitle">
 					<text lines="1" class="text_5 titleLeft">回收订单</text>
 					<text lines="1" class="text_6 titleRight" @click="toRecovery('')">查看全部</text>
@@ -295,50 +421,93 @@
 					</view>
 				</view>
 			</view> -->
-			<view class="goodsManage" v-if="userInfo.user_type == 30">
-				<view class="manageTitle">
-					<text lines="1" class="text_5 titleLeft">分销订单</text>
-					<!-- <text lines="1" class="text_6 titleRight" @click="goJump('/pages/news3/fenxiao')">查看全部</text> -->
-					<text lines="1" class="text_6 titleRight"
-						@click="goJump('/pages/news3/shopDealerOrder')">查看全部</text>
-					<u-icon @click="goJump('/pages/news3/fenxiao')"
-						style="margin-left: 5rpx; color: #909090; margin-top: -5rpx;" name="arrow-right"></u-icon>
-				</view>
-				<view class="grounding goodsOrder">
-					<view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=pay')">
-						<image :src="$picUrl+'/static/user/unpay.png'" class="label_11"></image>
-						<view class="text-group_21">
-							<text lines="1" class="text_7"
-								v-if="orderTodoInfo.distribution_order.payment_number">{{orderTodoInfo.distribution_order.payment_number}}</text>
-							<text lines="1" class="text_8">待付款</text>
-						</view>
-					</view>
-					<view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=delivery')">
-						<image :src="$picUrl+'/static/user/unsend.png'" class="label_11"></image>
-						<view class="text-group_21">
-							<text lines="1" class="text_7"
-								v-if="orderTodoInfo.distribution_order.delivery_number">{{orderTodoInfo.distribution_order.delivery_number}}</text>
-							<text lines="1" class="text_8">待发货</text>
-						</view>
-					</view>
-					<view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=receipt')">
-						<image :src="$picUrl+'/static/user/untake.png'" class="label_11"></image>
-						<view class="text-group_21">
-							<text lines="1" class="text_7"
-								v-if="orderTodoInfo.distribution_order.received_number">{{orderTodoInfo.distribution_order.received_number}}</text>
-							<text lines="1" class="text_8">待收货</text>
-						</view>
-					</view>
-					<view class="image-text_21" @click="goJump('/pages/news3/shopDealerOrder?type=complete')">
-						<image :src="$picUrl+'/static/user/over.png'" class="label_11"></image>
-						<view class="text-group_21">
-							<!-- <text lines="1" class="text_7" v-if="orderTodoInfo.distribution_order.finish_number">{{orderTodoInfo.distribution_order.finish_number}}</text> -->
-							<text lines="1" class="text_8">已完成</text>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- <view class="wallet">
+      <view class="goodsManage" v-if="userInfo.user_type == 30">
+        <view class="manageTitle">
+          <text lines="1" class="text_5 titleLeft">分销订单</text>
+          <!-- <text lines="1" class="text_6 titleRight" @click="goJump('/pages/news3/fenxiao')">查看全部</text> -->
+          <text
+            lines="1"
+            class="text_6 titleRight"
+            @click="goJump('/pages/news3/shopDealerOrder')"
+            >查看全部</text
+          >
+          <u-icon
+            @click="goJump('/pages/news3/fenxiao')"
+            style="margin-left: 5rpx; color: #909090; margin-top: -5rpx"
+            name="arrow-right"
+          ></u-icon>
+        </view>
+        <view class="grounding goodsOrder">
+          <view
+            class="image-text_21"
+            @click="goJump('/pages/news3/shopDealerOrder?type=pay')"
+          >
+            <image
+              :src="$picUrl + '/static/user/unpay.png'"
+              class="label_11"
+            ></image>
+            <view class="text-group_21">
+              <text
+                lines="1"
+                class="text_7"
+                v-if="orderTodoInfo.distribution_order.payment_number"
+                >{{ orderTodoInfo.distribution_order.payment_number }}</text
+              >
+              <text lines="1" class="text_8">待付款</text>
+            </view>
+          </view>
+          <view
+            class="image-text_21"
+            @click="goJump('/pages/news3/shopDealerOrder?type=delivery')"
+          >
+            <image
+              :src="$picUrl + '/static/user/unsend.png'"
+              class="label_11"
+            ></image>
+            <view class="text-group_21">
+              <text
+                lines="1"
+                class="text_7"
+                v-if="orderTodoInfo.distribution_order.delivery_number"
+                >{{ orderTodoInfo.distribution_order.delivery_number }}</text
+              >
+              <text lines="1" class="text_8">待发货</text>
+            </view>
+          </view>
+          <view
+            class="image-text_21"
+            @click="goJump('/pages/news3/shopDealerOrder?type=receipt')"
+          >
+            <image
+              :src="$picUrl + '/static/user/untake.png'"
+              class="label_11"
+            ></image>
+            <view class="text-group_21">
+              <text
+                lines="1"
+                class="text_7"
+                v-if="orderTodoInfo.distribution_order.received_number"
+                >{{ orderTodoInfo.distribution_order.received_number }}</text
+              >
+              <text lines="1" class="text_8">待收货</text>
+            </view>
+          </view>
+          <view
+            class="image-text_21"
+            @click="goJump('/pages/news3/shopDealerOrder?type=complete')"
+          >
+            <image
+              :src="$picUrl + '/static/user/over.png'"
+              class="label_11"
+            ></image>
+            <view class="text-group_21">
+              <!-- <text lines="1" class="text_7" v-if="orderTodoInfo.distribution_order.finish_number">{{orderTodoInfo.distribution_order.finish_number}}</text> -->
+              <text lines="1" class="text_8">已完成</text>
+            </view>
+          </view>
+        </view>
+      </view>
+      <!-- <view class="wallet">
 				<view class="myWallet">
 					我的钱包
 				</view>
@@ -369,69 +538,93 @@
 					</view>
 				</view>
 			</view> -->
-			<view class="myServe">
-				<view class="myservice">
-					我的服务
-				</view>
-				<view class="serve">
-					<view class="serveIcon" v-if="isLogin == false" @click="goJump('/pages/news/user/rechargeList')">
-						<image :src="$picUrl+'/static/user/customer.png'" class="icons"></image>
-						<view class="serveInfo">
-							客服
-						</view>
-					</view>
-					<view class="serveIcon" v-else>
-						<image :src="$picUrl+'/static/user/customer.png'" class="icons"></image>
-						<view class="serveInfo">
-							客服
-						</view>
-						<button type="default" open-type="contact" class="infoBtn"></button>
-					</view>
-					<view class="serveIcon" @click="goJump('/pages/news1/setting')">
-						<image :src="$picUrl+'/static/user/set.png'" class="icons"></image>
-						<view class="serveInfo">
-							设置
-						</view>
-					</view>
-					<view class="serveIcon" @click="goJump('/pages/news1/feedback')">
-						<image :src="$picUrl+'/static/user/complaint.png'" class="icons"></image>
-						<view class="serveInfo">
-							投诉
-						</view>
-					</view>
-					<view class="serveIcon" v-if="userInfo.user_type == 40" @click="goJump('/pages/feedback/index')">
-						<image src="/static/feedback/feedback.png" class="icons"></image>
-						<view class="serveInfo">
-							意见反馈
-						</view>
-					</view>
-					<view class="serveIcon" @click="goJump('/pages/news/park/addressList')">
-						<image :src="$picUrl+'/static/user/address.png'" class="icons"></image>
-						<view class="serveInfo">
-							地址
-						</view>
-					</view>
-					<view class="serveIcon" @click="goJump('/pages/news/consult/about',1)">
-						<image :src="$picUrl+'/static/user/about.png'" class="icons"></image>
-						<view class="serveInfo">
-							联系我们
-						</view>
-					</view>
-					<view class="serveIcon" @click="goJump('/pages/news3/setOutRecords')"
-						v-if="userInfo.user_type == 40">
-						<image :src="$picUrl+'/static/user/record.png'" class="icons"></image>
-						<view class="serveInfo">
-							发货记录
-						</view>
-					</view>
-					<view class="serveIcon" @click="goJump('/pages/news3/LogisticsInquiry')"
-						v-if="userInfo.user_type == 40">
-						<image :src="$picUrl+'/static/user/car.png'" class="icons"></image>
-						<view class="serveInfo">
-							物流查询
-						</view>
-					</view>
-					<!-- 	<view class="serveIcon" @click="goJump('/pages/news3/vipPrice?type=0')"
+      <view class="myServe">
+        <view class="myservice"> 我的服务 </view>
+        <view class="serve">
+          <view
+            class="serveIcon"
+            v-if="isLogin == false"
+            @click="goJump('/pages/news/user/rechargeList')"
+          >
+            <image
+              :src="$picUrl + '/static/user/customer.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 客服 </view>
+          </view>
+          <view class="serveIcon" v-else>
+            <image
+              :src="$picUrl + '/static/user/customer.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 客服 </view>
+            <button type="default" open-type="contact" class="infoBtn"></button>
+          </view>
+          <view class="serveIcon" @click="goJump('/pages/news1/setting')">
+            <image
+              :src="$picUrl + '/static/user/set.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 设置 </view>
+          </view>
+          <view class="serveIcon" @click="goJump('/pages/news1/feedback')">
+            <image
+              :src="$picUrl + '/static/user/complaint.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 投诉 </view>
+          </view>
+          <view
+            class="serveIcon"
+            v-if="userInfo.user_type == 40"
+            @click="goJump('/pages/feedback/index')"
+          >
+            <image src="/static/feedback/feedback.png" class="icons"></image>
+            <view class="serveInfo"> 意见反馈 </view>
+          </view>
+          <view
+            class="serveIcon"
+            @click="goJump('/pages/news/park/addressList')"
+          >
+            <image
+              :src="$picUrl + '/static/user/address.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 地址 </view>
+          </view>
+          <view
+            class="serveIcon"
+            @click="goJump('/pages/news/consult/about', 1)"
+          >
+            <image
+              :src="$picUrl + '/static/user/about.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 联系我们 </view>
+          </view>
+          <view
+            class="serveIcon"
+            @click="goJump('/pages/news3/setOutRecords')"
+            v-if="userInfo.user_type == 40"
+          >
+            <image
+              :src="$picUrl + '/static/user/record.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 发货记录 </view>
+          </view>
+          <view
+            class="serveIcon"
+            @click="goJump('/pages/news3/LogisticsInquiry')"
+            v-if="userInfo.user_type == 40"
+          >
+            <image
+              :src="$picUrl + '/static/user/car.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 物流查询 </view>
+          </view>
+          <!-- 	<view class="serveIcon" @click="goJump('/pages/news3/vipPrice?type=0')"
 						v-if="userInfo.user_type == 40">
 						<image :src="$picUrl+'/static/user/member.png'" class="icons"></image>
 						<view class="serveInfo">
@@ -445,125 +638,186 @@
 							分销价
 						</view>
 					</view> -->
-					<!-- <view class="serveIcon" @click="goJump('/pages/news1/MerchantSettlement')">
+          <!-- <view class="serveIcon" @click="goJump('/pages/news1/MerchantSettlement')">
 						<image :src="$picUrl+'/static/user/checkIn.png'" class="icons"></image>
 						<view class="serveInfo">
 							商家入驻
 						</view>
 					</view> -->
-					<!-- <view class="serveIcon" @click="goJump('/pages/news/user/vip')" v-if="userInfo.user_type == 40">
+          <!-- <view class="serveIcon" @click="goJump('/pages/news/user/vip')" v-if="userInfo.user_type == 40">
 						<image :src="$picUrl+'/static/user/staff.png'" class="icons"></image>
 						<view class="serveInfo">
 							员工管理
 						</view>
 					</view> -->
-					<view class="serveIcon" @click="goJump('/pages/news/consult/storeEdit')"
-						v-if="userInfo.user_type == 40">
-						<image :src="$picUrl+'/static/user/setHome.png'" class="icons"></image>
-						<view class="serveInfo">
-							店铺设置
-						</view>
-					</view>
-					<view class="serveIcon" @click="goJump('/pages/invite/index')">
-						<image :src="$picUrl+'/static/user/invite.png'" class="icons"></image>
-						<view class="serveInfo">
-							邀请商家
-						</view>
-					</view>
-					<!-- <view class="serveIcon" @click="goJump('/pages/invite/index')"> -->
-					<view class="serveIcon" v-if="userInfo.user_type ==30" @click="goDealer(userInfo.user_type)">
-						<image :src="$picUrl+'/static/user/invites.png'" class="icons"></image>
-						<view class="serveInfo">
-							<text>服务商</text>
-						</view>
-					</view>
-					<view class="serveIcon" v-if="userInfo.user_type == 10 || userInfo.user_type == 20"
-						@click="goDealer(userInfo.user_type)">
-						<image :src="$picUrl+'/static/user/invites.png'" class="icons"></image>
-						<view class="serveInfo">
-							<text>服务商</text>
-						</view>
-					</view>
-
-					<view class="serveIcon" @click="goJump('/pages/news1/help',1)">
-						<image :src="$picUrl+'/static/user/help.png'" class="icons"></image>
-						<view class="serveInfo">
-							帮助中心
-						</view>
-					</view>
-					<view class="serveIcon" @click="goJump('/pages/news1/huoyuan')">
-						<image :src="$picUrl+'/static/user/retail.png'" class="icons"></image>
-						<view class="serveInfo">
-							我要找货
-						</view>
-					</view>
-					<view class="serveIcon" @click="goJump('/pages/news/user/report')" v-if="userInfo.user_type == 40">
-						<image :src="$picUrl+'/static/user/sj.png'" class="icons"></image>
-						<view class="serveInfo">
-							数据统计
-						</view>
-					</view>
-					<view class="serveIcon" @click="goManagementHandle('/pages/news/user/vip?type=1','会员管理')"
-						v-if="userInfo.user_type == 40">
-						<image :src="$picUrl+'/static/user/hygl.png'" class="icons"></image>
-						<view class="serveInfo">
-							会员管理
-						</view>
-					</view>
-					<view class="serveIcon"
-						v-if="userInfo.user_type == 40 || userInfo.user_type == 30 || userInfo.user_type == 20"
-						@click="goJump('/pages/news1/jinqun')">
-						<image :src="$picUrl+'/static/user/jq.png'" class="icons"></image>
-						<view class="serveInfo">
-							进群有礼
-						</view>
-					</view>
-					<!-- course -->
-					<view class="serveIcon" v-if="userInfo.user_type == 40"
-						@click="goJump('/pages/merchantTutorial/tutorial')">
-						<image :src="$picUrl+'/static/user/course.png'" class="icons"></image>
-						<view class="serveInfo">
-							商家教程
-						</view>
-					</view>
-					<view v-if="is_show_open_shop_buttun== 10" class="serveIcon"  @click="goJump('/pages/gamll/index')">
-						<image :src="$picUrl+'/static/user/gmall.png?t=1'" class="icons"></image>
-						<view class="serveInfo">
-							开通商城
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 商品推荐 -->
-			<view class="goodsRecommend-title" v-if="isLogin == false || userInfo.user_type != 40">
-				<image :src="$picUrl+'/static/user/left.png'"></image>专属推荐<image
-					:src="$picUrl+'/static/user/right.png'"></image>
-			</view>
-			<view class="goodsRecommend" v-if="isLogin == false || userInfo.user_type != 40">
-				<!-- <u-waterfall v-model="goodsRecommend" ref="uWaterfall1"> -->
-				<!-- <template v-slot:left="{leftList}"> -->
-				<view class="goodsItem" v-for="(item,index) in goodsRecommend" @click="goodsDetail(item)" :key="index">
-					<view class="pic">
-						<image :src="item.goods_image" mode="aspectFill"></image>
-					</view>
-					<view class="goodsInfo">
-						<view class="title">
-							<!-- <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text> -->
-							<text class="name">{{item.goods_name}}</text>
-						</view>
-						<view class="price" style="margin-top: 12rpx;">
-							<text style="font-size: 26rpx;">￥</text>
-							<text style="font-weight: bold;font-size: 32rpx;">{{item.goods_price_min}}</text>
-							<text style="font-size: 20rpx;margin-left:10rpx;"></text>
-							<text
-								style="color: #949494;font-size: 22rpx;text-decoration: line-through;">￥{{item.line_price_min}}</text>
-						</view>
-						<!-- 	<view class="goodsInfo1" v-if="item.cmmdty_model">
+          <view
+            class="serveIcon"
+            @click="goJump('/pages/news/consult/storeEdit')"
+            v-if="userInfo.user_type == 40"
+          >
+            <image
+              :src="$picUrl + '/static/user/setHome.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 店铺设置 </view>
+          </view>
+          <view class="serveIcon" @click="goJump('/pages/invite/index')">
+            <image
+              :src="$picUrl + '/static/user/invite.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 邀请商家 </view>
+          </view>
+          <!-- <view class="serveIcon" @click="goJump('/pages/invite/index')"> -->
+          <view
+            class="serveIcon"
+            v-if="userInfo.user_type == 30"
+            @click="goDealer(userInfo.user_type)"
+          >
+            <image
+              :src="$picUrl + '/static/user/invites.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo">
+              <text>服务商</text>
+            </view>
+          </view>
+          <view
+            class="serveIcon"
+            v-if="userInfo.user_type == 10 || userInfo.user_type == 20"
+            @click="goDealer(userInfo.user_type)"
+          >
+            <image
+              :src="$picUrl + '/static/user/invites.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo">
+              <text>服务商</text>
+            </view>
+          </view>
+
+          <view class="serveIcon" @click="goJump('/pages/news1/help', 1)">
+            <image
+              :src="$picUrl + '/static/user/help.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 帮助中心 </view>
+          </view>
+          <view class="serveIcon" @click="goJump('/pages/news1/huoyuan')">
+            <image
+              :src="$picUrl + '/static/user/retail.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 我要找货 </view>
+          </view>
+          <view
+            class="serveIcon"
+            @click="goJump('/pages/news/user/report')"
+            v-if="userInfo.user_type == 40"
+          >
+            <image :src="$picUrl + '/static/user/sj.png'" class="icons"></image>
+            <view class="serveInfo"> 数据统计 </view>
+          </view>
+          <view
+            class="serveIcon"
+            @click="
+              goManagementHandle('/pages/news/user/vip?type=1', '会员管理')
+            "
+            v-if="userInfo.user_type == 40"
+          >
+            <image
+              :src="$picUrl + '/static/user/hygl.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 会员管理 </view>
+          </view>
+          <view
+            class="serveIcon"
+            v-if="
+              userInfo.user_type == 40 ||
+              userInfo.user_type == 30 ||
+              userInfo.user_type == 20
+            "
+            @click="goJump('/pages/news1/jinqun')"
+          >
+            <image :src="$picUrl + '/static/user/jq.png'" class="icons"></image>
+            <view class="serveInfo"> 进群有礼 </view>
+          </view>
+          <!-- course -->
+          <view
+            class="serveIcon"
+            v-if="userInfo.user_type == 40"
+            @click="goJump('/pages/merchantTutorial/tutorial')"
+          >
+            <image
+              :src="$picUrl + '/static/user/course.png'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 商家教程 </view>
+          </view>
+          <view
+            v-if="is_show_open_shop_buttun == 10"
+            class="serveIcon"
+            @click="goJump('/pages/gamll/index')"
+          >
+            <image
+              :src="$picUrl + '/static/user/gmall.png?t=1'"
+              class="icons"
+            ></image>
+            <view class="serveInfo"> 开通商城 </view>
+          </view>
+        </view>
+      </view>
+      <!-- 商品推荐 -->
+      <view
+        class="goodsRecommend-title"
+        v-if="isLogin == false || userInfo.user_type != 40"
+      >
+        <image :src="$picUrl + '/static/user/left.png'"></image>专属推荐<image
+          :src="$picUrl + '/static/user/right.png'"
+        ></image>
+      </view>
+      <view
+        class="goodsRecommend"
+        v-if="isLogin == false || userInfo.user_type != 40"
+      >
+        <!-- <u-waterfall v-model="goodsRecommend" ref="uWaterfall1"> -->
+        <!-- <template v-slot:left="{leftList}"> -->
+        <view
+          class="goodsItem"
+          v-for="(item, index) in goodsRecommend"
+          @click="goodsDetail(item)"
+          :key="index"
+        >
+          <view class="pic">
+            <image :src="item.goods_image" mode="aspectFill"></image>
+          </view>
+          <view class="goodsInfo">
+            <view class="title">
+              <!-- <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text> -->
+              <text class="name">{{ item.goods_name }}</text>
+            </view>
+            <view class="price" style="margin-top: 12rpx">
+              <text style="font-size: 26rpx">￥</text>
+              <text style="font-weight: bold; font-size: 32rpx">{{
+                item.goods_price_min
+              }}</text>
+              <text style="font-size: 20rpx; margin-left: 10rpx"></text>
+              <text
+                style="
+                  color: #949494;
+                  font-size: 22rpx;
+                  text-decoration: line-through;
+                "
+                >￥{{ item.line_price_min }}</text
+              >
+            </view>
+            <!-- 	<view class="goodsInfo1" v-if="item.cmmdty_model">
 									<view class="oneTip">
 										{{item.cmmdty_model}}
 									</view>
 								</view> -->
-						<!-- <view class="goodsSend">
+            <!-- <view class="goodsSend">
 									<view class="sendLeft">
 										<view class="left_1">
 											{{item.goods_source}}
@@ -582,10 +836,10 @@
 										<text v-if="item.delivery_time==6">45天内发货</text>
 									</view>
 								</view> -->
-					</view>
-				</view>
-				<!-- </template> -->
-				<!-- <template v-slot:right="{rightList}">
+          </view>
+        </view>
+        <!-- </template> -->
+        <!-- <template v-slot:right="{rightList}">
 						<view class="goodsItem" style="margin-right: 0;" v-for="(item,index) in rightList"
 							@click="goodsDetail(item)" :key="index">
 							<view class="pic">
@@ -631,21 +885,23 @@
 
 						</view>
 					</template> -->
-				<!-- </u-waterfall> -->
-				<view v-if="goodsRecommend.length" class="finished">{{ recommendLoadTitle }}</view>
-			</view>
-		</view>
-
-		<view class="toTop" v-if="isTop" @click="openScrollTo()">
-			<image :src="$picUrl+'/static/toTop.png?=1'"></image>
-		</view>
-		<view class="memberCode" v-if="memberCode" @click="memberCode=false">
-			<view class="codeMain1" v-if="lookMemberType == 2">
-				<image class="bg" :show-menu-by-longpress="true" :src="qrcode1">
-				</image>
-				<!-- <image class="code" :show-menu-by-longpress="true" :src="qrcode"></image> -->
-				<view class="btn" @click.stop="goMember('hy')"></view>
-				<!-- <view class="myCode">
+        <!-- </u-waterfall> -->
+        <view v-if="goodsRecommend.length" class="finished">{{
+          recommendLoadTitle
+        }}</view>
+      </view>
+    </view>
+
+    <view class="toTop" v-if="isTop" @click="openScrollTo()">
+      <image :src="$picUrl + '/static/toTop.png?=1'"></image>
+    </view>
+    <view class="memberCode" v-if="memberCode" @click="memberCode = false">
+      <view class="codeMain1" v-if="lookMemberType == 2">
+        <image class="bg" :show-menu-by-longpress="true" :src="qrcode1">
+        </image>
+        <!-- <image class="code" :show-menu-by-longpress="true" :src="qrcode"></image> -->
+        <view class="btn" @click.stop="goMember('hy')"></view>
+        <!-- <view class="myCode">
 					<text v-if="lookMemberType == 2">我的专属会员识别码</text>
 					<text v-if="lookMemberType == 3">我的专属分销识别码</text>
 				</view>
@@ -656,1881 +912,1926 @@
 				<view class="codeName">
 					{{userInfo.user_id}}
 				</view> -->
-			</view>
-			<view class="codeMain2" v-if="lookMemberType == 3">
-				<image class="bg" :show-menu-by-longpress="true" :src="qrcode2">
-				</image>
-				<!-- <image class="code" :show-menu-by-longpress="true" :src="qrcode"></image> -->
-				<view class="btn" @click.stop="goMember('fx')"></view>
-			</view>
-		</view>
-		<canvas id="myCanvas" class="myCanvas" canvas-id="myCanvas"
-			:style="{'width': 702/devicePixelRatio+'px',' height': 1000/devicePixelRatio+'px',position: 'absolute',left:'-100000px',top:'-100000px'}"></canvas>
-		<addShuiyin />
-	</view>
+      </view>
+      <view class="codeMain2" v-if="lookMemberType == 3">
+        <image class="bg" :show-menu-by-longpress="true" :src="qrcode2">
+        </image>
+        <!-- <image class="code" :show-menu-by-longpress="true" :src="qrcode"></image> -->
+        <view class="btn" @click.stop="goMember('fx')"></view>
+      </view>
+    </view>
+    <canvas
+      id="myCanvas"
+      class="myCanvas"
+      canvas-id="myCanvas"
+      :style="{
+        width: 702 / devicePixelRatio + 'px',
+        ' height': 1000 / devicePixelRatio + 'px',
+        position: 'absolute',
+        left: '-100000px',
+        top: '-100000px',
+      }"
+    ></canvas>
+    <addShuiyin />
+  </view>
 </template>
 <script>
-	const ctx = uni.createCanvasContext('myCanvas')
-	import {
-		checkLogin
-	} from '@/core/app'
-	import * as UserApi from '@/api/user';
-	import * as Api from '@/api/goods'
-	import * as UploadApi from '@/api/upload'
-	import {
-		createQrCodeImg
-	} from '@/utils/qrcode'
-	export default {
-		data() {
-			return {
-				devicePixelRatio: 750 / uni.getSystemInfoSync().windowHeight,
-				dealerInviteQrcode: "",
-				qrcode: "",
-				qrcode1: "",
-				qrcode2: "",
-				inviteQrcode: "",
-				lookMemberType: 2,
-				isTop: false,
-				background: {
-					background: 'url(https://www.royaum.com.cn/static/news/login-bg.png) center top no-repeat',
-					backgroundSize: '100% auto',
-				},
-				orderTodoInfo: {
-					distribution_order: {},
-					goods_order: {},
-					service_order: {},
-					recovery_order: {}
-				},
-				actionCountsInfo: {},
-				userType: 2,
-				memberCode: false,
-				isLogin: false,
-				userInfo: {},
-				goodsRecommend: [],
-				recommendPage: 1,
-				recommendFinish: false,
-				recommendLoadTitle: ''
-			}
-		},
-		onLoad() {
-			this.recommendPage = 1;
-			this.recommendFinish = false;
-			this.recommendLoadTitle = '';
-			this.goodsRecommend = [];
-			this.getSuggest()
-		},
-		onShow(options) {
-			if (uni.getStorageSync("userInfo").user_id) {
-				this.isLogin = true
-				this.onRefreshPage()
-			} else {
-				this.userInfo = {}
-				this.isLogin = false
-				this.actionCountsInfo = {}
-				this.orderTodoInfo = {
-					distribution_order: {},
-					goods_order: {},
-					service_order: {},
-					recovery_order: {}
-				}
-			}
-		},
-		onReachBottom() {
-			if (!this.recommendFinish) {
-				this.getSuggest()
-			}
-		},
-		onPageScroll(e) {
-			if (e.scrollTop <= 200) { // 当滚动到顶部且向下滑动时为true
-				this.isTop = false
-			} else {
-				this.isTop = true
-			}
-		},
-		methods: {
-			createImge(index, w, h) {
-				const that = this;
-				ctx.fillRect(0, 0, w / that.devicePixelRatio, h / that.devicePixelRatio);
-				uni.downloadFile({
-					url: index == 1 ? 'https://www.royaum.com.cn/static/1@2x.png' :
-						'https://www.royaum.com.cn/static/2@2x.png',
-					success(res) {
-						console.log(index, w, h)
-						console.log(index == 1 ? 'https://www.royaum.com.cn/static/1@2x.png' :
-							'https://www.royaum.com.cn/static/2@2x.png')
-						console.log(res.tempFilePath)
-						console.log("that.qrcode", that.qrcode)
-						ctx.beginPath(); // 开始绘制
-						ctx.drawImage(res.tempFilePath, 0, 0, w / that.devicePixelRatio, h / that
-							.devicePixelRatio);
-						uni.downloadFile({
-							url: that.qrcode,
-							success: (res2) => {
-								ctx.save(); // 保存
-								if (index == 1) {
-									ctx.arc(162 / that.devicePixelRatio / 2 + 468 / that
-										.devicePixelRatio,
-										162 / that.devicePixelRatio / 2 + 480 / that
-										.devicePixelRatio,
-										162 / that.devicePixelRatio / 2, 0, Math.PI * 2, false);
-									ctx.clip();
-									ctx.drawImage(res2.tempFilePath, 468 / that.devicePixelRatio, 480 /
-										that.devicePixelRatio, 162 / that.devicePixelRatio, 162 /
-										that
-										.devicePixelRatio);
-								} else {
-									ctx.arc(162 / that.devicePixelRatio / 2 + 275 / that
-										.devicePixelRatio,
-										162 / that.devicePixelRatio / 2 + 635 / that
-										.devicePixelRatio,
-										162 / that.devicePixelRatio / 2, 0, Math.PI * 2, false);
-									ctx.clip();
-									ctx.drawImage(res2.tempFilePath, 275 / that.devicePixelRatio, 635 /
-										that.devicePixelRatio, 162 / that.devicePixelRatio, 162 /
-										that
-										.devicePixelRatio);
-								}
-								ctx.draw()
-								uni.canvasToTempFilePath({
-									width: w / that.devicePixelRatio,
-									height: h / that.devicePixelRatio,
-									destWidth: w / that.devicePixelRatio,
-									destHeight: h / that.devicePixelRatio,
-									canvasId: 'myCanvas',
-									success: function(res) {
-										if (index == 1) {
-											that.qrcode1 = res.tempFilePath
-											console.log(that.qrcode1)
-										} else {
-											that.qrcode2 = res.tempFilePath
-											console.log(that.qrcode2)
-										}
-										ctx.clearRect(0, 0, w, h);
-									}
-								})
-
-							},
-						})
-
-					}
-				})
-			},
-			onChooseAvatar(e) {
-				console.log(e)
-				let that = this
-				that.headImgUpload(e.detail.avatarUrl)
-			},
-			nickSubmit(avatar_id) {
-				UserApi.editUser({
-						avatar_id: avatar_id
-					})
-					.then(res => {
-						if (res.status == 200) {
-							uni.showToast({
-								title: '获取成功',
-								icon: 'none',
-								duration: 2000
-							})
-							this.getUserInfo()
-						} else {
-							uni.showToast({
-								title: '获取失败',
-								icon: 'none',
-								duration: 2000
-							})
-						}
-					})
-					.finally()
-			},
-			headImgUpload(avatarUrl) {
-				const app = this
-				const imageList = [{
-					path: avatarUrl
-				}]
-				// 批量上传
-				return new Promise((resolve, reject) => {
-					if (imageList.length > 0) {
-						UploadApi.image(imageList)
-							.then(fileIds => {
-								console.log(fileIds)
-								app.nickSubmit(fileIds.join(','))
-								resolve(fileIds)
-							})
-							.catch(reject)
-					} else {
-						resolve()
-					}
-				})
-			},
-			goShopOrderList() {
-				uni.navigateTo({
-					url: '/pages/news3/shopOrder?delivery_type=20'
-				})
-			},
-			goDealer(type) {
-				if (type == 30) {
-					this.goJump('/pages/news3/JoinDistribution?dataType=all');
-				} else if (type == 10 || type == 20) {
-					// uni.showToast({
-					// 	title: '请先购买分销会员',
-					// 	icon: 'none',
-					// 	duration: 2000
-					// })
-					this.goJump('/pages/member/index');
-				}
-			},
-			openScrollTo() {
-				uni.pageScrollTo({
-					scrollTop: 0
-				})
-			},
-			getSuggest() {
-				// 获取推荐商品
-				Api.recommendedNew({
-					page: this.recommendPage++
-				}).then(res => {
-					console.log(res);
-					let arr = res.data.goodsList.data
-					if (arr && arr.length > 0) {
-						for (let i = 0; i < arr.length; i++) {
-							arr[i].goods_price_min = Number(arr[i].goods_price_min);
-							arr[i].goods_price_max = Number(arr[i].goods_price_max)
-							arr[i].line_price_min = Number(arr[i].line_price_min);
-							arr[i].line_price_max = Number(arr[i].line_price_max)
-						}
-					}
-					if (arr.length < res.data.goodsList.per_page) {
-						this.recommendFinish = true;
-					}
-					this.recommendLoadTitle = this.recommendFinish ? "已全部加载完" : "上拉加载更多";
-					this.goodsRecommend = [...this.goodsRecommend, ...arr]
-				})
-
-			},
-			// 刷新页面
-			onRefreshPage() {
-				this.isLogin = checkLogin()
-				console.log(this.isLogin, '是否登录')
-				// 获取页面数据
-				this.getUserInfo()
-			},
-			// 获取当前用户信息
-			getUserInfo() {
-				const that = this
-				return new Promise((resolve, reject) => {
-					!that.isLogin ? resolve(null) : UserApi.info({}, {
-							load: that.isFirstload
-						})
-						.then(result => {
-							let data = result.data.userInfo
-							console.log("data.user_id", data.user_id)
-							// data.qrcode = createQrCodeImg(data.user_id.toString(), {
-							// 	'size': 500
-							// });
-							console.log(data)
-
-							that.userInfo = data
-							that.getOrderInfo();
-							that.getActionCountsInfo();
-							uni.setStorageSync('userInfo', that.userInfo)
-							if (data.user_type == 20 || data.user_type == 40) {
-								that.getMembershipInviteQrcode()
-							}
-							if (data.user_type == 30 || data.user_type == 40) {
-								that.getDealerInviteQrcode()
-							}
-
-							// that.getMembershipInviteQrcode()
-							// that.getDealerInviteQrcode()
-							resolve(that.userInfo)
-						})
-						.catch(err => {
-							if (err.result && err.result.status == 401) {
-								that.isLogin = false
-								resolve(null)
-							} else {
-								reject(err)
-							}
-						})
-				})
-			},
-			// 获取会员邀请码
-			getMembershipInviteQrcode() {
-				const that = this
-				return new Promise((resolve, reject) => {
-					!that.isLogin ? resolve(null) : UserApi.getMembershipInviteQrcode({}, {
-							load: that.isFirstload
-						})
-						.then(result => {
-							that.inviteQrcode = result.message;
-							console.log(this.inviteQrcode)
-
-							resolve(that.inviteQrcode)
-						})
-						.catch(err => {
-							if (err.result && err.result.status == 401) {
-								that.isLogin = false
-								resolve(null)
-							} else {
-								reject(err)
-							}
-						})
-				})
-			},
-			// 获取分销码
-			getDealerInviteQrcode() {
-				const that = this
-				return new Promise((resolve, reject) => {
-					!that.isLogin ? resolve(null) : UserApi.getDealerInviteQrcode({}, {
-							load: that.isFirstload
-						})
-						.then(result => {
-							that.dealerInviteQrcode = result.message
-							console.log(this.dealerInviteQrcode)
-							resolve(that.dealerInviteQrcode)
-						})
-						.catch(err => {
-							if (err.result && err.result.status == 401) {
-								that.isLogin = false
-								resolve(null)
-							} else {
-								reject(err)
-							}
-						})
-				})
-			},
-			// 获取当前订单数量
-			getOrderInfo() {
-				const that = this
-				return new Promise((resolve, reject) => {
-					!that.isLogin ? resolve(null) : UserApi.todoCounts({}, {
-							load: that.isFirstload
-						})
-						.then(result => {
-							that.orderTodoInfo = result.data
-							resolve(that.orderTodoInfo)
-						})
-						.catch(err => {
-							if (err.result && err.result.status == 401) {
-								that.isLogin = false
-								resolve(null)
-							} else {
-								reject(err)
-							}
-						})
-				})
-			},
-			// 获取当前用户行为
-			getActionCountsInfo() {
-				const that = this
-				return new Promise((resolve, reject) => {
-					!that.isLogin ? resolve(null) : UserApi.actionCounts({}, {
-							load: that.isFirstload
-						})
-						.then(result => {
-							that.actionCountsInfo = result.data
-							resolve(that.actionCountsInfo)
-						})
-						.catch(err => {
-							if (err.result && err.result.status == 401) {
-								that.isLogin = false
-								resolve(null)
-							} else {
-								reject(err)
-							}
-						})
-				})
-			},
-			toFuwu(type) {
-				if (!uni.getStorageSync('AccessToken')) {
-					uni.navigateTo({
-						url: "/pages/login/index"
-					})
-					return;
-				}
-				uni.navigateTo({
-					url: "/pages/news/recycling/orderList?type=" + type
-				})
-			},
-			toRecovery(type) {
-				if (!uni.getStorageSync('AccessToken')) {
-					uni.navigateTo({
-						url: "/pages/login/index"
-					})
-					return;
-				}
-				uni.navigateTo({
-					url: "/pages/news/recycling/recoveryList?type=" + type
-				})
-			},
-			goJump(url, type) {
-				if (type == 1) {
-					uni.navigateTo({
-						url
-					})
-					return;
-				}
-				if (this.isLogin == false) {
-					this.goLogin()
-					return;
-				}
-				uni.navigateTo({
-					url
-				})
-			},
-			goManagementHandle(url, title) {
-				uni.navigateTo({
-					url: url + '?title=' + title
-				})
-
-			},
-			goLogin() {
-				// 去登录
-				uni.navigateTo({
-					url: '/pages/login/index'
-				})
-			},
-			goMember(type) {
-				if (this.isLogin == false) {
-					this.goLogin()
-					return;
-				}
-				if (type == 'hy') {
-					uni.navigateTo({
-						url: '/pages/news/caigou/notice1'
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/member/index?type=' + type
-					})
-				}
-			},
-			goOrder() {
-				if (this.isLogin == false) {
-					this.goLogin()
-					return;
-				}
-				uni.navigateTo({
-					url: '/pages/order/index'
-				})
-			},
-			lookMemberCode(val) {
-				if (this.isLogin == false) {
-					this.goLogin()
-					return;
-				}
-				this.lookMemberType = val;
-				this.qrcode = val == 2 ? this.inviteQrcode : this.dealerInviteQrcode;
-				this.memberCode = true;
-				if (val == 2) {
-					if (!this.qrcode1) {
-						this.createImge(1, 702, 702)
-					}
-				} else {
-					if (!this.qrcode2) {
-						this.createImge(2, 702, 889)
-					}
-				}
-			},
-
-			myWallet() {
-				if (this.isLogin == false) {
-					this.goLogin()
-					return;
-				}
-				// 我的钱包
-				uni.navigateTo({
-					url: '/pages/news1/wallet'
-				})
-			},
-			goGoodsOrder(val) {
-				if (this.isLogin == false) {
-					this.goLogin()
-					return;
-				}
-				// 我的订单
-				if (this.userInfo.user_type == 40) {
-					uni.navigateTo({
-						url: '/pages/news3/shopOrder?dataType=' + val
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/order/index?dataType=' + val
-					})
-				}
-
-			},
-			goodsDetail(item) {
-				// 跳转商品详情
-				uni.navigateTo({
-					url: '/pages/goods/detail?goodsId=' + item.goods_id
-				})
-			},
-			goPage(url) {
-				uni.switchTab({
-					url
-				})
-			},
-		}
-	}
+const ctx = uni.createCanvasContext("myCanvas");
+import { checkLogin } from "@/core/app";
+import * as UserApi from "@/api/user";
+import * as Api from "@/api/goods";
+import * as UploadApi from "@/api/upload";
+import { createQrCodeImg } from "@/utils/qrcode";
+export default {
+  data() {
+    return {
+      devicePixelRatio: 750 / uni.getSystemInfoSync().windowHeight,
+      dealerInviteQrcode: "",
+      qrcode: "",
+      qrcode1: "",
+      qrcode2: "",
+      inviteQrcode: "",
+      lookMemberType: 2,
+      isTop: false,
+      background: {
+        background:
+          "url(https://www.royaum.com.cn/static/news/login-bg.png) center top no-repeat",
+        backgroundSize: "100% auto",
+      },
+      orderTodoInfo: {
+        distribution_order: {},
+        goods_order: {},
+        service_order: {},
+        recovery_order: {},
+      },
+      actionCountsInfo: {},
+      userType: 2,
+      memberCode: false,
+      isLogin: false,
+      userInfo: {},
+      goodsRecommend: [],
+      recommendPage: 1,
+      recommendFinish: false,
+      recommendLoadTitle: "",
+      is_show_open_shop_buttun: null,
+    };
+  },
+  onLoad() {
+    this.recommendPage = 1;
+    this.recommendFinish = false;
+    this.recommendLoadTitle = "";
+    this.goodsRecommend = [];
+    this.getSuggest();
+    this.is_show_open_shop_buttun =
+      uni.getStorageSync("Store").storeInfo.is_show_open_shop_buttun;
+  },
+  onShow(options) {
+    if (uni.getStorageSync("userInfo").user_id) {
+      this.isLogin = true;
+      this.onRefreshPage();
+    } else {
+      this.userInfo = {};
+      this.isLogin = false;
+      this.actionCountsInfo = {};
+      this.orderTodoInfo = {
+        distribution_order: {},
+        goods_order: {},
+        service_order: {},
+        recovery_order: {},
+      };
+    }
+  },
+  onReachBottom() {
+    if (!this.recommendFinish) {
+      this.getSuggest();
+    }
+  },
+  onPageScroll(e) {
+    if (e.scrollTop <= 200) {
+      // 当滚动到顶部且向下滑动时为true
+      this.isTop = false;
+    } else {
+      this.isTop = true;
+    }
+  },
+  methods: {
+    createImge(index, w, h) {
+      const that = this;
+      ctx.fillRect(0, 0, w / that.devicePixelRatio, h / that.devicePixelRatio);
+      uni.downloadFile({
+        url:
+          index == 1
+            ? "https://www.royaum.com.cn/static/1@2x.png"
+            : "https://www.royaum.com.cn/static/2@2x.png",
+        success(res) {
+          console.log(index, w, h);
+          console.log(
+            index == 1
+              ? "https://www.royaum.com.cn/static/1@2x.png"
+              : "https://www.royaum.com.cn/static/2@2x.png"
+          );
+          console.log(res.tempFilePath);
+          console.log("that.qrcode", that.qrcode);
+          ctx.beginPath(); // 开始绘制
+          ctx.drawImage(
+            res.tempFilePath,
+            0,
+            0,
+            w / that.devicePixelRatio,
+            h / that.devicePixelRatio
+          );
+          uni.downloadFile({
+            url: that.qrcode,
+            success: (res2) => {
+              ctx.save(); // 保存
+              if (index == 1) {
+                ctx.arc(
+                  162 / that.devicePixelRatio / 2 + 468 / that.devicePixelRatio,
+                  162 / that.devicePixelRatio / 2 + 480 / that.devicePixelRatio,
+                  162 / that.devicePixelRatio / 2,
+                  0,
+                  Math.PI * 2,
+                  false
+                );
+                ctx.clip();
+                ctx.drawImage(
+                  res2.tempFilePath,
+                  468 / that.devicePixelRatio,
+                  480 / that.devicePixelRatio,
+                  162 / that.devicePixelRatio,
+                  162 / that.devicePixelRatio
+                );
+              } else {
+                ctx.arc(
+                  162 / that.devicePixelRatio / 2 + 275 / that.devicePixelRatio,
+                  162 / that.devicePixelRatio / 2 + 635 / that.devicePixelRatio,
+                  162 / that.devicePixelRatio / 2,
+                  0,
+                  Math.PI * 2,
+                  false
+                );
+                ctx.clip();
+                ctx.drawImage(
+                  res2.tempFilePath,
+                  275 / that.devicePixelRatio,
+                  635 / that.devicePixelRatio,
+                  162 / that.devicePixelRatio,
+                  162 / that.devicePixelRatio
+                );
+              }
+              ctx.draw();
+              uni.canvasToTempFilePath({
+                width: w / that.devicePixelRatio,
+                height: h / that.devicePixelRatio,
+                destWidth: w / that.devicePixelRatio,
+                destHeight: h / that.devicePixelRatio,
+                canvasId: "myCanvas",
+                success: function (res) {
+                  if (index == 1) {
+                    that.qrcode1 = res.tempFilePath;
+                    console.log(that.qrcode1);
+                  } else {
+                    that.qrcode2 = res.tempFilePath;
+                    console.log(that.qrcode2);
+                  }
+                  ctx.clearRect(0, 0, w, h);
+                },
+              });
+            },
+          });
+        },
+      });
+    },
+    onChooseAvatar(e) {
+      console.log(e);
+      let that = this;
+      that.headImgUpload(e.detail.avatarUrl);
+    },
+    nickSubmit(avatar_id) {
+      UserApi.editUser({
+        avatar_id: avatar_id,
+      })
+        .then((res) => {
+          if (res.status == 200) {
+            uni.showToast({
+              title: "获取成功",
+              icon: "none",
+              duration: 2000,
+            });
+            this.getUserInfo();
+          } else {
+            uni.showToast({
+              title: "获取失败",
+              icon: "none",
+              duration: 2000,
+            });
+          }
+        })
+        .finally();
+    },
+    headImgUpload(avatarUrl) {
+      const app = this;
+      const imageList = [
+        {
+          path: avatarUrl,
+        },
+      ];
+      // 批量上传
+      return new Promise((resolve, reject) => {
+        if (imageList.length > 0) {
+          UploadApi.image(imageList)
+            .then((fileIds) => {
+              console.log(fileIds);
+              app.nickSubmit(fileIds.join(","));
+              resolve(fileIds);
+            })
+            .catch(reject);
+        } else {
+          resolve();
+        }
+      });
+    },
+    goShopOrderList() {
+      uni.navigateTo({
+        url: "/pages/news3/shopOrder?delivery_type=20",
+      });
+    },
+    goDealer(type) {
+      if (type == 30) {
+        this.goJump("/pages/news3/JoinDistribution?dataType=all");
+      } else if (type == 10 || type == 20) {
+        // uni.showToast({
+        // 	title: '请先购买分销会员',
+        // 	icon: 'none',
+        // 	duration: 2000
+        // })
+        this.goJump("/pages/member/index");
+      }
+    },
+    openScrollTo() {
+      uni.pageScrollTo({
+        scrollTop: 0,
+      });
+    },
+    getSuggest() {
+      // 获取推荐商品
+      Api.recommendedNew({
+        page: this.recommendPage++,
+      }).then((res) => {
+        console.log(res);
+        let arr = res.data.goodsList.data;
+        if (arr && arr.length > 0) {
+          for (let i = 0; i < arr.length; i++) {
+            arr[i].goods_price_min = Number(arr[i].goods_price_min);
+            arr[i].goods_price_max = Number(arr[i].goods_price_max);
+            arr[i].line_price_min = Number(arr[i].line_price_min);
+            arr[i].line_price_max = Number(arr[i].line_price_max);
+          }
+        }
+        if (arr.length < res.data.goodsList.per_page) {
+          this.recommendFinish = true;
+        }
+        this.recommendLoadTitle = this.recommendFinish
+          ? "已全部加载完"
+          : "上拉加载更多";
+        this.goodsRecommend = [...this.goodsRecommend, ...arr];
+      });
+    },
+    // 刷新页面
+    onRefreshPage() {
+      this.isLogin = checkLogin();
+      console.log(this.isLogin, "是否登录");
+      // 获取页面数据
+      this.getUserInfo();
+    },
+    // 获取当前用户信息
+    getUserInfo() {
+      const that = this;
+      return new Promise((resolve, reject) => {
+        !that.isLogin
+          ? resolve(null)
+          : UserApi.info(
+              {},
+              {
+                load: that.isFirstload,
+              }
+            )
+              .then((result) => {
+                let data = result.data.userInfo;
+                console.log("data.user_id", data.user_id);
+                // data.qrcode = createQrCodeImg(data.user_id.toString(), {
+                // 	'size': 500
+                // });
+                console.log(data);
+
+                that.userInfo = data;
+                that.getOrderInfo();
+                that.getActionCountsInfo();
+                uni.setStorageSync("userInfo", that.userInfo);
+                if (data.user_type == 20 || data.user_type == 40) {
+                  that.getMembershipInviteQrcode();
+                }
+                if (data.user_type == 30 || data.user_type == 40) {
+                  that.getDealerInviteQrcode();
+                }
+
+                // that.getMembershipInviteQrcode()
+                // that.getDealerInviteQrcode()
+                resolve(that.userInfo);
+              })
+              .catch((err) => {
+                if (err.result && err.result.status == 401) {
+                  that.isLogin = false;
+                  resolve(null);
+                } else {
+                  reject(err);
+                }
+              });
+      });
+    },
+    // 获取会员邀请码
+    getMembershipInviteQrcode() {
+      const that = this;
+      return new Promise((resolve, reject) => {
+        !that.isLogin
+          ? resolve(null)
+          : UserApi.getMembershipInviteQrcode(
+              {},
+              {
+                load: that.isFirstload,
+              }
+            )
+              .then((result) => {
+                that.inviteQrcode = result.message;
+                console.log(this.inviteQrcode);
+
+                resolve(that.inviteQrcode);
+              })
+              .catch((err) => {
+                if (err.result && err.result.status == 401) {
+                  that.isLogin = false;
+                  resolve(null);
+                } else {
+                  reject(err);
+                }
+              });
+      });
+    },
+    // 获取分销码
+    getDealerInviteQrcode() {
+      const that = this;
+      return new Promise((resolve, reject) => {
+        !that.isLogin
+          ? resolve(null)
+          : UserApi.getDealerInviteQrcode(
+              {},
+              {
+                load: that.isFirstload,
+              }
+            )
+              .then((result) => {
+                that.dealerInviteQrcode = result.message;
+                console.log(this.dealerInviteQrcode);
+                resolve(that.dealerInviteQrcode);
+              })
+              .catch((err) => {
+                if (err.result && err.result.status == 401) {
+                  that.isLogin = false;
+                  resolve(null);
+                } else {
+                  reject(err);
+                }
+              });
+      });
+    },
+    // 获取当前订单数量
+    getOrderInfo() {
+      const that = this;
+      return new Promise((resolve, reject) => {
+        !that.isLogin
+          ? resolve(null)
+          : UserApi.todoCounts(
+              {},
+              {
+                load: that.isFirstload,
+              }
+            )
+              .then((result) => {
+                that.orderTodoInfo = result.data;
+                resolve(that.orderTodoInfo);
+              })
+              .catch((err) => {
+                if (err.result && err.result.status == 401) {
+                  that.isLogin = false;
+                  resolve(null);
+                } else {
+                  reject(err);
+                }
+              });
+      });
+    },
+    // 获取当前用户行为
+    getActionCountsInfo() {
+      const that = this;
+      return new Promise((resolve, reject) => {
+        !that.isLogin
+          ? resolve(null)
+          : UserApi.actionCounts(
+              {},
+              {
+                load: that.isFirstload,
+              }
+            )
+              .then((result) => {
+                that.actionCountsInfo = result.data;
+                resolve(that.actionCountsInfo);
+              })
+              .catch((err) => {
+                if (err.result && err.result.status == 401) {
+                  that.isLogin = false;
+                  resolve(null);
+                } else {
+                  reject(err);
+                }
+              });
+      });
+    },
+    toFuwu(type) {
+      if (!uni.getStorageSync("AccessToken")) {
+        uni.navigateTo({
+          url: "/pages/login/index",
+        });
+        return;
+      }
+      uni.navigateTo({
+        url: "/pages/news/recycling/orderList?type=" + type,
+      });
+    },
+    toRecovery(type) {
+      if (!uni.getStorageSync("AccessToken")) {
+        uni.navigateTo({
+          url: "/pages/login/index",
+        });
+        return;
+      }
+      uni.navigateTo({
+        url: "/pages/news/recycling/recoveryList?type=" + type,
+      });
+    },
+    goJump(url, type) {
+      if (type == 1) {
+        uni.navigateTo({
+          url,
+        });
+        return;
+      }
+      if (this.isLogin == false) {
+        this.goLogin();
+        return;
+      }
+      uni.navigateTo({
+        url,
+      });
+    },
+    goManagementHandle(url, title) {
+      uni.navigateTo({
+        url: url + "?title=" + title,
+      });
+    },
+    goLogin() {
+      // 去登录
+      uni.navigateTo({
+        url: "/pages/login/index",
+      });
+    },
+    goMember(type) {
+      if (this.isLogin == false) {
+        this.goLogin();
+        return;
+      }
+      if (type == "hy") {
+        uni.navigateTo({
+          url: "/pages/news/caigou/notice1",
+        });
+      } else {
+        uni.navigateTo({
+          url: "/pages/member/index?type=" + type,
+        });
+      }
+    },
+    goOrder() {
+      if (this.isLogin == false) {
+        this.goLogin();
+        return;
+      }
+      uni.navigateTo({
+        url: "/pages/order/index",
+      });
+    },
+    lookMemberCode(val) {
+      if (this.isLogin == false) {
+        this.goLogin();
+        return;
+      }
+      this.lookMemberType = val;
+      this.qrcode = val == 2 ? this.inviteQrcode : this.dealerInviteQrcode;
+      this.memberCode = true;
+      if (val == 2) {
+        if (!this.qrcode1) {
+          this.createImge(1, 702, 702);
+        }
+      } else {
+        if (!this.qrcode2) {
+          this.createImge(2, 702, 889);
+        }
+      }
+    },
+
+    myWallet() {
+      if (this.isLogin == false) {
+        this.goLogin();
+        return;
+      }
+      // 我的钱包
+      uni.navigateTo({
+        url: "/pages/news1/wallet",
+      });
+    },
+    goGoodsOrder(val) {
+      if (this.isLogin == false) {
+        this.goLogin();
+        return;
+      }
+      // 我的订单
+      if (this.userInfo.user_type == 40) {
+        uni.navigateTo({
+          url: "/pages/news3/shopOrder?dataType=" + val,
+        });
+      } else {
+        uni.navigateTo({
+          url: "/pages/order/index?dataType=" + val,
+        });
+      }
+    },
+    goodsDetail(item) {
+      // 跳转商品详情
+      uni.navigateTo({
+        url: "/pages/goods/detail?goodsId=" + item.goods_id,
+      });
+    },
+    goPage(url) {
+      uni.switchTab({
+        url,
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-	.myCanvas {
-		position: absolute;
-		z-index: -1;
-	}
-
-	.goodsInfo1 {
-		display: flex;
-		align-items: center;
-		margin: 18rpx 0 0 0rpx;
-
-		.oneTip {
-			padding: 0 16rpx;
-			height: 34rpx;
-			background: #F6F6F6;
-			border-radius: 4rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 22rpx;
-			color: #333333;
-			line-height: 34rpx;
-			text-align: left;
-			font-style: normal;
-			text-transform: none;
-			max-width: 300rpx;
-			display: -webkit-box;
-			-webkit-box-orient: vertical;
-			overflow: hidden;
-			-webkit-line-clamp: 1;
-			white-space: nowrap;
-		}
-	}
-
-	.goodsSend {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 18rpx;
-
-		.sendLeft {
-			width: 120rpx;
-			border: 1rpx solid #F21A1C;
-			border-radius: 4rpx;
-			height: 30rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.left_1 {
-				height: 100%;
-				width: 48rpx;
-				line-height: 25rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: bold;
-				font-size: 22rpx;
-				color: #F21A1C;
-				text-align: center;
-			}
-
-			.left_2 {
-				height: 100%;
-				width: 72rpx;
-				background-color: #F21A1C;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				font-size: 20rpx;
-				color: #FFFFFF;
-				line-height: 26rpx;
-				text-align: center;
-				font-style: normal;
-				text-transform: none;
-			}
-		}
-
-		.sendRight {
-			height: 32rpx;
-			background: #FDEDED;
-			padding: 0 10rpx;
-			border-radius: 4rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			font-size: 20rpx;
-			color: #F21A1C;
-			line-height: 32rpx;
-			text-align: left;
-			font-style: normal;
-			text-transform: none;
-		}
-	}
-
-	.delPrice {
-		font-size: 20rpx;
-		font-weight: 500;
-		color: #F21A1C;
-	}
-
-	.page {
-		background-color: rgba(247, 248, 250, 1.000000);
-		position: relative;
-		width: 750rpx;
-		height: 100%;
-		overflow: hidden;
-		display: flex;
-		flex-direction: column;
-		justify-content: flex-end;
-		padding-bottom: 30rpx;
-
-		.toTop {
-			position: fixed;
-			bottom: 120rpx;
-			right: 16rpx;
-			width: 99rpx;
-			height: 99rpx;
-			border-radius: 50%;
-			opacity: 1;
-			z-index: 999;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-
-		}
-
-	}
-
-	.goodsRecommend-title {
-		padding: 20rpx 25rpx;
-		display: flex;
-		align-items: center;
-		font-size: 32rpx;
-		font-weight: 600;
-		color: #3B3B3B;
-		justify-content: center;
-
-		image {
-			width: 30rpx;
-			height: 30rpx;
-			margin: 0 10rpx;
-		}
-	}
-
-	.goodsRecommend {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		flex-wrap: wrap;
-		padding: 10rpx 25rpx 25rpx;
-
-		.goodsItem {
-			width: 345rpx;
-			border-radius: 8rpx;
-			overflow: hidden;
-			background-color: #ffffff;
-			padding: 20rpx;
-			box-sizing: border-box;
-			// margin: 0rpx 14rpx 20rpx 0;
-			margin: 0 0 20rpx 0;
-
-			.pic {
-				width: 100%;
-				align-items: center;
-				display: flex;
-				height: 256rpx;
-				overflow: hidden;
-
-				image {
-					width: 100%;
-					height: 100%;
-
-				}
-			}
-
-			.goodsInfo {
-				overflow: hidden;
-
-				.title {
-					height: 60rpx;
-					display: flex;
-					align-items: center;
-					margin-top: 10rpx;
-					display: -webkit-box;
-					-webkit-box-orient: vertical;
-					overflow: hidden;
-					-webkit-line-clamp: 2;
-					line-height: 33rpx;
-					white-space: normal;
-
-					.ziying {
-						padding: 4rpx 10rpx;
-						background: #FF4438;
-						border-radius: 2px 2px 2px 2px;
-						opacity: 1;
-						font-size: 24rpx;
-						font-weight: 400;
-						color: #FFFFFF;
-
-					}
-
-					.name {
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 500;
-						font-size: 28rpx;
-						color: #2B2B2B;
-						line-height: 33rpx;
-						text-align: left;
-						font-style: normal;
-						text-transform: none;
-					}
-				}
-
-				.isExpress {
-					height: 30rpx;
-					display: flex;
-					align-items: center;
-					margin: 10rpx 0;
-
-					text {
-						display: inline-block;
-						width: 44rpx;
-						height: 30rpx;
-						line-height: 28rpx;
-						border: 1px solid #F21A1C;
-						border-radius: 2px 2px 2px 2px;
-						background: #FFFFFF;
-						text-align: center;
-						font-size: 16rpx;
-						font-family: PingFang SC, PingFang SC;
-						font-weight: 400;
-						color: #F21A1C;
-					}
-
-				}
-
-				.price {
-					color: #F21A1C;
-					display: flex;
-					align-items: baseline;
-				}
-
-				.comment {
-					margin-top: 6rpx;
-					font-size: 22rpx;
-					font-weight: 400;
-					color: #949494;
-
-				}
-			}
-		}
-
-
-		.finished {
-			font-size: 28rpx;
-			line-height: 100rpx;
-			text-align: center;
-			color: #bbb;
-			width: 100%;
-		}
-	}
-
-	.section_1 {
-		position: relative;
-		width: 100%;
-		display: flex;
-		flex-direction: column;
-		background: url('https://www.royaum.com.cn/static/news/login-bg.png') center -80px no-repeat;
-		background-size: 100% auto;
-	}
-
-
-	.box_1 {
-		width: 668rpx;
-		height: 114rpx;
-		flex-direction: row;
-		display: flex;
-		margin: 30rpx auto 0;
-	}
-
-	.image_2 {
-		width: 114rpx;
-		height: 114rpx;
-		border-radius: 50%;
-	}
-
-	.group_1 {
-		width: 288rpx;
-		height: 96rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		margin: 2rpx 0 0 24rpx;
-
-		button:after {
-			border: none !important;
-		}
-	}
-
-	.image-text_1 {
-		width: 286rpx;
-		height: 50rpx;
-		margin-left: 2rpx;
-		display: flex;
-		align-items: center;
-	}
-
-	.avatar-wrapper {
-		width: 286rpx;
-		height: 50rpx;
-		margin-left: 2rpx;
-		display: flex;
-		align-items: center;
-		background: none;
-		padding: 0;
-		margin: 0;
-		border: none;
-
-		::v-ddep uni-button:after {
-			border: none !important;
-		}
-
-		button[type=primary][plain] {
-			border: none !important;
-		}
-	}
-
-	.text-group_1 {
-		// width: 232rpx;
-		height: 50rpx;
-		overflow-wrap: break-word;
-		color: rgba(0, 0, 0, 1);
-		font-size: 36rpx;
-		font-weight: 500;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 50rpx;
-	}
-
-	.thumbnail_1 {
-		width: 32rpx;
-		height: 32rpx;
-		margin-left: 12rpx;
-	}
-
-	.text-wrapper_1 {
-		background-color: rgba(255, 255, 255, 0.56);
-		border-radius: 28rpx;
-		height: 44rpx;
-		border: 2px solid rgba(255, 255, 255, 1);
-		margin-top: 2rpx;
-		display: flex;
-		flex-direction: column;
-		width: 100rpx;
-	}
-
-	.text_1 {
-		color: rgba(100, 100, 100, 1);
-		font-size: 24rpx;
-		text-align: center;
-	}
-
-	.group_2 {
-		width: 40rpx;
-		height: 68rpx;
-		margin: 8rpx 0 0 48rpx;
-		position: relative;
-
-		button {
-			width: 100%;
-			height: 100%;
-			position: absolute;
-			left: 0;
-			top: 0;
-			z-index: 2;
-			opacity: 0;
-		}
-
-		.thumbnail {
-			width: 30rpx;
-			height: 30rpx;
-			display: block;
-			margin: 0 auto;
-		}
-	}
-
-	.group_3 {
-		background-color: rgba(17, 17, 17, 1.000000);
-		width: 32rpx;
-		height: 32rpx;
-		margin-left: 4rpx;
-		display: flex;
-		flex-direction: column;
-	}
-
-	.text_2 {
-		color: rgba(53, 53, 53, 1);
-		font-size: 20rpx;
-		font-weight: normal;
-		text-align: center;
-	}
-
-	.group_4 {
-		width: 60rpx;
-		height: 66rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: ce;
-		margin: 10rpx 0 0 20rpx;
-	}
-
-	.thumbnail_2 {
-		width: 30rpx;
-		height: 30rpx;
-		margin-left: 16rpx;
-	}
-
-	.text_3 {
-		width: 60rpx;
-		height: 28rpx;
-		overflow-wrap: break-word;
-		color: rgba(53, 53, 53, 1.000000);
-		font-size: 20rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 20rpx;
-		margin-top: 12rpx;
-	}
-
-	.group_5 {
-		width: 60rpx;
-		height: 66rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		margin: 10rpx 0 0 14rpx;
-	}
-
-	.thumbnail_3 {
-		width: 30rpx;
-		height: 30rpx;
-		margin-left: 16rpx;
-	}
-
-	.text_4 {
-		width: 60rpx;
-		height: 28rpx;
-		overflow-wrap: break-word;
-		color: rgba(53, 53, 53, 1.000000);
-		font-size: 20rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 20rpx;
-		margin-top: 12rpx;
-	}
-
-	.plus {
-		width: 692rpx;
-		height: 134rpx;
-		background: url('https://www.royaum.com.cn/static/bg-1.png') center top no-repeat;
-		background-size: 100% auto;
-		border-radius: 8rpx;
-		opacity: 1;
-		margin: 24rpx auto 0;
-		display: flex;
-		position: relative;
-
-		.plusLeft {
-			.leftTop {
-				width: 198rpx;
-				height: 48rpx;
-				background: linear-gradient(180deg, #FFF4E4 0%, #F3C683 100%);
-				opacity: 1;
-				border-radius: 8rpx 0 40rpx 0;
-				font-size: 28rpx;
-				font-weight: 500;
-				color: #966542;
-				line-height: 48rpx;
-				text-align: center;
-				display: flex;
-				align-items: center;
-
-				.vipIcon {
-					width: 42rpx;
-					height: 40rpx;
-					margin-right: 6rpx;
-					margin-left: 16rpx;
-				}
-			}
-
-			.leftBottom {
-				// width: 162rpx;
-				height: 34rpx;
-				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: #885733;
-				line-height: 34rpx;
-				margin: 22rpx 0 0 14rpx;
-			}
-		}
-
-		.plusLine {
-			height: 0;
-			position: absolute;
-			width: 98rpx;
-			left: 240rpx;
-			opacity: 1;
-			border: 1px solid;
-			border-image: linear-gradient(90deg, #fcead5, #f1b874, #f2d9bb) 2 2;
-			transform: rotate(90deg);
-			top: 35px;
-			z-index: 2;
-		}
-
-		.plusRight {
-			margin-left: 100rpx;
-
-			.rightTop {
-				width: 280rpx;
-				height: 40rpx;
-				font-size: 28rpx;
-				font-weight: 500;
-				color: #654731;
-				line-height: 40rpx;
-				margin: 30rpx 0 0 44rpx;
-			}
-
-			.rightBot {
-				width: 160rpx;
-				height: 28rpx;
-				font-size: 20rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: #966542;
-				line-height: 28rpx;
-				margin: 4rpx 0 0 44rpx;
-
-			}
-		}
-	}
-
-	.coupon {
-		width: 688rpx;
-		height: 142rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-		opacity: 1;
-		margin: 16rpx auto 0;
-
-		.walletList {
-			display: flex;
-			margin: 30rpx 0 0 28rpx;
-			justify-content: space-around;
-
-			.listItem {
-				text-align: center;
-
-				.num {
-					height: 50rpx;
-					font-size: 36rpx;
-					font-weight: 600;
-					color: #2F2F2F;
-					line-height: 50rpx;
-				}
-
-				.info {
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #3D3D3D;
-					line-height: 40rpx;
-				}
-			}
-		}
-	}
-
-	.newplus {
-		display: flex;
-		margin: 25rpx 30rpx 0;
-		justify-content: space-between;
-
-		.memVip {
-			width: 334rpx;
-			height: 130rpx;
-			background: linear-gradient(180deg, #FFF0DF 0%, #EFD4B4 100%);
-			border-radius: 8rpx 8rpx 8rpx 8rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-
-			.vipLine {
-				width: 176rpx;
-				height: 46rpx;
-				background: #FCF0E3;
-				opacity: 1;
-				border-radius: 8rpx 0 20rpx 0;
-				font-size: 24rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #966542;
-				display: flex;
-				align-items: center;
-
-				.vipIcon {
-					width: 42rpx;
-					height: 40rpx;
-					margin-left: 16rpx;
-				}
-			}
-
-			.sec {
-				color: #AD836C;
-				margin-top: 15rpx;
-				display: flex;
-				align-items: center;
-				width: 100%;
-
-				.inVip {
-					font-size: 28rpx;
-					font-weight: 500;
-					color: #654731;
-					margin-right: 6rpx;
-					margin-left: 50rpx;
-				}
-
-				.enjoyVip {
-					height: 28rpx;
-					font-size: 20rpx;
-					font-weight: 400;
-					color: #966542;
-					line-height: 28rpx;
-					margin-right: 20rpx;
-				}
-			}
-		}
-
-		.fxVip {
-			width: 334rpx;
-			height: 130rpx;
-			background: linear-gradient(180deg, #F8DAC2 0%, #F5C4A6 100%);
-			border-radius: 8rpx 8rpx 8rpx 8rpx;
-			opacity: 1;
-		}
-	}
-
-	.goodsManage {
-		background-color: rgba(255, 255, 255, 1.000000);
-		border-radius: 10rpx;
-		height: 216rpx;
-		width: 688rpx;
-		display: flex;
-		flex-direction: column;
-		margin: 20rpx auto 0;
-
-		.manageTitle {
-			width: 638rpx;
-			height: 44rpx;
-			display: flex;
-			align-items: center;
-			margin: 16rpx 0 0 28rpx;
-
-			.titleLeft {
-				width: 112rpx;
-				height: 40rpx;
-				overflow-wrap: break-word;
-				color: rgba(36, 36, 36, 1.000000);
-				font-size: 28rpx;
-				font-weight: 500;
-				text-align: left;
-				white-space: nowrap;
-				line-height: 40rpx;
-			}
-
-			.titleRight {
-				width: 96rpx;
-				height: 34rpx;
-				overflow-wrap: break-word;
-				color: rgba(144, 144, 144, 1.000000);
-				font-size: 24rpx;
-				font-family: PingFang SC-Regular;
-				font-weight: normal;
-				text-align: left;
-				white-space: nowrap;
-				line-height: 24rpx;
-				margin-left: 406rpx;
-			}
-		}
-
-		.image-text_21 {
-			width: 20%;
-			float: left;
-			position: relative;
-			text-align: center;
-
-			.label_11 {
-				width: 50rpx;
-				height: 50rpx;
-			}
-
-			.text-group_21 {
-				line-height: 40rpx;
-				font-size: 24rpx;
-				font-weight: 400;
-				color: #3D3D3D;
-			}
-
-			.text_71 {
-				width: 30rpx;
-				height: 30rpx;
-				background: #F3202A;
-				border-radius: 50%;
-				position: absolute;
-				right: 20rpx;
-				top: -10rpx;
-				z-index: 2;
-				line-height: 30rpx;
-				font-size: 24rpx;
-				color: #fff;
-			}
-		}
-
-		.grounding {
-			width: 570rpx;
-			height: 100rpx;
-			flex-direction: row;
-			display: flex;
-			justify-content: space-between;
-			margin: 26rpx 0 30rpx 44rpx;
-		}
-
-		.goodsOrder {
-			width: 688rpx;
-			margin: 26rpx 0rpx 30rpx 12rpx;
-			justify-content: space-around;
-			text-align: center;
-			padding-right: 26rpx;
-		}
-
-		.send {
-			margin: 4rpx 0 0 36rpx;
-			text-align: center;
-			justify-content: center;
-
-			text {
-				text-align: center;
-			}
-		}
-	}
-
-
-
-	.thumbnail_4 {
-		width: 16rpx;
-		height: 10rpx;
-		margin: 26rpx 0 0 8rpx;
-	}
-
-	.image-text_2 {
-		width: 104rpx;
-		height: 100rpx;
-	}
-
-	.label_1 {
-		width: 62rpx;
-		height: 62rpx;
-		display: block;
-		margin: 0 auto;
-	}
-
-	.text-group_2 {
-		width: 104rpx;
-		height: 34rpx;
-		margin-top: 10rpx;
-		flex-direction: row;
-		display: flex;
-		text-align: center;
-		align-items: center;
-	}
-
-	.text_7 {
-		width: 12rpx;
-		height: 28rpx;
-		overflow-wrap: break-word;
-		color: rgba(255, 255, 255, 1.000000);
-		font-size: 20rpx;
-		font-family: PingFang SC-Semibold;
-		font-weight: 600;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 20rpx;
-		margin-top: 4rpx;
-	}
-
-	.text_8 {
-		width: 96rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(61, 61, 61, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-	}
-
-	.image-text_3 {
-		width: 96rpx;
-		height: 96rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-		margin: 4rpx 0 0 58rpx;
-	}
-
-	.label_2 {
-		width: 54rpx;
-		height: 54rpx;
-		margin-left: 20rpx;
-	}
-
-	.text-group_3 {
-		width: 96rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(61, 61, 61, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin-top: 8rpx;
-	}
-
-	.box_3 {
-		width: 104rpx;
-		height: 100rpx;
-	}
-
-	.image_4 {
-		width: 62rpx;
-		height: 62rpx;
-		display: block;
-		margin: 0 auto;
-	}
-
-	.text_9 {
-		width: 96rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(61, 61, 61, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin-top: 12rpx;
-	}
-
-	.image-text_4 {
-		width: 104rpx;
-		height: 100rpx;
-	}
-
-	.label_3 {
-		width: 52rpx;
-		height: 52rpx;
-		margin-left: 22rpx;
-	}
-
-	.text-group_4 {
-		width: 96rpx;
-		height: 34rpx;
-		overflow-wrap: break-word;
-		color: rgba(61, 61, 61, 1.000000);
-		font-size: 24rpx;
-		font-family: PingFang SC-Regular;
-		font-weight: normal;
-		text-align: left;
-		white-space: nowrap;
-		line-height: 24rpx;
-		margin-top: 10rpx;
-	}
-
-	.userSell {
-		width: 892rpx;
-		width: 684rpx;
-		height: 220rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-		opacity: 1;
-		margin: 16rpx 0 0 36rpx;
-
-		.sell {
-			height: 40rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			color: #242424;
-			line-height: 40rpx;
-			margin: 20rpx 0 0 28rpx;
-		}
-
-		.type {
-			display: flex;
-
-			.common {
-				width: 304rpx;
-				height: 120rpx;
-				background-image: url('https://www.royaum.com.cn/static/user/manage.png');
-				background-size: 100% 100%;
-				line-height: 120rpx;
-				color: #fff;
-				font-size: 28rpx;
-				padding-left: 130rpx;
-				box-sizing: border-box;
-			}
-
-			.typeLeft {
-				margin: 20rpx 20rpx 0 28rpx;
-			}
-
-			.typeRight {
-				margin: 20rpx 20rpx 0 0rpx;
-				position: relative;
-
-				.sale {
-					width: 98rpx;
-					height: 98rpx;
-					position: absolute;
-					top: 8rpx;
-					left: 20rpx;
-					margin-right: 20rpx;
-				}
-			}
-
-		}
-	}
-
-	.wallet {
-		width: 688rpx;
-		height: 186rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-		opacity: 1;
-		margin: 16rpx auto 0;
-
-		.myWallet {
-			height: 40rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			color: #242424;
-			line-height: 40rpx;
-			margin: 18rpx 0 0 30rpx;
-		}
-
-		.walletList {
-			display: flex;
-			margin: 22rpx 0 0 18rpx;
-			justify-content: space-around;
-
-			.listItem {
-				text-align: center;
-
-				.num {
-					height: 50rpx;
-					font-size: 36rpx;
-					font-weight: 600;
-					color: #2F2F2F;
-					line-height: 50rpx;
-				}
-
-				.info {
-					font-size: 24rpx;
-					font-weight: 400;
-					color: #3D3D3D;
-					line-height: 40rpx;
-				}
-			}
-		}
-	}
-
-	.myServe {
-		width: 688rpx;
-		// height: 436rpx;
-		background: #FFFFFF;
-		border-radius: 10rpx 10rpx 10rpx 10rpx;
-		opacity: 1;
-		margin: 16rpx auto 0;
-
-		.myservice {
-			margin: 20rpx 0 0 30rpx;
-			height: 40rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 500;
-			color: #242424;
-			line-height: 40rpx;
-		}
-
-		.serve {
-			margin: 16rpx 0 0 42rpx;
-			display: flex;
-			flex-wrap: wrap;
-
-			.serveIcon {
-				width: 120rpx;
-				height: 100rpx;
-				text-align: center;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				margin-bottom: 22rpx;
-				position: relative;
-
-				.icons {
-					width: 48rpx;
-					height: 48rpx;
-					margin-bottom: 12rpx;
-				}
-
-				.serveInfo {
-					width: 96rpx;
-					height: 34rpx;
-					font-size: 24rpx;
-					font-family: PingFang SC, PingFang SC;
-					font-weight: 400;
-					color: #3D3D3D;
-					line-height: 34rpx;
-					text-align: center;
-
-				}
-
-				.infoBtn {
-					width: 100%;
-					height: 100%;
-					position: absolute;
-					left: 0;
-					top: 0;
-					z-index: 2;
-					opacity: 0;
-				}
-			}
-		}
-	}
-
-	.line {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin: 26rpx 0 20rpx 0;
-
-		image {
-			width: 60rpx;
-			height: 44rpx;
-		}
-
-		text {
-			height: 44rpx;
-			font-size: 32rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 600;
-			color: #3B3B3B;
-			line-height: 44rpx;
-			margin: 0 16rpx;
-		}
-	}
-
-	.goodsList {
-		margin: 0 auto;
-		display: flex;
-		flex-wrap: wrap;
-		width: 100%;
-
-		.group_11 {
-			width: 340rpx;
-			height: 438rpx;
-			flex-direction: row;
-			display: flex;
-			justify-content: space-between;
-			margin: 14rpx 0 0 16rpx;
-		}
-
-		.block_2 {
-			background-color: rgba(255, 255, 255, 1.000000);
-			border-radius: 8rpx;
-			width: 340rpx;
-			height: 436rpx;
-			margin-top: 2rpx;
-			display: flex;
-			flex-direction: column;
-			justify-content: flex-center;
-		}
-
-		.image_3 {
-			width: 276rpx;
-			height: 252rpx;
-			margin: 20rpx 0 0 28rpx;
-		}
-
-		.box_6 {
-			width: 300rpx;
-			height: 34rpx;
-			flex-direction: row;
-			display: flex;
-			justify-content: space-between;
-			margin: 14rpx 0 0 28rpx;
-		}
-
-		.text-wrapper_4 {
-			background-color: rgba(255, 68, 56, 1.000000);
-			border-radius: 4rpx;
-			height: 34rpx;
-			display: flex;
-			flex-direction: column;
-			width: 58rpx;
-		}
-
-		.text_12 {
-			width: 48rpx;
-			height: 34rpx;
-			overflow-wrap: break-word;
-			color: rgba(255, 255, 255, 1.000000);
-			font-size: 24rpx;
-			font-family: PingFang SC-Regular;
-			font-weight: normal;
-			text-align: left;
-			white-space: nowrap;
-			line-height: 24rpx;
-			margin-left: 6rpx;
-		}
-
-		.text_13 {
-			width: 236rpx;
-			height: 34rpx;
-			overflow-wrap: break-word;
-			color: rgba(30, 30, 30, 1.000000);
-			font-size: 24rpx;
-			font-family: PingFang SC-Regular;
-			font-weight: normal;
-			text-align: left;
-			white-space: nowrap;
-			line-height: 24rpx;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-
-		.text-wrapper_5 {
-			width: 242rpx;
-			height: 50rpx;
-			flex-direction: row;
-			display: flex;
-			margin: 20rpx 0 0 34rpx;
-		}
-
-		.text_14 {
-			width: 16rpx;
-			height: 34rpx;
-			overflow-wrap: break-word;
-			color: rgba(242, 26, 28, 1.000000);
-			font-size: 24rpx;
-			font-family: PingFang SC-Semibold;
-			font-weight: 600;
-			text-align: left;
-			white-space: nowrap;
-			line-height: 24rpx;
-			margin-top: 12rpx;
-		}
-
-		.text_15 {
-			// min-width: 86rpx;
-			height: 50rpx;
-			overflow-wrap: break-word;
-			color: rgba(242, 26, 28, 1.000000);
-			font-size: 36rpx;
-			font-family: PingFang SC-Semibold;
-			font-weight: 600;
-			text-align: left;
-			white-space: nowrap;
-			line-height: 36rpx;
-		}
-
-		.text_16 {
-			width: 60rpx;
-			height: 28rpx;
-			overflow-wrap: break-word;
-			color: rgba(242, 26, 28, 1.000000);
-			font-size: 20rpx;
-			font-family: PingFang SC-Medium;
-			font-weight: 500;
-			text-align: left;
-			white-space: nowrap;
-			line-height: 20rpx;
-			margin: 14rpx 0 0 4rpx;
-		}
-
-		.text_17 {
-			width: 66rpx;
-			height: 30rpx;
-			overflow-wrap: break-word;
-			color: rgba(148, 148, 148, 1.000000);
-			font-size: 22rpx;
-			font-family: PingFang SC-Regular;
-			font-weight: normal;
-			text-align: left;
-			white-space: nowrap;
-			line-height: 22rpx;
-			margin: 16rpx 0 0 10rpx;
-			text-decoration: line-through;
-		}
-
-		.text_18 {
-			width: 220rpx;
-			height: 28rpx;
-			overflow-wrap: break-word;
-			color: rgba(148, 148, 148, 1.000000);
-			font-size: 20rpx;
-			font-family: PingFang SC-Regular;
-			font-weight: normal;
-			text-align: left;
-			white-space: nowrap;
-			line-height: 20rpx;
-			margin: -2rpx 0 20rpx 36rpx;
-		}
-	}
-
-	.memberCode {
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(9, 9, 9, 0.38);
-		z-index: 20;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-
-		.codeMain1 {
-			width: 702rpx;
-			height: 702rpx;
-			position: relative;
-
-			.bg {
-				width: 100%;
-				height: 100%;
-			}
-
-			.code {
-				width: 170rpx;
-				height: 170rpx;
-				border-radius: 50%;
-				position: absolute;
-				right: 70rpx;
-				bottom: 55rpx;
-				z-index: 2;
-			}
-
-			.btn {
-				width: 220rpx;
-				height: 50rpx;
-				position: absolute;
-				left: 50%;
-				top: 172rpx;
-				margin-left: -110rpx;
-				z-index: 3;
-			}
-		}
-
-		.codeMain2 {
-			width: 702rpx;
-			height: 889rpx;
-			position: relative;
-
-			.bg {
-				width: 100%;
-				height: 100%;
-			}
-
-			.code {
-				width: 150rpx;
-				height: 150rpx;
-				border-radius: 50%;
-				position: absolute;
-				left: 50%;
-				bottom: 105rpx;
-				margin-left: -75rpx;
-				z-index: 2;
-			}
-
-			.btn {
-				width: 400rpx;
-				height: 50rpx;
-				position: absolute;
-				left: 50%;
-				bottom: 10rpx;
-				margin-left: -200rpx;
-				z-index: 3;
-			}
-		}
-
-		.codeMain {
-			width: 560rpx;
-			height: 714rpx;
-			background-image: url('https://www.royaum.com.cn/static/bg-2.png');
-			background-size: 100% 100%;
-
-			.myCode {
-				width: 100%;
-				height: 50rpx;
-				font-size: 36rpx;
-				font-weight: 500;
-				color: #654731;
-				line-height: 50rpx;
-				text-align: center;
-				margin-top: 64rpx;
-			}
-
-			.codeImg {
-				display: flex;
-				justify-content: center;
-				width: 100%;
-				height: 378rpx;
-				border-radius: 0rpx 0rpx 0rpx 0rpx;
-				opacity: 1;
-				margin-top: 34rpx;
-
-				.img {
-					width: 388rpx;
-					height: 378rpx;
-					background-color: #fff;
-				}
-			}
-
-			.codeName {
-				width: 100%;
-				height: 44rpx;
-				font-size: 32rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #A8A8A8;
-				line-height: 44rpx;
-				text-align: center;
-				margin-top: 62rpx;
-			}
-		}
-
-	}
+.myCanvas {
+  position: absolute;
+  z-index: -1;
+}
+
+.goodsInfo1 {
+  display: flex;
+  align-items: center;
+  margin: 18rpx 0 0 0rpx;
+
+  .oneTip {
+    padding: 0 16rpx;
+    height: 34rpx;
+    background: #f6f6f6;
+    border-radius: 4rpx;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 500;
+    font-size: 22rpx;
+    color: #333333;
+    line-height: 34rpx;
+    text-align: left;
+    font-style: normal;
+    text-transform: none;
+    max-width: 300rpx;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    -webkit-line-clamp: 1;
+    white-space: nowrap;
+  }
+}
+
+.goodsSend {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 18rpx;
+
+  .sendLeft {
+    width: 120rpx;
+    border: 1rpx solid #f21a1c;
+    border-radius: 4rpx;
+    height: 30rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .left_1 {
+      height: 100%;
+      width: 48rpx;
+      line-height: 25rpx;
+      font-family: PingFang SC, PingFang SC;
+      font-weight: bold;
+      font-size: 22rpx;
+      color: #f21a1c;
+      text-align: center;
+    }
+
+    .left_2 {
+      height: 100%;
+      width: 72rpx;
+      background-color: #f21a1c;
+      font-family: PingFang SC, PingFang SC;
+      font-weight: 500;
+      font-size: 20rpx;
+      color: #ffffff;
+      line-height: 26rpx;
+      text-align: center;
+      font-style: normal;
+      text-transform: none;
+    }
+  }
+
+  .sendRight {
+    height: 32rpx;
+    background: #fdeded;
+    padding: 0 10rpx;
+    border-radius: 4rpx;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 500;
+    font-size: 20rpx;
+    color: #f21a1c;
+    line-height: 32rpx;
+    text-align: left;
+    font-style: normal;
+    text-transform: none;
+  }
+}
+
+.delPrice {
+  font-size: 20rpx;
+  font-weight: 500;
+  color: #f21a1c;
+}
+
+.page {
+  background-color: rgba(247, 248, 250, 1);
+  position: relative;
+  width: 750rpx;
+  height: 100%;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+  padding-bottom: 30rpx;
+
+  .toTop {
+    position: fixed;
+    bottom: 120rpx;
+    right: 16rpx;
+    width: 99rpx;
+    height: 99rpx;
+    border-radius: 50%;
+    opacity: 1;
+    z-index: 999;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+
+.goodsRecommend-title {
+  padding: 20rpx 25rpx;
+  display: flex;
+  align-items: center;
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #3b3b3b;
+  justify-content: center;
+
+  image {
+    width: 30rpx;
+    height: 30rpx;
+    margin: 0 10rpx;
+  }
+}
+
+.goodsRecommend {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  padding: 10rpx 25rpx 25rpx;
+
+  .goodsItem {
+    width: 345rpx;
+    border-radius: 8rpx;
+    overflow: hidden;
+    background-color: #ffffff;
+    padding: 20rpx;
+    box-sizing: border-box;
+    // margin: 0rpx 14rpx 20rpx 0;
+    margin: 0 0 20rpx 0;
+
+    .pic {
+      width: 100%;
+      align-items: center;
+      display: flex;
+      height: 256rpx;
+      overflow: hidden;
+
+      image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .goodsInfo {
+      overflow: hidden;
+
+      .title {
+        height: 60rpx;
+        display: flex;
+        align-items: center;
+        margin-top: 10rpx;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        overflow: hidden;
+        -webkit-line-clamp: 2;
+        line-height: 33rpx;
+        white-space: normal;
+
+        .ziying {
+          padding: 4rpx 10rpx;
+          background: #ff4438;
+          border-radius: 2px 2px 2px 2px;
+          opacity: 1;
+          font-size: 24rpx;
+          font-weight: 400;
+          color: #ffffff;
+        }
+
+        .name {
+          font-family: PingFang SC, PingFang SC;
+          font-weight: 500;
+          font-size: 28rpx;
+          color: #2b2b2b;
+          line-height: 33rpx;
+          text-align: left;
+          font-style: normal;
+          text-transform: none;
+        }
+      }
+
+      .isExpress {
+        height: 30rpx;
+        display: flex;
+        align-items: center;
+        margin: 10rpx 0;
+
+        text {
+          display: inline-block;
+          width: 44rpx;
+          height: 30rpx;
+          line-height: 28rpx;
+          border: 1px solid #f21a1c;
+          border-radius: 2px 2px 2px 2px;
+          background: #ffffff;
+          text-align: center;
+          font-size: 16rpx;
+          font-family: PingFang SC, PingFang SC;
+          font-weight: 400;
+          color: #f21a1c;
+        }
+      }
+
+      .price {
+        color: #f21a1c;
+        display: flex;
+        align-items: baseline;
+      }
+
+      .comment {
+        margin-top: 6rpx;
+        font-size: 22rpx;
+        font-weight: 400;
+        color: #949494;
+      }
+    }
+  }
+
+  .finished {
+    font-size: 28rpx;
+    line-height: 100rpx;
+    text-align: center;
+    color: #bbb;
+    width: 100%;
+  }
+}
+
+.section_1 {
+  position: relative;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  background: url("https://www.royaum.com.cn/static/news/login-bg.png") center -80px
+    no-repeat;
+  background-size: 100% auto;
+}
+
+.box_1 {
+  width: 668rpx;
+  height: 114rpx;
+  flex-direction: row;
+  display: flex;
+  margin: 30rpx auto 0;
+}
+
+.image_2 {
+  width: 114rpx;
+  height: 114rpx;
+  border-radius: 50%;
+}
+
+.group_1 {
+  width: 288rpx;
+  height: 96rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin: 2rpx 0 0 24rpx;
+
+  button:after {
+    border: none !important;
+  }
+}
+
+.image-text_1 {
+  width: 286rpx;
+  height: 50rpx;
+  margin-left: 2rpx;
+  display: flex;
+  align-items: center;
+}
+
+.avatar-wrapper {
+  width: 286rpx;
+  height: 50rpx;
+  margin-left: 2rpx;
+  display: flex;
+  align-items: center;
+  background: none;
+  padding: 0;
+  margin: 0;
+  border: none;
+
+  ::v-ddep uni-button:after {
+    border: none !important;
+  }
+
+  button[type="primary"][plain] {
+    border: none !important;
+  }
+}
+
+.text-group_1 {
+  // width: 232rpx;
+  height: 50rpx;
+  overflow-wrap: break-word;
+  color: rgba(0, 0, 0, 1);
+  font-size: 36rpx;
+  font-weight: 500;
+  text-align: left;
+  white-space: nowrap;
+  line-height: 50rpx;
+}
+
+.thumbnail_1 {
+  width: 32rpx;
+  height: 32rpx;
+  margin-left: 12rpx;
+}
+
+.text-wrapper_1 {
+  background-color: rgba(255, 255, 255, 0.56);
+  border-radius: 28rpx;
+  height: 44rpx;
+  border: 2px solid rgba(255, 255, 255, 1);
+  margin-top: 2rpx;
+  display: flex;
+  flex-direction: column;
+  width: 100rpx;
+}
+
+.text_1 {
+  color: rgba(100, 100, 100, 1);
+  font-size: 24rpx;
+  text-align: center;
+}
+
+.group_2 {
+  width: 40rpx;
+  height: 68rpx;
+  margin: 8rpx 0 0 48rpx;
+  position: relative;
+
+  button {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 2;
+    opacity: 0;
+  }
+
+  .thumbnail {
+    width: 30rpx;
+    height: 30rpx;
+    display: block;
+    margin: 0 auto;
+  }
+}
+
+.group_3 {
+  background-color: rgba(17, 17, 17, 1);
+  width: 32rpx;
+  height: 32rpx;
+  margin-left: 4rpx;
+  display: flex;
+  flex-direction: column;
+}
+
+.text_2 {
+  color: rgba(53, 53, 53, 1);
+  font-size: 20rpx;
+  font-weight: normal;
+  text-align: center;
+}
+
+.group_4 {
+  width: 60rpx;
+  height: 66rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: ce;
+  margin: 10rpx 0 0 20rpx;
+}
+
+.thumbnail_2 {
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 16rpx;
+}
+
+.text_3 {
+  width: 60rpx;
+  height: 28rpx;
+  overflow-wrap: break-word;
+  color: rgba(53, 53, 53, 1);
+  font-size: 20rpx;
+  font-family: PingFang SC-Regular;
+  font-weight: normal;
+  text-align: left;
+  white-space: nowrap;
+  line-height: 20rpx;
+  margin-top: 12rpx;
+}
+
+.group_5 {
+  width: 60rpx;
+  height: 66rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin: 10rpx 0 0 14rpx;
+}
+
+.thumbnail_3 {
+  width: 30rpx;
+  height: 30rpx;
+  margin-left: 16rpx;
+}
+
+.text_4 {
+  width: 60rpx;
+  height: 28rpx;
+  overflow-wrap: break-word;
+  color: rgba(53, 53, 53, 1);
+  font-size: 20rpx;
+  font-family: PingFang SC-Regular;
+  font-weight: normal;
+  text-align: left;
+  white-space: nowrap;
+  line-height: 20rpx;
+  margin-top: 12rpx;
+}
+
+.plus {
+  width: 692rpx;
+  height: 134rpx;
+  background: url("https://www.royaum.com.cn/static/bg-1.png") center top
+    no-repeat;
+  background-size: 100% auto;
+  border-radius: 8rpx;
+  opacity: 1;
+  margin: 24rpx auto 0;
+  display: flex;
+  position: relative;
+
+  .plusLeft {
+    .leftTop {
+      width: 198rpx;
+      height: 48rpx;
+      background: linear-gradient(180deg, #fff4e4 0%, #f3c683 100%);
+      opacity: 1;
+      border-radius: 8rpx 0 40rpx 0;
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #966542;
+      line-height: 48rpx;
+      text-align: center;
+      display: flex;
+      align-items: center;
+
+      .vipIcon {
+        width: 42rpx;
+        height: 40rpx;
+        margin-right: 6rpx;
+        margin-left: 16rpx;
+      }
+    }
+
+    .leftBottom {
+      // width: 162rpx;
+      height: 34rpx;
+      font-size: 24rpx;
+      font-family: PingFang SC, PingFang SC;
+      font-weight: 400;
+      color: #885733;
+      line-height: 34rpx;
+      margin: 22rpx 0 0 14rpx;
+    }
+  }
+
+  .plusLine {
+    height: 0;
+    position: absolute;
+    width: 98rpx;
+    left: 240rpx;
+    opacity: 1;
+    border: 1px solid;
+    border-image: linear-gradient(90deg, #fcead5, #f1b874, #f2d9bb) 2 2;
+    transform: rotate(90deg);
+    top: 35px;
+    z-index: 2;
+  }
+
+  .plusRight {
+    margin-left: 100rpx;
+
+    .rightTop {
+      width: 280rpx;
+      height: 40rpx;
+      font-size: 28rpx;
+      font-weight: 500;
+      color: #654731;
+      line-height: 40rpx;
+      margin: 30rpx 0 0 44rpx;
+    }
+
+    .rightBot {
+      width: 160rpx;
+      height: 28rpx;
+      font-size: 20rpx;
+      font-family: PingFang SC, PingFang SC;
+      font-weight: 400;
+      color: #966542;
+      line-height: 28rpx;
+      margin: 4rpx 0 0 44rpx;
+    }
+  }
+}
+
+.coupon {
+  width: 688rpx;
+  height: 142rpx;
+  background: #ffffff;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+  opacity: 1;
+  margin: 16rpx auto 0;
+
+  .walletList {
+    display: flex;
+    margin: 30rpx 0 0 28rpx;
+    justify-content: space-around;
+
+    .listItem {
+      text-align: center;
+
+      .num {
+        height: 50rpx;
+        font-size: 36rpx;
+        font-weight: 600;
+        color: #2f2f2f;
+        line-height: 50rpx;
+      }
+
+      .info {
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #3d3d3d;
+        line-height: 40rpx;
+      }
+    }
+  }
+}
+
+.newplus {
+  display: flex;
+  margin: 25rpx 30rpx 0;
+  justify-content: space-between;
+
+  .memVip {
+    width: 334rpx;
+    height: 130rpx;
+    background: linear-gradient(180deg, #fff0df 0%, #efd4b4 100%);
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+
+    image {
+      width: 100%;
+      height: 100%;
+    }
+
+    .vipLine {
+      width: 176rpx;
+      height: 46rpx;
+      background: #fcf0e3;
+      opacity: 1;
+      border-radius: 8rpx 0 20rpx 0;
+      font-size: 24rpx;
+      font-family: PingFang SC, PingFang SC;
+      font-weight: 500;
+      color: #966542;
+      display: flex;
+      align-items: center;
+
+      .vipIcon {
+        width: 42rpx;
+        height: 40rpx;
+        margin-left: 16rpx;
+      }
+    }
+
+    .sec {
+      color: #ad836c;
+      margin-top: 15rpx;
+      display: flex;
+      align-items: center;
+      width: 100%;
+
+      .inVip {
+        font-size: 28rpx;
+        font-weight: 500;
+        color: #654731;
+        margin-right: 6rpx;
+        margin-left: 50rpx;
+      }
+
+      .enjoyVip {
+        height: 28rpx;
+        font-size: 20rpx;
+        font-weight: 400;
+        color: #966542;
+        line-height: 28rpx;
+        margin-right: 20rpx;
+      }
+    }
+  }
+
+  .fxVip {
+    width: 334rpx;
+    height: 130rpx;
+    background: linear-gradient(180deg, #f8dac2 0%, #f5c4a6 100%);
+    border-radius: 8rpx 8rpx 8rpx 8rpx;
+    opacity: 1;
+  }
+}
+
+.goodsManage {
+  background-color: rgba(255, 255, 255, 1);
+  border-radius: 10rpx;
+  height: 216rpx;
+  width: 688rpx;
+  display: flex;
+  flex-direction: column;
+  margin: 20rpx auto 0;
+
+  .manageTitle {
+    width: 638rpx;
+    height: 44rpx;
+    display: flex;
+    align-items: center;
+    margin: 16rpx 0 0 28rpx;
+
+    .titleLeft {
+      width: 112rpx;
+      height: 40rpx;
+      overflow-wrap: break-word;
+      color: rgba(36, 36, 36, 1);
+      font-size: 28rpx;
+      font-weight: 500;
+      text-align: left;
+      white-space: nowrap;
+      line-height: 40rpx;
+    }
+
+    .titleRight {
+      width: 96rpx;
+      height: 34rpx;
+      overflow-wrap: break-word;
+      color: rgba(144, 144, 144, 1);
+      font-size: 24rpx;
+      font-family: PingFang SC-Regular;
+      font-weight: normal;
+      text-align: left;
+      white-space: nowrap;
+      line-height: 24rpx;
+      margin-left: 406rpx;
+    }
+  }
+
+  .image-text_21 {
+    width: 20%;
+    float: left;
+    position: relative;
+    text-align: center;
+
+    .label_11 {
+      width: 50rpx;
+      height: 50rpx;
+    }
+
+    .text-group_21 {
+      line-height: 40rpx;
+      font-size: 24rpx;
+      font-weight: 400;
+      color: #3d3d3d;
+    }
+
+    .text_71 {
+      width: 30rpx;
+      height: 30rpx;
+      background: #f3202a;
+      border-radius: 50%;
+      position: absolute;
+      right: 20rpx;
+      top: -10rpx;
+      z-index: 2;
+      line-height: 30rpx;
+      font-size: 24rpx;
+      color: #fff;
+    }
+  }
+
+  .grounding {
+    width: 570rpx;
+    height: 100rpx;
+    flex-direction: row;
+    display: flex;
+    justify-content: space-between;
+    margin: 26rpx 0 30rpx 44rpx;
+  }
+
+  .goodsOrder {
+    width: 688rpx;
+    margin: 26rpx 0rpx 30rpx 12rpx;
+    justify-content: space-around;
+    text-align: center;
+    padding-right: 26rpx;
+  }
+
+  .send {
+    margin: 4rpx 0 0 36rpx;
+    text-align: center;
+    justify-content: center;
+
+    text {
+      text-align: center;
+    }
+  }
+}
+
+.thumbnail_4 {
+  width: 16rpx;
+  height: 10rpx;
+  margin: 26rpx 0 0 8rpx;
+}
+
+.image-text_2 {
+  width: 104rpx;
+  height: 100rpx;
+}
+
+.label_1 {
+  width: 62rpx;
+  height: 62rpx;
+  display: block;
+  margin: 0 auto;
+}
+
+.text-group_2 {
+  width: 104rpx;
+  height: 34rpx;
+  margin-top: 10rpx;
+  flex-direction: row;
+  display: flex;
+  text-align: center;
+  align-items: center;
+}
+
+.text_7 {
+  width: 12rpx;
+  height: 28rpx;
+  overflow-wrap: break-word;
+  color: rgba(255, 255, 255, 1);
+  font-size: 20rpx;
+  font-family: PingFang SC-Semibold;
+  font-weight: 600;
+  text-align: left;
+  white-space: nowrap;
+  line-height: 20rpx;
+  margin-top: 4rpx;
+}
+
+.text_8 {
+  width: 96rpx;
+  height: 34rpx;
+  overflow-wrap: break-word;
+  color: rgba(61, 61, 61, 1);
+  font-size: 24rpx;
+  font-family: PingFang SC-Regular;
+  font-weight: normal;
+  text-align: left;
+  white-space: nowrap;
+  line-height: 24rpx;
+}
+
+.image-text_3 {
+  width: 96rpx;
+  height: 96rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin: 4rpx 0 0 58rpx;
+}
+
+.label_2 {
+  width: 54rpx;
+  height: 54rpx;
+  margin-left: 20rpx;
+}
+
+.text-group_3 {
+  width: 96rpx;
+  height: 34rpx;
+  overflow-wrap: break-word;
+  color: rgba(61, 61, 61, 1);
+  font-size: 24rpx;
+  font-family: PingFang SC-Regular;
+  font-weight: normal;
+  text-align: left;
+  white-space: nowrap;
+  line-height: 24rpx;
+  margin-top: 8rpx;
+}
+
+.box_3 {
+  width: 104rpx;
+  height: 100rpx;
+}
+
+.image_4 {
+  width: 62rpx;
+  height: 62rpx;
+  display: block;
+  margin: 0 auto;
+}
+
+.text_9 {
+  width: 96rpx;
+  height: 34rpx;
+  overflow-wrap: break-word;
+  color: rgba(61, 61, 61, 1);
+  font-size: 24rpx;
+  font-family: PingFang SC-Regular;
+  font-weight: normal;
+  text-align: left;
+  white-space: nowrap;
+  line-height: 24rpx;
+  margin-top: 12rpx;
+}
+
+.image-text_4 {
+  width: 104rpx;
+  height: 100rpx;
+}
+
+.label_3 {
+  width: 52rpx;
+  height: 52rpx;
+  margin-left: 22rpx;
+}
+
+.text-group_4 {
+  width: 96rpx;
+  height: 34rpx;
+  overflow-wrap: break-word;
+  color: rgba(61, 61, 61, 1);
+  font-size: 24rpx;
+  font-family: PingFang SC-Regular;
+  font-weight: normal;
+  text-align: left;
+  white-space: nowrap;
+  line-height: 24rpx;
+  margin-top: 10rpx;
+}
+
+.userSell {
+  width: 892rpx;
+  width: 684rpx;
+  height: 220rpx;
+  background: #ffffff;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+  opacity: 1;
+  margin: 16rpx 0 0 36rpx;
+
+  .sell {
+    height: 40rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 500;
+    color: #242424;
+    line-height: 40rpx;
+    margin: 20rpx 0 0 28rpx;
+  }
+
+  .type {
+    display: flex;
+
+    .common {
+      width: 304rpx;
+      height: 120rpx;
+      background-image: url("https://www.royaum.com.cn/static/user/manage.png");
+      background-size: 100% 100%;
+      line-height: 120rpx;
+      color: #fff;
+      font-size: 28rpx;
+      padding-left: 130rpx;
+      box-sizing: border-box;
+    }
+
+    .typeLeft {
+      margin: 20rpx 20rpx 0 28rpx;
+    }
+
+    .typeRight {
+      margin: 20rpx 20rpx 0 0rpx;
+      position: relative;
+
+      .sale {
+        width: 98rpx;
+        height: 98rpx;
+        position: absolute;
+        top: 8rpx;
+        left: 20rpx;
+        margin-right: 20rpx;
+      }
+    }
+  }
+}
+
+.wallet {
+  width: 688rpx;
+  height: 186rpx;
+  background: #ffffff;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+  opacity: 1;
+  margin: 16rpx auto 0;
+
+  .myWallet {
+    height: 40rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 500;
+    color: #242424;
+    line-height: 40rpx;
+    margin: 18rpx 0 0 30rpx;
+  }
+
+  .walletList {
+    display: flex;
+    margin: 22rpx 0 0 18rpx;
+    justify-content: space-around;
+
+    .listItem {
+      text-align: center;
+
+      .num {
+        height: 50rpx;
+        font-size: 36rpx;
+        font-weight: 600;
+        color: #2f2f2f;
+        line-height: 50rpx;
+      }
+
+      .info {
+        font-size: 24rpx;
+        font-weight: 400;
+        color: #3d3d3d;
+        line-height: 40rpx;
+      }
+    }
+  }
+}
+
+.myServe {
+  width: 688rpx;
+  // height: 436rpx;
+  background: #ffffff;
+  border-radius: 10rpx 10rpx 10rpx 10rpx;
+  opacity: 1;
+  margin: 16rpx auto 0;
+
+  .myservice {
+    margin: 20rpx 0 0 30rpx;
+    height: 40rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 500;
+    color: #242424;
+    line-height: 40rpx;
+  }
+
+  .serve {
+    margin: 16rpx 0 0 42rpx;
+    display: flex;
+    flex-wrap: wrap;
+
+    .serveIcon {
+      width: 120rpx;
+      height: 100rpx;
+      text-align: center;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      margin-bottom: 22rpx;
+      position: relative;
+
+      .icons {
+        width: 48rpx;
+        height: 48rpx;
+        margin-bottom: 12rpx;
+      }
+
+      .serveInfo {
+        width: 96rpx;
+        height: 34rpx;
+        font-size: 24rpx;
+        font-family: PingFang SC, PingFang SC;
+        font-weight: 400;
+        color: #3d3d3d;
+        line-height: 34rpx;
+        text-align: center;
+      }
+
+      .infoBtn {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        left: 0;
+        top: 0;
+        z-index: 2;
+        opacity: 0;
+      }
+    }
+  }
+}
+
+.line {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 26rpx 0 20rpx 0;
+
+  image {
+    width: 60rpx;
+    height: 44rpx;
+  }
+
+  text {
+    height: 44rpx;
+    font-size: 32rpx;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 600;
+    color: #3b3b3b;
+    line-height: 44rpx;
+    margin: 0 16rpx;
+  }
+}
+
+.goodsList {
+  margin: 0 auto;
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+
+  .group_11 {
+    width: 340rpx;
+    height: 438rpx;
+    flex-direction: row;
+    display: flex;
+    justify-content: space-between;
+    margin: 14rpx 0 0 16rpx;
+  }
+
+  .block_2 {
+    background-color: rgba(255, 255, 255, 1);
+    border-radius: 8rpx;
+    width: 340rpx;
+    height: 436rpx;
+    margin-top: 2rpx;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-center;
+  }
+
+  .image_3 {
+    width: 276rpx;
+    height: 252rpx;
+    margin: 20rpx 0 0 28rpx;
+  }
+
+  .box_6 {
+    width: 300rpx;
+    height: 34rpx;
+    flex-direction: row;
+    display: flex;
+    justify-content: space-between;
+    margin: 14rpx 0 0 28rpx;
+  }
+
+  .text-wrapper_4 {
+    background-color: rgba(255, 68, 56, 1);
+    border-radius: 4rpx;
+    height: 34rpx;
+    display: flex;
+    flex-direction: column;
+    width: 58rpx;
+  }
+
+  .text_12 {
+    width: 48rpx;
+    height: 34rpx;
+    overflow-wrap: break-word;
+    color: rgba(255, 255, 255, 1);
+    font-size: 24rpx;
+    font-family: PingFang SC-Regular;
+    font-weight: normal;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 24rpx;
+    margin-left: 6rpx;
+  }
+
+  .text_13 {
+    width: 236rpx;
+    height: 34rpx;
+    overflow-wrap: break-word;
+    color: rgba(30, 30, 30, 1);
+    font-size: 24rpx;
+    font-family: PingFang SC-Regular;
+    font-weight: normal;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 24rpx;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .text-wrapper_5 {
+    width: 242rpx;
+    height: 50rpx;
+    flex-direction: row;
+    display: flex;
+    margin: 20rpx 0 0 34rpx;
+  }
+
+  .text_14 {
+    width: 16rpx;
+    height: 34rpx;
+    overflow-wrap: break-word;
+    color: rgba(242, 26, 28, 1);
+    font-size: 24rpx;
+    font-family: PingFang SC-Semibold;
+    font-weight: 600;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 24rpx;
+    margin-top: 12rpx;
+  }
+
+  .text_15 {
+    // min-width: 86rpx;
+    height: 50rpx;
+    overflow-wrap: break-word;
+    color: rgba(242, 26, 28, 1);
+    font-size: 36rpx;
+    font-family: PingFang SC-Semibold;
+    font-weight: 600;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 36rpx;
+  }
+
+  .text_16 {
+    width: 60rpx;
+    height: 28rpx;
+    overflow-wrap: break-word;
+    color: rgba(242, 26, 28, 1);
+    font-size: 20rpx;
+    font-family: PingFang SC-Medium;
+    font-weight: 500;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 20rpx;
+    margin: 14rpx 0 0 4rpx;
+  }
+
+  .text_17 {
+    width: 66rpx;
+    height: 30rpx;
+    overflow-wrap: break-word;
+    color: rgba(148, 148, 148, 1);
+    font-size: 22rpx;
+    font-family: PingFang SC-Regular;
+    font-weight: normal;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 22rpx;
+    margin: 16rpx 0 0 10rpx;
+    text-decoration: line-through;
+  }
+
+  .text_18 {
+    width: 220rpx;
+    height: 28rpx;
+    overflow-wrap: break-word;
+    color: rgba(148, 148, 148, 1);
+    font-size: 20rpx;
+    font-family: PingFang SC-Regular;
+    font-weight: normal;
+    text-align: left;
+    white-space: nowrap;
+    line-height: 20rpx;
+    margin: -2rpx 0 20rpx 36rpx;
+  }
+}
+
+.memberCode {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(9, 9, 9, 0.38);
+  z-index: 20;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  .codeMain1 {
+    width: 702rpx;
+    height: 702rpx;
+    position: relative;
+
+    .bg {
+      width: 100%;
+      height: 100%;
+    }
+
+    .code {
+      width: 170rpx;
+      height: 170rpx;
+      border-radius: 50%;
+      position: absolute;
+      right: 70rpx;
+      bottom: 55rpx;
+      z-index: 2;
+    }
+
+    .btn {
+      width: 220rpx;
+      height: 50rpx;
+      position: absolute;
+      left: 50%;
+      top: 172rpx;
+      margin-left: -110rpx;
+      z-index: 3;
+    }
+  }
+
+  .codeMain2 {
+    width: 702rpx;
+    height: 889rpx;
+    position: relative;
+
+    .bg {
+      width: 100%;
+      height: 100%;
+    }
+
+    .code {
+      width: 150rpx;
+      height: 150rpx;
+      border-radius: 50%;
+      position: absolute;
+      left: 50%;
+      bottom: 105rpx;
+      margin-left: -75rpx;
+      z-index: 2;
+    }
+
+    .btn {
+      width: 400rpx;
+      height: 50rpx;
+      position: absolute;
+      left: 50%;
+      bottom: 10rpx;
+      margin-left: -200rpx;
+      z-index: 3;
+    }
+  }
+
+  .codeMain {
+    width: 560rpx;
+    height: 714rpx;
+    background-image: url("https://www.royaum.com.cn/static/bg-2.png");
+    background-size: 100% 100%;
+
+    .myCode {
+      width: 100%;
+      height: 50rpx;
+      font-size: 36rpx;
+      font-weight: 500;
+      color: #654731;
+      line-height: 50rpx;
+      text-align: center;
+      margin-top: 64rpx;
+    }
+
+    .codeImg {
+      display: flex;
+      justify-content: center;
+      width: 100%;
+      height: 378rpx;
+      border-radius: 0rpx 0rpx 0rpx 0rpx;
+      opacity: 1;
+      margin-top: 34rpx;
+
+      .img {
+        width: 388rpx;
+        height: 378rpx;
+        background-color: #fff;
+      }
+    }
+
+    .codeName {
+      width: 100%;
+      height: 44rpx;
+      font-size: 32rpx;
+      font-family: PingFang SC, PingFang SC;
+      font-weight: 500;
+      color: #a8a8a8;
+      line-height: 44rpx;
+      text-align: center;
+      margin-top: 62rpx;
+    }
+  }
+}
 </style>

From 5ff18211c869e9dbde7e7579b82c853b13165e06 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 5 Aug 2024 21:00:34 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/tutorial.js       | 12 +++++++++++-
 pages/gamll/index.vue |  3 +--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/api/tutorial.js b/api/tutorial.js
index eb8abf9..3a65be4 100644
--- a/api/tutorial.js
+++ b/api/tutorial.js
@@ -7,7 +7,8 @@ const api = {
 	retailList: 'retail/retailPayList',
 	describe: 'retail/describe',
 	submit: 'retail/submit',
-	getSoftAgreement: 'retail/getSoftAgreement'
+	getSoftAgreement: 'retail/getSoftAgreement',
+	tradeQuery: 'retail/tradeQuery',
 }
 
 // 分类
@@ -30,6 +31,15 @@ export const describe = (param) => {
 export const submit = (param) => {
 	return request.post(api.submit, param)
 }
+/**
+ * 交易查询
+ * 查询第三方支付订单是否付款成功
+ * @param {Object} param
+ */
+export function tradeQuery(param) {
+  return request.get(api.tradeQuery, param)
+}
+
 // 协议
 export const getSoftAgreement = (param) => {
 	return request.get(api.getSoftAgreement, param)
diff --git a/pages/gamll/index.vue b/pages/gamll/index.vue
index f8b9aef..8a9d032 100644
--- a/pages/gamll/index.vue
+++ b/pages/gamll/index.vue
@@ -203,7 +203,6 @@
 </template>
 <script>
 	import * as api from '@/api/tutorial'
-	import * as CashierApi from '@/api/cashier';
 	import {
 		Wechat
 	} from '@/core/payment'
@@ -332,7 +331,7 @@
 				const app = this
 				// 交易查询
 				// 查询第三方支付订单是否付款成功
-				CashierApi.tradeQuery({
+				api.tradeQuery({
 						outTradeNo,
 						method,
 						client: app.platform

From b8ec718a29401d137dc7ea7cd176058a5fbec1e2 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 5 Aug 2024 21:01:56 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ext.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext.json b/ext.json
index 9c6326d..b05e423 100644
--- a/ext.json
+++ b/ext.json
@@ -1,6 +1,6 @@
 {
 	"extEnable": true,
-	"extAppid": "wx3f1dcf2e2ac45e7c",
+	"extAppid": "wx8dc1c2620cfd953a",
 	"ext": {
 		"store_id": 10048
 	}

From bb5d505d27207b7b239286cb1d704a671bf4c5e2 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Mon, 5 Aug 2024 21:32:31 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gamll/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/gamll/index.vue b/pages/gamll/index.vue
index 8a9d032..8a5de91 100644
--- a/pages/gamll/index.vue
+++ b/pages/gamll/index.vue
@@ -105,7 +105,7 @@
 									<u-td class="box_cus flex-1">
 										<view class="box_tips" :style="{ color: index==0?'#333':'#594b40' }">
 											{{item.feature}}
-											<u-icon v-if="index>2"
+											<u-icon v-if="item.function_description"
 												@click="openPopup(item.function_description,item.feature)"
 												name="question-circle-fill" color="#999" size="30"></u-icon>
 										</view>
@@ -551,7 +551,7 @@
 							proIndex: 1,
 							H5: 'H5',
 							H5Index: 1,
-							function_description: '说明',
+							function_description: '',
 							plate_id: 1
 						}]
 

From b20be9e2253dfb045af6b127b3b6a98c6fbba576 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 6 Aug 2024 19:01:59 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=B0=B4=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gamll/index.vue |  1 +
 pages/gamll/rules.vue | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/pages/gamll/index.vue b/pages/gamll/index.vue
index 8a5de91..82cd27e 100644
--- a/pages/gamll/index.vue
+++ b/pages/gamll/index.vue
@@ -199,6 +199,7 @@
 				</view>
 			</view>
 		</u-popup>
+			<addShuiyin />
 	</view>
 </template>
 <script>
diff --git a/pages/gamll/rules.vue b/pages/gamll/rules.vue
index 6fc1511..5e8f8fd 100644
--- a/pages/gamll/rules.vue
+++ b/pages/gamll/rules.vue
@@ -2,21 +2,22 @@
 	<view class="pages">
 		<view class="content" v-html="strings">
 		</view>
+		<addShuiyin />
 	</view>
 </template>
 
 <script>
-		import * as api from '@/api/tutorial'
-	export default{
-		data(){
-			return{
-				strings:'',
+	import * as api from '@/api/tutorial'
+	export default {
+		data() {
+			return {
+				strings: '',
 			}
 		},
-		onLoad(options){
+		onLoad(options) {
 			this.getSoftAgreementData()
 		},
-		methods:{
+		methods: {
 			// 列表
 			async getSoftAgreementData() {
 				let that = this;
@@ -24,9 +25,11 @@
 					status,
 					message,
 					data
-				} = await api.getSoftAgreement({type:'soft'});
+				} = await api.getSoftAgreement({
+					type: 'soft'
+				});
 				if (status == 200) {
-					this.strings=data.detail.content
+					this.strings = data.detail.content
 				} else {
 					that.$toast(message)
 				}
@@ -36,12 +39,13 @@
 </script>
 
 <style scoped lang="scss">
-	.pages{
+	.pages {
 		width: 100%;
 		height: 100%;
 		padding: 30rpx;
-		span{
+
+		span {
 			white-space: normal !important
 		}
 	}
-</style>
\ No newline at end of file
+</style>

From 325b21218360122d5bc27884c347740aefe49317 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 6 Aug 2024 19:17:48 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/invite/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/invite/index.vue b/pages/invite/index.vue
index bcc9b14..ad72795 100644
--- a/pages/invite/index.vue
+++ b/pages/invite/index.vue
@@ -55,7 +55,7 @@
 		</view>
 		<view class="invite-popup" v-if="isPopup">
 			<view class="popup">
-				<image class="bg" show-menu-by-longpress :src="qrcode"></image>
+				<image class="bg" mode="widthFix" show-menu-by-longpress :src="qrcode"></image>
 				<view class="tips">
 					<view class="cancle" @click="download(1)">取消</view>
 					<view class="sure"  @click="download(2)">保存到相册</view>

From a71dcd33d8dd395e08331921a2b7e9003e60cdb2 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 6 Aug 2024 22:08:40 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/invite/index.vue | 189 +++++++++++++++++++++++++++++++++--------
 1 file changed, 154 insertions(+), 35 deletions(-)

diff --git a/pages/invite/index.vue b/pages/invite/index.vue
index ad72795..bec5c0c 100644
--- a/pages/invite/index.vue
+++ b/pages/invite/index.vue
@@ -27,7 +27,10 @@
 				</view>
 			</view>
 			<view class="a">
-				<view class="title"><image src="https://www.amiami.com.cn/static/news1/zuo@2x.png"></image>怎么邀请好友<image src="https://www.amiami.com.cn/static/news1/you@2x.png"></image></view>
+				<view class="title">
+					<image src="https://www.amiami.com.cn/static/news1/zuo@2x.png"></image>怎么邀请好友<image
+						src="https://www.amiami.com.cn/static/news1/you@2x.png"></image>
+				</view>
 				<view class="content" style="margin-top: 30rpx;">
 					<view class="item">
 						<image src="https://www.amiami.com.cn/static/news1/4@2x.png"></image>
@@ -44,7 +47,10 @@
 				</view>
 			</view>
 			<view class="a">
-				<view class="title"><image src="https://www.amiami.com.cn/static/news1/zuo@2x.png"></image>邀请小技巧<image src="https://www.amiami.com.cn/static/news1/you@2x.png"></image></view>
+				<view class="title">
+					<image src="https://www.amiami.com.cn/static/news1/zuo@2x.png"></image>邀请小技巧<image
+						src="https://www.amiami.com.cn/static/news1/you@2x.png"></image>
+				</view>
 				<view class="desc1">邀请成功率提高200%</view>
 				<view class="content">
 					<view class="li">邀请您的同行，跨行商家，成功率高</view>
@@ -55,20 +61,24 @@
 		</view>
 		<view class="invite-popup" v-if="isPopup">
 			<view class="popup">
-				<image class="bg" mode="widthFix" show-menu-by-longpress :src="qrcode"></image>
+				<image class="bg" mode="heightFix" show-menu-by-longpress :src="qrcode1"></image>
 				<view class="tips">
 					<view class="cancle" @click="download(1)">取消</view>
-					<view class="sure"  @click="download(2)">保存到相册</view>
+					<view class="sure" @click="download(2)">保存到相册</view>
 				</view>
 			</view>
 		</view>
+		<canvas id="myCanvas" class="myCanvas" canvas-id="myCanvas"
+			:style="{'width': 702/devicePixelRatio+'px',' height': 1248/devicePixelRatio+'px',position: 'absolute',left:'-100000px',top:'-100000px'}"></canvas>
 		<view class="invite-fd">
-			<view class="btn" @click="openPage(3)">立即邀请</view></view>
+			<view class="btn" @click="openPage(3)">立即邀请</view>
+		</view>
 		<addShuiyin />
 	</view>
 </template>
 
 <script>
+	const ctx = uni.createCanvasContext('myCanvas')
 	import {
 		createQrCodeImg
 	} from '@/utils/qrcode'
@@ -77,6 +87,7 @@
 	export default {
 		data() {
 			return {
+				qrcode1: "",
 				qrcode: "",
 				userInfo: {},
 				backgroundBg: {
@@ -88,7 +99,8 @@
 				isPopup: false,
 				info: {},
 				info1: {},
-				list: []
+				list: [],
+				devicePixelRatio: 750 / uni.getSystemInfoSync().windowHeight
 			}
 		},
 		onReady() {
@@ -138,25 +150,98 @@
 				return val.replace(/&(lt|gt|nbsp|amp|quot);/ig, function(all, t) {
 					return arrEntities[t];
 				});
+			},
+			createImge() {
+				const that = this;
+				ctx.fillRect(0, 0, 702 / that.devicePixelRatio, 1248 / that.devicePixelRatio);
+				uni.downloadFile({
+					url: 'https://www.amiami.com.cn/static/news1/business.png',
+					success(res) {
+						ctx.drawImage(res.tempFilePath, 0, 0, 702 / that.devicePixelRatio, 1248 / that
+							.devicePixelRatio);
+						uni.downloadFile({
+							url: that.qrcode,
+							success: (res2) => {
+								ctx.save(); // 保存
+								ctx.beginPath(); // 开始绘制
+								ctx.arc(162 / that.devicePixelRatio / 2 + 285 / that.devicePixelRatio,
+									162 / that.devicePixelRatio / 2 + 870 / that.devicePixelRatio,
+									162 / that.devicePixelRatio / 2, 0, Math.PI * 2, false);
+								ctx.clip();
+								ctx.drawImage(res2.tempFilePath, 285 / that.devicePixelRatio, 870 /
+									that.devicePixelRatio, 162 / that.devicePixelRatio, 162 / that
+									.devicePixelRatio);
+								// 恢复之前保存的绘图上下文
+								ctx.restore();
+								// 邀请码
+								ctx.setFontSize(45 / that.devicePixelRatio);
+								ctx.setFillStyle('#cf100d');
+								ctx.fillText(that.userInfo.user_id, 200 / that.devicePixelRatio, 1213 /
+									that.devicePixelRatio);
+								ctx.draw()
+								uni.canvasToTempFilePath({
+									width: 702 / that.devicePixelRatio,
+									height: 1248 / that.devicePixelRatio,
+									destWidth: 702 / that.devicePixelRatio,
+									destHeight: 1248 / that.devicePixelRatio,
+									canvasId: 'myCanvas',
+									success: function(res) {
+										// 在H5平台下，tempFilePath 为 base64
+										console.log(res.tempFilePath)
+										that.qrcode1 = res.tempFilePath;
+										that.isPopup = true;
+										ctx.clearRect(0, 0, 702, 1248);
+										// uni.saveImageToPhotosAlbum({
+										// 	filePath: res.tempFilePath,
+										// 	success(data) {
+										// 		that.$success('保存成功')
+										// 	},
+										// 	fail(err) {
+										// 		if (err.errMsg ===
+										// 			'saveImageToPhotosAlbum:fail auth deny'
+										// 		) {
+										// 			that.$toast(
+										// 				'请允许访问相册后重试 (右上角菜单 - 设置 - 相册)',
+										// 				3000)
+										// 		}
+										// 	}
+										// })
+									}
+								})
+
+							},
+						})
+
+					}
+				})
+
+
 			},
 			//生成海报
 			async InviteUserPoster() {
 				const {
 					status,
 					data
-				} = await newFunApi.InviteUserPoster({type:2});
+				} = await newFunApi.InviteUserPoster({});
 				if (status == 200) {
 					console.log(data)
-					this.isPopup = true;
-					this.qrcode = data.imageUrl
+					this.qrcode = data.imageUrl;
+					this.createImge();
 				}
 			},
 			download(type) {
 				const app = this
 				app.isPopup = false;
-				if(type == 1){
-					return ;
+				if (type == 1) {
+					return;
+				} else {
+					uni.showLoading({
+						title: '加载中'
+					})
+					app.onSaveImage(app.qrcode1)
+					// this.createImge();
 				}
+				return;
 				uni.showLoading({
 					title: '加载中'
 				})
@@ -214,7 +299,7 @@
 				linkElement.click()
 			},
 			// #endif
-			
+
 			async getList1() {
 				const {
 					status,
@@ -254,7 +339,11 @@
 						url: "/pages/news/user/withdrawal?balance=" + this.userInfo.withdrawal_money
 					})
 				} else if (index == 3) {
-					this.InviteUserPoster();
+					if (!this.qrcode1) {
+						this.InviteUserPoster();
+					} else {
+						this.isPopup = true;
+					}
 				} else if (index == 4) {
 					uni.navigateTo({
 						url: "/pages/invite/rule"
@@ -272,8 +361,14 @@
 		background-size: 100% auto;
 		min-height: 100vh;
 		padding-bottom: 150rpx;
-		&-fd{
-			width: 100%; 
+
+		.myCanvas {
+			position: absolute;
+			z-index: -1;
+		}
+
+		&-fd {
+			width: 100%;
 			position: fixed;
 			left: 0;
 			bottom: 0;
@@ -283,7 +378,8 @@
 			box-sizing: border-box;
 			display: flex;
 			justify-content: center;
-			.btn{
+
+			.btn {
 				width: 642rpx;
 				line-height: 90rpx;
 				background: #F34A40;
@@ -294,6 +390,7 @@
 				color: #FFFFFF;
 			}
 		}
+
 		&-popup {
 			width: 100%;
 			height: 100%;
@@ -304,6 +401,9 @@
 			z-index: 55;
 
 			.popup {
+				display: flex;
+				justify-content: center;
+				/* 水平居中 */
 				width: 672rpx;
 				height: 912rpx;
 				position: absolute;
@@ -345,13 +445,15 @@
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
-					.cancle{
+
+					.cancle {
 						flex: 1;
 						background-color: #FFFFFF;
 						margin-right: 30rpx;
 						border-radius: 10rpx;
 					}
-					.sure{
+
+					.sure {
 						border-radius: 10rpx;
 						flex: 1;
 						color: #FFFFFF;
@@ -371,11 +473,13 @@
 			}
 
 		}
+
 		&-hd {
 			width: 100%;
 			text-align: center;
 			height: 435rpx;
 			position: relative;
+
 			.rule {
 				width: 50rpx;
 				height: 170rpx;
@@ -414,6 +518,7 @@
 		&-bd {
 			padding: 0 24rpx 24rpx;
 			overflow: hidden;
+
 			.a {
 				width: 100%;
 				min-height: 290rpx;
@@ -422,7 +527,8 @@
 				margin-bottom: 20rpx;
 				padding-bottom: 50rpx;
 				overflow: hidden;
-				.title{
+
+				.title {
 					line-height: 100rpx;
 					font-weight: 400;
 					font-size: 36rpx;
@@ -430,69 +536,79 @@
 					display: flex;
 					align-items: center;
 					justify-content: center;
-					image{
+
+					image {
 						width: 52rpx;
 						height: 24rpx;
 						margin: 0 20rpx;
 					}
 				}
-				.desc1{
+
+				.desc1 {
 					text-align: center;
 					font-size: 28rpx;
 					color: #9A372D;
 					position: relative;
 				}
-				.desc{
+
+				.desc {
 					text-align: center;
 					font-size: 28rpx;
 					color: #9A372D;
 					position: relative;
-					&::after{
+
+					&::after {
 						content: "";
 						width: 100rpx;
 						height: 1px;
-						background-color:  #9A372D;
+						background-color: #9A372D;
 						position: absolute;
 						top: 50%;
 						left: 150rpx;
 						z-index: 2;
 					}
-					&::before{
+
+					&::before {
 						content: "";
 						width: 100rpx;
 						height: 1px;
-						background-color:  #9A372D;
+						background-color: #9A372D;
 						position: absolute;
 						top: 50%;
 						right: 150rpx;
 						z-index: 2;
 					}
 				}
-				.content{
+
+				.content {
 					width: 100%;
 					margin-top: 45rpx;
 					overflow: hidden;
-					.item{
+
+					.item {
 						width: 33.3%;
 						text-align: center;
 						font-size: 26rpx;
 						color: #9A372D;
 						float: left;
-						image{
+
+						image {
 							width: 122rpx;
 							height: 122rpx;
 							display: block;
 							margin: 0 auto 20rpx;
 						}
 					}
-					.li{
+
+					.li {
 						padding: 0 50rpx 0 80rpx;
 						position: relative;
 						font-weight: 400;
 						font-size: 26rpx;
 						color: #9A372D;
 						line-height: 45rpx;
-						&::after{
+
+						&::after {
 							content: "";
 							width: 10rpx;
 							height: 10rpx;
@@ -506,20 +622,23 @@
 						}
 					}
 				}
-				
+
 			}
-			.tixian{
+
+			.tixian {
 				width: 110rpx;
 				height: 110rpx;
 				background: #FFFFFF;
-				box-shadow: 0px 4rpx 12rpx 0px rgba(77,13,17,0.16);
+				box-shadow: 0px 4rpx 12rpx 0px rgba(77, 13, 17, 0.16);
 				border-radius: 50%;
-				image{
+
+				image {
 					width: 30rpx;
 					height: 30rpx;
 					display: block;
 					margin: 15rpx auto;
 				}
+
 				font-weight: 400;
 				font-size: 20rpx;
 				text-align: center;