Home Explore Help
Register Sign In
xuhaolan
/
paopaoShop
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

3-10

hwq 3 years ago
parent
25295b9001
commit
b35988b8f0
36 changed files with 56 additions and 42 deletions
Split View Show Diff Stats
  1. 21 9
      pages/category/business.vue
  2. 30 30
      pages/index/index.vue
  3. 1 1
      pages/user/user.vue
  4. BIN
      unpackage/dist/build/h5/3-10-1.rar
  5. 1 1
      unpackage/dist/build/h5/index.html
  6. 0 0
      unpackage/dist/build/h5/static/js/index.38e54b04.js
  7. 0 0
      unpackage/dist/build/h5/static/js/index.a3411fff.js
  8. 0 0
      unpackage/dist/build/h5/static/js/pages-activity-bargain-index.1b48554e.js
  9. 0 0
      unpackage/dist/build/h5/static/js/pages-activity-goods_bargain-index.fee159d7.js
  10. 0 0
      unpackage/dist/build/h5/static/js/pages-activity-goods_bargain_details-index.13975381.js
  11. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-cart.86480518.js
  12. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-cart~pages-category-business~pages-game-game~pages-index-index~pages-money-withdmoenys~pa~81c49d9f.3b0f33a8.js
  13. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-cart~pages-category-business~pages-game-game~pages-index-index~pages-user-user.26f8bc8f.js
  14. 0 0
      unpackage/dist/build/h5/static/js/pages-cart-cart~pages-category-business~pages-game-game~pages-index-index~pages-user-user.be925962.js
  15. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.b81238b0.js
  16. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.eee45769.js
  17. 0 0
      unpackage/dist/build/h5/static/js/pages-money-pay.2e6c6f95.js
  18. 0 0
      unpackage/dist/build/h5/static/js/pages-money-pay.baf549bc.js
  19. 0 0
      unpackage/dist/build/h5/static/js/pages-money-withdmoenys.3bc5538c.js
  20. 0 0
      unpackage/dist/build/h5/static/js/pages-order-createOrder.00df48f8.js
  21. 0 0
      unpackage/dist/build/h5/static/js/pages-public-login.7a0becab.js
  22. 0 0
      unpackage/dist/build/h5/static/js/pages-public-login.98fb1fcb.js
  23. 0 0
      unpackage/dist/build/h5/static/js/pages-redirect-redirect.4ae5e005.js
  24. 0 0
      unpackage/dist/build/h5/static/js/pages-set-address.8c19bb8c.js
  25. 0 0
      unpackage/dist/build/h5/static/js/pages-set-addressManage.03213806.js
  26. 0 0
      unpackage/dist/build/h5/static/js/pages-set-addressManage.f5c013d2.js
  27. 0 0
      unpackage/dist/build/h5/static/js/pages-user-favorites.ba204643.js
  28. 0 0
      unpackage/dist/build/h5/static/js/pages-user-jiedian.c5aa85eb.js
  29. 0 0
      unpackage/dist/build/h5/static/js/pages-user-jiedianDetails.2de617ec.js
  30. 0 0
      unpackage/dist/build/h5/static/js/pages-user-jiedianDetails.c3f435d3.js
  31. 0 0
      unpackage/dist/build/h5/static/js/pages-user-scoreAccumulate.ed28a843.js
  32. 0 0
      unpackage/dist/build/h5/static/js/pages-user-scoreAccumulate.efc07fa3.js
  33. 0 0
      unpackage/dist/build/h5/static/js/pages-user-shareQrCode.43d74fb9.js
  34. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.5cac65d6.js
  35. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.df6d270e.js
  36. 3 1
      utils/wxAuthorized.js

+ 21 - 9
pages/category/business.vue
View File 

@@ -1,27 +1,39 @@
 
 <template>
 
 	<view class="center">
 
 		<view class="kong">
 
-			<u-empty mode="data" text="敬请期待"></u-empty>
 
+			<view class="search flex">
 
+				<image src="../../static/index/index09.png" class="address"></image>
 
+				<!-- <view class="shop-name clamp" @click.stop="canChange == 0?nav('/pages/shoping/list'):''">{{ storeInfo.name }}</view> -->
 
+				<view class="shop-name clamp">椒江区</view>
 
+				<image class="shop-jt" src="../../static/index/index07.png" mode=""></image>
 
+				<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>
 
+			<!-- <u-empty mode="data" text="敬请期待"></u-empty> -->
 
 		</view>
 
 		<u-tabbar activeColor="#EE0979" v-model="current" :list="tabbar" :mid-button="true"></u-tabbar>
 
 	</view>
 
 </template>
 
 
 <script>
 
-import { tabbar } from '@/utils/tabbar.js'
 
