2022-9-2

api/product.js

@@ -239,5 +239,19 @@ export function craftGuide(data) {
 		data
 	});
 }
-
-
+// 选择合成列表
+export function nftMy(data) {
+	return request({
+		url: '/api/nft/my',
+		method: 'get',
+		data
+	});
+}
+// 选择合成列表
+export function nftCraft(data) {
+	return request({
+		url: '/api/nft/craft',
+		method: 'post',
+		data
+	});
+}

manifest.json

@@ -2,8 +2,8 @@
     "name" : "艺绘",
     "appid" : "__UNI__E01ACD1",
     "description" : "",
-    "versionName" : "1.1.2",
-    "versionCode" : 112,
+    "versionName" : "1.1.6",
+    "versionCode" : 116,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

pages.json

@@ -15,6 +15,23 @@
 				}
 			}
 		},
+		{
+			"path": "pages/index/guide",
+			"style": {
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
+				"navigationBarTitleText": "NFT合成"
+			}
+		},
+		{
+			"path": "pages/index/myNftList",
+			"style": {
+				"navigationBarBackgroundColor": "#111111",
+				"navigationBarTextStyle": "white", 
+				"navigationBarTitleText": "NFT列表",
+				"enablePullDownRefresh":true
+			}
+		},
 		{
 			"path": "pages/user/myvip",
 			"style": {
@@ -93,20 +110,6 @@
 				}
 			}
 		},
