Browse Source

2023.11.9

zyx 1 năm trước cách đây
mục cha
commit
69b99c293f
97 tập tin đã thay đổi với 19 bổ sung6327 xóa
  1. 17 163
      pages.json
  2. 0 434
      pages/cart/cart.vue
  3. 2 67
      pages/index/index.vue
  4. 0 177
      pages/index/sign.vue
  5. 0 337
      pages/money/money.vue
  6. 0 301
      pages/money/qdwallet.vue
  7. 0 34
      pages/money/qudou.vue
  8. 0 292
      pages/money/quick.vue
  9. 0 259
      pages/money/quickList.vue
  10. 0 279
      pages/money/wallet.vue
  11. 0 295
      pages/product/classify.vue
  12. 0 207
      pages/product/new.vue
  13. 0 278
      pages/product/reply.vue
  14. 0 116
      pages/product/zero.vue
  15. 0 617
      pages/store/shopList.vue
  16. 0 1578
      pages/store/store.vue
  17. 0 464
      pages/user/myAppointment.vue
  18. 0 153
      pages/user/notice.vue
  19. 0 142
      pages/user/sqjl.vue
  20. 0 134
      pages/user/xrtd.vue
  21. BIN
      static/icon/bdjj.png
  22. BIN
      static/icon/call.png
  23. BIN
      static/icon/dh.png
  24. BIN
      static/icon/fhsy.png
  25. BIN
      static/icon/jindou.png
  26. BIN
      static/icon/login_name.png
  27. BIN
      static/icon/login_pw.png
  28. BIN
      static/icon/login_pw2.png
  29. BIN
      static/icon/n1.png
  30. BIN
      static/icon/n2.png
  31. BIN
      static/icon/n3.png
  32. BIN
      static/icon/n4.png
  33. BIN
      static/icon/n5.png
  34. BIN
      static/icon/n6.png
  35. BIN
      static/icon/n7.png
  36. BIN
      static/icon/n8.png
  37. BIN
      static/icon/qudou1.png
  38. BIN
      static/icon/qudou2.png
  39. BIN
      static/icon/qudou3.png
  40. BIN
      static/icon/sh-log.png
  41. BIN
      static/icon/tdjj.png
  42. BIN
      static/icon/team.png
  43. BIN
      static/icon/tool-1.png
  44. BIN
      static/icon/tool-2.png
  45. BIN
      static/icon/tool-3.png
  46. BIN
      static/icon/tool-4.png
  47. BIN
      static/icon/tool-5.png
  48. BIN
      static/icon/tool-6.png
  49. BIN
      static/icon/user_bind.png
  50. BIN
      static/img/afternoon.png
  51. BIN
      static/img/ali.png
  52. BIN
      static/img/aliD.png
  53. BIN
      static/img/arc.png
  54. BIN
      static/img/bank.png
  55. BIN
      static/img/bankD.png
  56. BIN
      static/img/cart.png
  57. BIN
      static/img/delete.png
  58. BIN
      static/img/deletes.png
  59. BIN
      static/img/eveningicon.png
  60. BIN
      static/img/gssy.png
  61. BIN
      static/img/hall-bg.png
  62. BIN
      static/img/img01.png
  63. BIN
      static/img/img12.png
  64. BIN
      static/img/img39.png
  65. BIN
      static/img/img43.png
  66. BIN
      static/img/img45.png
  67. BIN
      static/img/img57.png
  68. BIN
      static/img/img74.png
  69. BIN
      static/img/index-product.png
  70. BIN
      static/img/index-shop.png
  71. BIN
      static/img/indwxWp.png
  72. BIN
      static/img/integration.png
  73. BIN
      static/img/jiantou.png
  74. BIN
      static/img/ling.png
  75. BIN
      static/img/log.png
  76. BIN
      static/img/login-title.png
  77. BIN
      static/img/message.png
  78. BIN
      static/img/money-bg.png
  79. BIN
      static/img/morningicon.png
  80. BIN
      static/img/shua.png
  81. BIN
      static/img/sign-popup.png
  82. BIN
      static/img/sign.png
  83. BIN
      static/img/spfm.png
  84. BIN
      static/img/tongz-bg.png
  85. BIN
      static/img/top-bg.png
  86. BIN
      static/img/user-bg.png
  87. BIN
      static/img/xrtd-bg.png
  88. BIN
      static/img/xrtd-log.png
  89. BIN
      static/img/yongjin-bg.png
  90. BIN
      static/img/zhihuanjuan.png
  91. BIN
      static/index/index06.png
  92. BIN
      static/index/index10.png
  93. BIN
      static/index/index11.png
  94. BIN
      static/index/index13.png
  95. BIN
      static/index/index14.png
  96. BIN
      static/index/shop-banner.png
  97. BIN
      static/money/m05.png

+ 17 - 163
pages.json

@@ -27,26 +27,6 @@
 				}
 			}
 		},
