hwq 2 years ago
parent
commit
f135a03f36
57 changed files with 296 additions and 61 deletions
  1. 18 0
      api/order.js
  2. 15 6
      pages/hall/hallinfo.vue
  3. 1 1
      pages/hall/halllist.vue
  4. 119 10
      pages/hall/hallpay.vue
  5. 4 3
      pages/money/paySuccess.vue
  6. 34 4
      pages/money/success.vue
  7. 92 24
      pages/order/order.vue
  8. 12 12
      pages/public/login.vue
  9. BIN
      unpackage/dist/build/h5/h5.rar
  10. 1 1
      unpackage/dist/build/h5/index.html
  11. 0 0
      unpackage/dist/build/h5/static/js/index.5e2f6032.js
  12. 0 0
      unpackage/dist/build/h5/static/js/index.9069f88a.js
  13. 0 0
      unpackage/dist/build/h5/static/js/pages-collection-wx.55b5ec0f.js
  14. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-gsell.428c79b2.js
  15. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-hall.3cd756a0.js
  16. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-hall.4d88e85d.js
  17. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-hallinfo.2d642a4a.js
  18. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-hallinfo.4ea8490b.js
  19. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-halllist.636b886c.js
  20. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-halllist.89cafa64.js
  21. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-halllist~pages-hall-hallpay~pages-hall-porducthall~pages-set-addressManage~pages-set-userinfo.e33a5def.js
  22. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-halllist~pages-hall-porducthall~pages-set-addressManage~pages-set-userinfo.9d83533e.js
  23. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-halllist~pages-index-index.9436e9c9.js
  24. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-halllist~pages-index-index.c06a1545.js
  25. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-hallpay.0448382c.js
  26. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-hallpay.8b8e36cb.js
  27. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-history.6c4063ee.js
  28. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-history.b1c0586b.js
  29. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-porducthall.4e131b4f.js
  30. 0 0
      unpackage/dist/build/h5/static/js/pages-hall-porducthall.4fe3069d.js
  31. 0 0
      unpackage/dist/build/h5/static/js/pages-index-sign.6deac65a.js
  32. 0 0
      unpackage/dist/build/h5/static/js/pages-index-sign.77f674e2.js
  33. 0 0
      unpackage/dist/build/h5/static/js/pages-money-pay.73efa015.js
  34. 0 0
      unpackage/dist/build/h5/static/js/pages-money-paySuccess.7276e233.js
  35. 0 0
      unpackage/dist/build/h5/static/js/pages-money-paySuccess.fb49ce76.js
  36. 0 0
      unpackage/dist/build/h5/static/js/pages-money-success.6d1ba76a.js
  37. 0 0
      unpackage/dist/build/h5/static/js/pages-money-success.bb45cb6c.js
  38. 0 0
      unpackage/dist/build/h5/static/js/pages-order-createOrder.dd39fbec.js
  39. 0 0
      unpackage/dist/build/h5/static/js/pages-order-evaluate.06d4083e.js
  40. 0 0
      unpackage/dist/build/h5/static/js/pages-order-expressInfo.3083b546.js
  41. 0 0
      unpackage/dist/build/h5/static/js/pages-order-order.77b63fbe.js
  42. 0 0
      unpackage/dist/build/h5/static/js/pages-order-order.d8b815a7.js
  43. 0 0
      unpackage/dist/build/h5/static/js/pages-order-order1.71919450.js
  44. 0 0
      unpackage/dist/build/h5/static/js/pages-order-orderDetail.dfbe041c.js
  45. 0 0
      unpackage/dist/build/h5/static/js/pages-order-orderRefund.b840980f.js
  46. 0 0
      unpackage/dist/build/h5/static/js/pages-order-orderRefund.fc034fd5.js
  47. 0 0
      unpackage/dist/build/h5/static/js/pages-public-login.3840809b.js
  48. 0 0
      unpackage/dist/build/h5/static/js/pages-public-login.74738e2b.js
  49. 0 0
      unpackage/dist/build/h5/static/js/pages-set-userinfo.5f735597.js
  50. 0 0
      unpackage/dist/build/h5/static/js/pages-user-approve.f0e57460.js
  51. 0 0
      unpackage/dist/build/h5/static/js/pages-user-gzsq.6009be36.js
  52. 0 0
      unpackage/dist/build/h5/static/js/pages-user-gzsq.73cb979c.js
  53. 0 0
      unpackage/dist/build/h5/static/js/pages-user-mygs.3c362572.js
  54. 0 0
      unpackage/dist/build/h5/static/js/pages-user-myproduct.26f3ac2b.js
  55. 0 0
      unpackage/dist/build/h5/static/js/pages-user-myproduct.43a3350a.js
  56. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.59f1ac87.js
  57. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.79b6d3be.js

