合并分支 'yan' 到 'master'
Yan 查看合并请求 !15
正在显示
4 个修改的文件
包含
12 行增加
和
5 行删除
@@ -5,8 +5,9 @@ | @@ -5,8 +5,9 @@ | ||
5 | // http://localhost:8080/ | 5 | // http://localhost:8080/ |
6 | onLaunch: function(e) { | 6 | onLaunch: function(e) { |
7 | const openId = uni.getStorageSync('openId') | 7 | const openId = uni.getStorageSync('openId') |
8 | - console.log(openId); | 8 | + console.log(openId,'openid'); |
9 | if(!openId && !e.query.code){ | 9 | if(!openId && !e.query.code){ |
10 | + console.log('获取code'); | ||
10 | getApp().authorization() | 11 | getApp().authorization() |
11 | }else if(e.query.code) { | 12 | }else if(e.query.code) { |
12 | console.log(2); | 13 | console.log(2); |
@@ -19,11 +19,11 @@ | @@ -19,11 +19,11 @@ | ||
19 | </view> | 19 | </view> |
20 | <view class="contail"> | 20 | <view class="contail"> |
21 | <view class="nev"> | 21 | <view class="nev"> |
22 | - <view class="bar" v-for="(item,index) in categoryList" :key="index" @click="tocate"> | 22 | + <view class="bar" v-for="(item,index) in categoryList" :key="index" @click="tocate(item.name)"> |
23 | <image class="barimg" :src="item.image_preview" mode=""></image> | 23 | <image class="barimg" :src="item.image_preview" mode=""></image> |
24 | <text>{{item.name}}</text> | 24 | <text>{{item.name}}</text> |
25 | </view> | 25 | </view> |
26 | - <view class="bar"> | 26 | + <view class="bar" @click="toallCate"> |
27 | <image class="barimg" src="/static/logo.png" mode=""></image> | 27 | <image class="barimg" src="/static/logo.png" mode=""></image> |
28 | <text>更多</text> | 28 | <text>更多</text> |
29 | </view> | 29 | </view> |
@@ -157,7 +157,12 @@ | @@ -157,7 +157,12 @@ | ||
157 | url: "/pages/index/consultationDetails?id=" + e | 157 | url: "/pages/index/consultationDetails?id=" + e |
158 | }) | 158 | }) |
159 | }, | 159 | }, |
160 | - tocate() { | 160 | + tocate(name) { |
161 | + uni.navigateTo({ | ||
162 | + url: "/pages/index/product?ktext="+name | ||
163 | + }) | ||
164 | + }, | ||
165 | + toallCate(){ | ||
161 | uni.navigateTo({ | 166 | uni.navigateTo({ |
162 | url: "/pages/index/category" | 167 | url: "/pages/index/category" |
163 | }) | 168 | }) |
1 | <!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)')) | 1 | <!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)')) |
2 | - 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=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.f3bf79df.js></script><script src=/static/js/index.9fa833af.js></script></body></html> | ||
2 | + 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=/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.f3bf79df.js></script><script src=/static/js/index.6b7d1d69.js></script></body></html> |
-
请 注册 或 登录 后发表评论