Browse Source

样式修改

master
xpz2018 6 years ago
parent
commit
398488f290
16 changed files with 188 additions and 116 deletions
  1. 80
      app.js
  2. BIN
      assets/image/icon_address.png
  3. 20
      assets/image/icon_address.svg
  4. 19
      colorui/main.wxss
  5. 29
      components/helpers/checkIPhoneX.js
  6. 4
      components/tab/index.wxss
  7. 5
      pages/mall/order-info/index.js
  8. 45
      pages/mall/order-info/index.wxml
  9. 26
      pages/mall/order-info/index.wxss
  10. 2
      pages/mall/order-list/index.wxml
  11. 6
      pages/mall/order-offer/index.js
  12. 32
      pages/mall/order-offer/index.wxml
  13. 12
      pages/mall/order-offer/index.wxss
  14. 2
      pages/mall/order-result/index.wxml
  15. 14
      pages/mall/page-list/index.wxss
  16. 8
      pages/mall/shops/index.wxml

80
app.js

@ -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
}
})

BIN
assets/image/icon_address.png

Before After
Width: 32  |  Height: 32  |  Size: 1.7 KiB

20
assets/image/icon_address.svg

@ -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>

19
colorui/main.wxss

@ -754,9 +754,9 @@ button.icon.lg {
.cu-bar .search-form input { .cu-bar .search-form input {
flex: 1; flex: 1;
padding-right: 30rpx; padding-right: 30rpx;
height: 64rpx;
line-height: 64rpx;
font-size: 26rpx;
height: 72rpx;
line-height: 72rpx;
font-size: 32rpx;
background-color: transparent; background-color: transparent;
} }
@ -2526,22 +2526,11 @@ scroll-view.cu-steps .cu-item {
height: 40rpx; height: 40rpx;
display: inline-block; display: inline-block;
vertical-align: middle; 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: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
background-size: 100%; background-size: 100%;
} }
@keyframes loading {
0% {
transform: rotate3d(0, 0, 1, 0deg);
}
100% {
transform: rotate3d(0, 0, 1, 360deg);
}
}
.customer-box-blue { .customer-box-blue {
border: 1px solid #009ddf; border: 1px solid #009ddf;
width: 80rpx; width: 80rpx;

29
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;
"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;

4
components/tab/index.wxss

@ -35,11 +35,11 @@
padding: 0 10rpx; padding: 0 10rpx;
box-sizing: border-box; box-sizing: border-box;
transition: color 0.3s ease-in-out; transition: color 0.3s ease-in-out;
font-size: 14px;
font-size: 28rpx;
} }
.tabs__item--cur { .tabs__item--cur {
color: #008AFF; color: #008AFF;
font-size: 16px;
font-size: 32rpx;
} }
.tabs__item-child { .tabs__item-child {
display: inline-block; display: inline-block;

5
pages/mall/order-info/index.js

@ -21,7 +21,8 @@ Page({
number: 1, number: 1,
unitPrice: 0 unitPrice: 0
}, },
amount: null
amount: null,
isIPhoneX: false
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
@ -32,7 +33,7 @@ Page({
backStr: '首页' backStr: '首页'
}) })
} }
this.setData({ token: app.globalData.token })
this.setData({ token: app.globalData.token, isIPhoneX: app.globalData.isIPhoneX })
event.on('EventMessage', this, this.onEvent) event.on('EventMessage', this, this.onEvent)
if (options.id) { if (options.id) {
wx.showLoading({ wx.showLoading({

45
pages/mall/order-info/index.wxml

@ -1,7 +1,7 @@
<!--pages/order/order-info/index.wxml--> <!--pages/order/order-info/index.wxml-->
<cu-custom bgColor="bg-white" isBack="{{true}}"> <cu-custom bgColor="bg-white" isBack="{{true}}">
<view slot="backText">{{backStr}}</view> <view slot="backText">{{backStr}}</view>
<view slot="content" style="color:black;font-size:18px">商品详情</view>
<view slot="content" style="color:black;font-size:36rpx">商品详情</view>
</cu-custom> </cu-custom>
<view wx:if="{{orderInfo}}"> <view wx:if="{{orderInfo}}">
@ -10,62 +10,65 @@
<image src="{{item}}" mode='aspectFill'></image> <image src="{{item}}" mode='aspectFill'></image>
</swiper-item> </swiper-item>
</swiper> </swiper>
<view class="bg-white flex flex-justify" style="padding:8rpx 32rpx 0rpx 32rpx">
<view class="bg-white flex flex-justify" style="padding:24rpx 32rpx">
<view class="flex flex-center"> <view class="flex flex-center">
<view class="detail-price">¥{{form.unitPrice || orderInfo.price}}</view> <view class="detail-price">¥{{form.unitPrice || orderInfo.price}}</view>
<view class="text-gray" style="font-size:12px;margin-left:48rpx">库存:{{form.stockNumber >= 0 ? form.stockNumber : orderInfo.stockNumber}}{{orderInfo.unit}}</view>
</view>
<view class="flex flex-center">
<view class="text-gray" style="font-size:12px;margin-right:24rpx">{{orderInfo.viewNum}} 浏览</view>
<button open-type="share" style="background-color: #fff;border-radius: 0;padding-left: 0px;padding-right: 0px;">
<wux-icon type="md-share" color="#333333" size="16" />
</button>
<view class="text-gray" style="font-size:24rpx;margin-left:48rpx">库存:{{form.stockNumber >= 0 ? form.stockNumber : orderInfo.stockNumber}}{{orderInfo.unit}}</view>
</view> </view>
<view class="text-gray" style="font-size:24rpx">{{orderInfo.viewNum}} 浏览</view>
</view> </view>
<view class="bg-white text-name" style="padding:0rpx 32rpx">{{orderInfo.name}}</view> <view class="bg-white text-name" style="padding:0rpx 32rpx">{{orderInfo.name}}</view>
<view class="bg-white text-gray" style="font-size:14px;padding:12rpx 32rpx">{{orderInfo.outline}}</view>
<view class="bg-white text-black" style="font-size:24rpx;padding:24rpx 32rpx">{{orderInfo.outline}}</view>
<view class="bg-white" style="padding:0rpx 32rpx 32rpx 32rpx"> <view class="bg-white" style="padding:0rpx 32rpx 32rpx 32rpx">
<view wx:for-item="sukItem" wx:for="{{orderInfo.attributeList}}" wx:key="sukIndex" style="padding-top:12rpx"> <view wx:for-item="sukItem" wx:for="{{orderInfo.attributeList}}" wx:key="sukIndex" style="padding-top:12rpx">
<view class="text-gray" style="font-size:14px">选择{{sukItem.name}}</view>
<view class="text-gray" style="font-size:28rpx">选择{{sukItem.name}}</view>
<view class="flex flex-wrap" style="margin-top:16rpx"> <view class="flex flex-wrap" style="margin-top:16rpx">
<view wx:for-item="item" wx:for="{{sukItem.values}}" wx:key="index" style="margin-right:24rpx"> <view wx:for-item="item" wx:for="{{sukItem.values}}" wx:key="index" style="margin-right:24rpx">
<wux-button size="tag" disabled="{{item.disabled}}" outline="{{!item.select}}" type="tag" data-suk="{{sukItem.id}}" data-index="{{item.id}}" bind:click="tagClick">{{item.val}}</wux-button>
<wux-button size="tag" disabled="{{item.disabled}}" outline="{{!item.select}}" type="tag" data-suk="{{sukItem.id}}" data-index="{{item.id}}" bind:click="tagClick">{{item.val}}</wux-button>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="bg-white"> <view class="bg-white">
<view style="height:1px;width:100%;background-color:#F3F3F3;margin-left:32rpx"></view> <view style="height:1px;width:100%;background-color:#F3F3F3;margin-left:32rpx"></view>
</view> </view>
<view class="bg-white flex flex-justify" style="height:100rpx;;padding: 0rpx 32rpx"> <view class="bg-white flex flex-justify" style="height:100rpx;;padding: 0rpx 32rpx">
<view class="text-gray" style="font-size:14px">购买数量</view>
<view class="text-gray" style="font-size:28rpx">购买数量</view>
<wux-input-number default-value="{{form.number}}" disabled="{{false}}" color="stable" min="{{1}}" max="{{stockNumber||orderInfo.stockNumber}}" bind:change="onNumChange" /> <wux-input-number default-value="{{form.number}}" disabled="{{false}}" color="stable" min="{{1}}" max="{{stockNumber||orderInfo.stockNumber}}" bind:change="onNumChange" />
</view> </view>
<view class="bg-white" style="padding:32rpx;margin-top:32rpx"> <view class="bg-white" style="padding:32rpx;margin-top:32rpx">
<view class="text-black" style="font-size:16px">商品描述</view>
<view class="text-gray" style="font-size:14px;margin-top:32rpx">{{orderInfo.detail}}</view>
<view class="text-black" style="font-size:32rpx">商品描述</view>
<view class="text-gray" style="font-size:28rpx;margin-top:32rpx">{{orderInfo.detail}}</view>
</view> </view>
<view class="bg-white"> <view class="bg-white">
<view style="height:1px;width:100%;background-color:#F3F3F3;margin-left:32rpx"></view> <view style="height:1px;width:100%;background-color:#F3F3F3;margin-left:32rpx"></view>
</view> </view>
<view class="bg-white" style="padding:32rpx;"> <view class="bg-white" style="padding:32rpx;">
<view class="text-black" style="font-size:16px">送货说明</view>
<view class="text-gray" style="font-size:14px;margin-top:32rpx">{{orderInfo.deliverTips}}</view>
<view class="text-black" style="font-size:32rpx">送货说明</view>
<view class="text-gray" style="font-size:28rpx;margin-top:32rpx">{{orderInfo.deliverTips}}</view>
</view>
<view class="booking-tool" style="bottom:{{isIPhoneX?334:300}}rpx">
<view class="roder-add flex flex-center">
<button open-type="share" style="background-color: #fff;border-radius: 0;padding-left: 0px;padding-right: 0px;height:32px">
<image style="width:40rpx;height:40rpx;margin-bottom:3px" src="/assets/image/icon_share.png"></image>
</button>
</view>
</view> </view>
<view style="height:150rpx;"></view> <view style="height:150rpx;"></view>
<view class="cu-bar bg-white shadow foot flex flex-justify" style="height:120rpx;padding:32rpx">
<view class="cu-bar bg-white shadow foot flex flex-justify" style="height:{{isIPhoneX?154:120}}rpx;padding:32rpx;padding-bottom:{{isIPhoneX?66:32}}rpx">
<button class="action" open-type="contact" style="background-color: #fff;border-radius: 0;margin-left:-20rpx"> <button class="action" open-type="contact" style="background-color: #fff;border-radius: 0;margin-left:-20rpx">
<image style="width:48rpx;height:48rpx" src="/assets/image/icon_kefu.png"></image> <image style="width:48rpx;height:48rpx" src="/assets/image/icon_kefu.png"></image>
</button> </button>
<view class="flex align-end"> <view class="flex align-end">
<view wx:if="{{amount}}"> <view wx:if="{{amount}}">
<text class="text-black" style="font-size:14px">合计:</text>
<text class="text-blue" style="font-size:14px">¥{{amount}}</text>
<text class="text-black" style="font-size:32rpx">合计:</text>
<text class="text-blue" style="font-size:32rpx">¥{{amount}}</text>
</view> </view>
<button wx:if="{{token}}" class="cu-btn offer-btn" bindtap="offerProject">立即购买</button> <button wx:if="{{token}}" class="cu-btn offer-btn" bindtap="offerProject">立即购买</button>
<button wx:else class="cu-btn offer-btn" open-type="getPhoneNumber" bindgetphonenumber="onGotPhoneNumber">立即购买</button> <button wx:else class="cu-btn offer-btn" open-type="getPhoneNumber" bindgetphonenumber="onGotPhoneNumber">立即购买</button>

26
pages/mall/order-info/index.wxss

@ -8,7 +8,7 @@
} }
.detail-price { .detail-price {
font-size: 16px;
font-size: 32rpx;
font-family: DINAlternate-Bold, DINAlternate; font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold; font-weight: bold;
color: rgba(255, 66, 43, 1); color: rgba(255, 66, 43, 1);
@ -16,7 +16,7 @@
} }
.text-name { .text-name {
font-size: 16px;
font-size: 32rpx;
font-family: PingFang-SC-Medium, PingFang-SC; font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500; font-weight: 500;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
@ -36,4 +36,26 @@
button::after { button::after {
border: none; 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);
} }

2
pages/mall/order-list/index.wxml

@ -1,7 +1,7 @@
<!--pages/order/order-list/index.wxml--> <!--pages/order/order-list/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">全部订单</view>
<view slot="content" style="color:black;font-size:36rpx">全部订单</view>
</cu-custom> </cu-custom>
<view class="nav bg-white fixed" style="top:{{CustomBar}}px;"> <view class="nav bg-white fixed" style="top:{{CustomBar}}px;">

6
pages/mall/order-offer/index.js

@ -14,7 +14,8 @@ Page({
form: { form: {
payType: 1, payType: 1,
}, },
addressInfo: null
addressInfo: null,
isIPhoneX: false
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
@ -28,7 +29,8 @@ Page({
form.totalPrice = float.accMul(form.unitPrice, form.number).toFixed(2) form.totalPrice = float.accMul(form.unitPrice, form.number).toFixed(2)
form.preAmount = float.accMul(float.accMul(form.unitPrice, form.number), 0.1).toFixed(2) form.preAmount = float.accMul(float.accMul(form.unitPrice, form.number), 0.1).toFixed(2)
this.setData({ this.setData({
form: form
form: form,
isIPhoneX: app.globalData.isIPhoneX
}) })
} }
}, },

32
pages/mall/order-offer/index.wxml

@ -1,7 +1,7 @@
<!-- <wxs module="mall" src="../index.wxs"></wxs> --> <!-- <wxs module="mall" src="../index.wxs"></wxs> -->
<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">确认订单</view>
<view slot="content" style="color:black;font-size:36rpx">确认订单</view>
</cu-custom> </cu-custom>
<view style="padding:48rpx 32rpx"> <view style="padding:48rpx 32rpx">
@ -10,18 +10,18 @@
<view class="flex flex-center"> <view class="flex flex-center">
<image style="width:60rpx;height:60rpx" src="/assets/image/icon_address.png"></image> <image style="width:60rpx;height:60rpx" src="/assets/image/icon_address.png"></image>
<view style="margin-left:18rpx"> <view style="margin-left:18rpx">
<view style="color:black;font-size:14px">{{addressInfo.userName}}</view>
<view style="color:gray;font-size:12px">{{addressInfo.provinceName + addressInfo.cityName + addressInfo.countyName + addressInfo.detailInfo}}</view>
<view style="color:black;font-size:28rpx">{{addressInfo.userName}}</view>
<view style="color:gray;font-size:24rpx">{{addressInfo.provinceName + addressInfo.cityName + addressInfo.countyName + addressInfo.detailInfo}}</view>
</view> </view>
</view> </view>
<text class="cuIcon-right text-gray" style="font-size:18px"></text>
<text class="cuIcon-right text-gray" style="font-size:36rpx"></text>
</view> </view>
<view wx:else class="header-box flex flex-justify" style="padding:32rpx" bindtap="chooseAddress"> <view wx:else class="header-box flex flex-justify" style="padding:32rpx" bindtap="chooseAddress">
<view class="flex flex-center"> <view class="flex flex-center">
<image style="width:30rpx;height:30rpx" src="/assets/image/icon_address.png"></image>
<image style="width:30rpx;height:30rpx" src="/assets/image/icon_address.svg"></image>
<view style="margin-left:18rpx">地址收货选择</view> <view style="margin-left:18rpx">地址收货选择</view>
</view> </view>
<text class="cuIcon-right text-gray" style="font-size:18px"></text>
<text class="cuIcon-right text-gray" style="font-size:36rpx"></text>
</view> </view>
<view class="margin-top header-box" style="padding:32rpx"> <view class="margin-top header-box" style="padding:32rpx">
@ -56,26 +56,26 @@
<view class="offer-val">¥{{form.dividePrice}}</view> <view class="offer-val">¥{{form.dividePrice}}</view>
</view> </view>
<view class="flex flex-justify" style="height:60rpx"> <view class="flex flex-justify" style="height:60rpx">
<view class="offer-label" style="color:#333333;font-size:14px">{{form.payType == 1 ? '预付金额' : '应付金额'}}</view>
<view class="offer-val" style="color:#008AFF;font-size:14px">¥{{form.preAmount}}</view>
<view class="offer-label" style="color:#333333;font-size:28rpx">{{form.payType == 1 ? '预付金额' : '应付金额'}}</view>
<view class="offer-val" style="color:#008AFF;font-size:28rpx">¥{{form.preAmount}}</view>
</view> </view>
</view> </view>
<view class="margin-top header-box" style="padding:32rpx"> <view class="margin-top header-box" style="padding:32rpx">
<view class="flex flex-center item_border" style="justify-content: flex-start"> <view class="flex flex-center item_border" style="justify-content: flex-start">
<text class="cuIcon-titles text-blue"></text> <text class="cuIcon-titles text-blue"></text>
<view style="color:black;font-size:16px">付款方式</view>
<view style="color:black;font-size:32rpx">付款方式</view>
</view> </view>
<view class="flex flex-justify" style="height:80rpx" data-index="1" bindtap="checkMode"> <view class="flex flex-justify" style="height:80rpx" data-index="1" bindtap="checkMode">
<view class="flex align-end"> <view class="flex align-end">
<text style="font-size:14px">预付定金</text>
<text style="font-size:28rpx">预付定金</text>
<text class="offer-hint" style="margin-left:10rpx">预付款10%,余款货到付款</text> <text class="offer-hint" style="margin-left:10rpx">预付款10%,余款货到付款</text>
</view> </view>
<text class="cuIcon-{{form.payType==1?'roundcheckfill':'roundcheck'}} text-{{form.payType==1?'blue':'grey'}}" style="font-size:18px"></text>
<text class="cuIcon-{{form.payType==1?'roundcheckfill':'roundcheck'}} text-{{form.payType==1?'blue':'grey'}}" style="font-size:36rpx"></text>
</view> </view>
<view class="flex flex-justify" style="height:80rpx" data-index="2" bindtap="checkMode"> <view class="flex flex-justify" style="height:80rpx" data-index="2" bindtap="checkMode">
<view style="font-size:14px">货到付款</view>
<text class="cuIcon-{{form.payType==2?'roundcheckfill':'roundcheck'}} text-{{form.payType==2?'blue':'grey'}}" style="font-size:18px"></text>
<view style="font-size:28rpx">货到付款</view>
<text class="cuIcon-{{form.payType==2?'roundcheckfill':'roundcheck'}} text-{{form.payType==2?'blue':'grey'}}" style="font-size:36rpx"></text>
</view> </view>
</view> </view>
@ -83,14 +83,14 @@
<view style="height:120rpx"></view> <view style="height:120rpx"></view>
<view class="cu-bar bg-white foot flex flex-justify" style="height:120rpx;box-shadow: 0 0rpx 0rpx rgba(0, 0, 0, 0);padding:32rpx">
<view class="cu-bar bg-white foot flex flex-justify" style="height:{{isIPhoneX?154:120}}rpx;padding:32rpx;padding-bottom:{{isIPhoneX?66:32}}rpx">
<button class="action" open-type="contact" style="background-color: #fff;border-radius: 0;margin-left:-20rpx"> <button class="action" open-type="contact" style="background-color: #fff;border-radius: 0;margin-left:-20rpx">
<image style="width:48rpx;height:48rpx" src="/assets/image/icon_kefu.png"></image> <image style="width:48rpx;height:48rpx" src="/assets/image/icon_kefu.png"></image>
</button> </button>
<view class="flex align-end"> <view class="flex align-end">
<!-- <view class="text-gray" style="font-size:12px">共{{form.number}}{{form.unit}}</view> --> <!-- <view class="text-gray" style="font-size:12px">共{{form.number}}{{form.unit}}</view> -->
<view class="text-black" style="font-size:14px;margin-left:24rpx">合计:</view>
<view class="text-blue" style="font-size:14px">¥{{form.totalPrice}}</view>
<view class="text-black" style="font-size:32rpx;margin-left:24rpx">合计:</view>
<view class="text-blue" style="font-size:32rpx">¥{{form.totalPrice}}</view>
<button class="cu-btn offer-btn" bindtap="offerProject">立即购买</button> <button class="cu-btn offer-btn" bindtap="offerProject">立即购买</button>
</view> </view>
</view> </view>

12
pages/mall/order-offer/index.wxss

@ -17,7 +17,7 @@
} }
.offer-label { .offer-label {
font-size: 12px;
font-size: 24rpx;
font-family: PingFang-SC-Regular, PingFang-SC; font-family: PingFang-SC-Regular, PingFang-SC;
font-weight: 400; font-weight: 400;
color: rgba(208, 208, 208, 1); color: rgba(208, 208, 208, 1);
@ -25,7 +25,7 @@
} }
.offer-val { .offer-val {
font-size: 12px;
font-size: 24rpx;
font-family: PingFang-SC-Regular, PingFang-SC; font-family: PingFang-SC-Regular, PingFang-SC;
font-weight: 400; font-weight: 400;
color: rgba(208, 208, 208, 1); color: rgba(208, 208, 208, 1);
@ -38,7 +38,7 @@
} }
.page-name { .page-name {
font-size: 16px;
font-size: 32rpx;
font-family: PingFang-SC-Medium, PingFang-SC; font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500; font-weight: 500;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
@ -47,14 +47,14 @@
.page-num { .page-num {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 10px;
font-size: 20rpx;
font-family: PingFang-SC-Regular, PingFang-SC; font-family: PingFang-SC-Regular, PingFang-SC;
font-weight: 400; font-weight: 400;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
} }
.offer-hint { .offer-hint {
font-size: 12px;
font-size: 24rpx;
font-family: PingFang-SC-Regular, PingFang-SC; font-family: PingFang-SC-Regular, PingFang-SC;
font-weight: 400; font-weight: 400;
color: rgba(208, 208, 208, 1); color: rgba(208, 208, 208, 1);
@ -86,7 +86,7 @@ button::after {
.page-outline { .page-outline {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 10px;
font-size: 20rpx;
font-family: PingFang-SC-Regular, PingFang-SC; font-family: PingFang-SC-Regular, PingFang-SC;
font-weight: 400; font-weight: 400;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);

2
pages/mall/order-result/index.wxml

@ -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" />

14
pages/mall/page-list/index.wxss

@ -15,7 +15,7 @@
} }
.page-name { .page-name {
font-size: 16px;
font-size: 32rpx;
font-family: PingFang-SC-Medium, PingFang-SC; font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500; font-weight: 500;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
@ -24,7 +24,7 @@
.page-num { .page-num {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 10px;
font-size: 20rpx;
font-family: PingFang-SC-Regular, PingFang-SC; font-family: PingFang-SC-Regular, PingFang-SC;
font-weight: 400; font-weight: 400;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
@ -32,7 +32,7 @@
.page-outline { .page-outline {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 10px;
font-size: 20rpx;
font-family: PingFang-SC-Regular, PingFang-SC; font-family: PingFang-SC-Regular, PingFang-SC;
font-weight: 400; font-weight: 400;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
@ -47,7 +47,7 @@
.page-summary { .page-summary {
margin-top: 8rpx; margin-top: 8rpx;
font-size: 10px;
font-size: 20rpx;
font-family: PingFang-SC-Regular, PingFang-SC; font-family: PingFang-SC-Regular, PingFang-SC;
font-weight: 400; font-weight: 400;
color: rgba(51, 51, 51, 1); color: rgba(51, 51, 51, 1);
@ -65,18 +65,18 @@
background: rgba(255, 66, 43, 1); background: rgba(255, 66, 43, 1);
box-shadow: 0px 4px 14px -6px rgba(255, 43, 45, 0.8); box-shadow: 0px 4px 14px -6px rgba(255, 43, 45, 0.8);
color: white; color: white;
font-size: 12px;
font-size: 24rpx;
} }
.page-price { .page-price {
font-size: 16px;
font-size: 32rpx;
font-family: DINAlternate-Bold, DINAlternate; font-family: DINAlternate-Bold, DINAlternate;
font-weight: bold; font-weight: bold;
color: rgba(255, 66, 43, 1); color: rgba(255, 66, 43, 1);
} }
.page-stock { .page-stock {
font-size: 10px;
font-size: 20rpx;
font-family: PingFang-SC-Regular, PingFang-SC; font-family: PingFang-SC-Regular, PingFang-SC;
font-weight: 400; font-weight: 400;
color: rgba(153, 153, 153, 1); color: rgba(153, 153, 153, 1);

8
pages/mall/shops/index.wxml

@ -1,11 +1,11 @@
<!--pages/message/index.wxml--> <!--pages/message/index.wxml-->
<cu-custom bgColor="bg-white" isBack="{{false}}"> <cu-custom bgColor="bg-white" isBack="{{false}}">
<view slot="content" style="color:black;font-size:18px">原纸商城</view>
<view slot="content" style="color:black;font-size:36rpx">原纸商城</view>
</cu-custom> </cu-custom>
<view class="cu-bar bg-white search fixed" style="top:{{CustomBar}}px;"> <view class="cu-bar bg-white search fixed" style="top:{{CustomBar}}px;">
<view class="search-form" style="border-radius: 12rpx" bindtap="searchList"> <view class="search-form" style="border-radius: 12rpx" bindtap="searchList">
<text class="cuIcon-search"></text>
<text class="cuIcon-search" style="font-size:26rpx"></text>
<input type="text" disabled="true" placeholder="请输入要搜索的商品" confirm-type="search"></input> <input type="text" disabled="true" placeholder="请输入要搜索的商品" confirm-type="search"></input>
</view> </view>
</view> </view>
@ -106,7 +106,7 @@
<view wx:if="{{cheapList.length}}"> <view wx:if="{{cheapList.length}}">
<view class="flex nav-li"> <view class="flex nav-li">
<view class="shadow">特价</view> <view class="shadow">特价</view>
<view style="font-size:18px;color:white">专区</view>
<view style="font-size:36rpx;color:white">专区</view>
<view class="v-driver"></view> <view class="v-driver"></view>
<view class="nav-title">限时限量 售完即止</view> <view class="nav-title">限时限量 售完即止</view>
</view> </view>
@ -115,7 +115,7 @@
<view wx:if="{{taskList.length}}"> <view wx:if="{{taskList.length}}">
<view class="flex nav-li"> <view class="flex nav-li">
<view class="shadow">团购</view> <view class="shadow">团购</view>
<view style="font-size:18px;color:white">专区</view>
<view style="font-size:36rpx;color:white">专区</view>
<view class="v-driver"></view> <view class="v-driver"></view>
<view class="nav-title">大厂品牌 质量保证</view> <view class="nav-title">大厂品牌 质量保证</view>
</view> </view>

Loading…
Cancel
Save