diff --git a/app.js b/app.js
index 77ce278..b4edc66 100644
--- a/app.js
+++ b/app.js
@@ -1,39 +1,47 @@
//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)
- }
- })
- }
-
-})
\ No newline at end of file
+ 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
+ }
+
+ })
\ No newline at end of file
diff --git a/assets/image/icon_address.png b/assets/image/icon_address.png
deleted file mode 100644
index 1e25755..0000000
Binary files a/assets/image/icon_address.png and /dev/null differ
diff --git a/assets/image/icon_address.svg b/assets/image/icon_address.svg
new file mode 100644
index 0000000..1e0cecc
--- /dev/null
+++ b/assets/image/icon_address.svg
@@ -0,0 +1,20 @@
+
+
\ No newline at end of file
diff --git a/colorui/main.wxss b/colorui/main.wxss
index 41e9385..2539e18 100644
--- a/colorui/main.wxss
+++ b/colorui/main.wxss
@@ -754,9 +754,9 @@ button.icon.lg {
.cu-bar .search-form input {
flex: 1;
padding-right: 30rpx;
- height: 64rpx;
- line-height: 64rpx;
- font-size: 26rpx;
+ height: 72rpx;
+ line-height: 72rpx;
+ font-size: 32rpx;
background-color: transparent;
}
@@ -2526,22 +2526,11 @@ scroll-view.cu-steps .cu-item {
height: 40rpx;
display: inline-block;
vertical-align: middle;
- animation: loading 1s steps(12, end) infinite;
+ animation: cuIcon-spin 2s infinite linear;
background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
background-size: 100%;
}
-@keyframes loading {
- 0% {
- transform: rotate3d(0, 0, 1, 0deg);
- }
-
- 100% {
- transform: rotate3d(0, 0, 1, 360deg);
- }
-}
-
-
.customer-box-blue {
border: 1px solid #009ddf;
width: 80rpx;
diff --git a/components/helpers/checkIPhoneX.js b/components/helpers/checkIPhoneX.js
index ee350f9..11566ce 100644
--- a/components/helpers/checkIPhoneX.js
+++ b/components/helpers/checkIPhoneX.js
@@ -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;
\ No newline at end of file
+"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;
\ No newline at end of file
diff --git a/components/tab/index.wxss b/components/tab/index.wxss
index 7c7e3fc..d6a53bc 100644
--- a/components/tab/index.wxss
+++ b/components/tab/index.wxss
@@ -35,11 +35,11 @@
padding: 0 10rpx;
box-sizing: border-box;
transition: color 0.3s ease-in-out;
- font-size: 14px;
+ font-size: 28rpx;
}
.tabs__item--cur {
color: #008AFF;
- font-size: 16px;
+ font-size: 32rpx;
}
.tabs__item-child {
display: inline-block;
diff --git a/pages/mall/order-info/index.js b/pages/mall/order-info/index.js
index 1418891..23a1dce 100644
--- a/pages/mall/order-info/index.js
+++ b/pages/mall/order-info/index.js
@@ -21,7 +21,8 @@ Page({
number: 1,
unitPrice: 0
},
- amount: null
+ amount: null,
+ isIPhoneX: false
},
/**
* 生命周期函数--监听页面加载
@@ -32,7 +33,7 @@ Page({
backStr: '首页'
})
}
- this.setData({ token: app.globalData.token })
+ this.setData({ token: app.globalData.token, isIPhoneX: app.globalData.isIPhoneX })
event.on('EventMessage', this, this.onEvent)
if (options.id) {
wx.showLoading({
diff --git a/pages/mall/order-info/index.wxml b/pages/mall/order-info/index.wxml
index 55254d8..0a6d738 100644
--- a/pages/mall/order-info/index.wxml
+++ b/pages/mall/order-info/index.wxml
@@ -1,7 +1,7 @@
{{backStr}}
- 商品详情
+ 商品详情
@@ -10,62 +10,65 @@
-
+
￥{{form.unitPrice || orderInfo.price}}
- 库存：{{form.stockNumber >= 0 ? form.stockNumber : orderInfo.stockNumber}}{{orderInfo.unit}}
-
-
- {{orderInfo.viewNum}} 浏览
-
+ 库存：{{form.stockNumber >= 0 ? form.stockNumber : orderInfo.stockNumber}}{{orderInfo.unit}}
+ {{orderInfo.viewNum}} 浏览
{{orderInfo.name}}
- {{orderInfo.outline}}
+ {{orderInfo.outline}}
- 选择{{sukItem.name}}
+ 选择{{sukItem.name}}
- {{item.val}}
+ {{item.val}}
-
+
- 购买数量
+ 购买数量
- 商品描述
- {{orderInfo.detail}}
+ 商品描述
+ {{orderInfo.detail}}
- 送货说明
- {{orderInfo.deliverTips}}
+ 送货说明
+ {{orderInfo.deliverTips}}
+
+
+
+
+
+
-
+
- 合计：
- ￥{{amount}}
+ 合计：
+ ￥{{amount}}
diff --git a/pages/mall/order-info/index.wxss b/pages/mall/order-info/index.wxss
index 4292b90..0c3db9c 100644
--- a/pages/mall/order-info/index.wxss
+++ b/pages/mall/order-info/index.wxss
@@ -8,7 +8,7 @@
}
.detail-price {
- font-size: 16px;
+ font-size: 32rpx;
font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold;
color: rgba(255, 66, 43, 1);
@@ -16,7 +16,7 @@
}
.text-name {
- font-size: 16px;
+ font-size: 32rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: rgba(51, 51, 51, 1);
@@ -36,4 +36,26 @@
button::after {
border: none;
+}
+
+.booking-tool {
+ width: calc(100% - 20px);
+ background-color: #fff;
+ position: fixed;
+ bottom: 150px;
+ left: 25px;
+}
+
+.roder-add {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 40px;
+ height: 40px;
+ background-color: #fff;
+ border-radius: 20px;
+ position: absolute;
+ top: 24px;
+ right: 24px;
+ box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
}
\ No newline at end of file
diff --git a/pages/mall/order-list/index.wxml b/pages/mall/order-list/index.wxml
index 58d5ec0..936d4ce 100644
--- a/pages/mall/order-list/index.wxml
+++ b/pages/mall/order-list/index.wxml
@@ -1,7 +1,7 @@
返回
- 全部订单
+ 全部订单
diff --git a/pages/mall/order-offer/index.js b/pages/mall/order-offer/index.js
index a5ba0a6..6fa9464 100644
--- a/pages/mall/order-offer/index.js
+++ b/pages/mall/order-offer/index.js
@@ -14,7 +14,8 @@ Page({
form: {
payType: 1,
},
- addressInfo: null
+ addressInfo: null,
+ isIPhoneX: false
},
/**
* 生命周期函数--监听页面加载
@@ -28,7 +29,8 @@ Page({
form.totalPrice = float.accMul(form.unitPrice, form.number).toFixed(2)
form.preAmount = float.accMul(float.accMul(form.unitPrice, form.number), 0.1).toFixed(2)
this.setData({
- form: form
+ form: form,
+ isIPhoneX: app.globalData.isIPhoneX
})
}
},
diff --git a/pages/mall/order-offer/index.wxml b/pages/mall/order-offer/index.wxml
index 5504caf..1f52842 100644
--- a/pages/mall/order-offer/index.wxml
+++ b/pages/mall/order-offer/index.wxml
@@ -1,7 +1,7 @@
返回
- 确认订单
+ 确认订单
@@ -10,18 +10,18 @@
- {{addressInfo.userName}}
- {{addressInfo.provinceName + addressInfo.cityName + addressInfo.countyName + addressInfo.detailInfo}}
+ {{addressInfo.userName}}
+ {{addressInfo.provinceName + addressInfo.cityName + addressInfo.countyName + addressInfo.detailInfo}}
-
+
- {{form.payType == 1 ? '预付金额' : '应付金额'}}
- ￥{{form.preAmount}}
+ {{form.payType == 1 ? '预付金额' : '应付金额'}}
+ ￥{{form.preAmount}}
@@ -83,14 +83,14 @@
-