-
-		{
-			"path": "pages/public/forget",
-			"style": {
-				"navigationBarTitleText": "忘记密码",
-				"navigationBarBackgroundColor": "#111111",
-				"navigationBarTextStyle": "white", 
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
 		{
 			"path": "pages/user/team",
 			"style": {
@@ -427,7 +430,7 @@
 	},
 	"tabBar": {
 		"color": "#fff",
-		"selectedColor": "#A581FF",
+		"selectedColor": "#FDD58A",
 		"borderStyle": "black",
 		"backgroundColor": "#222222",
 		"list": [{

pages/index/bazaar.vue

@@ -506,7 +506,7 @@ page {
 		color: #fff;
 		position: relative;
 		&.current {
-			color: #917bf6;
+			color: #FDD58A;
 			&:after {
 				content: '';
 				position: absolute;
@@ -515,7 +515,7 @@ page {
 				transform: translateX(-50%);
 				width: 120rpx;
 				height: 0;
-				border-bottom: 4rpx solid #917bf6;
+				border-bottom: 4rpx solid #FDD58A;
 			}
 		}
 	}

pages/index/cangp.vue

@@ -40,25 +40,23 @@
 		</view>
 		<!-- NFT合成 -->
 		<view class="ls" v-show="onIndex==1">
-			<view class="lt flex" v-for="(item,index) in nft.list">
+			<view @click="navGuid(item)" class="lt flex" v-for="(item,index) in nft.list">
 				<image class="leftImg" :src="item.res.uri" mode="scaleToFill"></image>
-				<view class="rightContent padding-20 flex">
+				<view class="rightContent padding-c-20 flex">
 					<view class="left">
 						<view class="rightName clamp ">
 							{{item.name}}
 						</view>
-						<view class="flex margin-t-10">
-							<view class="item">
+						<view class="itemlist margin-t-20">
+							<view class="item" v-for="(ls,ind) in  item.elements">
+								{{ls.info.name}}
 
 							</view>
 						</view>
 					</view>
 					<image class="rightImg" src="../../static/user/back.png" mode="widthFix"></image>
-
 				</view>
 			</view>
-
-
 			<u-loadmore class='clearFloat' lineColor='#FFFFFF' iconColor='#FFFFFF' color="#FFFFFF"
 				:status="nft.loadingType" />
 		</view>
@@ -70,15 +68,16 @@
 			</view>
 		</u-modal>
 		<u-modal @confirm='showAlertSuccess = false' :show="showAlertSuccess" title="盲盒开启结果">
-			<view class="slot-content padding-t-20">
-				
-				<view class="boxAlert flex" v-for="(item , inde) in successJg ">
-					<image class="img" :src="item.info.uri" mode="scaleToFill"></image>
-					<view>
-						{{item.info.name}}
+			<scroll-view class="alertbox" scroll-y>
+				<view class="slot-content padding-t-20">
+					<view class="boxAlert flex" v-for="(item , inde) in successJg ">
+						<image class="img" :src="item.info.uri" mode="scaleToFill"></image>
+						<view>
+							{{item.info.name}}
+						</view>
 					</view>
 				</view>
-			</view>
+			</scroll-view>
 		</u-modal>
 	</view>
 </template>
@@ -137,10 +136,23 @@
 			this.craftGuide();
 		},
 		onShow() {
+			this.mh.page=1
+			this.mh.loadingType='loadmore';
+			this.mh.list=[];
 			// 我的盲盒
 			this.lodingMh();
 		},
 		methods: {
+			// 跳转nft选择页面
+			navGuid(item) {
+				uni.navigateTo({
+					url: './guide',
+					success: res => {
+						console.log(res, 'dk');
+						res.eventChannel.emit('setItemData', item)
+					},
+				});
+			},
 			// nft合成列表
 			craftGuide(source) {
 				let navItem = this.nft;
@@ -298,23 +310,26 @@
 		min-height: 100%;
 	}
 
-	.slot-content {
-		display: flex;
-		flex-wrap: wrap;
-
-		.boxAlert {
-			line-height: 1;
-			border: 1px solid #9F570E;
-			padding: 10rpx 20rpx;
-			color: #9F570E;
-			border-radius: 10rpx;
-			margin: 10rpx;
+	.alertbox {
+		height: 750rpx;
+		.slot-content {
+			display: flex;
+			flex-wrap: wrap;
 
-			.img {
-				width: 30rpx;
-				height: 30rpx;
-				margin-right: 10rpx;
+			.boxAlert {
+				line-height: 1;
+				border: 1px solid #9F570E;
+				padding: 10rpx 20rpx;
+				color: #9F570E;
 				border-radius: 10rpx;
+				margin: 10rpx;
+
+				.img {
+					width: 30rpx;
+					height: 30rpx;
+					margin-right: 10rpx;
+					border-radius: 10rpx;
+				}
 			}
 		}
 	}
@@ -345,7 +360,7 @@
 			&.action {
 				font-weight: bold;
 				color: #9F570E;
-				background: linear-gradient(270deg, #FFE7C4, #FFCE8A);
+				background: $bgBaseBg;
 			}
 		}
 	}
@@ -358,27 +373,46 @@
 		.clearFloat {
 			clear: both;
 		}
-		.lt{
+
+		.lt {
 			width: 100%;
 			background-color: #1d1c21;
 			line-height: 0;
 			padding: 30rpx;
 			border-radius: 20rpx;
-			.leftImg{
+
+			.leftImg {
 				flex-shrink: 0;
-				width: 100rpx;
-				height: 100rpx;
+				width: 120rpx;
+				height: 120rpx;
 				border-radius: 30rpx;
 			}
-			.rightContent{
+
+			.rightContent {
 				line-height: 1;
 				flex-grow: 1;
-			.rightImg{
-				width: 20rpx;
-			}
-				
+
+				.rightImg {
+					width: 20rpx;
+				}
+
+				.itemlist {
+					display: flex;
+					flex-wrap: wrap;
+					font-size: 20rpx;
+
+					.item {
+						border: 1px solid #FFCE8A;
+						padding: 10rpx 10rpx;
+						border-radius: 5rpx;
+						margin-right: 10rpx;
+						margin-bottom: 10rpx;
+						color: #FFCE8A;
+					}
+				}
 			}
 		}
+
 		.ll {
 			width: 330rpx;
 			line-height: 0;
@@ -412,7 +446,7 @@
 						width: 98rpx;
 						padding: 10rpx 0;
 						text-align: center;
-						background: linear-gradient(270deg, #FFE7C4, #FFCE8A);
+						background: $bgBaseBg;
 						border-radius: 20rpx;
 						color: #9F570E;
 					}

pages/index/guide.vue

@@ -0,0 +1,208 @@
+<template>
+	<view class="container">
+		<view class="ls">
+			<view @click="item.onData.count>0?tabInde(item,index):''" class="lt flex" v-for="(item,index) in nftInfo">
+				<image class="leftImg" :src="item.uri" mode="scaleToFill"></image>
+				<view class="rightContent padding-c-20 flex">
+					<view class="left">
+						<view class="rightName clamp ">
+							{{item.name}}
+						</view>
+						<view class="itemlist margin-t-20 u-warning" v-if="!item.onData.checked">
+							<text v-if="item.onData.count>0">
+								可供选择{{item.onData.count}}件，点击选择
+							</text>
+							<text class="text-danger" v-else>
+								未持有该类NFT无法选择
+							</text>
+						</view>
+						<view class="itemlist margin-t-20 u-success" v-else>
+							选择ID:{{item.onData.info.id}}
+						</view>
+					</view>
+					<image class="rightImg" src="../../static/user/back.png" mode="widthFix"></image>
+				</view>
+			</view>
+		</view>
+		<button class="add-btn" :class="{ 'bg-gray': loding }" @click="loding ? '' : confirm()">立即合成</button>
+	</view>
+</template>
+
+<script>
+	import {
+		nftMy,
+		nftCraft
+	} from '@/api/product.js';
+	export default {
+		data() {
+			return {
+				nftInfo: [],
+				loding: false ,//判断是否提交合成中
+				id:''
+			};
+		},
+		onLoad: function(option) {
+			const that = this;
+			// #ifdef APP-NVUE
+			const eventChannel = that.$scope.eventChannel; // 兼容APP-NVUE
+			// #endif
+			// #ifndef APP-NVUE
+			const eventChannel = that.getOpenerEventChannel();
+			// #endif
+			// 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
+			eventChannel.on('setItemData', function(data) {
+				that.id = data.result;
+				that.setItemData(data.elements)
+			})
+		},
+		onShow() {
+
+		},
+		methods: {
+			// 保存数据
+			setItemData(item) {
+				this.nftInfo = item.map((e) => {
+					e.info.onData = {
+						info: '',
+						checked: false, //保存是否选择
+						count: e.count
+					}
+					return e.info
+				})
+			},
+			tabInde(item, ind) {
+				const that = this;
+				console.log(item, 'id');
+				uni.navigateTo({
+					url: './myNftList?id=' + item.id + '&type=2&ind=' + ind,
+					events: {
+						checkedData: function(res) {
+							that.nftInfo[res.ind].onData.checked = true;
+							that.nftInfo[res.ind].onData.info = res.data;
+							that.nftInfo = that.nftInfo.map((e) => {
+								return e
+							})
+						},
+					}
+				});
+			},
+			// 开始合成
+			confirm() {
+				let upData = {
+					element:[],
+					result:this.id 
+				}
+				for (let i = 0; i < this.nftInfo.length; i++) {
+					const data = this.nftInfo[i]
+					if (!data.onData.checked) {
+						uni.showModal({
+							title: '提示',
+							content: '请选择'+data.name+'NFT',
+							showCancel: false,
+						});
+						break
+					}
+					upData.element.push( data.onData.info.id);
+				}
+				this.loding = true;
+				uni.showLoading({
+					title: '合成中'
+				});
+				nftCraft(upData).then((data)=>{
+					uni.hideLoading()
+					uni.showModal({
+						title: '提示',
+						content: '成功合成',
+						showCancel: false,
+					});
+					this.loding = false;
+					console.log(data,'返回');
+				}).catch(()=>{
+					uni.hideLoading()
+					this.loding = true;
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		width: 750rpx;
+		min-height: 100%;
+		background: #111111;
+	}
+
+	.container {
+		/* #ifdef APP */
+		padding-top: var(--status-bar-height);
+		/* #endif */
+		min-height: 100%;
+	}
+
+	.ls {
+		color: #FFFFFF;
+		padding: 30rpx;
+
+		.clearFloat {
+			clear: both;
+		}
+
+		.lt {
+			width: 100%;
+			background-color: #1d1c21;
+			line-height: 0;
+			padding: 30rpx;
+			border-radius: 20rpx;
+
+			.leftImg {
+				flex-shrink: 0;
+				width: 120rpx;
+				height: 120rpx;
+				border-radius: 30rpx;
+			}
+
+			.rightContent {
+				line-height: 1;
+				flex-grow: 1;
+
+				.rightImg {
+					width: 20rpx;
+				}
+
+				.itemlist {
+					display: flex;
+					flex-wrap: wrap;
+					font-size: 20rpx;
+
+					.item {
+						border: 1px solid #FFCE8A;
+						padding: 10rpx 10rpx;
+						border-radius: 5rpx;
+						margin-right: 10rpx;
+						margin-bottom: 10rpx;
+						color: #FFCE8A;
+					}
+				}
+			}
+		}
+	}
+
+	.add-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 690rpx;
+		height: 80rpx;
+		margin: 60rpx auto;
+		font-size: $font-lg;
+		color: #fff;
+		background:#FFCE8A;
+		border-radius: 10rpx;
+		// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	}
+
+	.bg-gray {
+		background-color: $color-gray;
+	}
+</style>

pages/index/index.vue

@@ -30,22 +30,37 @@
 				<view class="img">
 					<image :src="item.image" mode=""></image>
 				</view>
+
 				<view class="content-title">
 					<view class="title">
 						{{item.store_name}}
 					</view>
-					<view class="text">
-						艺绘官方 发行
-					</view>
-					<view class="text">
-						发行数量: {{item.stock}}份
-					</view>
-					<view class="text">
-						开售时间: {{item.cmy_pay_time}}
+					<view>
+						<view class="text">
+							艺绘官方 发行
+						</view>
+						<view class="text flex">
+							<view class="flex">
+								<view class="textStock border-radius-10 flex">
+									<view class="tip">
+										限量
+									</view>
+									<view class="num">
+										{{item.stock}}
+									</view>
+								</view>
+								<view class="tip border-radius-10 margin-l-10">
+									限购{{item.buy_limit}}份
+								</view>
+							</view>
+							<view class="money">
+								￥{{item.price}}
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
-			<u-loadmore  v-show="checked==0" :status="dataList[0].list.loadType" />
+			<u-loadmore v-show="checked==0" :status="dataList[0].list.loadType" />
 			<view v-show="checked==1" class="box-content" v-for="(item,index) in dataList[1].list" @click="buyMh(item)">
 				<view class="img">
 					<image :src="item.pic" mode=""></image>
@@ -62,7 +77,7 @@
 					</view>
 				</view>
 			</view>
-			<u-loadmore  v-show="checked==1" :status="dataList[1].list.loadType" />
+			<u-loadmore v-show="checked==1" :status="dataList[1].list.loadType" />
 		</view>
 	</view>
 </template>
@@ -109,7 +124,7 @@
 		onShow: function() {
 			this.getProduct()
 		},
-		onReachBottom(){
+		onReachBottom() {
 			this.getProduct()
 		},
 		methods: {
@@ -151,10 +166,10 @@
 				if (obj.checked == 1) {
 					this.mysteryList(item)
 				}
-				
+
 			},
 			// 盲盒列表
-			mysteryList(item){
+			mysteryList(item) {
 				mysteryList({
 					page: item.page,
 					limit: item.limit
@@ -208,7 +223,7 @@
 				})
 			},
 			// 盲盒
-			buyMh(item){
+			buyMh(item) {
 				uni.navigateTo({
 					url: '/pages/product/productMh?id=' + item.id
 				})
@@ -238,6 +253,7 @@
 		min-height: 100%;
 		background: #111111;
 	}
+
 	.carousel {
 		width: 750rpx;
 		height: 375rpx;
@@ -303,11 +319,13 @@
 			display: flex;
 			justify-content: space-between;
 			margin-bottom: 50rpx;
+
 			.left {
 				font-size: 34rpx;
 				font-family: PingFang SC;
 				font-weight: 500;
 				color: #FFFFFF;
+
 				.action {
 					color: #FDD58A;
 				}
@@ -345,6 +363,7 @@
 				border-bottom-left-radius: 10rpx;
 				border-bottom-right-radius: 10rpx;
 				background-color: rgb(29, 28, 33);
+
 				.title {
 					font-size: 39rpx;
 					font-weight: bold;
@@ -357,6 +376,27 @@
 					margin: 10rpx 0;
 					color: #FFFFFF;
 					font-size: 28rpx;
+					flex-grow: 1;
+					.textStock {
+						overflow: hidden;
+					}
+
+					.num {
+						font-size: 18rpx;
+						padding: 10rpx;
+						color: #9F570E;
+						background-color: #4D3414;
+					}
+					.money{
+						font-size: 40rpx;
+					}
+					.tip {
+						font-size: 20rpx;
+						color: #9F570E;
+						padding: 10rpx;
+						line-height: 1;
+						background: $bgBaseBg;
+					}
 				}
 			}
 		}

pages/index/myNftList.vue

@@ -0,0 +1,390 @@
+<template>
+	<view class="container">
+		<view class="flex dy-list">
+			<view class="box-content" v-for="item in navitem.list" @click="type==1?navto(item):''">
+				<view class="img">
+					<image :src="item.class_info.uri" mode=""></image>
+				</view>
+				<view class="content-title">
+					<view class="title">
+						<view class="text clamp">{{ item.class_info.name }}</view>
+						<view class="zm" v-if="item.hang != null">转卖中</view>
+					</view>
+					<view class="content-price">
+						<view class="price" v-if="item.hang">
+							挂卖中￥{{ item.price }}
+						</view>
+						<view class="price" v-if="item.extract">
+							提取中
+						</view>
+						<view class="price" v-if="!item.hang&&!item.extract">
+							￥{{ item.price }}
+						</view>
+						<view class="" v-if="!item.extract&&type==1">
+							<view class="button" @click="navPop(item)" v-if="item.hang == null">卖出</view>
+							<view class="button" @click="qxMai(item.hang.id)" v-else>取消卖出</view>
+						</view>
+						<view class="" v-if="type==2&&!item.hang&&!item.extract">
+							<view class="button" @click="checked(item)">选择</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-loadmore class='clearFloat' lineColor='#FFFFFF' iconColor='#FFFFFF' color="#FFFFFF"
+			:status="navitem.loadingType" />
+		<uni-popup ref="maipop" type="center">
+			<view class="mai-box">
+				<view class="mai-title">卖出价格</view>
+				<input type="number" v-model="money" placeholder="请输入" />
+				<view class="mai-button">
+					<view class="button-left" @click="maiClose()">取消</view>
+					<view class="button-right" @click="buy()">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="qumaipop" type="center">
+			<view class="mai-box">
+				<view class="mai-title">提示</view>
+				<view class="mai-title">您正在转卖这件藏品确认取消卖出?</view>
+				<view class="mai-button">
+					<view class="button-left" @click="maiClose()">取消</view>
+					<view class="button-right" @click="quxbuy(item)">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import { sell, qxgd } from '@/api/order.js';
+	import {
+		nftMy
+	} from '@/api/product.js';
+	export default {
+		data() {
+			return {
+				id: '', //请求查询的分类id
+				type: 1, //默认1显示普通列表2表示选择列表
+				eventChannel: '', //保存数据处理对象
+				navitem: {
+					loadingType: 'loadmore',
+					list: [],
+					page: 1,
+					limit: 10,
+					loaded: false
+				},
+				// 当前选中要挂单的商品
+				actionItem: {},
+				// 出售价格
+				money: 0
+			};
+		},
+		onLoad: function(option) {
+			const that = this;
+			that.id = option.id;
+			that.type = option.type
+			this.craftGuide();
+			// 判断是否是选择商品
+			if (that.type == 2) {
+				that.ind = option.ind
+				// #ifdef APP-NVUE
+				that.eventChannel = that.$scope.eventChannel; // 兼容APP-NVUE
+				// #endif
+				// #ifndef APP-NVUE
+				that.eventChannel = that.getOpenerEventChannel();
+				// #endif
+			}
+		},
+		onShow() {
+
+		},
+		onReachBottom() {
+			this.craftGuide()
+		},
+		methods: {
+			// 跳转商品详情页面
+			navto(item){
+				uni.navigateTo({
+					url: '/pages/product/product?isSc=1&id='+item.id,
+				});
+			},
+			// 选择商品
+			checked(item) {
+				const that = this;
+				uni.showModal({
+					title: '提示',
+					content: '是否选择ID' + item.id + '号NFT',
+					success: res => {
+						if (res.confirm) {
+							uni.navigateBack();
+							that.eventChannel.emit('checkedData', {
+								data: item,
+								ind: that.ind,
+							});
+						}
+					},
+					fail: () => {},
+					complete: () => {}
+				});
+
+			},
+			// 获取nft列表信息
+			craftGuide(source) {
+				let navItem = this.navitem;
+				if (source === 'tabChange' && navItem.loaded === true) {
+					//tab切换只有第一次需要加载数据
+					return;
+				}
+				if (navItem.loadingType === 'loading') {
+					//防止重复加载
+					return;
+				}
+				// 修改当前对象状态为加载中
+				navItem.loadingType = 'loading';
+				nftMy({
+						page: navItem.page,
+						limit: navItem.limit,
+						nft_class_id: this.id
+					})
+					.then(({
+						data
+					}) => {
+						if (data.list.length > 0) {
+							navItem.list = navItem.list.concat(data.list);
+							navItem.page++;
+						}
+						if (navItem.limit == data.list.length) {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'loadmore';
+							return;
+						} else {
+							//判断是否还有数据， 有改为 more， 没有改为noMore
+							navItem.loadingType = 'nomore';
+						}
+						uni.hideLoading();
+						navItem.loaded = true;
+					})
+					.catch(e => {
+						console.log(e);
+					});
+
+			},
+			// 打开挂单
+			navPop(item) {
+				this.item = item;
+				this.$refs.maipop.open();
+			},
+			// 取消挂单
+			qxMai(item) {
+				this.$refs.qumaipop.open();
+				console.log(item, 'id');
+				this.onid = item;
+			},
+			// 关闭弹窗
+			maiClose() {
+				this.$refs.maipop.close();
+				this.$refs.qumaipop.close();
+			},
+			// 开始挂单
+			buy() {
+				let obj = this;
+				console.log(obj.item, 'item');
+				if (obj.price == '') {
+					obj.$api.msg('请输入价格');
+					return;
+				}
+				sell({
+						price: obj.money
+					},
+					obj.item.id
+				).then(res => {
+					console.log(res, 'res');
+					uni.showModal({
+						title: '成功',
+						content: '挂售成功!',
+						showCancel: false
+					});
+					obj.$refs.maipop.close();
+				}).catch((e)=>{
+					console.log(e);
+				});
+			},
+			// 取消挂单
+			quxbuy() {
+				qxgd({}, this.onid).then(res => {
+					console.log(res, '取消挂单');
+					this.$refs.qumaipop.close();
+					uni.showModal({
+						title: '成功',
+						content: '已成功取消挂单',
+						showCancel: false
+					});
+				});
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		width: 750rpx;
+		min-height: 100%;
+		background: #111111;
+	}
+
+	.container {
+		/* #ifdef APP */
+		padding-top: var(--status-bar-height);
+		/* #endif */
+		min-height: 100%;
+	}
+
+	.dy-list {
+		flex-wrap: wrap;
+		padding: 30rpx;
+
+		.box-content {
+			width: 330rpx;
+			height: 415rpx;
+			// margin:0 15rpx 50rpx ;
+
+			.img {
+				width: 330rpx;
+				height: 280rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.content-title {
+				z-index: 99;
+				display: flex;
+
+				margin-top: -10rpx;
+				padding: 20rpx;
+				flex-direction: column;
+				border-bottom-left-radius: 10rpx;
+				border-bottom-right-radius: 10rpx;
+				border: 2rpx solid #533a6a;
+				// box-shadow: 0px 0px 20rpx 0px rgba(79,59,103,0.0600);
+
+				.title {
+					display: flex;
+					align-items: center;
+					// font-size: 39rpx;
+					// font-weight: bold;
+					// color: #FFFFFF;
+					// margin-bottom: 20rpx;
+				}
+
+				.zm {
+					flex-shrink: 0;
+					// margin: 10rpx;
+					// width: 63rpx;
+					display: inline-block;
+					// padding: 2rpx;
+					// height: 30rpx;
+					// border: 1rpx solid #FDD58A;
+					margin-left: 10rpx;
+					border-radius: 5rpx;
+					font-size: 16rpx;
+					font-weight: 500;
+					color: #FDD58A;
+					// line-height: 30rpx;
+					text-align: center;
+				}
+
+				.text {
+					color: #ffffff;
+					font-size: 24rpx;
+					margin: 10rpx 0;
+				}
+			}
+
+			.content-price {
+				display: flex;
+				justify-content: space-between;
+
+				.price {
+					font-size: 30rpx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #ffffff;
+				}
+
+				.button {
+					width: 104rpx;
+					height: 35rpx;
+					border-radius: 18rpx;
+					background: $bgBaseBg;
+					color: #9F570E;
+					font-size: 20rpx;
+					font-weight: 500;
+					line-height: 35rpx;
+					text-align: center;
+				}
+			}
+		}
+	}
+
+	.mai-box {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-around;
+		width: 582rpx;
+		height: 377rpx;
+		background: #ffffff;
+		border-radius: 20rpx;
+
+		.mai-title {
+			margin: 0 60rpx;
+			font-size: 42rpx;
+			font-weight: 500;
+			color: #0c1732;
+			line-height: 56rpx;
+		}
+
+		input {
+			width: 494rpx;
+			height: 90rpx;
+			font-size: 40rpx;
+			background: rgba(199, 212, 255, 0.35);
+			border-radius: 10rpx;
+			text-align: center;
+		}
+
+		.mai-button {
+			display: flex;
+			width: 90%;
+			justify-content: space-between;
+
+			.button-left {
+				text-align: center;
+				width: 248rpx;
+				height: 78rpx;
+				border: 2rpx solid #a581ff;
+				border-radius: 10rpx;
+				font-size: 34rpx;
+				font-weight: 500;
+				color: #a581ff;
+				line-height: 78rpx;
+			}
+
+			.button-right {
+				text-align: center;
+				width: 248rpx;
+				height: 78rpx;
+				background: $bgBaseBg;
+				border-radius: 10rpx;
+				font-size: 34rpx;
+				font-weight: 500;
+				color: #ffffff;
+				line-height: 78rpx;
+			}
+		}
+	}
+</style>

pages/money/recharge.vue

@@ -343,7 +343,7 @@
 			}
 
 			.seletPrice {
-				background: linear-gradient(270deg, #6E8DF7, #9977F6);
+				background: $bgBaseBg;
 				color: #ffffff;
 			}
 		}
@@ -483,7 +483,7 @@
 		color: #F21F5D;
 		line-height: 90rpx;
 		text-align: center;
-		background: linear-gradient(270deg, #6E8DF7, #9977F6);
+		background: $bgBaseBg;
 	}
 
 	.row-box {

pages/money/withdrawal.vue

@@ -396,7 +396,7 @@
 		}
 
 		&.up {
-			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			background: $bgBaseBg;
 			color: #fff;
 		}
 

pages/order/order.vue

@@ -37,18 +37,18 @@
 								<view class="flex-start">
 									<text class="title clamp">{{ goodsItem.productInfo.store_name }}</text>
 									<!-- <text class="price">{{ goodsItem.productInfo.price|moneyNum }}</text> -->
-								</view>
+								</view>
 								
 								<view class="row flex">
 									<!-- <text class="row_title">{{ goodsItem.productInfo.attrInfo ? goodsItem.productInfo.attrInfo.suk : '' }}</text> -->
-									<!-- <text class="attr-box"> x {{ goodsItem.cart_num }}</text> -->
-									<view class="price-box">
-									<!-- 		共
-											<text class="num">{{ item.cartInfo.length }}</text>
-											商品 邮费
-											<text class="price">{{ moneyNum(item.pay_postage)}}</text> -->
-											付款
-											<text class="price">{{ moneyNum(item.pay_price)}}</text>
+									<!-- <text class="attr-box"> x {{ goodsItem.cart_num }}</text> -->
+									<view class="price-box">
+									<!-- 		共
+											<text class="num">{{ item.cartInfo.length }}</text>
+											商品 邮费
+											<text class="price">{{ moneyNum(item.pay_postage)}}</text> -->
+											付款
+											<text class="price">{{ moneyNum(item.pay_price)}}</text>
 										</view>
 								</view>
 							</view>
@@ -72,13 +72,13 @@
 
 <script>
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
-import empty from '@/components/empty';
+import empty from '@/components/empty';
 import uEmpty from '@/uview-ui/components/u-empty/u-empty.vue'
 import { orderList, orderCancel, orderDel, orderTake } from '@/api/order.js';
 export default {
 	components: {
 		uniLoadMore,
-		empty,
+		empty,
 		uEmpty
 	},
 	filters: {
@@ -346,7 +346,7 @@ page,
 }
 
 .swiper-box {
-	height: calc(100% - 40px);
+	height: calc(100% - 40px);
 	background-color: #111111;
 }
 .list-scroll-content {
@@ -371,7 +371,7 @@ page,
 		color: #fff;
 		position: relative;
 		&.current {
-			color:#5C5EE5;
+			color:#FDD58A;
 			&:after {
 				content: '';
 				position: absolute;
@@ -380,7 +380,7 @@ page,
 				transform: translateX(-50%);
 				width: 44px;
 				height: 0;
-				border-bottom: 2px solid #5C5EE5;
+				border-bottom: 2px solid #FDD58A;
 			}
 		}
 	}
@@ -404,13 +404,13 @@ page,
 		color: $font-color-dark;
 		position: relative;
 		.time {
-			flex: 1;
-			font-size: 24rpx;
-			font-weight: 500;
+			flex: 1;
+			font-size: 24rpx;
+			font-weight: 500;
 			color: #FFFFFF;
 		}
 		.state {
-			color:#5C5EE5;
+			color:#FDD58A;
 		}
 		.del-btn {
 			padding: 10rpx 0 10rpx 36rpx;
@@ -447,7 +447,7 @@ page,
 		}
 	}
 	/* 单条商品 */
-	.goods-box-single {
+	.goods-box-single {
 		background: #0E0E0E;
 		display: flex;
 		padding: 20rpx 0;
@@ -487,7 +487,7 @@ page,
 			.price {
 				display: inline;
 				font-size: $font-base + 2rpx;
-				color:#5C5EE5;
+				color:#FDD58A;
 				&:before {
 					content: '￥';
 					font-size: $font-sm;
@@ -504,11 +504,11 @@ page,
 		color:#fff;
 		.num {
 			margin: 0 8rpx;
-			color: #5C5EE5;
+			color: #FDD58A;
 		}
 		.price {
 			font-size: $font-lg;
-			color:  #5C5EE5;
+			color:  #FDD58A;
 			&:before {
 				content: '￥';
 				font-size: $font-sm;
@@ -534,7 +534,7 @@ page,
 		line-height: 60rpx;
 		font-size: $font-sm + 2rpx;
 		color: #fff;
-		background: linear-gradient(270deg, #6E8DF7, #9977F6);
+		background: $bgBaseBg;
 		border-radius: 100px;
 		&:after {
 			border-radius: 100px;

pages/order/orderDetail.vue

@@ -491,9 +491,9 @@ page {
 	display: flex;
 	align-items: center;
 	height: 80rpx;
-	.tit-box {
-		@extend %font-title-box;
-	}
+	// .tit-box {
+	// 	@extend %font-title-box;
+	// }
 	.tit {
 		@extend %font-title;
 	}

pages/order/orderSC.vue

@@ -303,7 +303,7 @@
 			position: relative;
 
 			&.current {
-				color: #5C5EE5;
+				color: #FDD58A;
 
 				&:after {
 					content: '';
@@ -313,7 +313,7 @@
 					transform: translateX(-50%);
 					width: 44px;
 					height: 0;
-					border-bottom: 2px solid #5C5EE5;
+					border-bottom: 2px solid #FDD58A;
 				}
 			}
 		}
@@ -347,7 +347,7 @@
 			}
 
 			.state {
-				color: #5C5EE5;
+				color: #FDD58A;
 			}
 
 			.del-btn {
@@ -437,7 +437,7 @@
 				.price {
 					display: inline;
 					font-size: $font-base + 2rpx;
-					color: #5C5EE5;
+					color: #FDD58A;
 
 					&:before {
 						content: '￥';
@@ -457,12 +457,12 @@
 
 			.num {
 				margin: 0 8rpx;
-				color: #5C5EE5;
+				color: #FDD58A;
 			}
 
 			.price {
 				font-size: $font-lg;
-				color: #5C5EE5;
+				color: #FDD58A;
 
 				&:before {
 					content: '￥';
@@ -491,7 +491,7 @@
 			line-height: 60rpx;
 			font-size: $font-sm + 2rpx;
 			color: #fff;
-			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			background: $bgBaseBg;
 			border-radius: 100px;
 
 			&:after {

pages/product/product.vue

@@ -1,24 +1,44 @@
 <template>
 	<view class="container">
 		<view class="swiper-box">
-			<view class="img" v-if="isSc == 2"><image :src="shopDetail.image" mode="widthFix"></image></view>
-			<view class="img" v-if="isSc == 1"><image :src="shopDetail.class_info.uri" mode="widthFix"></image></view>
+			<view class="img" v-if="isSc == 2">
+				<image :src="shopDetail.image" mode="widthFix"></image>
+			</view>
+			<view class="img" v-if="isSc == 1">
+				<image :src="shopDetail.class_info.uri" mode="widthFix"></image>
+			</view>
 		</view>
 		<view class="content-box">
 			<view class="content-top">
-				<view class="hd">{{ shopDetail.store_name }}</view>
+				<view class="hd flex">
+					<view>
+						{{ shopDetail.store_name }}
+					</view>
+					<view class="flex rightTip">
+						<view class="textStock border-radius-10 flex">
+							<view class="tip">
+								限量
+							</view>
+							<view class="num">
+								{{shopDetail.stock}}
+							</view>
+						</view>
+						<view class="tip border-radius-10 margin-l-10">
+							限购{{shopDetail.buy_limit}}份
+						</view>
+					</view>
+				</view>
 				<!-- <view class="content-img">
 					<image src="../../static/img/fx.png" mode=""></image>分享
 				</view> -->
 			</view>
 			<view class="content-center" v-if="isSc == 2">
-				<view class="title">发行数量: {{ shopDetail.ficti + shopDetail.stock }}份</view>
 				<view class="title">已售数量: {{ shopDetail.ficti }}份</view>
-				<view class="title">个人限购: {{ shopDetail.buy_limit }}</view>
-				<view class="title">开售时间: {{ shopDetail.cmy_pay_time }}</view>
+				<view class="title">发行方: 艺绘官方ssss</view>
 			</view>
-			<view class="content-center" v-else>
-				<view class="title" style="font-size: 38rpx;font-weight: bold;color: #FFFFFF;">{{ shopDetail.class_info.name }}</view>
+			<view class="content-center" v-if="isSc == 1">
+				<view class="title" style="font-size: 38rpx;font-weight: bold;color: #FFFFFF;">
+					{{ shopDetail.class_info.name }}</view>
 				<view class="title">持有者: {{ shopDetail.user.nickname }}</view>
 			</view>
 			<view class="content-bottom">
@@ -58,7 +78,8 @@
 						<!-- #ifdef APP-PLUS -->
 						<label class="pop-radio-box" @click="type = 'ali'">
 							<view class="pop-radio-cont">
-								<image src="../../static/img/ali.png" style="width: 40rpx;height: 40rpx;" mode="scaleToFill"></image>
+								<image src="../../static/img/ali.png" style="width: 40rpx;height: 40rpx;"
+									mode="scaleToFill"></image>
 								<text>支付宝支付</text>
 							</view>
 							<radio :checked="type == 'ali'" style="transform: scale(0.8);" />
@@ -75,7 +96,8 @@
 						<!-- #endif -->
 						<label class="pop-radio-box" @click="type = 'yue'">
 							<view class="pop-radio-cont">
-								<image src="../../static/img/yue.png" style="width: 40rpx;height: 40rpx;" mode="scaleToFill"></image>
+								<image src="../../static/img/yue.png" style="width: 40rpx;height: 40rpx;"
+									mode="scaleToFill"></image>
 								<text>余额支付：{{ now_money }}</text>
 							</view>
 							<radio :checked="type == 'yue'" style="transform: scale(0.8);" />
@@ -102,702 +124,746 @@
 </template>
 
 <script>
-// import uniPopup from '@/components/uni-popup/uni-popup.vue'
-import { balance } from '@/api/wallet.js';
-import { mapState } from 'vuex';
-import uniCopy from '@/components/js_sdk/xb-copy/uni-copy.js';
-import { goodsDetails, cartAdd } from '@/api/product.js';
-import { confirm, orderPay, createOrderkey, nftmall, nftDetail, nftBuy } from '@/api/order.js';
-
-export default {
-	data() {
-		return {
-			orderId: '', //订单编号
-			moneyAll: '', //购物车订单
-			now_money: 0, //余额
-			payLoding: true, //判断是否支付中
-			orderKey: '', //订单的key值
-			addressData: {}, //地址信息
-			shopList: [], //商品列表
-			cartId: '', //购物车id
-			uniqueId: '',
-			nft: '',
-			type: 'yue', //支付状态
-			shopDetail: {
-				class_info: {},
-				user: {}
-			}, //商品详情
-			weixin: '',
-			yue: '',
-			shopId: '', //商品id
-			list: [
-				// 'https://img.php.cn/upload/article/202104/15/2021041518005466284.jpg',
-				// 'https://img.php.cn/upload/article/202104/15/2021041518005466284.jpg',
-				// 'https://img.php.cn/upload/article/202104/15/2021041518005466284.jpg'
-			],
-			froms: '', //保存h5中数据来源对象
-			isSc: 0 //是否是是市场传递过来的参数
-		};
-	},
-	onLoad(options) {
-		// 保存当前获取数据的类型
-		this.isSc = options.isSc;
-		// 商品id
-		this.shopId = options.id;
-		// 判断是否是首页
-		if (this.isSc == 2) {
-			this.goodsDetail();
-		}
-		// 判断是否是市场
-		if (this.isSc == 1) {
-			this.getNftDetail();
-		}
-		// 载入余额
-		balance({}).then(({ data }) => {
-			// 获取余额
-			this.now_money = data.now_money;
-		});
-	},
-	computed: {
-		...mapState(['weichatObj', 'baseURL', 'urlFile']),
-		...mapState('user', ['userInfo', 'hasLogin'])
-	},
-	methods: {
-		//选择支付方式
-		changePayType(type) {
-			this.type = type;
-		},
-		copy(value) {
-			let obj = this;
-			let content = value; //需要复制的内容
-			console.log('复制的内容:', content);
-			// content = typeof content === 'string' ? content : content.toString(); // 复制内容，必须字符串，数字需要转换为字符串
-			const result = uniCopy(content);
-			if (result === false) {
-				uni.showToast({
-					title: '不支持'
-				});
-			} else {
-				uni.showToast({
-					title: '复制成功',
-					icon: 'none'
-				});
-			}
+	// import uniPopup from '@/components/uni-popup/uni-popup.vue'
+	import {
+		balance
+	} from '@/api/wallet.js';
+	import {
+		mapState
+	} from 'vuex';
+	import uniCopy from '@/components/js_sdk/xb-copy/uni-copy.js';
+	import {
+		goodsDetails,
+		cartAdd
+	} from '@/api/product.js';
+	import {
+		confirm,
+		orderPay,
+		createOrderkey,
+		nftmall,
+		nftDetail,
+		nftBuy
+	} from '@/api/order.js';
+
+	export default {
+		data() {
+			return {
+				orderId: '', //订单编号
+				moneyAll: '', //购物车订单
+				now_money: 0, //余额
+				payLoding: true, //判断是否支付中
+				orderKey: '', //订单的key值
+				addressData: {}, //地址信息
+				shopList: [], //商品列表
+				cartId: '', //购物车id
+				uniqueId: '',
+				nft: '',
+				type: 'yue', //支付状态
+				shopDetail: {
+					class_info: {},
+					user: {}
+				}, //商品详情
+				weixin: '',
+				yue: '',
+				shopId: '', //商品id
+				list: [
+					// 'https://img.php.cn/upload/article/202104/15/2021041518005466284.jpg',
+					// 'https://img.php.cn/upload/article/202104/15/2021041518005466284.jpg',
+					// 'https://img.php.cn/upload/article/202104/15/2021041518005466284.jpg'
+				],
+				froms: '', //保存h5中数据来源对象
+				isSc: 0 //是否是是市场传递过来的参数
+			};
 		},
-		buy() {
+		onLoad(options) {
+			// 保存当前获取数据的类型
+			this.isSc = options.isSc;
+			// 商品id
+			this.shopId = options.id;
 			// 判断是否是首页
 			if (this.isSc == 2) {
-				this.indexPay();
+				this.goodsDetail();
 			}
 			// 判断是否是市场
 			if (this.isSc == 1) {
-				this.$refs.popupkf.open();
+				this.getNftDetail();
 			}
+			// 载入余额
+			balance({}).then(({
+				data
+			}) => {
+				// 获取余额
+				this.now_money = data.now_money;
+			});
 		},
-		// 判断是否是首页进入交易
-		indexPay() {
-			let obj = this;
-			let lj = true;
-			// 判断是否需要拦截
-			if (obj.userInfo.is_company == 1 || obj.userInfo.is_partner == 1) {
-				lj = false;
-			}
-			if (lj) {
-				let time = new Date();
-				if (time.getTime() < obj.shopDetail.sell_time * 1000) {
+		computed: {
+			...mapState(['weichatObj', 'baseURL', 'urlFile']),
+			...mapState('user', ['userInfo', 'hasLogin'])
+		},
+		methods: {
+			//选择支付方式
+			changePayType(type) {
+				this.type = type;
+			},
+			copy(value) {
+				let obj = this;
+				let content = value; //需要复制的内容
+				console.log('复制的内容:', content);
+				// content = typeof content === 'string' ? content : content.toString(); // 复制内容，必须字符串，数字需要转换为字符串
+				const result = uniCopy(content);
+				if (result === false) {
+					uni.showToast({
+						title: '不支持'
+					});
+				} else {
+					uni.showToast({
+						title: '复制成功',
+						icon: 'none'
+					});
+				}
+			},
+			buy() {
+				// 判断是否是首页
+				if (this.isSc == 2) {
+					this.indexPay();
+				}
+				// 判断是否是市场
+				if (this.isSc == 1) {
+					this.$refs.popupkf.open();
+				}
+			},
+			// 判断是否是首页进入交易
+			indexPay() {
+				let obj = this;
+				let lj = true;
+				// 判断是否需要拦截
+				if (obj.userInfo.is_company == 1 || obj.userInfo.is_partner == 1) {
+					lj = false;
+				}
+				if (lj) {
+					let time = new Date();
+					if (time.getTime() < obj.shopDetail.sell_time * 1000) {
+						uni.showModal({
+							title: '错误',
+							content: '未到开售时间，不能购买',
+							showCancel: false,
+							success: res => {},
+							fail: () => {}
+						});
+						return;
+					}
+				}
+				let data = {
+					cartNum: 1,
+					uniqueId: obj.uniqueId, //商品标签.默认无
+					new: '1',
+					// mer_id: '',//商店id暂未知晓
+					productId: obj.shopId
+				};
+				//生成订单
+				cartAdd(data)
+					.then(res => {
+						console.log(res, 'res');
+						//需要获取购物车号
+						obj.cartId = res.data.cartId;
+						this.getKeys();
+					})
+					.catch(e => {
+						console.log(e);
+					});
+				this.$refs.popupkf.open();
+			},
+			getKeys() {
+				let obj = this;
+				confirm({
+					cartId: obj.cartId
+				}).then(data => {
+					console.log(data, '生平具体信息');
+					obj.addressData = data.data.addressInfo || {};
+					obj.shopList = data.data.cartInfo; //商品列表
+					// obj.moneyAll = data.data.cartInfo.truePrice; //金额数据
+					obj.orderKey = data.data.orderKey; //订单key
+					// let url = `/pages/money/pay?key=${obj.orderKey}`
+					// console.log(url);
+				});
+			},
+			//支付
+			async pay() {
+				let obj = this;
+				if (obj.type == 'yue' && obj.now_money * 1 < obj.shopDetail.price * 1) {
 					uni.showModal({
-						title: '错误',
-						content: '未到开售时间，不能购买',
-						showCancel: false,
-						success: res => {},
-						fail: () => {}
+						title: '提示',
+						content: '账户余额不足！',
+						showCancel: false
 					});
 					return;
 				}
-			}
-			let data = {
-				cartNum: 1,
-				uniqueId: obj.uniqueId, //商品标签.默认无
-				new: '1',
-				// mer_id: '',//商店id暂未知晓
-				productId: obj.shopId
-			};
-			//生成订单
-			cartAdd(data)
-				.then(res => {
-					console.log(res, 'res');
-					//需要获取购物车号
-					obj.cartId = res.data.cartId;
-					this.getKeys();
-				})
-				.catch(e => {
-					console.log(e);
-				});
-			this.$refs.popupkf.open();
-		},
-		getKeys() {
-			let obj = this;
-			confirm({
-				cartId: obj.cartId
-			}).then(data => {
-				console.log(data, '生平具体信息');
-				obj.addressData = data.data.addressInfo || {};
-				obj.shopList = data.data.cartInfo; //商品列表
-				// obj.moneyAll = data.data.cartInfo.truePrice; //金额数据
-				obj.orderKey = data.data.orderKey; //订单key
-				// let url = `/pages/money/pay?key=${obj.orderKey}`
-				// console.log(url);
-			});
-		},
-		//支付
-		async pay() {
-			let obj = this;
-			if (obj.type == 'yue' && obj.now_money * 1 < obj.shopDetail.price * 1) {
-				uni.showModal({
-					title: '提示',
-					content: '账户余额不足！',
-					showCancel: false
+				// uni.hideLoading()
+				uni.showLoading({
+					title: '支付中',
+					mask: true
 				});
-				return;
-			}
-			// uni.hideLoading()
-			uni.showLoading({
-				title: '支付中',
-				mask: true
-			});
-			// 判断是否支付中
-			if (!obj.payLoding) {
-				return;
-			}
-			obj.payLoding = false;
-			if (obj.type == 'weixin') {
-				obj.$api.msg('微信暂未开通!');
-				uni.hideLoading();
-				obj.payLoding = true;
-				return;
-			}
-			// 判断是否是市场进入
-			if (obj.isSc == 1) {
-				console.log('sc');
-				obj.marketPay();
-			}
-			// 判断是否是市场进入
-			if (obj.isSc == 2) {
-				obj.firstCreateOrder();
-			}
-		},
-		// 市场支付
-		marketPay() {
-			const obj = this;
-			nftBuy(
-				{
-					pay_type: obj.type
-				},
-				obj.shopId
-			)
-				.then(res => {
-					console.log(res, '购入');
+				// 判断是否支付中
+				if (!obj.payLoding) {
+					return;
+				}
+				obj.payLoding = false;
+				if (obj.type == 'weixin') {
+					obj.$api.msg('微信暂未开通!');
 					uni.hideLoading();
-					if (obj.type == 'yue') {
-						obj.paySuccessTo();
+					obj.payLoding = true;
+					return;
+				}
+				// 判断是否是市场进入
+				if (obj.isSc == 1) {
+					console.log('sc');
+					obj.marketPay();
+				}
+				// 判断是否是市场进入
+				if (obj.isSc == 2) {
+					obj.firstCreateOrder();
+				}
+			},
+			// 市场支付
+			marketPay() {
+				const obj = this;
+				nftBuy({
+							pay_type: obj.type
+						},
+						obj.shopId
+					)
+					.then(res => {
+						console.log(res, '购入');
+						uni.hideLoading();
+						if (obj.type == 'yue') {
+							obj.paySuccessTo();
+						}
+						if (obj.type == 'ali') {
+							const url = res.data.payConfig;
+							console.log(url, 'url');
+							uni.requestPayment({
+								provider: 'alipay',
+								orderInfo: url,
+								success: res => {
+									obj.paySuccessTo();
+								},
+								fail: e => {
+									uni.showModal({
+										title: '错误',
+										content: '未成功支付',
+										showCancel: false
+									});
+									console.log(e);
+								},
+								complete: () => {}
+							});
+						}
+					})
+					.catch(() => {
+						obj.payLoding = true;
+					});
+
+				return;
+			},
+			//普通商品支付
+			firstCreateOrder() {
+				let obj = this;
+				// 获取下单页面数据
+				// let prepage = obj.$api.prePage();
+				// console.log(prepage,'prepage');
+				let pages = getCurrentPages(); // 获取页面栈
+				let current = pages[pages.length - 1]; // 当前页面
+				console.log(current, 'current');
+
+				let data = {
+					real_name: '', //联系人名称
+					phone: '', //联系人号码
+					couponId: '', //优惠券编号
+					addressId: '', //支付地址id
+					useIntegral: 0, //是否积分抵扣1为是0为否
+					payType: obj.type, //支付类型  weixin-微信 yue-余额
+					mark: '', //备注
+					from: 'app', //来源
+					shipping_type: 1 //提货方式 1 快递 2自提
+				};
+				// 生成订单
+				console.log(obj.orderKey, 'obj.orderKey');
+				createOrderkey(data, obj.orderKey)
+					.then(({
+						data,
+						status,
+						msg
+					}) => {
+						console.log(status);
+						// 判断是否支付失败
+						if (data.status == 'ORDER_EXIST') {
+							uni.showModal({
+								title: '提示',
+								content: msg,
+								showCancel: false
+							});
+							uni.hideLoading();
+							obj.payLoding = true;
+							return;
+						}
+						// 保存订单号
+						obj.orderId = data.result.orderId;
+						// 判断是否为余额支付
+						if (obj.type == 'yue') {
+							if (status == 200) {
+								obj.paySuccessTo();
+							} else {
+								obj.$api.msg(msg);
+							}
+						} else {
+							// 立即支付
+							obj.orderMoneyPay();
+						}
+					})
+					.catch(e => {
+						uni.hideLoading();
+						obj.payLoding = true;
+						console.log(e, '123456789');
+					});
+			},
+			//立即支付订单
+			orderMoneyPay() {
+				let obj = this;
+				orderPay({
+					uni: obj.orderKey,
+					from: 'app', //来源
+					paytype: obj.type //支付类型  weixin-微信 yue-余额
+				}).then(res => {
+					console.log(res, '订单支付信息');
+					if (res.data.status == 'SUCCESS' && obj.type == 'yue') {
+						if (res.status == 200) {
+							obj.paySuccessTo();
+						} else {
+							obj.$api.msg(msg);
+							console.log('失败');
+						}
 					}
 					if (obj.type == 'ali') {
-						const url = res.data.payConfig;
+						const url = res.data.result.jsConfig;
 						console.log(url, 'url');
 						uni.requestPayment({
 							provider: 'alipay',
 							orderInfo: url,
 							success: res => {
+								console.log(res);
+								uni.showToast({
+									title: '支付成功',
+									duration: 2000
+								});
 								obj.paySuccessTo();
 							},
 							fail: e => {
-								uni.showModal({
-									title: '错误',
-									content: '未成功支付',
-									showCancel: false
-								});
 								console.log(e);
 							},
 							complete: () => {}
 						});
 					}
-				})
-				.catch(() => {
+					uni.hideLoading();
 					obj.payLoding = true;
 				});
-
-			return;
-		},
-		//普通商品支付
-		firstCreateOrder() {
-			let obj = this;
-			// 获取下单页面数据
-			// let prepage = obj.$api.prePage();
-			// console.log(prepage,'prepage');
-			let pages = getCurrentPages(); // 获取页面栈
-			let current = pages[pages.length - 1]; // 当前页面
-			console.log(current, 'current');
-
-			let data = {
-				real_name: '', //联系人名称
-				phone: '', //联系人号码
-				couponId: '', //优惠券编号
-				addressId: '', //支付地址id
-				useIntegral: 0, //是否积分抵扣1为是0为否
-				payType: obj.type, //支付类型  weixin-微信 yue-余额
-				mark: '', //备注
-				from: 'app', //来源
-				shipping_type: 1 //提货方式 1 快递 2自提
-			};
-			// 生成订单
-			console.log(obj.orderKey, 'obj.orderKey');
-			createOrderkey(data, obj.orderKey)
-				.then(({ data, status, msg }) => {
-					console.log(status);
-					// 判断是否支付失败
-					if (data.status == 'ORDER_EXIST') {
-						uni.showModal({
-							title: '提示',
-							content: msg,
-							showCancel: false
-						});
-						uni.hideLoading();
-						obj.payLoding = true;
-						return;
+			},
+			// 获取商品详情
+			goodsDetail() {
+				let obj = this;
+				console.log(obj.isSc, 'issc');
+				goodsDetails({}, obj.shopId).then(res => {
+					console.log(res, '123456789');
+					obj.uniqueId = res.data.productValue['默认'].unique;
+					obj.nft = res.data.nft_class;
+					obj.shopDetail = res.data.storeInfo;
+					console.log(obj.shopDetail, obj.uniqueId, 'res1111');
+					if (obj.shopDetail.description != null) {
+						obj.shopDetail.description = obj.shopDetail.description.replace(/<img/g,
+							'<img class="rich-img"').replace(/<p>\s*<img/g, '<p class="pHeight"><img');
 					}
-					// 保存订单号
-					obj.orderId = data.result.orderId;
-					// 判断是否为余额支付
-					if (obj.type == 'yue') {
-						if (status == 200) {
-							obj.paySuccessTo();
-						} else {
-							obj.$api.msg(msg);
-						}
-					} else {
-						// 立即支付
-						obj.orderMoneyPay();
+					if (obj.shopDetail.rule != null) {
+						obj.shopDetail.rule = '<p>' + obj.shopDetail.rule.replace(/\n/g, '</p><p>').trim() +
+						'</p>';
 					}
-				})
-				.catch(e => {
-					uni.hideLoading();
-					obj.payLoding = true;
-					console.log(e, '123456789');
+					let time = new Date(obj.shopDetail.sell_time * 1000);
+					obj.shopDetail.cmy_pay_time =
+						time.getFullYear() + '年' + (time.getMonth() + 1) + '月' + time.getDate() + '日' + time
+						.getHours() + '时' + time.getMinutes() + '分' + time.getSeconds() + '秒';
+					return;
 				});
-		},
-		//立即支付订单
-		orderMoneyPay() {
-			let obj = this;
-			orderPay({
-				uni: obj.orderKey,
-				from: 'app', //来源
-				paytype: obj.type //支付类型  weixin-微信 yue-余额
-			}).then(res => {
-				console.log(res, '订单支付信息');
-				if (res.data.status == 'SUCCESS' && obj.type == 'yue') {
-					if (res.status == 200) {
-						obj.paySuccessTo();
-					} else {
-						obj.$api.msg(msg);
-						console.log('失败');
-					}
-				}
-				if (obj.type == 'ali') {
-					const url = res.data.result.jsConfig;
-					console.log(url, 'url');
-					uni.requestPayment({
-						provider: 'alipay',
-						orderInfo: url,
-						success: res => {
-							console.log(res);
-							uni.showToast({
-								title: '支付成功',
-								duration: 2000
-							});
-							obj.paySuccessTo();
-						},
-						fail: e => {
-							console.log(e);
-						},
-						complete: () => {}
-					});
-				}
+			},
+			// 获取交易市场进入时候的数据
+			getNftDetail() {
+				let obj = this;
+				nftDetail({}, obj.shopId).then(res => {
+					// obj.uniqueId = res.data.productValue['默认'].unique
+					// obj.shopDetail = res.data.storeInfo
+					obj.shopDetail = res.data.info;
+					console.log(res, obj.isSc, 'res1111');
+				});
+			},
+			// 支付成功跳转
+			paySuccessTo() {
 				uni.hideLoading();
-				obj.payLoding = true;
-			});
-		},
-		// 获取商品详情
-		goodsDetail() {
-			let obj = this;
-			console.log(obj.isSc, 'issc');
-			goodsDetails({}, obj.shopId).then(res => {
-				console.log(res, '123456789');
-				obj.uniqueId = res.data.productValue['默认'].unique;
-				obj.nft = res.data.nft_class;
-				obj.shopDetail = res.data.storeInfo;
-				console.log(obj.shopDetail, obj.uniqueId, 'res1111');
-				if (obj.shopDetail.description != null) {
-					obj.shopDetail.description = obj.shopDetail.description.replace(/<img/g, '<img class="rich-img"').replace(/<p>\s*<img/g, '<p class="pHeight"><img');
-				}
-				if (obj.shopDetail.rule != null) {
-					obj.shopDetail.rule = '<p>' + obj.shopDetail.rule.replace(/\n/g, '</p><p>').trim() + '</p>';
-				}
-				let time = new Date(obj.shopDetail.sell_time * 1000);
-				obj.shopDetail.cmy_pay_time =
-					time.getFullYear() + '年' + (time.getMonth() + 1) + '月' + time.getDate() + '日' + time.getHours() + '时' + time.getMinutes() + '分' + time.getSeconds() + '秒';
-				return;
-			});
-		},
-		// 获取交易市场进入时候的数据
-		getNftDetail() {
-			let obj = this;
-			nftDetail({}, obj.shopId).then(res => {
-				// obj.uniqueId = res.data.productValue['默认'].unique
-				// obj.shopDetail = res.data.storeInfo
-				obj.shopDetail = res.data.info;
-				console.log(res, obj.isSc, 'res1111');
-			});
-		},
-		// 支付成功跳转
-		paySuccessTo() {
-			uni.hideLoading();
-			uni.redirectTo({
-				url: '/pages/money/paySuccess?orderKey=' + this.orderKey
-			});
+				uni.redirectTo({
+					url: '/pages/money/paySuccess?orderKey=' + this.orderKey
+				});
+			}
 		}
-	}
-};
+	};
 </script>
 
 <style lang="scss">
-.container,
-page {
-	background: #111111;
-	min-height: 100%;
-}
-
-/deep/ .rich-img {
-	width: 100% !important;
-	height: auto;
-}
-
-/* #ifdef MP */
-.rich-img {
-	width: 100% !important;
-	height: auto;
-}
-
-// 处理图片间白色间距问题
-.pHeight {
-	line-height: 0;
-}
-
-/* #endif */
-
-.swiper-box {
-	background: #0c0a36;
-}
-
-.img {
-	margin: 0 auto;
-	width: 750rpx;
-
-	image {
-		width: 100%;
+	.container,
+	page {
+		background: #111111;
+		min-height: 100%;
 	}
-}
 
-.content-box {
-	border-bottom: 2rpx solid #919295;
-	padding: 30rpx;
-	display: flex;
-	flex-direction: column;
+	/deep/ .rich-img {
+		width: 100% !important;
+		height: auto;
+	}
 
-	.content-top {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
+	/* #ifdef MP */
+	.rich-img {
+		width: 100% !important;
+		height: auto;
+	}
 
-		.hd {
-			font-size: 38rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
-			line-height: 42rpx;
-		}
+	// 处理图片间白色间距问题
+	.pHeight {
+		line-height: 0;
+	}
 
-		.content-img {
-			display: flex;
-			align-items: center;
-			justify-content: space-around;
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #585be7;
-			line-height: 39rpx;
-			padding: 10rpx;
-			height: 41rpx;
-			border: 2rpx solid #585be7;
-			border-radius: 5rpx;
-
-			image {
-				width: 26rpx;
-				height: 26rpx;
-			}
-		}
+	/* #endif */
+
+	.swiper-box {
+		background: #0c0a36;
 	}
 
-	.content-center {
-		margin: 20rpx 0;
-		display: flex;
-		flex-direction: column;
+	.img {
+		margin: 0 auto;
+		width: 750rpx;
 
-		.title {
-			font-size: 24rpx;
-			font-weight: 500;
-			color: #ffffff;
-			line-height: 42rpx;
+		image {
+			width: 100%;
 		}
 	}
 
-	.content-bottom {
+	.content-box {
+		border-bottom: 2rpx solid #919295;
+		padding: 30rpx;
 		display: flex;
-		align-items: center;
-		justify-content: space-between;
+		flex-direction: column;
 
-		.price {
+		.content-top {
 			display: flex;
-			justify-content: flex-end;
-			font-size: 48rpx;
-			font-weight: bold;
-			color: #585be7;
+			justify-content: space-between;
+			align-items: center;
 
-			span {
-				font-size: 24rpx;
+			.hd {
+				font-size: 38rpx;
+				font-family: PingFang SC;
 				font-weight: bold;
-				color: #666666;
-				font-family: SourceHanSerifSC;
-				line-height: 66rpx;
+				color: #ffffff;
+				line-height: 1;
+				.rightTip{
+					.textStock {
+						overflow: hidden;
+					}
+					.num {
+						font-size: 18rpx;
+						padding: 6rpx 10rpx;
+						color: #9F570E;
+						background-color: #4D3414;
+					}
+					.tip {
+						font-size: 20rpx;
+						color: #9F570E;
+						padding: 6rpx 10rpx;
+						line-height: 1;
+						background: $bgBaseBg;
+					}
+				}
 			}
-		}
 
-		.gobuy {
-			width: 334rpx;
-			height: 90rpx;
-			background: linear-gradient(270deg, #6e8df7, #9977f6);
-			border-radius: 10rpx;
-			font-size: 36rpx;
-			font-weight: 500;
-			color: #ffffff;
-			line-height: 90rpx;
-			text-align: center;
+			.content-img {
+				display: flex;
+				align-items: center;
+				justify-content: space-around;
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #585be7;
+				line-height: 39rpx;
+				padding: 10rpx;
+				height: 41rpx;
+				border: 2rpx solid #585be7;
+				border-radius: 5rpx;
+
+				image {
+					width: 26rpx;
+					height: 26rpx;
+				}
+			}
 		}
-	}
-}
-
-.rz {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-
-	.rz-title {
-		margin: 35rpx 0;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-		line-height: 42rpx;
-	}
-
-	.rich {
-		display: block;
-		justify-content: center;
-		margin: 30rpx;
-		width: 750rpx;
-		overflow: hidden;
-	}
 
-	.rz-ms {
-		padding: 0 20rpx;
-		width: 690rpx;
-		font-size: 24rpx;
-		line-height: 36rpx;
-		color: #ffffff;
-		word-wrap: break-word;
-		word-break: normal;
-	}
-
-	.rz-content {
-		padding: 20rpx;
-		display: flex;
-		flex-direction: column;
-		width: 690rpx;
-		background: #222222;
-		border-radius: 20rpx;
-
-		.con-box {
-			line-height: 60rpx;
+		.content-center {
+			margin: 20rpx 0;
 			display: flex;
-			justify-content: space-between;
-			align-items: center;
+			flex-direction: column;
 
-			.left {
+			.title {
 				font-size: 24rpx;
-				color: #a5a5a5;
+				font-weight: 500;
+				color: #ffffff;
+				line-height: 42rpx;
 			}
+		}
+
+		.content-bottom {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
 
-			.right {
+			.price {
 				display: flex;
-				align-items: center;
+				justify-content: flex-end;
+				font-size: 48rpx;
+				font-weight: bold;
+				color: #FDD58A;
 
-				.address {
-					color: #6363fe;
+				span {
 					font-size: 24rpx;
-					width: 300rpx;
-					text-align: right;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
+					font-weight: bold;
+					color: #666666;
+					font-family: SourceHanSerifSC;
+					line-height: 66rpx;
 				}
+			}
 
-				.copy {
-					margin-left: 15rpx;
-					margin-bottom: 22rpx;
-					width: 30rpx;
-					height: 30rpx;
-
-					image {
-						width: 30rpx;
-						height: 30rpx;
-					}
-				}
+			.gobuy {
+				width: 334rpx;
+				height: 90rpx;
+				background: $bgBaseBg;
+				border-radius: 10rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #9F570E;
+				line-height: 90rpx;
+				text-align: center;
 			}
 		}
 	}
-	.tc-item {
-		width: 100%;
-		padding: 50rpx 40rpx 0;
-		line-height: 1;
-		.tcitem-name {
-			flex-shrink: 0;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #fff;
-		}
-		.ali-name {
-			font-size: 30rpx;
+
+	.rz {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.rz-title {
+			margin: 35rpx 0;
+			font-size: 36rpx;
 			font-family: PingFang SC;
-			font-weight: 500;
-			padding: 0 20rpx;
-			color: #fff;
+			font-weight: bold;
+			color: #ffffff;
+			line-height: 42rpx;
 		}
-		.tcitem-image {
-			flex-shrink: 0;
-			width: 26rpx;
-			height: 28rpx;
+
+		.rich {
+			display: block;
+			justify-content: center;
+			margin: 30rpx;
+			width: 750rpx;
+			overflow: hidden;
 		}
-	}
-}
-
-.popup-box {
-	width: 750rpx;
-	background: #ffffff;
-	border-radius: 10rpx 10rpx 0px 0px;
-	padding-bottom: 130rpx;
-
-	.pop-title {
-		line-height: 1;
-		padding-top: 30rpx;
-		padding-left: 30rpx;
-		padding-bottom: 10rpx;
-		font-size: 34rpx;
-		font-weight: bold;
-		color: #333333;
-	}
 
-	.pop-radio {
-		display: flex;
+		.rz-ms {
+			padding: 0 20rpx;
+			width: 690rpx;
+			font-size: 24rpx;
+			line-height: 36rpx;
+			color: #ffffff;
+			word-wrap: break-word;
+			word-break: normal;
+		}
 
-		.pop-radio-box {
-			height: 100rpx;
+		.rz-content {
+			padding: 20rpx;
 			display: flex;
-			align-items: center;
-			padding: 25rpx;
-			justify-content: space-between;
-			width: 750rpx;
+			flex-direction: column;
+			width: 690rpx;
+			background: #222222;
+			border-radius: 20rpx;
 
-			.pop-radio-cont {
+			.con-box {
+				line-height: 60rpx;
 				display: flex;
+				justify-content: space-between;
+				align-items: center;
 
-				img {
-					width: 40rpx;
-					height: 40rpx;
+				.left {
+					font-size: 24rpx;
+					color: #a5a5a5;
 				}
 
-				text {
-					margin-left: 10rpx;
-					font-size: 28rpx;
-					font-weight: 400;
-					color: #3f454b;
+				.right {
+					display: flex;
+					align-items: center;
+
+					.address {
+						color: #6363fe;
+						font-size: 24rpx;
+						width: 300rpx;
+						text-align: right;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+					}
+
+					.copy {
+						margin-left: 15rpx;
+						margin-bottom: 22rpx;
+						width: 30rpx;
+						height: 30rpx;
+
+						image {
+							width: 30rpx;
+							height: 30rpx;
+						}
+					}
 				}
 			}
 		}
 
-		.pop-bottom {
-			position: fixed;
-			bottom: 0;
-			right: 0;
-			height: 93rpx;
-			width: 750rpx;
+		.tc-item {
+			width: 100%;
+			padding: 50rpx 40rpx 0;
+			line-height: 1;
+
+			.tcitem-name {
+				flex-shrink: 0;
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #fff;
+			}
+
+			.ali-name {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				padding: 0 20rpx;
+				color: #FDD58A;
+			}
+
+			.tcitem-image {
+				flex-shrink: 0;
+				width: 26rpx;
+				height: 28rpx;
+			}
+		}
+	}
+
+	.popup-box {
+		width: 750rpx;
+		background: #ffffff;
+		border-radius: 10rpx 10rpx 0px 0px;
+		padding-bottom: 130rpx;
+
+		.pop-title {
+			line-height: 1;
+			padding-top: 30rpx;
+			padding-left: 30rpx;
+			padding-bottom: 10rpx;
+			font-size: 34rpx;
+			font-weight: bold;
+			color: #333333;
+		}
+
+		.pop-radio {
 			display: flex;
-			justify-content: space-between;
 
-			.pirce {
+			.pop-radio-box {
+				height: 100rpx;
 				display: flex;
 				align-items: center;
-				margin-left: 25rpx;
-
-				.price-left {
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 400;
-					color: #3f454b;
-					line-height: 100px;
+				padding: 25rpx;
+				justify-content: space-between;
+				width: 750rpx;
+
+				.pop-radio-cont {
+					display: flex;
+
+					img {
+						width: 40rpx;
+						height: 40rpx;
+					}
+
+					text {
+						margin-left: 10rpx;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #3f454b;
+					}
 				}
+			}
 
+			.pop-bottom {
+				position: fixed;
+				bottom: 0;
+				right: 0;
+				height: 93rpx;
+				width: 750rpx;
 				display: flex;
+				justify-content: space-between;
+
+				.pirce {
+					display: flex;
+					align-items: center;
+					margin-left: 25rpx;
+
+					.price-left {
+						font-size: 28rpx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #3f454b;
+						line-height: 100px;
+					}
 
-				.price-right {
-					font-size: 24rpx;
-					font-weight: 500;
-					color: #fd3b39;
-					line-height: 55px;
+					display: flex;
 
-					span {
-						font-size: 36rpx;
+					.price-right {
+						font-size: 24rpx;
 						font-weight: 500;
 						color: #fd3b39;
 						line-height: 55px;
+
+						span {
+							font-size: 36rpx;
+							font-weight: 500;
+							color: #fd3b39;
+							line-height: 55px;
+						}
 					}
 				}
-			}
 
-			.buy {
-				width: 360rpx;
-				height: 93rpx;
-				background: linear-gradient(270deg, #6e8df7, #9977f6);
-				font-size: 32rpx;
-				font-weight: bold;
-				line-height: 93rpx;
-				text-align: center;
-				color: #ffffff;
+				.buy {
+					width: 360rpx;
+					height: 93rpx;
+					background: $bgBaseBg;
+					font-size: 32rpx;
+					font-weight: bold;
+					line-height: 93rpx;
+					text-align: center;
+					color: #ffffff;
+				}
 			}
 		}
 	}
-}
 
-.clickbg {
-	background-color: $color-gray !important;
-}
+	.clickbg {
+		background-color: $color-gray !important;
+	}
 </style>

pages/product/productMh.vue

@@ -399,7 +399,7 @@
 			.gobuy {
 				width: 334rpx;
 				height: 90rpx;
-				background: linear-gradient(270deg, #6e8df7, #9977f6);
+				background: $bgBaseBg;
 				border-radius: 10rpx;
 				font-size: 36rpx;
 				font-weight: 500;
@@ -603,7 +603,7 @@
 				.buy {
 					width: 360rpx;
 					height: 93rpx;
-					background: linear-gradient(270deg, #6e8df7, #9977f6);
+					background: $bgBaseBg;
 					font-size: 32rpx;
 					font-weight: bold;
 					line-height: 93rpx;

pages/public/forget.vue

@@ -1,200 +0,0 @@
-<template>
-	<view class="container">
-		<view class="container_text">
-			<image class="banner-img" src="/static/img/img01.png" mode=" scaleToFill"></image>
-		</view>
-		<view class="loginTitle"><text>手机号登录</text></view>
-		<view class="login_text">
-			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img03.png"></image></view>
-				<view class="login_name"><input class="uni-input" v-model="phone" focus placeholder="请输入手机号" /></view>
-			</view>
-			<view class="login_input flex">
-				<view class="login_img"><image src="/static/icon/img06.png"></image></view>
-				<view class="login_name flex">
-					<input class="uni-input width" v-model="code" focus placeholder="请输入验证码" />
-					<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
-				</view>
-			</view>
-			<view>
-				<button type="green" @click="register" class="uni-button uni-button-green">登录</button>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-import { mapMutations } from 'vuex';
-import { verify, loginMobile, getUserInfo } from '@/api/login.js';
-export default {
-	data() {
-		return {
-			phone: '', //用户
-			code: '', //验证码
-			time: '', //保存倒计时对象
-			countDown: 0 //倒计时
-		};
-	},
-	onLoad() {},
-	watch: {
-		// 监听倒计时
-		countDown(i) {
-			if (i == 0) {
-				clearInterval(this.time);
-			}
-		}
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'login']),
-		// 手机登录
-		register() {
-			let obj = this;
-			if (obj.phone == '') {
-				obj.$api.msg('请输入电话号码');
-				return;
-			}
-			if (!/(^1[3|4|5|7|8][0-9]{9}$)/.test(this.phone)) {
-				obj.$api.msg('请输入正确的手机号');
-				return;
-			}
-			if (obj.code == '') {
-				obj.$api.msg('请输入验证码');
-				return;
-			}
-
-			loginMobile({
-				phone: obj.phone, //账号
-				captcha: obj.code
-			}).then(function(e) {
-				uni.setStorageSync('token', e.data.token);
-				getUserInfo({}).then(e => {
-					obj.login();
-					// 保存返回用户数据
-					obj.setUserInfo(e.data);
-					//成功跳转首页
-					uni.switchTab({
-						url: '/pages/index/index'
-					});
-				});
-			}).catch((e) => {
-				console.log(e);
-			});
-		},
-		//发送验证码
-		verification() {
-			let obj = this;
-			if (this.phone == '') {
-				this.$api.msg('请输入电话号码');
-				return;
-			}
-			if (this.phone.length < 11) {
-				this.$api.msg('请输入正确的手机号');
-				return;
-			}
-			// 判断是否在倒计时
-			if (obj.countDown > 0) {
-				return false;
-			} else {
-				obj.countDown = 60;
-				obj.time = setInterval(() => {
-					obj.countDown--;
-				}, 1000);
-				//调用验证码接口
-				verify({
-					phone: obj.phone,
-					type: 'login'
-				})
-					.then(({ data }) => {})
-					.catch(err => {
-						console.log(err);
-					});
-			}
-		},
-		login() {
-			//返回登录
-			uni.navigateTo({
-				url: '/pages/public/login'
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	height: 100%;
-}
-.container {
-	width: 100%;
-	height: 100%;
-	background-size: 100%;
-}
-.container_text {
-	width: 100%;
-	height: 500rpx;
-	top: 0rpx;
-	.banner-img {
-		width: 100%;
-		height: 100%;
-	}
-}
-.login_text {
-	margin: auto 30rpx;
-	position: relative;
-	padding: 100rpx 102rpx;
-	background-color: #ffffff;
-	margin-top: -180rpx;
-	border-radius: 20rpx;
-	.login_input {
-		border-bottom: 1px solid #f0f0f0;
-		margin-bottom: 65rpx;
-		.login_img image {
-			height: 35rpx;
-			width: 29rpx;
-			margin-right: 20rpx;
-		}
-		.uni-input {
-			text-align: left;
-			width: 470rpx;
-			font-size: 28rpx !important;
-		}
-		.login_name {
-			color: #333333;
-			.width {
-				width: 325rpx !important;
-			}
-			.code {
-				color: #5dbc7c;
-				font-size: 23rpx;
-				border-left: 1px solid #eeeeee;
-				width: 150rpx;
-				flex-shrink: 0;
-				text-align: center;
-			}
-		}
-	}
-	.uni-button-green {
-		color: #ffffff;
-		background-color: #5dbc7c;
-		margin: 40rpx 10rpx;
-		border-radius: 50rpx;
-	}
-	.uni-button {
-		height: 85rpx;
-		line-height: 85rpx;
-	}
-}
-.loginTitle {
-	position: absolute;
-	top: 250rpx;
-	width: 100%;
-	text-align: center;
-	color: white;
-	font-size: 40rpx;
-}
-
-uni-button {
-	height: 80rpx !important;
-	line-height: 80rpx !important;
-}
-
-</style>

pages/public/login.vue

@@ -189,7 +189,8 @@
 				}
 
 				.input {
-					color: #9977F6;
+					flex-grow: 1;
+					color: #9F570E;
 					margin-left: 40rpx;
 				}
 			}
@@ -200,11 +201,11 @@
 			text-align: center;
 			width: 452rpx;
 			height: 90rpx;
-			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			background: $bgBaseBg;
 			border-radius: 45rpx;
 			font-size: 34rpx;
 			font-weight: 500;
-			color: #FFFFFF;
+			color: #9F570E;
 			line-height: 90rpx;
 		}
 

pages/public/register.vue

@@ -218,21 +218,23 @@
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-
+						flex-grow: 1;
 					.input {
-						color: #9977F6;
+						width: 100%;
+						color:#9F570E;
 						// line-height: 40rpx;
 
 					}
 
 					.time {
-						width: 150rpx;
+						flex-shrink: 0;
+						width: 190rpx;
 						height: 50rpx;
 						line-height: 50rpx;
 						text-align: center;
 						border-radius: 10rpx;
-						color: #FFFFFF;
-						background: linear-gradient(270deg, #6E8DF7, #9977F6);
+						color: #9F570E;
+						background: $bgBaseBg;
 					}
 
 					.djs {
@@ -243,7 +245,7 @@
 						text-align: center;
 						border-radius: 10rpx;
 						color: #FFFFFF;
-						background: linear-gradient(270deg, #6E8DF7, #9977F6);
+						background: $bgBaseBg;
 					}
 				}
 
@@ -255,11 +257,11 @@
 			text-align: center;
 			width: 604rpx;
 			height: 90rpx;
-			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			background: $bgBaseBg;
 			border-radius: 10rpx;
 			font-size: 34rpx;
 			font-weight: 500;
-			color: #FFFFFF;
+			color: #9F570E;
 			line-height: 90rpx;
 		}
 

pages/set/changePass.vue

@@ -160,7 +160,7 @@ page {
 .logo {
 	font-size: 36rpx;
 	font-weight: 400;
-	color: #A581FF;
+	color: #9F570E;
 	text-align: center;
 }
 .phone {
@@ -189,28 +189,32 @@ page {
 		}
 		.uni-input {
 			text-align: left;
-			width: 400rpx;
-			color: #A581FF;
+			width: 100%;
+			color: #9F570E;
 			font-size: 32rpx !important;
+			
 		}
 		.login_name {
 			color: #333333;
+			flex-grow: 1;
 			.code {
-				color: #A581FF;
-				font-size: 23rpx;
-				border-left: 1px solid #eeeeee;
-				width: 150rpx;
 				flex-shrink: 0;
+				width: 190rpx;
+				height: 50rpx;
+				line-height: 50rpx;
 				text-align: center;
+				border-radius: 10rpx;
+				color: #9F570E;
+				background: $bgBaseBg;
 			}
 		}
 	}
 }
 
 .login {
-	background: linear-gradient(270deg, #6E8DF7, #9977F6);
+	background: $bgBaseBg;
 	margin-top: 96rpx;
-	color: #ffffff;
+	color: #9F570E;
 	text-align: center;
 	padding: 26rpx 0rpx;
 	border-radius: 20rpx;

pages/set/password.vue

@@ -223,7 +223,7 @@
 			margin-top: 60rpx;
 			width: 690rpx;
 			height: 80rpx;
-			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			background: $bgBaseBg;
 			border-radius: 40rpx;
 
 			font-size: 30rpx;

pages/set/set.vue

@@ -179,7 +179,7 @@
 		line-height: 80rpx;
 		height: 80rpx;
 		position: relative;
-		background: linear-gradient(270deg, #6E8DF7, #9977F6);
+		background: $bgBaseBg;
 		border-radius: 10rpx;
 		justify-content: center;
 

pages/set/userinfo.vue

@@ -256,7 +256,7 @@
 		line-height: 80rpx;
 		height: 80rpx;
 		position: relative;
-		background: linear-gradient(270deg, #6E8DF7, #9977F6);
+		background: $bgBaseBg;
 		border-radius: 10rpx;
 		justify-content: center;
 

pages/user/feedback.vue

@@ -116,7 +116,7 @@
 	.button{
 		width: 560rpx;
 		height: 90rpx;
-		background: linear-gradient(270deg, #6E8DF7, #9977F6);
+		background: $bgBaseBg;
 		border-radius: 45rpx;
 		font-size: 36rpx;
 		font-weight: 500;

pages/user/myvip.vue

@@ -52,6 +52,21 @@
 				</view>
 			</view>
 		</view>
+		
+		<view class="box-content" v-if="actionIndex==1">
+			<view class="content-title">
+				<view class="title">
+					加盟即送：{{partner.name}}
+				</view>
+			</view>
+			<view class="img">
+				<image :src="partner.uri" mode=""></image>
+			</view>
+		</view>
+		
+		
+		
+		
 		<view class="footer">
 			<view class="price-content">
 				<text>{{list[actionIndex].level}}</text>
@@ -80,14 +95,16 @@
 				list: [{
 						src: '../../static/img/le1.png',
 						level: '分公司',
-						pir: 2000,
+						pir: 0,
 					},
 					{
 						src: '../../static/img/le1.png',
 						level: '分销商',
-						pir: 2000,
+						pir: 0,
 					},
 				],
+				// 赠送商品
+				partner:{}
 
 			}
 		},
@@ -102,6 +119,7 @@
 				vipList().then((e) => {
 					list[0].pir = e.data.company;
 					list[1].pir = e.data.partner;
+					this.partner = e.data.partner_gift;
 				}).catch((e) => {
 					console.log(e);
 				})
@@ -118,10 +136,12 @@
 			// 支付回调
 			payChecked(data){
 				console.log(data,'fanhui ');
+				console.log(this.type);
+				console.log(data.payConfig,'payConfig ');
 				const that = this;
 				// #ifdef APP-PLUS
 				if (that.type == 'ali') {
-					const url = data.payConfig;
+					const url = data.data.payConfig;
 					console.log(url, 'url');
 					uni.requestPayment({
 						provider: 'alipay',
@@ -191,6 +211,39 @@
 </script>
 
 <style lang="scss">
+	.box-content {
+		margin-bottom: 50rpx;
+		background-color: rgb(15, 15, 15);
+		overflow: hidden;
+		.img {
+			width: 750rpx;
+			height: 750rpx;
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+	
+		.content-title {
+			padding: 30rpx 20rpx;
+			border-bottom-left-radius: 10rpx;
+			border-bottom-right-radius: 10rpx;
+			background-color: rgb(29, 28, 33);
+			.title {
+				font-size: 39rpx;
+				font-weight: bold;
+				color: #FFFFFF;
+				margin-bottom: 20rpx;
+	
+			}
+	
+			.text {
+				margin: 10rpx 0;
+				color: #FFFFFF;
+				font-size: 28rpx;
+			}
+		}
+	}
 	.pay-type-list {
 		margin-top: 20upx;
 		background-color: #fff;
@@ -242,7 +295,7 @@
 	.content {
 		line-height: 1;
 		padding-top: 50rpx;
-
+		padding-bottom: 50px;
 		.top {
 			padding-top: 40rpx;
 			position: relative;
@@ -350,9 +403,9 @@
 			justify-content: center;
 			width: 280rpx;
 			height: 100%;
-			color: #fff;
+			color: #9F570E;
 			font-size: 32rpx;
-			background-color: $base-color;
+			background: $bgBaseBg;
 
 			&.submitNo {
 				background-color: $font-color-disabled;

pages/user/personal.vue

@@ -124,7 +124,7 @@ page,
 		margin-top: 160rpx;
 		width: 690rpx;
 		height: 80rpx;
-		background: linear-gradient(270deg, #6e8df7, #9977f6);
+		background: $bgBaseBg;
 		border-radius: 10rpx;
 		font-size: 30rpx;
 		font-weight: 500;
@@ -132,4 +132,4 @@ page,
 		line-height: 80rpx;
 	}
 }
-</style>
+</style>

pages/user/realName.vue

@@ -122,7 +122,7 @@
 			margin-top: 100rpx;
 			width: 690rpx;
 			height: 80rpx;
-			background: linear-gradient(270deg, #6E8DF7, #9977F6);
+			background: $bgBaseBg;
 			border-radius: 10rpx;
 			font-size: 30rpx;
 			font-family: PingFang SC;
@@ -131,4 +131,4 @@
 			line-height: 80rpx;
 		}
 	}
-</style>
+</style>

pages/user/team.vue

@@ -6,7 +6,7 @@
 				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/img/fanhui.png" mode=""></image></view>
 				<view class="header">我的推广</view>
 			</view>
-			<view class="content-bg"><image src="../../static/img/promotion-bg.png" mode=""></image></view>
+			<!-- <view class="content-bg"><image src="../../static/img/promotion-bg.png" mode=""></image></view> -->
 			<view class="money-box">
 				<view class="money">{{ count || 0 }}</view>
 				<view>我的推广人数</view>
@@ -14,34 +14,25 @@
 		</view>
 		<view class="info-box flex">
 			<view class="info-item">
-				<view class="info-font">参与人数</view>
 				<view class="info-num">{{ count || 0 }}</view>
+				<view class="info-font">参与人数</view>
 			</view>
 			<view class="shu"></view>
 			<view class="info-item">
-				<view class="info-font">团队总销售金额</view>
 				<view class="info-num">{{ user_price || 0 }}</view>
+				<view class="info-font">团队总销售金额</view>
 			</view>
 			<view class="shu"></view>
 			<view class="info-item">
-				<view class="info-font">团队奖</view>
 				<view class="info-num">{{ week_price || 0 }}</view>
+				<view class="info-font">团队奖</view>
 			</view>
 		</view>
 		<view class="content-box" v-for="(item, index) in ztlist" :key="index">
-			<!-- <view class="tgTop">
-				<image src="../../static/img/top.png" mode=""></image>
-			</view> -->
 			<view class="content-box-left">
-				<!-- <view class="left-img">
-					<image :src="item.avatar" mode=""></image>
-				</view> -->
 				<view class="right-title">
 					<view class="top">{{ item.nickname }}</view>
 					<view class="bottom">ID:{{ item.uid }}</view>
-					<!-- <view class="bottom " style="font-size: 24rpx;">手机号:{{ item.phone }}</view> -->
-					<!-- <view class="bottom " style="font-size: 24rpx;">返回额度:{{ item.price }}</view>
-					<view class="bottom " style="font-size: 24rpx;">参与中金额:{{ item.cy_price }}</view> -->
 				</view>
 			</view>
 
@@ -51,8 +42,6 @@
 					销售金额:
 					<span>{{ item.sells }}</span>
 				</view>
-				<!-- <view class="bottom " style="font-size: 24rpx;">待返回金额:{{ item.dfh_price }}</view>
-				<view class="bottom " style="font-size: 24rpx;">充值金额:{{ item.order_price }}</view> -->
 			</view>
 		</view>
 		<view class="content-box" v-for="(item, index) in jtlist" :key="index">
@@ -60,9 +49,6 @@
 				<view class="right-title">
 					<view class="top">{{ item.nickname }}</view>
 					<view class="bottom">ID:{{ item.uid }}</view>
-					<!-- <view class="bottom " style="font-size: 24rpx;">手机号:{{ item.phone }}</view>
-					<view class="bottom " style="font-size: 24rpx;">返回额度:{{ item.price }}</view>
-					<view class="bottom " style="font-size: 24rpx;">参与中金额:{{ item.cy_price }}</view> -->
 				</view>
 			</view>
 
@@ -72,8 +58,6 @@
 					销售金额:
 					<span>{{ item.sells }}</span>
 				</view>
-				<!-- 	<view class="bottom " style="font-size: 24rpx;">待返回金额:{{ item.dfh_price }}</view>
-				<view class="bottom " style="font-size: 24rpx;">充值金额:{{ item.order_price }}</view> -->
 			</view>
 		</view>
 	</view>
@@ -159,14 +143,13 @@ export default {
 
 <style lang="scss">
 page {
-	background: #f8f8f8;
-	height: 100%;
+	min-height: 100%;
+	background:url("@/static/img/pageBg.png") ;
+	background-repeat: repeat;
 }
-
 .info-box {
 	width: 670rpx;
 	height: 186rpx;
-	background: #ffffff;
 	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
 	border-radius: 20rpx;
 	margin: -100rpx auto 0;
@@ -192,7 +175,7 @@ page {
 			font-size: 30rpx;
 			font-family: PingFang SC;
 			font-weight: bold;
-			color: #181818;
+			color: #ffffff;
 		}
 	}
 

pages/user/user.vue

@@ -19,38 +19,15 @@
 				复制
 			</view>
 		</view>
-		<view class="main-box">
-			<view class="title flex" @click="navTo('/pages/order/order?state=0')">
-				<view class="title-left">
-					<!-- <image class="title-icon" src="../../static/user/user5.png" mode=""></image> -->
-					<view class="title-font">我的订单</view>
-				</view>
-				<image class="title-right" src="../../static/user/back.png" mode=""></image>
-			</view>
-			<view class="main flex">
-				<view class="oitem" @click="navTo('/pages/order/order?state=0')">
-					<image class="oitem-image" src="../../static/user/dfk.png" mode=""></image>
-					<view class="oitem-font">待付款</view>
-				</view>
-				<view class="oitem" @click="navTo('/pages/order/order?state=1')">
-					<image class="oitem-image" src="../../static/user/dfh.png" mode=""></image>
-					<view class="oitem-font">待发货</view>
-				</view>
-				<view class="oitem" @click="navTo('/pages/order/order?state=2')">
-					<image class="oitem-image" src="../../static/user/dsh.png" mode=""></image>
-					<view class="oitem-font">待收货</view>
-				</view>
-				<view class="oitem" @click="navTo('/pages/order/order?state=2')">
-					<image class="oitem-image" src="../../static/user/dfk.png" mode=""></image>
-					<view class="oitem-font">已完成</view>
-				</view>
-			</view>
-		</view>
 		<view class="manage-box">
 			<view class="manage" @click="navTo('/pages/order/orderSC')">
 				<view class="flex-center"><image src="../../static/user/user13.png" mode="widthFix"></image></view>
 				<view class="manage-title">市场未付</view>
 			</view>
+			<view class="manage" @click="navTo('/pages/order/order?state=0')">
+				<view class="flex-center"><image src="../../static/user/user15.png" mode="widthFix"></image></view>
+				<view class="manage-title">我的订单</view>
+			</view>
 			<view class="manage" @click="navTo('/pages/money/wallet')">
 				<view class="flex-center"><image src="../../static/user/user06.png" mode="widthFix"></image></view>
 				<view class="manage-title">钱包</view>
@@ -114,10 +91,6 @@
 								<view class="price" v-if="tabCurrentIndex==0">
 									数量{{ item.nft_count }}
 								</view>
-								<view class="" v-show="tabCurrentIndex != 1 && isshow == 1">
-									<view class="button" @click="navPop(item)" v-if="item.hang == null">卖出</view>
-									<view class="button" @click="qxMai(item.hang.id)" v-else>取消卖出</view>
-								</view>
 								<view class="" v-show="tabCurrentIndex==0">
 									<view class="button" @click="listInfo(item)">展开</view>
 								</view>
@@ -145,30 +118,9 @@
 				</view>
 			</view>
 		</uni-popup>
-		<uni-popup ref="maipop" type="center">
-			<view class="mai-box">
-				<view class="mai-title">卖出价格</view>
-				<input type="number" v-model="money" placeholder="请输入" />
-				<view class="mai-button">
-					<view class="button-left" @click="maiClose()">取消</view>
-					<view class="button-right" @click="buy()">确定</view>
-				</view>
-			</view>
-		</uni-popup>
-		<uni-popup ref="qumaipop" type="center">
-			<view class="mai-box">
-				<view class="mai-title">提示</view>
-				<view class="mai-title">您正在转卖这件藏品确认取消卖出?</view>
-				<view class="mai-button">
-					<view class="button-left" @click="maiClose()">取消</view>
-					<view class="button-right" @click="quxbuy(item)">确定</view>
-				</view>
-			</view>
-		</uni-popup>
 	</view>
 </template>
 <script>
-import { sell, qxgd } from '@/api/order.js';
 import uniCopy from '@/js_sdk/xb-copy/uni-copy.js';
 import uEmpty from '@/uview-ui/components/u-empty/u-empty.vue';
 import { mapState, mapMutations } from 'vuex';
@@ -252,6 +204,12 @@ export default {
 	},
 	methods: {
 		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
+		// 跳转转开列表
+		listInfo(item){
+			uni.navigateTo({
+				url: '/pages/index/myNftList?id=' + item.nft_class_id + '&type=1'
+			});
+		},
 		// 判断是否可以交易
 		pdshow() {
 			loadIndexs().then(e => {
@@ -285,52 +243,6 @@ export default {
 					console.log(e);
 				});
 		},
-		navPop(item) {
-			this.item = item;
-			this.$refs.maipop.open();
-		},
-
-		buy() {
-			let obj = this;
-			console.log(obj.item, 'item');
-			if (obj.price == '') {
-				obj.$api.msg('请输入价格');
-				return;
-			}
-			sell(
-				{
-					price: obj.money
-				},
-				obj.item.id
-			).then(res => {
-				console.log(res, 'res');
-				uni.showModal({
-					title: '成功',
-					content: '挂售成功!',
-					showCancel: false
-				});
-				obj.$refs.maipop.close();
-			});
-		},
-		//取消卖出弹窗
-		qxMai(item) {
-			this.$refs.qumaipop.open();
-			console.log(item, 'id');
-			this.id = item;
-		},
-		// 取消挂单
-		quxbuy() {
-			qxgd({}, this.id).then(res => {
-				console.log(res, '取消挂单');
-				this.$refs.qumaipop.close();
-				uni.showModal({
-					title: '成功',
-					content: '已成功取消挂单',
-					showCancel: false
-				});
-			});
-		},
-
 		navGet(index) {
 			this.tabCurrentIndex = index;
 			this.getMyNft('tab');
@@ -393,10 +305,7 @@ export default {
 				});
 			}
 		},
-		maiClose() {
-			this.$refs.maipop.close();
-			this.$refs.qumaipop.close();
-		},
+
 		getMyNft(type) {
 			let obj = this;
 			let index = obj.tabCurrentIndex;
@@ -455,9 +364,9 @@ page,
 .hashAddress{
 	line-height: 1;
 	margin: 30rpx;
-	border: 1px solid #7D5FA4;
+	border: 1px solid #4D3414;
 	border-radius: 10rpx;
-	color: #7D5FA4;
+	color:#9F570E;
 	font-size: 20rpx;
 	height: 60rpx;
 	padding: 0 30rpx;
@@ -465,70 +374,14 @@ page,
 		padding: 6rpx 0;
 		padding-left: 20rpx;
 		padding-right: 20rpx;
-		color: #FFFFFF;
+		color: #9F570E;
 		border-radius: 100rpx;
 		border-top-right-radius: 0rpx;
-		border: 1px solid #7D5FA4;
+		background: $bgBaseBg;
 		flex-shrink: 0;
 	}
 }
-.mai-box {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: space-around;
-	width: 582rpx;
-	height: 377rpx;
-	background: #ffffff;
-	border-radius: 20rpx;
-
-	.mai-title {
-		margin: 0 60rpx;
-		font-size: 42rpx;
-		font-weight: 500;
-		color: #0c1732;
-		line-height: 56rpx;
-	}
 
-	input {
-		width: 494rpx;
-		height: 90rpx;
-		font-size: 40rpx;
-		background: rgba(199, 212, 255, 0.35);
-		border-radius: 10rpx;
-		text-align: center;
-	}
-
-	.mai-button {
-		display: flex;
-		width: 90%;
-		justify-content: space-between;
-
-		.button-left {
-			text-align: center;
-			width: 248rpx;
-			height: 78rpx;
-			border: 2rpx solid #a581ff;
-			border-radius: 10rpx;
-			font-size: 34rpx;
-			font-weight: 500;
-			color: #a581ff;
-			line-height: 78rpx;
-		}
-
-		.button-right {
-			text-align: center;
-			width: 248rpx;
-			height: 78rpx;
-			background: linear-gradient(270deg, #6e8df7, #9977f6);
-			border-radius: 10rpx;
-			font-size: 34rpx;
-			font-weight: 500;
-			color: #ffffff;
-			line-height: 78rpx;
-		}
-	}
-}
 
 .title-box {
 	margin: 80rpx 0 40rpx 0;
@@ -578,7 +431,7 @@ page,
 	font-size: 20rpx;
 	font-weight: 500;
 	line-height: 61rpx;
-	color: #5c5ee5;
+	color: #FDD58A;
 
 	.address-text {
 		margin: 0 25rpx;
@@ -649,7 +502,7 @@ page,
 	line-height: 42rpx;
 
 	.current {
-		color: #5c5ee5;
+		color: #FDD58A;
 	}
 }
 
@@ -708,12 +561,12 @@ page,
 			display: inline-block;
 			// padding: 2rpx;
 			// height: 30rpx;
-			// border: 1rpx solid #5C5EE5;
+			// border: 1rpx solid #FDD58A;
 			margin-left: 10rpx;
 			border-radius: 5rpx;
 			font-size: 16rpx;
 			font-weight: 500;
-			color: #5c5ee5;
+			color: #FDD58A;
 			// line-height: 30rpx;
 			text-align: center;
 		}
@@ -739,11 +592,11 @@ page,
 		.button {
 			width: 104rpx;
 			height: 35rpx;
-			background: linear-gradient(270deg, #6e8df7, #9977f6);
+			background: $bgBaseBg;
 			border-radius: 18rpx;
 			font-size: 20rpx;
 			font-weight: 500;
-			color: #ffffff;
+			color: #9F570E;
 			line-height: 35rpx;
 			text-align: center;
 		}
@@ -937,4 +790,4 @@ page,
 	flex-wrap: wrap;
 	padding: 30rpx;
 }
-</style>
+</style>

uni.scss

@@ -46,6 +46,7 @@ $box-shadow: 0rpx 0rpx 10rpx 10rpx #f3f3f3;
 $border-radius-sm: 15rpx;
 // 渐变背景颜色
 $bg-green-gradual: linear-gradient(#5dbc7c, #71d094);
+$bgBaseBg: linear-gradient(270deg, #FFE7C4, #FFCE8A);
 /* 功能栏字体大小 */
 %font-title {
 	font-size: $font-lg + 2rpx;
@@ -63,7 +64,7 @@ $bg-green-gradual: linear-gradient(#5dbc7c, #71d094);
 %f-left-icon {
 	height: $font-lg + 2rpx;
 	width: 8rpx;
-	background-image: $bg-green-gradual;
+	background-image: $bgBaseBg;
 	margin-right: 10rpx;
 	border-radius: 10rpx;
 }