miniprogram / binhaineigouopen · 提交

转到一个项目

作者 梁鹏山
提交 abd2f386693abf84d4decec9090b00e7c8f35166 1 个父辈 1e78744f

fix:更新同步

内嵌 并排对比
正在显示 20 个修改的文件 包含 482 行增加 和 608 行删除
@@ -7,9 +7,10 @@ @@ -7,9 +7,10 @@
7 <view class="word">{{type == 3?item.name:type==2?item.product_name:item.product.name}}</view> 7 <view class="word">{{type == 3?item.name:type==2?item.product_name:item.product.name}}</view>
8 <view class="info"> 8 <view class="info">
9 <view class="jifen"> 9 <view class="jifen">
10 - <view class="name">积分</view>  
11 - <text wx:if='{{item.product.price2!=null||item.price2!=null}}'>{{type == 3 || type == 2?item.price2:item.product.price2}}</text>  
12 - <text wx:else>{{type == 3 || type == 2?item.goods_price:item.product.price}}</text> 10 + <!-- 2023-10-19 需求要将积分改为微信支付的金额 -->
  11 + <!-- <view class="name">积分</view> -->
  12 + <text wx:if='{{item.product.price2!=null||item.price2!=null}}'>¥{{type == 3 || type == 2?item.price2:item.product.price2}}</text>
  13 + <text wx:else>¥{{type == 3 || type == 2?item.goods_price:item.product.price}}</text>
