16 changed files with 188 additions and 116 deletions
Unified View
Diff Options
-
80app.js
-
BINassets/image/icon_address.png
-
20assets/image/icon_address.svg
-
19colorui/main.wxss
-
29components/helpers/checkIPhoneX.js
-
4components/tab/index.wxss
-
5pages/mall/order-info/index.js
-
45pages/mall/order-info/index.wxml
-
26pages/mall/order-info/index.wxss
-
2pages/mall/order-list/index.wxml
-
6pages/mall/order-offer/index.js
-
32pages/mall/order-offer/index.wxml
-
12pages/mall/order-offer/index.wxss
-
2pages/mall/order-result/index.wxml
-
14pages/mall/page-list/index.wxss
-
8pages/mall/shops/index.wxml
@ -1,39 +1,47 @@ |
|||||
//app.js
|
//app.js
|
||||
App({ |
|
||||
|
App({ |
||||
|
|
||||
release: false, |
|
||||
httpUrl: 'https://api-test.qniao.cn', |
|
||||
tmplIds: ['kg0T1ve0FpYrEtZ4ExbypHm8mtS7OJaehvqN_T9ypoI'], |
|
||||
globalData: { |
|
||||
userInfo: {}, |
|
||||
openId: null, |
|
||||
token: null |
|
||||
}, |
|
||||
|
release: false, |
||||
|
httpUrl: 'https://api-test.qniao.cn', |
||||
|
tmplIds: ['kg0T1ve0FpYrEtZ4ExbypHm8mtS7OJaehvqN_T9ypoI'], |
||||
|
globalData: { |
||||
|
userInfo: {}, |
||||
|
openId: null, |
||||
|
token: null, |
||||
|
isIPhoneX: false |
||||
|
}, |
||||
|
|
||||
onLaunch: function () { |
|
||||
if (this.release) { |
|
||||
this.httpUrl = 'https://api.qniao.cn' |
|
||||
} else { |
|
||||
this.httpUrl = 'https://api-test.qniao.cn' |
|
||||
} |
|
||||
wx.loadFontFace({ |
|
||||
family: 'DINAlternate', |
|
||||
source: 'url("https://medou.oss-cn-shenzhen.aliyuncs.com/ttf/DIN-BoldAlternate.otf")', |
|
||||
success: function (res) { |
|
||||
} |
|
||||
}) |
|
||||
wx.getSystemInfo({ |
|
||||
success: e => { |
|
||||
this.globalData.StatusBar = e.statusBarHeight; |
|
||||
let custom = wx.getMenuButtonBoundingClientRect(); |
|
||||
this.globalData.Custom = custom; |
|
||||
this.globalData.CustomBar = custom.bottom + custom.top - e.statusBarHeight; |
|
||||
let windowHeight = e.windowHeight * (750 / e.windowWidth); |
|
||||
let statusBarHeight = this.globalData.CustomBar * (750 / e.windowWidth); |
|
||||
this.globalData.fragmentHeight = windowHeight - statusBarHeight |
|
||||
// console.log('fragmentHeight>>>' + this.globalData.fragmentHeight + ',windowHeight=' + windowHeight)
|
|
||||
} |
|
||||
}) |
|
||||
} |
|
||||
|
|
||||
}) |
|
||||
|
onLaunch: function () { |
||||
|
if (this.release) { |
||||
|
this.httpUrl = 'https://api.qniao.cn' |
||||
|
} else { |
||||
|
this.httpUrl = 'https://api-test.qniao.cn' |
||||
|
} |
||||
|
// wx.loadFontFace({
|
||||
|
// family: 'DINAlternate',
|
||||
|
// source: 'url("https://medou.oss-cn-shenzhen.aliyuncs.com/ttf/DIN-BoldAlternate.otf")',
|
||||
|
// success: function (res) {
|
||||
|
// }
|
||||
|
// })
|
||||
|
wx.getSystemInfo({ |
||||
|
success: e => { |
||||
|
this.globalData.StatusBar = e.statusBarHeight; |
||||
|
let custom = wx.getMenuButtonBoundingClientRect(); |
||||
|
this.globalData.Custom = custom; |
||||
|
this.globalData.CustomBar = custom.bottom + custom.top - e.statusBarHeight; |
||||
|
let windowHeight = e.windowHeight * (750 / e.windowWidth); |
||||
|
let statusBarHeight = this.globalData.CustomBar * (750 / e.windowWidth); |
||||
|
this.globalData.fragmentHeight = windowHeight - statusBarHeight |
||||
|
// console.log('fragmentHeight>>>' + this.globalData.fragmentHeight + ',windowHeight=' + windowHeight)
|
||||
|
this.globalData.isIPhoneX = this.checkIPhoneX(e) |
||||
|
} |
||||
|
}) |
||||
|
}, |
||||
|
|
||||
|
checkIPhoneX: function (e) { |
||||
|
var t = e.model, |
||||
|
o = e.platform; |
||||
|
return /iPhone X/.test(t) && "ios" === o |
||||
|
} |
||||
|
|
||||
|
}) |
||||
@ -0,0 +1,20 @@ |
|||||
|
<?xml version="1.0" encoding="UTF-8"?> |
||||
|
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> |
||||
|
<!-- Generator: Sketch 60 (88103) - https://sketch.com --> |
||||
|
<title>画板@2x</title> |
||||
|
<desc>Created with Sketch.</desc> |
||||
|
<defs> |
||||
|
<linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-1"> |
||||
|
<stop stop-color="#267DD6" offset="0%"></stop> |
||||
|
<stop stop-color="#008AFF" offset="100%"></stop> |
||||
|
</linearGradient> |
||||
|
</defs> |
||||
|
<g id="画板" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> |
||||
|
<g id="icon_dizhi备份"> |
||||
|
<rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="16" height="16" rx="8"></rect> |
||||
|
<g id="地址" transform="translate(5.000000, 4.000000)" fill="#FFFFFF" fill-rule="nonzero"> |
||||
|
<path d="M3.0000358,0 C1.34309295,0 0,1.43826716 0,3.21253833 C0,5.18531187 1.78617516,6.91533252 2.7413404,7.88859413 L2.7413404,7.88859413 C2.88637411,8.03665215 3.11262729,8.03719903 3.25826965,7.88984415 C4.19081924,6.94133283 6.0000716,5.1793118 6.0000716,3.21253833 C6.0000716,1.43826716 4.65697865,0 3.0000358,0 L3.0000358,0 Z M3.08151009,4.19290549 C2.3910778,4.19290549 1.83151009,3.63331999 1.83151009,2.94290549 C1.83151009,2.25249098 2.3910778,1.69290549 3.08125399,1.69290549 C3.77194237,1.69290549 4.33151009,2.25249098 4.33151009,2.94290549 C4.33151009,3.63331999 3.77194237,4.19290549 3.08151009,4.19290549 Z" id="形状"></path> |
||||
|
</g> |
||||
|
</g> |
||||
|
</g> |
||||
|
</svg> |
||||
@ -1 +1,28 @@ |
|||||
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.checkIPhoneX=exports.safeAreaInset=exports.getSystemInfo=void 0;var systemInfo=null,getSystemInfo=function(e){if(!systemInfo||e)try{systemInfo=wx.getSystemInfoSync()}catch(e){}return systemInfo};exports.getSystemInfo=getSystemInfo;var safeAreaInset={top:88,left:0,right:0,bottom:34};exports.safeAreaInset=safeAreaInset;var isIPhoneX=function(e){var t=e.model,o=e.platform;return/iPhone X/.test(t)&&"ios"===o},checkIPhoneX=function(e){return isIPhoneX(getSystemInfo(e))};exports.checkIPhoneX=checkIPhoneX; |
|
||||
|
"use strict"; |
||||
|
Object.defineProperty(exports, "__esModule", { |
||||
|
value: !0 |
||||
|
}), exports.checkIPhoneX = exports.safeAreaInset = exports.getSystemInfo = void 0; |
||||
|
var systemInfo = null, |
||||
|
getSystemInfo = function (e) { |
||||
|
if (!systemInfo || e) try { |
||||
|
systemInfo = wx.getSystemInfoSync() |
||||
|
} catch (e) {} |
||||
|
return systemInfo |
||||
|
}; |
||||
|
exports.getSystemInfo = getSystemInfo; |
||||
|
var safeAreaInset = { |
||||
|
top: 88, |
||||
|
left: 0, |
||||
|
right: 0, |
||||
|
bottom: 34 |
||||
|
}; |
||||
|
exports.safeAreaInset = safeAreaInset; |
||||
|
var isIPhoneX = function (e) { |
||||
|
var t = e.model, |
||||
|
o = e.platform; |
||||
|
return /iPhone X/.test(t) && "ios" === o |
||||
|
}, |
||||
|
checkIPhoneX = function (e) { |
||||
|
return isIPhoneX(getSystemInfo(e)) |
||||
|
}; |
||||
|
exports.checkIPhoneX = checkIPhoneX; |
||||
@ -1,7 +1,7 @@ |
|||||
<!--pages/mall/order-result/index.wxml--> |
<!--pages/mall/order-result/index.wxml--> |
||||
<cu-custom bgColor="bg-white" isBack="{{true}}"> |
<cu-custom bgColor="bg-white" isBack="{{true}}"> |
||||
<view slot="backText">返回</view> |
<view slot="backText">返回</view> |
||||
<view slot="content" style="color:black;font-size:18px">{{title}}</view> |
|
||||
|
<view slot="content" style="color:black;font-size:26rpx">{{title}}</view> |
||||
</cu-custom> |
</cu-custom> |
||||
|
|
||||
<wux-result icon="{{ icon }}" title="{{label}}" label="{{message}}" buttons="{{ buttons }}" fixed bind:click="onClick" /> |
<wux-result icon="{{ icon }}" title="{{label}}" label="{{message}}" buttons="{{ buttons }}" fixed bind:click="onClick" /> |
||||
Write
Preview
Loading…
Cancel
Save