Browse Source

功能优化,新增供货商页面

xiaoxin 1 year ago
parent
commit
652e22f451
100 changed files with 1615 additions and 995 deletions
  1. 31 28
      pages.json
  2. 47 101
      pages/index/index.vue
  3. 10 4
      pages/index/shop/index.vue
  4. 614 0
      pages/index/shopList/indexShop.vue
  5. 773 768
      pages/my/index.vue
  6. 47 1
      pages/order/index.vue
  7. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/empty.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/watch-login/watch-button.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/watch-login/watch-input.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/address/add.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/address/index.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/apply/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/chat/index.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/coupon/index.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/helpList/helpDet.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/hongbao/hongbao.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/integral/index.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/integral/integralDet.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/integral/record.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/msg/index.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/myPingJia/myPingJia.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/recruit/index.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/about.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/chat.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/customer.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/feedback.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/index.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/mimi.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/xieyi.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/shoppingCar/index.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/task/index.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/tousu/detail.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/tousu/index.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/vip/index.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/wallet/index.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/my/wallet/walletDet.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/search/index.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/selectCampus.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/confirmOrder.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/goodsDet.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/goodsList.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/im.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/index.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/payOrder.js.map
  48. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/pindanDet.js.map
  49. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shopList/index.js.map
  50. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  51. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/updateNickName.js.map
  52. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/complaint/complaint.js.map
  53. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/detail.js.map
  54. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/feedback.js.map
  55. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/feedbacks.js.map
  56. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map
  57. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/paotuiMap.js.map
  58. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/takefood.js.map
  59. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/waimaiMap.js.map
  60. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/public/login.js.map
  61. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/running/Cityservice/Cityservice.js.map
  62. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/running/Helppay/Helppay.js.map
  63. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/running/Helpsend/Helpsend.js.map
  64. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/running/closeaddress/closeaddress.js.map
  65. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/running/huodong/list.js.map
  66. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/running/index/index.js.map
  67. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/running/order/pay/pay.js.map
  68. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/running/takeaddress/takeaddress.js.map
  69. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-avatar/u-avatar.js.map
  70. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map
  71. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map
  72. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map
  73. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  74. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-column-notice/u-column-notice.js.map
  75. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-field/u-field.js.map
  76. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form-item/u-form-item.js.map
  77. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form/u-form.js.map
  78. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-grid-item/u-grid-item.js.map
  79. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-grid/u-grid.js.map
  80. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  81. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map
  82. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
  83. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line/u-line.js.map
  84. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map
  85. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map
  86. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  87. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-notice-bar/u-notice-bar.js.map
  88. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-number-box/u-number-box.js.map
  89. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-parse/libs/trees.js.map
  90. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-parse/u-parse.js.map
  91. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-picker/u-picker.js.map
  92. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map
  93. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-rate/u-rate.js.map
  94. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-row-notice/u-row-notice.js.map
  95. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-search/u-search.js.map
  96. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-select/u-select.js.map
  97. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-skeleton/u-skeleton.js.map
  98. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-switch/u-switch.js.map
  99. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map
  100. 0 0
      unpackage/dist/dev/mp-weixin/app.json

+ 31 - 28
pages.json

@@ -30,6 +30,12 @@
 			}
 		},
 		{
+			"path": "pages/index/shopList/indexShop",
+			"style": {
+				"navigationBarTitleText": "店铺列表2"
+			}
+		},
+		{
 			"path": "pages/index/shop/index",
 			"style": {
 				"navigationBarTitleText": "店铺详情"
@@ -77,7 +83,7 @@
 				"navigationBarTitleText": "店铺详情"
 			}
 		},
-		
+
 		{
 			"path": "pages/order/index",
 			"style": {
@@ -132,14 +138,14 @@
 				"navigationBarTitleText": "地图"
 			}
 		},
-		
+
 		{
 			"path": "pages/my/index",
 			"style": {
 				"navigationBarTitleText": "我的",
 				"navigationBarBackgroundColor": "#FEFBDA"
 			}
-		},{
+		}, {
 			"path": "pages/my/updateNickName",
 			"style": {
 				"navigationBarTitleText": "修改昵称",
@@ -306,7 +312,7 @@
 					"style": {
 						"navigationBarTitleText": "我的投诉"
 					}
-				},{
+				}, {
 					"path": "tousu/detail",
 					"style": {
 						"navigationBarTitleText": "投诉详情"
@@ -317,17 +323,15 @@
 					"style": {
 						"navigationBarTitleText": "超级会员"
 					}
+				}, {
+					"path": "myPingJia/myPingJia",
+					"style": {
+						"navigationBarTitleText": "我的评价",
+						"enablePullDownRefresh": false
+					}
+
 				}
-			    ,{
-                    "path" : "myPingJia/myPingJia",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "我的评价",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-            ]
+			]
 		},
 		{
 			"root": "running",
@@ -362,7 +366,7 @@
 						"enablePullDownRefresh": false
 					}
 				},