+ 18 - 0
api/order.js

@@ -179,3 +179,21 @@ export function up_image(data) {
 		data
 	});
 }
+
+// 取消挂售
+export function cancel(data) {
+	return request({
+		url: '/api/auction/cancel',
+		method: 'post',
+		data
+	});
+}
+
+//判断是否有新订单
+export function untreated(data) {
+	return request({
+		url: '/api/auction/untreated',
+		method: 'get',
+		data
+	});
+}

+ 15 - 6
pages/hall/hallinfo.vue

@@ -28,6 +28,9 @@
 						<text class="font-size-sm">¥</text>
 						{{ item.hanging_price }}
 					</view>
+					<view class="over" v-if="item.status == 2">
+						已售罄
+					</view>
 				</view>
 			</view>
 		</view>
@@ -55,6 +58,9 @@ export default {
 		this.id = option.id
 		this.loadData();
 	},
+	onShow() {
+		this.loadData();
+	},
 	methods: {
 		search() {
 			this.firstList = [];
@@ -95,6 +101,9 @@ export default {
 			});
 		},
 		navToDetailPage(item) {
+			if(item.status == '2'){
+				return this.$api.msg('已售罄')
+			}
 			uni.navigateTo({
 				url:'/pages/hall/porducthall?id=' + item.id
 			})
@@ -229,18 +238,18 @@ page {
 			display: flex;
 			justify-content: space-between;
 			padding: 0 16rpx 12rpx;
-
+			align-items: center;
 			.price {
 				font-size: 40rpx;
 				color: #ff0000;
 				font-weight: 500;
 			}
-			.cart-icon {
-				image {
-					width: 44rpx;
-					height: 44rpx;
-				}
+			.over {
+				font-size: 24rpx;
+				color: #a199a1;
+				font-weight: 500;
 			}
+			
 		}
 	}
 }

+ 1 - 1
pages/hall/halllist.vue

@@ -210,7 +210,7 @@ export default {
 						console.log(e, 'success');
 						this.nav();
 					})
-					.then(e => {
+					.catch(e => {
 						console.log(e, 'fail');
 					});
 			} else {

+ 119 - 10
pages/hall/hallpay.vue

@@ -128,17 +128,33 @@
 		</view>
 		<view class="contentBottomHeight"></view>
 		<view class="bottom flex">
-			<view class="bottom-item" @click="tocall()">
+			<view class="bottom-item" @click.stop="tocall()">
 				<image class="bi-image" src="../../static/img/call.png" mode=""></image>
 				<view class="bottom-font">联系卖家</view>
 			</view>
 			<view class="shu"></view>
-			<view class="bottom-item">
+			<view class="bottom-item" @click.stop="openKf()">
 				<image class="bi-image" src="../../static/img/kf.png" mode=""></image>
 				<view class="bottom-font">联系客服</view>
 			</view>
-			<view class="btn" @click="buy()">立即购买</view>
+			<view class="btn" @click.stop="buy()">立即购买</view>
 		</view>
+		<uni-popup ref="popupkf" type="center">
+			<view class="popup-box">
+				<view class="img"><image src="../../static/img/img009.png" mode=""></image></view>
+				<view class="mian">
+					<view class="delivery">
+						<view class="title">已经为您定制专属客服</view>
+						<image src="../../static/img/img010.png" mode=""></image>
+					</view>
+					<view class="nocancel">客服VX:{{ text }}</view>
+					<view class="comfirm-box">
+						<view class="cancel" @click="cancel">取消</view>
+						<view class="comfirm" @click="copy(text)">复制微信</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -165,7 +181,8 @@ export default {
 			bank: '',
 			wx: '',
 			zfb: '',
-			image: ''
+			image: '',
+			text: '123456'
 		};
 	},
 	onLoad(option) {
@@ -201,12 +218,6 @@ export default {
 				console.log(this.tabCurrentIndex);
 			});
 		},
