miniprogram / binhaineigouopen · 提交

转到一个项目

作者 zhuwenjin@bronet.cn
提交 1ade5565aa24df75e37b86748e3fabb0d44de60f 1 个父辈 ae2b77c7

海油修改

内嵌 并排对比
正在显示 10 个修改的文件 包含 342 行增加 和 78 行删除
@@ -49,13 +49,14 @@ App({ @@ -49,13 +49,14 @@ App({
49 console.log(entrance_type); 49 console.log(entrance_type);
50 if (entrance_type == '1' || url == '/getopenid/get' || url.indexOf('address') > -1 || url.indexOf('/wb/wb')>-1) { 50 if (entrance_type == '1' || url == '/getopenid/get' || url.indexOf('address') > -1 || url.indexOf('/wb/wb')>-1) {
51 //劳保商城入口 51 //劳保商城入口
52 - baseUrl = 'https://binhai.w.broing.cn/api';  
53 - // baseUrl = 'http://bhng.cn/api' 52 + // baseUrl = 'https://binhai.w.broing.cn/api';
  53 + baseUrl = 'http://binhai.shs.broing.cn/api'
54 } else if (entrance_type == '2') { 54 } else if (entrance_type == '2') {
55 //工会商城入口 55 //工会商城入口
56 - baseUrl = 'https://binhaigh.w.broing.cn/api'; 56 + // baseUrl = 'https://binhaigh.w.broing.cn/api';
  57 + baseUrl = 'http://gonghui.shs.broing.cn/api'
57 } else if (entrance_type == '3') { 58 } else if (entrance_type == '3') {
58 - //工会商城入口 59 + //办公入口
59 baseUrl = 'https://bgcb.w.broing.cn/api'; 60 baseUrl = 'https://bgcb.w.broing.cn/api';
60 } 61 }
61 // 天远甄选 62 // 天远甄选
@@ -161,6 +162,7 @@ App({ @@ -161,6 +162,7 @@ App({
161 header: { 162 header: {
162 'content-type': 'application/x-www-form-urlencoded', 163 'content-type': 'application/x-www-form-urlencoded',
163 'token': wx.getStorageSync('token') || '' 164 'token': wx.getStorageSync('token') || ''
  165 + // 'token': '' || ''
164 }, 166 },
165 success: function (res) { //返回取得的数据 167 success: function (res) { //返回取得的数据
166 if (res.data.code == '1') { 168 if (res.data.code == '1') {
@@ -356,6 +358,7 @@ App({ @@ -356,6 +358,7 @@ App({
356 shopcarNum: '/shop/shopcarnum', // 购物车数量 358 shopcarNum: '/shop/shopcarnum', // 购物车数量
357 orderlist: '/shop/orderlist', // 订单各状态数量 359 orderlist: '/shop/orderlist', // 订单各状态数量
358 order_read: '/shop/read', // 订单数 360 order_read: '/shop/read', // 订单数
  361 + orderMixed: '/order/zhifu',
359 }, 362 },
360 globalData: { 363 globalData: {
361 login_new: "", 364 login_new: "",
@@ -8,7 +8,9 @@ Page({ @@ -8,7 +8,9 @@ Page({
8 info:[], 8 info:[],
9 item:'', 9 item:'',
10 detail:{}, 10 detail:{},
11 - sel:0 11 + sel:0,
  12 + kuaidiList: [],
  13 + sum: 0
12 }, 14 },
13 // 复制物流编号 15 // 复制物流编号
14 copy(e){ 16 copy(e){
@@ -39,8 +41,33 @@ Page({ @@ -39,8 +41,33 @@ Page({
39 this.setData({ 41 this.setData({
40 item: res.msg.kuaidi[0] 42 item: res.msg.kuaidi[0]
41 }) 43 })
42 - 44 + this.setData({
  45 + id: res.msg.id
  46 + })
  47 + let sum = 0
  48 + this.data.info.forEach(item=>{
  49 + sum += item.goods_number
  50 + })
  51 + this.setData({
  52 + sum: sum
  53 + })
  54 + console.log(sum)
43 console.log(that.data.info) 55 console.log(that.data.info)
  56 + // that.getOrderDetail(res.msg.id)
  57 + })
  58 + },
  59 + getOrderDetail(id) {
  60 + let that=this
  61 + let url = app.interface.orderInfo
  62 + let params = {
  63 + id: id
  64 + }
  65 + app.post(url,params).then((res)=>{
  66 + res.msg.kuaidi = JSON.parse(res.msg.kuaidi)
  67 + console.log(res.msg.kuaidi,'zzzzzzzzzzzzz')
  68 + this.setData({
  69 + kuaidiList: res.msg.kuaidi
  70 + })
44 }) 71 })
45 }, 72 },
46 lookMoreInfo(e){ 73 lookMoreInfo(e){
@@ -22,6 +22,9 @@ @@ -22,6 +22,9 @@
22 </view> 22 </view>
23 <view class="pack" wx:if="{{item.kuaidi.goods_number&&item.kuaidi.goods_number>0}}">当前快递含有{{item.kuaidi.goods_number}}个商品</view> 23 <view class="pack" wx:if="{{item.kuaidi.goods_number&&item.kuaidi.goods_number>0}}">当前快递含有{{item.kuaidi.goods_number}}个商品</view>
24 </view> 24 </view>
  25 + <view class="name" style="display: flex;">
  26 + <text>订单详情 您的订单总计{{sum}}件商品，本包裹发货{{item.goods_number}}件商品。请注意查验货品，如有疑问请及时联系我方客服。</text>
  27 + </view>
25 <view class="order_box {{item.open?'':'normalHeight'}}"> 28 <view class="order_box {{item.open?'':'normalHeight'}}">
26 <view class="order_item" wx:for="{{item.kuaidi.Traces}}" wx:key="index"> 29 <view class="order_item" wx:for="{{item.kuaidi.Traces}}" wx:key="index">
27 <view class="time_box"> 30 <view class="time_box">
@@ -8,21 +8,23 @@ Page({ @@ -8,21 +8,23 @@ 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 + payMent: '',
  19 + orderPayMent: '',
  20 +
  21 + info: {
  22 + address: {
  23 + address: '',
  24 + area: '',
  25 + id: '',
  26 + tel: '',
  27 + name: ''
26 } 28 }
27 29
28 } 30 }
@@ -36,16 +38,16 @@ Page({ @@ -36,16 +38,16 @@ Page({
36 let index = e.currentTarget.dataset.index 38 let index = e.currentTarget.dataset.index
37 let id = e.currentTarget.dataset.id 39 let id = e.currentTarget.dataset.id
38 let check = e.currentTarget.dataset.check 40 let check = e.currentTarget.dataset.check
39 - let coudan = this.data.coudan||[]  
40 - let coudan_arr = this.data.coudan_arr||[] 41 + let coudan = this.data.coudan || []
  42 + let coudan_arr = this.data.coudan_arr || []
41 let price = e.currentTarget.dataset.price; 43 let price = e.currentTarget.dataset.price;
42 let price2 = e.currentTarget.dataset.price2; 44 let price2 = e.currentTarget.dataset.price2;
43 45
44 if (type == 1) { 46 if (type == 1) {
45 - if(this.data.info.choudan*100<(price*100)){ 47 + if (this.data.info.choudan * 100 < (price * 100)) {
46 wx.showToast({ 48 wx.showToast({
47 title: '当前剩余积分不足，请重新挑选', 49 title: '当前剩余积分不足，请重新挑选',
48 - icon:'none' 50 + icon: 'none'
49 }) 51 })
50 return 52 return
51 } 53 }
@@ -58,7 +60,7 @@ Page({ @@ -58,7 +60,7 @@ Page({
58 } 60 }
59 } 61 }
60 62
61 - if (num<1) { 63 + if (num < 1) {
62 coudan.forEach((item, index) => { 64 coudan.forEach((item, index) => {
63 if (item.id == id) { 65 if (item.id == id) {
64 coudan.splice(index, 1) 66 coudan.splice(index, 1)
@@ -66,7 +68,7 @@ Page({ @@ -66,7 +68,7 @@ Page({
66 } 68 }
67 }) 69 })
68 } else { 70 } else {
69 - if(type==1&&num==1){ 71 + if (type == 1 && num == 1) {
70 //选中 72 //选中
71 coudan.push({ 73 coudan.push({
72 id: id, 74 id: id,
@@ -76,9 +78,9 @@ Page({ @@ -76,9 +78,9 @@ Page({
76 id: id, 78 id: id,
77 num: num, 79 num: num,
78 price: Number(price), 80 price: Number(price),
79 - price2:Number(price2) 81 + price2: Number(price2)
80 }) 82 })
81 - }else{ 83 + } else {
82 coudan.forEach((item, index) => { 84 coudan.forEach((item, index) => {
83 if (item.id == id) { 85 if (item.id == id) {
84 item.num = num 86 item.num = num
@@ -104,19 +106,19 @@ Page({ @@ -104,19 +106,19 @@ Page({
104 for (let obj of coudan_arr) { 106 for (let obj of coudan_arr) {
105 console.log(obj) 107 console.log(obj)
106 console.log(obj.price2) 108 console.log(obj.price2)
107 - if (obj.price2!= null) { 109 + if (obj.price2 != null) {
108 console.log(111) 110 console.log(111)
109 choudan_money = (obj.price2 * 100 * obj.num) / 100 + choudan_money 111 choudan_money = (obj.price2 * 100 * obj.num) / 100 + choudan_money
110 } else { 112 } else {
111 console.log(222) 113 console.log(222)
112 choudan_money = (obj.price * 100 * obj.num) / 100 + choudan_money 114 choudan_money = (obj.price * 100 * obj.num) / 100 + choudan_money
113 } 115 }
114 - num = num+obj.num 116 + num = num + obj.num
115 } 117 }
116 118
117 this.setData({ 119 this.setData({
118 - choudan_money: choudan_money*100,  
119 - choudanNum:num, 120 + choudan_money: choudan_money * 100,
  121 + choudanNum: num,
120 'info.choudan': this.data.info.syjf - choudan_money 122 'info.choudan': this.data.info.syjf - choudan_money
121 // choudan_money: Math.floor(choudan_money* 100) / 100 123 // choudan_money: Math.floor(choudan_money* 100) / 100
122 }) 124 })
@@ -183,7 +185,7 @@ Page({ @@ -183,7 +185,7 @@ Page({
183 id: id, 185 id: id,
184 num: num, 186 num: num,
185 price: Number(price), 187 price: Number(price),
186 - price2:Number(price2) 188 + price2: Number(price2)
187 }) 189 })
188 } 190 }
189 that.setData({ 191 that.setData({
@@ -204,7 +206,11 @@ Page({ @@ -204,7 +206,11 @@ Page({
204 app.post(url, params).then((res) => { 206 app.post(url, params).then((res) => {
205 console.log('99999', res, Number(res.msg.total)) 207 console.log('99999', res, Number(res.msg.total))
206 res.msg.syjf = res.msg.choudan - res.msg.yunfei 208 res.msg.syjf = res.msg.choudan - res.msg.yunfei
207 - res.msg.choudan = res.msg.choudan - res.msg.yunfei 209 + let a = (res.msg.choudan - res.msg.yunfei).toFixed(2)
  210 + if (a < 0) {
  211 + a = 0
  212 + }
  213 + res.msg.choudan = a
208 res.msg.total = Number(res.msg.total * 100) 214 res.msg.total = Number(res.msg.total * 100)
209 res.msg.yunfei = Number(res.msg.yunfei * 100) 215 res.msg.yunfei = Number(res.msg.yunfei * 100)
210 216
@@ -213,10 +219,8 @@ Page({ @@ -213,10 +219,8 @@ Page({
213 219
214 that.setData({ 220 that.setData({
215 info: res.msg, 221 info: res.msg,
216 - total:total  
217 - 222 + total: total
218 }) 223 })
219 -  
220 console.log('9988756', that.data.info) 224 console.log('9988756', that.data.info)
221 225
222 }) 226 })
@@ -233,12 +237,46 @@ Page({ @@ -233,12 +237,46 @@ Page({
233 } 237 }
234 app.post(url, params).then((res) => { 238 app.post(url, params).then((res) => {
235 that.setData({ 239 that.setData({
236 - "info.yunfei": Number(res.msg.yunfei)*100 240 + "info.yunfei": Number(res.msg.yunfei) * 100
  241 + })
  242 + })
  243 + },
  244 + // 支付失败弹窗关闭
  245 + payFail() {
  246 + this.setData({
  247 + fail: false
  248 + })
  249 + },
  250 + // 混合支付
  251 + mixedPay() {
  252 + let that = this
  253 + let url = app.interface.orderMixed
  254 + let params = {
  255 + order_odd: that.data.orderPayMent,
  256 + money: that.data.payMent
  257 + }
  258 + app.post(url, params).then((res) => {
  259 + wx.requestPayment({
  260 + timeStamp: res.data.timestamp,
  261 + nonceStr: res.data.nonceStr,
  262 + package: res.data.package,
  263 + signType: 'MD5',
  264 + paySign: res.data.paySign,
  265 + success(res) {
  266 + console.log(res,'支付成功')
  267 + that.setData({
  268 + fail: false
  269 + })
  270 + wx.showToast({
  271 + title: '支付成功',
  272 + })
  273 + },
  274 + fail(res) {
  275 + console.log(res,'支付失败')
  276 + }
237 }) 277 })
238 }) 278 })
239 }, 279 },
240 -  
241 -  
242 //点击支付 280 //点击支付
243 submit() { 281 submit() {
244 let that = this 282 let that = this
@@ -272,12 +310,16 @@ Page({ @@ -272,12 +310,16 @@ Page({
272 that.setData({ 310 that.setData({
273 cover_type: false 311 cover_type: false
274 }) 312 })
  313 + that.setData({
  314 + orderPayMent: res.msg
  315 + })
275 that.order_pay(res.msg) 316 that.order_pay(res.msg)
276 }) 317 })
277 }, 318 },
278 319
279 //订单支付 320 //订单支付
280 order_pay(order_odd) { 321 order_pay(order_odd) {
  322 + let that = this
281 let url = app.interface.order_pay 323 let url = app.interface.order_pay
282 let params = { 324 let params = {
283 order_odd: order_odd 325 order_odd: order_odd
@@ -298,13 +340,18 @@ Page({ @@ -298,13 +340,18 @@ Page({
298 this.setData({ 340 this.setData({
299 fail: true 341 fail: true
300 }) 342 })
  343 + let payMents = (that.data.info.total + that.data.info.yunfei) / 100 - that.data.order.syjf
  344 + that.setData({
  345 + payMent: payMents.toFixed(2)
  346 + })
  347 + console.log(payMents, 'payMent')
301 } 348 }
302 }) 349 })
303 }, 350 },
304 /** 351 /**
305 * 生命周期函数--监听页面加载 352 * 生命周期函数--监听页面加载
306 */ 353 */
307 - onLoad: function(options) { 354 + onLoad: function (options) {
308 console.log(options) 355 console.log(options)
309 this.setData({ 356 this.setData({
310 type: options.type, 357 type: options.type,
@@ -317,21 +364,21 @@ Page({ @@ -317,21 +364,21 @@ Page({
317 /** 364 /**
318 * 生命周期函数--监听页面初次渲染完成 365 * 生命周期函数--监听页面初次渲染完成
319 */ 366 */
320 - onReady: function() { 367 + onReady: function () {
321 368
322 }, 369 },
323 370
324 /** 371 /**
325 * 生命周期函数--监听页面显示 372 * 生命周期函数--监听页面显示
326 */ 373 */
327 - onShow: function() { 374 + onShow: function () {
328 375
329 let pages = getCurrentPages(); 376 let pages = getCurrentPages();
330 377
331 let currPage = pages[pages.length - 1] 378 let currPage = pages[pages.length - 1]
332 - console.log('887766554',currPage.data.id) 379 + console.log('887766554', currPage.data.id)
333 if (currPage.data.id) { 380 if (currPage.data.id) {
334 - console.log('4778785',this.data.info) 381 + console.log('4778785', this.data.info)
335 382
336 this.setData({ 383 this.setData({
337 "info.address.address": currPage.data.address, 384 "info.address.address": currPage.data.address,
@@ -356,35 +403,35 @@ Page({ @@ -356,35 +403,35 @@ Page({
356 /** 403 /**
357 * 生命周期函数--监听页面隐藏 404 * 生命周期函数--监听页面隐藏
358 */ 405 */
359 - onHide: function() { 406 + onHide: function () {
360 407
361 }, 408 },
362 409
363 /** 410 /**
364 * 生命周期函数--监听页面卸载 411 * 生命周期函数--监听页面卸载
365 */ 412 */
366 - onUnload: function() { 413 + onUnload: function () {
367 414
368 }, 415 },
369 416
370 /** 417 /**
371 * 页面相关事件处理函数--监听用户下拉动作 418 * 页面相关事件处理函数--监听用户下拉动作
372 */ 419 */
373 - onPullDownRefresh: function() { 420 + onPullDownRefresh: function () {
374 421
375 }, 422 },
376 423
377 /** 424 /**
378 * 页面上拉触底事件的处理函数 425 * 页面上拉触底事件的处理函数
379 */ 426 */
380 - onReachBottom: function() { 427 + onReachBottom: function () {
381 428
382 }, 429 },
383 430
384 /** 431 /**
385 * 用户点击右上角分享 432 * 用户点击右上角分享
386 */ 433 */
387 - onShareAppMessage: function() { 434 + onShareAppMessage: function () {
388 435
389 } 436 }
390 }) 437 })
@@ -37,14 +37,14 @@ @@ -37,14 +37,14 @@
37 </view> 37 </view>
38 <view class='re_bottom'> 38 <view class='re_bottom'>
39 <view class='re_re_name'>{{item.name}}</view> 39 <view class='re_re_name'>{{item.name}}</view>
40 - <view class='re_re_score'wx:if="{{item.price!=null}}">{{item.price2}}积分</view> 40 + <view class='re_re_score' wx:if="{{item.price!=null}}">{{item.price2}}积分</view>
41 <view class='re_re_score' wx:else>{{item.price}}积分</view> 41 <view class='re_re_score' wx:else>{{item.price}}积分</view>
42 </view> 42 </view>
43 43
44 <!-- 数量操作 --> 44 <!-- 数量操作 -->
45 <view class="num_box"> 45 <view class="num_box">
46 <image class="num_btn" src="/images/reduce.png" data-check='{{item.check}}' wx:if="{{item.num}}" data-index="{{index}}" data-id="{{item.id}}" data-type="0" data-num="{{item.num?item.num:0}}" catchtap="num_change" data-price='{{item.price}}' data-price2="{{item.price2}}" /> 46 <image class="num_btn" src="/images/reduce.png" data-check='{{item.check}}' wx:if="{{item.num}}" data-index="{{index}}" data-id="{{item.id}}" data-type="0" data-num="{{item.num?item.num:0}}" catchtap="num_change" data-price='{{item.price}}' data-price2="{{item.price2}}" />
47 - <text wx:if="{{item.num}}" >{{item.num?item.num:0}}</text> 47 + <text wx:if="{{item.num}}">{{item.num?item.num:0}}</text>
48 <image class="num_btn" src="/images/add.png" data-check='{{item.check}}' data-index="{{index}}" data-id="{{item.id}}" data-type="1" data-num="{{item.num?item.num:0}}" catchtap="num_change" data-price='{{item.price}}' data-price2="{{item.price2}}" /> 48 <image class="num_btn" src="/images/add.png" data-check='{{item.check}}' data-index="{{index}}" data-id="{{item.id}}" data-type="1" data-num="{{item.num?item.num:0}}" catchtap="num_change" data-price='{{item.price}}' data-price2="{{item.price2}}" />
49 </view> 49 </view>
50 </view> 50 </view>
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 </view> 79 </view>
80 <view class="num">共{{info.totalnum + choudanNum}}件</view> 80 <view class="num">共{{info.totalnum + choudanNum}}件</view>
81 </view> 81 </view>
82 -<concat/> 82 +<concat />
83 83
84 <!-- 支付成功弹框开始 --> 84 <!-- 支付成功弹框开始 -->
85 <view class='success_mask' wx:if='{{success}}'> 85 <view class='success_mask' wx:if='{{success}}'>
@@ -93,17 +93,67 @@ @@ -93,17 +93,67 @@
93 </view> 93 </view>
94 <!-- 支付成功弹框结束 --> 94 <!-- 支付成功弹框结束 -->
95 <!-- 支付失败弹框开始 --> 95 <!-- 支付失败弹框开始 -->
96 -<view class='success_mask' wx:if='{{fail}}'> 96 +<!-- <view class='success_mask' wx:if='{{fail}}'>
97 <view class='success_diceng'> 97 <view class='success_diceng'>
98 <view class='success_one'> 98 <view class='success_one'>
99 <image src='/images/icon_55.png'></image> 99 <image src='/images/icon_55.png'></image>
100 </view> 100 </view>
101 <view class='success_font'>支付失败</view> 101 <view class='success_font'>支付失败</view>
102 - <!-- status为1的时候才能支付 --> 102 + status为1的时候才能支付
103 <view class='fail_font' wx:if="{{info.status == 0}}">不在活动时间，您不能支付</view> 103 <view class='fail_font' wx:if="{{info.status == 0}}">不在活动时间，您不能支付</view>
104 <view class='fail_font' wx:else>所需积分{{order.xy}},积分余额{{order.syjf}}</view> 104 <view class='fail_font' wx:else>所需积分{{order.xy}},积分余额{{order.syjf}}</view>
105 <navigator class='success_confirm_btn' open-type="navigateBack">取消支付</navigator> 105 <navigator class='success_confirm_btn' open-type="navigateBack">取消支付</navigator>
106 </view> 106 </view>
  107 +</view> -->
  108 +<view class="peijianMask" wx-if="{{fail}}">
  109 + <view class="peijianPopup">
  110 + <view class="typePopop_quxiao" bindtap="payFail">
  111 + <image src="/images/quxiao11.png" mode="widthFix" style="width: 48rpx;"></image>
  112 + </view>
  113 + <view style="padding: 32rpx;margin-top: 80rpx;">
  114 + <view style="display: flex;flex-direction: column;align-items: center;">
  115 + <image src="/images/jinggao.png" mode="widthFix" style="width: 126rpx;"></image>
  116 + <text style="font-size: 32rpx; color: #000;margin: 16rpx 0;">支付失败</text>
  117 + <text style="font-size: 28rpx;">您的积分不足,可使用微信支付差价</text>
  118 + </view>
  119 + <view style="width: 100%;padding: 32rpx 0;display: flex;justify-content: space-between;border-bottom: 1rpx solid rgba(240,242,245,1);">
  120 + <view style="font-size: 28rpx;">
  121 + 共需积分
  122 + </view>
  123 + <view style="font-size: 32rpx;color: #3D9BF5;">
  124 + {{order.xy}}
  125 + </view>
  126 + </view>
  127 + <view style="width: 100%;padding: 32rpx 0;display: flex;justify-content: space-between;border-bottom: 1rpx solid rgba(240,242,245,1);">
  128 + <view style="font-size: 28rpx;">
  129 + 当前积分
  130 + </view>
  131 + <view style="font-size: 32rpx;color: #3D9BF5;">
  132 + {{order.syjf}}
  133 + </view>
  134 + </view>
  135 + <view style="width: 100%;padding: 32rpx 0;display: flex;justify-content: space-between;border-bottom: 1rpx solid rgba(240,242,245,1);">
  136 + <view style="font-size: 28rpx;">
  137 + 差价支付
  138 + </view>
  139 + <view style="font-size: 32rpx;color: #ED261C;">
  140 + ￥{{payMent}}
  141 + </view>
  142 + </view>
  143 + <view style="margin-top: 114rpx;display: flex;align-items: center;font-size: 28rpx;justify-content: space-between;">
  144 + <view>
  145 + <text style="color: rgba(0,0,0,0.26);">共{{info.totalnum + choudanNum}}件,</text>
  146 + <text style="color: rgba(0,0,0,0.6);">合计:</text>
  147 + <text style="color: #3D9BF5;">{{order.xy}}积分,</text>
  148 + <text style="color: rgba(0,0,0,0.6);">差价:</text>
  149 + <text style="color: #ED261C;">￥{{payMent}}</text>
  150 + </view>
  151 + <view style="width: 222rpx;height: 88rpx;background-color: #3D9BF5;border-radius: 96rpx;display: flex;align-items: center;justify-content: center;font-size: 32rpx;color: #FFFFFF;" bindtap="mixedPay">
  152 + 提交
  153 + </view>
  154 + </view>
  155 + </view>
  156 + </view>
107 </view> 157 </view>
108 <!-- 支付失败弹框结束 --> 158 <!-- 支付失败弹框结束 -->
109 159
@@ -479,3 +479,29 @@ page { @@ -479,3 +479,29 @@ page {
479 color: rgba(19, 26, 46, 1); 479 color: rgba(19, 26, 46, 1);
480 margin: 0 24rpx; 480 margin: 0 24rpx;
481 } 481 }
  482 +.peijianMask {
  483 + width: 100%;
  484 + height: 100%;
  485 + position: fixed;
  486 + top: 0;
  487 + left: 0;
  488 + background-color: rgba(0, 0, 0, 0.4);
  489 + opacity: 1;
  490 + z-index: 999999;
  491 +}
  492 +
  493 +.peijianPopup {
  494 + width: 100%;
  495 + border-radius: 32rpx 32rpx 0 0;
  496 + opacity: 1;
  497 + background-color: #FFFFFF;
  498 + position: absolute;
  499 + bottom: 0;
  500 + left: 0;
  501 + z-index: 999999;
  502 +}
  503 +.typePopop_quxiao {
  504 + position: absolute;
  505 + top: 32rpx;
  506 + right: 32rpx;
  507 +}
1 { 1 {
2 "description": "项目配置文件", 2 "description": "项目配置文件",
3 "packOptions": { 3 "packOptions": {
4 - "ignore": [] 4 + "ignore": [],
  5 + "include": []
5 }, 6 },
6 "setting": { 7 "setting": {
7 "urlCheck": false, 8 "urlCheck": false,
@@ -25,6 +26,7 @@ @@ -25,6 +26,7 @@
25 "useMultiFrameRuntime": true, 26 "useMultiFrameRuntime": true,
26 "useApiHook": true, 27 "useApiHook": true,
27 "useApiHostProcess": true, 28 "useApiHostProcess": true,
  29 + "ignoreDevUnusedFiles": false,
28 "babelSetting": { 30 "babelSetting": {
29 "ignore": [], 31 "ignore": [],
30 "disablePlugins": [], 32 "disablePlugins": [],
@@ -45,47 +47,30 @@ @@ -45,47 +47,30 @@
45 "libVersion": "2.22.0", 47 "libVersion": "2.22.0",
46 "appid": "wx73497072e7340d61", 48 "appid": "wx73497072e7340d61",
47 "projectname": "binhaineigouopen", 49 "projectname": "binhaineigouopen",
48 - "debugOptions": {  
49 - "hidedInDevtools": []  
50 - },  
51 - "isGameTourist": false,  
52 "simulatorType": "wechat", 50 "simulatorType": "wechat",
53 "simulatorPluginLibVersion": {}, 51 "simulatorPluginLibVersion": {},
54 "condition": { 52 "condition": {
55 - "plugin": {  
56 - "list": []  
57 - },  
58 - "game": {  
59 - "list": []  
60 - },  
61 - "gamePlugin": {  
62 - "list": []  
63 - },  
64 "miniprogram": { 53 "miniprogram": {
65 "list": [ 54 "list": [
66 { 55 {
67 - "id": 0,  
68 "name": "123", 56 "name": "123",
69 "pathName": "pages/login/login", 57 "pathName": "pages/login/login",
70 "query": "", 58 "query": "",
71 "scene": null 59 "scene": null
72 }, 60 },
73 { 61 {
74 - "id": 1,  
75 "name": "pages/shop_detail/shop_detail", 62 "name": "pages/shop_detail/shop_detail",
76 "pathName": "pages/order/order", 63 "pathName": "pages/order/order",
77 "query": "", 64 "query": "",
78 "scene": null 65 "scene": null
79 }, 66 },
80 { 67 {
81 - "id": 2,  
82 "name": "公众号模拟", 68 "name": "公众号模拟",
83 "pathName": "pages/register/register", 69 "pathName": "pages/register/register",
84 "query": "", 70 "query": "",
85 "scene": 1058 71 "scene": 1058
86 }, 72 },
87 { 73 {
88 - "id": -1,  
89 "name": "自定义菜单", 74 "name": "自定义菜单",
90 "pathName": "pages/register/register", 75 "pathName": "pages/register/register",
91 "query": "", 76 "query": "",
@@ -95,63 +80,54 @@ @@ -95,63 +80,54 @@
95 } 80 }
96 }, 81 },
97 { 82 {
98 - "id": -1,  
99 "name": "个人中心", 83 "name": "个人中心",
100 "pathName": "pages/my/my", 84 "pathName": "pages/my/my",
101 "query": "", 85 "query": "",
102 "scene": null 86 "scene": null
103 }, 87 },
104 { 88 {
105 - "id": -1,  
106 "name": "商品列表", 89 "name": "商品列表",
107 "pathName": "pages/classify/classify", 90 "pathName": "pages/classify/classify",
108 "query": "", 91 "query": "",
109 "scene": null 92 "scene": null
110 }, 93 },
111 { 94 {
112 - "id": -1,  
113 "name": "活动套餐", 95 "name": "活动套餐",
114 "pathName": "pages/search/search_result/search_result", 96 "pathName": "pages/search/search_result/search_result",
115 "query": "", 97 "query": "",
116 "scene": null 98 "scene": null
117 }, 99 },
118 { 100 {
119 - "id": -1,  
120 "name": "足迹", 101 "name": "足迹",
121 "pathName": "pages/zuji/zuji", 102 "pathName": "pages/zuji/zuji",
122 "query": "", 103 "query": "",
123 "scene": null 104 "scene": null
124 }, 105 },
125 { 106 {
126 - "id": -1,  
127 "name": "首页", 107 "name": "首页",
128 "pathName": "pages/index/index", 108 "pathName": "pages/index/index",
129 "query": "", 109 "query": "",
130 "scene": null 110 "scene": null
131 }, 111 },
132 { 112 {
133 - "id": -1,  
134 "name": "注册", 113 "name": "注册",
135 "pathName": "pages/register/register", 114 "pathName": "pages/register/register",
136 "query": "", 115 "query": "",
137 "scene": null 116 "scene": null
138 }, 117 },
139 { 118 {
140 - "id": -1,  
141 "name": "pages/shop_detail/shop_detail", 119 "name": "pages/shop_detail/shop_detail",
142 "pathName": "pages/shop_detail/shop_detail", 120 "pathName": "pages/shop_detail/shop_detail",
143 "query": "id=774", 121 "query": "id=774",
144 "scene": null 122 "scene": null
145 }, 123 },
146 { 124 {
147 - "id": -1,  
148 "name": "pages/classify/classify", 125 "name": "pages/classify/classify",
149 "pathName": "pages/classify/classify", 126 "pathName": "pages/classify/classify",
150 "query": "", 127 "query": "",
151 "scene": null 128 "scene": null
152 }, 129 },
153 { 130 {
154 - "id": -1,  
155 "name": "pages/classify/classify", 131 "name": "pages/classify/classify",
156 "pathName": "pages/classify/classify", 132 "pathName": "pages/classify/classify",
157 "query": "", 133 "query": "",
@@ -189,5 +165,9 @@ @@ -189,5 +165,9 @@
189 } 165 }
190 ] 166 ]
191 } 167 }
  168 + },
  169 + "editorSetting": {
  170 + "tabIndent": "insertSpaces",
  171 + "tabSize": 4
192 } 172 }
193 } 173 }
  1 +{
  2 + "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
  3 + "libVersion": "2.25.0",
  4 + "condition": {
  5 + "miniprogram": {
  6 + "list": [
  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": "自定义菜单",
  27 + "pathName": "pages/register/register",
  28 + "query": "",
  29 + "scene": 1035,
  30 + "referrerInfo": {
  31 + "appId": "wx017596efd78a16f0"
  32 + }
  33 + },
  34 + {
  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",
  102 + "pathName": "packageA/pages/index/index",
  103 + "query": "",
  104 + "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 + }
  125 + ]
  126 + }
  127 + }
  128 +}