-			
+
 				{
 					"path": "Cityservice/Cityservice",
 					"style": {
@@ -371,7 +375,7 @@
 					}
 				},
 
-			
+
 				{
 					"path": "order/pay/pay",
 					"style": {
@@ -379,17 +383,16 @@
 						"enablePullDownRefresh": false
 					}
 				}
-				
-			    ,{
-                    "path" : "huodong/list",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "精选活动",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-            ]
+
+				, {
+					"path": "huodong/list",
+					"style": {
+						"navigationBarTitleText": "精选活动",
+						"enablePullDownRefresh": false
+					}
+
+				}
+			]
 		}
 	],
 
@@ -424,4 +427,4 @@
 			}
 		]
 	}
-}
+}

+ 47 - 101
pages/index/index.vue

@@ -289,6 +289,14 @@
 					<!-- <image src="../../static/images/index/hb_btn.png" class="hb_btn" @click="takemoney()"></image> -->
 				</view>
 			</view>
+			
+			<!-- 联系客服悬浮按钮区域 -->
+			<view class="serviceBtn" @click="goChat">
+				<img src="../../static/images/my/6.png" style="width: 60rpx;height: 60rpx;" mode="scaleToFill" />
+				<view class="serviceBtn_text">
+					联系客服
+				</view>
+			</view>
 		</view>
 </template>
 
@@ -340,107 +348,7 @@
 						"describess": ""
 					},
 				],
-				gridData: [{
-					"id": 22,
-					"createTime": "2022-02-18 16:44:17",
-					"name": "外卖",
-					"imageUrl": "https://diancan.xianmxkj.com/file/uploadPath/2022/02/18/9c6bac5a332188f22d7a692831b09c1c.png",
-					"state": 1,
-					"classify": 4,
-					"url": "/pages/index/shopList/index",
-					"sort": 1,
-					"describess": "精品1"
-				}, {
-					"id": 26,
-					"createTime": "2022-02-18 16:44:17",
-					"name": "水果",
-					"imageUrl": "https://diancan.xianmxkj.com/file/uploadPath/2022/02/18/8aa4e61ded3fc8b341be14acba170607.png",
-					"state": 1,
-					"classify": 4,
-					"url": "/pages/index/shopList/index",
-					"sort": 1,
-					"describess": "精品2"
-				}, {
-					"id": 51,
-					"createTime": "2022-02-18 16:44:17",
-					"name": "日用好货",
-					"imageUrl": "https://diancan.xianmxkj.com/file/uploadPath/2022/02/18/c52f353674722c5db28186850607ea6d.png",
-					"state": 1,
-					"classify": 4,
-					"url": "/pages/index/shopList/index",
-					"sort": 1,
-					"describess": "美食类型商铺"
-				}, {
-					"id": 59,
-					"createTime": "2022-02-18 16:44:17",
-					"name": "肉蛋蔬菜",
-					"imageUrl": "https://diancan.xianmxkj.com/file/uploadPath/2022/02/18/81a44aeb97590c8961afa6a642ab0a7a.png",
-					"state": 1,
-					"classify": 4,
-					"url": "/pages/index/shopList/index",
-					"sort": 1,
-					"describess": null
-				}, {
-					"id": 60,
-					"createTime": "2022-02-18 16:44:17",
-					"name": "大牌乳品",
-					"imageUrl": "https://diancan.xianmxkj.com/file/uploadPath/2022/02/18/62d5d5700811720d601a448e21fd4564.png",
-					"state": 1,
-					"classify": 4,
-					"url": "/pages/index/shopList/index",
-					"sort": 1,
-					"describess": null
-				}, {
-					"id": 61,
-					"createTime": "2022-02-18 16:44:17",
-					"name": "帮我送",
-					"imageUrl": "https://diancan.xianmxkj.com/file/uploadPath/2022/02/18/5ee033f64352b96941cd55ff5cc2f86e.png",
-					"state": 1,
-					"classify": 4,
-					"url": "/running/Helpsend/Helpsend?index=1",
-					"sort": 1,
-					"describess": null
-				}, {
-					"id": 62,
-					"createTime": "2022-02-18 16:44:17",
-					"name": "帮我取",
-					"imageUrl": "https://diancan.xianmxkj.com/file/uploadPath/2022/02/18/56ab760223015b1cd33caf1f9af73cda.png",
-					"state": 1,
-					"classify": 4,
-					"url": "/running/Helpsend/Helpsend?index=2",
-					"sort": 1,
-					"describess": null
-				}, {
-					"id": 63,
-					"createTime": "2022-02-18 16:44:17",
-					"name": "同城服务",
-					"imageUrl": "https://diancan.xianmxkj.com/file/uploadPath/2022/02/18/d01391db321b35a76a76b3b0c485a0d0.png",
-					"state": 1,
-					"classify": 4,
-					"url": "/running/Cityservice/Cityservice",
-					"sort": 1,
-					"describess": null
-				}, {
-					"id": 64,
-					"createTime": "2022-02-18 16:44:17",
-					"name": "陪玩服务",
-					"imageUrl": "https://diancan.xianmxkj.com/file/uploadPath/2022/02/18/795f621be2eb7df2dcf740ad30c7cedd.png",
-					"state": 1,
-					"classify": 4,
-					"url": "/running/Cityservice/Cityservice?title=陪玩服务",
-					"sort": 1,
-					"describess": null
-				}, {
-					"id": 65,
-					"createTime": "2022-02-18 16:44:17",
-					"name": "同城帮买",
-					"imageUrl": "https://diancan.xianmxkj.com/file/uploadPath/2022/02/18/04d342ce358635ff0196f88c8736441e.png",
-					"state": 1,
-					"classify": 4,
-					"url": "/running/Helppay/Helppay",
-					"sort": 1,
-					"describess": null
-				}, ],
+				gridData: [],
 				page: 1,
 				limit: 10,
 				shopList: [],