-		open() {
-			this.$refs.popup.open();
-		},
-		close() {
-			this.$refs.popup.close();
-		},
 		nav(url) {
 			uni.navigateTo({
 				url
@@ -246,6 +257,14 @@ export default {
 		change(num) {
 			this.tabCurrentIndex = num * 1;
 		},
+		// 打开客服
+		openKf() {
+			this.$refs.popupkf.open();
+		},
+		// 关闭客服
+		cancel() {
+			this.$refs.popupkf.close();
+		},
 		buy() {
 			if (this.image == '') {
 				return this.$api.msg('请上传支付凭证');
@@ -497,4 +516,94 @@ export default {
 .contentBottomHeight {
 	height: 150rpx;
 }
+.popup-box {
+	width: 522rpx;
+	height: 605rpx;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	position: relative;
+
+	.img {
+		position: relative;
+		top: -56rpx;
+		left: 0;
+		width: 522rpx;
+		height: 132rpx;
+		display: flex;
+		justify-content: center;
+
+		image {
+			border-radius: 20rpx 20rpx 0 0;
+			width: 450rpx;
+			height: 132rpx;
+		}
+	}
+
+	.mian {
+		margin-top: -44rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		// padding: 32rpx 32rpx;
+		background-color: #ffffff;
+		border-radius: 0 0 20rpx 20rpx;
+		text-align: center;
+
+		.delivery {
+			font-size: 40rpx;
+			color: #333333;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+
+			.title {
+			}
+
+			image {
+				margin-top: 48rpx;
+				width: 172rpx;
+				height: 160rpx;
+			}
+		}
+
+		.nocancel {
+			font-size: 32rpx;
+			color: #333333;
+			margin-top: 14rpx;
+		}
+
+		.comfirm-box {
+			margin-top: 52rpx;
+			display: flex;
+			// margin-bottom: 32rpx;
+
+			// justify-content: space-around;
+			.cancel {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 197rpx;
+				height: 74rpx;
+				border: 1px solid #dcc786;
+				border-radius: 38rpx;
+
+				font-size: 32rpx;
+				color: #605128;
+			}
+
+			.comfirm {
+				margin-left: 32rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 197rpx;
+				height: 74rpx;
+				background: linear-gradient(-90deg, #d1ba77 0%, #f7e8ad 100%);
+				border-radius: 38px;
+				font-size: 32rpx;
+				color: #605128;
+			}
+		}
+	}
+}
 </style>

+ 4 - 3
pages/money/paySuccess.vue

@@ -1,11 +1,12 @@
 <template>
 	<view class="content">
 		<text class="success-icon iconfont iconroundcheck"></text>
-		<text class="tit">支付成功</text>
+		<text class="tit">{{ type == 1? '抢购成功' : '支付成功'}}</text>
 		<view class="btn-group">
 			<navigator v-if="type == '1' " :url="'/pages/order/order'" open-type="redirect" class="mix-btn">查看订单</navigator>
 			<navigator v-else :url="'/pages/order/orderDetail?id='+orderId" open-type="redirect" class="mix-btn">查看订单</navigator>
-			<navigator url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
+			<navigator v-if="type == '1' " :url="'/pages/order/order'" open-type="redirect" class="mix-btn">返回抢画列表</navigator>
+			<navigator v-else url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
 		</view>
 	</view>
 </template>
@@ -40,7 +41,7 @@
 	}
 	.success-icon{
 		font-size: 160upx;
-		color: #5dbc7c;
+		color: #d13737;
 		margin-top: 100upx;
 	}
 	.tit{

+ 34 - 4
pages/money/success.vue

@@ -3,7 +3,10 @@
 		<view class="re-succ-box">
 			<image class="re-succ-img" src="../../static/img/success.png"></image>
 			<view class="re-succ-tit">{{type ==2? '挂售成功' : '提交成功'}}</view>
-			<view class="re-succ-btn" @click="goBack()">返回首页</view>
+			<view class="btn-box flex">
+				<view class="re-succ-btn" @click="goBack()">返回首页</view>
+				<view class="go-btn " @click="go()">{{ type == 2? '返回挂售' : '返回支付'}}</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -25,6 +28,17 @@ export default {
 			uni.switchTab({
 				url: '/pages/index/index'
 			})
+		},
+		go() {
+			let url
+			if(this.type == 1){
+				url = '/pages/order/order?state=1'
+			}else if(this.type == 2) {
+				url = '/pages/order/order?state=3'
+			}
+			uni.navigateTo({
+				url: url
+			})
 		}
 	}
 }
@@ -60,10 +74,13 @@ page {
 			font-weight: 500;
 			color: #333333;
 		}
-		.re-succ-btn {
-			
+		.btn-box{
+			width: 750rpx;
 			margin-top: 80rpx;
-			width: 350rpx;
+			padding: 0 50rpx;
+		}
+		.re-succ-btn {
+			width: 300rpx;
 			height: 80rpx;
 			background: linear-gradient(180deg, #FD4646, #FF3535);
 			border-radius: 40rpx;
@@ -75,6 +92,19 @@ page {
 			align-items: center;
 			justify-content: center;
 		}
+		.go-btn {
+			width: 300rpx;
+			height: 80rpx;
+			border: 1px solid #FD4646;
+			border-radius: 40rpx;
+			font-size: 36rpx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #FD4646;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
 	}
 }
 </style>

+ 92 - 24
pages/order/order.vue

@@ -10,11 +10,15 @@
 			</view>
 		</view>
 		<view class="navbar" v-show="currentIndex == 0">
-			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index, 0)">{{ item.text }}</view>
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index, 0)">
+				{{ item.text }}
+				<view class="dian" v-if="tabCurrentIndex != index && item.isnew == 2"></view>
+			</view>
 		</view>
 		<view class="navbar" v-show="currentIndex == 1">
 			<view v-for="(item, index) in navList1" :key="index" class="nav-item" :class="{ current: tabCurrentIndex1 === index }" @click="tabClick(index, 1)">
 				{{ item.text }}
+				<view class="dian" v-if="tabCurrentIndex1 != index && item.isnew == 2"></view>
 			</view>
 		</view>
 
@@ -63,7 +67,7 @@
 					<!-- 订单列表 -->
 					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
 						<view class="i-top b-b">
-							<text class="time">{{ item.order_id }}</text>
+							<text class="time">{{ item.order_id ? item.order_id : item.order }}</text>
 							<text class="state" :style="{ color: item.stateTipColor }">{{ item.stateTip }}</text>
 						</view>
 						<view class="goods-box-single">
@@ -78,12 +82,20 @@
 						</view>
 
 						<view class="buy-box">
-							<view class="buy-info" v-if="item.status != 0">
+							<view class="buy-info" v-if="item.status != 0 && item.status">
 								<view class="font">买家:</view>
 								<image class="avter" :src="item.avatar" mode=""></image>
 								<view class="buy-name">{{ item.nickname }}</view>
 								<view class="phone">{{ item.phone }}</view>
 							</view>
+							<view v-if="!item.status">
+								<view class="buy-info">
+									<view class="font">挂售价格:{{ item.hanging_price }}</view>
+								</view>
+								<view class="buy-info">
+									<view class="font">挂售时间:{{ item.update_time }}</view>
+								</view>
+							</view>
 						</view>
 						<view class="upimg" v-if="item.status == 2 || item.status == 3">
 							<view class="up-tit">打款凭证:</view>
@@ -95,6 +107,10 @@
 							<!-- <button @click.stop="orderPay(item)" class="refuse recom">拒绝</button> -->
 							<button @click.stop="orderPay(item)" class="action-btn recom">通过</button>
 						</view>
+						<view class="action-box b-t" v-if="!item.status">
+							<!-- <button @click.stop="orderPay(item)" class="refuse recom">拒绝</button> -->
+							<button @click.stop="cancel(item)" class="action-btn recom">取消挂售</button>
+						</view>
 					</view>
 
 					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
@@ -108,7 +124,7 @@
 <script>
 import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 import empty from '@/components/empty';
-import { orderList, orderCancel, orderDel, orderTake, adopt, user_auction_order, seller } from '@/api/order.js';
+import { orderList, orderCancel, orderDel, orderTake, adopt, user_auction_order, seller, cancel, untreated } from '@/api/order.js';
 import { tabbar } from '@/utils/tabbar.js';
 export default {
 	components: {
@@ -137,6 +153,7 @@ export default {
 					text: '已过期',
 					loadingType: 'more',
 					orderList: [],
+					isnew:1,//判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -145,6 +162,7 @@ export default {
 					text: '待支付',
 					loadingType: 'more',
 					orderList: [],
+					isnew:1,//判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -153,6 +171,7 @@ export default {
 					text: '待审核',
 					loadingType: 'more',
 					orderList: [],
+					isnew:1,//判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -161,6 +180,7 @@ export default {
 					text: '待挂售',
 					loadingType: 'more',
 					orderList: [],
+					isnew:1,//判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -169,6 +189,7 @@ export default {
 					text: '已完成',
 					loadingType: 'more',
 					orderList: [],
+					isnew:1,//判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				}
@@ -179,6 +200,16 @@ export default {
 					text: '已过期',
 					loadingType: 'more',
 					orderList: [],
+					isnew:1,//判断是否有新的订单
+					page: 1, //当前页数
+					limit: 10 //每次信息条数
+				},
+				{
+					state: 4,
+					text: '售卖中',
+					loadingType: 'more',
+					orderList: [],
+					isnew:1,//判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -187,6 +218,7 @@ export default {
 					text: '待支付',
 					loadingType: 'more',
 					orderList: [],
+					isnew:1,//判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -195,6 +227,7 @@ export default {
 					text: '待审核',
 					loadingType: 'more',
 					orderList: [],
+					isnew:1,//判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				},
@@ -203,6 +236,7 @@ export default {
 					text: '已完成',
 					loadingType: 'more',
 					orderList: [],
+					isnew:1,//判断是否有新的订单
 					page: 1, //当前页数
 					limit: 10 //每次信息条数
 				}
@@ -225,14 +259,10 @@ export default {
 		 * 替换onLoad下代码即可
 		 */
 		this.tabCurrentIndex = +options.state || 0;
-		// #ifndef MP
+	},
+	onShow() {
 		this.loadData();
-		// #endif
-		// #ifdef MP
-		if (options.state == 0) {
-			this.loadData();
-		}
-		// #endif
+		this.upData();
 	},
 	// #ifdef APP-PLUS || H5
 	onBackPress(e) {
@@ -287,6 +317,20 @@ export default {
 		moneyNum(value) {
 			return +value;
 		},
+		upData() {
+			untreated().then(({ data }) => {
+				console.log(data);
+				if(data.user.hanging != 0){
+					this.navList[3].isnew = 2
+				}
+				if(data.user.paid != 0){
+					this.navList[1].isnew = 2
+				}
+				if(data.seller.reviewed != 0) {
+					this.navList1[3].isnew = 2
+				} 
+			});
+		},
 		// 查看大图
 		lookimg(src) {
 			console.log(src);
@@ -337,13 +381,19 @@ export default {
 		},
 		gsell(item) {
 			uni.navigateTo({
-				url: '/pages/hall/gsell?id=' + item.id
+				url: '/pages/hall/gsell?id=' + item.product_id
 			});
 		},
 		orderPay(e) {
-			console.log(e);
 			adopt({ order_id: e.order_id }).then(({ data }) => {
-				this.loadData();
+				console.log('1111');
+				this.loadData('reload');
+			});
+		},
+		cancel(e) {
+			cancel({ id: e.id }).then(({ data }) => {
+				this.loadData('reload');
+				this.upData()
 			});
 		},
 		//获取订单列表
@@ -360,6 +410,12 @@ export default {
 			}
 
 			let state = navItem.state;
+			if (source == 'reload') {
+				navItem.orderList = [];
+				navItem.page = 1;
+				navItem.limit = 10;
+				navItem.loadingType = 'more';
+			}
 			if (source === 'tabChange' && navItem.loaded === true) {
 				//tab切换只有第一次需要加载数据
 				return;
@@ -383,17 +439,17 @@ export default {
 					.then(({ data }) => {
 						let arr = data.map(e => {
 							console.log(state == 4);
-							if(state == 4) {
+							if (state == 4) {
 								e.stateTip = '待挂售';
 								e.stateTipColor = '#fa436a';
-							}else {
+							} else {
 								let b = this.orderStateExp(e.status);
 								e.stateTip = b.stateTip;
 								e.stateTipColor = b.stateTipColor;
 							}
 							return e;
 						});
-						console.log(arr,"123456");
+						console.log(arr, '123456');
 						navItem.orderList = navItem.orderList.concat(arr);
 
 						// console.log(navItem.orderList);
@@ -422,9 +478,14 @@ export default {
 					.then(({ data }) => {
 						console.log(data);
 						let arr = data.map(e => {
-							let b = this.orderStateExp(e.status);
-							e.stateTip = b.stateTip;
-							e.stateTipColor = b.stateTipColor;
+							if (state == 4) {
+								e.stateTip = '售卖中';
+								e.stateTipColor = '#fa436a';
+							} else {
+								let b = this.orderStateExp(e.status);
+								e.stateTip = b.stateTip;
+								e.stateTipColor = b.stateTipColor;
+							}
 							return e;
 						});
 						navItem.orderList = navItem.orderList.concat(arr);
@@ -655,7 +716,15 @@ page,
 		font-size: 15px;
 		color: $font-color-dark;
 		position: relative;
-
+		.dian {
+			position: absolute;
+			top: 20rpx;
+			right: 10rpx;
+			width: 8rpx;
+			height: 8rpx;
+			border-radius: 50%;
+			background-color: $base-color;
+		}
 		&.current {
 			color: $base-color;
 
@@ -792,13 +861,12 @@ page,
 		}
 	}
 	.buy-box {
-		height: 84rpx;
-		padding: 0 22rpx;
+		padding: 10rpx 22rpx;
 		background-color: #ffffff;
 		.buy-info {
-			height: 100%;
 			display: flex;
 			align-items: center;
+			margin-top: 20rpx;
 			.font {
 				font-size: 32rpx;
 				font-family: PingFang SC;

+ 12 - 12
pages/public/login.vue

@@ -202,20 +202,20 @@ export default {
 						obj.login();
 						// 保存返回用户数据
 						obj.setUserInfo(e.data);
-						let ur = uni.getStorageSync('present')|| '/pages/index/index';
+						// let ur = uni.getStorageSync('present')|| '/pages/index/index';
 						//成功跳转首页
 						uni.switchTab({
-							url: ur,
-							fail(e) {
-								uni.navigateTo({
-									url: ur,
-									fail(e) {
-										uni.navigateTo({
-											url: '/pages/index/index',
-										});
-									}
-								});
-							}
+							url: "/pages/index/index",
+							// fail(e) {
+							// 	uni.navigateTo({
+							// 		url: ur,
+							// 		fail(e) {
+							// 			uni.navigateTo({
+							// 				url: '/pages/index/index',
+							// 			});
+							// 		}
+							// 	});
+							// }
 						});
 					});
 				})

BIN
unpackage/dist/build/h5/h5.rar


+ 1 - 1
unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d618d095.js></script><script src=/index/static/js/index.9069f88a.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.d618d095.js></script><script src=/index/static/js/index.5e2f6032.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.5e2f6032.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.9069f88a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-collection-wx.55b5ec0f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-gsell.428c79b2.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-hall.3cd756a0.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-hall.4d88e85d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-hallinfo.2d642a4a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-hallinfo.4ea8490b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-halllist.636b886c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-halllist.89cafa64.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-halllist~pages-hall-hallpay~pages-hall-porducthall~pages-set-addressManage~pages-set-userinfo.e33a5def.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-halllist~pages-hall-porducthall~pages-set-addressManage~pages-set-userinfo.9d83533e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-halllist~pages-index-index.9436e9c9.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-halllist~pages-index-index.c06a1545.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-hallpay.0448382c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-hallpay.8b8e36cb.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-history.6c4063ee.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-history.b1c0586b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-porducthall.4e131b4f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-hall-porducthall.4fe3069d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-sign.6deac65a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-sign.77f674e2.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-pay.73efa015.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-paySuccess.7276e233.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-paySuccess.fb49ce76.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-success.6d1ba76a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-money-success.bb45cb6c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-createOrder.dd39fbec.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-evaluate.06d4083e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-expressInfo.3083b546.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-order.77b63fbe.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-order.d8b815a7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-order1.71919450.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-orderDetail.dfbe041c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-orderRefund.b840980f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-order-orderRefund.fc034fd5.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-login.3840809b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-login.74738e2b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-userinfo.5f735597.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-approve.f0e57460.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-gzsq.6009be36.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-gzsq.73cb979c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-mygs.3c362572.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-myproduct.26f3ac2b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-myproduct.43a3350a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-user.59f1ac87.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-user.79b6d3be.js


Some files were not shown because too many files changed in this diff