+import { tabbar } from '@/utils/tabbar.js';
 
 export default {
 
 	data() {
 
 		return {
 
 			tabbar: tabbar,
 
-			current: 1,
 
-		}
 
+			current: 1
 
+		};
 
 	}
 
-}
 
+};
 
 </script>
 
 
 <style lang="less">
 
-	.kong {
 
-		height: 100vh;
 
-		width: 750rpx;
 
-	}
 
+.kong {
 
+	height: 100vh;
 
+	width: 750rpx;
 
+}
 
 </style>

+ 30 - 30
pages/index/index.vue
View File 

@@ -221,37 +221,37 @@ export default {
 
 		getaddress() {
 
 			console.log('dizhi+++++++++++');
 
 			let obj = this;
 
-			uni.getLocation({
 
-				type: 'gcj02',
 
-				success: res => {
 
-					console.log(res, 123456);
 
-					obj.setLat(res.latitude);
 
-					obj.setLon(res.longitude);
 
-				},
 
-				fail: err => {
 
-					console.log(err, 'shi+++++++++++++++');
 
-					openMap().then(e => {
 
-						this.getaddress();
 
-					});
 
-				}
 
-			});
 
-			// weixindata().then(wxOjb => {
 
-			// 	console.log(wxOjb,'获取微信');
 
-			// 	wxOjb.getLocation({
 
-			// 		type: 'gcj02',
 
-			// 		success: res => {
 
-			// 			console.log(res, 123456);
 
-			// 			obj.setLat(res.latitude);
 
-			// 			obj.setLon(res.longitude);
 
-			// 		},
 
-			// 		fail: err => {
 
-			// 			console.log(err, 'shi+++++++++++++++');
 
-			// 			openMap().then(e => {
 
-			// 				this.getaddress();
 
-			// 			});
 
-			// 		}
 
-			// 	});
 
+			// uni.getLocation({
 
+			// 	type: 'gcj02',
 
+			// 	success: res => {
 
+			// 		console.log(res, 123456);
 
+			// 		obj.setLat(res.latitude);
 
+			// 		obj.setLon(res.longitude);
 
+			// 	},
 
+			// 	fail: err => {
 
+			// 		console.log(err, 'shi+++++++++++++++');
 
+			// 		openMap().then(e => {
 
+			// 			this.getaddress();
 
+			// 		});
 
+			// 	}
 
 			// });
 
+			weixindata().then(wxOjb => {
 
+				console.log(wxOjb,'获取微信');
 
+				wxOjb.getLocation({
 
+					type: 'gcj02',
 
+					success: res => {
 
+						console.log(res, 123456);
 
+						obj.setLat(res.latitude);
 
+						obj.setLon(res.longitude);
 
+					},
 
+					fail: err => {
 
+						console.log(err, 'shi+++++++++++++++');
 
+						openMap().then(e => {
 
+							this.getaddress();
 
+						});
 
+					}
 
+				});
 
+			});
 
 		},
 
 		//砍价商品推荐详情页
 
 		navToDetailPages(item) {

+ 1 - 1
pages/user/user.vue
View File 

@@ -130,7 +130,7 @@
 
 						</view>

 						<view class="order-item" @click="navTo('/pages/user/scoreAccumulate')" hover-class="common-hover" :hover-stay-time="50">

 							<view class="icon"><image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image></view>

-							<text>响亮积分明细</text>

+							<text>积分明细</text>

 						</view>

 						<!-- <view class="order-item" @click="navTo('/pages/order/order?state=4')" hover-class="common-hover" :hover-stay-time="50">

 							<view class="icon"><image class="icon-img" src="/static/icon/u4.png" mode="aspectFit"></image></view>

BIN
unpackage/dist/build/h5/h5.rar → unpackage/dist/build/h5/3-10-1.rar
View File


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

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

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


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-activity-bargain-index.1b48554e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-activity-goods_bargain-index.fee159d7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-activity-goods_bargain_details-index.13975381.js


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-cart~pages-category-business~pages-game-game~pages-index-index~pages-money-withdmoenys~pa~81c49d9f.3b0f33a8.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-cart~pages-category-business~pages-game-game~pages-index-index~pages-user-user.26f8bc8f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-cart-cart~pages-category-business~pages-game-game~pages-index-index~pages-user-user.be925962.js


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


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


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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-set-address.8c19bb8c.js


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


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


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


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


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


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


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


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


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


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


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


+ 3 - 1
utils/wxAuthorized.js
View File 

@@ -128,7 +128,9 @@ export async function weixindata(config) {
 
 						weixinObj.ready((e) => {
 
 							log.addLog("注册完毕", data)
 
 							console.log('注册完毕');
 
-							ok(data)
 
+							store.commit('setWeiChatObj', weixinObj)
 
+							ok(weixinObj)
 
+							// ok(data)
 
 						})
 
 					} catch (e) {
 
 						console.log(e)

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