-		{
-			"path": "pages/product/new",
-			"style": {
-				"navigationBarTitleText": "新品",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/index/sign",
-			"style": {
-				"navigationBarTitleText": "每日签到",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
 		{
 			"path": "pages/product/seckill",
 			"style": {
@@ -144,17 +124,7 @@
 				}
 			}
 		},
-		{
-			"path": "pages/product/reply",
-			"style": {
-				"navigationBarTitleText": "商品评价",
-				"app-plus": {
-					"titleNView": {
-						"type": "transparent"
-					}
-				}
-			}
-		},
+		
 		{
 			"path": "pages/product/product",
 			"style": {
@@ -189,33 +159,13 @@
 				"navigationBarTitleText": "商品列表"
 			}
 		},
-		{
-			"path": "pages/product/zero",
-			"style": {
-				"navigationBarTitleText": "0元购",
-				"navigationBarBackgroundColor": "#DC262B",
-				"navigationBarTextStyle": "white"
-
-			}
-		},
-		{
-			"path": "pages/store/store",
-			"style": {
-				"navigationBarTitleText": "同城好店"
-			}
-		},
-		{
-			"path": "pages/store/shopDetail",
-			"style": {
-				"navigationBarTitleText": "好店详情"
-			}
-		},
-		{
-			"path": "pages/store/shopList",
-			"style": {
-				"navigationBarTitleText": "好店列表"
-			}
-		},
+		
+		// {
+		// 	"path": "pages/store/shopDetail",
+		// 	"style": {
+		// 		"navigationBarTitleText": "好店详情"
+		// 	}
+		// },
 		{
 			"path": "pages/index/message",
 			"style": {
@@ -265,17 +215,6 @@
 				"navigationBarTitleText": "搜索"
 			}
 		},
-		{
-			"path": "pages/product/classify",
-			"style": {
-				"navigationBarTitleText": "",
-				"app-plus": {
-					"titleNView": {
-						"type": "none"
-					}
-				}
-			}
-		},
 		{
 			"path": "pages/set/set",
 			"style": {
@@ -311,13 +250,7 @@
 			"style": {
 				"navigationBarTitleText": "修改资料"
 			}
-		}, {
-			"path": "pages/cart/cart",
-			"style": {
-				"navigationBarTitleText": "购物车"
-			}
 		},
-
 		{
 			"path": "pages/user/user",
 			"style": {
@@ -367,20 +300,7 @@
 				}
 			}
 		},
-		{
-			"path": "pages/user/notice",
-			"style": {
-				"navigationBarTitleText": "通知"
-			}
-		},
-
-
-		{
-			"path": "pages/user/xrtd",
-			"style": {
-				"navigationBarTitleText": "新人通道"
-			}
-		},
+	
 		{
 			"path": "pages/user/approve",
 			"style": {
@@ -389,12 +309,7 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
-		{
-			"path": "pages/user/sqjl",
-			"style": {
-				"navigationBarTitleText": "申请记录"
-			}
-		},
+		
 		{
 			"path": "pages/order/index",
 			"style": {
@@ -467,7 +382,8 @@
 			"style": {
 				"navigationBarTitleText": "创建订单"
 			}
-		}, {
+		},
+		{
 			"path": "pages/money/pay",
 			"style": {
 				"navigationBarTitleText": "支付"
@@ -479,30 +395,7 @@
 				"navigationBarTitleText": "支付成功"
 			}
 		},
-		{
-			"path": "pages/money/quick",
-			"style": {
-				"navigationBarTitleText": "闪兑"
-			}
-		},
-		{
-			"path": "pages/money/quickList",
-			"style": {
-				"navigationBarTitleText": "兑换记录"
-			}
-		},
-		{
-			"path": "pages/money/wallet",
-			"style": {
-				"navigationBarTitleText": "易趣卷转账"
-			}
-		},
-		{
-			"path": "pages/money/qdwallet",
-			"style": {
-				"navigationBarTitleText": "易豆转账"
-			}
-		},
+	
 		{
 			"path": "pages/money/withdrawal",
 			"style": {
@@ -515,30 +408,7 @@
 				"navigationBarTitleText": "充值"
 			}
 		},
-		{
-			"path": "pages/category/category",
-			"style": {
-				// #ifdef APP-PLUS
-				"navigationStyle": "custom",
-				// #endif
-				// #ifndef MP
-				"app-plus": {
-					"bounce": "none",
-					"titleNView": {
-						"searchInput": {
-							"backgroundColor": "rgba(231, 231, 231,.7)",
-							"borderRadius": "16px",
-							"placeholder": "商品搜索",
-							"disabled": true,
-							"placeholderColor": "#606266",
-							"align": "left"
-						}
-					}
-				},
-				// #endif
-				"navigationBarTitleText": "分类"
-			}
-		},
+		
 		{
 			"path": "pages/redirect/redirect",
 			"style": {
@@ -581,30 +451,14 @@
 				"navigationBarTitleText": "场次详情"
 			}
 		},
-		{
-			"path": "pages/money/money",
-			"style": {
-				"navigationBarTitleText": "财务",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
-		{
-			"path": "pages/user/myAppointment",
-			"style": {
-				"navigationBarTitleText": "我的易趣卷",
-				"app-plus": {
-					"titleNView": false
-				}
-			}
-		},
+		
 		{
 			"path": "pages/user/shareQrCode",
 			"style": {
 				"navigationBarTitleText": "邀请好友"
 			}
-		}, {
+		},
+		{
 			"path": "pages/money/qudou",
 			"style": {
 				"navigationBarTitleText": "我的趣豆",

+ 0 - 434
pages/cart/cart.vue

@@ -1,434 +0,0 @@
-<template>
-	<view class="container">
-		<!-- 空白页 -->
-		<view v-if="!hasLogin || empty === true" class="empty">
-			<image src="/static/error/emptyCart.png" class="emptyImg" mode="aspectFit"></image>
-			<view v-if="hasLogin" class="empty-tips">
-				空空如也
-				<navigator class="navigator" v-if="hasLogin" url="../index/index" open-type="switchTab">随便逛逛></navigator>
-			</view>
-			<view v-else class="empty-tips">
-				空空如也
-				<view class="navigator" @click="navToLogin">去登陆></view>
-			</view>
-		</view>
-		<view v-else>
-			<!-- 列表 -->
-			<view class="cart-list">
-				<block v-for="(item, index) in cartList" :key="item.id">
-					<view class="cart-item" :class="{ 'b-b': index !== cartList.length - 1 }">
-						<view class="image-wrapper">
-							<image
-								:src="item.productInfo.image"
-								:class="[item.loaded]"
-								mode="aspectFill"
-								lazy-load
-								@load="onImageLoad('cartList', index)"
-								@error="onImageError('cartList', index)"
-							></image>
-							<view class="iconfont iconroundcheckfill checkbox" :class="{ checked: item.checked }" @click="check('item', index)"></view>
-						</view>
-						<view class="item-right">
-							<text class="clamp title">{{ item.productInfo.store_name }}</text>
-							<text class="attr">{{ item.attr_val }}</text>
-							<text class="price">¥{{ item.productInfo.price }}</text>
-							<uni-number-box
-								class="step"
-								:min="1"
-								:max="item.productInfo.stock"
-								:value="item.cart_num > item.productInfo.stock ? item.productInfo.stock : item.cart_num"
-								:isMax="item.cart_num >= item.productInfo.stock ? true : false"
-								:isMin="item.cart_num === 1"
-								:index="index"
-								@eventChange="numberChange"
-							></uni-number-box>
-						</view>
-						<text class="del-btn iconfont iconclose" @click="deleteCartItem(index)"></text>
-					</view>
-				</block>
-			</view>
-			<!-- 底部菜单栏 -->
-			<view class="action-section">
-				<view class="checkbox">
-					<view class="iconfont iconroundcheckfill icon-checked-box" @click="check('all')" :class="{ 'icon-checked': allChecked }"></view>
-					<view class="clear-btn" @click="allChecked ? clearCart() : ''" :class="{ show: allChecked }"><text>清空</text></view>
-				</view>
-				<view class="total-box">
-					<text class="price">¥{{ total }}</text>
-					<!-- <text class="coupon">
-						已优惠
-						<text>74.35</text>
-						元
-					</text> -->
-				</view>
-				<button type="primary" class="no-border confirm-btn" @click="createOrder">去结算</button>
-			</view>
-		</view>
-		<u-tabbar activeColor="#333333" inactive-color='#999999' v-model="current" :list="tabbar" ></u-tabbar>
-	</view>
-</template>
-
-<script>
-	import { tabbar1 } from '@/utils/tabbar.js';
-import { getCartList, getCartNum, cartDel } from '@/api/user.js';
-import { mapState } from 'vuex';
-import uniNumberBox from '@/components/uni-number-box.vue';
-import { saveUrl, interceptor } from '@/utils/loginUtils.js';
-export default {
-	components: {
-		uniNumberBox
-	},
-	data() {
-		return {
-			current: 2,
-			tabbar: tabbar1,
-			total: 0, //总价格
-			allChecked: false, //全选状态  true|false
-			empty: false, //空白页现实  true|false
-			cartList: []
-		};
-	},
-	onShow() {
-		// 只有登录时才加载数据
-		if (this.hasLogin) {
-			this.loadData();
-		}
-	},
-	watch: {
-		//显示空白页
-		cartList(e) {
-			let empty = e.length === 0 ? true : false;
-			if (this.empty !== empty) {
-				this.empty = empty;
-			}
-		}
-	},
-	computed: {
-		...mapState('user', ['hasLogin'])
-	},
-	methods: {
-		//请求数据
-		async loadData() {
-			let obj = this;
-			getCartList({})
-				.then(function(e) {
-					console.log(e+"111");
-					// 获取当前购物车物品增加数量
-					let nub = obj.cartList.length;
-					// 获取之前对象数组
-					let aArray = obj.cartList.reverse();
-					// 获取返回数据对象数组
-					let bArray = e.data.valid.reverse();
-					obj.cartList = bArray
-						.map((item, ind) => {
-							// 设置返回数据默认为勾选状态
-							item.checked = true;
-							// 获取相同数组之前对象的数据
-							let carlist = aArray[ind];
-							// 判断之前是否已经加载完毕
-							if (carlist && carlist.loaded == 'loaded') {
-								item.loaded = 'loaded';
-							}
-							return item;
-						})
-						.reverse();
-					obj.calcTotal(); //计算总价
-				})
-				.catch(function(e) {
-					console.log(e);
-				});
-		},
-		//监听image加载完成
-		onImageLoad(key, index) {
-			// 修改载入完成后图片class样式
-			this.$set(this[key][index], 'loaded', 'loaded');
-		},
-		//监听image加载失败
-		onImageError(key, index) {
-			this[key][index].image = '/static/error/errorImage.jpg';
-		},
-		// 跳转到登录页
-		navToLogin() {
-			// 保存地址
-			saveUrl();
-			// 登录拦截
-			interceptor();
-		},
-		//选中状态处理
-		check(type, index) {
-			if (type === 'item') {
-				this.cartList[index].checked = !this.cartList[index].checked;
-			} else {
-				const checked = !this.allChecked;
-				const list = this.cartList;
-				list.forEach(item => {
-					item.checked = checked;
-				});
-				this.allChecked = checked;
-			}
-			this.calcTotal(type);
-		},
-		//数量
-		numberChange(data) {
-			let arr = this.cartList[data.index];
-			arr.cart_num = data.number;
-			getCartNum({ id: arr.id, number: data.number })
-				.then(e => {
-					console.log(e);
-				})
-				.catch(function(e) {
-					console.log(e);
-				});
-			this.calcTotal();
-		},
-		//删除
-		deleteCartItem(index) {
-			let list = this.cartList;
-			let row = list[index];
-			let id = row.id;
-			cartDel({
-				ids: id
-			});
-			this.cartList.splice(index, 1);
-			uni.hideLoading();
-			this.calcTotal();
-		},
-		//清空
-		clearCart() {
-			uni.showModal({
-				content: '清空购物车?',
-				success: e => {
-					if (e.confirm) {
-						let st = this.cartList.map(e => {
-							return e.id;
-						});
-						cartDel({
-							ids: st.join(',')
-						}).then(e => {
-							console.log(e);
-						});
-						this.cartList = [];
-					}
-				}
-			});
-		},
-		//计算总价
-		calcTotal() {
-			let list = this.cartList;
-			if (list.length === 0) {
-				this.empty = true;
-				return;
-			}
-			let total = 0;
-			let checked = true;
-			list.forEach(item => {
-				if (item.checked === true) {
-					total += item.productInfo.price * item.cart_num;
-				} else if (checked === true) {
-					checked = false;
-				}
-			});
-			this.allChecked = checked;
-			this.total = Number(total.toFixed(2));
-		},
-		//创建订单
-		createOrder() {
-			let list = this.cartList;
-			let goodsData = [];
-			list.forEach(item => {
-				if (item.checked) {
-					goodsData.push(item.id);
-				}
-			});
-
-			uni.navigateTo({
-				url: '/pages/order/createOrder?id=' + goodsData.join(',')
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-.container {
-	padding-bottom: 134rpx;
-	background-color: $page-color-base;
-	/* 空白页 */
-	.empty {
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		padding-bottom: 100rpx;
-		display: flex;
-		justify-content: center;
-		flex-direction: column;
-		align-items: center;
-		background: #fff;
-		.emptyImg {
-			width: 300rpx;
-			height: 250rpx;
-			margin-bottom: 30rpx;
-		}
-		.empty-tips {
-			display: flex;
-			font-size: $font-sm + 2rpx;
-			color: $font-color-disabled;
-			.navigator {
-				color: $uni-color-primary;
-				margin-left: 16rpx;
-			}
-		}
-	}
-}
-/* 购物车列表项 */
-.cart-item {
-	display: flex;
-	position: relative;
-	padding: 30rpx 40rpx;
-	.image-wrapper {
-		width: 230rpx;
-		height: 230rpx;
-		flex-shrink: 0;
-		position: relative;
-		image {
-			border-radius: 8rpx;
-		}
-	}
-	.checkbox {
-		position: absolute;
-		left: -16rpx;
-		top: -16rpx;
-		z-index: 8;
-		font-size: 44rpx;
-		line-height: 1;
-		padding: 4rpx;
-		color: $font-color-disabled;
-		background: #fff;
-		border-radius: 50px;
-	}
-	.item-right {
-		display: flex;
-		flex-direction: column;
-		flex: 1;
-		overflow: hidden;
-		position: relative;
-		padding-left: 30rpx;
-		.title,
-		.price {
-			font-size: $font-base + 2rpx;
-			color: $font-color-dark;
-			height: 40rpx;
-			line-height: 40rpx;
-		}
-		.attr {
-			font-size: $font-sm + 2rpx;
-			color: $font-color-light;
-			height: 50rpx;
-			line-height: 50rpx;
-		}
-		.price {
-			height: 50rpx;
-			line-height: 50rpx;
-		}
-		.step {
-			margin-top: 20rpx;
-		}
-	}
-	.del-btn {
-		padding: 4rpx 10rpx;
-		font-size: 34rpx;
-		height: 50rpx;
-		color: $font-color-light;
-	}
-}
-/* 底部栏 */
-.action-section {
-	/* #ifdef H5 */
-	margin-bottom: 100rpx;
-	/* #endif */
-	position: fixed;
-	left: 30rpx;
-	bottom: 30rpx;
-	z-index: 95;
-	display: flex;
-	align-items: center;
-	width: 690rpx;
-	height: 100rpx;
-	padding: 0 30rpx;
-	background: rgba(255, 255, 255, 0.9);
-	box-shadow: 0 0 20rpx 0 rgba(0, 0, 0, 0.5);
-	border-radius: 16rpx;
-	.checkbox {
-		height: 52rpx;
-		position: relative;
-		.icon-checked-box {
-			border-radius: 50rpx;
-			background-color: #ffffff;
-			width: 52rpx;
-			height: 100%;
-			position: relative;
-			z-index: 5;
-			font-size: 53rpx;
-			line-height: 1;
-			color: $font-color-light;
-		}
-		.icon-checked {
-			color: $base-color;
-		}
-	}
-	.clear-btn {
-		position: absolute;
-		left: 26rpx;
-		top: 0;
-		z-index: 4;
-		width: 0;
-		height: 52rpx;
-		line-height: 52rpx;
-		padding-left: 38rpx;
-		font-size: $font-base;
-		color: #fff;
-		background: $font-color-disabled;
-		border-radius: 0 50px 50px 0;
-		opacity: 0;
-		transition: 0.2s;
-		&.show {
-			opacity: 1;
-			width: 120rpx;
-		}
-	}
-	.total-box {
-		flex: 1;
-		display: flex;
-		flex-direction: column;
-		text-align: right;
-		padding-right: 40rpx;
-		.price {
-			font-size: $font-lg;
-			color: $font-color-dark;
-		}
-		.coupon {
-			font-size: $font-sm;
-			color: $font-color-light;
-			text {
-				color: $font-color-dark;
-			}
-		}
-	}
-	.confirm-btn {
-		padding: 0 38rpx;
-		margin: 0;
-		border-radius: 100px;
-		height: 76rpx;
-		line-height: 76rpx;
-		font-size: $font-base + 2rpx;
-		background: $base-color;
-	}
-}
-/* 复选框选中状态 */
-.action-section .checkbox.checked,
-.cart-item .checkbox.checked {
-	color: $base-color;
-}
-</style>

+ 2 - 67
pages/index/index.vue

@@ -169,14 +169,12 @@
 		onPullDownRefresh() {
 			console.log('111');
 			this.loadData();
-			this.getaddress();
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
 		onShow() {
 			this.loadData();
-			this.getaddress();
 		},
 		methods: {
 			...mapMutations(['setLat', 'setLon', 'setChoose']),
@@ -231,76 +229,13 @@
 			out_of_china(lng, lat) {
 				return lng < 72.004 || lng > 137.8347 || (lat < 0.8293 || lat > 55.8271 || false);
 			},
-			transformlat(lng, lat) {
-				const x_PI = (3.14159265358979324 * 3000.0) / 180.0;
-				const PI = 3.1415926535897932384626;
-				const a = 6378245.0;
-				const ee = 0.00669342162296594323;
-				let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(
-					lng));
-				ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0;
-				ret += ((20.0 * Math.sin(lat * PI) + 40.0 * Math.sin((lat / 3.0) * PI)) * 2.0) / 3.0;
-				ret += ((160.0 * Math.sin((lat / 12.0) * PI) + 320 * Math.sin((lat * PI) / 30.0)) * 2.0) / 3.0;
-				return ret;
-			},
-			transformlng(lng, lat) {
-				const x_PI = (3.14159265358979324 * 3000.0) / 180.0;
-				const PI = 3.1415926535897932384626;
-				const a = 6378245.0;
-				const ee = 0.00669342162296594323;
-				let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
-				ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0;
-				ret += ((20.0 * Math.sin(lng * PI) + 40.0 * Math.sin((lng / 3.0) * PI)) * 2.0) / 3.0;
-				ret += ((150.0 * Math.sin((lng / 12.0) * PI) + 300.0 * Math.sin((lng / 30.0) * PI)) * 2.0) / 3.0;
-				return ret;
-			},
-			wgs84Togcj02(lng, lat) {
-				if (this.out_of_china(lng, lat)) {
-					return [lng, lat];
-				}
-				//定义一些常量
-				//GCJ02 转换为 WGS84
-				var that = this;
-				const x_PI = (3.14159265358979324 * 3000.0) / 180.0;
-				const PI = 3.1415926535897932384626;
-				const a = 6378245.0;
-				const ee = 0.00669342162296594323;
-				let dlat = that.transformlat(lng - 105.0, lat - 35.0);
-				let dlng = that.transformlng(lng - 105.0, lat - 35.0);
-				let radlat = (lat / 180.0) * PI;
-				let magic = Math.sin(radlat);
-				magic = 1 - ee * magic * magic;
-				let sqrtmagic = Math.sqrt(magic);
-				dlat = (dlat * 180.0) / (((a * (1 - ee)) / (magic * sqrtmagic)) * PI);
-				dlng = (dlng * 180.0) / ((a / sqrtmagic) * Math.cos(radlat) * PI);
-				var mglat = lat + dlat;
-				var mglng = lng + dlng;
-				return [mglng, mglat];
-			},
+			
 			toBack() {
 				uni.navigateTo({
 					url: '/pages/navigation/index'
 				})
 			},
-			getaddress() {
-				console.log('dizhi+++++++++++');
-				let obj = this;
-				uni.getLocation({
-					type: 'wgs84',
-					success: res => {
-						let wz = obj.wgs84Togcj02(res.longitude, res.latitude);
-						obj.setLat(wz[1]);
-						obj.setLon(wz[0]);
-						console.log(wz, '经纬度');
-					},
-					fail: err => {
-						console.log(err, '经纬度');
-						openMap().then(e => {
-							this.getaddress();
-						});
-					}
-				});
-			},
+			
 			goDetails(e) {
 				uni.navigateTo({
 					url: '/pages/index/messageInfo?id=' + this.article[e].id

+ 0 - 177
pages/index/sign.vue

@@ -1,177 +0,0 @@
-<template>
-	<view>
-		<view class="title-box">
-			<view class=" title-conetnt  position-relative">
-				<view class="title-img"><image src="/static/img/img08.png" mode="aspectFit"></image></view>
-				<view class="title-content-box">
-					<view class="title-text">已连续签到</view>
-					<view class="title-day-text">
-						<text class="title-day">{{actionDay}}</text>
-						<text>天</text>
-					</view>
-					<view class="title-button" :class="{'signAction':signTrue}" @click="signTrue?'':integral()">{{signTrue?'已签到':'立即签到'}}</view>
-				</view>
-			</view>
-			<view class="title-tip"><text>共获得{{sum_integral}}积分,总签到{{allSign}}天</text></view>
-		</view>
-		<calendar class="sign-date-box" :checks="signList" checksClass="" :checkTextShow="true" checksIcon="/static/img/img07.png"></calendar>
-	</view>
-</template>
-
-<script>
-import calendar from '../../components/ss-calendar/ss-calendar.vue';
-import { signList, integral,signUser } from '@/api/functionalUnit.js';
-export default {
-	components: {
-		calendar
-	},
-	data() {
-		return {
-			money: '', //保存当前月份
-			year: '', //保存当前年份
-			day: '', //保存当前日期
-			signList: [] ,//签到日子列表
-			actionDay:0,//连续签到天数
-			allSign:0,//累计签到
-			sum_integral:0,//累计获得积分
-			signTrue:false,
-		};
-	},
-	onLoad() {
-		this.signUser();
-		this.getData();
-		this.loadList();
-	},
-	methods: {
-		// 获取当前时间
-		getData(current) {
-			const date = current ? new Date(current) : new Date();
-			this.year = date.getFullYear();//保存当前年份
-			this.month = date.getMonth() + 1;//保存当前月份
-			this.day = date.getDate();//保存当前日期
-		},
-		//获取签到用户信息
-		signUser(){
-			signUser({all:1}).then(({data}) => {
-				this.actionDay = data.sign_num;//连续签到天数
-				this.allSign = data.sum_sgin_day;//累计签到天数
-				this.sum_integral = data.sum_integral;//累计总积分
-			})
-		},
-		// 签到
-		integral() {
-			integral({})
-				.then(e => {
-					// 改为已签到
-					this.signTrue = true;
-					this.actionDay++;
-					// 保存签到成功
-					this.signList.push(this.day);
-					uni.showToast({
-						title: '签到成功',
-						duration: 2000,
-						position: 'top'
-					});
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 获取签到列表
-		loadList() {
-			let obj = this;
-			let present = this.day; //保存当前天数用于后续计算
-			let actionDay = 0; //用于计算活跃天数
-			let arr = []; //保存返回数组;
-			signList({
-				page: 1,
-				limit: 31
-			}).then(e => {
-				arr = e.data.map((e, ind) => {
-					let time = e.add_time.split('-');
-					let day = parseInt(time[2].replace(/^0/i, ''));
-					let year = time[0];
-					let month = +time[1];
-					if (obj.year == year && obj.month == month) {
-						return day;
-					}
-				});
-				this.signList = arr;
-				// 判断今天是否已经签到
-				if(arr[0]==this.day){
-					this.signTrue = true;
-				}
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: $page-color-base;
-}
-.sign-date-box {
-	margin: 25rpx;
-	border-radius: 15rpx;
-	margin-top: -70rpx;
-}
-.title-box {
-	background-color: $base-color;
-	padding-top: 120rpx;
-	color: #ffffff;
-	height: 590rpx;
-	.title-conetnt {
-		height: 350rpx;
-		width: 350rpx;
-		margin: 0 auto;
-		text-align: center;
-		.title-img {
-			position: absolute;
-			top: 0;
-			left: 0;
-			height: 100%;
-			width: 100%;
-			image {
-				height: 100%;
-				width: 100%;
-			}
-		}
-		.title-content-box {
-			position: absolute;
-			width: 100%;
-			.title-day-text {
-				padding: 20rpx;
-				font-size: $font-base - 2rpx;
-				.title-day {
-					font-size: 60rpx;
-				}
-			}
-			.title-text {
-				font-size: 26rpx;
-				padding-top: 100rpx;
-			}
-			.title-button {
-				background-color: #fe7e51;
-				border-radius: 99rpx;
-				width: 200rpx;
-				height: 64rpx;
-				margin: 0 auto;
-				line-height: 64rpx;
-				text-align: center;
-				font-size: $font-base;
-				&.signAction{
-					background-color: $font-color-light;
-				}
-			}
-		}
-	}
-}
-.title-tip {
-	color: #ffffff;
-	font-size: $font-base - 2rpx;
-	padding-top: 20rpx;
-	text-align: center;
-	margin-top: -40rpx;
-}
-</style>

+ 0 - 337
pages/money/money.vue

@@ -1,337 +0,0 @@
-<template>
-	<view class="center">
-		<view class="top">
-			<image class="top-bg" src="../../static/img/order99.png" mode=""></image>
-			<view class="top-font">现金余额(元)</view>
-			<view class="num">{{ userInfo.now_money || '0.00' }}</view>
-		</view>
-		<view class="navbar">
-			<view class="navbar-item" @click="navTo('/pages/money/qudou')">
-				<view class="navbar-font">
-					<image class="navbar-image" src="../../static/img/been.png" mode=""></image>
-					<view class="font">趣豆</view>
-				</view>
-				<view class="navbar-num">{{ userInfo.integral || '0.00' }}</view>
-			</view>
-			<view class="vvv"></view>
-			<view class="navbar-item">
-				<view class="navbar-font" @click="navTo('/pages/user/mygs')">
-					<image class="navbar-image" src="../../static/money/m03.png" mode=""></image>
-					<view class="font">我的收益</view>
-				</view>
-				<view class="navbar-num">{{ userInfo.profit > 0 ? userInfo.profit : '0' }}</view>
-			</view>
-			<view class="vvv"></view>
-			<view class="navbar-item">
-				<view class="navbar-font" @click="navTo('/pages/user/myAppointment')">
-					<image class="navbar-image" src="../../static/money/m04.png" mode=""></image>
-					<view class="font">易趣卷</view>
-				</view>
-				<view class="navbar-num">{{ userInfo.anticipate }}</view>
-			</view>
-		</view>
-		<view class="content-box">
-			<view class="content-title">
-				<view class="title-left">
-					<image src="../../static/money/m02.png" mode=""></image>
-					<text>现金余额明细</text>
-				</view>
-				<view class="title-right">
-					<view @tap="handleTap('picker')">{{ title }}</view>
-					<lb-picker ref="picker" v-model="value" mode="selector" :list="typeList" :dataset="{ name: 'type' }" @confirm="handleConfirm"></lb-picker>
-					<image src="../../static/money/m01.png" mode=""></image>
-				</view>
-			</view>
-			<scroll-view scroll-y="true" class="scroll-list" :style="{ height: height }" @scrolltolower="loadData()">
-				<view class="list" v-for="(item, index) in list" :style="{ background: index % 2 == 0 ? '#F9F9F9' : '#fff' }">
-					<view class="list-box">
-						<view class="list-left">
-							<view class="top1">{{ item.title }}</view>
-							<view class="bottom">{{ item.add_time }}</view>
-						</view>
-						<view class="list-right" :style="{ color: index % 2 == 0 ? '#ff0000' : '#000000' }">{{ item.pm == 1 ? '+' : '-' }}{{ item.number }}</view>
-					</view>
-				</view>
-			</scroll-view>
-		</view>
-		<u-tabbar activeColor="#f42b4e" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
-	</view>
-</template>
-
-<script>
-import { getUserInfo } from '@/api/user.js';
-import { tabbar } from '@/utils/tabbar.js';
-import { mapState, mapMutations } from 'vuex';
-import LbPicker from '@/components/lb-picker';
-import { spreadCommission, userBalance } from '@/api/wallet.js';
-export default {
-	components: {
-		LbPicker
-	},
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.scroll-list').boundingClientRect();
-				query.exec(function(res) {
-					console.log(res, 'ddddddddddddd');
-					_this.height = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.height);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			height: '',
-			current: 3,
-			tabbar: tabbar,
-			list: [],
-			typeList: [{ title: '收入', type: 2 }, { title: '支出', type: 1 }],
-			type: 2,
-			title: '收入',
-			value: '',
-			page: 1,
-			limit: 10,
-			loadingType: 'more'
-		};
-	},
-	computed: {
-		...mapState('user', ['userInfo', 'orderInfo', 'hasLogin'])
-	},
-	onLoad() {
-		this.upData();
-		this.loadData();
-	},
-	onReachBottom() {
-		this.loadData();
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'setOrderInfo']),
-		upData() {
-			getUserInfo({})
-				.then(({ data }) => {
-					this.setUserInfo(data);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		loadData() {
-			const obj = this;
-			if (obj.loadingType == 'nomore' || obj.loadingType == 'loading') {
-				return;
-			}
-			obj.loadingType = 'loading';
-			spreadCommission({ page: obj.page, limit: obj.limit }, obj.type).then(({ data }) => {
-				if (data == '') {
-					return;
-				} else {
-					obj.list = obj.list.concat(data[0].list);
-					if (data[0].list.length == obj.limit) {
-						obj.page++;
-					} else {
-						obj.loadingType == 'nomore';
-					}
-				}
-			});
-		},
-		navTo(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		handleConfirm(e) {
-			console.log(e);
-			this.title = e.item.title;
-			this.type = e.item.type;
-			this.page = 1;
-			(this.limit = 10), (this.loadingType = 'more'), (this.list = []);
-			this.loadData();
-		},
-		handleTap(name) {
-			this.$refs[name].show();
-		}
-	}
-};
-</script>
-
-<style lang="less">
-.center {
-	height: 100%;
-	width: 100%;
-	height: auto;
-	min-height: 100%;
-	background: #ffffff;
-}
-
-.top {
-	margin: 20rpx auto 0;
-	position: relative;
-	width: 700rpx;
-	height: 200rpx;
-	padding: 54rpx 40rpx;
-
-	.top-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		width: 700rpx;
-		height: 200rpx;
-		border-radius: 25rpx;
-	}
-
-	.top-font {
-		position: relative;
-		z-index: 2;
-		font-size: 32rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-		line-height: 1;
-	}
-
-	.num {
-		line-height: 1;
-		position: relative;
-		z-index: 2;
-		margin-top: 24rpx;
-		font-size: 48rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-}
-
-.navbar {
-	display: flex;
-	justify-content: space-around;
-	width: 700rpx;
-	background: #ffffff;
-	box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-	border-radius: 20rpx;
-	margin: 40rpx auto 0;
-	padding: 40rpx 0 50rpx;
-
-	.vvv {
-		width: 2rpx;
-		height: 74rpx;
-		background: #dcdcdc;
-	}
-
-	.navbar-item {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-
-		.navbar-font {
-			margin-bottom: 10rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-			image {
-				margin-right: 10rpx;
-				width: 40rpx;
-				height: 40rpx;
-			}
-
-			.font {
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #0c1732;
-			}
-		}
-
-		.navbar-num {
-			font-size: 34rpx;
-			font-weight: bold;
-			color: #0c1732;
-		}
-	}
-}
-
-.content-box {
-	margin: 0 30rpx;
-
-	.content-title {
-		margin: 50rpx 0;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-
-		.title-left {
-			image {
-				width: 8rpx;
-				height: 30rpx;
-				margin-right: 10rpx;
-			}
-
-			text {
-				font-size: 34rpx;
-				font-weight: bold;
-				color: #0c1732;
-			}
-		}
-
-		.title-right {
-			font-size: 30rpx;
-			font-weight: 500;
-			color: #0c1732;
-			display: flex;
-			align-items: center;
-			image {
-				margin-left: 10rpx;
-				width: 17rpx;
-				height: 12rpx;
-			}
-		}
-	}
-}
-
-.list {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	.list-box {
-		width: 700rpx;
-		height: 143rpx;
-		width: 100%;
-		display: flex;
-
-		border-radius: 10rpx;
-		justify-content: space-between;
-		align-items: center;
-		margin: 0 30rpx;
-
-		.list-left {
-			height: 143rpx;
-			display: flex;
-			flex-direction: column;
-
-			justify-content: space-around;
-
-			.top1 {
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #0c1732;
-			}
-
-			.bottom {
-				font-size: 26rpx;
-				font-weight: 500;
-				color: #999999;
-			}
-		}
-
-		.list-right {
-			font-size: 36rpx;
-			font-weight: bold;
-			color: #ea453c;
-		}
-	}
-}
-</style>

+ 0 - 301
pages/money/qdwallet.vue

@@ -1,301 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="flex">
-				<view class="buttom">
-					<view class="icon">{{ userInfo.integral | getMoneyStyle }}</view>
-					<text class="text">可用趣豆</text>
-				</view>
-			</view>
-		</view>
-		<view class="row-box">
-			<view class="title">收款人id</view>
-			<view class="row"><input class="input" type="number" v-model="card" placeholder="请输入收款人id" placeholder-class="placeholder" /></view>
-		</view>
-		<view class="row-box">
-			<view class="title">交易密码</view>
-			<view class="row"><input class="input" type="password" v-model="password" placeholder="请输入交易密码" placeholder-class="placeholder" /></view>
-		</view>
-		<view class="row-box">
-			<view class="title">转账金额</view>
-			<view class="row">
-				<!-- <text class="tit">¥</text> -->
-				<input class="input" type="number" v-model="withdrawal" placeholder="转入金额" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = userInfo.integral">全部转账</view>
-			</view>
-		</view>
-
-		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">提交</button>
-	</view>
-</template>
-
-<script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { getUserInfo, admintrade, trade } from '@/api/user.js';
-import { mapMutations, mapState } from 'vuex';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	data() {
-		return {
-			money: '0.00', //可提现金额
-			withdrawal: '', //提现金额
-			password: '', //支付密码
-			card: '', //转账卡号
-			name: '',
-			// #ifdef H5
-			weichatBsrowser: false,
-			// #endif
-			loding: false,
-			type: '1'
-		};
-	},
-	onLoad(options) {
-		// #ifdef H5
-		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
-		// #endif
-		this.dataUp();
-		if (options.type) {
-			this.type = options.type;
-			console.log(this.type);
-		}
-	},
-	computed: {
-		...mapState('user', ['userInfo'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'login']),
-		// 更新数据
-		dataUp() {
-			let obj = this;
-			getUserInfo({})
-				.then(e => {
-					obj.login();
-					// 保存返回用户数据
-					obj.setUserInfo(e.data);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 切换选中对象
-		tabRadio(e) {
-			this.type = e.detail.value;
-		},
-		// 提交
-		confirm() {
-			let obj = this;
-			obj.loding = true;
-			if (obj.withdrawal < 10) {
-				obj.loding = false;
-				uni.showModal({
-					title: '提示',
-					content: '转账金额最低为10'
-				});
-				return;
-			}
-			if (obj.password == '') {
-				obj.loding = false;
-				uni.showModal({
-					title: '提示',
-					content: '请输入交易密码'
-				});
-				return;
-			}
-			if (obj.withdrawal % 10 != 0) {
-				obj.loding = false;
-				uni.showModal({
-					title: '提示',
-					content: '转账金额请输入10的倍数'
-				});
-				return;
-			} else {
-				let data = {
-					uid: obj.card, //编号
-					num: obj.withdrawal, //金额
-					payment: obj.password
-				};
-				if (obj.type == '1') {
-					trade(data)
-						.then(e => {
-							// 允许按钮点击
-							obj.loding = false;
-							// 初始化提现金额
-							obj.withdrawal = '';
-							uni.showToast({
-								title: '转账成功',
-								duration: 2000,
-								position: 'top'
-							});
-							obj.dataUp();
-						})
-						.catch(e => {
-							obj.$api.msg(e.msg);
-							obj.loding = false;
-							console.log();
-						});
-				}
-				if (obj.type == '2') {
-					admintrade(data)
-						.then(e => {
-							// 允许按钮点击
-							obj.loding = false;
-							// 初始化提现金额
-							obj.withdrawal = '';
-							uni.showToast({
-								title: '转账成功',
-								duration: 2000,
-								position: 'top'
-							});
-							obj.dataUp();
-						})
-						.catch(e => {
-							obj.$api.msg(e.msg);
-							obj.loding = false;
-							console.log();
-						});
-				}
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	height: 100%;
-}
-.content-money {
-	padding: 30rpx 0;
-	background: #ffffff;
-}
-
-.item {
-	padding: 0 $page-row-spacing;
-	background-color: #ffffff;
-}
-.flex {
-	background-color: #ffffff;
-	text-align: center;
-	margin: 0 30rpx;
-	border-radius: $border-radius-sm;
-	justify-content: center;
-	.buttom {
-		font-size: $font-lg;
-		width: 50%;
-	}
-	.interval {
-		width: 2px;
-		height: 60rpx;
-		background-color: #eeeeee;
-	}
-	.icon {
-		background-size: 100%;
-		font-size: 42rpx;
-		color: $font-color-dark;
-		font-weight: bold;
-		background-repeat: no-repeat;
-		background-position: center;
-	}
-	.text {
-		color: $font-color-light;
-	}
-}
-
-.row-box {
-	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	.title {
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-	}
-	.row {
-		display: flex;
-		align-items: center;
-		position: relative;
-		height: 80rpx;
-		.tit {
-			flex-shrink: 0;
-			width: 40rpx;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.input {
-			flex: 1;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.iconlocation {
-			font-size: 36rpx;
-			color: $font-color-light;
-		}
-
-		.buttom {
-			color: #f21f5d;
-			font-size: $font-base;
-		}
-	}
-}
-.add-btn {
-	width: 520rpx;
-	height: 80rpx;
-	border: 2rpx solid #f21f5d;
-	border-radius: 40rpx;
-	margin: 140rpx auto;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #f21f5d;
-}
-.name {
-	background: #fff;
-	padding: 30rpx;
-}
-.list {
-	padding-left: 30rpx;
-	margin-top: 30rpx;
-	background-color: #ffffff;
-	.box {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		border-bottom: 1px solid $border-color-light;
-		.icon {
-			font-size: 48rpx;
-			padding-right: 20rpx;
-			.icon-img {
-				height: 50rpx;
-				width: 50rpx;
-			}
-		}
-		.iconweixin1 {
-			color: #18bf16;
-		}
-		.iconzhifubao {
-			color: #08aaec;
-		}
-		.title-box {
-			flex-grow: 1;
-			text-align: left;
-			.title {
-				font-size: $font-base + 2rpx;
-				color: $font-color-base;
-			}
-			.node {
-				font-size: $font-sm;
-				color: $font-color-light;
-			}
-		}
-	}
-}
-.tip {
-	padding: 20rpx;
-	color: #ff0000;
-}
-/deep/ .uni-radio-input {
-	width: 45rpx;
-	height: 45rpx;
-}
-</style>

+ 0 - 34
pages/money/qudou.vue

@@ -16,40 +16,6 @@
 				<view>当前余额</view>
 			</view>
 		</view>
-		<!-- <view class="moneybtn-box flex">
-			<view class="money-btn" v-if="userInfo.staff" @click="navto('/pages/money/qdwallet?type=2')">
-				<view class="flex-center">
-					<image class="tipIcon" src="../../static/icon/qudou3.png" mode="scaleToFill"></image>
-				</view>
-				<view class="margin-t-10 flex-center">
-					<text>
-						商家转账
-					</text>
-				</view>
-			</view>
-			<view class="money-bt-line" v-if="userInfo.staff"></view>
-			<view class="money-btn" @click="navto('/pages/money/quick')">
-				<view class="flex-center">
-					<image class="tipIcon" src="../../static/icon/qudou1.png" mode="scaleToFill"></image>
-				</view>
-				<view class="margin-t-10 flex-center">
-					<text>
-						兑票
-					</text>
-				</view>
-			</view>
-			<view class="money-bt-line"></view>
-			<view class="money-btn" @click="navto('/pages/money/qdwallet')">
-				<view class="flex-center">
-					<image class="tipIcon" src="../../static/icon/qudou2.png" mode="scaleToFill"></image>
-				</view>
-				<view class="margin-t-10 flex-center">
-					<text>
-						转账
-					</text>
-				</view>
-			</view>
-		</view> -->
 		<view class="info-box flex">
 			<view class="info-item">
 				<view class="info-font">累计收入</view>

+ 0 - 292
pages/money/quick.vue

@@ -1,292 +0,0 @@
-<template>
-	<view class="content">
-		<view class="box padding-b-30">
-			<view class="titlebox">
-				<view class="titlename padding-l-30">
-					兑换文票
-				</view>
-			</view>
-			<view class="row-box">
-				<view class="title">兑入云票</view>
-				<view class="row flex">
-					<view class="flex name-box">
-						<image class="nametip" src="../../static/icon/quick2.png" mode="scaleToFill"></image>
-						<text class="padding-l-10 name">文票</text>
-					</view>
-					<input class="input margin-l-10" type="number" v-model="ticketnum" placeholder="请输入整数"
-						placeholder-class="placeholder" />
-				</view>
-			</view>
-			<view class="flex-center">
-				<image class="tabquick" src="../../static/icon/quick0.png" mode="scaleToFill"></image>
-			</view>
-			<view class="row-box">
-				<view class="title">兑出趣豆<text class="font-size-sm">(余额:{{userInfo.integral}})</text></view>
-				<view class="row flex">
-					<view class="flex name-box">
-						<image class="nametip" src="../../static/icon/quick1.png" mode="scaleToFill"></image>
-						<text class="padding-l-10 name">趣豆</text>
-					</view>
-					<view class="input margin-l-10" type="number" placeholder="0.00" placeholder-class="placeholder">
-						{{ticketnum*ratio}}
-					</view>
-				</view>
-			</view>
-			<view class="row-box">
-				<view class="title">输入账号</view>
-				<view class="row flex">
-					<view class="flex name-box">
-						<image class="nametip" src="../../static/icon/quick3.png" mode="scaleToFill"></image>
-						<text class="padding-l-10 name">文交所账号</text>
-					</view>
-					<input class="input margin-l-10" type="number" v-model="card" placeholder="请输入文交所账号"
-						placeholder-class="placeholder" />
-				</view>
-			</view>
-			<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">确认兑换</button>
-		</view>
-		<navigator url="./quickList">
-			<view class="box margin-t-30">
-				<view class="titlebox flex">
-					<view class="flex-start">
-						<image class="nametip" src="../../static/icon/quick4.png" mode="scaleToFill"></image>
-						<text class="padding-l-10">兑换记录</text>
-					</view>
-					<image class="nextTip" src="../../static/img/back.png" mode="scaleToFill"></image>
-				</view>
-			</view>
-		</navigator>
-
-		<view class="echart-box"><l-echart ref="chart" @finished="init"></l-echart></view>
-	</view>
-</template>
-
-<script>
-	import {
-		getUserInfo,
-		admintrade,
-		trade
-	} from '@/api/user.js';
-	import {
-		getTicket,
-		getExchange
-	} from '@/api/quick.js';
-	import {
-		mapMutations,
-		mapState
-	} from 'vuex';
-	export default {
-		data() {
-			return {
-				ticketnum: '', //兑换文票数
-				integral: '', //兑换所需要的积分数
-				card: '', //转账卡号
-				ratio: 1, //兑换比例
-				loding: false,
-				type: '1'
-			};
-		},
-		onLoad(options) {
-			this.dataUp();
-			// 加载文票比例
-			this.getTicket();
-		},
-		computed: {
-			...mapState('user', ['userInfo'])
-		},
-		methods: {
-			...mapMutations('user', ['setUserInfo', 'login']),
-			// 更新数据
-			dataUp() {
-				let obj = this;
-				getUserInfo({})
-					.then(e => {
-						obj.login();
-						// 保存返回用户数据
-						obj.setUserInfo(e.data);
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			getTicket() {
-				getTicket().then(
-					(res) => {
-						console.log(res);
-						if (res.data.v.CurPrice != 0 && res.data.integral_price != 0) {
-							this.ratio = +(res.data.v.CurPrice / res.data.integral_price).toFixed(2);
-						} else {
-							this.loding = true;
-							uni.showModal({
-								title: '提示',
-								content: '当前兑换暂未开放',
-								showCancel: false,
-							});
-						}
-					}
-				).catch(
-					(res) => {
-						console.log(res);
-					}
-				)
-			},
-			// 提交
-			confirm() {
-				let obj = this;
-				obj.loding = true;
-
-				if (!this.ticketnum) {
-					uni.showToast({
-						title: '请输入兑换数量',
-						icon: 'error'
-					});
-					return
-				}
-				if (this.ticketnum.indexOf('.') > -1) {
-					uni.showToast({
-						title: '请输入整数',
-						icon: 'error'
-					});
-					return
-				}
-				// if(this.ticketnum*this.ratio>this.userInfo.integral){
-				// 	uni.showToast({
-				// 		title: '趣豆不足无法兑换',
-				// 		icon:'error'
-				// 	});
-				// 	return
-				// }
-				if (!this.card) {
-					uni.showToast({
-						title: '请输入社交账号',
-						icon: 'error'
-					});
-					return
-				}
-				let data = {
-					account: obj.card, //账号
-					extract_ticket: obj.ticketnum, //数量
-				};
-				uni.showModal({
-					title: '提示',
-					content: `本人委托王伟将本人所持有的 53年18K一分券送至中藏仓储有限公司进行鉴定托管,在整个鉴定托管过程中,该委托人的一切行为,均代表我本人,与本人的行为具有同等法律效力,我本人将承担该委托人行为的全部法律后果和责任。`,
-					cancelText: '不同意',
-					confirmText: '我同意',
-					success: res => {
-						if (res.confirm) {
-							getExchange(data)
-								.then(e => {
-									// 允许按钮点击
-									obj.loding = false;
-									// 初始化提现金额
-									obj.ticketnum = '';
-									uni.showToast({
-										title: e.msg,
-										duration: 2000,
-										position: 'top'
-									});
-									obj.dataUp();
-								})
-								.catch(e => {
-									obj.$api.msg(e.msg);
-									obj.loding = false;
-								});
-						}
-					},
-					fail: (err) => {
-						console.log(err);
-					}
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		height: 100%;
-	}
-
-	.content {
-		padding-top: 30rpx;
-
-		.box {
-			background-color: #FFF;
-			line-height: 1;
-
-			.titlebox {
-				padding: 30rpx;
-				font-weight: bold;
-				font-size: $font-lg;
-				border-bottom: 1px solid $border-color-base;
-
-				.titlename {
-					border-left: 2px solid $color-red ;
-				}
-
-				.nextTip {
-					width: 20rpx;
-					height: 40rpx;
-				}
-			}
-
-			.tabquick {
-				width: 70rpx;
-				height: 70rpx;
-			}
-
-			.nametip {
-				width: 40rpx;
-				height: 40rpx;
-			}
-
-			.row-box {
-				padding: 30rpx;
-
-				.title {
-					font-size: $font-sm;
-					color: $font-color-light;
-					padding-bottom: 20rpx;
-				}
-
-				.row {
-					position: relative;
-
-					.name-box {
-						font-weight: bold;
-						font-size: $font-base;
-						width: 220rpx;
-
-						.name {
-							flex-grow: 1;
-							border-right: 2px solid $font-color-disabled;
-							margin-right: 10rpx;
-						}
-					}
-
-					.input {
-						flex: 1;
-						font-size: 30rpx;
-						height: 60rpx;
-						line-height: 60rpx;
-						color: $font-color-dark;
-						border-bottom: 1px solid $border-color-light;
-					}
-				}
-			}
-		}
-	}
-
-	.add-btn {
-		height: 80rpx;
-		border-radius: 10rpx;
-		margin: 0 50rpx;
-		margin-top: 30rpx;
-		color: #FFF;
-		background-color: $uni-color-error ;
-
-		&.action {
-			background-color: $border-color-light ;
-		}
-	}
-</style>

+ 0 - 259
pages/money/quickList.vue

@@ -1,259 +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-one" duration="0" @change="changeTab">
-
-			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex"
-				@click="goToOrderDetail(item)">
-				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
-					<!-- 空白页 -->
-					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view class="order-item flex" v-for="(item, index) in tabItem.orderList" :key="index">
-						<view class="title-box">
-							<view class="title">
-								<text>{{ item.mark||"文票闪兑" }}</text>
-							</view>
-							<view class="time">
-								<text>{{ item.add_time }}</text>
-							</view>
-						</view>
-						<view class="money">
-							<view>+{{ item.extract_ticket }}</view>
-							<view v-if="item.status == 0" class="status">待发放</view>
-							<view v-if="item.status == 1" class="status">已发放</view>
-						</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 {
-		getExchangeList
-	} from '@/api/quick.js';
-	export default {
-		components: {
-			empty
-		},
-		data() {
-			return {
-				loading: false, //判断是否在点击
-				tabCurrentIndex: 0, //当前选中的第二级别我要买单选中项
-				navList: [{
-						state: 0,
-						text: '待发放',
-						loadingType: 'more',
-						orderList: [],
-						isnew: 1, //判断是否有新的订单
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					},
-					{
-						state: 1,
-						text: '已发放',
-						loadingType: 'more',
-						orderList: [],
-						isnew: 1, //判断是否有新的订单
-						page: 1, //当前页数
-						limit: 10 //每次信息条数
-					}
-				],
-			};
-		},
-		onLoad(options) {
-			this.tabCurrentIndex = +options.state || 0;
-		},
-		onShow() {
-			this.loadData();
-		},
-		// #ifdef APP-PLUS || H5
-		onBackPress(e) {
-			uni.switchTab({
-				url: '/pages/user/user'
-			});
-			return true;
-		},
-		// #endif
-		filters: {
-			moneyNum(value) {
-				return +value;
-			}
-		},
-		// 页面加载完获取swiper高度
-		onReady(res) {
-			var obj = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.swiper-box-one').boundingClientRect();
-					query.exec(function(res) {
-						console.log(res, 'ddddddddddddd');
-						obj.height = resu.windowHeight - res[0].top + 'px';
-						console.log('打印页面的剩余高度', obj.height);
-					});
-				},
-				fail: res => {}
-			});
-		},
-		methods: {
-			//顶部tab点击
-			tabClick(index, type) {
-				this.tabCurrentIndex = index;
-			},
-			//获取订单列表
-			loadData(source) {
-				//这里是将订单挂载到tab列表下
-				let index = this.tabCurrentIndex;
-				let navItem = this.navList[index];
-				let state = navItem.state;
-				// if ( navItem.loaded === true) {
-				// 	//tab切换只有第一次需要加载数据
-				// 	return;
-				// }
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				if (source == 'reload') {
-					navItem.orderList = [];
-					navItem.page = 1;
-					navItem.limit = 10;
-					navItem.loadingType = 'loading';
-				}
-				if (navItem.loadingType === 'noMore') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				getExchangeList({
-						status: state,
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						let arr = data.list.map(e => {
-							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();
-			},
-		}
-	};
-</script>
-
-<style lang="scss">
-	page,
-	.content {
-		background: $page-color-base;
-		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;
-				}
-			}
-		}
-	}
-
-	.swiper-box-one {
-		height: calc(100% - 40px);
-
-		.tab-content {
-			height: 100%;
-		}
-
-		.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;
-				}
-			}
-		}
-	}
-</style>

+ 0 - 279
pages/money/wallet.vue

@@ -1,279 +0,0 @@
-<template>
-	<view class="content">
-		<view class="content-money">
-			<view class="flex">
-				<view class="buttom">
-					<view class="icon">{{ userInfo.anticipate | getMoneyStyle }}</view>
-					<text class="text">可用易趣卷</text>
-				</view>
-			</view>
-		</view>
-		<view class="row-box">
-			<view class="title">收款人id</view>
-			<view class="row"><input class="input" type="number" v-model="card" placeholder="请输入收款人id" placeholder-class="placeholder" /></view>
-		</view>
-		<view class="row-box">
-			<view class="title">交易密码</view>
-			<view class="row"><input class="input" type="password" v-model="password" placeholder="请输入交易密码" placeholder-class="placeholder" /></view>
-		</view>
-		<view class="row-box">
-			<view class="title">转账金额</view>
-			<view class="row">
-				<!-- <text class="tit">¥</text> -->
-				<input class="input" type="number" v-model="withdrawal" placeholder="转入金额" placeholder-class="placeholder" />
-				<view class="buttom" @click="withdrawal = userInfo.anticipate">全部转账</view>
-			</view>
-		</view>
-
-		<button class="add-btn up" :class="{ action: loding }" @click="!loding ? confirm() : ''">提交</button>
-	</view>
-</template>
-
-<script>
-import { getMoneyStyle } from '@/utils/rocessor.js';
-import { getUserInfo, transfer_accounts } from '@/api/user.js';
-import { mapMutations, mapState } from 'vuex';
-export default {
-	filters: {
-		getMoneyStyle
-	},
-	data() {
-		return {
-			money: '0.00', //可提现金额
-			withdrawal: '', //提现金额
-			password: '', //支付密码
-			card: '', //转账卡号
-			name: '',
-			// #ifdef H5
-			weichatBsrowser: false,
-			// #endif
-			loding: false,
-			type: 'xl'
-		};
-	},
-	onLoad(options) {
-		// #ifdef H5
-		this.weichatBsrowser = uni.getStorageSync('weichatBrowser');
-		// #endif
-		this.dataUp();
-		if (options.type) {
-			this.type = options.type;
-			console.log(this.type);
-		}
-	},
-	computed: {
-		...mapState('user', ['userInfo'])
-	},
-	methods: {
-		...mapMutations('user', ['setUserInfo', 'login']),
-		// 更新数据
-		dataUp() {
-			let obj = this;
-			getUserInfo({})
-				.then(e => {
-					obj.login();
-					// 保存返回用户数据
-					obj.setUserInfo(e.data);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 切换选中对象
-		tabRadio(e) {
-			this.type = e.detail.value;
-		},
-		// 提交
-		confirm() {
-			let obj = this;
-			obj.loding = true;
-			if (obj.withdrawal < 10) {
-				obj.loding = false;
-				uni.showModal({
-					title: '提示',
-					content: '转账金额最低为10'
-				});
-				return;
-			}
-			if (obj.password == '') {
-				obj.loding = false;
-				uni.showModal({
-					title: '提示',
-					content: '请输入交易密码'
-				});
-				return;
-			}
-			if (obj.withdrawal % 10 != 0) {
-				obj.loding = false;
-				uni.showModal({
-					title: '提示',
-					content: '转账金额请输入10的倍数'
-				});
-				return;
-			} else {
-				let data = {
-					uid: obj.card, //编号
-					anticipate: obj.withdrawal, //金额
-					payment: obj.password
-				};
-				transfer_accounts(data)
-					.then(e => {
-						// 允许按钮点击
-						obj.loding = false;
-						// 初始化提现金额
-						obj.withdrawal = '';
-						uni.showToast({
-							title: '转账成功',
-							duration: 2000,
-							position: 'top'
-						});
-						obj.dataUp();
-					})
-					.catch(e => {
-						obj.$api.msg(e.msg);
-						obj.loding = false;
-						console.log();
-					});
-			}
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	height: 100%;
-}
-.content-money {
-	padding: 30rpx 0;
-	background: #ffffff;
-}
-
-.item {
-	padding: 0 $page-row-spacing;
-	background-color: #ffffff;
-}
-.flex {
-	background-color: #ffffff;
-	text-align: center;
-	margin: 0 30rpx;
-	border-radius: $border-radius-sm;
-	justify-content: center;
-	.buttom {
-		font-size: $font-lg;
-		width: 50%;
-	}
-	.interval {
-		width: 2px;
-		height: 60rpx;
-		background-color: #eeeeee;
-	}
-	.icon {
-		background-size: 100%;
-		font-size: 42rpx;
-		color: $font-color-dark;
-		font-weight: bold;
-		background-repeat: no-repeat;
-		background-position: center;
-	}
-	.text {
-		color: $font-color-light;
-	}
-}
-
-.row-box {
-	margin-top: 30rpx;
-	padding: 20rpx 30rpx;
-	background: #fff;
-	.title {
-		font-size: $font-base + 2rpx;
-		color: $font-color-dark;
-	}
-	.row {
-		display: flex;
-		align-items: center;
-		position: relative;
-		height: 80rpx;
-		.tit {
-			flex-shrink: 0;
-			width: 40rpx;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.input {
-			flex: 1;
-			font-size: 30rpx;
-			color: $font-color-dark;
-		}
-		.iconlocation {
-			font-size: 36rpx;
-			color: $font-color-light;
-		}
-
-		.buttom {
-			color: #f21f5d;
-			font-size: $font-base;
-		}
-	}
-}
-.add-btn {
-	width: 520rpx;
-	height: 80rpx;
-	border: 2rpx solid #f21f5d;
-	border-radius: 40rpx;
-	margin: 140rpx auto;
-	font-family: PingFang SC;
-	font-weight: bold;
-	color: #f21f5d;
-}
-.name {
-	background: #fff;
-	padding: 30rpx;
-}
-.list {
-	padding-left: 30rpx;
-	margin-top: 30rpx;
-	background-color: #ffffff;
-	.box {
-		display: flex;
-		align-items: center;
-		width: 100%;
-		height: 120rpx;
-		border-bottom: 1px solid $border-color-light;
-		.icon {
-			font-size: 48rpx;
-			padding-right: 20rpx;
-			.icon-img {
-				height: 50rpx;
-				width: 50rpx;
-			}
-		}
-		.iconweixin1 {
-			color: #18bf16;
-		}
-		.iconzhifubao {
-			color: #08aaec;
-		}
-		.title-box {
-			flex-grow: 1;
-			text-align: left;
-			.title {
-				font-size: $font-base + 2rpx;
-				color: $font-color-base;
-			}
-			.node {
-				font-size: $font-sm;
-				color: $font-color-light;
-			}
-		}
-	}
-}
-.tip {
-	padding: 20rpx;
-	color: #ff0000;
-}
-/deep/ .uni-radio-input {
-	width: 45rpx;
-	height: 45rpx;
-}
-</style>

+ 0 - 295
pages/product/classify.vue

@@ -1,295 +0,0 @@
-<template>
-	<view class="container">
-		<empty v-if="loaded === true && list.length === 0"></empty>
-		<view class="hotgoods">
-			<view class="hotgoods-item" v-for="item in list" :key="item.id" @click="navToDetailPage(item)">
-				<view class="image-wrapper"><image :src="item.image" mode="scaleToFill"></image></view>
-				<view class="title clamp margin-c-20">{{ item.store_name }}</view>
-				<view class="hot-price">
-					<view class="price">
-						<text class="font-size-sm">¥</text>
-						{{ item.price }}
-					</view>
-				</view>
-			</view>
-		</view>
-		<uni-load-more :status="loadingType"></uni-load-more>
-	</view>
-</template>
-
-<script>
-import empty from '@/components/empty';
-import { groomList } from '@/api/product.js';
-export default {
-	data() {
-		return {
-			list: [],
-			bannerImg: [],
-			type: 1, //1->置换
-			loadingType: 'more',
-			loaded: false,
-			page: 1,
-			limit: 20
-		};
-	},
-	components: {
-		empty
-	},
-	onReachBottom() {
-		this.loadData();
-	},
-	onLoad(option) {
-		// 获取查询对象
-		if (option.type) {
-			this.type = option.type;
-			uni.setNavigationBarTitle({
-				title: option.type == 1 ? '医斯佳专区' : option.type == 4 ? '随意嗨购' : option.type == 3 ? 'CBB专区' : '置换'
-			});
-		}
-		// 加载基础数据
-		this.loadData();
-	},
-	methods: {
-		navTo: function(ls) {
-			uni.navigateTo({
-				url: '/pages/product/product?id=' + ls.id
-			});
-		},
-		// 请求载入数据
-		async loadData() {
-			let obj = this;
-			if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
-				return;
-			}
-			obj.loadingType = 'loading';
-			groomList(
-				{
-					page: obj.page,
-					limit: obj.limit
-				},
-				this.type
-			)
-				.then(({ data }) => {
-					// 保存轮播图
-					obj.bannerImg = data.banner;
-					// 保存商品信息
-					obj.list = this.list.concat(data.list);
-					obj.loaded = true;
-					obj.page++;
-					if (obj.limit == data.list.length) {
-						obj.loadingType = 'more';
-					} else {
-						obj.loadingType = 'noMore';
-					}
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// 轮播图跳转
-		bannerNavToUrl(item) {
-			// #ifdef H5
-			if (item.wap_link.indexOf('http') > 0) {
-				window.location.href = item.wap_link;
-			}
-			// #endif
-			if (item.wap_link) {
-				uni.navigateTo({
-					url: item.wap_link
-				});
-			}
-		},
-		navToDetailPage(e) {
-			uni.navigateTo({
-				url: '/pages/product/product?id=' + e.id
-			});
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: $page-color-base;
-}
-
-.carousel-section {
-	padding: 0;
-
-	.titleNview-placing {
-		padding-top: 0;
-		height: 0;
-	}
-
-	.swiper-dots {
-		left: 45rpx;
-		bottom: 40rpx;
-	}
-
-	.carousel {
-		width: 100%;
-		height: 360rpx;
-
-		.carousel-item {
-			width: 100%;
-			height: 100%;
-			overflow: hidden;
-		}
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-}
-
-// 中间标题样式
-.type-title-box {
-	padding: 40rpx;
-
-	.title-content {
-		height: 100%;
-		width: 200rpx;
-		text-align: center;
-		font-size: $font-lg;
-		font-weight: 500;
-		color: $font-color-dark;
-	}
-
-	.title-border {
-		width: 250rpx;
-		height: 2rpx;
-		background-color: #e9e9e9;
-	}
-}
-
-// 商品列表
-.goodsList-box {
-	.goodsList-item {
-		margin-bottom: 40rpx;
-		background-color: #ffffff;
-		padding: 30rpx;
-
-		image {
-			flex-shrink: 0;
-			border-radius: $border-radius-sm;
-			height: 180rpx;
-			width: 180rpx;
-		}
-
-		.goodsList-content {
-			margin-left: 20rpx;
-			flex-grow: 1;
-			height: 180rpx;
-			position: relative;
-
-			.title {
-				font-size: $font-base;
-				color: $font-color-dark;
-				font-weight: 500;
-			}
-
-			.goods-money {
-				position: absolute;
-				left: 0;
-				bottom: 0;
-				width: 100%;
-
-				.money-box {
-					.money {
-						font-size: $font-lg;
-						color: $color-red;
-						font-weight: bold;
-					}
-
-					.otMoney-box {
-						font-size: $font-sm;
-
-						.otMoney {
-							color: $font-color-dark;
-							padding-right: 20rpx;
-						}
-
-						.sales {
-							color: $font-color-light;
-						}
-					}
-				}
-
-				.cart {
-					border: 1px solid $color-red;
-					color: $color-red;
-					font-size: $font-base;
-					font-weight: bold;
-					border-radius: 99px;
-					width: 55rpx;
-					height: 55rpx;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-				}
-			}
-		}
-	}
-}
-
-.hotgoods {
-	margin-top: 38rpx;
-	width: 100%;
-	display: flex;
-	flex-wrap: wrap;
-	padding: 0 32rpx;
-
-	.hotgoods-item {
-		width: 48%;
-		background-color: #ffffff;
-		border-radius: 12rpx;
-		margin-bottom: 24rpx;
-
-		&:nth-child(2n + 1) {
-			margin-right: 24rpx;
-		}
-
-		.image-wrapper {
-			width: 100%;
-			height: 330rpx;
-			// background: red;
-			border-radius: 3px;
-			overflow: hidden;
-
-			image {
-				width: 100%;
-				height: 100%;
-				opacity: 1;
-				border-radius: 12rpx 12rpx 0 0;
-			}
-		}
-
-		.title {
-			font-size: $font-base;
-			color: $font-color-dark;
-			font-weight: bold;
-			line-height: 80rpx;
-		}
-
-		.hot-price {
-			display: flex;
-			justify-content: space-between;
-			padding: 0 16rpx 12rpx;
-
-			.price {
-				font-size: 36rpx;
-				font-weight: bold;
-				color: #fd3b39;
-			}
-
-			.cart-icon {
-				image {
-					width: 44rpx;
-					height: 44rpx;
-				}
-			}
-		}
-	}
-}
-</style>

+ 0 - 207
pages/product/new.vue

@@ -1,207 +0,0 @@
-<template>
-	<view class="center">
-		<view class="top">
-			<image class="top-bg" src="../../static/img/top-bg.png" mode=""></image>
-			<view class="title">新品</view>
-		</view>
-		<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange">
-			<swiper-item class="carousel-item" @click="bannerNavToUrl(item)">
-				<!-- #ifdef APP-PLUS -->
-				<image src="../../static/img/new.png" />
-				<!-- #endif -->
-				<!-- #ifndef APP-PLUS -->
-				<image src="http://yiqugo.oss-cn-hangzhou.aliyuncs.com/4f5a820230406150308383.png" />
-
-				<!-- #endif -->
-			</swiper-item>
-		</swiper>
-		<view class="hotgoods" v-if="firstList.length != 0">
-			<view class="hotgoods-item" v-for="item in firstList" :key="item.id" @click="navToDetailPage(item)">
-				<view class="image-wrapper">
-					<image :src="item.image" mode="scaleToFill"></image>
-				</view>
-				<view class="title clamp margin-c-20">{{ item.store_name }}</view>
-				<view class="hot-price">
-					<view class="price">
-						<text class="font-size-sm">¥</text>
-						{{ item.price }}
-					</view>
-				</view>
-			</view>
-		</view>
-		<u-tabbar activeColor="#f42b4e" v-model="current" :list="tabbar"></u-tabbar>
-	</view>
-</template>
-
-<script>
-	import {
-		tabbar1
-	} from '@/utils/tabbar.js';
-	import {
-		groomList
-	} from '@/api/product.js';
-	export default {
-		data() {
-			return {
-				current: 3,
-				tabbar: tabbar1,
-				firstList: [],
-				type: 2,
-				page: 1,
-				limit: 20,
-				loaded: false,
-				loadingType: 'more'
-			};
-		},
-		onLoad() {
-			this.loadData();
-		},
-		onReachBottom() {
-			this.loadData();
-		},
-		methods: {
-			loadData() {
-				let obj = this;
-				if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
-					return;
-				}
-				obj.loadingType = 'loading';
-				groomList({
-							page: obj.page,
-							limit: obj.limit
-						},
-						this.type
-					)
-					.then(({
-						data
-					}) => {
-						// 保存轮播图
-						obj.bannerImg = data.banner;
-						// 保存商品信息
-						obj.firstList = this.firstList.concat(data.list);
-						obj.loaded = true;
-						obj.page++;
-						if (obj.limit == data.list.length) {
-							obj.loadingType = 'more';
-						} else {
-							obj.loadingType = 'noMore';
-						}
-					})
-					.catch(e => {
-						console.log(e);
-					});
-			},
-			navToDetailPage(e) {
-				uni.navigateTo({
-					url: '/pages/product/product?id=' + e.id
-				});
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page,
-	.center {
-		min-height: 100%;
-		height: auto;
-		background: #ffffff;
-	}
-
-	.top {
-		position: relative;
-		width: 100%;
-		height: 400rpx;
-
-		.top-bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			width: 100%;
-			height: 100%;
-		}
-
-		.title {
-			position: relative;
-			z-index: 2;
-			padding: 30rpx 0;
-			font-size: 34rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #ffffff;
-			text-align: center;
-		}
-	}
-
-	.carousel {
-		width: 700rpx;
-		height: 300rpx;
-		margin: -280rpx auto 0;
-
-		image {
-			width: 700rpx;
-			height: 300rpx;
-		}
-	}
-
-	.hotgoods {
-		margin-top: 38rpx;
-		width: 100%;
-		display: flex;
-		flex-wrap: wrap;
-		padding: 0 32rpx;
-
-		.hotgoods-item {
-			width: 48%;
-			background-color: #ffffff;
-			border-radius: 12rpx;
-			margin-bottom: 24rpx;
-
-			&:nth-child(2n + 1) {
-				margin-right: 24rpx;
-			}
-
-			.image-wrapper {
-				width: 100%;
-				height: 330rpx;
-				// background: red;
-				border-radius: 3px;
-				overflow: hidden;
-
-				image {
-					width: 100%;
-					height: 100%;
-					opacity: 1;
-					border-radius: 12rpx 12rpx 0 0;
-				}
-			}
-
-			.title {
-				font-size: $font-base;
-				color: $font-color-dark;
-				font-weight: bold;
-				line-height: 80rpx;
-			}
-
-			.hot-price {
-				display: flex;
-				justify-content: space-between;
-				padding: 0 16rpx 12rpx;
-
-				.price {
-					font-size: 36rpx;
-					font-weight: bold;
-					color: #fd3b39;
-				}
-
-				.cart-icon {
-					image {
-						width: 44rpx;
-						height: 44rpx;
-					}
-				}
-			}
-		}
-	}
-</style>

+ 0 - 278
pages/product/reply.vue

@@ -1,278 +0,0 @@
-<template>
-	<view class="container">
-		<view class="reply_btn flex_item">
-			<view class="btn" v-for="(item, index) in navList" :key="index" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">
-				{{ item.text }}({{ item.number }})
-			</view>
-		</view>
-		<swiper :current="tabCurrentIndex" class="swiper-box" :style="{ height: maxheight + 'px' }" 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="loadDate">
-					<!-- 评论列表 -->
-					<view v-for="(item, index) in tabItem.orderList" :key="index" class="eva-box">
-						<view class="row-1 flex1">
-							<image class="portrait" :src="item.avatar" mode="aspectFill"></image>
-							<view class="right flex1">
-								<view>
-									<view class="name flex1">
-										<view>{{ item.nickname }}</view>
-										<!-- <image src="../../static/label/vip.png"></image> -->
-									</view>
-									<uniRate class="rate" disabled size="10" margin="1" :value="item.product_score" ></uniRate>
-								</view>
-								<view class="bot">
-									<text class="attr"></text>
-									<text class="time">{{ item.add_time }}</text>
-								</view>
-							</view>
-						</view>
-						<view class="con">{{ item.comment }}</view>
-						<view class="con_box">
-							<view class="con_image" v-for="ls in item.pics"><image :src="ls"></image></view>
-						</view>
-					</view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import { reply_config, reply_list } from '@/api/product.js';
-import uniRate from '@/components/uni-rate/uni-rate.vue';
-export default {
-	components: {
-		uniRate
-	},
-	watch: {},
-	data() {
-		return {
-			maxheight: '',
-			id: '', //商品id
-			list: '', //评论列表
-			reply: '', //评论配置
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					state: 0,
-					text: '全部',
-					loadingType: 'more',
-					number: '',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 5 //每次信息条数
-				},
-				{
-					state: 1,
-					text: '好评',
-					loadingType: 'more',
-					number: '',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 5 //每次信息条数
-				},
-				{
-					state: 3,
-					text: '差评',
-					loadingType: 'more',
-					number: '',
-					orderList: [],
-					page: 1, //当前页数
-					limit:5 //每次信息条数
-				},
-				{
-					state: 2,
-					text: '中评',
-					loadingType: 'more',
-					number: '',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 5 //每次信息条数
-				}
-			]
-		};
-	},
-	computed: {},
-	onReady() {
-		// 初始化获取页面宽度
-		uni.createSelectorQuery()
-			.select('.container')
-			.fields(
-				{
-					size: true
-				},
-				data => {
-					// 保存头部高度
-					this.maxheight = data.height - Math.floor((data.width / 750) * 145);
-				}
-			)
-			.exec();
-	},
-	onLoad(option) {
-		this.id = option.id;
-	},
-	onShow() {
-		let obj = this;
-		reply_config({}, this.id).then(function({ data }) {
-			obj.reply = data;
-			obj.navList[0].number = obj.reply.sum_count;
-			obj.navList[1].number = obj.reply.good_count;
-			obj.navList[2].number = obj.reply.poor_count;
-			obj.navList[3].number = obj.reply.in_count;
-		});
-		this.loadDate();
-	},
-	methods: {
-		async loadDate(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';
-			reply_list(
-				{
-					type: state,
-					page: navItem.page,
-					limit: navItem.limit
-				},
-				this.id
-			)
-				.then(({ data }) => {
-					let arr = data;
-					navItem.orderList = navItem.orderList.concat(arr);
-					console.log(navItem.orderList,111)
-					navItem.page++;
-					if (navItem.limit == data.length) {
-						//判断是否还有数据, 有改为 more, 没有改为noMore
-						navItem.loadingType = 'more';
-						return;
-					} else {
-						//判断是否还有数据, 有改为 more, 没有改为noMore
-						navItem.loadingType = 'noMore';
-					}
-					this.$set(navItem, 'loaded', true);
-				})
-				.catch(e => {
-					console.log(e);
-				});
-		},
-		// async GetList(){
-		// 	let obj = this;
-		// 	reply_list({}, obj.id).then(function({ data }) {
-		// 		// console.log(data)
-		// 		obj.list = data;
-		// 	});
-		// },
-		//跳转接口
-		navTo(url) {
-			uni.navigateTo({
-				url
-			});
-		},
-		//swiper 切换
-		changeTab(e) {
-			this.tabCurrentIndex = e.target.current;
-			this.loadDate('tabChange');
-		},
-		//顶部tab点击
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-};
-</script>
-
-<style lang="scss">
-page {
-	background: #ffffff;
-	height: 100%;
-	.container {
-		height: 100%;
-		padding: 25rpx 25rpx;
-		padding-top: 120rpx;
-		.swiper-box {
-			// height: 100%;
-			.list-scroll-content {
-				height: 100%;
-			}
-		}
-	}
-}
-.reply_btn {
-	padding: 15rpx 0rpx;
-	.btn {
-		padding: 10rpx 25rpx;
-		font-size: 24rpx;
-		background: #f4f4f4;
-		margin-right: 25rpx;
-	}
-	.current {
-		background-color: #e93323 !important;
-		color: #ffffff !important;
-	}
-}
-.eva-box {
-	padding: 20rpx 0;
-	// height: 100%;
-	.row-1{
-		.portrait {
-			flex-shrink: 0;
-			width: 80rpx;
-			height: 80rpx;
-			border-radius: 100px;
-		}
-		.right {
-			flex: 1;
-			font-size: $font-base;
-			color: $font-color-base;
-			padding-left: 26rpx;
-			.name{
-				margin-bottom: 20rpx;
-				image{
-					width: 35rpx;
-					height: 25rpx;
-				}
-			}
-			.bot {
-				display: flex;
-				justify-content: space-between;
-				font-size: $font-sm;
-				color: $font-color-light;
-			}
-		}
-	}
-	.con {
-		font-size:24rpx;
-		font-weight:500;
-		color:rgba(84,84,86,1);
-		padding: 20rpx 0 35rpx 0;
-		letter-spacing: 3rpx;
-	}
-	.con_image {
-		width: 150rpx;
-		height: 150rpx;
-		display: inline-block;
-		margin-right: 20rpx;
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-}
-
-
-</style>

+ 0 - 116
pages/product/zero.vue

@@ -1,116 +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" :style="{ height: maxheight + 'px' }">
-			<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.orderList.length === 0"></empty>
-
-					<!-- 订单列表 -->
-					<view v-for="(ls, index) in tabItem.orderList"></view>
-					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
-				</scroll-view>
-			</swiper-item>
-		</swiper>
-	</view>
-</template>
-
-<script>
-import empty from '@/components/empty';
-export default {
-	components: {
-		empty,
-	},
-	// 计算剩余高度
-	onReady(res) {
-		var _this = this;
-		uni.getSystemInfo({
-			success: resu => {
-				const query = uni.createSelectorQuery();
-				query.select('.swiper-box').boundingClientRect();
-				query.exec(function(res) {
-					console.log(res, 'ddddddddddddd');
-					_this.maxheight = resu.windowHeight - res[0].top + 'px';
-					console.log('打印页面的剩余高度', _this.maxheight);
-				});
-			},
-			fail: res => {}
-		});
-	},
-	data() {
-		return {
-			// 头部图高度
-			maxheight: '',
-			tabCurrentIndex: 0,
-			navList: [
-				{
-					text: '首页',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				},
-				{
-					text: '我的抢购',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 10 //每次信息条数
-				}
-			]
-		};
-	},
-	methods: {
-		tabClick(index) {
-			this.tabCurrentIndex = index;
-		}
-	}
-};
-</script>
-
-<style lang="less">
-.content,page {
-	
-}
-.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: #999999;
-		position: relative;
-		&.current {
-			color: #dc262b;
-			&:after {
-				content: '';
-				position: absolute;
-				left: 50%;
-				bottom: 0;
-				transform: translateX(-50%);
-				width: 44px;
-				height: 0;
-				border-bottom: 2px solid #dc262b;
-			}
-		}
-	}
-}
-.swiper-box {
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-	}
-}
-</style>

+ 0 - 617
pages/store/shopList.vue

@@ -1,617 +0,0 @@
-<template>
-	<view class="content">
-		<!-- <view class="shop">
-			<view class="shop-title">
-				<view class="shop-item" @click="changePx(0)">
-					<view class="sitem-font" :class="{ choose: PXType == 0 }">销量</view>
-					<view class="p-box">
-						<text :class="{ active: PXType == 0 && numberOrder === 1 }" class="iconfont iconfold"></text>
-						<text :class="{ active: PXType == 0 && numberOrder === 2 }"
-							class="iconfont iconfold xia"></text>
-					</view>
-				</view>
-				<view class="shop-item" @click="changePx(1)">
-					<view class="sitem-font" :class="{ choose: PXType == 1 }">位置距离</view>
-					<view class="p-box">
-						<text :class="{ active: PXType == 1 && distance === 1 }" class="iconfont iconfold"></text>
-						<text :class="{ active: PXType == 1 && distance === 2 }" class="iconfont iconfold xia"></text>
-					</view>
-				</view>
-			</view>
-		</view> -->
-		<scroll-view scroll-y="true" :style="{ height: height }" class="shop-list-wrap" @scrolltolower="getStoreList()">
-			<!-- 空白页 -->
-			<empty v-if="loaded === true && shopList.length === 0"></empty>
-			<view class="djq-wrap flex f-ai-s" v-for="item in shopList"
-				@click="navTo('/pages/store/shopDetail?id=' + item.id)">
-				<image :src="item.image" mode="" class="djq-img"></image>
-				<view class="djq-right pl20">
-					<view class="djq-tit flex f-j-sb f-ai-s">
-						<view class="djq-name clamp">{{ item.name }}</view>
-						<view class="djq-dis">
-							<image src="../../static/icon/dw.png" mode=""></image>
-							距离{{ (item.range * 1).toFixed(2) }}KM
-						</view>
-					</view>
-					<view class="flex f-d-c f-j-sb f-ai-s fg1" style="height: 110rpx;">
-						<view class="djq-dz-box">
-							<view class="djq-dz clamp2">{{ item.detailed_address }}</view>
-							<view class="djq-dz">每100元赠送趣豆{{ item.gift_integral * 1 }}</view>
-						</view>
-						<view class="djq-hd flex f-j-sb">
-							<view class="hd-btn">
-								<image src="../../static/icon/call.png" mode="" style="margin-right: 15rpx;"
-									@click.stop="makeCall(item.phone)"></image>
-								<!-- #ifdef H5 -->
-								<image src="../../static/icon/dh.png" mode=""
-									@click.stop="toGaodeMap(item.latitude, item.longitude, item.name)"></image>
-								<!-- #endif -->
-								<!-- #ifdef MP -->
-								<image src="../../static/icon/dh.png" mode="" @click.stop="dh(item)"></image>
-								<!-- #endif -->
-								<!-- #ifdef APP-PLUS -->
-								<image src="../../static/icon/dh.png" mode=""
-									@click.stop="gomapApp(item.latitude, item.longitude, item.name)"></image>
-								<!-- #endif -->
-							</view>
-						</view>
-					</view>
-					<view class="" style="padding: 10rpx 0 0 0;">
-						<view class="left-btm flex f-j-s" v-for="itemt in item.cou">
-							<view class="j-price">
-								<text>¥</text>
-								{{ itemt.coupon_price }}
-							</view>
-							<view class="j-name">{{ itemt.title }}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<uni-load-more :status="loadingType"></uni-load-more>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import empty from '@/components/empty';
-	// #ifdef H5
-	import {
-		weixindata,
-		shareLoad
-	} from '@/utils/wxAuthorized';
-	// #endif
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	import {
-		getStoreList
-	} from '@/api/shop.js';
-	export default {
-		components: {
-			empty
-		},
-		data() {
-			return {
-				page: 1,
-				limit: 10,
-				shopList: [],
-				name: '',
-				height: '',
-				PXType: 0, //店铺排序规则 0-》销量排序 1-》距离排序 2-》趣豆多少排序
-				numberOrder: 1, //销量排序1升2降
-				distance: 1, //距离排序1升2降
-				qudou: 1, //趣豆多少排序1升2降
-				loadingType: 'more',
-				loaded: false
-			};
-		},
-		computed: {
-			...mapState(['loginInterceptor', 'baseURL', 'latitude', 'longitude'])
-		},
-		onLoad(opt) {
-			this.getStoreList();
-		},
-		onShow() {},
-		onReachBottom() {},
-		onReady() {
-			var obj = this;
-			uni.getSystemInfo({
-				success: resu => {
-					const query = uni.createSelectorQuery();
-					query.select('.shop-list-wrap').boundingClientRect();
-					query.exec(function(res) {
-						obj.height = resu.windowHeight - res[0].top + 'px';
-					});
-				},
-				fail: res => {}
-			});
-		},
-		methods: {
-			changePx(index) {
-				let obj = this;
-				obj.PXType = index;
-				if (index === 0) {
-					this.order = this.numberOrder === 1 ? 'asc' : 'desc';
-					this.numberOrder = this.numberOrder === 1 ? 2 : 1;
-				}
-				if (index === 1) {
-					this.order = this.distance === 1 ? 'asc' : 'desc';
-					this.distance = this.distance === 1 ? 2 : 1;
-				}
-				// 判断是否为价格优先
-				if (index === 2) {
-					this.order = this.qudou === 1 ? 'asc' : 'desc';
-					this.qudou = this.qudou === 1 ? 2 : 1;
-				}
-				console.log('切换显示');
-				this.page = 1;
-				this.loadingType = 'more';
-				this.getStoreList('reload');
-			},
-			navTo(url) {
-				uni.navigateTo({
-					url,
-					fail() {
-						uni.switchTab({
-							url
-						});
-					}
-				});
-			},
-			search() {
-				let obj = this;
-				obj.shopList = [];
-				obj.loadingType = 'more';
-				obj.page = 1;
-				obj.getStoreList();
-			},
-			// 拨打电话
-			makeCall(phone) {
-				console.log(phone, '121345');
-				uni.makePhoneCall({
-					phoneNumber: phone //仅为示例
-				});
-			},
-			// 导航
-			dh(item) {
-				wx.openLocation({
-					latitude: item.latitude * 1,
-					longitude: item.longitude * 1,
-					name: item.name,
-					address: item.detailed_address
-				});
-			},
-			getStoreList(type) {
-				let obj = this;
-				if (obj.loadingType == 'noMore' || obj.loadingType == 'loading') {
-					return;
-				}
-				obj.loadingType = 'loading';
-				getStoreList({
-					name: obj.name,
-					latitude: obj.latitude,
-					longitude: obj.longitude,
-					page: obj.page,
-					limit: obj.limit,
-					sort: obj.PXType == 0 ? 'achievement' : obj.PXType == 1 ? 'distance' : 'gift_integral',
-					order: obj.order
-				}).then(res => {
-					console.log(res, type);
-					if (type == 'reload') {
-						obj.shopList = [];
-					}
-					console.log(obj.shopList, '12456');
-					obj.shopList = obj.shopList.concat(res.data.list);
-					obj.page++;
-					if (obj.limit == res.data.list.length) {
-						obj.loadingType = 'more';
-					} else {
-						obj.loadingType = 'noMore';
-					}
-					obj.loaded = true;
-				});
-			},
-			gomapApp(latitude, longitude, name) {
-				let url = '';
-				if (plus.os.name == 'Android') {
-					//判断是安卓端
-					plus.nativeUI.actionSheet({
-							//选择菜单
-							title: '选择地图应用',
-							cancel: '取消',
-							buttons: [{
-								title: '腾讯地图'
-							}, {
-								title: '百度地图'
-							}, {
-								title: '高德地图'
-							}]
-						},
-						function(e) {
-							switch (e.index) {
-								//下面是拼接url,不同系统以及不同地图都有不同的拼接字段
-								case 1:
-									//注意referer=xxx的xxx替换成你在腾讯地图开发平台申请的key
-									url = `qqmap://map/geocoder?coord=${latitude},${longitude}&referer=xxx`;
-									break;
-								case 2:
-									url =
-										`baidumap://map/marker?location=${latitude},${longitude}&title=${name}&coord_type=gcj02&src=andr.baidu.openAPIdemo`;
-									break;
-								case 3:
-									url =
-										`androidamap://viewMap?sourceApplication=appname&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`;
-									break;
-								default:
-									break;
-							}
-							if (url != '') {
-								url = encodeURI(url);
-								//plus.runtime.openURL(url,function(e){})调起手机APP应用
-								plus.runtime.openURL(url, function(e) {
-									plus.nativeUI.alert('本机未安装指定的地图应用');
-								});
-							}
-						}
-					);
-				} else {
-					// iOS上获取本机是否安装了百度高德地图,需要在manifest里配置
-					// 在manifest.json文件app-plus->distribute->apple->urlschemewhitelist节点下添加
-					//(如urlschemewhitelist:["iosamap","baidumap"])
-					plus.nativeUI.actionSheet({
-							title: '选择地图应用',
-							cancel: '取消',
-							buttons: [{
-								title: '腾讯地图'
-							}, {
-								title: '百度地图'
-							}, {
-								title: '高德地图'
-							}]
-						},
-						function(e) {
-							switch (e.index) {
-								case 1:
-									url = `qqmap://map/geocoder?coord=${latitude},${longitude}&referer=xxx`;
-									break;
-								case 2:
-									url =
-										`baidumap://map/marker?location=${latitude},${longitude}&title=${name}&content=${name}&src=ios.baidu.openAPIdemo&coord_type=gcj02`;
-									break;
-								case 3:
-									url =
-										`iosamap://viewMap?sourceApplication=applicationName&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`;
-									break;
-								default:
-									break;
-							}
-							if (url != '') {
-								url = encodeURI(url);
-								plus.runtime.openURL(url, function(e) {
-									plus.nativeUI.alert('本机未安装指定的地图应用');
-								});
-							}
-						}
-					);
-				}
-			},
-			// 调用高德
-			toGaodeMap(latitude, longitude, address) {
-				console.log('选择高德', latitude, longitude, address);
-				window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`;
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	.search-top {
-		// position: fixed;
-		// top: 0;
-		// z-index: 99;
-	}
-
-	.shop {
-		// margin-top: 20rpx;
-		background: #ffffff;
-		padding: 0 12rpx;
-
-		.shop-title {
-			padding: 30rpx 0 20rpx;
-			display: flex;
-			align-items: center;
-			border-bottom: 1px solid #e3e6e7;
-
-			.shop-item {
-				width: 33%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-				.sitem-font {
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #333333;
-				}
-
-				.jt-down {
-					width: 10rpx;
-					height: 8rpx;
-					margin-left: 12rpx;
-				}
-			}
-		}
-	}
-
-	.shop-list-wrap {
-		// background-color: red;
-		padding-top: 20rpx;
-	}
-
-	.djq-wrap {
-		width: 701rpx;
-		// height: 255rpx;
-		background: #ffffff;
-		box-shadow: 0px 0px 27rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin: 0 auto 20rpx;
-		padding: 23rpx 22rpx;
-
-		&:last-of-type {
-			margin-bottom: 0;
-		}
-
-		.djq-img {
-			flex-shrink: 0;
-			width: 150rpx;
-			height: 150rpx;
-			border-radius: 10rpx;
-		}
-
-		.djq-right {
-			width: 500rpx;
-			margin-left: 10rpx;
-
-			.djq-tit {
-				font-size: 34rpx;
-				font-weight: bold;
-				color: #333333;
-				line-height: 52rpx;
-
-				.djq-name {
-					max-width: 300rpx;
-				}
-
-				.djq-dis {
-					display: flex;
-					align-items: center;
-					flex-shrink: 0;
-
-					image {
-						width: 20rpx;
-						height: 28rpx;
-						margin-right: 10rpx;
-					}
-
-					font-size: 22rpx;
-					font-weight: 500;
-					color: #666666;
-				}
-			}
-
-			.djq-dz-box {
-				width: 60%;
-			}
-
-			.djq-dz {
-				width: 100%;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #666666;
-			}
-
-			.djq-hd {
-				width: 30%;
-				display: flex;
-				justify-content: end;
-
-				.buy-info {
-					display: inline-block;
-					height: 32rpx;
-					border-radius: 16rpx 16rpx 16rpx 0px;
-					line-height: 32rpx;
-					font-size: 20rpx;
-					font-weight: 500;
-					color: #ff440d;
-					padding: 0 15rpx;
-					background-color: #fff;
-				}
-
-				.hd-btn {
-					image {
-						width: 46rpx;
-						height: 46rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.left-btm {
-		height: 50rpx;
-
-		.j-logo {
-			width: 32rpx;
-			line-height: 33rpx;
-			background: linear-gradient(-48deg, #ffa30b, #ffd158);
-			border-radius: 13rpx;
-			font-size: 21rpx;
-			font-weight: 500;
-			color: #ffffff;
-			text-align: center;
-		}
-
-		.j-price {
-			font-size: 27rpx;
-			font-weight: bold;
-			color: #ff4c4c;
-			margin: 0 10rpx 0 5rpx;
-		}
-
-		.j-zk {
-			height: 31rpx;
-			border: 1rpx solid #ff4c4c;
-			border-radius: 7rpx;
-			line-height: 31rpx;
-			padding: 0 8rpx;
-			font-size: 20rpx;
-			font-weight: bold;
-			color: #ff4c4c;
-			margin-right: 5rpx;
-		}
-
-		.j-name {
-			font-size: 23rpx;
-			font-weight: bold;
-			color: #333333;
-		}
-	}
-
-	.search {
-		justify-content: flex-start;
-		padding: 10rpx 32rpx 20rpx;
-		align-items: center;
-		background-color: #fff;
-
-		.search-btn {
-			display: inline-block;
-			// flex-grow: ;
-			flex-shrink: 0;
-			padding: 0 0 0 20rpx;
-			font-size: 32rpx;
-			color: #ff4c4c;
-			z-index: 99;
-		}
-
-		.address {
-			width: 32rpx;
-			height: 38rpx;
-		}
-
-		.shop-name {
-			height: 38rpx;
-			position: relative;
-			top: -4rpx;
-			z-index: 100;
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			padding-left: 10rpx;
-		}
-
-		.shop-jt {
-			margin-left: 8rpx;
-			width: 16rpx;
-			height: 10rpx;
-		}
-
-		.input-box {
-			margin-left: 10rpx;
-			position: relative;
-			z-index: 99;
-			width: 710rpx;
-			height: 60rpx;
-			background: #eeeeee;
-			border-radius: 30rpx;
-
-			.input-content {
-				position: relative;
-				z-index: 11;
-				border-radius: 99rpx;
-				flex-grow: 1;
-				padding: 5rpx 30rpx;
-				background: #eeeeee;
-
-				.iconsearch {
-					font-size: 50rpx;
-					color: #cbcbcb;
-				}
-
-				.input {
-					margin-left: 19rpx;
-					flex-grow: 1;
-
-					input {
-						font-size: 28rpx;
-
-						color: #000;
-					}
-				}
-			}
-
-			.input-button {
-				padding-left: 20rpx;
-				font-size: $font-base;
-				height: 100%;
-			}
-		}
-	}
-
-	.shop {
-		margin-top: 20rpx;
-		background: #ffffff;
-		padding: 0 12rpx;
-
-		.shop-title {
-			padding: 30rpx 0 20rpx;
-			display: flex;
-			align-items: center;
-			border-bottom: 1px solid #e3e6e7;
-
-			.shop-item {
-				width: 25%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-				.sitem-font {
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #333333;
-				}
-
-				.choose {
-					color: #ff4c4c;
-				}
-
-				.p-box {
-					display: flex;
-					flex-direction: column;
-
-					.iconfont {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						width: 30rpx;
-						height: 14rpx;
-						line-height: 1;
-						margin-left: 4rpx;
-						font-size: 26rpx;
-						color: #888;
-
-						&.active {
-							color: $base-color;
-						}
-					}
-
-					.xia {
-						transform: scaleY(-1);
-					}
-				}
-			}
-		}
-	}
-</style>

+ 0 - 1578
pages/store/store.vue

@@ -1,1578 +0,0 @@
-<template>
-	<view class="container">
-		<view class="carousel-section">
-			<swiper class="carousel" autoplay="true" duration="400" interval="5000" @change="swiperChange"
-				:indicator-dots="true" indicator-active-color="#FFFFFF">
-				<swiper-item class="carousel-item">
-					<!-- #ifndef APP-PLUS -->
-					<image src="http://yiqugo.oss-cn-hangzhou.aliyuncs.com/f8564202304061452591511.png"
-						mode="aspectFill"></image>
-					<!-- #endif -->
-					<!-- #ifdef APP-PLUS -->
-					<image src="http://yiqugo.oss-cn-hangzhou.aliyuncs.com/f8564202304061452591511.png"
-						mode="aspectFill"></image>
-					<!-- #endif -->
-				</swiper-item>
-			</swiper>
-			<!-- <view class="search flex">
-				<view class="input-box flex" @click.stop="clickSearch">
-					<view class=" input-content flex">
-						<view class="iconfont iconsearch"></view>
-						<view class="input"><input type="text" disabled value="搜索附近门店" /></view>
-					</view>
-				</view>
-			</view> -->
-		</view>
-		<swiper :interval="3000" :duration="1000" style="height: 300rpx;background: #fff;">
-			<swiper-item v-for="(shopitem, shopindex) in shopList" :key="shopindex">
-				<view class="shop-list flex" style="padding-top: 40rpx;">
-					<view class="shop-item flex" v-for="(item, index) in shopitem"
-						@click="navto('/pages/store/shopList?id=' + item.id)">
-						<image :src="item.pic" mode="" class="shop-img"></image>
-						<view class="shop-name">{{ item.cate_name }}</view>
-					</view>
-				</view>
-			</swiper-item>
-		</swiper>
-		<!-- 门店列表 -->
-		<view class="" style="height: 20rpx;"></view>
-		<view class="shop">
-			<view class="shop-title">
-				<view class="shop-item" @click="changePx(0)">
-					<view class="sitem-font" :class="{ choose: PXType == 0 }">销量</view>
-					<view class="p-box">
-						<text :class="{ active: PXType == 0 && numberOrder === 1 }" class="iconfont iconfold"></text>
-						<text :class="{ active: PXType == 0 && numberOrder === 2 }"
-							class="iconfont iconfold xia"></text>
-					</view>
-				</view>
-				<view class="shop-item" @click="changePx(1)">
-					<view class="sitem-font" :class="{ choose: PXType == 1 }">位置距离</view>
-					<view class="p-box">
-						<text :class="{ active: PXType == 1 && distance === 1 }" class="iconfont iconfold"></text>
-						<text :class="{ active: PXType == 1 && distance === 2 }" class="iconfont iconfold xia"></text>
-					</view>
-				</view>
-				<view class="shop-item" @click="changePx(2)">
-					<view class="sitem-font" :class="{ choose: PXType == 2 }">趣豆赠送</view>
-					<view class="p-box">
-						<text :class="{ active: PXType == 2 && qudou === 1 }" class="iconfont iconfold"></text>
-						<text :class="{ active: PXType == 2 && qudou === 2 }" class="iconfont iconfold xia"></text>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="" style="height: 20rpx;"></view>
-		<view class="djq-wrap flex f-ai-s" v-for="storeitem in storeList"
-			@click="navto('/pages/store/shopDetail?id=' + storeitem.id)">
-			<image :src="storeitem.image" mode="" class="djq-img"></image>
-			<view class="djq-right pl20">
-				<view class="djq-tit flex f-j-sb f-ai-s">
-					<view class="djq-name clamp">{{ storeitem.name }}</view>
-					<view class="djq-dis">
-						<image src="https://hy.liuniu946.com/app/index/index10.png" mode=""></image>
-						距离{{ (storeitem.range * 1).toFixed(2) * 1 }}KM
-					</view>
-				</view>
-				<view class="flex f-d-c f-j-sb f-ai-s fg1" style="height: 110rpx;">
-					<view class="djq-dz-box">
-						<view class="djq-dz clamp2">{{ storeitem.detailed_address }}</view>
-						<view class="djq-dz">每100元赠送趣豆{{ storeitem.gift_integral * 1 }}</view>
-					</view>
-
-					<view class="djq-hd flex f-j-sb">
-						<view class="hd-btn">
-							<image src="../../static/icon/call.png" mode="" style="margin-right: 15rpx;"
-								@click.stop="makeCall(storeitem.phone)"></image>
-							<!-- #ifdef H5 -->
-							<image src="../../static/icon/dh.png" mode=""
-								@click.stop="toGaodeMap(storeitem.latitude, storeitem.longitude, storeitem.name)">
-							</image>
-							<!-- #endif -->
-							<!-- #ifdef MP -->
-							<image src="../../static/icon/dh.png" mode="" @click.stop="dh(storeitem)"></image>
-							<!-- #endif -->
-							<!-- #ifdef APP-PLUS -->
-							<image src="../../static/icon/dh.png" mode=""
-								@click.stop="gomapApp(storeitem.latitude, storeitem.longitude, storeitem.name)"></image>
-							<!-- #endif -->
-						</view>
-					</view>
-				</view>
-				<view class="" style="padding: 10rpx 0 0 0;" v-if="storeitem.cou && storeitem.cou.length > 0">
-					<view class="left-btm flex f-j-s" v-for="qitem in storeitem.cou">
-						<view class="j-price">
-							<text>¥</text>
-							{{ qitem.coupon_price }}
-						</view>
-						<view class="j-name">{{ qitem.title }}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<uni-load-more :status="loadingType"></uni-load-more>
-	</view>
-</template>
-
-<script>
-	// 地区选择
-	import LeeSelectCity from '@/components/lee-select-city/lee-select-city.vue';
-	import {
-		store_cate,
-		getStoreList,
-		getCity
-	} from '@/api/shop.js';
-	import {
-		lookSubpoints,
-		lookOneself
-	} from '../../api/user.js';
-	import seckill from '../../components/seckill/seckill.vue';
-	import {
-		loadIndexs,
-		getVip
-	} from '@/api/index.js';
-	import {
-		getUserInfo,
-		spread
-	} from '@/api/user.js';
-	import {
-		getBargainList,
-		getProducts
-	} from '@/api/product.js';
-	import {
-		interceptor
-	} from '@/utils/loginUtils';
-	import {
-		openMap
-	} from '@/utils/rocessor';
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex';
-	// #ifdef H5
-	import {
-		weixindata,
-		shareLoad
-	} from '@/utils/wxAuthorized';
-	// #endif
-	export default {
-		components: {
-			seckill,
-			LeeSelectCity
-		},
-		data() {
-			return {
-				page: 1,
-				limitt: 20,
-				loadingType: 'more',
-				district: '定位中',
-				PXType: 0, //店铺排序规则 0-》销量排序 1-》距离排序 2-》趣豆多少排序
-				numberOrder: 1, //销量排序1升2降
-				distance: 1, //距离排序1升2降
-				qudou: 1, //趣豆多少排序1升2降
-				storeList: [],
-				current: 0,
-				carouselList: [], //轮播列表
-				page: 1,
-				limit: 5,
-				shopList: [],
-				period: 1,
-				order: ''
-			};
-		},
-		computed: {
-			...mapState(['loginInterceptor', 'baseURL', 'latitude', 'longitude', 'weichatObj', 'chooseDistrict']),
-			...mapState('user', ['hasLogin', 'userInfo'])
-		},
-		onReachBottom() {
-			this.getStoreList();
-		},
-		onLoad: function(option) {
-			this.getaddress();
-			// #ifdef MP
-			if (option.scene) {
-				// 存储小程序邀请人
-				uni.setStorage({
-					key: 'spread_code',
-					data: option.scene
-				});
-			}
-			// #endif
-		},
-		watch: {
-			PXType(val, old) {
-				console.log('切换显示');
-				this.getStoreList();
-			}
-			// chooseDistrict(val,old) {
-			// 	this.reGetStoreList()
-			// }
-		},
-		onShow: function() {
-			this.getStoreCate();
-			this.getStoreList();
-			// this.loadData();
-		},
-		//下拉刷新
-		onPullDownRefresh() {
-			this.loadData();
-		},
-		// #ifndef MP
-		// 监听导航栏输入框点击事件
-		onNavigationBarSearchInputClicked(e) {
-			//跳转到搜索页面
-			this.clickSearch();
-		},
-		//点击导航栏 buttons 时触发
-		onNavigationBarButtonTap(e) {
-			const index = e.index;
-			if (index === 0) {
-				this.$api.msg('点击了扫描');
-			} else if (index === 1) {
-				// #ifdef APP-PLUS
-				const pages = getCurrentPages();
-				const page = pages[pages.length - 1];
-				const currentWebview = page.$getAppWebview();
-				currentWebview.hideTitleNViewButtonRedDot({
-					index
-				});
-				// #endif
-				uni.navigateTo({
-					url: '/user/page/notice'
-				});
-			}
-		},
-
-		// #endif
-		methods: {
-			...mapMutations(['setLat', 'setLon', 'setChoose']),
-			// 切换排序
-			changePx(index) {
-				let obj = this;
-				obj.PXType = index;
-				if (index === 0) {
-					this.order = this.numberOrder === 1 ? 'asc' : 'desc';
-					this.numberOrder = this.numberOrder === 1 ? 2 : 1;
-				}
-				if (index === 1) {
-					this.order = this.distance === 1 ? 'asc' : 'desc';
-					this.distance = this.distance === 1 ? 2 : 1;
-				}
-				// 判断是否为价格优先
-				if (index === 2) {
-					this.order = this.qudou === 1 ? 'asc' : 'desc';
-					this.qudou = this.qudou === 1 ? 2 : 1;
-				}
-				console.log('切换显示');
-				this.page = 1;
-				this.loadingType = 'more';
-				this.getStoreList('reload');
-			},
-			// 刷新门店列表
-			reGetStoreList() {
-				this.page = 1;
-				this.loadingType = 'more';
-				this.storeList = [];
-				console.log('地址刷新');
-				this.getStoreList();
-			},
-			// 计算距离
-			space(lat1, lng1, lat2, lng2) {
-				console.log(lat1, lng1, lat2, lng2);
-				var radLat1 = (lat1 * Math.PI) / 180.0;
-				var radLat2 = (lat2 * Math.PI) / 180.0;
-				var a = radLat1 - radLat2;
-				var b = (lng1 * Math.PI) / 180.0 - (lng2 * Math.PI) / 180.0;
-				var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math
-					.pow(Math.sin(b / 2), 2)));
-				s = s * 6378.137;
-				s = Math.round(s * 10000) / 10000;
-				// return s * 1000; // 单位米
-				return s; //单位km
-			},
-			// 获取店铺分类
-			getStoreCate() {
-				let obj = this;
-				store_cate().then(res => {
-					console.log(res);
-					obj.shopList = obj.chunkArr(res.data, 10);
-					console.log(obj.shopList, 'this.shopList+++++++++++++');
-				});
-			},
-			// 拨打电话
-			makeCall(phone) {
-				console.log(phone, '123456');
-				uni.makePhoneCall({
-					phoneNumber: phone, //仅为示例
-					fail(err) {
-						console.log(err, 'fail');
-					},
-					success(res) {
-						console.log(res, 'success');
-					}
-				});
-			},
-			// 导航
-			dh(item) {
-				wx.openLocation({
-					latitude: item.latitude * 1,
-					longitude: item.longitude * 1,
-					name: item.name,
-					address: item.detailed_address
-				});
-			},
-			// 获取商店列表
-			getStoreList(type) {
-				let obj = this;
-				if (obj.loadingType == 'loading' || obj.loadingType == 'noMore') {
-					return;
-				}
-				obj.loadingType = 'loading';
-				let data = {
-					page: obj.page,
-					latitude: obj.latitude,
-					longitude: obj.longitude,
-					limit: obj.limitt,
-					// address: obj.$store.state.chooseProvince,
-					sort: obj.PXType == 0 ? 'achievement' : obj.PXType == 1 ? 'distance' : 'gift_integral',
-					order: obj.order
-				};
-				getStoreList(data)
-					.then(res => {
-						console.log(res, '1111');
-						if (type == 'reload') {
-							obj.storeList = [];
-						}
-						console.log(type);
-						if (res.data.list.length > 0) {
-							obj.storeList = obj.storeList.concat(res.data.list);
-							obj.page++;
-							console.log('数据加载完毕');
-						}
-
-						if (obj.limitt == res.data.list.length) {
-							//说明数据已经加载完毕了
-							obj.loadingType = 'more';
-							console.log('加载完毕1111111');
-						} else {
-							console.log('加载完毕1222222222211');
-							obj.loadingType = 'noMore';
-						}
-						//说明还有数据
-						uni.hideLoading();
-						this.$set(obj.storeList, 'loaded', true);
-					})
-					.catch(err => {
-						console.log(err, '报错');
-					});
-			},
-			getLocation() {
-				uni.getLocation({
-					type: 'gcj02',
-					success(e) {
-						console.log(e, 'dingwei');
-					}
-				});
-			},
-			navto(url) {
-				uni.navigateTo({
-					url,
-					fail() {
-						uni.switchTab({
-							url
-						});
-					}
-				});
-			},
-			getaddress() {
-				console.log('dizhi+++++++++++');
-				let obj = this;
-				uni.getLocation({
-					type: 'wgs84',
-					success: res => {
-						// uni.showModal({
-						// 	title: '成功',
-						// 	content: JSON.stringify(res)
-						// });
-						let wz = obj.wgs84Togcj02(res.longitude, res.latitude);
-						obj.setLat(wz[1]);
-						obj.setLon(wz[0]);
-						console.log(wz, '经纬度');
-						this.getStoreList();
-						// obj.getCity();
-					},
-					fail: err => {
-						// uni.showModal({
-						// 	title: '失败',
-						// 	content: JSON.stringify(err)
-						// });
-						this.getStoreList();
-						openMap().then(e => {
-							this.getaddress();
-						});
-					}
-				});
-			},
-			wgs84Togcj02(lng, lat) {
-				if (this.out_of_china(lng, lat)) {
-					return [lng, lat];
-				}
-				//定义一些常量
-				//GCJ02 转换为 WGS84
-				var that = this;
-				const x_PI = (3.14159265358979324 * 3000.0) / 180.0;
-				const PI = 3.1415926535897932384626;
-				const a = 6378245.0;
-				const ee = 0.00669342162296594323;
-				let dlat = that.transformlat(lng - 105.0, lat - 35.0);
-				let dlng = that.transformlng(lng - 105.0, lat - 35.0);
-				let radlat = (lat / 180.0) * PI;
-				let magic = Math.sin(radlat);
-				magic = 1 - ee * magic * magic;
-				let sqrtmagic = Math.sqrt(magic);
-				dlat = (dlat * 180.0) / (((a * (1 - ee)) / (magic * sqrtmagic)) * PI);
-				dlng = (dlng * 180.0) / ((a / sqrtmagic) * Math.cos(radlat) * PI);
-				var mglat = lat + dlat;
-				var mglng = lng + dlng;
-				return [mglng, mglat];
-			},
-
-			out_of_china(lng, lat) {
-				return lng < 72.004 || lng > 137.8347 || (lat < 0.8293 || lat > 55.8271 || false);
-			},
-
-			transformlat(lng, lat) {
-				const x_PI = (3.14159265358979324 * 3000.0) / 180.0;
-				const PI = 3.1415926535897932384626;
-				const a = 6378245.0;
-				const ee = 0.00669342162296594323;
-				let ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(
-					lng));
-				ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0;
-				ret += ((20.0 * Math.sin(lat * PI) + 40.0 * Math.sin((lat / 3.0) * PI)) * 2.0) / 3.0;
-				ret += ((160.0 * Math.sin((lat / 12.0) * PI) + 320 * Math.sin((lat * PI) / 30.0)) * 2.0) / 3.0;
-				return ret;
-			},
-			transformlng(lng, lat) {
-				const x_PI = (3.14159265358979324 * 3000.0) / 180.0;
-				const PI = 3.1415926535897932384626;
-				const a = 6378245.0;
-				const ee = 0.00669342162296594323;
-				let ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
-				ret += ((20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0) / 3.0;
-				ret += ((20.0 * Math.sin(lng * PI) + 40.0 * Math.sin((lng / 3.0) * PI)) * 2.0) / 3.0;
-				ret += ((150.0 * Math.sin((lng / 12.0) * PI) + 300.0 * Math.sin((lng / 30.0) * PI)) * 2.0) / 3.0;
-				return ret;
-			},
-			navTo(url) {
-				if (url == '') {
-					this.$api.msg('暂未开通,敬请期待');
-				} else {
-					uni.navigateTo({
-						url
-					});
-				}
-			},
-			// 點擊搜索框
-			clickSearch() {
-				uni.navigateTo({
-					url: '/pages/store/shopList'
-				});
-			},
-			// 监听图片加载完成
-			onImageError(key, index) {
-				this[key][index].image = '/static/error/errorImage.jpg';
-			},
-			// 请求载入数据
-			async loadData() {
-				loadIndexs({})
-					.then(({
-						data
-					}) => {
-						this.carouselList = data.info.storebanner;
-						uni.stopPullDownRefresh();
-					})
-					.catch(e => {
-						uni.stopPullDownRefresh();
-					});
-			},
-			//轮播图切换修改背景色
-			swiperChange(e) {
-				const index = e.detail.current;
-				this.swiperCurrent = index;
-				this.titleNViewBackground = this.carouselList[index].background;
-			},
-			// 轮播图跳转
-			bannerNavToUrl(item) {
-				// #ifdef H5
-				console.log(item.wap_url.indexOf('http'), 'banner');
-				if (item.wap_url.indexOf('http') >= 0) {
-					window.location.href = item.wap_url;
-				}
-				// #endif
-				//测试数据没有写id,用title代替
-				uni.navigateTo({
-					url: item.wap_url
-				});
-			},
-			// 根据指定个数分割数组
-			chunkArr(arr, size) {
-				console.log(arr, 'arr+++++');
-				//判断如果不是数组(就没有length),或者size没有传值,size小于1,就返回空数组
-				if (!arr.length || !size || size < 1) return [];
-				let [start, end, result] = [null, null, []];
-				for (let i = 0; i < Math.ceil(arr.length / size); i++) {
-					start = i * size;
-					end = start + size;
-					result.push(arr.slice(start, end));
-				}
-				return result;
-			},
-			gomapApp(latitude, longitude, name) {
-				let url = '';
-				if (plus.os.name == 'Android') {
-					//判断是安卓端
-					plus.nativeUI.actionSheet({
-							//选择菜单
-							title: '选择地图应用',
-							cancel: '取消',
-							buttons: [{
-								title: '腾讯地图'
-							}, {
-								title: '百度地图'
-							}, {
-								title: '高德地图'
-							}]
-						},
-						function(e) {
-							switch (e.index) {
-								//下面是拼接url,不同系统以及不同地图都有不同的拼接字段
-								case 1:
-									//注意referer=xxx的xxx替换成你在腾讯地图开发平台申请的key
-									url = `qqmap://map/geocoder?coord=${latitude},${longitude}&referer=xxx`;
-									break;
-								case 2:
-									url =
-										`baidumap://map/marker?location=${latitude},${longitude}&title=${name}&coord_type=gcj02&src=andr.baidu.openAPIdemo`;
-									break;
-								case 3:
-									url =
-										`androidamap://viewMap?sourceApplication=appname&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`;
-									break;
-								default:
-									break;
-							}
-							if (url != '') {
-								url = encodeURI(url);
-								//plus.runtime.openURL(url,function(e){})调起手机APP应用
-								plus.runtime.openURL(url, function(e) {
-									plus.nativeUI.alert('本机未安装指定的地图应用');
-								});
-							}
-						}
-					);
-				} else {
-					// iOS上获取本机是否安装了百度高德地图,需要在manifest里配置
-					// 在manifest.json文件app-plus->distribute->apple->urlschemewhitelist节点下添加
-					//(如urlschemewhitelist:["iosamap","baidumap"])
-					plus.nativeUI.actionSheet({
-							title: '选择地图应用',
-							cancel: '取消',
-							buttons: [{
-								title: '腾讯地图'
-							}, {
-								title: '百度地图'
-							}, {
-								title: '高德地图'
-							}]
-						},
-						function(e) {
-							switch (e.index) {
-								case 1:
-									url = `qqmap://map/geocoder?coord=${latitude},${longitude}&referer=xxx`;
-									break;
-								case 2:
-									url =
-										`baidumap://map/marker?location=${latitude},${longitude}&title=${name}&content=${name}&src=ios.baidu.openAPIdemo&coord_type=gcj02`;
-									break;
-								case 3:
-									url =
-										`iosamap://viewMap?sourceApplication=applicationName&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`;
-									break;
-								default:
-									break;
-							}
-							if (url != '') {
-								url = encodeURI(url);
-								plus.runtime.openURL(url, function(e) {
-									plus.nativeUI.alert('本机未安装指定的地图应用');
-								});
-							}
-						}
-					);
-				}
-			},
-			getCity() {
-				let obj = this;
-				console.log('进入city');
-				getCity({
-						lat: obj.latitude,
-						lng: obj.longitude
-					})
-					.then(res => {
-						console.log(res, '逆解析结果');
-						obj.chooseDistrict = res.data.district;
-						if (!obj.chooseDistrict) {
-							obj.setChoose({
-								chooseProvince: res.data.province,
-								chooseCity: res.data.city,
-								chooseDistrict: res.data.district
-							});
-						}
-
-						obj.getStoreList();
-					})
-					.catch(err => {
-						console.log(err, 'shibai');
-					});
-			},
-			// 调用高德
-			toGaodeMap(latitude, longitude, address) {
-				window.location.href = `https://uri.amap.com/marker?position=${longitude},${latitude}&name=${address}`;
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background: #f8f6f9;
-	}
-
-	.carousel-section {
-		position: relative;
-		// padding-top: 10px;
-
-		.bg {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 750rpx;
-			height: 378rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.titleNview-placing {
-			height: var(--status-bar-height);
-			box-sizing: content-box;
-		}
-
-		.search {
-			justify-content: space-between;
-			padding: 30rpx 32rpx 20rpx;
-			align-items: center;
-			background-color: #fff;
-
-			.address {
-				width: 32rpx;
-				height: 38rpx;
-			}
-
-			.shop-name {
-				height: 38rpx;
-				position: relative;
-				top: -4rpx;
-				z-index: 100;
-				width: 120rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				padding-left: 10rpx;
-			}
-
-			.shop-jt {
-				margin-left: 8rpx;
-				width: 16rpx;
-				height: 10rpx;
-			}
-
-			.input-box {
-				margin-left: 10rpx;
-				position: relative;
-				z-index: 99;
-				width: 650rpx;
-				height: 60rpx;
-				background: #eeeeee;
-				border-radius: 30rpx;
-
-				.input-content {
-					position: relative;
-					z-index: 11;
-					border-radius: 99rpx;
-					flex-grow: 1;
-					padding: 5rpx 30rpx;
-					background: #eeeeee;
-
-					.iconsearch {
-						font-size: 50rpx;
-						color: #cbcbcb;
-					}
-
-					.input {
-						margin-left: 19rpx;
-						flex-grow: 1;
-						color: #cbcbcb;
-
-						input {
-							font-size: 28rpx;
-
-							color: #cbcbcb;
-						}
-					}
-				}
-
-				.input-button {
-					padding-left: 20rpx;
-					font-size: $font-base;
-					height: 100%;
-				}
-			}
-		}
-	}
-
-	.carousel {
-		position: relative;
-		z-index: 3;
-		width: 100%;
-		height: 360rpx;
-		background-color: #fff;
-
-		.carousel-item {
-			width: 100%;
-			height: 100%;
-		}
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.navbar {
-		position: relative;
-		z-index: 2;
-		padding: 0 50rpx;
-		margin-top: -200rpx;
-		width: 750rpx;
-		height: 420rpx;
-		background: #ffffff;
-		border-radius: 40rpx;
-
-		.navbar-box {
-			padding-top: 250rpx;
-
-			.navbar-item {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				width: 20%;
-
-				.nitem-image {
-					width: 90rpx;
-					height: 90rpx;
-				}
-
-				.nitem-font {
-					margin-top: 22rpx;
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #000000;
-				}
-			}
-		}
-	}
-
-	.jx {
-		background: #fff;
-		width: 750rpx;
-	}
-
-	.jx-box {
-		background: #fff;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		width: 750rpx;
-
-		.jx-box-title {
-			margin: 50rpx 0;
-			width: 610rpx;
-			height: 30rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.jx-box-img {
-			width: 750rpx;
-			height: 220rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-	}
-
-	.cai {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		padding-bottom: 20rpx;
-		font-size: 28rpx;
-		font-weight: 500;
-		color: #999999;
-	}
-
-	.jx-box-content {
-		display: flex;
-
-		.content-left {
-			margin: 20rpx 15rpx;
-			width: 236rpx;
-			height: 236rpx;
-			background: #e2e2e2;
-			border-radius: 10rpx;
-
-			image {
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.content-right {
-			display: flex;
-			flex-direction: column;
-			justify-content: space-around;
-
-			.shop-name {
-				width: 382rpx;
-				font-size: 32rpx;
-				font-weight: bold;
-				color: #333333;
-
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: -webkit-box;
-				-webkit-box-orient: vertical;
-				-webkit-line-clamp: 2;
-			}
-
-			.shop-content {
-				width: 455rpx;
-				display: flex;
-				justify-content: space-between;
-
-				.shop-content-left {
-					display: flex;
-					flex-direction: column;
-
-					.price-box {
-						display: flex;
-						align-items: center;
-
-						.yuan-price {
-							font-size: 26rpx;
-							font-weight: 500;
-							text-decoration: line-through;
-							color: #999999;
-						}
-
-						image {
-							margin: 0 10rpx;
-							width: 16rpx;
-							height: 18rpx;
-						}
-
-						.j-price {
-							font-size: 24rpx;
-							font-weight: bold;
-							color: #b59467;
-						}
-					}
-
-					.price-x {
-						font-size: 36rpx;
-						font-weight: bold;
-						color: #ff4c4c;
-					}
-				}
-
-				.shop-content-right {
-					margin-top: 20rpx;
-					align-items: center;
-					text-align: center;
-					width: 137rpx;
-					height: 52rpx;
-					font-size: 26rpx;
-					font-weight: 500;
-					color: #fff;
-					background: #f75022;
-					border-radius: 26rpx;
-					line-height: 52rpx;
-				}
-			}
-		}
-	}
-
-	.shop {
-		margin-top: 20rpx;
-		background: #ffffff;
-		padding: 0 12rpx;
-
-		.shop-title {
-			padding: 30rpx 0 20rpx;
-			display: flex;
-			align-items: center;
-			border-bottom: 1px solid #e3e6e7;
-
-			.shop-item {
-				width: 25%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-				.sitem-font {
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #333333;
-				}
-
-				.choose {
-					color: #ff4c4c;
-				}
-
-				.p-box {
-					display: flex;
-					flex-direction: column;
-
-					.iconfont {
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						width: 30rpx;
-						height: 14rpx;
-						line-height: 1;
-						margin-left: 4rpx;
-						font-size: 26rpx;
-						color: #888;
-
-						&.active {
-							color: $base-color;
-						}
-					}
-
-					.xia {
-						transform: scaleY(-1);
-					}
-				}
-			}
-		}
-	}
-
-	.shop-main {
-		padding: 32rpx 18rpx 0 12rpx;
-		align-items: flex-start;
-		justify-content: flex-start;
-
-		.main-left {
-			width: 180rpx;
-			height: 180rpx;
-			border-radius: 10rpx;
-		}
-
-		.main-right {
-			width: 500rpx;
-			justify-content: space-between;
-			align-items: flex-start;
-			margin-left: 20rpx;
-			padding: 13rpx 0 35rpx;
-			border-bottom: 1px solid #eaeced;
-
-			.shopm-info {
-				max-width: 60%;
-				line-height: 1;
-
-				.shopm-title {
-					display: flex;
-					justify-content: flex-start;
-
-					.shopmt-font {
-						font-size: 34rpx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #333333;
-					}
-
-					.shopmt-good {
-						margin-left: 6rpx;
-						width: 30rpx;
-						height: 30rpx;
-						border: 1px solid #ff4c4c;
-						border-radius: 5rpx;
-						font-size: 20rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #ff4c4c;
-						text-align: center;
-						line-height: 30rpx;
-					}
-				}
-
-				.address {
-					margin-top: 16rpx;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #666666;
-				}
-
-				.shopmt-tip {
-					position: relative;
-					display: inline-block;
-					flex-grow: 0;
-					margin-top: 52rpx;
-					padding: 8rpx;
-					background: #fcf3f0;
-					border-radius: 16rpx 16rpx 16rpx 0px;
-					font-size: 20rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #ff440d;
-				}
-			}
-
-			.right {
-				height: 100%;
-				margin-top: 5rpx;
-				display: flex;
-				flex-direction: column;
-
-				.mright-top {
-					display: flex;
-					justify-content: flex-end;
-					align-items: center;
-
-					.mrt-image {
-						width: 20rpx;
-						height: 28rpx;
-					}
-
-					.mrt-font {
-						margin-left: 8rpx;
-						font-size: 22rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #666666;
-					}
-				}
-
-				.mright-bottom {
-					margin-top: 80rpx;
-					display: flex;
-					justify-content: flex-end;
-
-					.mrb-item {
-						width: 46rpx;
-						height: 46rpx;
-						margin-left: 14rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.good-list {
-		width: 750rpx;
-		background: linear-gradient(0deg, #ffffff, #f8f8f8);
-		padding: 0 30rpx 30rpx;
-
-		.good {
-			width: 690rpx;
-			height: 276rpx;
-			background: #ffffff;
-			box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-			border-radius: 10rpx;
-			margin: auto;
-			padding: 20rpx 15rpx;
-			margin-bottom: 20rpx;
-
-			&:last-of-type {
-				margin-bottom: 0rpx;
-			}
-
-			.good-img {
-				flex-shrink: 0;
-				width: 236rpx;
-				height: 236rpx;
-				border-radius: 10rpx;
-				margin-right: 22rpx;
-
-				image {
-					width: 236rpx;
-					height: 236rpx;
-					border-radius: 10rpx;
-				}
-			}
-
-			.good-info {
-				flex-grow: 1;
-				height: 100%;
-				flex-direction: column;
-				justify-content: space-between;
-				align-items: flex-start;
-
-				.good-name {
-					font-size: 32rpx;
-					font-weight: bold;
-					padding-top: 10rpx;
-					color: #333333;
-				}
-
-				.good-price {
-					width: 100%;
-
-					image {
-						width: 14rpx;
-						margin: 0 6rpx 0 10rpx;
-					}
-
-					.old-price {
-						.old-left {
-							font-size: 26rpx;
-							font-weight: 500;
-							text-decoration: line-through;
-							color: #999999;
-						}
-
-						.old-right {
-							font-size: 24rpx;
-							font-weight: bold;
-							color: #b59467;
-						}
-					}
-
-					.new-price {
-						width: 100%;
-						font-size: 36rpx;
-						font-weight: bold;
-						color: #ff4c4c;
-						justify-content: space-between;
-
-						.good-tip {
-							display: inline-block;
-							padding: 0 20rpx 0 17rpx;
-							min-width: 160rpx;
-							text-align: center;
-							line-height: 40rpx;
-							background: #f75022;
-							font-size: 24rpx;
-							font-weight: 500;
-							color: #fff;
-							border-radius: 10rpx;
-							position: relative;
-
-							&::before {
-								content: '';
-								display: inline-block;
-								height: 17rpx;
-								width: 17rpx;
-								background-color: #fff;
-								border-radius: 50%;
-								position: absolute;
-								top: 0;
-								bottom: 0;
-								left: -9rpx;
-								margin: auto;
-							}
-
-							&::after {
-								content: '';
-								display: inline-block;
-								height: 17rpx;
-								width: 17rpx;
-								background-color: #fff;
-								border-radius: 50%;
-								position: absolute;
-								top: 0;
-								bottom: 0;
-								right: -9rpx;
-								margin: auto;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.title-wrapper {
-		padding-left: 20rpx;
-		justify-content: flex-start;
-		align-items: center;
-		height: 86rpx;
-		line-height: 86rpx;
-		width: 690rpx;
-		margin: auto;
-
-		image {
-			width: 36rpx;
-			height: 36rpx;
-			background: linear-gradient(43deg, #ffc063, #ffa163);
-			border-radius: 50%;
-		}
-
-		view {
-			padding-left: 10rpx;
-			font-size: 32rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
-			color: #242424;
-		}
-
-		.title-b {
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #8b8b8b;
-		}
-	}
-
-	.shop-list {
-		padding-top: 20rpx;
-		flex-wrap: wrap;
-		background-color: #fff;
-		justify-content: flex-start;
-
-		.shop-item {
-			margin-bottom: 20rpx;
-			flex-direction: column;
-			width: 20%;
-			height: 100rpx;
-
-			image {
-				width: 60rpx;
-				height: 58rpx;
-			}
-		}
-	}
-
-	.gift-info {
-		width: 690rpx;
-		height: 155rpx;
-		background: linear-gradient(43deg, #ffb242, #ff944d);
-		border-radius: 12rpx 12rpx 0px 0px;
-		margin: auto;
-		color: #fff;
-		font-size: 24rpx;
-		font-weight: 400;
-		color: #ffffff;
-
-		view {
-			padding-left: 28rpx;
-		}
-	}
-
-	.gift-good-list {
-		width: 690rpx;
-		height: 243rpx;
-		background: #f4f4f4;
-		border-radius: 12rpx;
-		margin: auto;
-
-		.gift-list {
-			width: 670rpx;
-			height: 286rpx;
-
-			background: #fff;
-			border-radius: 12px;
-			// margin: -54rpx auto 0;
-			top: -54rpx;
-			left: 0;
-			right: 0;
-			margin: auto;
-
-			.gift-item {
-				background-color: #fff;
-				width: 223rpx;
-				height: 100%;
-				border-right: 1rpx solid #d6d7dc;
-
-				&:first-of-type {
-					border-radius: 12rpx 0 0 12rpx;
-				}
-
-				&:last-of-type {
-					margin-right: 0;
-				}
-
-				image {
-					width: 160rpx;
-					height: 160rpx;
-				}
-
-				.gift-name {
-					font-size: 22rpx;
-					font-weight: bold;
-					color: #3f3f3f;
-					line-height: 34px;
-				}
-
-				.gift-price {
-					font-size: 28rpx;
-					font-weight: bold;
-					color: #ff4c4c;
-				}
-			}
-		}
-	}
-
-	.djq-wrap {
-		width: 701rpx;
-		// height: 255rpx;
-		background: #ffffff;
-		box-shadow: 0px 0px 27rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin: 0 auto 20rpx;
-		padding: 23rpx 22rpx;
-
-		&:last-of-type {
-			margin-bottom: 0;
-		}
-
-		.djq-img {
-			flex-shrink: 0;
-			width: 150rpx;
-			height: 150rpx;
-			border-radius: 10rpx;
-		}
-
-		.djq-right {
-			padding-left: 10rpx;
-			width: 500rpx;
-
-			.djq-tit {
-				font-size: 34rpx;
-				font-weight: bold;
-				color: #333333;
-				line-height: 52rpx;
-
-				.djq-name {
-					max-width: 300rpx;
-				}
-
-				.djq-dis {
-					flex-shrink: 0;
-					display: flex;
-					align-items: center;
-
-					image {
-						width: 20rpx;
-						height: 28rpx;
-						margin-right: 10rpx;
-					}
-
-					font-size: 22rpx;
-					font-weight: 500;
-					color: #666666;
-				}
-			}
-
-			.djq-dz-box {
-				width: 60%;
-			}
-
-			.djq-dz {
-				width: 100%;
-				font-size: 24rpx;
-				font-weight: 500;
-				color: #666666;
-			}
-
-			.djq-hd {
-				width: 30%;
-				display: flex;
-				justify-content: flex-end;
-
-				.buy-info {
-					display: inline-block;
-					height: 32rpx;
-					border-radius: 16rpx 16rpx 16rpx 0px;
-					line-height: 32rpx;
-					font-size: 20rpx;
-					font-weight: 500;
-					color: #ff440d;
-					padding: 0 15rpx;
-					background-color: #fff;
-				}
-
-				.hd-btn {
-					image {
-						width: 46rpx;
-						height: 46rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.left-btm {
-		height: 66rpx;
-
-		.j-logo {
-			width: 32rpx;
-			line-height: 33rpx;
-			background: linear-gradient(-48deg, #ffa30b, #ffd158);
-			border-radius: 13rpx;
-			font-size: 21rpx;
-			font-weight: 500;
-			color: #ffffff;
-			text-align: center;
-		}
-
-		.j-price {
-			font-size: 27rpx;
-			font-weight: bold;
-			color: #ff4c4c;
-			margin: 0 10rpx 0 5rpx;
-		}
-
-		.j-zk {
-			height: 31rpx;
-			border: 1rpx solid #ff4c4c;
-			border-radius: 7rpx;
-			line-height: 31rpx;
-			padding: 0 8rpx;
-			font-size: 20rpx;
-			font-weight: bold;
-			color: #ff4c4c;
-			margin-right: 5rpx;
-		}
-
-		.j-name {
-			font-size: 23rpx;
-			font-weight: bold;
-			color: #333333;
-		}
-	}
-
-	.hotgoods {
-		// margin-top: 38rpx;
-		width: 100%;
-		display: flex;
-		flex-wrap: wrap;
-		padding: 0 0 30rpx;
-
-		.hotgoods-item {
-			width: 48%;
-			background-color: #ffffff;
-			border-radius: 12rpx;
-
-			&:nth-child(2n + 1) {
-				margin-right: 24rpx;
-			}
-
-			.image-wrapper {
-				width: 100%;
-				height: 330rpx;
-				border-radius: 3px;
-				overflow: hidden;
-				position: relative;
-
-				.image-bg {
-					position: absolute;
-					top: 0;
-					left: 0;
-					right: 0;
-					bottom: 0;
-					width: 100%;
-					height: 100%;
-					opacity: 1;
-					border-radius: 12rpx 12rpx 0 0;
-					z-index: 2;
-				}
-
-				.image {
-					width: 100%;
-					height: 100%;
-					opacity: 1;
-					border-radius: 12rpx 12rpx 0 0;
-				}
-			}
-
-			.title {
-				margin-top: 24rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-			}
-
-			.hot-price {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				padding: 14rpx 10rpx 30rpx;
-
-				.hotPrice-box {
-					width: 70rpx;
-					height: 28rpx;
-					background: linear-gradient(90deg, #c79a4c, #f9df7f);
-					border-radius: 5rpx;
-					text-align: center;
-					line-height: 28rpx;
-					font-size: 20rpx;
-					font-family: Source Han Sans CN;
-					font-weight: 400;
-					color: #ffffff;
-				}
-
-				.price {
-					// margin-left: 10rpx;
-					font-size: 40rpx;
-					color: #ff0000;
-					font-weight: 500;
-				}
-
-				.yuanPrice {
-					margin-left: 10rpx;
-					font-size: 20rpx;
-					font-weight: 500;
-					// text-decoration: line-through;
-					color: #999999;
-				}
-
-				.cart-icon {
-					image {
-						width: 44rpx;
-						height: 44rpx;
-					}
-				}
-			}
-		}
-	}
-
-	.product-box {
-		// margin-top: 20rpx;
-		background: #ffffff;
-		padding: 0rpx 30rpx 20rpx;
-	}
-</style>

+ 0 - 464
pages/user/myAppointment.vue

@@ -1,464 +0,0 @@
-<template>
-	<view class="content">
-		<view class="status_bar"><!-- 这里是状态栏 --></view>
-		<view class="content-money">
-			<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/myfans.png" mode=""></image>
-			</view>
-			<view class="money-box">
-				<view class="money">{{ userInfo.anticipate }}</view>
-				<view>当前余额</view>
-			</view>
-			<!-- <view class="moneybtn-box">
-				<view class="money-btn" @click="navto('/pages/money/recharge?status=2')"></view>
-				<view class="money-btn" @click="navto('/pages/money/wallet')">转账</view>
-			</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.mark }}</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 {
-		anticipatelist
-	} 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: 0,
-					text: '易趣卷明细',
-					loadingType: 'more',
-					orderList: [],
-					page: 1, //当前页数
-					limit: 1000, //每次信息条数
-					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;
-				console.log(source, 'iwiwiwiwi');
-				if (source === 'tabChange' && navItem.loaded === true) {
-					//tab切换只有第一次需要加载数据
-					return;
-				}
-				if (navItem.loadingType === 'loading') {
-					//防止重复加载
-					return;
-				}
-				// 修改当前对象状态为加载中
-				navItem.loadingType = 'loading';
-
-				anticipatelist({
-						page: navItem.page,
-						limit: navItem.limit
-					})
-					.then(({
-						data
-					}) => {
-						obj.recharge = data.sr;
-						obj.orderStatusSum = data.zc;
-						navItem.orderList = data.data;
-					})
-					.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%;
-		background: #00bdff;
-	}
-
-	.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-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;
-		}
-	}
-
-	.moneybtn-box {
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-		z-index: 2;
-		color: #ffffff;
-		padding: 20rpx 50rpx;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-	}
-
-	.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;
-		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;
-	}
-
-	.money-btn {
-		position: relative;
-		z-index: 2;
-		color: #ffffff;
-		text-align: right;
-		font-size: 30rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #ffffff;
-
-		text {
-			display: inline-block;
-			padding-left: 10rpx;
-		}
-	}
-</style>

+ 0 - 153
pages/user/notice.vue

@@ -1,153 +0,0 @@
-<template>
-	<view>
-		<view class="notice-item">
-			<text class="time">11:30</text>
-			<view class="content">
-				<text class="title">新品上市,全场满199减50</text>
-				<view class="img-wrapper">
-					<image class="pic" src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1556465765776&di=57bb5ff70dc4f67dcdb856e5d123c9e7&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F01fd015aa4d95fa801206d96069229.jpg%401280w_1l_2o_100sh.jpg"></image>
-				</view>
-				<text class="introduce">
-					虽然做了一件好事,但很有可能因此招来他人的无端猜测,例如被质疑是否藏有其他利己动机等,乃至谴责。即便如此,还是要做好事。
-				</text>
-				<view class="bot b-t">
-					<text>查看详情</text>
-					<text class="more-icon iconfont iconenter"></text>
-				</view>
-			</view>
-		</view>
-		<view class="notice-item">
-			<text class="time">昨天 12:30</text>
-			<view class="content">
-				<text class="title">新品上市,全场满199减50</text>
-				<view class="img-wrapper">
-					<image class="pic" src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3761064275,227090144&fm=26&gp=0.jpg"></image>
-					<view class="cover">
-						活动结束
-					</view>
-				</view>
-				<view class="bot b-t">
-					<text>查看详情</text>
-					<text class="more-icon iconfont iconenter"></text>
-				</view>
-			</view>
-		</view>
-		<view class="notice-item">
-			<text class="time">2019-07-26 12:30</text>
-			<view class="content">
-				<text class="title">新品上市,全场满199减50</text>
-				<view class="img-wrapper">
-					<image class="pic" src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1556465765776&di=57bb5ff70dc4f67dcdb856e5d123c9e7&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F01fd015aa4d95fa801206d96069229.jpg%401280w_1l_2o_100sh.jpg"></image>
-					<view class="cover">
-						活动结束
-					</view>
-				</view>
-				<text class="introduce">新品上市全场2折起,新品上市全场2折起,新品上市全场2折起,新品上市全场2折起,新品上市全场2折起</text>
-				<view class="bot b-t">
-					<text>查看详情</text>
-					<text class="more-icon iconfont iconenter"></text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang='scss'>
-	page {
-		background-color: #f7f7f7;
-		padding-bottom: 30upx;
-	}
-
-	.notice-item {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-	}
-
-	.time {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 80upx;
-		padding-top: 10upx;
-		font-size: 26upx;
-		color: #7d7d7d;
-	}
-
-	.content {
-		width: 710upx;
-		padding: 0 24upx;
-		background-color: #fff;
-		border-radius: 4upx;
-	}
-
-	.title {
-		display: flex;
-		align-items: center;
-		height: 90upx;
-		font-size: 32upx;
-		color: #303133;
-	}
-
-	.img-wrapper {
-		width: 100%;
-		height: 260upx;
-		position: relative;
-	}
-
-	.pic {
-		display: block;
-		width: 100%;
-		height: 100%;
-		border-radius: 6upx;
-	}
-
-	.cover {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		position: absolute;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-		background-color: rgba(0, 0, 0, .5);
-		font-size: 36upx;
-		color: #fff;
-	}
-
-	.introduce {
-		display: inline-block;
-		padding: 16upx 0;
-		font-size: 28upx;
-		color: #606266;
-		line-height: 38upx;
-	}
-
-	.bot {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		height: 80upx;
-		font-size: 24upx;
-		color: #707070;
-		position: relative;
-	}
-
-	.more-icon {
-		font-size: 32upx;
-	}
-</style>

+ 0 - 142
pages/user/sqjl.vue

@@ -1,142 +0,0 @@
-<template>
-	<view class="content">
-		<view v-for="(item, index) in list" :key="index" class="order-item flex">
-			<view class="title-box flex_item">
-				<view class="title-avatar">
-					<image src="../../static/icon/sh-log.png"></image>
-				</view>
-				<view class="list_tpl">
-					<view class="title">
-						<view class="title-name ">我的好强儿</view>
-					</view>
-					<view class="time">
-						<text>2020-12-12</text>
-					</view>
-				</view>
-				<view class="money">
-					<text>未通过</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				list: 10
-			}
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.content {
-		background-color: #fff;
-	}
-
-	.sq-item {
-		height: 118rpx;
-		border-top: 1px solid #F0F0F0;
-		width: 690rpx;
-		margin: auto;
-
-		&:first-of-type {
-			border-top: none;
-		}
-
-	}
-
-	.order-item {
-		padding: 20rpx 30rpx;
-		line-height: 1.5;
-		height: 118rpx;
-		border-top: 1px solid #F0F0F0;
-		width: 690rpx;
-		margin: auto;
-
-		&:first-of-type {
-			border-top: none;
-		}
-
-		.title-box {
-			width: 100%;
-
-			.title-avatar {
-				flex-shrink: 0;
-				width: 55rpx;
-				height: 55rpx;
-				margin-right: 25rpx;
-				border-radius: 100%;
-
-				image {
-					width: 100%;
-					height: 100%;
-					border-radius: 100%;
-				}
-			}
-
-			.list_tpl {
-				width: 85%;
-
-				.title {
-					display: flex;
-					justify-content: flex-start;
-					font-size: $font-lg;
-					color: $font-color-base;
-					overflow: hidden; //超出的文本隐藏
-					text-overflow: ellipsis; //溢出用省略号显示
-					white-space: nowrap;
-					line-height: 1;
-					text-align: center;
-
-					.title-name {
-						max-width: 40%;
-					}
-
-					.dl {
-						margin-left: 10rpx;
-						width: 93rpx;
-						height: 32rpx;
-						border-radius: 16rpx;
-
-						image {
-							width: 93rpx;
-							height: 32rpx;
-							border-radius: 16rpx;
-						}
-					}
-
-					.class {
-						display: inline-block;
-						margin-left: 10rpx;
-						padding: 6rpx;
-						text-align: center;
-						border: 1px solid #2e58ff;
-						border-radius: 16rpx;
-						font-size: 20rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #2e58ff;
-					}
-				}
-
-				.time {
-					font-size: $font-base;
-					color: $font-color-light;
-				}
-			}
-		}
-
-		.money {
-			width: 50%;
-			text-align: right;
-			color: #333;
-			font-size: $font-lg;
-		}
-	}
-</style>

+ 0 - 134
pages/user/xrtd.vue

@@ -1,134 +0,0 @@
-<template>
-	<view class="content">
-		<view class="top-bg">
-			<image src="../../static/img/xrtd-bg.png" mode=""></image>
-		</view>
-		<view class="sq-tj">
-			<image src="../../static/img/xrtd-log.png" mode=""></image>
-			<view class="sq-tj-tit">
-				申请条件
-			</view>
-			<view class="sq-tj-info">
-				注册为新人
-			</view>
-		</view>
-		<view class="sq-tj" style="margin-top: 0;margin-bottom: 62rpx;">
-			<image src="../../static/img/xrtd-log.png" mode=""></image>
-			<view class="sq-tj-tit">
-				申请说明
-			</view>
-			<view class="sq-tj-info">
-				身份证名下六单,可提前三分钟抢购
-			</view>
-		</view>
-		<view class="btn-list flex">
-			<view class="look-btn" @click="lookJl()">
-				查看申请记录
-			</view>
-			<view class="sub-btn">
-				提交申请
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			// 查看申请记录
-			lookJl() {
-				this.navTo('/pages/user/sqjl')
-			},
-			// 提交申请
-			subSq() {
-				
-			},
-			navTo(url) {
-				uni.navigateTo({
-					url
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.top-bg {
-		width: 750rpx;
-		height: 623rpx;
-		image {
-			width: 750rpx;
-			height: 623rpx;
-		}
-	}
-	.sq-tj {
-		position: relative;
-		width: 690rpx;
-		height: 190rpx;
-		background: #FFFFFF;
-		box-shadow: 0px 0px 20rpx 0px rgba(50, 50, 52, 0.06);
-		border-radius: 20rpx;
-		margin: -160rpx auto 50rpx;
-		image {
-			width: 224rpx;
-			height: 68rpx;
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			margin: auto;
-		}
-		.sq-tj-tit {
-			width: 224rpx;
-			height: 68rpx;
-			font-size: 34rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 68rpx;
-			text-align: center;
-			position: absolute;
-			top: 0;
-			left: 0;
-			right: 0;
-			margin: auto;
-		}
-		.sq-tj-info {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #0C1732;
-			line-height: 42rpx;
-			padding-top: 100rpx;
-			text-align: center;
-		}
-	}
-	.btn-list {
-		justify-content: space-around;
-		font-size: 32rpx;
-		font-family: PingFang SC;
-		font-weight: bold;
-		color: #375AFE;
-		line-height: 83rpx;
-		text-align: center;
-		.look-btn {
-			width: 294rpx;
-			height: 83rpx;
-			background: #FFFFFF;
-			border: 2rpx solid #375AFE;
-			border-radius: 10rpx;
-		}
-		.sub-btn {
-			width: 294rpx;
-			height: 83rpx;
-			background: linear-gradient(0deg, rgba(60, 237, 237, 0.99), #04B8FF, #375AFE);
-			border-radius: 10rpx;
-			color: #fff;
-		}
-	}
-</style>

BIN
static/icon/bdjj.png


BIN
static/icon/call.png


BIN
static/icon/dh.png


BIN
static/icon/fhsy.png


BIN
static/icon/jindou.png


BIN
static/icon/login_name.png


BIN
static/icon/login_pw.png


BIN
static/icon/login_pw2.png


BIN
static/icon/n1.png


BIN
static/icon/n2.png


BIN
static/icon/n3.png


BIN
static/icon/n4.png


BIN
static/icon/n5.png


BIN
static/icon/n6.png


BIN
static/icon/n7.png


BIN
static/icon/n8.png


BIN
static/icon/qudou1.png


BIN
static/icon/qudou2.png


BIN
static/icon/qudou3.png


BIN
static/icon/sh-log.png


BIN
static/icon/tdjj.png


BIN
static/icon/team.png


BIN
static/icon/tool-1.png


BIN
static/icon/tool-2.png


BIN
static/icon/tool-3.png


BIN
static/icon/tool-4.png


BIN
static/icon/tool-5.png


BIN
static/icon/tool-6.png


BIN
static/icon/user_bind.png


BIN
static/img/afternoon.png


BIN
static/img/ali.png


BIN
static/img/aliD.png


BIN
static/img/arc.png


BIN
static/img/bank.png


BIN
static/img/bankD.png


BIN
static/img/cart.png


BIN
static/img/delete.png


BIN
static/img/deletes.png


BIN
static/img/eveningicon.png


BIN
static/img/gssy.png


BIN
static/img/hall-bg.png


BIN
static/img/img01.png


BIN
static/img/img12.png


BIN
static/img/img39.png


BIN
static/img/img43.png


BIN
static/img/img45.png


BIN
static/img/img57.png


BIN
static/img/img74.png


BIN
static/img/index-product.png


BIN
static/img/index-shop.png


BIN
static/img/indwxWp.png


BIN
static/img/integration.png


BIN
static/img/jiantou.png


BIN
static/img/ling.png


BIN
static/img/log.png


BIN
static/img/login-title.png


BIN
static/img/message.png


BIN
static/img/money-bg.png


BIN
static/img/morningicon.png


BIN
static/img/shua.png


BIN
static/img/sign-popup.png


BIN
static/img/sign.png


BIN
static/img/spfm.png


BIN
static/img/tongz-bg.png


BIN
static/img/top-bg.png


BIN
static/img/user-bg.png


BIN
static/img/xrtd-bg.png


BIN
static/img/xrtd-log.png


BIN
static/img/yongjin-bg.png


BIN
static/img/zhihuanjuan.png


BIN
static/index/index06.png


BIN
static/index/index10.png


BIN
static/index/index11.png


BIN
static/index/index13.png


BIN
static/index/index14.png


BIN
static/index/shop-banner.png


BIN
static/money/m05.png