正在显示
24 个修改的文件
包含
271 行增加
和
230 行删除
@@ -108,7 +108,7 @@ | @@ -108,7 +108,7 @@ | ||
108 | 108 | ||
109 | globalData: { | 109 | globalData: { |
110 | userInfo: null, | 110 | userInfo: null, |
111 | - version:'v1.0.7', | 111 | + version:'v1.0.8', |
112 | // baseUrl: 'http://zhongmian.w.brotop.cn/api/', | 112 | // baseUrl: 'http://zhongmian.w.brotop.cn/api/', |
113 | // imgurl:'http://zhongmian.w.brotop.cn/' | 113 | // imgurl:'http://zhongmian.w.brotop.cn/' |
114 | baseUrl: 'https://app.chinesenooddles.com/api/', | 114 | baseUrl: 'https://app.chinesenooddles.com/api/', |
@@ -127,6 +127,21 @@ | @@ -127,6 +127,21 @@ | ||
127 | width: 100%; | 127 | width: 100%; |
128 | height: 100%; | 128 | height: 100%; |
129 | } | 129 | } |
130 | + .shartype{ | ||
131 | + width: 48rpx; | ||
132 | + height: 48rpx; | ||
133 | + position: absolute; | ||
134 | + top:0; | ||
135 | + left:0; | ||
136 | + border:none; | ||
137 | + outline: none; | ||
138 | + background:transparent; | ||
139 | + } | ||
140 | + .shartype::after{ | ||
141 | + border:none; | ||
142 | + outline: none; | ||
143 | + background:transparent; | ||
144 | + } | ||
130 | .eye{ | 145 | .eye{ |
131 | width:45rpx; | 146 | width:45rpx; |
132 | height:35rpx; | 147 | height:35rpx; |
@@ -2,8 +2,8 @@ | @@ -2,8 +2,8 @@ | ||
2 | "name" : "中国面条", | 2 | "name" : "中国面条", |
3 | "appid" : "__UNI__86EF000", | 3 | "appid" : "__UNI__86EF000", |
4 | "description" : "中国面条", | 4 | "description" : "中国面条", |
5 | - "versionName" : "1.1.0", | ||
6 | - "versionCode" : 134, | 5 | + "versionName" : "1.1.2", |
6 | + "versionCode" : 136, | ||
7 | "transformPx" : false, | 7 | "transformPx" : false, |
8 | /* 5+App特有相关 */ | 8 | /* 5+App特有相关 */ |
9 | "app-plus" : { | 9 | "app-plus" : { |
@@ -124,7 +124,7 @@ | @@ -124,7 +124,7 @@ | ||
124 | <view class="homeshoplist flexone"> | 124 | <view class="homeshoplist flexone"> |
125 | <view class="homeshopitem" v-for="(item,index) in shoplist" :key="index" @click="goodtail" :data-id="item.id"> | 125 | <view class="homeshopitem" v-for="(item,index) in shoplist" :key="index" @click="goodtail" :data-id="item.id"> |
126 | <view class="gooditemimg"> | 126 | <view class="gooditemimg"> |
127 | - <image :src="item.image" mode=""></image> | 127 | + <image :src="item.image" mode="aspectFill"></image> |
128 | <view class="sale">已售{{item.sales}}件</view> | 128 | <view class="sale">已售{{item.sales}}件</view> |
129 | </view> | 129 | </view> |
130 | <view class="goodname hidden">{{item.name}}</view> | 130 | <view class="goodname hidden">{{item.name}}</view> |
@@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
23 | <view class="homeshoplist flexone goodboxlist" v-else> | 23 | <view class="homeshoplist flexone goodboxlist" v-else> |
24 | <view class="homeshopitem goodboxitem" v-for="(item,index) in shoplist" :key="index" @click="goodtail" :data-id="item.id"> | 24 | <view class="homeshopitem goodboxitem" v-for="(item,index) in shoplist" :key="index" @click="goodtail" :data-id="item.id"> |
25 | <view class="gooditemimg goodboximg"> | 25 | <view class="gooditemimg goodboximg"> |
26 | - <image :src="item.image" mode="scaleToFill"></image> | 26 | + <image :src="item.image" mode="aspectFill"></image> |
27 | <!-- <view class="sale boxsale">已售{{item.sale}}件</view> --> | 27 | <!-- <view class="sale boxsale">已售{{item.sale}}件</view> --> |
28 | </view> | 28 | </view> |
29 | <view class="goodname hidden boxgoodname">{{item.name}}</view> | 29 | <view class="goodname hidden boxgoodname">{{item.name}}</view> |
@@ -333,7 +333,8 @@ | @@ -333,7 +333,8 @@ | ||
333 | }, | 333 | }, |
334 | // 注册 | 334 | // 注册 |
335 | register() { | 335 | register() { |
336 | - uni.navigateTo({ | 336 | + uni.redirectTo({ |
337 | + | ||
337 | url: '/pages/login/registercode' | 338 | url: '/pages/login/registercode' |
338 | }) | 339 | }) |
339 | }, | 340 | }, |
@@ -347,9 +348,6 @@ | @@ -347,9 +348,6 @@ | ||
347 | xieyi(e) { | 348 | xieyi(e) { |
348 | let type = e.currentTarget.dataset.type; | 349 | let type = e.currentTarget.dataset.type; |
349 | this.xieyishow = true; | 350 | this.xieyishow = true; |
350 | - | ||
351 | - | ||
352 | - | ||
353 | }, | 351 | }, |
354 | goxieyi(e) { | 352 | goxieyi(e) { |
355 | let type = e.currentTarget.dataset.type; | 353 | let type = e.currentTarget.dataset.type; |
@@ -113,9 +113,10 @@ | @@ -113,9 +113,10 @@ | ||
113 | onLoad(options) { | 113 | onLoad(options) { |
114 | }, | 114 | }, |
115 | methods: { | 115 | methods: { |
116 | + | ||
116 | // 去登录页面 | 117 | // 去登录页面 |
117 | loginlogin(){ | 118 | loginlogin(){ |
118 | - uni.navigateTo({ | 119 | + uni.redirectTo({ |
119 | url:'/pages/login/loginindex' | 120 | url:'/pages/login/loginindex' |
120 | }) | 121 | }) |
121 | }, | 122 | }, |
@@ -373,7 +373,6 @@ | @@ -373,7 +373,6 @@ | ||
373 | page: that.page, | 373 | page: that.page, |
374 | pageNum: 10 | 374 | pageNum: 10 |
375 | } | 375 | } |
376 | - | ||
377 | console.log('参数', params) | 376 | console.log('参数', params) |
378 | app.post(url, params).then((res) => { | 377 | app.post(url, params).then((res) => { |
379 | console.log('论坛列表', res); | 378 | console.log('论坛列表', res); |
@@ -74,9 +74,7 @@ | @@ -74,9 +74,7 @@ | ||
74 | <text>{{item.category_name}}</text> | 74 | <text>{{item.category_name}}</text> |
75 | <text style="border:none">{{item.createtime}}</text> | 75 | <text style="border:none">{{item.createtime}}</text> |
76 | </view> | 76 | </view> |
77 | - | ||
78 | <text v-for="(item,index) in item.user.label" :key="index">{{item.name_label}}</text> | 77 | <text v-for="(item,index) in item.user.label" :key="index">{{item.name_label}}</text> |
79 | - | ||
80 | </view> | 78 | </view> |
81 | 79 | ||
82 | <view class="release-text"> | 80 | <view class="release-text"> |
@@ -3,31 +3,31 @@ | @@ -3,31 +3,31 @@ | ||
3 | <view class="personal-wrap"> | 3 | <view class="personal-wrap"> |
4 | <!-- 头像,名称,等级 --> | 4 | <!-- 头像,名称,等级 --> |
5 | <view class="user-info"> | 5 | <view class="user-info"> |
6 | - <image :src="user.avatar" style="border-radius: 50%;"/> | 6 | + <image :src="user.avatar" style="border-radius: 50%;" /> |
7 | <view class="name-vip-type"> | 7 | <view class="name-vip-type"> |
8 | <view class="name-vip"> | 8 | <view class="name-vip"> |
9 | <text class="title">{{user.nickname}}</text> | 9 | <text class="title">{{user.nickname}}</text> |
10 | - | 10 | + |
11 | <!-- <view class="VIP" v-if="user.level.name1!=undefined"> | 11 | <!-- <view class="VIP" v-if="user.level.name1!=undefined"> |
12 | <image src="../../icons/vip.png"></image> | 12 | <image src="../../icons/vip.png"></image> |
13 | {{user.level.name1}} | 13 | {{user.level.name1}} |
14 | </view> --> | 14 | </view> --> |
15 | - <view v-if="user_id!='null'"> | 15 | + <view v-if="user_id!='null'"> |
16 | <view v-if="user_id!=mineuserid"> | 16 | <view v-if="user_id!=mineuserid"> |
17 | <view class='attention' @click="attentionguan" v-if="user.is_attention==2">关注</view> | 17 | <view class='attention' @click="attentionguan" v-if="user.is_attention==2">关注</view> |
18 | <view class='noattention' @click="noattention" v-else>取消关注</view> | 18 | <view class='noattention' @click="noattention" v-else>取消关注</view> |
19 | </view> | 19 | </view> |
20 | - | 20 | + |
21 | </view> | 21 | </view> |
22 | - | 22 | + |
23 | </view> | 23 | </view> |
24 | - <view class="connectmobile" @click="mobile">联系方式:{{user.mobile_hide}}</view> | 24 | + <view class="connectmobile" @click="mobile">联系方式:{{user.mobile_hide}}</view> |
25 | <view class="connectmobile" v-if="user.address!=''">地址:{{user.address}}</view> | 25 | <view class="connectmobile" v-if="user.address!=''">地址:{{user.address}}</view> |
26 | - <view v-if="user.label!=undefined"> | 26 | + <view v-if="user.label!=undefined"> |
27 | <view class="type" v-for="(item,index) in user.label" :key="index"> | 27 | <view class="type" v-for="(item,index) in user.label" :key="index"> |
28 | </view> | 28 | </view> |
29 | - </view > | ||
30 | - | 29 | + </view> |
30 | + | ||
31 | </view> | 31 | </view> |
32 | </view> | 32 | </view> |
33 | <view class="nodata" v-if="personlist.length==0">暂无数据</view> | 33 | <view class="nodata" v-if="personlist.length==0">暂无数据</view> |
@@ -39,19 +39,19 @@ | @@ -39,19 +39,19 @@ | ||
39 | <view> | 39 | <view> |
40 | <view style="display:flex;align-items: center;"> | 40 | <view style="display:flex;align-items: center;"> |
41 | <text class="title">{{item.user.nickname}}</text> | 41 | <text class="title">{{item.user.nickname}}</text> |
42 | - | 42 | + |
43 | <view v-if="item.user.level!=undefined"> | 43 | <view v-if="item.user.level!=undefined"> |
44 | <view class="VIP" v-if="item.user.level.name1!=undefined"> | 44 | <view class="VIP" v-if="item.user.level.name1!=undefined"> |
45 | <image src="../../icons/vip.png"></image> | 45 | <image src="../../icons/vip.png"></image> |
46 | {{item.user.level.name1}} | 46 | {{item.user.level.name1}} |
47 | </view> | 47 | </view> |
48 | </view> | 48 | </view> |
49 | - | 49 | + |
50 | </view> | 50 | </view> |
51 | <view style="color:#333;font-size: 28rpx;margin-top:5rpx;margin-left:20rpx">{{item.createtime}}</view> | 51 | <view style="color:#333;font-size: 28rpx;margin-top:5rpx;margin-left:20rpx">{{item.createtime}}</view> |
52 | - | 52 | + |
53 | </view> | 53 | </view> |
54 | - | 54 | + |
55 | </view> | 55 | </view> |
56 | <!-- type --> | 56 | <!-- type --> |
57 | <view class="type-wrap"> | 57 | <view class="type-wrap"> |
@@ -99,48 +99,56 @@ | @@ -99,48 +99,56 @@ | ||
99 | page: 1, | 99 | page: 1, |
100 | personlist: [], | 100 | personlist: [], |
101 | user: '', | 101 | user: '', |
102 | - mineuserid:'', | ||
103 | - | 102 | + mineuserid: '', |
103 | + type:'' | ||
104 | + | ||
104 | } | 105 | } |
105 | }, | 106 | }, |
106 | onLoad(options) { | 107 | onLoad(options) { |
107 | console.log(options) | 108 | console.log(options) |
108 | this.user_id = options.userid; | 109 | this.user_id = options.userid; |
109 | - this.getpersonpage(); | ||
110 | - | 110 | + this.type=options.type |
111 | + this.getpersonpage(); | ||
112 | + | ||
111 | }, | 113 | }, |
112 | - | 114 | + onUnload() { |
115 | + uni.$emit('update', { | ||
116 | + type: this.type | ||
117 | + }) | ||
118 | + console.log(3734784378) | ||
119 | + }, | ||
120 | + | ||
113 | methods: { | 121 | methods: { |
114 | hidebanben() { | 122 | hidebanben() { |
115 | this.showbanben = false; | 123 | this.showbanben = false; |
116 | 124 | ||
117 | }, | 125 | }, |
118 | - | ||
119 | - mobile(){ | 126 | + |
127 | + mobile() { | ||
120 | uni.makePhoneCall({ | 128 | uni.makePhoneCall({ |
121 | - phoneNumber: this.user.mobile//仅为示例 | 129 | + phoneNumber: this.user.mobile //仅为示例 |
122 | }); | 130 | }); |
123 | }, | 131 | }, |
124 | - | 132 | + |
125 | // 获取用户信息 | 133 | // 获取用户信息 |
126 | getuserinfo() { | 134 | getuserinfo() { |
127 | let that = this; | 135 | let that = this; |
128 | var url = 'member/index'; | 136 | var url = 'member/index'; |
129 | var params = { | 137 | var params = { |
130 | - | 138 | + |
131 | } | 139 | } |
132 | console.log('7766554', params) | 140 | console.log('7766554', params) |
133 | app.post(url, params).then((res) => { | 141 | app.post(url, params).then((res) => { |
134 | - console.log('用户信息',res); | ||
135 | - that.mineuserid=res.data.data.id; | ||
136 | - console.log('个人的ID',that.mineuserid) | ||
137 | - | 142 | + console.log('用户信息', res); |
143 | + that.mineuserid = res.data.data.id; | ||
144 | + console.log('个人的ID', that.mineuserid) | ||
145 | + | ||
138 | }).catch((err) => { | 146 | }).catch((err) => { |
139 | console.log(err) | 147 | console.log(err) |
140 | - | 148 | + |
141 | }) | 149 | }) |
142 | }, | 150 | }, |
143 | - | 151 | + |
144 | // 获取个人主页 | 152 | // 获取个人主页 |
145 | getpersonpage() { | 153 | getpersonpage() { |
146 | let that = this; | 154 | let that = this; |
@@ -150,59 +158,59 @@ | @@ -150,59 +158,59 @@ | ||
150 | page: that.page, | 158 | page: that.page, |
151 | pageNum: 10 | 159 | pageNum: 10 |
152 | } | 160 | } |
153 | - console.log('8934394889',params) | ||
154 | - | 161 | + console.log('8934394889', params) |
162 | + | ||
155 | app.post(url, params).then((res) => { | 163 | app.post(url, params).then((res) => { |
156 | - console.log('个人主页信息',res) | ||
157 | - that.user=res.data.data.user; | ||
158 | - console.log('676767676767',that.user) | ||
159 | - that.personlist = that.personlist.concat(res.data.data.list); | ||
160 | - | 164 | + console.log('个人主页信息', res) |
165 | + that.user = res.data.data.user; | ||
166 | + console.log('676767676767', that.user) | ||
167 | + that.personlist = that.personlist.concat(res.data.data.list); | ||
168 | + | ||
161 | }).catch((err) => { | 169 | }).catch((err) => { |
162 | - console.log(err) | ||
163 | - }) | ||
164 | - | 170 | + console.log(err) |
171 | + }) | ||
172 | + | ||
165 | }, | 173 | }, |
166 | // 关注和取消关注 | 174 | // 关注和取消关注 |
167 | - attentionguan(){ | 175 | + attentionguan() { |
168 | let that = this; | 176 | let that = this; |
169 | let url = 'forum/attention'; | 177 | let url = 'forum/attention'; |
170 | var params = { | 178 | var params = { |
171 | to_user_id: that.user_id, | 179 | to_user_id: that.user_id, |
172 | - | 180 | + |
173 | } | 181 | } |
174 | - | 182 | + |
175 | app.post(url, params).then((res) => { | 183 | app.post(url, params).then((res) => { |
176 | uni.showToast({ | 184 | uni.showToast({ |
177 | - title:"关注成功", | ||
178 | - icon:'none' | 185 | + title: "关注成功", |
186 | + icon: 'none' | ||
179 | }) | 187 | }) |
180 | - that.user.is_attention=1; | ||
181 | - that.user=that.user | 188 | + that.user.is_attention = 1; |
189 | + that.user = that.user | ||
182 | }).catch((err) => { | 190 | }).catch((err) => { |
183 | console.log(err) | 191 | console.log(err) |
184 | - | 192 | + |
185 | 193 | ||
186 | }) | 194 | }) |
187 | }, | 195 | }, |
188 | - noattention(){ | 196 | + noattention() { |
189 | let that = this; | 197 | let that = this; |
190 | let url = 'forum/attention'; | 198 | let url = 'forum/attention'; |
191 | var params = { | 199 | var params = { |
192 | to_user_id: that.user_id, | 200 | to_user_id: that.user_id, |
193 | - | 201 | + |
194 | } | 202 | } |
195 | - | 203 | + |
196 | app.post(url, params).then((res) => { | 204 | app.post(url, params).then((res) => { |
197 | uni.showToast({ | 205 | uni.showToast({ |
198 | - title:"取消关注成功", | ||
199 | - icon:'none' | 206 | + title: "取消关注成功", |
207 | + icon: 'none' | ||
200 | }) | 208 | }) |
201 | - that.user.is_attention=2; | ||
202 | - that.user=that.user | 209 | + that.user.is_attention = 2; |
210 | + that.user = that.user | ||
203 | }) | 211 | }) |
204 | }, | 212 | }, |
205 | - | 213 | + |
206 | // 更多 | 214 | // 更多 |
207 | goodkind() { | 215 | goodkind() { |
208 | uni.navigateTo({ | 216 | uni.navigateTo({ |
@@ -227,11 +235,11 @@ | @@ -227,11 +235,11 @@ | ||
227 | url: '/pages/homepage/miaosha' | 235 | url: '/pages/homepage/miaosha' |
228 | }) | 236 | }) |
229 | }, | 237 | }, |
230 | - | 238 | + |
231 | // 论坛详情 | 239 | // 论坛详情 |
232 | - luntandetail(item){ | 240 | + luntandetail(item) { |
233 | uni.navigateTo({ | 241 | uni.navigateTo({ |
234 | - url:'/pages/luntan/luntandetail?id='+item.id | 242 | + url: '/pages/luntan/luntandetail?id=' + item.id |
235 | }) | 243 | }) |
236 | }, | 244 | }, |
237 | } | 245 | } |
@@ -243,31 +251,34 @@ | @@ -243,31 +251,34 @@ | ||
243 | page { | 251 | page { |
244 | background: #F9F9F9; | 252 | background: #F9F9F9; |
245 | } | 253 | } |
246 | - .connectmobile{ | ||
247 | - color:#333; | 254 | + |
255 | + .connectmobile { | ||
256 | + color: #333; | ||
248 | font-size: 32rpx; | 257 | font-size: 32rpx; |
249 | } | 258 | } |
250 | - .attention{ | ||
251 | - width:160rpx; | ||
252 | - height:52rpx; | 259 | + |
260 | + .attention { | ||
261 | + width: 160rpx; | ||
262 | + height: 52rpx; | ||
253 | border-radius: 40rpx; | 263 | border-radius: 40rpx; |
254 | - color:#fff; | 264 | + color: #fff; |
255 | font-size: 28rpx; | 265 | font-size: 28rpx; |
256 | text-align: center; | 266 | text-align: center; |
257 | line-height: 52rpx; | 267 | line-height: 52rpx; |
258 | background: #C29445; | 268 | background: #C29445; |
259 | - margin-left:20rpx; | 269 | + margin-left: 20rpx; |
260 | } | 270 | } |
261 | - .noattention{ | ||
262 | - width:160rpx; | ||
263 | - height:52rpx; | 271 | + |
272 | + .noattention { | ||
273 | + width: 160rpx; | ||
274 | + height: 52rpx; | ||
264 | border-radius: 40rpx; | 275 | border-radius: 40rpx; |
265 | - color:#fff; | 276 | + color: #fff; |
266 | font-size: 28rpx; | 277 | font-size: 28rpx; |
267 | text-align: center; | 278 | text-align: center; |
268 | line-height: 52rpx; | 279 | line-height: 52rpx; |
269 | - background:#BDC4CE; | ||
270 | - margin-left:20rpx; | 280 | + background: #BDC4CE; |
281 | + margin-left: 20rpx; | ||
271 | } | 282 | } |
272 | 283 | ||
273 | .release-text-content { | 284 | .release-text-content { |
@@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
20 | <image src="../../static/cartsel.png" mode="" v-else></image> | 20 | <image src="../../static/cartsel.png" mode="" v-else></image> |
21 | </view> | 21 | </view> |
22 | <view class="sureorderitemleft"> | 22 | <view class="sureorderitemleft"> |
23 | - <image :src="item.store_goods.image" mode=""></image> | 23 | + <image :src="item.store_goods.image" mode="aspectFill"></image> |
24 | </view> | 24 | </view> |
25 | <view class='shuright'> | 25 | <view class='shuright'> |
26 | <view class="suregoodnamek">{{item.store_goods.name}} | 26 | <view class="suregoodnamek">{{item.store_goods.name}} |
@@ -62,7 +62,7 @@ | @@ -62,7 +62,7 @@ | ||
62 | <image src="../../static/cartsel.png" mode="" v-else></image> | 62 | <image src="../../static/cartsel.png" mode="" v-else></image> |
63 | </view> | 63 | </view> |
64 | <view class="sureorderitemleft"> | 64 | <view class="sureorderitemleft"> |
65 | - <image :src="item.flour_goods.image" mode=""></image> | 65 | + <image :src="item.flour_goods.image" mode="aspectFill"></image> |
66 | </view> | 66 | </view> |
67 | <view class='shuright'> | 67 | <view class='shuright'> |
68 | <view class="suregoodnamek"> | 68 | <view class="suregoodnamek"> |
@@ -105,7 +105,7 @@ | @@ -105,7 +105,7 @@ | ||
105 | <image src="../../static/cartnosel.png" mode="" v-else></image> | 105 | <image src="../../static/cartnosel.png" mode="" v-else></image> |
106 | </view> | 106 | </view> |
107 | <view class="sureorderitemleft"> | 107 | <view class="sureorderitemleft"> |
108 | - <image :src="item.score_goods.image" mode=""></image> | 108 | + <image :src="item.score_goods.image" mode="aspectFill"></image> |
109 | </view> | 109 | </view> |
110 | </view> | 110 | </view> |
111 | <view class='shuright'> | 111 | <view class='shuright'> |
@@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
32 | <view class="searchgooditem flex boxsizing" v-for="(item,index) in shoplist" :key="index" @click="shopdetail(item.id)" :data-id="item.id"> | 32 | <view class="searchgooditem flex boxsizing" v-for="(item,index) in shoplist" :key="index" @click="shopdetail(item.id)" :data-id="item.id"> |
33 | 33 | ||
34 | <view class="shopleftimg"> | 34 | <view class="shopleftimg"> |
35 | - <image :src="item.image" mode=""></image> | 35 | + <image :src="item.image" mode="aspectFill"></image> |
36 | </view> | 36 | </view> |
37 | <view class="shopright"> | 37 | <view class="shopright"> |
38 | <view class="shopname">{{item.name}}</view> | 38 | <view class="shopname">{{item.name}}</view> |
@@ -229,7 +229,6 @@ | @@ -229,7 +229,6 @@ | ||
229 | getshoplist() { | 229 | getshoplist() { |
230 | let that = this; | 230 | let that = this; |
231 | let token=uni.getStorageSync("token"); | 231 | let token=uni.getStorageSync("token"); |
232 | - console.log('343498493349哈哈哈哈哈哈',token) | ||
233 | var url = 'store/get_store_list'; | 232 | var url = 'store/get_store_list'; |
234 | var params = { | 233 | var params = { |
235 | province_id:'', | 234 | province_id:'', |
@@ -92,7 +92,14 @@ | @@ -92,7 +92,14 @@ | ||
92 | selcoupon(item,index){ | 92 | selcoupon(item,index){ |
93 | let that=this | 93 | let that=this |
94 | console.log(item); | 94 | console.log(item); |
95 | - that.couponlist[index].sel=!that.couponlist[index].sel; | 95 | + that.couponlist.forEach(function(value,index,array){ |
96 | + if(value.id==item.id){ | ||
97 | + that.couponlist[index].sel=!that.couponlist[index].sel; | ||
98 | + }else{ | ||
99 | + that.couponlist[index].sel=false | ||
100 | + } | ||
101 | + }) | ||
102 | + | ||
96 | console.log(that.couponlist[index].sel) | 103 | console.log(that.couponlist[index].sel) |
97 | 104 | ||
98 | that.couponlist=that.couponlist; | 105 | that.couponlist=that.couponlist; |
@@ -102,6 +109,7 @@ | @@ -102,6 +109,7 @@ | ||
102 | }else{ | 109 | }else{ |
103 | uni.setStorageSync("couponitem",''); | 110 | uni.setStorageSync("couponitem",''); |
104 | } | 111 | } |
112 | + | ||
105 | }, | 113 | }, |
106 | surecoupon(){ | 114 | surecoupon(){ |
107 | uni.navigateBack({ | 115 | uni.navigateBack({ |
@@ -143,25 +143,20 @@ | @@ -143,25 +143,20 @@ | ||
143 | </view> | 143 | </view> |
144 | </view> | 144 | </view> |
145 | </view> | 145 | </view> |
146 | - | ||
147 | - | ||
148 | </view> | 146 | </view> |
149 | <view class="nodata" v-if="goodlist.length==0" style="margin-top:100rpx;">暂无数据</view> | 147 | <view class="nodata" v-if="goodlist.length==0" style="margin-top:100rpx;">暂无数据</view> |
150 | <view class="homeshoplist flexone goodboxlist" v-else> | 148 | <view class="homeshoplist flexone goodboxlist" v-else> |
151 | <view class="homeshopitem goodboxitem" v-for="(item,index) in goodlist" :key="index" @click="goodtail" :data-id="item.id"> | 149 | <view class="homeshopitem goodboxitem" v-for="(item,index) in goodlist" :key="index" @click="goodtail" :data-id="item.id"> |
152 | <view class="gooditemimg goodboximg"> | 150 | <view class="gooditemimg goodboximg"> |
153 | - <image :src="item.image" mode=""></image> | 151 | + <image :src="item.image" mode="aspectFill"></image> |
154 | <view class="sale boxsale">已售{{item.sales}}件</view> | 152 | <view class="sale boxsale">已售{{item.sales}}件</view> |
155 | </view> | 153 | </view> |
156 | <view class="goodname hidden boxgoodname">{{item.name}}</view> | 154 | <view class="goodname hidden boxgoodname">{{item.name}}</view> |
157 | <view class="saleprice">¥{{item.price}}</view> | 155 | <view class="saleprice">¥{{item.price}}</view> |
158 | - | ||
159 | - | ||
160 | </view> | 156 | </view> |
161 | </view> | 157 | </view> |
162 | </view> | 158 | </view> |
163 | </template> | 159 | </template> |
164 | - | ||
165 | <script> | 160 | <script> |
166 | import app from "../../App.vue"; | 161 | import app from "../../App.vue"; |
167 | export default { | 162 | export default { |
@@ -612,15 +612,24 @@ | @@ -612,15 +612,24 @@ | ||
612 | app.post(url, params, "post").then((res) => { | 612 | app.post(url, params, "post").then((res) => { |
613 | console.log(res,'99998778775545546677887'); | 613 | console.log(res,'99998778775545546677887'); |
614 | console.log(res.data.data); | 614 | console.log(res.data.data); |
615 | - that.goodinfo=res.data.data | 615 | + that.goodinfo=res.data.data; |
616 | + if(uni.getStorageSync("couponitem")!=''){ | ||
617 | + let couponitem = uni.getStorageSync("couponitem"); | ||
618 | + that.couponname=couponitem.name; | ||
619 | + }else{ | ||
620 | + that.couponname='请选择优惠券'; | ||
621 | + } | ||
622 | + | ||
623 | + | ||
616 | }).catch((err) => { | 624 | }).catch((err) => { |
617 | console.log(err) | 625 | console.log(err) |
618 | uni.showToast({ | 626 | uni.showToast({ |
619 | title:err.msg, | 627 | title:err.msg, |
620 | icon:'none' | 628 | icon:'none' |
621 | }) | 629 | }) |
622 | - | ||
623 | - that.couponitem='' | 630 | + that.couponname='请选择优惠券'; |
631 | + that.couponitem=''; | ||
632 | + that.user_ticket_id='' | ||
624 | 633 | ||
625 | }) | 634 | }) |
626 | }, | 635 | }, |
@@ -670,9 +679,7 @@ | @@ -670,9 +679,7 @@ | ||
670 | pay_type:that.pay_type, | 679 | pay_type:that.pay_type, |
671 | user_address_id:that.addressitem.id | 680 | user_address_id:that.addressitem.id |
672 | } | 681 | } |
673 | - console.log(that.seldata); | ||
674 | - console.log(params,'乔') | ||
675 | - console.log(params.data,'乔蒙蒙的参数') | 682 | + |
676 | app.post(url, params,"post").then((res) => { | 683 | app.post(url, params,"post").then((res) => { |
677 | console.log(res); | 684 | console.log(res); |
678 | that.order_id=res.data.data.order_id; | 685 | that.order_id=res.data.data.order_id; |
@@ -682,6 +689,7 @@ | @@ -682,6 +689,7 @@ | ||
682 | // }) | 689 | // }) |
683 | 690 | ||
684 | }).catch((err) => { | 691 | }).catch((err) => { |
692 | + | ||
685 | console.log(err) | 693 | console.log(err) |
686 | uni.showToast({ | 694 | uni.showToast({ |
687 | title:err.msg, | 695 | title:err.msg, |
@@ -743,7 +751,7 @@ | @@ -743,7 +751,7 @@ | ||
743 | 751 | ||
744 | setTimeout(function(){ | 752 | setTimeout(function(){ |
745 | uni.navigateTo({ | 753 | uni.navigateTo({ |
746 | - url:"/pages/usercenter/myOrder" | 754 | + url:"/pages/usercenter/myOrder?id="+2 |
747 | }) | 755 | }) |
748 | },1500) | 756 | },1500) |
749 | } | 757 | } |
@@ -754,19 +762,17 @@ | @@ -754,19 +762,17 @@ | ||
754 | } | 762 | } |
755 | }); | 763 | }); |
756 | }else{ | 764 | }else{ |
757 | - console.log('3434893489834894389','支付成功成功') | 765 | + |
758 | uni.showToast({ | 766 | uni.showToast({ |
759 | title:'支付成功', | 767 | title:'支付成功', |
760 | icon:'none' | 768 | icon:'none' |
761 | }) | 769 | }) |
762 | setTimeout(function(){ | 770 | setTimeout(function(){ |
763 | uni.redirectTo({ | 771 | uni.redirectTo({ |
764 | - url:"/pages/usercenter/myOrder" | 772 | + url:"/pages/usercenter/myOrder?id="+2 |
765 | }) | 773 | }) |
766 | },1500) | 774 | },1500) |
767 | } | 775 | } |
768 | - | ||
769 | - | ||
770 | }).catch((err) => { | 776 | }).catch((err) => { |
771 | console.log(err) | 777 | console.log(err) |
772 | 778 | ||
@@ -792,26 +798,27 @@ | @@ -792,26 +798,27 @@ | ||
792 | }, | 798 | }, |
793 | 799 | ||
794 | onShow() { | 800 | onShow() { |
801 | + let that=this | ||
795 | this.buyshow=false | 802 | this.buyshow=false |
796 | console.log(uni.getStorageSync("addressitem")) | 803 | console.log(uni.getStorageSync("addressitem")) |
797 | if(uni.getStorageSync("addressitem")!=''){ | 804 | if(uni.getStorageSync("addressitem")!=''){ |
798 | this.addressitem = uni.getStorageSync("addressitem"); | 805 | this.addressitem = uni.getStorageSync("addressitem"); |
799 | } | 806 | } |
807 | + | ||
808 | + // 选择优惠券 | ||
809 | + | ||
800 | if(uni.getStorageSync("couponitem")!=''){ | 810 | if(uni.getStorageSync("couponitem")!=''){ |
801 | let couponitem = uni.getStorageSync("couponitem"); | 811 | let couponitem = uni.getStorageSync("couponitem"); |
802 | - console.log(couponitem) | ||
803 | - this.couponname=couponitem.name; | ||
804 | - | ||
805 | - this.user_ticket_id=couponitem.id; | 812 | + // that.couponname=couponitem.name; |
813 | + that.user_ticket_id=couponitem.id; | ||
806 | this.changeorder() | 814 | this.changeorder() |
807 | 815 | ||
808 | }else{ | 816 | }else{ |
809 | - this.couponname='请选择优惠券'; | ||
810 | - this.user_ticket_id=''; | 817 | + // that.couponname='请选择优惠券'; |
818 | + that.user_ticket_id=''; | ||
811 | this.changeorder() | 819 | this.changeorder() |
812 | } | 820 | } |
813 | 821 | ||
814 | - console.log(this.addressitem) | ||
815 | 822 | ||
816 | } | 823 | } |
817 | 824 |
@@ -92,7 +92,7 @@ | @@ -92,7 +92,7 @@ | ||
92 | <image src="../../static/right.png" mode="widthFix" /> | 92 | <image src="../../static/right.png" mode="widthFix" /> |
93 | </view> | 93 | </view> |
94 | </view> | 94 | </view> |
95 | - <view class="citem" @click.stop="jump" data-id="7"> | 95 | + <view class="citem" @click.stop="jump" data-id="7" v-if="myclose==1"> |
96 | <view class="left"> | 96 | <view class="left"> |
97 | <image src="../../static/fenxiao.png" mode="widthFix" /> | 97 | <image src="../../static/fenxiao.png" mode="widthFix" /> |
98 | 我的分销 | 98 | 我的分销 |
@@ -37,9 +37,7 @@ | @@ -37,9 +37,7 @@ | ||
37 | </view> | 37 | </view> |
38 | </view> | 38 | </view> |
39 | </view> | 39 | </view> |
40 | - | ||
41 | </view> | 40 | </view> |
42 | - | ||
43 | </view> | 41 | </view> |
44 | <!-- 我的评论 --> | 42 | <!-- 我的评论 --> |
45 | <view v-if="order==2"> | 43 | <view v-if="order==2"> |
@@ -49,19 +47,17 @@ | @@ -49,19 +47,17 @@ | ||
49 | 47 | ||
50 | <view class="wordarea"> | 48 | <view class="wordarea"> |
51 | <rich-text :nodes="item.content"></rich-text> | 49 | <rich-text :nodes="item.content"></rich-text> |
52 | - | ||
53 | </view> | 50 | </view> |
54 | <view class="time" style="margin-top:10rpx;">{{item.forum.title}}</view> | 51 | <view class="time" style="margin-top:10rpx;">{{item.forum.title}}</view> |
55 | <view class="numbox"> | 52 | <view class="numbox"> |
56 | <view class="time">{{item.createtime}}</view> | 53 | <view class="time">{{item.createtime}}</view> |
57 | <view class="btnbox"> | 54 | <view class="btnbox"> |
55 | + <image src="../../static/del.png" class="del" @click.stop="delcomment(item)" style="margin-right:20rpx"></image> | ||
58 | <view class="zan"> | 56 | <view class="zan"> |
59 | <view> | 57 | <view> |
60 | <image src="../../static/tienozan.png" mode="widthFix" class="icon" v-if="item.is_praise==2"></image> | 58 | <image src="../../static/tienozan.png" mode="widthFix" class="icon" v-if="item.is_praise==2"></image> |
61 | <image src="../../static/zan.png" mode="widthFix" class="icon" v-else></image> | 59 | <image src="../../static/zan.png" mode="widthFix" class="icon" v-else></image> |
62 | </view> | 60 | </view> |
63 | - | ||
64 | - | ||
65 | {{item.praise}} | 61 | {{item.praise}} |
66 | </view> | 62 | </view> |
67 | <view class="people"> | 63 | <view class="people"> |
@@ -70,10 +66,7 @@ | @@ -70,10 +66,7 @@ | ||
70 | </view> | 66 | </view> |
71 | </view> | 67 | </view> |
72 | </view> | 68 | </view> |
73 | - | ||
74 | - | ||
75 | </view> | 69 | </view> |
76 | - | ||
77 | </view> | 70 | </view> |
78 | <!-- 我的发布 --> | 71 | <!-- 我的发布 --> |
79 | <view v-if="order==3"> | 72 | <view v-if="order==3"> |
@@ -90,9 +83,7 @@ | @@ -90,9 +83,7 @@ | ||
90 | </view> | 83 | </view> |
91 | <view class="wordarea"> | 84 | <view class="wordarea"> |
92 | <rich-text :nodes="item.content"></rich-text> | 85 | <rich-text :nodes="item.content"></rich-text> |
93 | - | ||
94 | </view> | 86 | </view> |
95 | - | ||
96 | <view class="numbox"> | 87 | <view class="numbox"> |
97 | <view class="time">{{item.creatssssetime}}</view> | 88 | <view class="time">{{item.creatssssetime}}</view> |
98 | <view class="btnbox"> | 89 | <view class="btnbox"> |
@@ -109,10 +100,7 @@ | @@ -109,10 +100,7 @@ | ||
109 | </view> | 100 | </view> |
110 | </view> | 101 | </view> |
111 | </view> | 102 | </view> |
112 | - | ||
113 | - | ||
114 | </view> | 103 | </view> |
115 | - | ||
116 | </view> | 104 | </view> |
117 | <view v-if="order==4"> | 105 | <view v-if="order==4"> |
118 | <view class="nodata" v-if="attentionlist.length==0">暂无数据</view> | 106 | <view class="nodata" v-if="attentionlist.length==0">暂无数据</view> |
@@ -151,7 +139,7 @@ | @@ -151,7 +139,7 @@ | ||
151 | 139 | ||
152 | <view class="new-release-content" v-for="(item,index) in attentionlist" :key="index" @click="luntandetail(item,4)"> | 140 | <view class="new-release-content" v-for="(item,index) in attentionlist" :key="index" @click="luntandetail(item,4)"> |
153 | <!-- 头像,名称,等级 --> | 141 | <!-- 头像,名称,等级 --> |
154 | - <view class="userinfo-wrap" @click.stop="usercenter(item)"> | 142 | + <view class="userinfo-wrap" @click.stop="usercenter(item,4)"> |
155 | <image class="avatarimgk" :src="item.to_user.avatar"></image> | 143 | <image class="avatarimgk" :src="item.to_user.avatar"></image> |
156 | <text class="title">{{item.to_user.nickname}}</text> | 144 | <text class="title">{{item.to_user.nickname}}</text> |
157 | <view class="VIP"> | 145 | <view class="VIP"> |
@@ -159,65 +147,8 @@ | @@ -159,65 +147,8 @@ | ||
159 | {{item.to_user.level.name1}} | 147 | {{item.to_user.level.name1}} |
160 | </view> | 148 | </view> |
161 | </view> | 149 | </view> |
162 | - <!-- type --> | ||
163 | - <!-- <view class="type-wrap"> | ||
164 | - | ||
165 | - <text v-for="(item,index) in item.to_user.label" :key="index">{{item.name_label}}</text> | ||
166 | - | ||
167 | - </view> --> | ||
168 | - <!-- content --> | ||
169 | - | ||
170 | - <!-- 点赞, 人数 --> | ||
171 | - | ||
172 | </view> | 150 | </view> |
173 | - | ||
174 | - | ||
175 | - <!-- <view class="item"> | ||
176 | - <view class="titlebox"> | ||
177 | - <view class="type">审核中</view> | ||
178 | - <view class="word">帖子标题帖子标题帖子标题帖子帖...</view> | ||
179 | - <image src="../../static/del.png" mode="widthFix" class="del"></image> | ||
180 | - </view> | ||
181 | - <view class="wordarea"> | ||
182 | - 帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容... | ||
183 | - </view> | ||
184 | - <view class="numbox"> | ||
185 | - <view class="time">2019-10-10 15:30:30</view> | ||
186 | - <view class="btnbox"> | ||
187 | - <view class="zan"> | ||
188 | - <image src="../../static/zan.png" mode="widthFix" class="icon"></image>399 | ||
189 | - </view> | ||
190 | - <view class="people"> | ||
191 | - <image src="../../static/people.png" mode="widthFix" class="icon"></image>399 | ||
192 | - </view> | ||
193 | - </view> | ||
194 | - </view> | ||
195 | - </view> | ||
196 | - <view class="item"> | ||
197 | - <view class="titlebox"> | ||
198 | - <view class="type">审核中</view> | ||
199 | - <view class="word">帖子标题帖子标题帖子标题帖子帖...</view> | ||
200 | - <image src="../../static/del.png" mode="widthFix" class="del"></image> | ||
201 | - </view> | ||
202 | - <view class="wordarea"> | ||
203 | - 帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容帖子内容... | ||
204 | - </view> | ||
205 | - <view class="numbox"> | ||
206 | - <view class="time">2019-10-10 15:30:30</view> | ||
207 | - <view class="btnbox"> | ||
208 | - <view class="zan"> | ||
209 | - <image src="../../static/zan.png" mode="widthFix" class="icon"></image>399 | ||
210 | - </view> | ||
211 | - <view class="people"> | ||
212 | - <image src="../../static/people.png" mode="widthFix" class="icon"></image>399 | ||
213 | - </view> | ||
214 | - </view> | ||
215 | - </view> | ||
216 | - </view> | ||
217 | - --> | ||
218 | - | ||
219 | </view> | 151 | </view> |
220 | - | ||
221 | </view> | 152 | </view> |
222 | <!-- 发布 --> | 153 | <!-- 发布 --> |
223 | <view class="release-news" v-if="publish"> | 154 | <view class="release-news" v-if="publish"> |
@@ -367,8 +298,6 @@ | @@ -367,8 +298,6 @@ | ||
367 | 298 | ||
368 | }) | 299 | }) |
369 | }, | 300 | }, |
370 | - | ||
371 | - | ||
372 | // 发布评论 | 301 | // 发布评论 |
373 | publishitezik(item) { | 302 | publishitezik(item) { |
374 | let token=uni.getStorageSync("token"); | 303 | let token=uni.getStorageSync("token"); |
@@ -386,10 +315,10 @@ | @@ -386,10 +315,10 @@ | ||
386 | 315 | ||
387 | 316 | ||
388 | // 进入论坛主页 | 317 | // 进入论坛主页 |
389 | - usercenter(item) { | 318 | + usercenter(item,type) { |
390 | // let user = JSON.stringify(item.user) | 319 | // let user = JSON.stringify(item.user) |
391 | uni.navigateTo({ | 320 | uni.navigateTo({ |
392 | - url: '/pages/luntan/luntanpage?userid=' + item.to_user_id | 321 | + url: '/pages/luntan/luntanpage?userid=' + item.to_user_id+'&type='+type |
393 | }) | 322 | }) |
394 | }, | 323 | }, |
395 | // 底部导航跳转 | 324 | // 底部导航跳转 |
@@ -480,6 +409,7 @@ | @@ -480,6 +409,7 @@ | ||
480 | console.log(err) | 409 | console.log(err) |
481 | }) | 410 | }) |
482 | }, | 411 | }, |
412 | + // 删除帖子 | ||
483 | del(item) { | 413 | del(item) { |
484 | let that = this; | 414 | let that = this; |
485 | console.log(3443893489809) | 415 | console.log(3443893489809) |
@@ -514,6 +444,44 @@ | @@ -514,6 +444,44 @@ | ||
514 | } | 444 | } |
515 | }); | 445 | }); |
516 | }, | 446 | }, |
447 | + // 删除评论 | ||
448 | + delcomment(item){ | ||
449 | + let that = this; | ||
450 | + console.log(3443893489809) | ||
451 | + uni.showModal({ | ||
452 | + title: '提示', | ||
453 | + content: '是否删除评论', | ||
454 | + success: function(res) { | ||
455 | + if (res.confirm) { | ||
456 | + | ||
457 | + var url = 'comments/del_comments'; | ||
458 | + var params = { | ||
459 | + comments_id: item.id | ||
460 | + } | ||
461 | + console.log('7766554', params) | ||
462 | + app.post(url, params).then((res) => { | ||
463 | + console.log(res); | ||
464 | + uni.showToast({ | ||
465 | + title: '删除成功', | ||
466 | + icon: 'none' | ||
467 | + }) | ||
468 | + that.commentlist.forEach(function(value,index,array){ | ||
469 | + if(value.id==item.id){ | ||
470 | + that.commentlist.splice(index,1) | ||
471 | + } | ||
472 | + }) | ||
473 | + that.commentlist=that.commentlist; | ||
474 | + that.$forceUpdate() | ||
475 | + | ||
476 | + }).catch((err) => { | ||
477 | + console.log(err,999999) | ||
478 | + }) | ||
479 | + } else if (res.cancel) { | ||
480 | + console.log('用户点击取消'); | ||
481 | + } | ||
482 | + } | ||
483 | + }); | ||
484 | + }, | ||
517 | 485 | ||
518 | // 我的点赞 | 486 | // 我的点赞 |
519 | getmayzan(){ | 487 | getmayzan(){ |
@@ -644,8 +612,8 @@ | @@ -644,8 +612,8 @@ | ||
644 | } | 612 | } |
645 | }, | 613 | }, |
646 | onShow() { | 614 | onShow() { |
647 | - | ||
648 | let that=this; | 615 | let that=this; |
616 | + console.log(3434893489498) | ||
649 | 617 | ||
650 | // 我的关注 | 618 | // 我的关注 |
651 | // 获取我的点赞 | 619 | // 获取我的点赞 |
@@ -664,6 +632,12 @@ | @@ -664,6 +632,12 @@ | ||
664 | that.attentionlist=[]; | 632 | that.attentionlist=[]; |
665 | that.getmyattention(); | 633 | that.getmyattention(); |
666 | } | 634 | } |
635 | + | ||
636 | + // else if(data.type==2){ | ||
637 | + // that.pagecoment=1; | ||
638 | + // that.commentlist=[]; | ||
639 | + // that.getmycomment() | ||
640 | + // } | ||
667 | }) | 641 | }) |
668 | 642 | ||
669 | 643 |
1 | <template> | 1 | <template> |
2 | <view class="content"> | 2 | <view class="content"> |
3 | <view class="ordercontent"> | 3 | <view class="ordercontent"> |
4 | - | ||
5 | - <view class="sureordertop flextwo"> | ||
6 | - | ||
7 | - <view class="addresstop" > | 4 | + |
5 | + <view class="sureordertop flextwo" v-if="postage_type==1"> | ||
6 | + | ||
7 | + <view class="addresstop"> | ||
8 | <view class="addressname flexone"> | 8 | <view class="addressname flexone"> |
9 | <view class="sureordername"> | 9 | <view class="sureordername"> |
10 | {{addresspeople}} | 10 | {{addresspeople}} |
11 | - | 11 | + |
12 | </view> | 12 | </view> |
13 | <view class="sureorderphone">{{addressphone}}</view> | 13 | <view class="sureorderphone">{{addressphone}}</view> |
14 | </view> | 14 | </view> |
15 | <view class="addresstitle"> | 15 | <view class="addresstitle"> |
16 | - {{addressname}} | 16 | + {{addressname}} |
17 | </view> | 17 | </view> |
18 | </view> | 18 | </view> |
19 | <view class="yourowk"> | 19 | <view class="yourowk"> |
@@ -70,11 +70,18 @@ | @@ -70,11 +70,18 @@ | ||
70 | <view class='deliveryitemname'>下单时间</view> | 70 | <view class='deliveryitemname'>下单时间</view> |
71 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.createtime}}</view> | 71 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.createtime}}</view> |
72 | </view> | 72 | </view> |
73 | - <view class="deliveryitem flextwo"> | 73 | + <view class="deliveryitem flextwo" @click='copynumber(goodinfo.order_detail_num)'> |
74 | <view class='deliveryitemname'>订单编号</view> | 74 | <view class='deliveryitemname'>订单编号</view> |
75 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.order_detail_num}}</view> | 75 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.order_detail_num}}</view> |
76 | </view> | 76 | </view> |
77 | <view class="deliveryitem flextwo"> | 77 | <view class="deliveryitem flextwo"> |
78 | + <view class='deliveryitemname'>支付方式</view> | ||
79 | + <view class='deliveryitemname ' v-if="pay_typek==1">微信支付</view> | ||
80 | + <view class='deliveryitemname ' v-if="pay_typek==2">支付宝支付</view> | ||
81 | + <view class='deliveryitemname ' v-if="pay_typek==3">余额支付</view> | ||
82 | + <view class='deliveryitemname ' v-if="pay_typek==4">赊吧支付</view> | ||
83 | + </view> | ||
84 | + <view class="deliveryitem flextwo"> | ||
78 | <view class='deliveryitemname'>商品金额</view> | 85 | <view class='deliveryitemname'>商品金额</view> |
79 | <view class='deliveryitemname moneyright'>¥{{goodinfo.goods_total}}</view> | 86 | <view class='deliveryitemname moneyright'>¥{{goodinfo.goods_total}}</view> |
80 | </view> | 87 | </view> |
@@ -132,23 +139,31 @@ | @@ -132,23 +139,31 @@ | ||
132 | </view> | 139 | </view> |
133 | </view> | 140 | </view> |
134 | </view> | 141 | </view> |
135 | - | 142 | + |
136 | 143 | ||
137 | <view class="delivery markcontent markcontentk peibox"> | 144 | <view class="delivery markcontent markcontentk peibox"> |
138 | - | 145 | + |
139 | <view class="deliveryitem flextwo"> | 146 | <view class="deliveryitem flextwo"> |
140 | <view class='deliveryitemname'>下单时间</view> | 147 | <view class='deliveryitemname'>下单时间</view> |
141 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.createtime}}</view> | 148 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.createtime}}</view> |
142 | </view> | 149 | </view> |
143 | - <view class="deliveryitem flextwo"> | 150 | + <view class="deliveryitem flextwo" @click='copynumber(goodinfo.order_detail_num)'> |
144 | <view class='deliveryitemname'>订单编号</view> | 151 | <view class='deliveryitemname'>订单编号</view> |
145 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.order_detail_num}}</view> | 152 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.order_detail_num}}</view> |
146 | </view> | 153 | </view> |
147 | <view class="deliveryitem flextwo"> | 154 | <view class="deliveryitem flextwo"> |
155 | + <view class='deliveryitemname'>支付方式</view> | ||
156 | + <view class='deliveryitemname ' v-if="pay_typek==1">微信支付</view> | ||
157 | + <view class='deliveryitemname ' v-if="pay_typek==2">支付宝支付</view> | ||
158 | + <view class='deliveryitemname ' v-if="pay_typek==3">余额支付</view> | ||
159 | + <view class='deliveryitemname ' v-if="pay_typek==4">赊吧支付</view> | ||
160 | + </view> | ||
161 | + <view class="deliveryitem flextwo"> | ||
148 | <view class='deliveryitemname'>商品金额</view> | 162 | <view class='deliveryitemname'>商品金额</view> |
149 | <view class='deliveryitemname moneyright'>¥{{goodinfo.goods_total}}</view> | 163 | <view class='deliveryitemname moneyright'>¥{{goodinfo.goods_total}}</view> |
150 | </view> | 164 | </view> |
151 | - | 165 | + |
166 | + | ||
152 | <view class="deliveryitem flextwo"> | 167 | <view class="deliveryitem flextwo"> |
153 | <view class='deliveryitemname'>优惠券</view> | 168 | <view class='deliveryitemname'>优惠券</view> |
154 | <view class='deliveryitemname moneyright'>¥{{goodinfo.ticket_price==null?'':'-'}}{{goodinfo.ticket_price==null?'0':goodinfo.ticket_price}}</view> | 169 | <view class='deliveryitemname moneyright'>¥{{goodinfo.ticket_price==null?'':'-'}}{{goodinfo.ticket_price==null?'0':goodinfo.ticket_price}}</view> |
@@ -208,22 +223,31 @@ | @@ -208,22 +223,31 @@ | ||
208 | </view> | 223 | </view> |
209 | </view> | 224 | </view> |
210 | </view> | 225 | </view> |
211 | - | 226 | + |
212 | <view class="delivery markcontent markcontentk peibox"> | 227 | <view class="delivery markcontent markcontentk peibox"> |
213 | - | 228 | + |
214 | <view class="deliveryitem flextwo"> | 229 | <view class="deliveryitem flextwo"> |
215 | <view class='deliveryitemname'>下单时间</view> | 230 | <view class='deliveryitemname'>下单时间</view> |
216 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.createtime}}</view> | 231 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.createtime}}</view> |
217 | </view> | 232 | </view> |
218 | - <view class="deliveryitem flextwo"> | ||
219 | - | 233 | + <view class="deliveryitem flextwo" @click='copynumber(goodinfo.order_detail_num)'> |
234 | + | ||
220 | <view class='deliveryitemname'>订单编号</view> | 235 | <view class='deliveryitemname'>订单编号</view> |
221 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.order_detail_num}}</view> | 236 | <view class='deliveryitemname moneyright ordernumber'>{{goodinfo.order_detail_num}}</view> |
222 | </view> | 237 | </view> |
223 | <view class="deliveryitem flextwo"> | 238 | <view class="deliveryitem flextwo"> |
239 | + <view class='deliveryitemname'>支付方式</view> | ||
240 | + <view class='deliveryitemname ' v-if="pay_typek==1">微信支付</view> | ||
241 | + <view class='deliveryitemname ' v-if="pay_typek==2">支付宝支付</view> | ||
242 | + <view class='deliveryitemname ' v-if="pay_typek==3">余额支付</view> | ||
243 | + <view class='deliveryitemname ' v-if="pay_typek==4">赊吧支付</view> | ||
244 | + </view> | ||
245 | + <view class="deliveryitem flextwo"> | ||
224 | <view class='deliveryitemname'>商品金额</view> | 246 | <view class='deliveryitemname'>商品金额</view> |
225 | <view class='deliveryitemname moneyright'>¥{{goodinfo.goods_total}}</view> | 247 | <view class='deliveryitemname moneyright'>¥{{goodinfo.goods_total}}</view> |
226 | </view> | 248 | </view> |
249 | + | ||
250 | + | ||
227 | <view class="deliveryitem flextwo"> | 251 | <view class="deliveryitem flextwo"> |
228 | <view class='deliveryitemname'>积分抵扣</view> | 252 | <view class='deliveryitemname'>积分抵扣</view> |
229 | <view class='deliveryitemname moneyright'>¥{{goodinfo.score}}</view> | 253 | <view class='deliveryitemname moneyright'>¥{{goodinfo.score}}</view> |
@@ -323,7 +347,7 @@ | @@ -323,7 +347,7 @@ | ||
323 | 347 | ||
324 | </view> | 348 | </view> |
325 | </view> | 349 | </view> |
326 | - | 350 | + |
327 | </view> | 351 | </view> |
328 | </template> | 352 | </template> |
329 | 353 | ||
@@ -387,10 +411,12 @@ | @@ -387,10 +411,12 @@ | ||
387 | //判断收货地址是否显示 | 411 | //判断收货地址是否显示 |
388 | postage_type3: '', | 412 | postage_type3: '', |
389 | order_detail_id: '', | 413 | order_detail_id: '', |
390 | - addressname:'', | ||
391 | - addressphone:'', | ||
392 | - addresspeople:'' | 414 | + addressname: '', |
415 | + addressphone: '', | ||
416 | + addresspeople: '', | ||
393 | // data1 面坊 data2 积分 data3 店铺 | 417 | // data1 面坊 data2 积分 data3 店铺 |
418 | + postage_type: '', //1=快递配送,2=上门自提 | ||
419 | + pay_typek: "", //1微信支付 2 支付宝支付 3 余额支付 4 支付宝支付 | ||
394 | } | 420 | } |
395 | }, | 421 | }, |
396 | onLoad(options) { | 422 | onLoad(options) { |
@@ -410,7 +436,7 @@ | @@ -410,7 +436,7 @@ | ||
410 | // console.log(this.goodinfo) | 436 | // console.log(this.goodinfo) |
411 | }, | 437 | }, |
412 | methods: { | 438 | methods: { |
413 | - | 439 | + |
414 | // // 添加地址 | 440 | // // 添加地址 |
415 | // addaddress(){ | 441 | // addaddress(){ |
416 | // console.log(334439090) | 442 | // console.log(334439090) |
@@ -430,10 +456,11 @@ | @@ -430,10 +456,11 @@ | ||
430 | app.post(url, params, "post").then((res) => { | 456 | app.post(url, params, "post").then((res) => { |
431 | console.log(res); | 457 | console.log(res); |
432 | that.goodinfo = res.data.data; | 458 | that.goodinfo = res.data.data; |
433 | - that.addresspeople=res.data.data.name; | ||
434 | - that.addressname=res.data.data.address; | ||
435 | - that.addressphone=res.data.data.mobile | ||
436 | - | 459 | + that.addresspeople = res.data.data.name; |
460 | + that.addressname = res.data.data.address; | ||
461 | + that.addressphone = res.data.data.mobile; | ||
462 | + that.postage_type = res.data.data.postage_type; | ||
463 | + that.pay_typek = res.data.data.pay_type; | ||
437 | 464 | ||
438 | }).catch((err) => {}) | 465 | }).catch((err) => {}) |
439 | }, | 466 | }, |
@@ -441,6 +468,12 @@ | @@ -441,6 +468,12 @@ | ||
441 | gocomment() { | 468 | gocomment() { |
442 | 469 | ||
443 | }, | 470 | }, |
471 | + // 复制订单编号 | ||
472 | + copynumber(number) { | ||
473 | + uni.setClipboardData({ | ||
474 | + data: number | ||
475 | + }); | ||
476 | + }, | ||
444 | // 添加地址 | 477 | // 添加地址 |
445 | addaddress() { | 478 | addaddress() { |
446 | console.log(334439090) | 479 | console.log(334439090) |
@@ -485,7 +518,7 @@ | @@ -485,7 +518,7 @@ | ||
485 | } | 518 | } |
486 | }); | 519 | }); |
487 | }, | 520 | }, |
488 | - | 521 | + |
489 | 522 | ||
490 | // 确认收获 | 523 | // 确认收获 |
491 | shouhuo() { | 524 | shouhuo() { |
@@ -508,7 +541,6 @@ | @@ -508,7 +541,6 @@ | ||
508 | }) | 541 | }) |
509 | }, 1500) | 542 | }, 1500) |
510 | 543 | ||
511 | - | ||
512 | }).catch((err) => { | 544 | }).catch((err) => { |
513 | console.log(err) | 545 | console.log(err) |
514 | }) | 546 | }) |
@@ -664,7 +696,7 @@ | @@ -664,7 +696,7 @@ | ||
664 | 696 | ||
665 | }) | 697 | }) |
666 | } else if (that.goodinfo.pay_type == 1) { | 698 | } else if (that.goodinfo.pay_type == 1) { |
667 | - let result=res.data.data.result; | 699 | + let result = res.data.data.result; |
668 | uni.requestPayment({ | 700 | uni.requestPayment({ |
669 | provider: 'wxpay', | 701 | provider: 'wxpay', |
670 | orderInfo: JSON.stringify(result), //微信、支付宝订单数据 | 702 | orderInfo: JSON.stringify(result), //微信、支付宝订单数据 |
@@ -681,17 +713,17 @@ | @@ -681,17 +713,17 @@ | ||
681 | console.log('fail:' + JSON.stringify(err)); | 713 | console.log('fail:' + JSON.stringify(err)); |
682 | } | 714 | } |
683 | }); | 715 | }); |
684 | - | ||
685 | - }else{ | ||
686 | - uni.showToast({ | ||
687 | - title:'支付成功', | ||
688 | - icon:'none' | 716 | + |
717 | + } else { | ||
718 | + uni.showToast({ | ||
719 | + title: '支付成功', | ||
720 | + icon: 'none' | ||
689 | }) | 721 | }) |
690 | - setTimeout(function(){ | 722 | + setTimeout(function() { |
691 | uni.navigateBack({ | 723 | uni.navigateBack({ |
692 | - checked:true | 724 | + checked: true |
693 | }) | 725 | }) |
694 | - },1500) | 726 | + }, 1500) |
695 | } | 727 | } |
696 | // uni.showToast({ | 728 | // uni.showToast({ |
697 | // title: '支付成功', | 729 | // title: '支付成功', |
@@ -740,8 +772,9 @@ | @@ -740,8 +772,9 @@ | ||
740 | page { | 772 | page { |
741 | background: #F8F6F9; | 773 | background: #F8F6F9; |
742 | } | 774 | } |
743 | - .ordernumber{ | ||
744 | - color:#333 | 775 | + |
776 | + .ordernumber { | ||
777 | + color: #333 | ||
745 | } | 778 | } |
746 | 779 | ||
747 | .behuiyuanbtn { | 780 | .behuiyuanbtn { |
此 diff 太大无法显示。
此 diff 太大无法显示。
1 | -{"@platforms":["android","iPhone","iPad"],"id":"__UNI__86EF000","name":"中国面条","version":{"name":"1.1.0","code":134},"description":"中国面条","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Payment":{},"Maps":{"coordType":"gcj02"},"FaceID":{},"VideoPlayer":{},"Bluetooth":{},"Contacts":{},"Fingerprint":{},"iBeacon":{},"LivePusher":{},"Messaging":{},"OAuth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","compatible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.READ_SMS\"/>","<uses-permission android:name=\"android.permission.RECEIVE_SMS\"/>","<uses-permission android:name=\"android.permission.SEND_SMS\"/>","<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.WRITE_SMS\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"]},"apple":{"capabilities":{"entitlements":{"com.apple.developer.associated-domains":["applinks:app.chinesenooddles.com"]}},"privacyDescription":{"NSPhotoLibraryUsageDescription":"中国面条想要使用相册来进行用户头像选取,您同意我们访问你的相册吗?","NSPhotoLibraryAddUsageDescription":"中国面条想要使用相册来进行用户头像选取,您同意我们访问你的相册吗?","NSCameraUsageDescription":"中国面条想要使用相机来进行用户头像选取,您同意我们访问你的相机吗?","NSLocationWhenInUseUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?","NSLocationAlwaysUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?","NSLocationAlwaysAndWhenInUseUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?"}},"plugins":{"payment":{"alipay":{},"weixin":{"appid":"wx24f90adc1d2f4f3d","UniversalLinks":"https://app.chinesenooddles.com/.well-known/"},"appleiap":{}},"ad":{},"maps":{"amap":{"appkey_ios":"39ab1cc4587cc0c5f21f25054c59bb18","appkey_android":"01d25fb8343d7ce5040bc32cb3e5379f"}},"oauth":{"weixin":{"appid":"wx24f90adc1d2f4f3d","appsecret":"e1da139286ef1335fdd36029a2ac7fb5","UniversalLinks":"https://app.chinesenooddles.com/.well-known/"}},"share":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{"AThree-Face":{"__plugin_info__":{"name":"Face","description":"人脸核身","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"2.8.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#BDC4CE","selectedColor":"#EE8B27","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","list":[{"pagePath":"pages/homepage/homepage","iconPath":"../../static/index.png","selectedIconPath":"../../static/indexactive.png","text":"首页"},{"pagePath":"pages/nearshop/nearshop","iconPath":"../../static/nearshop.png","selectedIconPath":"../../static/nearshopactive.png","text":"附近店铺"},{"pagePath":"pages/luntan/luntan","iconPath":"../../static/luntan.png","selectedIconPath":"../../static/luntanactive.png","text":"中面论坛"},{"pagePath":"pages/usercenter/my","iconPath":"../../static/user.png","selectedIconPath":"../../static/useractive.png","text":"个人中心"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}} | ||
1 | +{"@platforms":["android","iPhone","iPad"],"id":"__UNI__86EF000","name":"中国面条","version":{"name":"1.1.2","code":136},"description":"中国面条","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Payment":{},"Maps":{"coordType":"gcj02"},"FaceID":{},"VideoPlayer":{},"Bluetooth":{},"Contacts":{},"Fingerprint":{},"iBeacon":{},"LivePusher":{},"Messaging":{},"OAuth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","compatible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.READ_SMS\"/>","<uses-permission android:name=\"android.permission.RECEIVE_SMS\"/>","<uses-permission android:name=\"android.permission.SEND_SMS\"/>","<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.WRITE_SMS\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"]},"apple":{"capabilities":{"entitlements":{"com.apple.developer.associated-domains":["applinks:app.chinesenooddles.com"]}},"privacyDescription":{"NSPhotoLibraryUsageDescription":"中国面条想要使用相册来进行用户头像选取,您同意我们访问你的相册吗?","NSPhotoLibraryAddUsageDescription":"中国面条想要使用相册来进行用户头像选取,您同意我们访问你的相册吗?","NSCameraUsageDescription":"中国面条想要使用相机来进行用户头像选取,您同意我们访问你的相机吗?","NSLocationWhenInUseUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?","NSLocationAlwaysUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?","NSLocationAlwaysAndWhenInUseUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?"}},"plugins":{"payment":{"alipay":{},"weixin":{"appid":"wx24f90adc1d2f4f3d","UniversalLinks":"https://app.chinesenooddles.com/.well-known/"},"appleiap":{}},"ad":{},"maps":{"amap":{"appkey_ios":"39ab1cc4587cc0c5f21f25054c59bb18","appkey_android":"01d25fb8343d7ce5040bc32cb3e5379f"}},"oauth":{"weixin":{"appid":"wx24f90adc1d2f4f3d","appsecret":"e1da139286ef1335fdd36029a2ac7fb5","UniversalLinks":"https://app.chinesenooddles.com/.well-known/"}},"share":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{"AThree-Face":{"__plugin_info__":{"name":"Face","description":"人脸核身","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"2.8.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#BDC4CE","selectedColor":"#EE8B27","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","list":[{"pagePath":"pages/homepage/homepage","iconPath":"../../static/index.png","selectedIconPath":"../../static/indexactive.png","text":"首页"},{"pagePath":"pages/nearshop/nearshop","iconPath":"../../static/nearshop.png","selectedIconPath":"../../static/nearshopactive.png","text":"附近店铺"},{"pagePath":"pages/luntan/luntan","iconPath":"../../static/luntan.png","selectedIconPath":"../../static/luntanactive.png","text":"中面论坛"},{"pagePath":"pages/usercenter/my","iconPath":"../../static/user.png","selectedIconPath":"../../static/useractive.png","text":"个人中心"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}} |
此 diff 太大无法显示。
此 diff 太大无法显示。
1 | -{"@platforms":["android","iPhone","iPad"],"id":"__UNI__86EF000","name":"中国面条","version":{"name":"1.1.0","code":134},"description":"中国面条","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Payment":{},"Maps":{"coordType":"gcj02"},"FaceID":{},"VideoPlayer":{},"Bluetooth":{},"Contacts":{},"Fingerprint":{},"iBeacon":{},"LivePusher":{},"Messaging":{},"OAuth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","compatible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.READ_SMS\"/>","<uses-permission android:name=\"android.permission.RECEIVE_SMS\"/>","<uses-permission android:name=\"android.permission.SEND_SMS\"/>","<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.WRITE_SMS\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"]},"apple":{"capabilities":{"entitlements":{"com.apple.developer.associated-domains":["applinks:app.chinesenooddles.com"]}},"privacyDescription":{"NSPhotoLibraryUsageDescription":"中国面条想要使用相册来进行用户头像选取,您同意我们访问你的相册吗?","NSPhotoLibraryAddUsageDescription":"中国面条想要使用相册来进行用户头像选取,您同意我们访问你的相册吗?","NSCameraUsageDescription":"中国面条想要使用相机来进行用户头像选取,您同意我们访问你的相机吗?","NSLocationWhenInUseUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?","NSLocationAlwaysUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?","NSLocationAlwaysAndWhenInUseUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?"}},"plugins":{"payment":{"alipay":{},"weixin":{"appid":"wx24f90adc1d2f4f3d","UniversalLinks":"https://app.chinesenooddles.com/.well-known/"},"appleiap":{}},"ad":{},"maps":{"amap":{"appkey_ios":"39ab1cc4587cc0c5f21f25054c59bb18","appkey_android":"01d25fb8343d7ce5040bc32cb3e5379f"}},"oauth":{"weixin":{"appid":"wx24f90adc1d2f4f3d","appsecret":"e1da139286ef1335fdd36029a2ac7fb5","UniversalLinks":"https://app.chinesenooddles.com/.well-known/"}},"share":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{"AThree-Face":{"__plugin_info__":{"name":"Face","description":"人脸核身","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"2.8.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#BDC4CE","selectedColor":"#EE8B27","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","list":[{"pagePath":"pages/homepage/homepage","iconPath":"../../static/index.png","selectedIconPath":"../../static/indexactive.png","text":"首页"},{"pagePath":"pages/nearshop/nearshop","iconPath":"../../static/nearshop.png","selectedIconPath":"../../static/nearshopactive.png","text":"附近店铺"},{"pagePath":"pages/luntan/luntan","iconPath":"../../static/luntan.png","selectedIconPath":"../../static/luntanactive.png","text":"中面论坛"},{"pagePath":"pages/usercenter/my","iconPath":"../../static/user.png","selectedIconPath":"../../static/useractive.png","text":"个人中心"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}} | ||
1 | +{"@platforms":["android","iPhone","iPad"],"id":"__UNI__86EF000","name":"中国面条","version":{"name":"1.1.2","code":136},"description":"中国面条","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Payment":{},"Maps":{"coordType":"gcj02"},"FaceID":{},"VideoPlayer":{},"Bluetooth":{},"Contacts":{},"Fingerprint":{},"iBeacon":{},"LivePusher":{},"Messaging":{},"OAuth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueCompiler":"uni-app","compatible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"google":{"permissions":["<uses-feature android:name=\"android.hardware.camera\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-permission android:name=\"android.permission.INTERNET\"/>","<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.READ_SMS\"/>","<uses-permission android:name=\"android.permission.RECEIVE_SMS\"/>","<uses-permission android:name=\"android.permission.SEND_SMS\"/>","<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.WRITE_SMS\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH\"/>","<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"]},"apple":{"capabilities":{"entitlements":{"com.apple.developer.associated-domains":["applinks:app.chinesenooddles.com"]}},"privacyDescription":{"NSPhotoLibraryUsageDescription":"中国面条想要使用相册来进行用户头像选取,您同意我们访问你的相册吗?","NSPhotoLibraryAddUsageDescription":"中国面条想要使用相册来进行用户头像选取,您同意我们访问你的相册吗?","NSCameraUsageDescription":"中国面条想要使用相机来进行用户头像选取,您同意我们访问你的相机吗?","NSLocationWhenInUseUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?","NSLocationAlwaysUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?","NSLocationAlwaysAndWhenInUseUsageDescription":"中国面条想要使用定位来为您推荐更加精准的面馆信息,您同意我们访问你的定位吗?"}},"plugins":{"payment":{"alipay":{},"weixin":{"appid":"wx24f90adc1d2f4f3d","UniversalLinks":"https://app.chinesenooddles.com/.well-known/"},"appleiap":{}},"ad":{},"maps":{"amap":{"appkey_ios":"39ab1cc4587cc0c5f21f25054c59bb18","appkey_android":"01d25fb8343d7ce5040bc32cb3e5379f"}},"oauth":{"weixin":{"appid":"wx24f90adc1d2f4f3d","appsecret":"e1da139286ef1335fdd36029a2ac7fb5","UniversalLinks":"https://app.chinesenooddles.com/.well-known/"}},"share":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"nativePlugins":{"AThree-Face":{"__plugin_info__":{"name":"Face","description":"人脸核身","platforms":"Android,iOS","url":"","android_package_name":"","ios_bundle_id":"","isCloud":false,"bought":-1,"pid":"","parameters":{}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"2.8.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#BDC4CE","selectedColor":"#EE8B27","borderStyle":"rgba(0,0,0,0.4)","backgroundColor":"#ffffff","list":[{"pagePath":"pages/homepage/homepage","iconPath":"../../static/index.png","selectedIconPath":"../../static/indexactive.png","text":"首页"},{"pagePath":"pages/nearshop/nearshop","iconPath":"../../static/nearshop.png","selectedIconPath":"../../static/nearshopactive.png","text":"附近店铺"},{"pagePath":"pages/luntan/luntan","iconPath":"../../static/luntan.png","selectedIconPath":"../../static/luntanactive.png","text":"中面论坛"},{"pagePath":"pages/usercenter/my","iconPath":"../../static/user.png","selectedIconPath":"../../static/useractive.png","text":"个人中心"}],"height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}} |
-
请 注册 或 登录 后发表评论