@@ -531,10 +439,12 @@
 				huodongList: [],
 				jxlist: [],
 				huoList:[],//商户参与的活动
+				token:""
 			}
 		},
 		onLoad(e) {
 			let that = this
+			that.token = that.$queue.getData("token")
 			that.userId = uni.getStorageSync('userId') ? uni.getStorageSync('userId') : ''
 			that.getZiZhi();
 			that.getBannerList()
@@ -648,6 +558,7 @@
 		},
 		onShow() {
 			let that = this
+			that.token = that.$queue.getData('token')
 			that.$Request.get('/app/common/type/264').then(res => {
 				if (res.code == 0) {
 					// #ifdef MP-WEIXIN
@@ -725,6 +636,20 @@
 			}
 		},
 		methods: {
+			goChat() {
+				if (this.token) {
+					uni.navigateTo({
+						url: '/my/setting/chat'
+					})
+				} else {
+					this.bindlogin()
+				}
+			},
+			bindlogin() {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				})
+			},
 			// 打开隐私协议页面
 			openPrivacyContract() {
 				let that = this;
@@ -1988,4 +1913,25 @@
 		top: 315rpx;
 		left: 80rpx;
 	}
+	
+	.serviceBtn{
+		position: fixed;
+		right: 52rpx;
+		bottom: 50rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: 50%;
+		color: #fff;
+		font-size: 20rpx;
+		background-color: #3E8EF7;
+		box-shadow: 0 0 7rpx #000;
+		
+		.serviceBtn_text{
+			margin-top: 5rpx;
+		}
+	}
 </style>

+ 10 - 4
pages/index/shop/index.vue

@@ -9,7 +9,7 @@
 							<image :src="item" mode="scaleToFill" style="width: 100%"></image>
 						</swiper-item>
 					</swiper>
-					<view style="position: relative; height: 34px; z-index: 1; margin-top: -100px"></view>
+					<view style="position: relative; height: 34px; z-index: 1; margin-top: -50px"></view>
 					<view class="shop padding">
 						<view class="flex justify-between">
 							<view style="width: 500rpx">
@@ -153,12 +153,17 @@
 										<view class="text-gray text-sm u-line-2" style="overflow: hidden; line-clamp: 2; -webkit-line-clamp: 2; width: 100%">
 											{{ ite.goodsDescribe ? ite.goodsDescribe : '' }}
 										</view>
-										<view class="flex justify-between">
+										<view class="flex justify-between" style="position: relative">
 											<view class="text-sm text-red">
 												¥
 												<text class="text-lg">{{ ite.goodsMoney }}</text>
 											</view>
-											<image @click.stop="selSku(ite)" src="../../../static/images/index/add.png" mode="" style="width: 40rpx; height: 40rpx"></image>
+											<view
+												style="width: 80rpx; height: 80rpx; line-height: 80rpx; position: absolute; right: 0; top: -10rpx; text-align: center"
+												@click.stop="selSku(ite)"
+											>
+												<image src="../../../static/images/index/add.png" style="width: 40rpx; height: 40rpx"></image>
+											</view>
 										</view>
 									</view>
 								</view>
@@ -922,6 +927,7 @@ export default {
 		},
 		// 弹窗展示商品详情
 		selSku(item) {
+			this.value = 1
 			this.checkStateList = []
 			this.checkString = ''
 			this.attrList = []
@@ -2204,4 +2210,4 @@ page {
 	width: 180rpx; /* 三张图片平分宽度 */
 	height: 135rpx;
 }
-</style>
+</style>

+ 614 - 0
pages/index/shopList/indexShop.vue

@@ -0,0 +1,614 @@
+<template>
+	<view v-if="XCXIsSelect=='是'">
+
+		<view style="position: fixed;top: 0;width: 100%;z-index: 999;">
+			<view class="flex justify-between align-center bg-white padding-tb padding-lr-sm">
+				<view class="flex-sub text-center" :class="current==1?'select':''" @click="confirm(1)">综合排序132</view>
+				<view class="flex-sub text-center" :class="current==3?'select':''" @click="confirm(3)">距离优先</view>
+				<view class="flex-sub text-center" :class="current==4?'select':''" @click="confirm(4)">销量优先</view>
+				<view class="flex-sub text-center flex" @click="isShow = !isShow">
+					<view class="flex align-center" style="margin: 0 auto;">
+						<view :class="isShow?'select':''">筛选</view>
+						<u-icon v-if="!isShow" name="arrow-down" size="28"></u-icon>
+						<u-icon v-if="isShow" name="arrow-up" color="#FCD202" size="28"></u-icon>
+					</view>
+				</view>
+			</view>
+			<view v-if="isShow"
+				style="position: absolute;top: 90rpx;width: 100%;z-index: 1000;background: rgba(0,0,0,.5);height: 100vh;"
+				@click="isShow =false">
+				<view class="padding-lr bg-white">
+					<view class="flex justify-between align-center padding-tb-sm u-border-bottom"
+						v-for="(item,index) in options4" :key='index' @click.stop="getSelect(item)">
+						<view class="text-df" :class="item.select?'select':''">{{item.shopTypeName}}</view>
+						<u-icon v-if="item.select" name="checkmark" color="#FCD202" size="28"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- #ifdef H5 -->
+		<view class="hd flex justify-center" style="position: fixed;top: 90rpx;" v-if="hdlist.length>0">
+		<!-- #endif -->
+		<!-- #ifndef H5 -->
+		<view class="hd flex justify-center" style="position: fixed;top: 90rpx;" v-if="hdlist.length>0">
+		<!-- #endif -->
+			<view class="hd-box">
+				<scroll-view scroll-x="true" class="scroll-view_H">
+					<view class="hd-box-item" :style="currenthd==index?'background-color:#fcd202;font-weight:bold':''" @click="searchhd(index,item.activityId)" v-for="(item,index) in hdlist" :key="index">{{item.activityTitle}}</view>
+				</scroll-view>
+			</view>
+		</view>
+		
+		<!-- #ifdef H5 -->
+		<view class="padding-lr-sm" style="margin-top: 80rpx;">
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<view class="padding-lr-sm" style="margin-top: 36px;min-height: 100vh; /* 设置最小高度为视口高度 */">
+				<!-- #endif -->
+				<view class="shopli" v-for="(item,index) in shopList" :key='index'>
+					<view class="margin-tb-sm flex justify-between bg-white padding"
+						@click="goNav(item.shopId,item,item.shopActivityList)">
+						<image :src="item.shopCover" class="radius" style="width: 160rpx;height: 160rpx;"></image>
+						<view class=" margin-left-sm" style="width: 450rpx;">
+							<view class=" flex flex-direction justify-between">
+								<view class="text-lg text-bold text-black">{{item.shopName}}</view>
+								<view class="flex align-center margin-top-xs" style="width: 100%;">
+									<u-icon name="star-fill" color="#FD6416" size="28"></u-icon>
+									<text class="text-lg" style=""> {{item.shopScore?item.shopScore:0}}</text>
+									<text
+										class="text-gray flex-sub margin-left-xs">销量{{item.shopSales?item.shopSales:0}}</text>
+									<text class="text-gray margin-left-xs">{{item.errandTime}}分钟</text>
+									<text class="text-gray margin-left-xs">{{item.distance}}</text>
+								</view>
+								<view class="text-gray margin-top-xs flex justify-between">
+									<view>起送 ¥{{item.minimumDelivery}} 配送 ¥{{item.errandMoney?item.errandMoney:0}}
+									</view>
+									<view style="color: #FCD202;">{{item.autoSendOrder==1?'商家配送':'平台配送'}}</view>
+								</view>
+								<view class="text-gray margin-top-xs" v-if="item.businessHours&&item.lockHours">
+									营业时间:{{item.businessHours}}-{{item.lockHours}}</view>
+								<view class="flex margin-top-xs justify-between align-start" style="width: 100%;">
+									<view class="flex flex-wrap align-center" style="width: 100%;height: 100%;overflow: hidden;">
+										<view class="lable flex justify-center align-center" v-if="item.enableFullReductionFlag==0&&item.exemptMinMoney">
+											满{{item.exemptMinMoney}}免配送费</view>
+										<!-- <view class="lable flex justify-center align-center" v-if="item.exemptMinMoney">满{{item.exemptMinMoney}}免配送费</view> -->
+										<view v-for="(ite,ind) in item.shopActivityList" :key='ind' v-if="item.shopActivityList && ite.activityType!='1'">
+											<view class="lable flex justify-center align-center" style="border-radius: 4rpx;background-color: #ffffff;color: red;box-sizing: border-box;">
+												<text v-if="ite.activityType=='2'">时段</text>
+												<text v-if="ite.activityType=='3'">满额</text>
+												<text v-if="ite.activityType=='4'">全场</text>
+												<text style="margin-left: 3px;">|</text>
+												<text style="margin-left: 3px;">{{ite.activityName}}</text>
+											</view>
+											<!-- <view class="lable flex justify-center align-center"
+												style="border-radius: 4rpx;border: 1rpx solid red;background-color: #ffffff;color: red;box-sizing: border-box;"
+												>{{ite.activityName}}
+											</view> -->
+										</view>
+										<view class="lable flex justify-center align-center" v-for="(ite,ind) in item.shopLable" :key='ind'
+											v-if="item.shopLable">
+											{{ite}}
+										</view>
+										<view class="lable flex justify-center align-center" v-if="item.couponList" style="border-radius: 4rpx;border: 1rpx solid red;background-color: #ffffff;color: red;box-sizing: border-box;" v-for="(it,ide) in item.couponList" :key="ide">
+											<text>优惠券</text>
+											<text style="margin-left: 3px;">|</text>
+											<text style="margin-left: 3px;">满{{it.minMoney}}减{{it.money}}</text>
+										</view>
+										<!-- <view class="lable flex justify-center align-center" v-if="item.couponList" style="border-radius: 4rpx;border: 1rpx solid red;background-color: #ffffff;color: red;box-sizing: border-box;" v-for="(it,ide) in item.couponList" :key="ide">满{{it.minMoney}}减{{it.money}}</view> -->
+									</view>
+								</view>
+							</view>
+							<view class="flex margin-top-xs">
+								<view v-for="(ite,ind) in item.goodsList" :key='ind'
+									@click.stop="goDet(ite.goodsId,item.shopId)" style="width: 33%;">
+									<image :src="ite.goodsCover" style="width: 120rpx;height: 120rpx;" class="radius"
+										mode=""></image>
+									<view class="u-line-1 text-df text-bold margin-top-xs">{{ite.goodsName}}</view>
+									<view class="text-bold margin-top-xs" style="color: #FD6416;">
+										<text class="text-sm">¥</text> {{ite.goodsMoney}}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<empty v-if="!shopList.length"></empty>
+			
+			<!-- 打样提示 -->
+			<view v-if="hintShow" class="hintPopul" @click.stop="hintShow=false">
+				<view class="content_">
+					<image src="../../../static/images/index/shop.png" mode="" style="width: 200rpx;height: 180rpx;">
+					</image>
+					<view class="text-xl text-bold">店铺打烊啦</view>
+					<view class="hintText margin-top-sm text-gray">现在店铺已经打烊了,营业时间</view>
+					<view class="margin-top-xs text-gray margin-bottom">{{shop.businessHours}}-{{shop.lockHours}}</view>
+					<view class="skuBtn" @click="hintShow=false">知道了</view>
+				</view>
+			</view>
+		</view>
+		<view v-else>
+			<view style="font-size: 28upx;" v-html="content"></view>
+		</view>
+</template>
+
+<script>
+	import empty from '@/components/empty.vue'
+	export default {
+		components: {
+			empty
+		},
+		data() {
+			return {
+				currenthd:-1,
+				hdlist:[],
+				activityId:'',
+				isShow: false,
+				hintShow: false,
+				shop: {},
+				page: 1,
+				limit: 10,
+				shopList: [],
+				current: 1,
+				shopTypeId: '',
+				userId: '',
+				lng: '',
+				lat: '',
+				value2: 0,
+				options4: [{
+					id: '',
+					select: true,
+					shopTypeName: "全部"
+				}],
+				totalCount: 0,
+				XCXIsSelect: '否',
+				content:'',
+				hintShow: false,
+			}
+		},
+		onLoad(e) {
+			console.log(e)
+			
+			this.XCXIsSelect = this.$queue.getData('XCXIsSelect');
+			if (this.XCXIsSelect == '否') {
+				this.getGuize()
+				uni.setNavigationBarTitle({
+					title: '隐私政策'
+				});
+			} else {
+				uni.setNavigationBarTitle({
+					title: '店铺列表'
+				});
+			}
+			let that = this
+			uni.showLoading({
+				title: '加载中',
+				mask: true, // 是否显示透明蒙层,防止触摸穿透
+			})
+			that.shopTypeId = e.value ? e.value : ''
+			that.value2 = e.value ? e.value : 0
+			that.userId = uni.getStorageSync('userId')
+			that.getShopType()
+			uni.getLocation({
+				type: 'gcj02', //返回可以用于uni.openLocation的经纬度
+				success: function(res) {
+					that.lat = res.latitude;
+					that.lng = res.longitude;
+				}
+			});
+			that.getShopList()
+			that.gethdlist();
+		},
+		methods: {
+			//筛选活动
+			searchhd(index,activityId){
+				if(index==this.currenthd){
+					this.currenthd = -1
+					this.activityId = '';
+					this.getShopList()
+				}else{
+					this.currenthd = index;
+					this.activityId=activityId;
+					this.getShopList()
+				}
+			},
+			//获取所有活动
+			gethdlist(){
+				this.$Request.get("/app/activityManage/getActivityList").then(res => {
+					if (res.code == 0) {
+						res.data.records.map((item,index)=>{
+							if(item.activityId==14){
+								res.data.records.splice(index, 1)
+							}
+						})
+						this.hdlist = res.data.records
+					}
+				});
+			},
+			// 跳转商品详情
+			goDet(goodsId, shopId) {
+				let userId = this.$queue.getData('userId');
+				if (!userId) {
+					uni.navigateTo({
+						url: '/pages/public/login'
+					})
+					return
+				}
+				uni.navigateTo({
+					url: '/pages/index/shop/goodsDet?goodsId=' + goodsId + '&shopId=' + shopId + '&orderType=2'
+				})
+			},
+			getGuize() {
+				this.$Request.getT('/app/common/type/237').then(res => {
+					if (res.code == 0) {
+						this.content = res.data.value;
+						// this.tit = res.data.min
+					}
+				});
+			},
+			goBack() {
+				uni.navigateBack({
+
+				})
+			},
+			getSelect(e) {
+				console.log(e)
+				this.options4.forEach(res => {
+					if (res.id == e.id) {
+						res.select = true
+						this.page = 1
+						this.shopTypeId = e.id
+						this.getShopList();
+						this.isShow = false
+					} else {
+						res.select = false
+					}
+				})
+			},
+			confirm(e) {
+				console.log(e)
+				this.page = 1
+				this.current = e;
+
+				this.getShopList();
+			},
+			confirm2(e) {
+				console.log(e)
+				this.page = 1
+				this.current = e;
+
+				this.getShopList();
+			},
+			confirm3(e) {
+				console.log(e)
+				this.page = 1
+				this.current = e;
+
+				this.getShopList();
+			},
+			confirm4(e) {
+				console.log(e)
+				this.page = 1
+				this.shopTypeId = e
+
+				this.getShopList();
+			},
+
+			// 商户列表
+			getShopList() {
+				// this.lng = uni.getStorageSync('lng')
+				// this.lat = uni.getStorageSync('lat')
+				let data = {
+					page: this.page,
+					limit: this.limit,
+					screen: this.current,
+					shopTypeId: this.shopTypeId,
+					lng: uni.getStorageSync('lng'),
+					lat: uni.getStorageSync('lat'),
+					activityId:this.activityId
+				}
+				this.$Request.getT('/app/goods/selectShop', data).then(res => {
+					uni.hideLoading()
+					if (res.code == 0) {
+						console.log(res.data.list)
+						this.totalCount = res.data.totalCount
+						res.data.list.forEach(ret => {
+							if (ret.distance > 1000) {
+								ret.distance = Number((ret.distance / 1000)).toFixed(2) + "km"
+							} else {
+								if (ret.distance == 0) {
+									ret.distance = "0m";
+								} else {
+									ret.distance = Number(ret.distance).toFixed(1) + "m";
+								}
+							}
+							ret.shopLable = ret.shopLable ? ret.shopLable.split(',') : ''
+							ret.shopCover = ret.shopCover ? ret.shopCover.split(',') :
+								'../../static/logo.png'
+							ret.errandTime = Math.round(ret.errandTime)
+							ret.shopScore = ret.shopScore.toFixed(1)
+						})
+
+
+						if (this.page == 1) {
+							this.shopList = res.data.list
+						} else {
+							this.shopList = [...this.shopList, ...res.data.list]
+						}
+						console.log(this.shopList)
+					}
+				})
+			},
+			// 商户类型
+			getShopType() {
+				this.$Request.getT('/app/shoptype/selectShopTypeList').then(res => {
+					if (res.code == 0) {
+						res.data.forEach(res => {
+							res.select = false
+						})
+						this.options4 = [...this.options4, ...res.data]
+					}
+				})
+			},
+			goNav(url,e,shuzu) {
+				this.shop = e
+				// console.log(e, '当前店铺')
+				
+				let myDate = new Date();
+				let hours = myDate.getHours();
+				let minute = myDate.getMinutes();
+				let openTime = this.shop.businessHours.split(':')[0] //开始小时
+				let openTime1 = this.shop.businessHours.split(':')[1] //开始分钟
+				let closeTime = this.shop.lockHours.split(':')[0] //结束小时
+				let closeTime1 = this.shop.lockHours.split(':')[1] //结束分钟.
+				console.log(hours)
+				console.log(minute)
+				console.log(openTime)
+				console.log(openTime1)
+				
+				console.log(closeTime)
+				console.log(closeTime1)
+				console.log(minute >= closeTime1)
+				if (hours < openTime) {
+					this.hintShow = true
+					return
+				} else if (hours == openTime && minute < openTime1) {
+					this.hintShow = true
+					return
+				} else if (hours > closeTime) {
+					this.hintShow = true
+					return
+				} else if (hours == closeTime && minute >= closeTime1) {
+					this.hintShow = true
+					return
+				}
+				
+				console.log(url)
+				let items = encodeURIComponent(JSON.stringify(shuzu));
+				if (this.userId) {
+					uni.navigateTo({
+						url:'/pages/index/shop/index?shopId='+url+'&huoListss='+items
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/public/login'
+					})
+				}
+			},
+			goShopDet(url, e) {
+				this.shop = e
+				// console.log(e, '当前店铺')
+
+				// let myDate = new Date();
+				// let hours = myDate.getHours();
+				// let minute = myDate.getMinutes();
+				// let openTime = this.shop.businessHours.split(':')[0] //开始小时
+				// let closeTime = this.shop.lockHours.split(':')[0] //结束小时
+				// let openTime1 = this.shop.businessHours.split(':')[1] //开始分钟
+				// let closeTime1 = this.shop.lockHours.split(':')[1] //结束分钟.
+				// console.log(hours)
+				// console.log(minute)
+				// console.log(openTime)
+				// console.log(openTime1)
+
+				// console.log(closeTime)
+				// console.log(closeTime1)
+				// console.log(minute >= closeTime1)
+				// if (hours < openTime) {
+				// 	this.hintShow = true
+				// 	return
+				// } else if (hours == openTime && minute < openTime1) {
+				// 	this.hintShow = true
+				// 	return
+				// } else if (hours >= closeTime) {
+				// 	this.hintShow = true
+				// 	return
+				// } else if (hours == closeTime && minute >= closeTime1) {
+				// 	this.hintShow = true
+				// 	return
+				// }
+
+				console.log(url)
+				if (this.userId) {
+					uni.navigateTo({
+						url
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/public/login'
+					})
+				}
+			},
+		},
+		onReachBottom: function() {
+			if (this.shopList.length < this.totalCount) {
+				this.page = this.page + 1;
+				this.getShopList()
+			} else {
+				uni.showToast({
+					title: '已经到底了',
+					icon: 'none'
+				})
+			}
+
+		},
+	}
+</script>
+
+<style lang="scss">
+	.hd{
+		width: 100%;
+		height: auto;
+		background-color: rgb(248, 248, 248);
+		padding: 20rpx 0 20rpx 0;
+		z-index: 1;
+		// margin-top: 20rpx;
+		.hd-box{
+			width: 686rpx;
+			height: 100%;
+			.scroll-view_H{
+				width: 100%;
+				white-space: nowrap;
+			}
+			.hd-box-item{
+				display: inline-block;
+				padding: 10rpx 20rpx 10rpx 20rpx;
+				background-color: #ffffff;
+				font-size: 24rpx;
+				border-radius: 8rpx;
+				margin-right: 10rpx;
+			}
+			
+		}
+	}
+	.shopli{
+		
+	}
+	.select {
+		color: #FCD202;
+	}
+
+	.tabs {
+		margin: 20rpx 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.tabs_name {
+
+		flex: 1;
+		/* display: inline-block; */
+		text-align: center;
+		margin-bottom: 30rpx 0;
+		position: relative;
+		display: flex;
+		/* justify-content: space-between; */
+		align-items: center;
+	}
+
+	.tabs_name view {
+		margin: 0 auto;
+		display: flex;
+		align-items: center;
+	}
+
+	.tabs_2 {
+		/* width: 30%; */
+	}
+
+	.actives {
+		color: #007AFF;
+	}
+
+	.tabsicon {
+		position: absolute;
+		top: 0;
+		right: 22rpx;
+		width: 20rpx;
+		height: 40rpx;
+		z-index: 1;
+	}
+
+	.tabs_icon {
+		width: 12rpx;
+		height: 8rpx;
+		z-index: 1;
+		margin-left: 10rpx;
+	}
+
+	.icon1 {
+		/* position: absolute; */
+		/* top: 6rpx; */
+	}
+
+	.icon2 {
+		position: absolute;
+		bottom: 6rpx;
+	}
+
+
+	.hintPopul {
+		width: 100%;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		background: rgba(0, 0, 0, .4);
+		z-index: 999;
+	}
+
+	.content_ {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		margin: auto;
+		text-align: center;
+		width: 500rpx;
+		height: 400rpx;
+		border-radius: 20rpx;
+		background-color: #fff;
+		padding-top: 120rpx;
+	}
+
+	.content_ image {
+		position: absolute;
+		top: -50rpx;
+		left: 0;
+		right: 0;
+		margin: auto;
+	}
+
+	.hintText {
+		font-size: 30rpx;
+	}
+
+	.skuBtn {
+		width: 460rpx;
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: center;
+		background: #FCD202;
+		font-size: 28rpx;
+		border: 2rpx solid #FCD202;
+		color: #333333;
+		border-radius: 50rpx;
+		font-weight: 700;
+		margin: auto;
+	}
+
+	.lable {
+		border: 1rpx solid #FFE6D9;
+		height: 40rpx;
+		padding: 0 14rpx;
+		background: #FFE6D9;
+		border-radius: 4rpx;
+		font-weight: 500;
+		color: #FD6416;
+		font-size: 20rpx;
+		margin-right: 10rpx;
+		margin-bottom: 10rpx;
+	}
+</style>

File diff suppressed because it is too large
+ 773 - 768
pages/my/index.vue


+ 47 - 1
pages/order/index.vue

@@ -219,6 +219,12 @@
 			</view>
 			<empty v-if="!order.length" style="z-index: 0"></empty>
 		</view>
+
+		<!-- 联系客服悬浮按钮区域 -->
+		<view class="serviceBtn" @click="goChat">
+			<img src="../../static/images/my/6.png" style="width: 60rpx; height: 60rpx" mode="scaleToFill" />
+			<view class="serviceBtn_text">联系客服</view>
+		</view>
 	</view>
 </template>
 
@@ -315,10 +321,13 @@ export default {
 			waimaiCount: 0,
 			paotuiCount: 0,
 			XCXIsSelect: '是',
-			arr: []
+			arr: [],
+			token: ''
 		}
 	},
 	onLoad(option) {
+		let that = this
+		that.token = that.$queue.getData('token')
 		this.XCXIsSelect = this.$queue.getData('XCXIsSelect') ? this.$queue.getData('XCXIsSelect') : '是'
 
 		this.userId = uni.getStorageSync('userId')
@@ -348,6 +357,8 @@ export default {
 		})
 	},
 	onShow() {
+		let that = this
+		that.token = that.$queue.getData('token')
 		this.userId = uni.getStorageSync('userId')
 		if (uni.getStorageSync('current') && this.userId) {
 			this.current1 = uni.getStorageSync('current')
@@ -371,6 +382,20 @@ export default {
 		uni.hideLoading()
 	},
 	methods: {
+		goChat() {
+			if (this.token) {
+				uni.navigateTo({
+					url: '/my/setting/chat'
+				})
+			} else {
+				this.bindlogin()
+			}
+		},
+		bindlogin() {
+			uni.navigateTo({
+				url: '/pages/public/login'
+			})
+		},
 		bindopen() {
 			this.show = true
 		},
@@ -1538,4 +1563,25 @@ export default {
 	background: rgba(255, 19, 10, 0.2);
 	opacity: 0.6;
 }
+
+.serviceBtn {
+	position: fixed;
+	right: 52rpx;
+	bottom: 50rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	width: 140rpx;
+	height: 140rpx;
+	border-radius: 50%;
+	color: #fff;
+	font-size: 20rpx;
+	background-color: #3e8ef7;
+	box-shadow: 0 0 7rpx #000;
+}
+
+.serviceBtn_text {
+	margin-top: 5rpx;
+}
 </style>

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/empty.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/watch-login/watch-button.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/watch-login/watch-input.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/address/add.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/address/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/apply/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/chat/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/coupon/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/helpList/helpDet.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/hongbao/hongbao.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/integral/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/integral/integralDet.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/integral/record.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/msg/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/myPingJia/myPingJia.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/recruit/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/about.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/chat.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/customer.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/feedback.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/mimi.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/setting/xieyi.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/shoppingCar/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/task/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/tousu/detail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/tousu/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/vip/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/wallet/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/my/wallet/walletDet.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/search/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/selectCampus.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/confirmOrder.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/goodsDet.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/goodsList.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/im.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/payOrder.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shop/pindanDet.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/shopList/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/updateNickName.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/complaint/complaint.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/detail.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/feedback.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/feedbacks.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/paotuiMap.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/takefood.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/waimaiMap.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/public/login.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/running/Cityservice/Cityservice.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/running/Helppay/Helppay.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/running/Helpsend/Helpsend.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/running/closeaddress/closeaddress.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/running/huodong/list.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/running/index/index.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/running/order/pay/pay.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/running/takeaddress/takeaddress.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-avatar/u-avatar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-badge/u-badge.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox-group/u-checkbox-group.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-column-notice/u-column-notice.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-field/u-field.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form-item/u-form-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form/u-form.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-grid-item/u-grid-item.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-grid/u-grid.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line/u-line.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-notice-bar/u-notice-bar.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-number-box/u-number-box.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-parse/libs/trees.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-parse/u-parse.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-picker/u-picker.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-rate/u-rate.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-row-notice/u-row-notice.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-search/u-search.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-select/u-select.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-skeleton/u-skeleton.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-switch/u-switch.js.map


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs/u-tabs.js.map


+ 0 - 0
unpackage/dist/dev/mp-weixin/app.json


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