2023-11-8

manifest.json

@@ -113,7 +113,7 @@
             "proxy" : {
                 "/api" : {
                     // "target" : "http://test.shangshigo.com", //请求的目标域名
-                    "target" : "http://jp.frp.qiniu1314.com", //请求的目标域名
+                    "target" : "https://xx.accle.shop", //请求的目标域名
                     "changeOrigin" : true
                 }
             }

pages.json

@@ -124,48 +124,13 @@
 				}
 			}
 		},
-		
-		{
-			"path": "pages/product/product",
-			"style": {
-				"navigationBarTitleText": "详情展示",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-		{
-			"path": "pages/hall/porducthall",
-			"style": {
-				"navigationBarTitleText": "详情展示",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
 		{
 			"path": "pages/hall/gsell",
 			"style": {
 				"navigationBarTitleText": "挂售"
 			}
 		},
-		{
-			"path": "pages/product/list",
-			"style": {
-				"navigationBarTitleText": "商品列表"
-			}
-		},
 		
-		// {
-		// 	"path": "pages/store/shopDetail",
-		// 	"style": {
-		// 		"navigationBarTitleText": "好店详情"
-		// 	}
-		// },
 		{
 			"path": "pages/index/message",
 			"style": {
@@ -184,61 +149,12 @@
 				"navigationBarTitleText": "公告详情"
 			}
 		},
-		{
-			"path": "pages/product/search",
-			"style": {
-				"enablePullDownRefresh": true,
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP || APP-PLUS
-				"app-plus": {
-					"titleNView": {
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "请输入关键字",
-							"disabled": false,
-							"placeholderColor": "#606266",
-							"align": "left"
-						},
-						"buttons": [{
-							"text": "搜索",
-							"fontSize": "14",
-							"color": "#303133",
-							"background": "rgba(0,0,0,0)",
-							"width": "40px"
-						}]
-					}
-				},
-				// #endif
-				"navigationBarTitleText": "搜索"
-			}
-		},
 		{
 			"path": "pages/set/set",
 			"style": {
 				"navigationBarTitleText": "设置"
 			}
 		},
-		{
-			"path": "pages/set/address",
-			"style": {
-				"navigationBarTitleText": "收货地址"
-			}
-		},
-		{
-			"path": "pages/set/addressManage",
-			"style": {
-				"navigationBarTitleText": ""
-			}
-		},
-		{
-			"path": "pages/set/phone",
-			"style": {
-				"navigationBarTitleText": "绑定手机"
-			}
-		},
 		{
 			"path": "pages/set/password",
 			"style": {
@@ -271,55 +187,12 @@
 				}
 			}
 		},
-		{
-			"path": "pages/user/gzsq",
-			"style": {
-				"navigationBarTitleText": "馆长申请"
-			}
-		},
 		{
 			"path": "pages/user/myfans",
 			"style": {
 				"navigationBarTitleText": "我的粉丝"
 			}
 		},
-		{
-			"path": "pages/user/myproduct",
-			"style": {
-				"navigationBarTitleText": "我的商品"
-			}
-		},
-		{
-			"path": "pages/user/myyue",
-			"style": {
-				"navigationBarTitleText": "我的余额",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
-	
-		{
-			"path": "pages/user/approve",
-			"style": {
-				"navigationBarTitleText": "实名认证",
-				"navigationBarBackgroundColor": "#E6C79D",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		
-		{
-			"path": "pages/order/index",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "我的订单",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
 		{
 			"path": "pages/order/order",
 			"style": {
@@ -329,73 +202,12 @@
 				}
 			}
 		},
-		{
-			"path": "pages/order/order1",
-			"style": {
-				"navigationBarTitleText": "我的订单"
-			}
-		},
-		{
-			"path": "pages/order/expressInfo",
-			"style": {
-				"navigationBarTitleText": "快递详情"
-			}
-		},
-		{
-			"path": "pages/order/orderDetail",
-			"style": {
-				"navigationBarTitleText": "订单详情",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
-		{
-			"path": "pages/order/hallorderDetail",
-			"style": {
-				"navigationBarTitleText": "订单详情",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
 		{
 			"path": "pages/hall/hallpay",
 			"style": {
 				"navigationBarTitleText": "支付"
 			}
 		},
-		{
-			"path": "pages/order/evaluate",
-			"style": {
-				"navigationBarTitleText": "评论"
-			}
-		},
-		{
-			"path": "pages/order/orderRefund",
-			"style": {
-				"navigationBarTitleText": "申请退款"
-			}
-		},
-		{
-			"path": "pages/order/createOrder",
-			"style": {
-				"navigationBarTitleText": "创建订单"
-			}
-		},
-		{
-			"path": "pages/money/pay",
-			"style": {
-				"navigationBarTitleText": "支付"
-			}
-		},
-		{
-			"path": "pages/money/paySuccess",
-			"style": {
-				"navigationBarTitleText": "支付成功"
-			}
-		},
-	
 		{
 			"path": "pages/money/withdrawal",
 			"style": {
@@ -408,20 +220,10 @@
 				"navigationBarTitleText": "充值"
 			}
 		},
-		
-		{
-			"path": "pages/redirect/redirect",
-			"style": {
-				"navigationBarTitleText": "微信登录跳转页面",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
 		{
 			"path": "pages/hall/hall",
 			"style": {
-				"navigationBarTitleText": "易趣会馆",
+				"navigationBarTitleText": "会馆",
 				"app-plus": {
 					"titleNView": false
 				}
@@ -436,22 +238,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/hall/hallinfo",
-			"style": {
-				"navigationBarTitleText": "场次详情",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/hall/history",
-			"style": {
-				"navigationBarTitleText": "场次详情"
-			}
-		},
-		
 		{
 			"path": "pages/user/shareQrCode",
 			"style": {
@@ -461,7 +247,7 @@
 		{
 			"path": "pages/money/qudou",
 			"style": {
-				"navigationBarTitleText": "我的趣豆",
+				"navigationBarTitleText": "我的积分",
 				"enablePullDownRefresh": false,
 				"app-plus": {
 					"titleNView": false

pages/hall/halllist.vue

@@ -229,25 +229,9 @@
 					});
 					return;
 				}
+				this.id = item.id;
+				this.$refs.popup.open();
 				// 场次是否已经预约sta=1未预约
-				if (item.sta != 1) {
-					this.id = item.id;
-					this.nav();
-					// advance({
-					// 		id: item.id
-					// 	})
-					// 	.then(e => {
-					// 		console.log(e, 'success');
-					// 		this.nav();
-					// 	})
-					// 	.catch(e => {
-					// 		console.log(e, 'fail');
-					// 	});
-				} else {
-					this.id = item.id;
-					this.$refs.popup.open();
-					// this.appointment();
-				}
 			},
 			goDetails(e) {
 				console.log(e, '123456');
@@ -259,12 +243,6 @@
 				this.id = '';
 				this.$refs.popup.close();
 			},
-			nav() {
-				uni.navigateTo({
-					url: '/pages/hall/hallinfo?id=' + this.id + '&name=' + this.name + '&peoplename=' + this
-						.peoplename
-				});
-			},
 			navTo(url) {
 				uni.navigateTo({
 					url

pages/order/evaluate.vue

@@ -1,410 +0,0 @@
-<template>
-	<view class="content">
-		<view class="order-item">
-			<view class="goods-box-single">
-				<image class="goods-img" :src="productInfo.image" mode="aspectFill"></image>
-				<view class="right position-relative">
-					<view class="flex">
-						<text class="title">{{ productInfo.store_name }}</text>
-						<view class="title-right">
-							<view class="price">{{ productInfo.price }}</view>
-							<view class="attr-box">x{{ list.cart_num }}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view>
-				<view class="flex_item zhil">
-					<view>商品质量</view>
-					<view><uniRate text="1" size="20" margin="10" :value="rateValue1" @change="rateChange1"></uniRate></view>
-				</view>
-				<view class="flex_item zhil">
-					<view>服务态度</view>
-					<view><uniRate text="1" size="20" margin="10" :value="rateValue2" @change="rateChange2"></uniRate></view>
-				</view>
-				<view class="equity_box">
-					<view class="text-box uni-textarea">
-						<textarea placeholder-style="color:#999" :placeholder="placeholder" @blur="bindTextAreaBlur"></textarea>
-					</view>
-					<view class="">
-						<view class="add-img-box flex_item">
-							<view class="add-img-item" v-for="(item, index) in imgList" :key="index">
-								<image class="add-img" @click.stop="imgInfo(index)" :src="item.url" mode="aspectFill"></image>
-								<image class="add-img-del" @click.stop="delImg(index)" src="/static/img/delete.png"></image>
-							</view>
-							<view v-if="imgList.length < 9" class="add-img-item" @click.stop="scImg()">
-								<image class="add-img" src="/static/img/add.png"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view @click.stop="submit" class="address-box submit-box"><text class="submit-btn">提交评论</text></view>
-	</view>
-</template>
-
-<script>
-import { product, upload, order_comment } from '@/api/order.js';
-import uniRate from '@/components/uni-rate/uni-rate.vue';
-export default {
-	components: {
-		uniRate
-	},
-	data() {
-		return {
-			list: '', //订单详情
-			productInfo: '',
-			text: '', //评论内容
-			placeholder: '商品满足你的期待么？说说你的想法，分享给想买的他们吧~',
-			imgList: [],
-			unique: '', //商品唯一标识码
-			cloudimgList: [],
-			rateValue1: '', //商品质量
-			rateValue2: '', //服务态度
-			imgCount: 6 ,//最多支持9张上传，可以修改
-			upFileLoding:false
-		};
-	},
-	onLoad(option) {
-		this.unique = option.unique;
-		this.loadOrder();
-	},
-	onShow() {},
-	methods: {
-		//text
-		bindTextAreaBlur: function(e) {
-			this.text = e.detail.value;
-		},
-		//获取收入支出信息
-		async loadOrder() {
-			product({
-				unique: this.unique
-			}).then(e => {
-				this.list = e.data;
-				this.productInfo = e.data.productInfo;
-			});
-		},
-		//商品质量评分
-		rateChange1(val) {
-			this.rateValue1 = val.value;
-		},
-		//服务态度评分
-		rateChange2(val) {
-			this.rateValue2 = val.value;
-		},
-		//单张上传图片
-		scImg() {
-			const that = this;
-			if (that.upFileLoding) {
-				return
-			}
-			that.upFileLoding = true;
-			setTimeout(()=>{
-				that.upFileLoding = false;
-			},1000);
-			if (that.imgCount == 0) {
-				uni.showToast({
-					title: '最多添加6张图片',
-					icon: 'none'
-				});
-				return;
-			}
-			upload({
-				file: ''
-			})
-				.then(e => {
-					that.imgList = [...that.imgList, ...e];
-					that.imgCount = 10 - that.imgList.length;
-				}).catch((err) => {
-					console.log(err);
-				})
-		},
-		//提交评论
-		submit(e) {
-			let obj = this;
-			if (obj.imgList.length < 1) {
-				uni.showToast({
-					title: '请添加图片',
-					icon: 'none'
-				});
-				return;
-			}
-			for (let i = 0; i < obj.imgList.length; i++) {
-				obj.cloudimgList.push(obj.imgList[i].url);
-			}
-			let arr = obj.cloudimgList.join(',');
-			order_comment({
-				pics: arr,
-				comment: obj.text,
-				product_score: obj.rateValue1,
-				service_score: obj.rateValue2,
-				unique: obj.unique,
-				
-			})
-				.then(e => {
-					uni.navigateTo({
-						url: '/pages/order/order?state=4'
-					});
-				})
-				.catch(e => {
-					uni.navigateTo({
-						url: '/pages/order/order?state=4'
-					});
-				});
-		},
-		//点击图片显示大图
-		imgInfo(i) {
-			let tempList = [];
-			console.log(111);
-			this.imgList.forEach(e => {
-				tempList.push(e.url);
-			});
-			console.log(tempList);
-			//显示图片
-			uni.previewImage({
-				current: i,
-				loop: false,
-				urls: tempList,
-				indicator: 'default'
-			});
-		},
-		//删除图片
-		delImg(i) {
-			uni.showModal({
-				content: '确定删除这张吗',
-				success: res => {
-					if (res.confirm) {
-						this.imgList.splice(i, 1);
-						this.imgCount++;
-					} else if (res.cancel) {
-					}
-				}
-			});
-		},
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #ffffff;
-	height: 100%;
-	.content {
-		background: #ffffff;
-		height: 100%;
-	}
-}
-/* 多条商品 */
-.order-item {
-	display: flex;
-	flex-direction: column;
-	padding: 0rpx 30rpx;
-	background: #fff;
-	margin-top: 20rpx;
-	/* 单条商品 */
-	.goods-box-single {
-		display: flex;
-		padding: 20rpx 0;
-		.goods-img {
-			display: block;
-			width: 120rpx;
-			height: 120rpx;
-		}
-		.right {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			padding: 0 30rpx 0 24rpx;
-			overflow: hidden;
-			height: 100%;
-			.title {
-				align-self: flex-start;
-				font-size: $font-base + 2rpx;
-				color: $font-color-dark;
-				height: 80rpx;
-				overflow:hidden; 
-				text-overflow:ellipsis;
-				display:-webkit-box; 
-				-webkit-box-orient:vertical;
-				-webkit-line-clamp:2; 
-			}
-			.title-right {
-				flex-shrink: 0;
-				text-align: right;
-				align-self: flex-start;
-			}
-			.attr-box {
-				font-size: $font-sm + 2rpx;
-				color: $font-color-light;
-			}
-			.price {
-				font-size: $font-base + 2rpx;
-				color: $font-color-dark;
-				&:before {
-					content: '￥';
-					font-size: $font-sm;
-					margin: 0 2rpx 0 8rpx;
-				}
-			}
-		}
-	}
-}
-.equity_box {
-	background-color: #fafafa;
-	border-radius: 10rpx;
-	padding: 25rpx 25rpx;
-	margin: 25rpx 0rpx;
-	.text-box {
-		height: 200rpx;
-		textarea {
-			font-size: 25rpx;
-			width: 100%;
-			height: 100%;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			display: -webkit-box;
-			-webkit-box-orient: vertical;
-			-webkit-line-clamp: 5;
-		}
-	}
-}
-.zhil {
-	font-size: 28rpx !important;
-	padding: 15rpx 15rpx;
-}
-.submit-box {
-	bottom: 0;
-	left: 0;
-	width: 750rpx;
-}
-.submit-btn {
-	margin-top: 10px;
-	display: inline-block;
-	width: 670rpx;
-	height: 96rpx;
-	line-height: 96rpx;
-	text-align: center;
-	background-color: #1BCC26 !important;
-	opacity: 1;
-	border-radius: 32rpx;
-	border-width: 8rpx;
-	border-color: rgba(255, 255, 255, 1);
-	box-shadow: 0rpx 8rpx 12rpx rgba(0, 0, 0, 0.16);
-	border-radius: 56rpx;
-	font-size: 39rpx;
-	font-weight: bold;
-	color: rgba(255, 255, 255, 1);
-}
-.submit-btn-txt {
-	font-size: 39rpx;
-	font-weight: bold;
-	line-height: 47rpx;
-	color: rgba(255, 255, 255, 1);
-	opacity: 1;
-}
-.map-box {
-	width: 484rpx;
-	height: 256rpx;
-	border-width: 4rpx;
-	border-color: rgba(255, 255, 255, 1);
-	box-shadow: 0rpx 0rpx 24rpx rgba(0, 0, 0, 0.16);
-	/* border-radius: 12rpx; */
-	position: relative;
-}
-.map {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	width: 476rpx;
-	height: 250rpx;
-}
-.map-img {
-	position: absolute;
-	top: 90rpx;
-	left: 156rpx;
-	width: 230rpx;
-	height: 68rpx;
-	background-color: rgba(51, 51, 51, 0.64);
-	border-width: 1rpx;
-	border-color: rgba(0, 0, 0, 0);
-	border-radius: 34px;
-
-	font-size: 28rpx;
-	font-weight: bold;
-	line-height: 66rpx;
-	color: rgba(255, 255, 255, 1);
-	text-align: center;
-}
-.address-box {
-	padding: 15rpx 40rpx;
-	margin-bottom: 10px;
-}
-.label {
-	font-size: 36rpx;
-	font-weight: bold;
-	line-height: 50rpx;
-	color: #222222;
-}
-.label-img {
-	padding-left: 40rpx;
-}
-
-.add-img-box {
-	width: 100%;
-	flex-direction: row;
-	flex-wrap: wrap;
-	margin-top: 50rpx;
-}
-.add-img-item {
-	width: 180rpx;
-	height: 180rpx;
-	border-radius: 24rpx;
-	position: relative;
-	margin: 0rpx 20rpx;
-	margin-bottom: 25rpx;
-	.add-img {
-		width: 100%;
-		height: 100%;
-		border-radius: 24rpx;
-	}
-}
-.add-img-camera {
-	flex: 1;
-}
-.add-img-del {
-	position: absolute;
-	width: 40rpx;
-	height: 40rpx;
-	left: 155rpx;
-	bottom: 155rpx;
-	//background-color: rgba(238, 0, 0, 1);
-	border-radius: 20rpx;
-}
-.address-time {
-	width: 484rpx;
-	height: 88rpx;
-	background-color: rgba(245, 245, 245, 1);
-	opacity: 1;
-	border-radius: 24rpx;
-	text-align: center;
-
-	font-size: 35rpx;
-	font-weight: 500;
-	color: rgba(51, 51, 51, 1);
-}
-.line {
-	width: 750rpx;
-	height: 1px;
-	transform: scaleY(0.3);
-	background-color: rgba(0, 0, 0, 0.5);
-}
-</style>

pages/order/expressInfo.vue

@@ -1,74 +0,0 @@
-<template>
-	<view class="container">
-		<view class="express-box">
-			<view class="top-text">
-				<text class="top-com">{{expressList.com}}</text>
-				<text>{{ expressList.nu }}</text>
-			</view>
-			<view class="express-body">
-				<uni-steps :options="expressList.data" active-color="#007AFF" :active="active" direction="column"></uni-steps>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-import { express_query } from '@/api/order.js';
-import uniSteps from '@/components/uni-steps/uni-steps.vue';
-export default {
-	components: {
-		uniSteps
-	},
-	data() {
-		return {
-			id: '',
-			expressList: [],
-			active: 0
-		}
-	},
-	onLoad(option) {
-		this.id = option.id
-	},
-	onShow() {
-		this.loadData()
-	},
-	methods: {
-		loadData() {
-			express_query({
-				id: this.id,
-			}).then(({data}) => {
-				this.expressList = data;
-				console.log(this.expressList)
-			})
-		}
-	}
-}
-</script>
-
-<style lang="scss">
-.container {
-	padding: 40rpx;
-	.express-box {
-		border-radius: $border-radius-sm;
-		.top-text {
-			width: 100%;
-			height: 60rpx;
-			background: #FFFFFF;
-			padding-left: 20rpx;
-			font-size: $font-base;
-			border-radius: $border-radius-sm;
-			display: flex;
-			align-items: center;
-			.top-com {
-				margin-right: 10rpx;
-			}
-		}
-		.express-body {
-			margin-top: 20rpx;
-			background: #FFFFFF;
-			border-radius: $border-radius-sm;
-			padding: 20rpx 10rpx 20rpx 0;
-		}
-	}
-}
-</style>

pages/order/index.vue

@@ -1,101 +0,0 @@
-<template>
-	<view class="content">
-		<view class="order-title"><text>订单选择</text></view>
-		<view class="title">请选择订单类型</view>
-		<view class="tip">请您选择您需要查看的订单类型</view>
-		<view class="order" @click="nav('/pages/order/order1?state=0')">
-			<image src="../../static/img/order1.png" mode=""></image>
-		</view>
-		<view class="order" @click="nav('/pages/order/order')">
-			<image src="../../static/img/order2.png" mode=""></image>
-		</view>
-		<u-tabbar activeColor="#f42b4e" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
-	</view>
-</template>
-
-<script>
-import { tabbar } from '@/utils/tabbar.js';
-export default {
-	data() {
-		return {
-			tabbar: tabbar,
-			current: 1 //底部tabar选中的icon对象
-		};
-	},
-	methods: {
-		nav(url) {
-			uni.navigateTo({
-				url
-			})
-		}
-	}
-};
-</script>
-
-<style lang="less">
-.order-title {
-	width: 750rpx;
-	height: 200rpx;
-	background: url(../../static/img/order99.png) repeat-x 0;
-	display: flex;
-	flex-direction: column;
-	text-align: center;
-
-	text {
-		margin: 30px 0;
-		font-size: 17px;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-
-	.roder-content {
-		display: flex;
-		justify-content: space-around;
-
-		.left {
-			width: 168px;
-			height: 40px;
-			line-height: 40px;
-			border: 1px solid #ffffff;
-			border-radius: 5px;
-			text-align: center;
-			font-size: 15px;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
-			background: #dc262b;
-		}
-
-		.current {
-			color: #dc262b;
-			background: #ffffff;
-		}
-	}
-}
-.title {
-	margin: 80rpx 34rpx 0;
-	font-size: 42rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #000000;
-}
-.tip {
-	margin: 26rpx 34rpx 50rpx;
-	font-size: 28rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #9F9F9F;
-}
-.order {
-	margin: 30rpx auto 0;
-	width: 700rpx;
-	height: 184rpx;
-	box-shadow: 0px 6rpx 30rpx 0px rgba(166, 166, 166, 0.16);
-	border-radius: 20rpx;
-	image {
-		width: 100%;
-		height: 100%;
-	}
-}
-</style>

pages/order/order.vue

@@ -326,11 +326,6 @@
 					this.tabCurrentIndex1 = index;
 				}
 			},
-			toBack() {
-				uni.switchTab({
-					url: '/pages/order/index'
-				});
-			},
 			navGo(index) {
 				this.currentIndex = index;
 				console.log(this.currentIndex, '点击');

pages/order/order1.vue

@@ -1,681 +0,0 @@
-<template>
-	<view class="content">
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-
-		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view @click="goToOrderDetail(item)" v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
-						<view class="i-top b-b">
-							<text class="time">{{ item._add_time }}</text>
-							<text class="state" :style="{ color: item.stateTipColor }">{{ item._status._title }}</text>
-							<text v-if="item.status === 4" class="del-btn iconfont icondelete" @click="deleteOrder(index)"></text>
-						</view>
-
-						<scroll-view v-if="item.cartInfo.length > 1" class="goods-box" scroll-x>
-							<view v-for="(goodsItem, goodsIndex) in item.cartInfo" :key="goodsIndex" class="goods-item">
-								<image class="goods-img" :src="goodsItem.productInfo.image" mode="aspectFill"></image>
-							</view>
-						</scroll-view>
-						<!-- <view v-if="item.cartInfo.length === 1" class="goods-box-single" v-for="(goodsItem, goodsIndex) in item.cartInfo" :key="goodsIndex">
-							<image class="goods-img" :src="goodsItem.productInfo.image" mode="aspectFill"></image>
-							<view class="right">
-								<text class="title clamp">{{ goodsItem.productInfo.store_name }}</text>
-								<text class="attr-box">{{ goodsItem.attrInfo ? goodsItem.attrInfo.suk : '' }} x {{ goodsItem.cart_num }}</text>
-								<text class="price">{{ moneyNum(goodsItem.productInfo.price)}}</text>
-							</view>
-						</view> -->
-						<view class="goods-box-single" v-for="(goodsItem, goodsIndex) in item.cartInfo" :key="goodsIndex">
-							<image class="goods-img" :src="goodsItem.productInfo.image" mode="scaleToFill"></image>
-							<view class="right">
-								<view class="flex-start">
-									<text class="title clamp">{{ goodsItem.productInfo.store_name }}</text>
-									<text class="price">{{ moneyNum(goodsItem.productInfo.price) }}</text>
-								</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>
-							</view>
-						</view>
-
-						<view class="price-box">
-							共
-							<text class="num">{{ item.cartInfo.length }}</text>
-							件商品 邮费
-							<text class="price">{{ moneyNum(item.pay_postage) }}</text>
-							实付款
-							<text class="price" v-if="item.use_integral != 0">{{ moneyNum(item.pay_price) }}+{{ item.use_integral }}趣豆</text>
-							<text class="price" v-if="item.use_integral == 0">{{ moneyNum(item.pay_price) }}</text>
-						</view>
-						<view class="action-box b-t" v-if="item.status != 5">
-							<button v-if="item._status._title == '未支付'" class="action-btn" @click.stop="cancelOrder(item)">取消订单</button>
-							<button v-if="item._status._title == '未支付'" @click.stop="orderPay(item)" class="action-btn recom">立即支付</button>
-							<button v-if="item._status._title == '待评价'" class="action-btn">评价</button>
-							<button v-if="item._status._title == '待收货'" @click.stop="orderTake(item, index)" class="action-btn">确认收货</button>
-							<button v-if="item._status._title == '未发货'" class="action-btn" @click.stop="orderRefund(item)">申请退款</button>
-						</view>
-					</view>
-
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import empty from '@/components/empty';
-import { orderList, orderCancel, orderDel, orderTake } from '@/api/order.js';
-export default {
-	components: {
-		empty
-	},
-	data() {
-		return {
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '待付款',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 1,
-					text: '待发货',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 2,
-					text: '待收货',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 3,
-					text: '待评价',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: 4,
-					text: '已完成',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					state: -3,
-					text: '售后',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			]
-		};
-	},
-
-	onLoad(options) {
-		/**
-		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
-		 * 替换onLoad下代码即可
-		 */
-		this.tabCurrentIndex = +options.state;
-		// #ifndef MP
-		this.loadData();
-		// #endif
-		// #ifdef MP
-		if (options.state == 0) {
-			this.loadData();
-		}
-		// #endif
-	},
-	// #ifdef APP-PLUS || H5
-	onBackPress(e) {
-		uni.switchTab({
-			url: '/pages/user/user'
-		});
-		return true;
-	},
-	// #endif
-	methods: {
-		// 转换金额为数字
-		moneyNum(value) {
-			return +value;
-		},
-		// 确认收货
-		orderTake(item, index) {
-			let obj = this;
-			uni.showModal({
-				title: '是否确认收货？',
-				success: () => {
-					orderTake({
-						uni: item.order_id
-					})
-						.then(e => {
-							obj.navList[obj.tabCurrentIndex].orderList.splice(index, 1);
-							uni.showToast({
-								title: '收货成功'
-							});
-						})
-						.catch(e => {
-							console.log(e);
-						});
-				}
-			});
-		},
-		//跳转到订单详情
-		goToOrderDetail(e) {
-			uni.navigateTo({
-				url: '/pages/order/orderDetail?id=' + e.order_id
-			});
-		},
-		// 申请退款
-		orderRefund(e) {
-			uni.navigateTo({
-				url: '/pages/order/orderRefund?id=' + e.order_id
-			});
-		},
-		// 订单支付
-		orderPay(e) {
-			uni.navigateTo({
-				url: '/pages/money/pay?type=1&ordid=' + e.order_id + '&money=' + e.pay_price
-			});
-		},
-		//获取订单列表
-		loadData(source) {
-			//这里是将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state;
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			if (navItem.loadingType === 'noMore') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			navItem.loadingType = 'loading';
-
-			orderList({
-				type: state,
-				page: navItem.page,
-				limit: navItem.limit
-			})
-				.then(({ data }) => {
-					let arr = data.map(e => {
-						let b = this.orderStateExp(e.status);
-						e.stateTip = b.stateTip;
-						e.stateTipColor = b.stateTipColor;
-						return e;
-					});
-					navItem.orderList = navItem.orderList.concat(arr);
-					// console.log(navItem.orderList);
-					navItem.page++;
-					if (navItem.limit == data.length) {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'noMore';
-					}
-					uni.hideLoading();
-					this.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		},
-		//删除订单
-		deleteOrder(index) {
-			uni.showLoading({
-				title: '请稍后'
-			});
-			setTimeout(() => {
-				this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
-				uni.hideLoading();
-			}, 600);
-		},
-		//取消订单
-		cancelOrder(item) {
-			uni.showModal({
-				title: '订单取消',
-				content: '是否取消订单？',
-				success: e => {
-					if (e.confirm) {
-						uni.showLoading({
-							title: '请稍后'
-						});
-						orderCancel({ id: item.order_id })
-							.then(e => {
-								uni.showToast({
-									title: '取消成功',
-									duration: 2000,
-									position: 'top'
-								});
-							})
-							.catch(e => {
-								console.log(e);
-							});
-						//取消订单后删除待付款中该项
-						let list = this.navList[this.tabCurrentIndex].orderList;
-						let index = list.findIndex(val => val.id === item.id);
-						index !== -1 && list.splice(index, 1);
-						uni.hideLoading();
-					}
-				}
-			});
-		},
-
-		//订单状态文字和颜色
-		orderStateExp(state) {
-			let stateTip = '',
-				stateTipColor = '#fa436a';
-			switch (+state) {
-				case 0:
-					stateTip = '待付款';
-					break;
-				case 1:
-					stateTip = '待发货';
-					break;
-				case 2:
-					stateTip = '待收货';
-					break;
-				case 3:
-					stateTip = '待评价';
-					break;
-				case 4:
-					stateTip = '已完成';
-					stateTipColor = '#5dbc7c';
-					break;
-				case 9:
-					stateTip = '订单已关闭';
-					stateTipColor = '#909399';
-					break;
-
-				//更多自定义
-			}
-			return { stateTip, stateTipColor };
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page,
-.content {
-	background: $page-color-base;
-	height: 100%;
-}
-
-.swiper-box {
-	height: calc(100% - 40px);
-}
-.list-scroll-content {
-	height: 100%;
-}
-
-.navbar {
-	display: flex;
-	height: 40px;
-	padding: 0 5px;
-	background: #fff;
-	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-	position: relative;
-	z-index: 10;
-	.nav-item {
-		flex: 1;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		font-size: 15px;
-		color: $font-color-dark;
-		position: relative;
-		&.current {
-			color: $base-color;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid $base-color;
-			}
-		}
-	}
-}
-
-.uni-swiper-item {
-	height: auto;
-}
-.order-item {
-	display: flex;
-	flex-direction: column;
-	padding-left: 30rpx;
-	background: #fff;
-	margin-top: 16rpx;
-	.i-top {
-		display: flex;
-		align-items: center;
-		height: 80rpx;
-		padding-right: 30rpx;
-		font-size: $font-base;
-		color: $font-color-dark;
-		position: relative;
-		.time {
-			flex: 1;
-		}
-		.state {
-			color: $base-color;
-		}
-		.del-btn {
-			padding: 10rpx 0 10rpx 36rpx;
-			font-size: $font-lg;
-			color: $font-color-light;
-			position: relative;
-			&:after {
-				content: '';
-				width: 0;
-				height: 30rpx;
-				border-left: 1px solid $border-color-dark;
-				position: absolute;
-				left: 20rpx;
-				top: 50%;
-				transform: translateY(-50%);
-			}
-		}
-	}
-	/* 多条商品 */
-	.goods-box {
-		height: 160rpx;
-		padding: 20rpx 0;
-		white-space: nowrap;
-		.goods-item {
-			width: 120rpx;
-			height: 120rpx;
-			display: inline-block;
-			margin-right: 24rpx;
-		}
-		.goods-img {
-			display: block;
-			width: 100%;
-			height: 100%;
-		}
-	}
-	/* 单条商品 */
-	.goods-box-single {
-		display: flex;
-		padding: 20rpx 0;
-		.goods-img {
-			display: block;
-			width: 120rpx;
-			height: 120rpx;
-		}
-		.right {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			padding: 0 30rpx 0 24rpx;
-			overflow: hidden;
-			.row {
-				margin-top: 10rpx;
-			}
-			.row_title {
-				padding: 5rpx 10rpx;
-				background-color: #dddddd;
-				border-radius: 10rpx;
-				font-size: 22rpx;
-				color: #ffffff;
-			}
-			.title {
-				font-size: $font-base + 2rpx;
-				color: $font-color-dark;
-				line-height: 1;
-				width: 80%;
-			}
-			.attr-box {
-				display: flex;
-				justify-content: flex-end;
-				font-size: $font-sm + 2rpx;
-				color: $font-color-light;
-			}
-			.price {
-				display: inline;
-				font-size: $font-base + 2rpx;
-				color: $font-color-dark;
-				&:before {
-					content: '￥';
-					font-size: $font-sm;
-				}
-			}
-		}
-	}
-	.price-box {
-		display: flex;
-		justify-content: flex-end;
-		align-items: baseline;
-		padding: 20rpx 30rpx;
-		font-size: $font-sm + 2rpx;
-		color: $font-color-light;
-		.num {
-			margin: 0 8rpx;
-			color: $font-color-dark;
-		}
-		.price {
-			font-size: $font-lg;
-			color: $font-color-dark;
-			&:before {
-				content: '￥';
-				font-size: $font-sm;
-				margin: 0 2rpx 0 8rpx;
-			}
-		}
-	}
-	.action-box {
-		display: flex;
-		justify-content: flex-end;
-		align-items: center;
-		height: 100rpx;
-		position: relative;
-		padding-right: 30rpx;
-	}
-	.action-btn {
-		width: 160rpx;
-		height: 60rpx;
-		margin: 0;
-		margin-left: 24rpx;
-		padding: 0;
-		text-align: center;
-		line-height: 60rpx;
-		font-size: $font-sm + 2rpx;
-		color: $font-color-dark;
-		background: #fff;
-		border-radius: 100px;
-		&:after {
-			border-radius: 100px;
-		}
-		&.recom {
-			color: $base-color;
-			&:after {
-				border-color: $base-color;
-			}
-		}
-		&.evaluate {
-			color: $color-yellow;
-			&:after {
-				border-color: $color-yellow;
-			}
-		}
-	}
-}
-
-/* load-more */
-.uni-load-more {
-	display: flex;
-	flex-direction: row;
-	height: 80rpx;
-	align-items: center;
-	justify-content: center;
-}
-
-.uni-load-more__text {
-	font-size: 28rpx;
-	color: #999;
-}
-
-.uni-load-more__img {
-	height: 24px;
-	width: 24px;
-	margin-right: 10px;
-}
-
-.uni-load-more__img > view {
-	position: absolute;
-}
-
-.uni-load-more__img > view view {
-	width: 6px;
-	height: 2px;
-	border-top-left-radius: 1px;
-	border-bottom-left-radius: 1px;
-	background: #999;
-	position: absolute;
-	opacity: 0.2;
-	transform-origin: 50%;
-	animation: load 1.56s ease infinite;
-}
-
-.uni-load-more__img > view view:nth-child(1) {
-	transform: rotate(90deg);
-	top: 2px;
-	left: 9px;
-}
-
-.uni-load-more__img > view view:nth-child(2) {
-	transform: rotate(180deg);
-	top: 11px;
-	right: 0;
-}
-
-.uni-load-more__img > view view:nth-child(3) {
-	transform: rotate(270deg);
-	bottom: 2px;
-	left: 9px;
-}
-
-.uni-load-more__img > view view:nth-child(4) {
-	top: 11px;
-	left: 0;
-}
-
-.load1,
-.load2,
-.load3 {
-	height: 24px;
-	width: 24px;
-}
-
-.load2 {
-	transform: rotate(30deg);
-}
-
-.load3 {
-	transform: rotate(60deg);
-}
-
-.load1 view:nth-child(1) {
-	animation-delay: 0s;
-}
-
-.load2 view:nth-child(1) {
-	animation-delay: 0.13s;
-}
-
-.load3 view:nth-child(1) {
-	animation-delay: 0.26s;
-}
-
-.load1 view:nth-child(2) {
-	animation-delay: 0.39s;
-}
-
-.load2 view:nth-child(2) {
-	animation-delay: 0.52s;
-}
-
-.load3 view:nth-child(2) {
-	animation-delay: 0.65s;
-}
-
-.load1 view:nth-child(3) {
-	animation-delay: 0.78s;
-}
-
-.load2 view:nth-child(3) {
-	animation-delay: 0.91s;
-}
-
-.load3 view:nth-child(3) {
-	animation-delay: 1.04s;
-}
-
-.load1 view:nth-child(4) {
-	animation-delay: 1.17s;
-}
-
-.load2 view:nth-child(4) {
-	animation-delay: 1.3s;
-}
-
-.load3 view:nth-child(4) {
-	animation-delay: 1.43s;
-}
-
-@-webkit-keyframes load {
-	0% {
-		opacity: 1;
-	}
-
-	100% {
-		opacity: 0.2;
-	}
-}
-</style>

pages/order/orderRefund.vue

@@ -1,237 +0,0 @@
-<template>
-	<view class="content">
-		<view class="order-item">
-			<scroll-view v-if="listStyle == 1" class="goods-box" scroll-x>
-				<view v-for="(goodsItem, goodsIndex) in item.cartInfo" :key="goodsIndex" class="goods-item">
-					<image class="goods-img" :src="goodsItem.productInfo.image" mode="aspectFill"></image>
-				</view>
-			</scroll-view>
-			<view v-if="listStyle == 2" class="goods-box-single" v-for="(goodsItem, goodsIndex) in item.cartInfo" :key="goodsIndex">
-				<image class="goods-img" :src="goodsItem.productInfo.image" mode="aspectFill"></image>
-				<view class="right">
-					<text class="title clamp">{{ goodsItem.productInfo.store_name }}</text>
-					<text class="attr-box">{{ goodsItem.attrInfo ? goodsItem.attrInfo.suk : '' }} x {{ goodsItem.cart_num }}</text>
-					<text class="price">{{ goodsItem.productInfo.price }}</text>
-				</view>
-			</view>
-		</view>
-		<view class="orderDetial">
-			<view class="row b-b flex">
-				<text class="tit">订单总价</text>
-				<view class="input">￥{{ item.total_price }}</view>
-			</view>
-			<view class="row b-b flex">
-				<text class="tit">邮费</text>
-				<view class="input">{{ item.pay_postage > 0 ? '￥' +item.pay_postage : '免邮费' }}</view>
-			</view>
-			<view class="row b-b flex" v-if="item.coupon_id > 0">
-				<text class="tit">优惠券</text>
-				<view class="input">-￥{{ item.coupon_price }}</view>
-			</view>
-			<view class="row b-b flex" v-if="item.use_integral > 0">
-				<text class="tit">积分抵扣</text>
-				<view class="input">-￥{{ item.use_integral }}</view>
-			</view>
-			<view class="row b-b flex">
-				<text class="tit ">实付</text>
-				<view class="input payColor">￥{{ item.pay_price }}</view>
-			</view>
-		</view>
-		<view class="row b-b">
-			<text class="tit">退款理由</text>
-			<picker mode="selector" :range="value" @change="bindChange">
-				<view class="refund" v-if="refund">{{ refund || '请选择退款理由' }}</view>
-				<view class="noRefund" v-else>请选择退款理由</view>
-			</picker>
-		</view>
-		<view class="row b-b">
-			<text class="tit">备注说明</text>
-			<input class="input" type="text" v-model="reason" placeholder="请填写备注" placeholder-class="placeholder" />
-		</view>
-		<button class="add-btn" @click="confirm">提交</button>
-	</view>
-</template>
-
-<script>
-import { refund, refundReason, orderDetail } from '@/api/order.js';
-export default {
-	data() {
-		return {
-			refund: '', //退款理由
-			reason: '', //备注
-			value: ['1', '2', '3', '4', '5', '6', '7', '8', 9, 10, 11, 12, 13],
-			orderId: '',
-			item: {},
-			listStyle: 2
-		};
-	},
-	onLoad(option) {
-		this.orderId = option.id;
-		this.refundReason();
-		this.loadOrder();
-	},
-	methods: {
-		// 切换选中事件
-		bindChange(e) {
-			this.refund = this.value[e.detail.value];
-		},
-		// 加载退款理由
-		refundReason() {
-			refundReason({}).then(e => {
-				this.value = e.data;
-			});
-		},
-		loadOrder() {
-			orderDetail({}, this.orderId).then(e => {
-				this.item = e.data;
-			});
-		},
-		//提交
-		confirm() {
-			let obj = this;
-			if (!obj.refund) {
-				uni.showModal({
-					title: '错误',
-					content: '请填写退货理由',
-					showCancel: false
-				});
-				return false;
-			}
-			refund({
-				text: obj.refund,
-				uni: obj.orderId,
-				refund_reason_wap_explain: obj.reason
-			}).then(function(e) {
-				uni.showToast({
-					title:'提交成功',
-					duration:1500
-				})
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: $page-color-base;
-	padding-top: 16rpx;
-}
-.orderDetial {
-	.row {
-		.input {
-			text-align: right;
-		}
-	}
-}
-.row {
-	display: flex;
-	align-items: center;
-	position: relative;
-	padding: 0 30rpx;
-	height: 110rpx;
-	background: #fff;
-	.refund {
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.noRefund {
-		font-size: 30rpx;
-		color: $font-color-light;
-		padding-left: 20rpx;
-	}
-	.tit {
-		flex-shrink: 0;
-		width: 120rpx;
-		font-size: 30rpx;
-		color: $font-color-dark;
-	}
-	.input {
-		flex: 1;
-		font-size: 30rpx;
-		color: $font-color-dark;
-		padding-left: 20rpx;
-		&.payColor {
-			color: $color-red;
-		}
-	}
-	.iconlocation {
-		font-size: 36rpx;
-		color: $font-color-light;
-	}
-}
-.add-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 60rpx auto;
-	font-size: $font-lg;
-	color: #fff;
-	background-color: $base-color;
-	border-radius: 10rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-
-/* 多条商品 */
-.order-item {
-	display: flex;
-	flex-direction: column;
-	padding-left: 30rpx;
-	background: #fff;
-	margin-top: 16rpx;
-	.goods-box {
-		height: 160rpx;
-		padding: 20rpx 0;
-		white-space: nowrap;
-		.goods-item {
-			width: 120rpx;
-			height: 120rpx;
-			display: inline-block;
-			margin-right: 24rpx;
-		}
-		.goods-img {
-			display: block;
-			width: 100%;
-			height: 100%;
-		}
-	}
-	/* 单条商品 */
-	.goods-box-single {
-		display: flex;
-		padding: 20rpx 0;
-		.goods-img {
-			display: block;
-			width: 120rpx;
-			height: 120rpx;
-		}
-		.right {
-			flex: 1;
-			display: flex;
-			flex-direction: column;
-			padding: 0 30rpx 0 24rpx;
-			overflow: hidden;
-			.title {
-				font-size: $font-base + 2rpx;
-				color: $font-color-dark;
-				line-height: 1;
-			}
-			.attr-box {
-				font-size: $font-sm + 2rpx;
-				color: $font-color-light;
-				padding: 10rpx 12rpx;
-			}
-			.price {
-				font-size: $font-base + 2rpx;
-				color: $font-color-dark;
-				&:before {
-					content: '￥';
-					font-size: $font-sm;
-					margin: 0 2rpx 0 8rpx;
-				}
-			}
-		}
-	}
-}
-</style>

pages/user/approve.vue

@@ -1,195 +0,0 @@
-<template>
-	<view class="content">
-		<view class="bgimg"><image class="img" src="https://zhibo.liuniu946.com/img/bgRz.png" mode="widthFix"></image></view>
-		<u-form class="user" :model="form" ref="uForm">
-			<u-form-item label="姓名" label-width="150"><u-input v-model="form.name" placeholder="请输入真实姓名" /></u-form-item>
-			<u-form-item label="身份证号" label-width="150"><u-input placeholder="请输入身份证号" v-model="form.card" /></u-form-item>
-		</u-form>
-		<view class="userBox">
-			<view class="title">上传身份证照片</view>
-			<view class="imgUp" @click.stop="upImg()"><image class="img" :src="form.img || '../../static/img/sfz.png'" mode="scaleToFill"></image></view>
-		</view>
-		<button class="add-btn" @click="pushData('add')">立即认证</button>
-	</view>
-</template>
-
-<script>
-import { realName } from '@/api/set.js';
-import { upload } from '@/api/order.js';
-export default {
-	data() {
-		return {
-			loding: false, //判断是否在点击中
-			form: {
-				name: '',
-				card: '',
-				img: ''
-			},
-			upFileLoding:false,
-		};
-	},
-	onLoad(option) {},
-	methods: {
-		upImg(e) {
-			const that = this;
-			if(that.upFileLoding){
-				return
-			}
-			that.upFileLoding = true;
-			setTimeout(()=>{
-				that.upFileLoding = false;
-			},1000);
-			upload({
-				filename: ''
-			}).then(data => {
-				this.form.img = data[0].url;
-			}).catch((err)=>{
-				console.log(err);
-			})
-		},
-		ToIndex() {
-			let obj = this;
-			let ur = uni.getStorageSync('present') || '/pages/index/index';
-			// 用于处理缓存bug
-			if (ur == 'pages/product/product') {
-				ur = '/pages/index/index';
-			}
-			uni.switchTab({
-				url: ur,
-				fail(e) {
-					uni.navigateTo({
-						url: ur,
-						fail(e) {
-							uni.navigateTo({
-								url: '/pages/index/index'
-							});
-						}
-					});
-				}
-			});
-		},
-		pushData() {
-			const da = this.form;
-			if (this.loding) {
-				return;
-			}
-			if (!da.name) {
-				uni.showModal({
-					title: '提示',
-					content: '请填写真实姓名',
-					showCancel: false
-				});
-				return;
-			}
-			if (!da.card) {
-				uni.showModal({
-					title: '提示',
-					content: '请填写身份证',
-					showCancel: false
-				});
-				return;
-			}
-			if (!da.img) {
-				uni.showModal({
-					title: '提示',
-					content: '请选择图片',
-					showCancel: false
-				});
-				return;
-			}
-			const data = {
-				cidimg: da.img,
-				rname: da.name,
-				cid: da.card
-			};
-			uni.showLoading({
-				title: '审核中',
-				mask: true
-			});
-			this.loding = true;
-			// 上传
-			realName(data)
-				.then(e => {
-					uni.showModal({
-						title: '提示',
-						content: '实名提交成功',
-						showCancel: false,
-						success: res => {
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-						}
-					});
-					uni.hideLoading();
-					this.loding = false;
-					console.log(e);
-				})
-				.catch(e => {
-					this.loding = false;
-					console.log(e);
-					uni.hideLoading();
-				});
-		}
-	}
-};
-</script>
-
-<style lang="scss" scoped>
-.content {
-	height: 100%;
-	padding: 0 $page-row-spacing;
-}
-.add-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 690rpx;
-	height: 80rpx;
-	margin: 60rpx auto;
-	font-size: $font-lg;
-	color: #fff;
-	background: #E6C79D ;
-	border-radius: 50rpx;
-	// box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
-}
-.bgimg {
-	text-align: center;
-	width: 1200rpx;
-	margin-left: -260rpx;
-	height: 400rpx;
-	background: #E6C79D ;
-	border-bottom-right-radius: 999999rpx;
-	border-bottom-left-radius: 999999rpx;
-	.img {
-		width: 400rpx;
-		margin-top: 50rpx;
-	}
-}
-.user {
-	margin-top: -100rpx !important;
-	border-radius: 10rpx !important;
-	padding: 0 30rpx;
-}
-.userBox,
-.user {
-	box-shadow: 0px 2px 16px 1px rgba(89, 89, 89, 0.24) !important;
-	background-color: white !important;
-}
-.userBox {
-	margin-top: 20rpx;
-	padding: 30rpx;
-	.imgUp {
-		min-height: 100rpx;
-		text-align: center;
-		margin-top: 30rpx;
-		.img {
-			width: 300rpx;
-			height: 400rpx;
-		}
-	}
-}
-.imglist /deep/ * {
-	margin-left: auto !important;
-	margin-right: auto !important;
-}
-</style>

pages/user/gzsq.vue

@@ -1,250 +0,0 @@
-<template>
-	<view class="content">
-		<view class="tab-wrapper">
-			<view class="itemx">
-				<view class="item-tit">公司名称：</view>
-				<input type="text" v-model="companyname" placeholder="请输入公司名称" />
-			</view>
-			<view class="itemx">
-				<view class="item-tit">负责人姓名：</view>
-				<input type="text" v-model="name" placeholder="请输入负责人姓名" />
-			</view>
-			<view class="itemx">
-				<view class="item-tit">联系方式：</view>
-				<input type="text" v-model="phone" placeholder="请输入联系方式" />
-			</view>
-			<view class="itemx">
-				<view class="item-tit">身份证号：</view>
-				<input type="text" v-model="cardid" placeholder="请输入身份证号" />
-			</view>
-		</view>
-		<view class="scsfz-wrap">
-			<image v-if="imagezm == ''" src="../../static/img/sfzzm.png" mode="" @click="uploads('imagezm')"></image>
-			<image v-if="imagezm != ''" :src="imagezm" mode="" @click="uploads('imagezm')"></image>
-			<view class="" style="padding-bottom: 33rpx;">
-				添加身份证正面
-			</view>
-			<image v-if="imagefm == ''" src="../../static/img/sfzzm.png" mode="" @click="uploads('imagefm')"></image>
-			<image v-if="imagefm != ''" :src="imagefm" mode="" @click="uploads('imagefm')"></image>
-			<view class="">
-				添加身份证反面
-			</view>
-		</view>
-		<view class="tab-wrapper" style="padding-top: 0;">
-			<view class="itemx">
-				<view class="item-tit">店铺地址：</view>
-				<input type="text" v-model="address" placeholder="请输入店铺地址" />
-			</view>
-			<view class="itemx"  style="height: 250rpx;">
-				<view class="item-tit">营业执照：</view>
-				<image v-if="yyzz == ''" src="../../static/img/add.png" mode="" @click="uploads('yyzz')"></image>
-				<image v-if="yyzz != ''" :src="yyzz" mode="" @click="uploads('yyzz')"></image>
-			</view>
-		</view>
-		<view class="tab-wrapper" style="padding-top: 0;">
-			<view class="itemx"  style="height: 250rpx;">
-				<view class="item-tit">门店照片：</view>
-				<image v-if="imageshop == ''" src="../../static/img/add.png" mode=""  @click="uploads('imageshop')"></image>
-				<image v-if="imageshop != ''" :src="imageshop" mode=""  @click="uploads('imageshop')"></image>
-			</view>
-		</view>
-		<view class="sq-xz" @click="dagou = !dagou">
-			<text class="sq-gou"  v-if="!dagou"></text>
-			<image src="../../static/icon/gou.png" mode="" class="sq-gou-g" v-else></image>
-			<text>我已阅读并同意</text><text style="color: #DC262B;">《馆长申请须知》</text>
-		</view>
-		<view class="sq-btn" @click="subSq()">
-			提交申请
-		</view>
-	</view>
-</template>
-
-<script>
-	import { upload } from '@/api/order.js';
-	import { apply } from '@/api/user.js'
-	export default {
-		data() {
-			return {
-				dagou: true,
-				companyname:'',//公司名称
-				name:'',//负责人姓名
-				phone:'',//联系方式
-				cardid:'',//身份证号码
-				imagezm:'',//身份证正面
-				imagefm:'',//身份证反面
-				address:'',//店铺地址
-				yyzz:'',//营业执照
-				imageshop:'',//门店照片
-				upFileLoding:false,
-			}
-		},
-		methods: {
-			subSq() {
-				let obj = this
-				if(obj.companyname == ''){
-					return this.$api.msg("请填写公司名称")
-				}
-				if(obj.name == ''){
-					return this.$api.msg("请填写负责人姓名")
-				}
-				if(obj.phone == ''){
-					return this.$api.msg("请填写联系方式")
-				}
-				if(obj.cardid == ''){
-					return this.$api.msg("请填写身份证号码")
-				}
-				if(obj.imagezm == ''){
-					return this.$api.msg("请填写身份证正面")
-				}
-				if(obj.imagefm == ''){
-					return this.$api.msg("请填写身份证反面")
-				}
-				if(obj.address == ''){
-					return this.$api.msg("请填写店铺地址")
-				}
-				if(obj.yyzz == ''){
-					return this.$api.msg("请填写营业执照")
-				}
-				if(obj.imageshop == ''){
-					return this.$api.msg("请填写门店照片")
-				}
-				// if(!obj.dagou) {
-				// 	return this.$api.msg('')
-				// }
-				apply().then(({data}) =>{
-					this.$api.msg('申请成功')
-				})
-			},
-			uploads(type) {
-				const that = this;
-				if (that.upFileLoding) {
-					return
-				}
-				that.upFileLoding = true;
-				setTimeout(()=>{
-					that.upFileLoding = false;
-				},1000);
-				upload({
-					filename: ''
-				}).then(data => {
-					that[type] = data[0].url;
-				}).catch((err) => {
-					console.log(err);
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.tab-wrapper {
-		padding: 20rpx 30rpx;
-		// background-color: #f2f3f5;
-
-	}
-
-	.itemx {
-		margin: 0 auto;
-		width: 100%;
-		background-color: #fff !important;
-		height: 100rpx;
-		display: flex;
-		// width: 690px;
-		border: 1px #f4f4f4 solid;
-		image {
-			margin-top: 63rpx;
-			margin-left: 55rpx;
-			width: 160rpx;
-			height: 160rpx;
-		}
-		.code {
-			width: 150rpx;
-			flex-shrink: 0;
-			text-align: center;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FF4C4C;
-			line-height: 100rpx;
-		}
-
-		.item-tit {
-			height: 100rpx;
-			line-height: 100rpx;
-			padding-left: 30rpx;
-			width: 220rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #666666;
-			flex-shrink: 0;
-		}
-
-		input {
-			width: 530rpx;
-			padding-right: 20rpx;
-			height: 100rpx;
-			line-height: 100rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #333333;
-		}
-	}
-
-	.scsfz-wrap {
-		width: 690rpx;
-		height: 673rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 10rpx;
-		margin: 0 auto 20rpx;
-		font-size: 29rpx;
-		font-family: SourceHanSansCN;
-		font-weight: 400;
-		color: #B2B2B2;
-		text-align: center;
-		padding-top: 33rpx;
-		image {
-			display: block;
-			width: 354rpx;
-			height: 240rpx;
-			margin: auto;
-		}
-	}
-	.sq-btn {
-		width: 750rpx;
-		height: 98rpx;
-		line-height: 98rpx;
-		background: #DC262B;
-		text-align: center;
-		font-size: 36rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #FFFFFF;
-	}
-	.sq-xz {
-		height: 32rpx;
-		line-height: 32rpx;
-		display: flex;
-		margin: 21rpx 0 75rpx 30rpx;
-		font-size: 24rpx;
-		font-family: PingFang SC;
-		font-weight: 500;
-		color: #0C1732;
-		.sq-gou {
-			display: inline-block;
-			width: 32rpx;
-			height: 32rpx;
-			border-radius: 50%;
-			border: 1px solid #999;
-			margin-right: 15rpx;
-		}
-		.sq-gou-g {
-			width: 32rpx;
-			height: 32rpx;
-			border-radius: 50%;
-			margin-right: 15rpx;
-		}
-	}
-</style>

pages/user/myyue.vue

@@ -1,421 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="status_bar"><!-- 这里是状态栏 --></view>
-			<view class="body-title">
-				<view class="goback-box" @click="toBack"><image class="goback" src="../../static/icon/fanhui.png" mode=""></image></view>
-				<view class="header">我的金豆</view>
-			</view>
-			<view class="content-bg"><image src="../../static/img/jifen.png" mode=""></image></view>
-			<view class="money-box">
-				<view class="money">{{ userInfo.brokerage_price }}</view>
-				<view>我的金豆</view>
-			</view>
-			<view class="money-btn" @click="navto('/pages/money/withdrawal')">
-				提现
-				<text>></text>
-			</view>
-		</view>
-		<!-- <view class="info-box flex">
-			<view class="info-item">
-				<view class="info-font">累计收入</view>
-				<view class="info-num">{{ recharge }}</view>
-			</view>
-			<view class="shu"></view>
-			<view class="info-item">
-				<view class="info-font">累计支出</view>
-				<view class="info-num">{{ orderStatusSum }}</view>
-			</view>
-		</view> -->
-		<view class="navbar">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
-		</view>
-		<swiper :current="tabCurrentIndex" :style="{ height: maxheight }" class="swiper-box" duration="300" @change="changeTab">
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
-				<scroll-view scroll-y="true" class="list-scroll-content" @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view>
-						<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-							<view class="title-box">
-								<view class="title">
-									<text>{{ item.title }}</text>
-								</view>
-								<view class="time">
-									<text>{{ item.add_time }}</text>
-								</view>
-							</view>
-							<view class="money">
-								<view>{{ (item.pm == 0 ? '-' : '+') + item.number }}</view>
-								<view v-if="item.status == 0" class="status">待发放</view>
-							</view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType" v-if="!(tabItem.orderList.length == 0 && tabItem.loaded)"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { mapState, mapMutations } from 'vuex';
-import uniLoadMore from '@/uview-ui/components/u-loadmore/u-loadmore.vue';
-import empty from '@/uview-ui/components/u-empty/u-empty.vue';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	components: {
-		empty,
-		uniLoadMore
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					_this.maxheight = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			// 头部图高度
-			maxheight: '',
-			tabCurrentIndex: 0,
-			orderStatusSum: 0,
-			recharge: 0,
-			navList: [
-				{
-					state: 3,
-					text: '收入',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10, //每次信息条数
-					loaded: false
-				},
-				{
-					state: 4,
-					text: '支出',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10, //每次信息条数
-					loaded: false
-				}
-			],
-			money: ''
-		};
-	},
-	onLoad(options) {},
-	onShow() {
-		this.loadData();
-	},
-	methods: {
-		// 页面跳转
-		navto(e) {
-			uni.navigateTo({
-				url: e
-			});
-		},
-		// 点击返回 我的页面
-		toBack() {
-			uni.navigateBack({});
-		},
-		//获取收入支出信息
-		async loadData(source) {
-			let obj = this;
-			//这里是将订单挂载到tab列表下
-			let index = this.tabCurrentIndex;
-			let navItem = this.navList[index];
-			let state = navItem.state;
-			if (source === 'tabChange' && navItem.loaded === true) {
-				//tab切换只有第一次需要加载数据
-				return;
-			}
-			if (navItem.loadingType === 'loading') {
-				//防止重复加载
-				return;
-			}
-			// 修改当前对象状态为加载中
-			navItem.loadingType = 'loading';
-
-			spreadCommission(
-				{
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				state
-			)
-				.then(({ data }) => {
-					console.log(data);
-					// obj.recharge = data.income;
-					// obj.orderStatusSum = data.expend;
-					if (data.length > 0) {
-						navItem.orderList = navItem.orderList.concat(data[0].list);
-						console.log(navItem.orderList);
-						navItem.page++;
-					} else {
-						navItem.loadingType = 'noMore';
-					}
-					if (navItem.limit == data[0].list.length) {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						//判断是否还有数据， 有改为 more， 没有改为noMore
-						navItem.loadingType = 'noMore';
-					}
-					uni.hideLoading();
-					this.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadData('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #f1f1f1;
-	height: 100%;
-}
-.status_bar {
-	height: var(--status-bar-height);
-	width: 100%;
-}
-.content-money {
-	position: relative;
-	height: 480rpx;
-	.content-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 750rpx;
-		height: 480rpx;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-	.body-title {
-		height: 80rpx;
-		text-align: center;
-		font-size: 35rpx;
-		position: relative;
-		.header {
-			position: absolute;
-			left: 0;
-			top: 0;
-			width: 100%;
-			font-size: 36rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #fffeff;
-			height: 80rpx;
-			font-size: 36rpx;
-			font-weight: 700;
-			z-index: 9;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-		}
-		.goback-box {
-			position: absolute;
-			left: 18rpx;
-			top: 0;
-			height: 80rpx;
-			display: flex;
-			align-items: center;
-		}
-
-		.goback {
-			z-index: 100;
-			width: 34rpx;
-			height: 34rpx;
-		}
-	}
-}
-.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;
-	position: relative;
-	z-index: 2;
-	.info-item {
-		width: 50%;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		line-height: 1;
-		.info-font {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #999999;
-		}
-		.info-num {
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #181818;
-		}
-	}
-	.shu {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdfe6;
-	}
-}
-.money-box {
-	position: relative;
-	z-index: 2;
-	padding-top: 90rpx;
-	color: #ffffff;
-	text-align: center;
-	.money {
-		font-size: 72rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-	.text {
-		font-size: 30rpx;
-	}
-}
-.money-btn {
-	position: relative;
-	z-index: 2;
-	color: #ffffff;
-	padding-right: 50rpx;
-	text-align: right;
-	font-size: 30rpx;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #ffffff;
-	text {
-		display: inline-block;
-		padding-left: 10rpx;
-	}
-}
-
-.navbar {
-	margin-top: 20rpx;
-	display: flex;
-	height: 88rpx;
-	padding: 0 5px;
-	background: #fff;
-	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
-	position: relative;
-	z-index: 10;
-	.nav-item {
-		flex: 1;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 100%;
-		font-size: 15px;
-		color: #999999;
-		position: relative;
-		&.current {
-			color: #000;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #fe5b38;
-			}
-		}
-	}
-}
-//列表
-.swiper-box {
-	.order-item:last-child {
-		margin-bottom: 60rpx;
-	}
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-		.title-box {
-			.title {
-				font-size: $font-lg;
-				color: $font-color-base;
-			}
-			.time {
-				font-size: $font-base;
-				color: $font-color-light;
-			}
-		}
-		.money {
-			color: #fd5b23;
-			font-size: $font-lg;
-			text-align: right;
-			.status {
-				color: $font-color-light;
-			}
-		}
-	}
-}
-.list-scroll-content {
-	background: #ffffff;
-	height: 100%;
-}
-.content {
-	height: 100%;
-	.empty-content {
-		background-color: #ffffff;
-	}
-}
-.btn-box {
-	width: 674rpx;
-	height: 88rpx;
-	background: linear-gradient(0deg, #2e58ff, #32c6ff);
-	border-radius: 44rpx;
-	font-size: 36rpx;
-	font-family: PingFang SC;
-	font-weight: 500;
-	color: #ffffff;
-	text-align: center;
-	line-height: 88rpx;
-	position: fixed;
-	bottom: 48rpx;
-	left: 0;
-	right: 0;
-	margin: 0 auto;
-}
-</style>

pages/user/user.vue

@@ -5,7 +5,8 @@
 			<view class="userinfo">
 				<view class="user-info" @click="navTo('/pages/set/set')">
 					<view class="avatar">
-						<image class="avatarimg" :src="userInfo.avatar || '/static/error/missing-face.png'" mode=""></image>
+						<image class="avatarimg" :src="userInfo.avatar || '/static/error/missing-face.png'" mode="">
+						</image>
 						<image v-if="sm != 0" class="real" src="../../static/img/real.png" mode=""></image>
 					</view>
 					<view class="name">{{ userInfo.nickname || '游客' }}</view>
@@ -19,7 +20,8 @@
 				</view>
 				<view class="sy-box flex">
 					<view class="sy-item" @click="navTo('/pages/user/mygs')">
-						<view class="sy-item-val">{{ userInfo.brokeage_price > 0 ? userInfo.brokeage_price : '0' }}</view>
+						<view class="sy-item-val">{{ userInfo.brokeage_price > 0 ? userInfo.brokeage_price : '0' }}
+						</view>
 						<view class="sy-item-name">我的奖金</view>
 					</view>
 					<view class="jg"></view>
@@ -35,25 +37,8 @@
 				</view>
 			</view>
 		</view>
-		<!-- <view class="qd-box flex">
-			<image src="../../static/icon/uqd.png" mode=""></image>
-			<view class="qd-info">
-				<view class="" style="font-weight: bold;color: #0C1732;">签到领取积分</view>
-				<view class="">已连续签到{{ actionDay }}天</view>
-				<view class="">累计签到奖励{{ sum_integral }}趣豆</view>
-			</view>
-			<view class="qd-btn" :class="{ qded: qded }" @click="qded ? '' : goQd()">{{ qded ? '已签到' : '立即签到' }}</view>
-		</view> -->
-		<!-- <view class="tool-box flex">
-			<view class="tool-item flex" v-for="itemt in toolList" :key="itemt.id" @click="useTool(itemt)"
-				v-if="itemt.id != 't7' || userInfo.staff">
-				<view class="tool-item-img">
-					<image :src="itemt.img" mode="widthFix" :style="{ width: itemt.width, height: itemt.height }"
-						class="tool-logo"></image>
-				</view>
-				<view class="tool-item-name">{{ itemt.name }}</view>
-			</view>
-		</view> -->
+
+
 		<uni-list class="tool-list margin-t-30">
 			<uni-list-item class="item" title="邀请好友" @click="navTo('/pages/user/shareQrCode')"
 				thumb="/static/icon/user_pick.png"></uni-list-item>
@@ -61,8 +46,10 @@
 				thumb="/static/icon/user_name.png"></uni-list-item>
 			<uni-list-item class="item" title="收款信息" @click="navTo('/pages/collection/collection')"
 				thumb="/static/icon/user_page.png"></uni-list-item>
-			<uni-list-item class="item" title="客服" @click="openKf()" thumb="/static/icon/user_serve.png"></uni-list-item>
-			<uni-list-item class="item" title="设置" @click="navTo('/pages/set/set')" thumb="/static/icon/user_set.png"></uni-list-item>
+			<uni-list-item class="item" title="客服" @click="openKf()"
+				thumb="/static/icon/user_serve.png"></uni-list-item>
+			<uni-list-item class="item" title="设置" @click="navTo('/pages/set/set')"
+				thumb="/static/icon/user_set.png"></uni-list-item>
 		</uni-list>
 		<!-- <view class="page-btm" style="padding-top: 20rpx;">©2022 杭州尚视拍卖有限公司 版权所有</view>
 		<view class="page-btm" style="padding-bottom: 10rpx;">浙ICP备2022017146号-2</view> -->
@@ -150,64 +137,6 @@
 				tom_type: '', //签到获得的数值单位
 				userDowm: 0, //卡片升级专属高度
 				userMaxDowm: 0, //卡片最高高度
-				toolList: [
-					// {
-					// 	id: 't1',
-					// 	name: '新人通道',
-					// 	width: '56rpx',
-					// 	heigt: '54rpx',
-					// 	img: '../../static/icon/tool-1.png',
-					// 	path: '/pages/user/xrtd'
-					// },
-					{
-						id: 't2',
-						name: '邀请好友',
-						width: '56rpx',
-						heigt: '57rpx',
-						img: '../../static/icon/tool-2.png',
-						path: '/pages/user/shareQrCode'
-					},
-					{
-						id: 't3',
-						name: '我的粉丝',
-						width: '68rpx',
-						heigt: '53rpx',
-						img: '../../static/icon/tool-3.png',
-						path: '/pages/user/myfans'
-					},
-					{
-						id: 't4',
-						name: '我的订单',
-						width: '55rpx',
-						heigt: '54rpx',
-						img: '../../static/icon/tool-4.png',
-						path: '/pages/order/index'
-					},
-					{
-						id: 't5',
-						name: '我的商品',
-						width: '50rpx',
-						heigt: '58rpx',
-						img: '../../static/icon/tool-5.png',
-						path: '/pages/user/myproduct'
-					},
-					{
-						id: 't6',
-						name: '馆长申请',
-						width: '59rpx',
-						heigt: '56rpx',
-						img: '../../static/icon/tool-6.png',
-						path: '/pages/user/gzsq'
-					},
-					{
-						id: 't7',
-						name: '我的金豆',
-						width: '59rpx',
-						heigt: '56rpx',
-						img: '../../static/icon/jindou.png',
-						path: '/pages/user/myyue'
-					}
-				]
 			};
 		},
 		onShow() {
@@ -347,83 +276,14 @@
 					// 登录拦截
 					interceptor();
 				} else {
-					if (url == '/pages/user/approve') {
-						rate({})
-							.then(e => {
-								console.log(e);
-								if (e.data.is_auth == null) {
-									uni.navigateTo({
-										url
-									});
-								}
-								if (e.data.is_auth == 0) {
-									uni.navigateTo({
-										url
-									});
-								}
-								if (e.data.is_auth == 1) {
-									this.$api.msg('正在审核中请耐心等待');
-								}
-								if (e.data.is_auth == 2) {
-									this.$api.msg('已通过实名认证，无需再实名认证');
-								}
-								if (e.data.is_auth == 3) {
-									uni.showModal({
-										title: '提示',
-										content: '申请失败,原因' + e.data.off + '是否重新申请',
-										success: function(res) {
-											if (res.confirm) {
-												uni.navigateTo({
-													url
-												});
-											} else if (res.cancel) {
-												console.log('用户点击取消');
-											}
-										}
-									});
-								}
-							})
-							.catch(e => {
-								return;
+					uni.navigateTo({
+						url,
+						fail() {
+							uni.switchTab({
+								url
 							});
-					} else if (url == '/pages/user/gzsq') {
-						apply_status({})
-							.then(e => {
-								if (e.data.status != 0) {
-									if (e.data.status == 3) {
-										uni.showModal({
-											title: '提示',
-											content: '申请失败是否重新申请',
-											success: function(res) {
-												if (res.confirm) {
-													uni.navigateTo({
-														url
-													});
-												} else if (res.cancel) {
-													console.log('用户点击取消');
-												}
-											}
-										});
-									} else {
-										obj.$api.msg(e.data.str);
-									}
-								} else {
-									uni.navigateTo({
-										url
-									});
-								}
-							})
-							.catch(e => {});
-					} else {
-						uni.navigateTo({
-							url,
-							fail() {
-								uni.switchTab({
-									url
-								});
-							}
-						});
-					}
+						}
+					});
 				}
 			},
 			useTool(e) {
@@ -732,10 +592,11 @@
 
 	.user-top {
 		background-image: url("../../static/img/use-bg.png");
-		background-size:750rpx auto;
+		background-size: 750rpx auto;
 		background-repeat: no-repeat;
 		padding: 60rpx 30rpx 0rpx 30rpx;
-		.userinfo{
+
+		.userinfo {
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
 		}
@@ -752,6 +613,7 @@
 				height: 134rpx;
 				border-radius: 50%;
 				overflow: hidden;
+
 				.avatarimg {
 					width: 134rpx;
 					height: 134rpx;
@@ -838,6 +700,7 @@
 		.sy-box {
 			bottom: 105rpx;
 			height: 148rpx;
+
 			.sy-item {
 				flex-grow: 1;
 				text-align: center;
@@ -912,6 +775,7 @@
 		margin-top: -100rpx;
 		z-index: 10;
 		position: relative;
+
 		.tool-item {
 			width: 20%;
 			height: 120rpx;
@@ -953,7 +817,8 @@
 		width: 690rpx;
 		margin: auto;
 		background: transparent;
-		.item{
+
+		.item {
 			background: #ffffff;
 			border-radius: 20rpx;
 			box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);

store/index.js

@@ -7,7 +7,7 @@ const store = new Vuex.Store({
 	namespaced: true,
 	state: {
 		// baseURL: 'https://www.shangshiyiqu.com', //地址配置
-		baseURL: 'http://jp.frp.qiniu1314.com', //测试地址配置
+		baseURL: 'https://xx.accle.shop', //测试地址配置
 		urlFile: '/index', //项目部署所在文件夹
 		userInfo: {}, //登录信息
 		loginInterceptor: false, //是否打开强制登录

utils/loginUtils.js

@@ -10,10 +10,10 @@ export function interceptor() {
 	let url = '/pages/public/login'
 	// #ifdef H5
 	// 判断是否为公众号调用微信授权登录
-	let weichatBrowser = uni.getStorageSync('weichatBrowser');
-	if (weichatBrowser) {
-		url = '/pages/public/wxLogin';
-	}
+	// let weichatBrowser = uni.getStorageSync('weichatBrowser');
+	// if (weichatBrowser) {
+	// 	url = '/pages/public/wxLogin';
+	// }
 	// #endif
 	// #ifdef MP-WEIXIN
 	url = '/pages/public/wxLogin';