13 <text style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;" wx:if="{{type == 3 || type == 4}}">X{{item.num}}</text> 14 <text style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;" wx:if="{{type == 3 || type == 4}}">X{{item.num}}</text>
14 </view> 15 </view>
15 <view class="num_box" wx:if="{{type == 1}}"> 16 <view class="num_box" wx:if="{{type == 1}}">
@@ -2,15 +2,12 @@ App({ @@ -2,15 +2,12 @@ App({
2 onLaunch: function () { 2 onLaunch: function () {
3 if (wx.getStorageSync('token')) { 3 if (wx.getStorageSync('token')) {
4 this.getmessagelist() 4 this.getmessagelist()
5 -  
6 } 5 }
7 this.getToken(); 6 this.getToken();
8 -  
9 //自动更新版本 7 //自动更新版本
10 const updateManager = wx.getUpdateManager() 8 const updateManager = wx.getUpdateManager()
11 updateManager.onCheckForUpdate(function (res) { 9 updateManager.onCheckForUpdate(function (res) {
12 // 请求完新版本信息的回调 10 // 请求完新版本信息的回调
13 -  
14 }) 11 })
15 updateManager.onUpdateReady(function () { 12 updateManager.onUpdateReady(function () {
16 wx.showModal({ 13 wx.showModal({
@@ -46,15 +43,12 @@ App({ @@ -46,15 +43,12 @@ App({
46 // let baseUrl = 'http://binhaitest.w.brotop.cn/api' 43 // let baseUrl = 'http://binhaitest.w.brotop.cn/api'
47 // 滨海 44 // 滨海
48 var entrance_type = wx.getStorageSync("entrance_type"); 45 var entrance_type = wx.getStorageSync("entrance_type");
49 - console.log(entrance_type);  
50 - if (entrance_type == '1' || entrance_type == '0' || url == '/getopenid/get' || url.indexOf('/wb/wb')>-1) { 46 + if (entrance_type == '1' || entrance_type == '0' || url == '/getopenid/get' || url.indexOf('/wb/wb') > -1) {
51 //劳保商城入口 47 //劳保商城入口
52 - console.log('11111111111111111')  
53 baseUrl = 'https://binhai.w.broing.cn/api'; 48 baseUrl = 'https://binhai.w.broing.cn/api';
54 // baseUrl = 'http://binhai.shs.broing.cn/api' 49 // baseUrl = 'http://binhai.shs.broing.cn/api'
55 } else if (entrance_type == '2') { 50 } else if (entrance_type == '2') {
56 //工会商城入口 51 //工会商城入口
57 - console.log('@@@@@@@@@@@@@@@@@@@@@@')  
58 baseUrl = 'https://binhaigh.w.broing.cn/api'; 52 baseUrl = 'https://binhaigh.w.broing.cn/api';
59 // baseUrl = 'http://gonghui.shs.broing.cn/api' 53 // baseUrl = 'http://gonghui.shs.broing.cn/api'
60 } else if (entrance_type == '3') { 54 } else if (entrance_type == '3') {
@@ -72,7 +66,6 @@ App({ @@ -72,7 +66,6 @@ App({
72 // //工会商城入口 66 // //工会商城入口
73 // baseUrl = 'https://bgcb2.w.broing.cn/api'; 67 // baseUrl = 'https://bgcb2.w.broing.cn/api';
74 // } 68 // }
75 - console.log(baseUrl);  
76 //网络请求 69 //网络请求
77 wx.request({ 70 wx.request({
78 url: baseUrl + url, 71 url: baseUrl + url,
@@ -83,7 +76,6 @@ App({ @@ -83,7 +76,6 @@ App({
83 'token': wx.getStorageSync('token') || '' 76 'token': wx.getStorageSync('token') || ''
84 }, 77 },
85 success: function (res) { //返回取得的数据 78 success: function (res) { //返回取得的数据
86 - console.log('ssssssssssssssssssssssssssssssssssss', res)  
87 if (res.data.code == '200') { 79 if (res.data.code == '200') {
88 resolve(res.data) 80 resolve(res.data)
89 } else if (res.data.code == '5000') { 81 } else if (res.data.code == '5000') {
@@ -101,7 +93,6 @@ App({ @@ -101,7 +93,6 @@ App({
101 url: '/pages/register/register?type=1', 93 url: '/pages/register/register?type=1',
102 }) 94 })
103 }, 1200) 95 }, 1200)
104 -  
105 } else { 96 } else {
106 wx.showModal({ 97 wx.showModal({
107 title: '提示', 98 title: '提示',
@@ -297,15 +288,10 @@ App({ @@ -297,15 +288,10 @@ App({
297 } 288 }
298 }) 289 })
299 } 290 }
300 -  
301 -  
302 }).catch((err) => { }) 291 }).catch((err) => { })
303 }, 292 },
304 293
305 - onShow: function () {  
306 - console.log('hahahahhahahahhhahh')  
307 - },  
308 - 294 + onShow: function () { },
309 295
310 //接口管理 296 //接口管理
311 interface: { 297 interface: {
1 -const app=getApp() 1 +const app = getApp()
2 Component({ 2 Component({
3 /** 3 /**
4 * 组件的属性列表 4 * 组件的属性列表
@@ -19,19 +19,20 @@ Component({ @@ -19,19 +19,20 @@ Component({
19 */ 19 */
20 methods: { 20 methods: {
21 look_more(e) { 21 look_more(e) {
22 - let login_new=app.globalData.login_new;  
23 - if(login_new==0){  
24 - wx.showToast({  
25 - title: '您还不是会员',  
26 - icon:"none"  
27 - })  
28 - setTimeout(function(){  
29 - wx.navigateTo({  
30 - url: '/packageA/pages/login/login',  
31 - })  
32 - },1500)  
33 - return false  
34 - } 22 + // 2023-10-19 需求是任何人都可以看商品
  23 + // let login_new=app.globalData.login_new;
  24 + // if(login_new==0){
  25 + // wx.showToast({
  26 + // title: '您还不是会员',
  27 + // icon:"none"
  28 + // })
  29 + // setTimeout(function(){
  30 + // wx.navigateTo({
  31 + // url: '/packageA/pages/login/login',
  32 + // })
  33 + // },1500)
  34 + // return false
  35 + // }
35 let id = e.currentTarget.dataset.id 36 let id = e.currentTarget.dataset.id
36 wx.navigateTo({ 37 wx.navigateTo({
37 url: '/packageA/pages/shop_detail/shop_detail?id=' + id 38 url: '/packageA/pages/shop_detail/shop_detail?id=' + id
@@ -62,9 +62,6 @@ Page({ @@ -62,9 +62,6 @@ Page({
62 ] 62 ]
63 }, 63 },
64 64
65 -  
66 -  
67 -  
68 scroll(e) { 65 scroll(e) {
69 // console.log(e.detail.scrollTop) 66 // console.log(e.detail.scrollTop)
70 // if (e.detail.scrollTop >300){ 67 // if (e.detail.scrollTop >300){
@@ -77,13 +74,13 @@ Page({ @@ -77,13 +74,13 @@ Page({
77 // stick:0 74 // stick:0
78 // }) 75 // })
79 // } 76 // }
80 -  
81 // console.log(this.data.stick) 77 // console.log(this.data.stick)
82 }, 78 },
83 79
84 -  
85 onLoad: function (options) { 80 onLoad: function (options) {
86 - console.log(app.globalData.index) 81 + if (options.token) {
  82 + wx.setStorageSync('token', options.token)
  83 + }
87 if (wx.getStorageSync('entrance_type') == '2') { 84 if (wx.getStorageSync('entrance_type') == '2') {
88 wx.setNavigationBarTitle({ 85 wx.setNavigationBarTitle({
89 title: '工会商城' 86 title: '工会商城'
@@ -97,57 +94,44 @@ Page({ @@ -97,57 +94,44 @@ Page({
97 title: '办公采办' 94 title: '办公采办'
98 }) 95 })
99 } 96 }
100 - if (app.globalData.index == undefined) {  
101 - let that = this;  
102 - let token = wx.getStorageSync('token');  
103 -  
104 - console.log('woshitoe', token);  
105 - if (token != "") {  
106 - console.log(9999)  
107 - this.getInfoFun()  
108 - }  
109 -  
110 - this.get_notice()  
111 - this.get_shopnum()  
112 - this.getmessagelist();  
113 - console.log('998867', this.data.pid)  
114 - if (this.data.pid) {  
115 - this.get_info(this.data.pid, 2);  
116 - } else {  
117 - this.get_info(0, 1);  
118 - }  
119 -  
120 - // 获取活动专区  
121 - this.getzhuanqulist();  
122 - this.getxianshi();  
123 - setTimeout(function () {  
124 - that.setData({  
125 - showtime: true  
126 - })  
127 - }, 990)  
128 - } 97 + // if (app.globalData.index == undefined) {
  98 + // let that = this;
  99 + // let token = wx.getStorageSync('token');
  100 + // if (token != "") {
  101 + // this.getInfoFun()
  102 + // }
  103 + // this.get_notice()
  104 + // this.get_shopnum()
  105 + // this.getmessagelist();
  106 + // if (this.data.pid) {
  107 + // this.get_info(this.data.pid, 2);
  108 + // } else {
  109 + // this.get_info(0, 1);
  110 + // }
  111 + // // 获取活动专区
  112 + // this.getzhuanqulist();
  113 + // this.getxianshi();
  114 + // setTimeout(function () {
  115 + // that.setData({
  116 + // showtime: true
  117 + // })
  118 + // }, 990)
  119 + // }
129 //控制显示隐藏 120 //控制显示隐藏
130 - this.ishow()  
131 - 121 + // this.ishow()
132 }, 122 },
133 -  
134 // 获取个人信息 123 // 获取个人信息
135 getInfoFun() { 124 getInfoFun() {
136 let that = this; 125 let that = this;
137 let u = app.interface.readteacher; 126 let u = app.interface.readteacher;
138 app.post(u, {}).then((r) => { 127 app.post(u, {}).then((r) => {
139 - console.log('3489523498', r)  
140 if (r.code == 200) { 128 if (r.code == 200) {
141 -  
142 app.globalData.login_new = r.msg.login_new; 129 app.globalData.login_new = r.msg.login_new;
143 app.globalData.status = r.msg.status; 130 app.globalData.status = r.msg.status;
144 - console.log(app.globalData.status)  
145 - // t.setData({  
146 - // obj: r.msg  
147 - // })  
148 } 131 }
149 - }) 132 + }).catch({})
150 }, 133 },
  134 +
151 moremiao() { 135 moremiao() {
152 let token = wx.getStorageSync("token") 136 let token = wx.getStorageSync("token")
153 if (token == '') { 137 if (token == '') {
@@ -163,8 +147,9 @@ Page({ @@ -163,8 +147,9 @@ Page({
163 } 147 }
164 }) 148 })
165 } else { 149 } else {
166 - let login_new = wx.getStorageSync("login");  
167 - if (login_new == 0) { 150 + // 2023-10-19 需求是无需登录
  151 + // let login_new = wx.getStorageSync("login");
  152 + // if (login_new == 0) {
168 // wx.showToast({ 153 // wx.showToast({
169 // title: '您还不是会员', 154 // title: '您还不是会员',
170 // icon:"none" 155 // icon:"none"
@@ -175,23 +160,19 @@ Page({ @@ -175,23 +160,19 @@ Page({
175 // }) 160 // })
176 // },1500) 161 // },1500)
177 // return false 162 // return false
178 -  
179 - wx.showModal({  
180 - title: '提示',  
181 - content: '您还不是会员',  
182 - success(res) {  
183 - if (res.confirm) {  
184 - wx.navigateTo({  
185 - url: '/packageA/pages/login/login',  
186 - })  
187 - } else if (res.cancel) { }  
188 - }  
189 - })  
190 -  
191 - return false  
192 -  
193 -  
194 - } 163 + // wx.showModal({
  164 + // title: '提示',
  165 + // content: '您还不是会员',
  166 + // success(res) {
  167 + // if (res.confirm) {
  168 + // wx.navigateTo({
  169 + // url: '/packageA/pages/login/login',
  170 + // })
  171 + // } else if (res.cancel) { }
  172 + // }
  173 + // })
  174 + // return false
  175 + // }
195 wx.navigateTo({ 176 wx.navigateTo({
196 url: '/packageA/pages/xianshi/xianshi?title2=' + this.data.title2, 177 url: '/packageA/pages/xianshi/xianshi?title2=' + this.data.title2,
197 }) 178 })
@@ -203,19 +184,13 @@ Page({ @@ -203,19 +184,13 @@ Page({
203 ishow() { 184 ishow() {
204 let that = this 185 let that = this
205 let url = '//wb/wb'; 186 let url = '//wb/wb';
206 - let data = {  
207 -  
208 - } 187 + let data = {}
209 app.post(url, data, "POST").then((r) => { 188 app.post(url, data, "POST").then((r) => {
210 - console.log('4456789', r)  
211 that.setData({ 189 that.setData({
212 status1: r.msg.status1, 190 status1: r.msg.status1,
213 status2: r.msg.status2, 191 status2: r.msg.status2,
214 title2: r.msg.title2 192 title2: r.msg.title2
215 }) 193 })
216 -  
217 -  
218 -  
219 }).catch((err) => { }) 194 }).catch((err) => { })
220 }, 195 },
221 196
@@ -226,28 +201,19 @@ Page({ @@ -226,28 +201,19 @@ Page({
226 let data = { 201 let data = {
227 page: 1, 202 page: 1,
228 pageNum: 6 203 pageNum: 6
229 -  
230 } 204 }
231 app.post(url, data, "POST").then((r) => { 205 app.post(url, data, "POST").then((r) => {
232 - console.log(r)  
233 - console.log(r.msg.residue_time)  
234 that.setData({ 206 that.setData({
235 xianshilist: r.msg.list, 207 xianshilist: r.msg.list,
236 endTime: r.msg.residue_time, 208 endTime: r.msg.residue_time,
237 activitystatus: r.msg.status 209 activitystatus: r.msg.status
238 }) 210 })
239 var time = that.date_format(r.msg.residue_time); 211 var time = that.date_format(r.msg.residue_time);
240 - console.log('9988776', that.data.activitystatus)  
241 -  
242 that.countDown() 212 that.countDown()
243 -  
244 - console.log(that.data.xianshilist)  
245 // that.setData({ 213 // that.setData({
246 // messagelist: that.data.messagelist.concat(r.msg) 214 // messagelist: that.data.messagelist.concat(r.msg)
247 // }) 215 // })
248 -  
249 // console.log(that.data.messagelist) 216 // console.log(that.data.messagelist)
250 -  
251 }).catch((err) => { }) 217 }).catch((err) => { })
252 }, 218 },
253 219
@@ -307,14 +273,10 @@ Page({ @@ -307,14 +273,10 @@ Page({
307 that.setData({ 273 that.setData({
308 activity: r.msg 274 activity: r.msg
309 }) 275 })
310 -  
311 - console.log(that.data.activity)  
312 // that.setData({ 276 // that.setData({
313 // messagelist: that.data.messagelist.concat(r.msg) 277 // messagelist: that.data.messagelist.concat(r.msg)
314 // }) 278 // })
315 -  
316 // console.log(that.data.messagelist) 279 // console.log(that.data.messagelist)
317 -  
318 }).catch((err) => { }) 280 }).catch((err) => { })
319 }, 281 },
320 282
@@ -335,27 +297,26 @@ Page({ @@ -335,27 +297,26 @@ Page({
335 } 297 }
336 }) 298 })
337 } else { 299 } else {
338 - let login_new = wx.getStorageSync('login');  
339 - if (login_new == 0) {  
340 - wx.showModal({  
341 - title: '提示',  
342 - content: '您还不是会员',  
343 - success(res) {  
344 - if (res.confirm) {  
345 - wx.navigateTo({  
346 - url: '/packageA/pages/login/login',  
347 - })  
348 - } else if (res.cancel) { }  
349 - }  
350 - })  
351 -  
352 - return false  
353 - } 300 + // 2023-10-19 需求是无需登录
  301 + // let login_new = wx.getStorageSync('login');
  302 + // if (login_new == 0) {
  303 + // wx.showModal({
  304 + // title: '提示',
  305 + // content: '您还不是会员',
  306 + // success(res) {
  307 + // if (res.confirm) {
  308 + // wx.navigateTo({
  309 + // url: '/packageA/pages/login/login',
  310 + // })
  311 + // } else if (res.cancel) { }
  312 + // }
  313 + // })
  314 + // return false
  315 + // }
354 wx.navigateTo({ 316 wx.navigateTo({
355 url: '/packageA/pages/zhuanqu/zhuanqu?id=' + id, 317 url: '/packageA/pages/zhuanqu/zhuanqu?id=' + id,
356 }) 318 })
357 } 319 }
358 -  
359 }, 320 },
360 321
361 more() { 322 more() {
@@ -372,27 +333,24 @@ Page({ @@ -372,27 +333,24 @@ Page({
372 } else if (res.cancel) { } 333 } else if (res.cancel) { }
373 } 334 }
374 }) 335 })
375 -  
376 - return false  
377 - }  
378 - let login_new = wx.getStorageSync('login');  
379 - if (login_new == 0) {  
380 - wx.showModal({  
381 - title: '提示',  
382 - content: '您还不是会员',  
383 - success(res) {  
384 - if (res.confirm) {  
385 -  
386 -  
387 - wx.navigateTo({  
388 - url: '/packageA/pages/login/login',  
389 - })  
390 - } else if (res.cancel) { }  
391 - }  
392 - })  
393 -  
394 return false 336 return false
395 } 337 }
  338 + // 2023-10-19 需求是无需登录
  339 + // let login_new = wx.getStorageSync('login');
  340 + // if (login_new == 0) {
  341 + // wx.showModal({
  342 + // title: '提示',
  343 + // content: '您还不是会员',
  344 + // success(res) {
  345 + // if (res.confirm) {
  346 + // wx.navigateTo({
  347 + // url: '/packageA/pages/login/login',
  348 + // })
  349 + // } else if (res.cancel) { }
  350 + // }
  351 + // })
  352 + // return false
  353 + // }
396 wx.navigateTo({ 354 wx.navigateTo({
397 url: '/packageA/pages/classify/classify', 355 url: '/packageA/pages/classify/classify',
398 }) 356 })
@@ -419,65 +377,66 @@ Page({ @@ -419,65 +377,66 @@ Page({
419 } 377 }
420 }) 378 })
421 } else { 379 } else {
422 - let login_new = wx.getStorageSync('login');  
423 - let gh_login = wx.getStorageSync('gh_login');  
424 - let cb_login = wx.getStorageSync('cb_login');  
425 - let loginType = wx.getStorageSync('entrance_type');  
426 - if (loginType == 1) {  
427 - if (login_new == 0) {  
428 - wx.showModal({  
429 - title: '提示',  
430 - content: '请绑定账户后操作',  
431 - success(res) {  
432 - if (res.confirm) {  
433 - wx.navigateTo({  
434 - url: '/packageA/pages/login/login',  
435 - })  
436 - } else if (res.cancel) { 380 + // 2023-10-19 需求是无需登录
  381 + // let login_new = wx.getStorageSync('login');
  382 + // let gh_login = wx.getStorageSync('gh_login');
  383 + // let cb_login = wx.getStorageSync('cb_login');
  384 + // let loginType = wx.getStorageSync('entrance_type');
  385 + // if (loginType == 1) {
  386 + // if (login_new == 0) {
  387 + // wx.showModal({
  388 + // title: '提示',
  389 + // content: '请绑定账户后操作',
  390 + // success(res) {
  391 + // if (res.confirm) {
  392 + // wx.navigateTo({
  393 + // url: '/packageA/pages/login/login',
  394 + // })
  395 + // } else if (res.cancel) {
437 396
438 - }  
439 - }  
440 - }) 397 + // }
  398 + // }
  399 + // })
441 400
442 - return false  
443 - }  
444 - } else if(loginType == 2){  
445 - if (gh_login == 0) {  
446 - wx.showModal({  
447 - title: '提示',  
448 - content: '请绑定账户后操作',  
449 - success(res) {  
450 - if (res.confirm) {  
451 - wx.navigateTo({  
452 - url: '/packageA/pages/login/login',  
453 - })  
454 - } else if (res.cancel) { 401 + // return false
  402 + // }
  403 + // } else if (loginType == 2) {
  404 + // if (gh_login == 0) {
  405 + // wx.showModal({
  406 + // title: '提示',
  407 + // content: '请绑定账户后操作',
  408 + // success(res) {
  409 + // if (res.confirm) {
  410 + // wx.navigateTo({
  411 + // url: '/packageA/pages/login/login',
  412 + // })
  413 + // } else if (res.cancel) {
455 414
456 - }  
457 - }  
458 - }) 415 + // }
  416 + // }
  417 + // })
459 418
460 - return false  
461 - }  
462 - }else if(loginType == 3){  
463 - if (cb_login == 0) {  
464 - wx.showModal({  
465 - title: '提示',  
466 - content: '请绑定账户后操作',  
467 - success(res) {  
468 - if (res.confirm) {  
469 - wx.navigateTo({  
470 - url: '/packageA/pages/login/login',  
471 - })  
472 - } else if (res.cancel) { 419 + // return false
  420 + // }
  421 + // } else if (loginType == 3) {
  422 + // if (cb_login == 0) {
  423 + // wx.showModal({
  424 + // title: '提示',
  425 + // content: '请绑定账户后操作',
  426 + // success(res) {
  427 + // if (res.confirm) {
  428 + // wx.navigateTo({
  429 + // url: '/packageA/pages/login/login',
  430 + // })
  431 + // } else if (res.cancel) {
473 432
474 - }  
475 - }  
476 - }) 433 + // }
  434 + // }
  435 + // })
477 436
478 - return false  
479 - }  
480 - } 437 + // return false
  438 + // }
  439 + // }
481 440
482 let title = this.data.nav_arr[this.data.nav_index].name 441 let title = this.data.nav_arr[this.data.nav_index].name
483 let index = e.currentTarget.dataset.index ? e.currentTarget.dataset.index : 0 442 let index = e.currentTarget.dataset.index ? e.currentTarget.dataset.index : 0
@@ -512,21 +471,22 @@ Page({ @@ -512,21 +471,22 @@ Page({
512 } 471 }
513 }) 472 })
514 } else { 473 } else {
515 - let login_new = wx.getStorageSync('login');  
516 - if (login_new == 0) {  
517 - wx.showModal({  
518 - title: '提示',  
519 - content: '您还不是会员',  
520 - success(res) {  
521 - if (res.confirm) {  
522 - wx.navigateTo({  
523 - url: '/packageA/pages/login/login',  
524 - })  
525 - } else if (res.cancel) { }  
526 - }  
527 - })  
528 - return false  
529 - } 474 + // 2023-10-19 需求是无需登录
  475 + // let login_new = wx.getStorageSync('login');
  476 + // if (login_new == 0) {
  477 + // wx.showModal({
  478 + // title: '提示',
  479 + // content: '您还不是会员',
  480 + // success(res) {
  481 + // if (res.confirm) {
  482 + // wx.navigateTo({
  483 + // url: '/packageA/pages/login/login',
  484 + // })
  485 + // } else if (res.cancel) { }
  486 + // }
  487 + // })
  488 + // return false
  489 + // }
530 if (style == 2) { 490 if (style == 2) {
531 wx.navigateTo({ 491 wx.navigateTo({
532 url: '/packageA/pages/outerChain/outerChain?src=' + e.currentTarget.dataset.src 492 url: '/packageA/pages/outerChain/outerChain?src=' + e.currentTarget.dataset.src
@@ -539,10 +499,6 @@ Page({ @@ -539,10 +499,6 @@ Page({
539 } 499 }
540 500
541 }, 501 },
542 -  
543 -  
544 -  
545 -  
546 // 排序 502 // 排序
547 reorder(e) { 503 reorder(e) {
548 let that = this 504 let that = this
@@ -735,7 +691,7 @@ Page({ @@ -735,7 +691,7 @@ Page({
735 index: 2, 691 index: 2,
736 }) 692 })
737 } 693 }
738 - }) 694 + }).catch(err => {})
739 }, 695 },
740 696
741 getmessagelist() { 697 getmessagelist() {
@@ -744,28 +700,22 @@ Page({ @@ -744,28 +700,22 @@ Page({
744 let data = { 700 let data = {
745 page: 1, 701 page: 1,
746 pageNum: 10, 702 pageNum: 10,
747 -  
748 } 703 }
749 app.post(url, data, "POST").then((r) => { 704 app.post(url, data, "POST").then((r) => {
750 // console.log(r) 705 // console.log(r)
751 // that.setData({ 706 // that.setData({
752 // messagelist: that.data.messagelist.concat(r.msg) 707 // messagelist: that.data.messagelist.concat(r.msg)
753 // }) 708 // })
754 -  
755 let newlist = []; 709 let newlist = [];
756 r.msg.forEach(function (value, index, array) { 710 r.msg.forEach(function (value, index, array) {
757 - console.log(newlist)  
758 if (value.status == 1) { 711 if (value.status == 1) {
759 newlist.push(value) 712 newlist.push(value)
760 } 713 }
761 }) 714 })
762 -  
763 - console.log('77889944556', newlist)  
764 if (newlist.length != 0) { 715 if (newlist.length != 0) {
765 wx.showTabBarRedDot({ 716 wx.showTabBarRedDot({
766 index: 1, 717 index: 1,
767 success: function (red) { 718 success: function (red) {
768 -  
769 wx.setTabBarBadge({ 719 wx.setTabBarBadge({
770 index: 1, 720 index: 1,
771 text: newlist.length.toString(), 721 text: newlist.length.toString(),
@@ -773,8 +723,6 @@ Page({ @@ -773,8 +723,6 @@ Page({
773 } 723 }
774 }) 724 })
775 } 725 }
776 -  
777 -  
778 }).catch((err) => { }) 726 }).catch((err) => { })
779 }, 727 },
780 // 获取个人信息 728 // 获取个人信息
@@ -790,37 +738,28 @@ Page({ @@ -790,37 +738,28 @@ Page({
790 * 生命周期函数--监听页面显示 738 * 生命周期函数--监听页面显示
791 */ 739 */
792 onShow: function () { 740 onShow: function () {
793 -  
794 this.setData({ 741 this.setData({
795 logok: app.globalData.baseUrlimg + "assets/img/cb2ad36a391388f19f5f912fa021f8f.png" 742 logok: app.globalData.baseUrlimg + "assets/img/cb2ad36a391388f19f5f912fa021f8f.png"
796 }) 743 })
797 - console.log(this.data.logok)  
798 // this.logok=app.globalData.baseUrlimg+"assets/img/cb2ad36a391388f19f5f912fa021f8f.png'' 744 // this.logok=app.globalData.baseUrlimg+"assets/img/cb2ad36a391388f19f5f912fa021f8f.png''
799 this.get_banner() 745 this.get_banner()
800 - console.log(app.globalData.index)  
801 - if (app.globalData.index == 0) {  
802 - app.globalData.index = undefined 746 + // if (app.globalData.index == 0) {
  747 + // app.globalData.index = undefined
803 let token = wx.getStorageSync('token'); 748 let token = wx.getStorageSync('token');
804 - console.log('woshitoe', token)  
805 if (token != "") { 749 if (token != "") {
806 this.getInfoFun() 750 this.getInfoFun()
807 } 751 }
808 this.get_notice() 752 this.get_notice()
809 this.get_shopnum() 753 this.get_shopnum()
810 this.getmessagelist(); 754 this.getmessagelist();
811 - console.log('998867', this.data.pid)  
812 if (this.data.pid) { 755 if (this.data.pid) {
813 this.get_info(this.data.pid, 2); 756 this.get_info(this.data.pid, 2);
814 } else { 757 } else {
815 this.get_info(0, 1); 758 this.get_info(0, 1);
816 } 759 }
817 -  
818 //控制显示隐藏 760 //控制显示隐藏
819 this.ishow() 761 this.ishow()
820 - }  
821 -  
822 -  
823 - 762 + // }
824 }, 763 },
825 764
826 /** 765 /**
@@ -8,39 +8,39 @@ Page({ @@ -8,39 +8,39 @@ Page({
8 data: { 8 data: {
9 page: 1, 9 page: 1,
10 messagelist: [], 10 messagelist: [],
11 - token:'',  
12 - login_new:'',  
13 - selected:1,  
14 - list:[{  
15 -         pagePath: "/packageA/pages/index/index",  
16 -         text: "商品",  
17 -         iconPath: "/images/tabbar/icon_75.png",  
18 -         selectedIconPath: "/images/tabbar/icon_68.png"  
19 -       },  
20 -       {  
21 -         pagePath: "/packageA/pages/message/message",  
22 -         text: "消息",  
23 -         iconPath: "/images/tabbar/message.png",  
24 -         selectedIconPath: "/images/tabbar/messageactive.png"  
25 -       },  
26 -       {  
27 -         pagePath: "/packageA/pages/shop_cart/shop_cart",  
28 -         text: "购物车",  
29 -         iconPath: "/images/tabbar/icon_70.png",  
30 -         selectedIconPath: "/images/tabbar/icon_73.png"  
31 -       },  
32 -       {  
33 -         pagePath: "/packageA/pages/my/my",  
34 -         text: "我的",  
35 -         iconPath: "/images/tabbar/icon_71.png",  
36 -         selectedIconPath: "/images/tabbar/icon_72.png"  
37 -       }] 11 + token: '',
  12 + login_new: '',
  13 + selected: 1,
  14 + list: [{
  15 + pagePath: "/packageA/pages/index/index",
  16 + text: "商品",
  17 + iconPath: "/images/tabbar/icon_75.png",
  18 + selectedIconPath: "/images/tabbar/icon_68.png"
  19 + },
  20 + {
  21 + pagePath: "/packageA/pages/message/message",
  22 + text: "消息",
  23 + iconPath: "/images/tabbar/message.png",
  24 + selectedIconPath: "/images/tabbar/messageactive.png"
  25 + },
  26 + {
  27 + pagePath: "/packageA/pages/shop_cart/shop_cart",
  28 + text: "购物车",
  29 + iconPath: "/images/tabbar/icon_70.png",
  30 + selectedIconPath: "/images/tabbar/icon_73.png"
  31 + },
  32 + {
  33 + pagePath: "/packageA/pages/my/my",
  34 + text: "我的",
  35 + iconPath: "/images/tabbar/icon_71.png",
  36 + selectedIconPath: "/images/tabbar/icon_72.png"
  37 + }]
38 }, 38 },
39 39
40 /** 40 /**
41 * 生命周期函数--监听页面加载 41 * 生命周期函数--监听页面加载
42 */ 42 */
43 - onLoad: function(options) { 43 + onLoad: function (options) {
44 44
45 }, 45 },
46 46
@@ -59,7 +59,7 @@ Page({ @@ -59,7 +59,7 @@ Page({
59 }) 59 })
60 60
61 let newlist = []; 61 let newlist = [];
62 - that.data.messagelist.forEach(function(value, index, array) { 62 + that.data.messagelist.forEach(function (value, index, array) {
63 console.log(newlist) 63 console.log(newlist)
64 if (value.status == 1) { 64 if (value.status == 1) {
65 newlist.push(value) 65 newlist.push(value)
@@ -70,14 +70,14 @@ Page({ @@ -70,14 +70,14 @@ Page({
70 if (newlist.length != 0) { 70 if (newlist.length != 0) {
71 wx.showTabBarRedDot({ 71 wx.showTabBarRedDot({
72 index: 1, 72 index: 1,
73 - success: function(red) { 73 + success: function (red) {
74 wx.setTabBarBadge({ 74 wx.setTabBarBadge({
75 index: 1, 75 index: 1,
76 text: newlist.length.toString(), 76 text: newlist.length.toString(),
77 }) 77 })
78 } 78 }
79 }) 79 })
80 - }else{ 80 + } else {
81 wx.hideTabBarRedDot({ 81 wx.hideTabBarRedDot({
82 index: 1, 82 index: 1,
83 success: function (red) { 83 success: function (red) {
@@ -91,7 +91,7 @@ Page({ @@ -91,7 +91,7 @@ Page({
91 } 91 }
92 92
93 93
94 - }).catch((err) => {}) 94 + }).catch((err) => { })
95 }, 95 },
96 96
97 // 订单详情 97 // 订单详情
@@ -105,17 +105,17 @@ Page({ @@ -105,17 +105,17 @@ Page({
105 /** 105 /**
106 * 生命周期函数--监听页面初次渲染完成 106 * 生命周期函数--监听页面初次渲染完成
107 */ 107 */
108 - onReady: function() { 108 + onReady: function () {
109 109
110 }, 110 },
111 111
112 /** 112 /**
113 * 生命周期函数--监听页面显示 113 * 生命周期函数--监听页面显示
114 */ 114 */
115 - onShow: function() { 115 + onShow: function () {
116 this.setData({ 116 this.setData({
117 - token:wx.getStorageSync('token'),  
118 - login_new:app.globalData.login_new 117 + token: wx.getStorageSync('token'),
  118 + login_new: app.globalData.login_new
119 }) 119 })
120 120
121 this.setData({ 121 this.setData({
@@ -128,28 +128,28 @@ Page({ @@ -128,28 +128,28 @@ Page({
128 /** 128 /**
129 * 生命周期函数--监听页面隐藏 129 * 生命周期函数--监听页面隐藏
130 */ 130 */
131 - onHide: function() { 131 + onHide: function () {
132 132
133 }, 133 },
134 134
135 /** 135 /**
136 * 生命周期函数--监听页面卸载 136 * 生命周期函数--监听页面卸载
137 */ 137 */
138 - onUnload: function() { 138 + onUnload: function () {
139 139
140 }, 140 },
141 141
142 /** 142 /**
143 * 页面相关事件处理函数--监听用户下拉动作 143 * 页面相关事件处理函数--监听用户下拉动作
144 */ 144 */
145 - onPullDownRefresh: function() { 145 + onPullDownRefresh: function () {
146 146
147 }, 147 },
148 148
149 /** 149 /**
150 * 页面上拉触底事件的处理函数 150 * 页面上拉触底事件的处理函数
151 */ 151 */
152 - onReachBottom: function() { 152 + onReachBottom: function () {
153 let newpage = this.data.page; 153 let newpage = this.data.page;
154 newpage++; 154 newpage++;
155 this.setData({ 155 this.setData({
@@ -161,7 +161,7 @@ Page({ @@ -161,7 +161,7 @@ Page({
161 /** 161 /**
162 * 用户点击右上角分享 162 * 用户点击右上角分享
163 */ 163 */
164 - onShareAppMessage: function() { 164 + onShareAppMessage: function () {
165 165
166 } 166 }
167 }) 167 })
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 <navigator class="no_login" catchtap="go_login" url="/packageA/pages/register/register" hover-class="none">请先登录</navigator> 2 <navigator class="no_login" catchtap="go_login" url="/packageA/pages/register/register" hover-class="none">请先登录</navigator>
3 </block> 3 </block>
4 4
5 -<block wx:elif="{{login_new==''}}"> 5 +<!-- <block wx:elif="{{login_new==''}}">
6 <navigator class="no_login" catchtap="go_login" url="/packageA/pages/login/login" hover-class="none">请先绑定会员</navigator> 6 <navigator class="no_login" catchtap="go_login" url="/packageA/pages/login/login" hover-class="none">请先绑定会员</navigator>
7 -</block> 7 +</block> -->
8 8
9 <block wx:else> 9 <block wx:else>
10 <view class="empty" wx:if="{{messagelist.length==0}}">暂无更多数据</view> 10 <view class="empty" wx:if="{{messagelist.length==0}}">暂无更多数据</view>
@@ -125,8 +125,8 @@ Page({ @@ -125,8 +125,8 @@ Page({
125 let t = this; 125 let t = this;
126 let type = e.currentTarget.dataset.i; 126 let type = e.currentTarget.dataset.i;
127 let index = e.currentTarget.dataset.t; 127 let index = e.currentTarget.dataset.t;
128 - if (wx.getStorageSync("token") && !this.data.noBind && index != 5) {  
129 - 128 + if (wx.getStorageSync("token") && index != 5) {
  129 + // if (wx.getStorageSync("token") && !this.data.noBind && index != 5) {
130 if (index == 1) { 130 if (index == 1) {
131 // 跳转订单列表 131 // 跳转订单列表
132 wx.navigateTo({ 132 wx.navigateTo({
@@ -178,25 +178,25 @@ Page({ @@ -178,25 +178,25 @@ Page({
178 178
179 return false 179 return false
180 } 180 }
  181 + // 2023-10-19 需求取消登录限制
  182 + // if(this.data.noBind){
  183 + // wx.showModal({
  184 + // title: '提示',
  185 + // content: '请绑定账号后操作',
  186 + // confirmText:'去绑定',
  187 + // cancelText:'取消',
  188 + // success(res) {
  189 + // if (res.confirm) {
  190 + // wx.navigateTo({
  191 + // url: '/packageA/pages/login/login',
  192 + // })
  193 + // } else if (res.cancel) {
  194 + // }
  195 + // }
  196 + // })
181 197
182 - if(this.data.noBind){  
183 - wx.showModal({  
184 - title: '提示',  
185 - content: '请绑定账号后操作',  
186 - confirmText:'去绑定',  
187 - cancelText:'取消',  
188 - success(res) {  
189 - if (res.confirm) {  
190 - wx.navigateTo({  
191 - url: '/packageA/pages/login/login',  
192 - })  
193 - } else if (res.cancel) {  
194 - }  
195 - }  
196 - })  
197 -  
198 - return false  
199 - } 198 + // return false
  199 + // }
200 } 200 }
201 }, 201 },
202 //获取购物车数量 202 //获取购物车数量
@@ -14,13 +14,13 @@ @@ -14,13 +14,13 @@
14 </view> 14 </view>
15 <!-- <view class="company">{{obj.competition}}</view> --> 15 <!-- <view class="company">{{obj.competition}}</view> -->
16 16
17 - <view class="info_box" wx:if="{{noBind}}"> 17 + <!-- <view class="info_box" wx:if="{{noBind}}">
18 <view class="bindNote">点击绑定账号</view> 18 <view class="bindNote">点击绑定账号</view>
19 - </view>  
20 - <view class="info_box" wx:else> 19 + </view> -->
  20 + <view class="info_box">
21 <view>{{obj.job?obj.job:'暂无'}}</view> 21 <view>{{obj.job?obj.job:'暂无'}}</view>
22 <!-- <view>{{obj.section?obj.section:'暂无'}}</view> --> 22 <!-- <view>{{obj.section?obj.section:'暂无'}}</view> -->
23 - <view>{{obj.tel}}</view> 23 + <view>{{obj.tel?obj.tel:''}}</view>
24 </view> 24 </view>
25 </view> 25 </view>
26 </view> 26 </view>
@@ -8,21 +8,21 @@ Page({ @@ -8,21 +8,21 @@ Page({
8 success: false, 8 success: false,
9 fail: false, 9 fail: false,
10 name: '', 10 name: '',
11 - choudanNum:0, 11 + choudanNum: 0,
12 addressId: 0, 12 addressId: 0,
13 tel: '', 13 tel: '',
14 area: '', 14 area: '',
15 address: '', 15 address: '',
16 cover_type: false, 16 cover_type: false,
17 - total:'',  
18 -  
19 - info:{  
20 - address:{  
21 - address:'',  
22 - area:'',  
23 - id:'',  
24 - tel:'',  
25 - name:'' 17 + total: '',
  18 +
  19 + info: {
  20 + address: {
  21 + address: '',
  22 + area: '',
  23 + id: '',
  24 + tel: '',
  25 + name: ''
26 } 26 }
27 27
28 } 28 }
@@ -36,16 +36,16 @@ Page({ @@ -36,16 +36,16 @@ Page({
36 let index = e.currentTarget.dataset.index 36 let index = e.currentTarget.dataset.index
37 let id = e.currentTarget.dataset.id 37 let id = e.currentTarget.dataset.id
38 let check = e.currentTarget.dataset.check 38 let check = e.currentTarget.dataset.check
39 - let coudan = this.data.coudan||[]  
40 - let coudan_arr = this.data.coudan_arr||[] 39 + let coudan = this.data.coudan || []
  40 + let coudan_arr = this.data.coudan_arr || []
41 let price = e.currentTarget.dataset.price; 41 let price = e.currentTarget.dataset.price;
42 let price2 = e.currentTarget.dataset.price2; 42 let price2 = e.currentTarget.dataset.price2;
43 43
44 if (type == 1) { 44 if (type == 1) {
45 - if(this.data.info.choudan*100<(price*100)){ 45 + if (this.data.info.choudan * 100 < (price * 100)) {
46 wx.showToast({ 46 wx.showToast({
47 title: '当前剩余积分不足，请重新挑选', 47 title: '当前剩余积分不足，请重新挑选',
48 - icon:'none' 48 + icon: 'none'
49 }) 49 })
50 return 50 return
51 } 51 }
@@ -58,7 +58,7 @@ Page({ @@ -58,7 +58,7 @@ Page({
58 } 58 }
59 } 59 }
60 60
61 - if (num<1) { 61 + if (num < 1) {
62 coudan.forEach((item, index) => { 62 coudan.forEach((item, index) => {
63 if (item.id == id) { 63 if (item.id == id) {
64 coudan.splice(index, 1) 64 coudan.splice(index, 1)
@@ -66,7 +66,7 @@ Page({ @@ -66,7 +66,7 @@ Page({
66 } 66 }
67 }) 67 })
68 } else { 68 } else {
69 - if(type==1&&num==1){ 69 + if (type == 1 && num == 1) {
70 //选中 70 //选中
71 coudan.push({ 71 coudan.push({
72 id: id, 72 id: id,
@@ -76,9 +76,9 @@ Page({ @@ -76,9 +76,9 @@ Page({
76 id: id, 76 id: id,
77 num: num, 77 num: num,
78 price: Number(price), 78 price: Number(price),
79 - price2:Number(price2) 79 + price2: Number(price2)
80 }) 80 })
81 - }else{ 81 + } else {
82 coudan.forEach((item, index) => { 82 coudan.forEach((item, index) => {
83 if (item.id == id) { 83 if (item.id == id) {
84 item.num = num 84 item.num = num
@@ -104,19 +104,19 @@ Page({ @@ -104,19 +104,19 @@ Page({
104 for (let obj of coudan_arr) { 104 for (let obj of coudan_arr) {
105 console.log(obj) 105 console.log(obj)
106 console.log(obj.price2) 106 console.log(obj.price2)
107 - if (obj.price2!= null) { 107 + if (obj.price2 != null) {
108 console.log(111) 108 console.log(111)
109 choudan_money = (obj.price2 * 100 * obj.num) / 100 + choudan_money 109 choudan_money = (obj.price2 * 100 * obj.num) / 100 + choudan_money
110 } else { 110 } else {
111 console.log(222) 111 console.log(222)
112 choudan_money = (obj.price * 100 * obj.num) / 100 + choudan_money 112 choudan_money = (obj.price * 100 * obj.num) / 100 + choudan_money
113 } 113 }
114 - num = num+obj.num 114 + num = num + obj.num
115 } 115 }
116 116
117 this.setData({ 117 this.setData({
118 - choudan_money: choudan_money*100,  
119 - choudanNum:num, 118 + choudan_money: choudan_money * 100,
  119 + choudanNum: num,
120 'info.choudan': this.data.info.syjf - choudan_money 120 'info.choudan': this.data.info.syjf - choudan_money
121 // choudan_money: Math.floor(choudan_money* 100) / 100 121 // choudan_money: Math.floor(choudan_money* 100) / 100
122 }) 122 })
@@ -183,7 +183,7 @@ Page({ @@ -183,7 +183,7 @@ Page({
183 id: id, 183 id: id,
184 num: num, 184 num: num,
185 price: Number(price), 185 price: Number(price),
186 - price2:Number(price2) 186 + price2: Number(price2)
187 }) 187 })
188 } 188 }
189 that.setData({ 189 that.setData({
@@ -213,12 +213,9 @@ Page({ @@ -213,12 +213,9 @@ Page({
213 213
214 that.setData({ 214 that.setData({
215 info: res.msg, 215 info: res.msg,
216 - total:total 216 + total: total
217 217
218 }) 218 })
219 -  
220 - console.log('9988756', that.data.info)  
221 -  
222 }) 219 })
223 }, 220 },
224 221
@@ -233,7 +230,7 @@ Page({ @@ -233,7 +230,7 @@ Page({
233 } 230 }
234 app.post(url, params).then((res) => { 231 app.post(url, params).then((res) => {
235 that.setData({ 232 that.setData({
236 - "info.yunfei": Number(res.msg.yunfei)*100 233 + "info.yunfei": Number(res.msg.yunfei) * 100
237 }) 234 })
238 }) 235 })
239 }, 236 },
@@ -276,35 +273,64 @@ Page({ @@ -276,35 +273,64 @@ Page({
276 }) 273 })
277 }, 274 },
278 275
279 - //订单支付 276 + //开放订单支付
280 order_pay(order_odd) { 277 order_pay(order_odd) {
  278 + let that = this;
281 let url = app.interface.order_pay 279 let url = app.interface.order_pay
282 let params = { 280 let params = {
283 order_odd: order_odd 281 order_odd: order_odd
284 } 282 }
285 app.post(url, params).then((res) => { 283 app.post(url, params).then((res) => {
286 - this.setData({  
287 - order: res.msg 284 + that.payment(res.msg)
288 }) 285 })
289 - if (res.msg.message == "支付成功") {  
290 - // wx.showToast({  
291 - // title: '购买成功',  
292 - // icon:'none'  
293 - // })  
294 - this.setData({  
295 - success: true  
296 - })  
297 - } else if (res.msg.message == "余额不足") {  
298 - this.setData({  
299 - fail: true 286 + },
  287 + payment(res) {
  288 + var timeStamp = res.timeStamp.toString();
  289 + wx.requestPayment({
  290 + timeStamp: timeStamp,
  291 + nonceStr: res.nonceStr,
  292 + package: res.package,
  293 + signType: res.signType,
  294 + paySign: res.paySign,
  295 + success: function (res) {
  296 + wx.redirectTo({
  297 + url: '/packageA/pages/order/order_list/order_list?status=3',
300 }) 298 })
  299 + },
  300 + fail: function (res) {
  301 + console.log(res);
301 } 302 }
302 }) 303 })
303 }, 304 },
  305 + //订单支付
  306 + // order_pay(order_odd) {
  307 + // let url = app.interface.order_pay
  308 + // let params = {
  309 + // order_odd: order_odd
  310 + // }
  311 + // app.post(url, params).then((res) => {
  312 + // this.setData({
  313 + // order: res.msg
  314 + // })
  315 + // if (res.msg.message == "支付成功") {
  316 + // // wx.showToast({
  317 + // // title: '购买成功',
  318 + // // icon:'none'
  319 + // // })
  320 + // this.setData({
  321 + // success: true
  322 + // })
  323 + // } else if (res.msg.message == "余额不足") {
  324 + // this.setData({
  325 + // fail: true
  326 + // })
  327 + // }
  328 + // })
  329 + // },
304 /** 330 /**
305 * 生命周期函数--监听页面加载 331 * 生命周期函数--监听页面加载
306 */ 332 */
307 - onLoad: function(options) { 333 + onLoad: function (options) {
308 console.log(options) 334 console.log(options)
309 this.setData({ 335 this.setData({
310 type: options.type, 336 type: options.type,
@@ -317,22 +343,19 @@ Page({ @@ -317,22 +343,19 @@ Page({
317 /** 343 /**
318 * 生命周期函数--监听页面初次渲染完成 344 * 生命周期函数--监听页面初次渲染完成
319 */ 345 */
320 - onReady: function() { 346 + onReady: function () {
321 347
322 }, 348 },
323 349
324 /** 350 /**
325 * 生命周期函数--监听页面显示 351 * 生命周期函数--监听页面显示
326 */ 352 */
327 - onShow: function() { 353 + onShow: function () {
328 354
329 let pages = getCurrentPages(); 355 let pages = getCurrentPages();
330 356
331 let currPage = pages[pages.length - 1] 357 let currPage = pages[pages.length - 1]
332 - console.log('887766554',currPage.data.id)  
333 if (currPage.data.id) { 358 if (currPage.data.id) {
334 - console.log('4778785',this.data.info)  
335 -  
336 this.setData({ 359 this.setData({
337 "info.address.address": currPage.data.address, 360 "info.address.address": currPage.data.address,
338 "info.address.area": currPage.data.area, 361 "info.address.area": currPage.data.area,
@@ -340,8 +363,6 @@ Page({ @@ -340,8 +363,6 @@ Page({
340 "info.address.tel": currPage.data.tel, 363 "info.address.tel": currPage.data.tel,
341 "info.address.name": currPage.data.name 364 "info.address.name": currPage.data.name
342 }) 365 })
343 - console.log(this.data.info)  
344 - console.log(currPage.data.address)  
345 this.get_youfei(currPage.data.id) 366 this.get_youfei(currPage.data.id)
346 } 367 }
347 // if (wx.getStorageSync('no_address')) { 368 // if (wx.getStorageSync('no_address')) {
@@ -356,35 +377,35 @@ Page({ @@ -356,35 +377,35 @@ Page({
356 /** 377 /**
357 * 生命周期函数--监听页面隐藏 378 * 生命周期函数--监听页面隐藏
358 */ 379 */
359 - onHide: function() { 380 + onHide: function () {
360 381
361 }, 382 },
362 383
363 /** 384 /**
364 * 生命周期函数--监听页面卸载 385 * 生命周期函数--监听页面卸载
365 */ 386 */
366 - onUnload: function() { 387 + onUnload: function () {
367 388
368 }, 389 },
369 390
370 /** 391 /**
371 * 页面相关事件处理函数--监听用户下拉动作 392 * 页面相关事件处理函数--监听用户下拉动作
372 */ 393 */
373 - onPullDownRefresh: function() { 394 + onPullDownRefresh: function () {
374 395
375 }, 396 },
376 397
377 /** 398 /**
378 * 页面上拉触底事件的处理函数 399 * 页面上拉触底事件的处理函数
379 */ 400 */
380 - onReachBottom: function() { 401 + onReachBottom: function () {
381 402
382 }, 403 },
383 404
384 /** 405 /**
385 * 用户点击右上角分享 406 * 用户点击右上角分享
386 */ 407 */
387 - onShareAppMessage: function() { 408 + onShareAppMessage: function () {
388 409
389 } 410 }
390 }) 411 })
@@ -63,10 +63,10 @@ @@ -63,10 +63,10 @@
63 <view class='score'>{{info.date}}</view> 63 <view class='score'>{{info.date}}</view>
64 </view> 64 </view>
65 65
66 - <view class='mask_two'> 66 + <!-- <view class='mask_two'>
67 <view>邮费</view> 67 <view>邮费</view>
68 <view class='score' style="color:rgba(242, 0, 0, 1)">{{info.yunfei/100}}积分</view> 68 <view class='score' style="color:rgba(242, 0, 0, 1)">{{info.yunfei/100}}积分</view>
69 - </view> 69 + </view> -->
70 </view> 70 </view>
71 </view> 71 </view>
72 </view> 72 </view>
@@ -75,7 +75,8 @@ @@ -75,7 +75,8 @@
75 <view class="submit" catchtap="show_cover">提交</view> 75 <view class="submit" catchtap="show_cover">提交</view>
76 <view class="jifen"> 合计： 76 <view class="jifen"> 合计：
77 <!-- <text>{{choudan_money?choudan_money + info.total + info.yunfei*100/100: info.total + info.yunfei*100/100}}积分</text> --> 77 <!-- <text>{{choudan_money?choudan_money + info.total + info.yunfei*100/100: info.total + info.yunfei*100/100}}积分</text> -->
78 - <text>{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}积分</text> 78 + <!-- <text>{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}积分</text> -->
  79 + <text>¥{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}</text>
79 </view> 80 </view>
80 <view class="num">共{{info.totalnum + choudanNum}}件</view> 81 <view class="num">共{{info.totalnum + choudanNum}}件</view>
81 </view> 82 </view>
@@ -109,15 +110,17 @@ @@ -109,15 +110,17 @@
109 110
110 <view class="cover_box" wx:if="{{cover_type}}"> 111 <view class="cover_box" wx:if="{{cover_type}}">
111 <view class="cover_order"> 112 <view class="cover_order">
112 - <view class="all_money">{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}积分</view> 113 + <!-- <view class="all_money">{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}积分</view> -->
  114 + <view class="all_money">¥{{choudan_money?(choudan_money + info.total + info.yunfei)/100: (info.total + info.yunfei)/100}}</view>
113 <view class="money_item"> 115 <view class="money_item">
114 - <text>商品积分</text>  
115 - <text>{{choudan_money?(choudan_money + info.total)/100:info.total/100}}积分</text> 116 + <text>商品价格</text>
  117 + <!-- <text>{{choudan_money?(choudan_money + info.total)/100:info.total/100}}积分</text> -->
  118 + <text>¥{{choudan_money?(choudan_money + info.total)/100:info.total/100}}</text>
116 </view> 119 </view>
117 - <view class="money_item"> 120 + <!-- <view class="money_item">
118 <text>邮费</text> 121 <text>邮费</text>
119 <text>{{info.yunfei/100}}积分</text> 122 <text>{{info.yunfei/100}}积分</text>
120 - </view> 123 + </view> -->
121 <view class="cover_submit" catchtap="submit">确认支付</view> 124 <view class="cover_submit" catchtap="submit">确认支付</view>
122 <image src="/images/close.png" class="cover_close" catchtap="show_cover" /> 125 <image src="/images/close.png" class="cover_close" catchtap="show_cover" />
123 </view> 126 </view>
@@ -24,8 +24,8 @@ @@ -24,8 +24,8 @@
24 <view class="word">{{item.product_name}}</view> 24 <view class="word">{{item.product_name}}</view>
25 <view class="info"> 25 <view class="info">
26 <view class="jifen"> 26 <view class="jifen">
27 - <view class="name">积分</view>  
28 - <text>{{item.product_money}}</text> 27 + <!-- <view class="name">积分</view> -->
  28 + <text>¥{{item.product_money}}</text>
29 <text style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{item.num}}</text> 29 <text style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{item.num}}</text>
30 </view> 30 </view>
31 </view> 31 </view>
@@ -36,8 +36,8 @@ @@ -36,8 +36,8 @@
36 <view class="info_box" wx:if="{{type == 3}}"> 36 <view class="info_box" wx:if="{{type == 3}}">
37 <view class="f_item"> 37 <view class="f_item">
38 <view class="shop"> 38 <view class="shop">
39 - 商品积分  
40 - <text>{{item.price*100*item.num/100}}积分</text> 39 + 商品价格
  40 + <text>¥{{item.price*100*item.num/100}}</text>
41 </view> 41 </view>
42 </view> 42 </view>
43 </view> 43 </view>
@@ -58,10 +58,10 @@ @@ -58,10 +58,10 @@
58 <view class='score'>{{info.status_text}}</view> 58 <view class='score'>{{info.status_text}}</view>
59 </view> 59 </view>
60 60
61 - <view class='mask_two'> 61 + <!-- <view class='mask_two'>
62 <view>邮费</view> 62 <view>邮费</view>
63 <view class='score' style="color:rgba(242, 0, 0, 1)">{{info.youfei}}积分</view> 63 <view class='score' style="color:rgba(242, 0, 0, 1)">{{info.youfei}}积分</view>
64 - </view> 64 + </view> -->
65 65
66 </view> 66 </view>
67 </view> 67 </view>
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 <view class="footer" wx:if="{{type==2}}"> 71 <view class="footer" wx:if="{{type==2}}">
72 <view class="submit" catchtap="show_cover">提交</view> 72 <view class="submit" catchtap="show_cover">提交</view>
73 <view class="jifen"> 合计： 73 <view class="jifen"> 合计：
74 - <text>{{info.money}}积分</text> 74 + <text>¥{{info.money}}</text>
75 </view> 75 </view>
76 <view class="num">共{{info.total_num}}件</view> 76 <view class="num">共{{info.total_num}}件</view>
77 </view> 77 </view>
@@ -109,15 +109,15 @@ @@ -109,15 +109,15 @@
109 109
110 <view class="cover_box" wx:if="{{cover_type}}"> 110 <view class="cover_box" wx:if="{{cover_type}}">
111 <view class="cover_order"> 111 <view class="cover_order">
112 - <view class="all_money">{{info.total_price + info.youfei*100/100}}积分</view> 112 + <view class="all_money">¥{{info.total_price + info.youfei*100/100}}</view>
113 <view class="money_item"> 113 <view class="money_item">
114 - <text>商品积分</text>  
115 - <text>{{info.total_price}}积分</text> 114 + <text>商品价格</text>
  115 + <text>¥{{info.total_price}}</text>
116 </view> 116 </view>
117 - <view class="money_item"> 117 + <!-- <view class="money_item">
118 <text>邮费</text> 118 <text>邮费</text>
119 <text>{{info.youfei}}积分</text> 119 <text>{{info.youfei}}积分</text>
120 - </view> 120 + </view> -->
121 <view class="cover_submit" catchtap="order_pay" data-order="{{info.order_odd}}">确认支付</view> 121 <view class="cover_submit" catchtap="order_pay" data-order="{{info.order_odd}}">确认支付</view>
122 <image src="/images/close.png" class="cover_close" catchtap="show_cover" /> 122 <image src="/images/close.png" class="cover_close" catchtap="show_cover" />
123 </view> 123 </view>
@@ -14,14 +14,14 @@ Page({ @@ -14,14 +14,14 @@ Page({
14 success: [], 14 success: [],
15 tui: [], 15 tui: [],
16 cover_type: false, 16 cover_type: false,
17 - totalmoney:"" 17 + totalmoney: ""
18 }, 18 },
19 // 展示待支付的去支付弹窗 19 // 展示待支付的去支付弹窗
20 show_cover(e) { 20 show_cover(e) {
21 - if( a.globalData.status==0){ 21 + if (a.globalData.status == 0) {
22 wx.showToast({ 22 wx.showToast({
23 title: '您已您所在单位暂未开始劳保购买！', 23 title: '您已您所在单位暂未开始劳保购买！',
24 - icon:'none' 24 + icon: 'none'
25 }) 25 })
26 return false 26 return false
27 } 27 }
@@ -31,9 +31,8 @@ Page({ @@ -31,9 +31,8 @@ Page({
31 this.setData({ 31 this.setData({
32 info: daiorder[index] 32 info: daiorder[index]
33 }) 33 })
34 - console.log(this.data.info)  
35 this.setData({ 34 this.setData({
36 - totalmoney: Number(this.data.info.total_price)+Number(this.data.info.youfei) 35 + totalmoney: Number(this.data.info.total_price) + Number(this.data.info.youfei)
37 }) 36 })
38 } 37 }
39 this.setData({ 38 this.setData({
@@ -48,18 +47,18 @@ Page({ @@ -48,18 +47,18 @@ Page({
48 }, 47 },
49 //查看订单详情 48 //查看订单详情
50 orderagain(e) { 49 orderagain(e) {
51 - let item=e.currentTarget.dataset.item;  
52 - let num=e.currentTarget.dataset.num;  
53 - let goodid=[]  
54 - item.forEach(function(value,index,array){ 50 + let item = e.currentTarget.dataset.item;
  51 + let num = e.currentTarget.dataset.num;
  52 + let goodid = []
  53 + item.forEach(function (value, index, array) {
55 goodid.push(value.id) 54 goodid.push(value.id)
56 }) 55 })
57 - let id=e.currentTarget.dataset.id; 56 + let id = e.currentTarget.dataset.id;
58 57
59 let that = this 58 let that = this
60 let url = '/shop/recur_order' 59 let url = '/shop/recur_order'
61 let params = { 60 let params = {
62 - order_id:id 61 + order_id: id
63 } 62 }
64 a.post(url, params).then((res) => { 63 a.post(url, params).then((res) => {
65 // that.setData({ 64 // that.setData({
@@ -95,7 +94,7 @@ Page({ @@ -95,7 +94,7 @@ Page({
95 /** 94 /**
96 * 生命周期函数--监听页面加载 95 * 生命周期函数--监听页面加载
97 */ 96 */
98 - onLoad: function(options) { 97 + onLoad: function (options) {
99 this.setData({ 98 this.setData({
100 status: options.type 99 status: options.type
101 }) 100 })
@@ -119,7 +118,7 @@ Page({ @@ -119,7 +118,7 @@ Page({
119 style: status > 0 ? (status > 1 ? (status > 2 ? (status > 3 ? 'tui' : 'success') : 'daishouhuoorder') : 'daifahuoorder') : 'daiorder' 118 style: status > 0 ? (status > 1 ? (status > 2 ? (status > 3 ? 'tui' : 'success') : 'daishouhuoorder') : 'daifahuoorder') : 'daiorder'
120 } 119 }
121 a.post(url, params).then((r) => { 120 a.post(url, params).then((r) => {
122 - }).catch((er) => {}) 121 + }).catch((er) => { })
123 }, 122 },
124 // 获取订单列表 123 // 获取订单列表
125 getListFun() { 124 getListFun() {
@@ -135,7 +134,7 @@ Page({ @@ -135,7 +134,7 @@ Page({
135 tui: r.msg.tui, 134 tui: r.msg.tui,
136 }) 135 })
137 } 136 }
138 - }).catch((er) => {}) 137 + }).catch((er) => { })
139 }, 138 },
140 139
141 // 支付订单 140 // 支付订单
@@ -149,17 +148,42 @@ Page({ @@ -149,17 +148,42 @@ Page({
149 this.setData({ 148 this.setData({
150 cover_type: false 149 cover_type: false
151 }) 150 })
152 - if (r.code == 200) {  
153 - wx.showToast({  
154 - title: r.msg.message,  
155 - icon: r.msg.message == '支付成功"' ? 'success' : 'none',  
156 - duration: 1300 151 + t.payment(r.msg)
  152 + // if (r.code == 200) {
  153 + // wx.showToast({
  154 + // title: r.msg.message,
  155 + // icon: r.msg.message == '支付成功"' ? 'success' : 'none',
  156 + // duration: 1300
  157 + // })
  158 + // setTimeout(() => {
  159 + // t.getListFun()
  160 + // }, 1300)
  161 + // }
  162 + }).catch((er) => { })
  163 + },
  164 +
  165 + payment(res) {
  166 + let that = this;
  167 + var timeStamp = res.timeStamp.toString();
  168 + wx.requestPayment({
  169 + timeStamp: timeStamp,
  170 + nonceStr: res.nonceStr,
  171 + package: res.package,
  172 + signType: res.signType,
  173 + paySign: res.paySign,
  174 + success: function (res) {
  175 + console.log(res)
  176 + that.setData({
  177 + page: 1,
  178 + daiorder: [],
  179 + cover_type: false
157 }) 180 })
158 - setTimeout(() => {  
159 - t.getListFun()  
160 - }, 1300) 181 + that.getListFun()
  182 + },
  183 + fail: function (res) {
  184 + console.log(res);
161 } 185 }
162 - }).catch((er) => {}) 186 + })
163 }, 187 },
164 188
165 // 取消订单 189 // 取消订单
@@ -180,7 +204,7 @@ Page({ @@ -180,7 +204,7 @@ Page({
180 t.getListFun() 204 t.getListFun()
181 }, 1300) 205 }, 1300)
182 } 206 }
183 - }).catch((er) => {}) 207 + }).catch((er) => { })
184 }, 208 },
185 209
186 // 确认收货 210 // 确认收货
@@ -201,7 +225,7 @@ Page({ @@ -201,7 +225,7 @@ Page({
201 t.getListFun() 225 t.getListFun()
202 }, 1300) 226 }, 1300)
203 } 227 }
204 - }).catch((er) => {}) 228 + }).catch((er) => { })
205 }, 229 },
206 //删除订单 230 //删除订单
207 delete_item(e) { 231 delete_item(e) {
@@ -219,7 +243,7 @@ Page({ @@ -219,7 +243,7 @@ Page({
219 }) 243 })
220 t.getListFun() 244 t.getListFun()
221 } 245 }
222 - }).catch((er) => {}) 246 + }).catch((er) => { })
223 }, 247 },
224 // 退换货跳转页面详情 248 // 退换货跳转页面详情
225 jumpReturnFun(e) { 249 jumpReturnFun(e) {
@@ -231,49 +255,49 @@ Page({ @@ -231,49 +255,49 @@ Page({
231 /** 255 /**
232 * 生命周期函数--监听页面初次渲染完成 256 * 生命周期函数--监听页面初次渲染完成
233 */ 257 */
234 - onReady: function() { 258 + onReady: function () {
235 259
236 }, 260 },
237 261
238 /** 262 /**
239 * 生命周期函数--监听页面显示 263 * 生命周期函数--监听页面显示
240 */ 264 */
241 - onShow: function() { 265 + onShow: function () {
242 this.getListFun(); 266 this.getListFun();
243 }, 267 },
244 268
245 /** 269 /**
246 * 生命周期函数--监听页面隐藏 270 * 生命周期函数--监听页面隐藏
247 */ 271 */
248 - onHide: function() { 272 + onHide: function () {
249 273
250 }, 274 },
251 275
252 /** 276 /**
253 * 生命周期函数--监听页面卸载 277 * 生命周期函数--监听页面卸载
254 */ 278 */
255 - onUnload: function() { 279 + onUnload: function () {
256 280
257 }, 281 },
258 282
259 /** 283 /**
260 * 页面相关事件处理函数--监听用户下拉动作 284 * 页面相关事件处理函数--监听用户下拉动作
261 */ 285 */
262 - onPullDownRefresh: function() { 286 + onPullDownRefresh: function () {
263 287
264 }, 288 },
265 289
266 /** 290 /**
267 * 页面上拉触底事件的处理函数 291 * 页面上拉触底事件的处理函数
268 */ 292 */
269 - onReachBottom: function() { 293 + onReachBottom: function () {
270 294
271 }, 295 },
272 296
273 /** 297 /**
274 * 用户点击右上角分享 298 * 用户点击右上角分享
275 */ 299 */
276 - onShareAppMessage: function() { 300 + onShareAppMessage: function () {
277 301
278 } 302 }
279 }) 303 })
@@ -17,8 +17,8 @@ @@ -17,8 +17,8 @@
17 <view class='info_titles'>{{zitem.product_name}}</view> 17 <view class='info_titles'>{{zitem.product_name}}</view>
18 18
19 <view class='two_ones'> 19 <view class='two_ones'>
20 - <view class='scores'>积分</view>  
21 - <view class='prices'>{{zitem.product_money}}</view> 20 + <!-- <view class='scores'>积分</view> -->
  21 + <view class='prices'>¥{{zitem.product_money}}</view>
22 <view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view> 22 <view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view>
23 </view> 23 </view>
24 </view> 24 </view>
@@ -44,13 +44,13 @@ @@ -44,13 +44,13 @@
44 44
45 45
46 <view class='mask_two'> 46 <view class='mask_two'>
47 - <view>商品积分</view>  
48 - <view class='score'>{{item.total_price*100/100}}积分</view> 47 + <view>商品价格</view>
  48 + <view class='score'>¥{{item.total_price*100/100}}</view>
49 </view> 49 </view>
50 - <view class='mask_two no_border'> 50 + <!-- <view class='mask_two no_border'>
51 <view>邮费积分</view> 51 <view>邮费积分</view>
52 <view class='score'>{{item.youfei}}积分</view> 52 <view class='score'>{{item.youfei}}积分</view>
53 - </view> 53 + </view> -->
54 </view> 54 </view>
55 <view class='btn_box'> 55 <view class='btn_box'>
56 <!-- <view class='go_pay' data-d="{{item.order_odd}}" catchtap="payFun">去支付</view> --> 56 <!-- <view class='go_pay' data-d="{{item.order_odd}}" catchtap="payFun">去支付</view> -->
@@ -76,8 +76,8 @@ @@ -76,8 +76,8 @@
76 <view class='img_right'> 76 <view class='img_right'>
77 <view class='info_titles'>{{zitem.product_name}}</view> 77 <view class='info_titles'>{{zitem.product_name}}</view>
78 <view class='two_ones'> 78 <view class='two_ones'>
79 - <view class='scores'>积分</view>  
80 - <view class='prices'>{{zitem.product_money}}</view> 79 + <!-- <view class='scores'>积分</view> -->
  80 + <view class='prices'>¥{{zitem.product_money}}</view>
81 <view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view> 81 <view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view>
82 </view> 82 </view>
83 </view> 83 </view>
@@ -87,8 +87,8 @@ @@ -87,8 +87,8 @@
87 <view class='mask_two no_border'> 87 <view class='mask_two no_border'>
88 <view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品 88 <view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品
89 <text decode='{{true}}'>&emsp;实付：</text> 89 <text decode='{{true}}'>&emsp;实付：</text>
90 - <text class='red_score'> {{item.total_price*100/100 + (item.youfei*100)/100}}</text>  
91 - <text class='small_red_score'>积分</text> 90 + <text class='red_score'>¥ {{item.total_price*100/100 + (item.youfei*100)/100}}</text>
  91 + <!-- <text class='small_red_score'>积分</text> -->
92 </view> 92 </view>
93 </view> 93 </view>
94 94
@@ -110,13 +110,13 @@ @@ -110,13 +110,13 @@
110 </view> 110 </view>
111 111
112 <view class='mask_two'> 112 <view class='mask_two'>
113 - <view>商品积分</view>  
114 - <view class='score'>{{item.total_price*100/100}}积分</view> 113 + <view>商品价格</view>
  114 + <view class='score'>¥{{item.total_price*100/100}}</view>
115 </view> 115 </view>
116 - <view class='mask_two no_border'> 116 + <!-- <view class='mask_two no_border'>
117 <view>邮费积分</view> 117 <view>邮费积分</view>
118 <view class='score'>{{item.youfei}}积分</view> 118 <view class='score'>{{item.youfei}}积分</view>
119 - </view> 119 + </view> -->
120 <view class='btn_box'> 120 <view class='btn_box'>
121 <view class='go_pay' data-d="{{item.order_odd}}" data-t="2" bindtap="orderagain" data-id="{{item.id}}" data-type="2" data-item="{{item.orderitem}}" data-num="{{item.total_num}}">再来一单</view> 121 <view class='go_pay' data-d="{{item.order_odd}}" data-t="2" bindtap="orderagain" data-id="{{item.id}}" data-type="2" data-item="{{item.orderitem}}" data-num="{{item.total_num}}">再来一单</view>
122 <view class='cancel_order' data-d="{{item.order_odd}}" data-t="1" bindtap="jumpReturnFun">退货</view> 122 <view class='cancel_order' data-d="{{item.order_odd}}" data-t="1" bindtap="jumpReturnFun">退货</view>
@@ -146,8 +146,8 @@ @@ -146,8 +146,8 @@
146 <view class="address">收电话：</view> --> 146 <view class="address">收电话：</view> -->
147 147
148 <view class='two_ones'> 148 <view class='two_ones'>
149 - <view class='scores'>积分</view>  
150 - <view class='prices'>{{zitem.product_money}}</view> 149 + <!-- <view class='scores'>积分</view> -->
  150 + <view class='prices'>¥{{zitem.product_money}}</view>
151 <view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view> 151 <view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view>
152 </view> 152 </view>
153 </view> 153 </view>
@@ -172,19 +172,19 @@ @@ -172,19 +172,19 @@
172 </view> 172 </view>
173 173
174 <view class='mask_two'> 174 <view class='mask_two'>
175 - <view>商品积分</view>  
176 - <view class='score'>{{item.total_price*100/100}}积分</view> 175 + <view>商品价格</view>
  176 + <view class='score'>¥{{item.total_price*100/100}}</view>
177 </view> 177 </view>
178 - <view class='mask_two no_border'> 178 + <!-- <view class='mask_two no_border'>
179 <view>邮费积分</view> 179 <view>邮费积分</view>
180 <view class='score'>{{item.youfei}}积分</view> 180 <view class='score'>{{item.youfei}}积分</view>
181 - </view> 181 + </view> -->
182 182
183 <view class='mask_two no_border'> 183 <view class='mask_two no_border'>
184 <view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品 184 <view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品
185 <text decode='{{true}}'>&emsp;实付：</text> 185 <text decode='{{true}}'>&emsp;实付：</text>
186 - <text class='red_score'> {{item.total_price*100/100 + (item.youfei*100)/100}}</text>  
187 - <text class='small_red_score'>积分</text> 186 + <text class='red_score'> ¥{{item.total_price*100/100 + (item.youfei*100)/100}}</text>
  187 + <!-- <text class='small_red_score'>积分</text> -->
188 </view> 188 </view>
189 </view> 189 </view>
190 <view class='btn_box'> 190 <view class='btn_box'>
@@ -215,8 +215,8 @@ @@ -215,8 +215,8 @@
215 215
216 216
217 <view class='two_ones'> 217 <view class='two_ones'>
218 - <view class='scores'>积分</view>  
219 - <view class='prices'>{{zitem.product_money}}</view> 218 + <!-- <view class='scores'>积分</view> -->
  219 + <view class='prices'>¥{{zitem.product_money}}</view>
220 <view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view> 220 <view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view>
221 </view> 221 </view>
222 </view> 222 </view>
@@ -241,19 +241,19 @@ @@ -241,19 +241,19 @@
241 </view> 241 </view>
242 242
243 <view class='mask_two'> 243 <view class='mask_two'>
244 - <view>商品积分</view>  
245 - <view class='score'>{{item.total_price*100/100}}积分</view> 244 + <view>商品价格</view>
  245 + <view class='score'>¥{{item.total_price*100/100}}</view>
246 </view> 246 </view>
247 - <view class='mask_two no_border'> 247 + <!-- <view class='mask_two no_border'>
248 <view>邮费积分</view> 248 <view>邮费积分</view>
249 <view class='score'>{{item.youfei}}积分</view> 249 <view class='score'>{{item.youfei}}积分</view>
250 - </view> 250 + </view> -->
251 251
252 <view class='mask_two no_border'> 252 <view class='mask_two no_border'>
253 <view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品 253 <view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品
254 <text decode='{{true}}'>&emsp;实付：</text> 254 <text decode='{{true}}'>&emsp;实付：</text>
255 - <text class='red_score'> {{item.total_price*100/100 + (item.youfei*100)/100}}</text>  
256 - <text class='small_red_score'>积分</text> 255 + <text class='red_score'>¥ {{item.total_price*100/100 + (item.youfei*100)/100}}</text>
  256 + <!-- <text class='small_red_score'>积分</text> -->
257 </view> 257 </view>
258 </view> 258 </view>
259 259
@@ -284,8 +284,8 @@ @@ -284,8 +284,8 @@
284 284
285 285
286 <view class='two_ones'> 286 <view class='two_ones'>
287 - <view class='scores'>积分</view>  
288 - <view class='prices'>{{zitem.product_money}}</view> 287 + <!-- <view class='scores'>积分</view> -->
  288 + <view class='prices'>¥{{zitem.product_money}}</view>
289 <view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view> 289 <view class='prices' style="margin-left: 10rpx;color:#ccc;font-size: 28rpx;">X{{zitem.num}}</view>
290 </view> 290 </view>
291 </view> 291 </view>
@@ -309,19 +309,19 @@ @@ -309,19 +309,19 @@
309 </view> 309 </view>
310 310
311 <view class='mask_two'> 311 <view class='mask_two'>
312 - <view>商品积分</view>  
313 - <view class='score'>{{item.total_price*100/100}}积分</view> 312 + <view>商品价格</view>
  313 + <view class='score'>¥{{item.total_price*100/100}}</view>
314 </view> 314 </view>
315 - <view class='mask_two no_border'> 315 + <!-- <view class='mask_two no_border'>
316 <view>邮费积分</view> 316 <view>邮费积分</view>
317 <view class='score'>{{item.youfei}}积分</view> 317 <view class='score'>{{item.youfei}}积分</view>
318 - </view> 318 + </view> -->
319 319
320 <view class='mask_two no_border'> 320 <view class='mask_two no_border'>
321 <view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品 321 <view class='scorea' decode='{{true}}'>共{{item.total_num}}件商品
322 <text decode='{{true}}'>&emsp;实付：</text> 322 <text decode='{{true}}'>&emsp;实付：</text>
323 - <text class='red_score'> {{item.total_price*1000/1000 + (item.youfei*1000)/1000}}</text>  
324 - <text class='small_red_score'>积分</text> 323 + <text class='red_score'>¥ {{item.total_price*1000/1000 + (item.youfei*1000)/1000}}</text>
  324 + <!-- <text class='small_red_score'>积分</text> -->
325 </view> 325 </view>
326 </view> 326 </view>
327 <view class='btn_box'> 327 <view class='btn_box'>
@@ -341,15 +341,15 @@ @@ -341,15 +341,15 @@
341 <!-- 待支付订单的支付弹窗 --> 341 <!-- 待支付订单的支付弹窗 -->
342 <view class="cover_box" wx:if="{{cover_type}}"> 342 <view class="cover_box" wx:if="{{cover_type}}">
343 <view class="cover_order"> 343 <view class="cover_order">
344 - <view class="all_money">{{totalmoney}}积分</view> 344 + <view class="all_money">¥{{totalmoney}}</view>
345 <view class="money_item"> 345 <view class="money_item">
346 - <text>商品积分</text>  
347 - <text>{{info.total_price}}积分</text> 346 + <text>商品价格</text>
  347 + <text>¥{{info.total_price}}</text>
348 </view> 348 </view>
349 - <view class="money_item"> 349 + <!-- <view class="money_item">
350 <text>邮费</text> 350 <text>邮费</text>
351 <text>{{info.youfei}}积分</text> 351 <text>{{info.youfei}}积分</text>
352 - </view> 352 + </view> -->
353 <view class="cover_submit" data-d="{{info.order_odd}}" catchtap="payFun">确认支付</view> 353 <view class="cover_submit" data-d="{{info.order_odd}}" catchtap="payFun">确认支付</view>
354 <image src="/images/close.png" class="cover_close" catchtap="show_cover" /> 354 <image src="/images/close.png" class="cover_close" catchtap="show_cover" />
355 </view> 355 </view>
@@ -93,12 +93,12 @@ @@ -93,12 +93,12 @@
93 </view> 93 </view>
94 <view class='mask_twos'> 94 <view class='mask_twos'>
95 <view class='mask_two'> 95 <view class='mask_two'>
96 - <view>退还总积分</view>  
97 - <view class='score'>{{detail.order.total_price + detail.order.youfei*100/100}}积分</view> 96 + <view>退还总金额</view>
  97 + <view class='score'>¥{{detail.order.total_price + detail.order.youfei*100/100}}</view>
98 </view> 98 </view>
99 <view class='mask_two'> 99 <view class='mask_two'>
100 <view>退回账户</view> 100 <view>退回账户</view>
101 - <view class='score'>{{detail.status == 1?detail.order.total_price + detail.order.youfei*100/100:0}}积分</view> 101 + <view class='score'>¥{{detail.status == 1?detail.order.total_price + detail.order.youfei*100/100:0}}</view>
102 </view> 102 </view>
103 </view> 103 </view>
104 <!-- 退款失败结束 --> 104 <!-- 退款失败结束 -->
@@ -130,8 +130,8 @@ @@ -130,8 +130,8 @@
130 <view class='score'>{{detail.cause}}</view> 130 <view class='score'>{{detail.cause}}</view>
131 </view> 131 </view>
132 <view class='mask_two'> 132 <view class='mask_two'>
133 - <view>退款积分</view>  
134 - <view class='score'>{{detail.order.total_price + detail.order.youfei*100/100}}积分</view> 133 + <view>退款金额</view>
  134 + <view class='score'>¥{{detail.order.total_price + detail.order.youfei*100/100}}</view>
135 </view> 135 </view>
136 </view> 136 </view>
137 </view> 137 </view>
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 <navigator class="no_login" catchtap="go_login" url="/pages/register/register" hover-class="none">请先登录</navigator> 2 <navigator class="no_login" catchtap="go_login" url="/pages/register/register" hover-class="none">请先登录</navigator>
3 </block> 3 </block>
4 4
5 -<block wx:elif="{{login_new==''}}"> 5 +<!-- <block wx:elif="{{login_new==''}}">
6 <navigator class="no_login" catchtap="go_login" url="/pages/login/login" hover-class="none">请先绑定后操作，点击绑定</navigator> 6 <navigator class="no_login" catchtap="go_login" url="/pages/login/login" hover-class="none">请先绑定后操作，点击绑定</navigator>
7 -</block> 7 +</block> -->
8 8
9 9
10 <block wx:else> 10 <block wx:else>
@@ -21,7 +21,8 @@ @@ -21,7 +21,8 @@
21 </view> 21 </view>
22 <view class="tips_info"> 22 <view class="tips_info">
23 <text>不含运费</text>合计 23 <text>不含运费</text>合计
24 - <text>{{integral}}积分</text> 24 + <!-- 2023-10-19 需求要将积分改为微信支付的金额 -->
  25 + <text>¥{{integral}}</text>
25 </view> 26 </view>
26 <view class="submit" bindtap="submit">结算（{{all_num}}）</view> 27 <view class="submit" bindtap="submit">结算（{{all_num}}）</view>
27 </view> 28 </view>
1 <import src="/wxParse/wxParse.wxml" /> 1 <import src="/wxParse/wxParse.wxml" />
2 2
3 <view class='page{{mask?" active":""}}'> 3 <view class='page{{mask?" active":""}}'>
4 - <concat/> 4 + <concat />
5 <view class='top'> 5 <view class='top'>
6 <view class='current_box'>{{current+1}}/{{info.images.length}}</view> 6 <view class='current_box'>{{current+1}}/{{info.images.length}}</view>
7 <swiper class='swiper' current='{{current}}' bindchange='getCurrent'> 7 <swiper class='swiper' current='{{current}}' bindchange='getCurrent'>
@@ -12,8 +12,9 @@ @@ -12,8 +12,9 @@
12 </view> 12 </view>
13 <view class='two'> 13 <view class='two'>
14 <view class='two_one'> 14 <view class='two_one'>
15 - <view class='score'>积分</view>  
16 - <view class='price'>{{info.price2==null?info.price:info.price2}}</view> 15 + <!-- 2023-10-19 需求要将积分改为微信支付的金额 -->
  16 + <!-- <view class='score'>积分</view> -->
  17 + <view class='price'>¥{{info.price2==null?info.price:info.price2}}</view>
17 </view> 18 </view>
18 19
19 <!-- <view class="oldprice" wx:if="{{info.price2!=null}}">{{info.price}}</view> --> 20 <!-- <view class="oldprice" wx:if="{{info.price2!=null}}">{{info.price}}</view> -->
@@ -66,16 +67,18 @@ @@ -66,16 +67,18 @@
66 <view class='info_title'>{{info.name}}</view> 67 <view class='info_title'>{{info.name}}</view>
67 <view wx:if="{{info.price2!=null}}"> 68 <view wx:if="{{info.price2!=null}}">
68 <view class='two_ones'> 69 <view class='two_ones'>
69 - <view class='scores'>积分</view>  
70 - <view class='prices'>{{info.price2}}</view> 70 + <!-- 2023-10-19 需求要将积分改为微信支付的金额 -->
  71 + <!-- <view class='scores'>积分</view> -->
  72 + <view class='prices'>¥{{info.price2}}</view>
71 </view> 73 </view>
72 <!-- <view class="oldprice">{{info.price}}</view> --> 74 <!-- <view class="oldprice">{{info.price}}</view> -->
73 </view> 75 </view>
74 76
75 77
76 <view class='two_ones' wx:else> 78 <view class='two_ones' wx:else>
77 - <view class='scores'>积分</view>  
78 - <view class='prices'>{{info.price}}</view> 79 + <!-- 2023-10-19 需求要将积分改为微信支付的金额 -->
  80 + <!-- <view class='scores'>积分</view> -->
  81 + <view class='prices'>¥{{info.price}}</view>
79 </view> 82 </view>
80 </view> 83 </view>
81 </view> 84 </view>
@@ -34,7 +34,7 @@ Page({ @@ -34,7 +34,7 @@ Page({
34 pid: '', 34 pid: '',
35 logok: '', 35 logok: '',
36 selected: 0, 36 selected: 0,
37 - tel:'', 37 + tel: '',
38 list: [{ 38 list: [{
39 pagePath: "/pages/index/index", 39 pagePath: "/pages/index/index",
40 text: "商品", 40 text: "商品",
@@ -231,18 +231,21 @@ Page({ @@ -231,18 +231,21 @@ Page({
231 let token = wx.getStorageSync('token'); 231 let token = wx.getStorageSync('token');
232 let cb_login = wx.getStorageSync('cb_login'); 232 let cb_login = wx.getStorageSync('cb_login');
233 let sq = wx.getStorageSync('cb_sq') 233 let sq = wx.getStorageSync('cb_sq')
234 - console.log(token)  
235 - if (token == '' || sq == 2) { 234 + console.log(token,'=================')
  235 + wx.navigateTo({
  236 + url: '/packageA/pages/index/index?token=' + token,
  237 + })
  238 + // if (token == '' || sq == 2) {
236 // wx.showLoading({ 239 // wx.showLoading({
237 // title: '模块加载中', 240 // title: '模块加载中',
238 // }) 241 // })
239 // setTimeout(function () { 242 // setTimeout(function () {
240 - wx.navigateTo({  
241 - url: '/pages/register/register',  
242 - }) 243 + // wx.navigateTo({
  244 + // url: '/pages/register/register',
  245 + // })
243 // }, 1000) 246 // }, 1000)
244 - } else {  
245 - if (cb_login == 1) { 247 + // } else {
  248 + // if (cb_login == 1) {
246 // wx.showLoading({ 249 // wx.showLoading({
247 // title: '模块加载中', 250 // title: '模块加载中',
248 // }) 251 // })
@@ -251,23 +254,22 @@ Page({ @@ -251,23 +254,22 @@ Page({
251 // title: '加载中', 254 // title: '加载中',
252 // duration: 1200 255 // duration: 1200
253 // }) 256 // })
254 - wx.navigateTo({  
255 - url: '/packageA/pages/index/index',  
256 - }) 257 + // wx.navigateTo({
  258 + // url: '/packageA/pages/index/index',
  259 + // })
257 // },1000) 260 // },1000)
258 - } else { 261 + // } else {
259 // wx.showLoading({ 262 // wx.showLoading({
260 // title: '加载中', 263 // title: '加载中',
261 // mask: true 264 // mask: true
262 // }) 265 // })
263 // setTimeout(()=>{ 266 // setTimeout(()=>{
264 - wx.navigateTo({  
265 - url: '/pages/login/login',  
266 - }) 267 + // wx.navigateTo({
  268 + // url: '/pages/login/login',
  269 + // })
267 // },1000) 270 // },1000)
268 - }  
269 -  
270 - } 271 + // }
  272 + // }
271 }, 273 },
272 274
273 // 进入差旅 275 // 进入差旅
@@ -356,7 +358,7 @@ Page({ @@ -356,7 +358,7 @@ Page({
356 358
357 359
358 }, 360 },
359 - onReady(){ 361 + onReady() {
360 this.setData({ 362 this.setData({
361 tel: wx.getStorageSync('tel') 363 tel: wx.getStorageSync('tel')
362 }) 364 })
@@ -478,7 +480,7 @@ Page({ @@ -478,7 +480,7 @@ Page({
478 status1: r.msg.status1, 480 status1: r.msg.status1,
479 status2: r.msg.status2, 481 status2: r.msg.status2,
480 title2: r.msg.title2, 482 title2: r.msg.title2,
481 - tel:r.msg.tel 483 + tel: r.msg.tel
482 }) 484 })
483 wx.setStorageSync('tel', r.msg.tel) 485 wx.setStorageSync('tel', r.msg.tel)
484 486
@@ -35,11 +35,9 @@ Page({ @@ -35,11 +35,9 @@ Page({
35 if(that.data.iv){ 35 if(that.data.iv){
36 that.get_token() 36 that.get_token()
37 } 37 }
38 -  
39 } 38 }
40 }) 39 })
41 } 40 }
42 -  
43 } 41 }
44 }) 42 })
45 } 43 }
@@ -63,10 +61,7 @@ Page({ @@ -63,10 +61,7 @@ Page({
63 that.get_token() 61 that.get_token()
64 } 62 }
65 }) 63 })
66 -  
67 -  
68 } 64 }
69 -  
70 } 65 }
71 }, 66 },
72 67
@@ -41,7 +41,8 @@ @@ -41,7 +41,8 @@
41 "minifyWXML": true, 41 "minifyWXML": true,
42 "showES6CompileOption": false, 42 "showES6CompileOption": false,
43 "useCompilerPlugins": false, 43 "useCompilerPlugins": false,
44 - "ignoreUploadUnusedFiles": true 44 + "ignoreUploadUnusedFiles": true,
  45 + "condition": false
45 }, 46 },
46 "compileType": "miniprogram", 47 "compileType": "miniprogram",
47 "libVersion": "2.22.0", 48 "libVersion": "2.22.0",
@@ -5,24 +5,6 @@ @@ -5,24 +5,6 @@
5 "miniprogram": { 5 "miniprogram": {
6 "list": [ 6 "list": [
7 { 7 {
8 - "name": "123",  
9 - "pathName": "pages/login/login",  
10 - "query": "",  
11 - "scene": null  
12 - },  
13 - {  
14 - "name": "pages/shop_detail/shop_detail",  
15 - "pathName": "pages/order/order",  
16 - "query": "",  
17 - "scene": null  
18 - },  
19 - {  
20 - "name": "公众号模拟",  
21 - "pathName": "pages/register/register",  
22 - "query": "",  
23 - "scene": 1058  
24 - },  
25 - {  
26 "name": "自定义菜单", 8 "name": "自定义菜单",
27 "pathName": "pages/register/register", 9 "pathName": "pages/register/register",
28 "query": "", 10 "query": "",
@@ -32,95 +14,10 @@ @@ -32,95 +14,10 @@
32 } 14 }
33 }, 15 },
34 { 16 {
35 - "name": "个人中心",  
36 - "pathName": "pages/my/my",  
37 - "query": "",  
38 - "scene": null  
39 - },  
40 - {  
41 - "name": "商品列表",  
42 - "pathName": "pages/classify/classify",  
43 - "query": "",  
44 - "scene": null  
45 - },  
46 - {  
47 - "name": "活动套餐",  
48 - "pathName": "pages/search/search_result/search_result",  
49 - "query": "",  
50 - "scene": null  
51 - },  
52 - {  
53 - "name": "足迹",  
54 - "pathName": "pages/zuji/zuji",  
55 - "query": "",  
56 - "scene": null  
57 - },  
58 - {  
59 - "name": "首页",  
60 - "pathName": "pages/index/index",  
61 - "query": "",  
62 - "scene": null  
63 - },  
64 - {  
65 - "name": "注册",  
66 - "pathName": "pages/register/register",  
67 - "query": "",  
68 - "scene": null  
69 - },  
70 - {  
71 - "name": "pages/shop_detail/shop_detail",  
72 - "pathName": "pages/shop_detail/shop_detail",  
73 - "query": "id=774",  
74 - "scene": null  
75 - },  
76 - {  
77 - "name": "pages/classify/classify",  
78 - "pathName": "pages/classify/classify",  
79 - "query": "",  
80 - "scene": null  
81 - },  
82 - {  
83 - "name": "pages/classify/classify",  
84 - "pathName": "pages/classify/classify",  
85 - "query": "",  
86 - "scene": null  
87 - },  
88 - {  
89 - "name": "确定顶",  
90 - "pathName": "pages/order/order",  
91 - "query": "type=3&info={\"shop_id\":12,\"num\":1}&id=12",  
92 - "scene": null  
93 - },  
94 - {  
95 - "name": "pages/shop_cart/shop_cart",  
96 - "pathName": "pages/shop_cart/shop_cart",  
97 - "query": "",  
98 - "scene": null  
99 - },  
100 - {  
101 "name": "packageA/pages/index/index", 17 "name": "packageA/pages/index/index",
102 "pathName": "packageA/pages/index/index", 18 "pathName": "packageA/pages/index/index",
103 "query": "", 19 "query": "",
104 "scene": null 20 "scene": null
105 - },  
106 - {  
107 - "name": "确认订单",  
108 - "pathName": "packageA/pages/order/order",  
109 - "query": "type=3&info={\"shop_id\":3232,\"num\":1}&id=3232",  
110 - "scene": null  
111 - },  
112 - {  
113 - "name": "packageA/pages/logistics/logistics",  
114 - "pathName": "packageA/pages/logistics/logistics",  
115 - "query": "order=K7J527500103601",  
116 - "scene": null  
117 - },  
118 - {  
119 - "name": "快递详情",  
120 - "pathName": "packageA/pages/logistics/logistics",  
121 - "query": "order=LBLAY890707802979",  
122 - "launchMode": "default",  
123 - "scene": null  
124 } 21 }
125 ] 22 ]
126 } 23 }