倪静楠 / huarunwj · 提交

转到一个项目

作者 倪静楠
提交 30edc592305d30733c3fbfbc5c60bc96bf62a0e9 1 个父辈 b7750d2a

20201218

内嵌 并排对比
正在显示 41 个修改的文件 包含 256 行增加 和 97 行删除
... ... @@ -35,8 +35,21 @@ App({
},
//获取屏幕高度
globalData: {
userInfo: null
}
onShow: function () {
let that = this;
wx.getSystemInfo({
success: res => {
console.log('手机信息res' + res.model)
let modelmes = res.model;
if (modelmes.search('iPhone X') != -1) {
that.globalData.isIphoneX = true
}
}
})
wx.setStorageSync('ipone', that.globalData.isIphoneX)
},
globalData: {
userInfo: null,
isIphoneX: false,
}
})
\ No newline at end of file
... ...
... ... @@ -43,9 +43,9 @@
},
"style": "v2",
"sitemapLocation": "sitemap.json",
"selectedColor": "#355DFF",
"tabBar": {
"borderStyle": "white",
"selectedColor": "#125af7",
"list": [
{
"pagePath": "pages/home/home",
... ...
... ... @@ -5,3 +5,6 @@ page{
overflow-x: hidden;
background-color: #f1f2f4;
}
#bottom40{
padding-bottom: 40rpx;
}
\ No newline at end of file
... ...
// pages/affirm-order/affirm-order.js
let method = require("../../utils/reuqest.js");
const util = require("../../utils/util.js");
const App=getApp();
Page({
data: {
iphone:'',
userData: "", //收货地址
id: '', //收货地址id
goodsData: '', //商品信息
... ... @@ -293,7 +295,8 @@ Page({
}, 3000),
onLoad: function (options) {
this.setData({
addressId: options.id
addressId: options.id,
iphone: App.globalData.isIphoneX
})
let carts = wx.getStorageSync('carts')
this.setData({
... ...
... ... @@ -89,7 +89,7 @@
</view>
</view>
<!-- 立即购买 -->
<view class="bottomBox">
<view class="{{iphone?'bottomBox1':'bottomBox'}}">
<view class="bottomLeft">
<view class="text">合计:</view>
<view class="priceBox">
... ...
... ... @@ -409,17 +409,30 @@ textarea {
/* 底部 */
.bottomBox {
width: 750rpx;
height: 160rpx;
background-color: #ffffff;
position: fixed;
bottom: 0;
left: 0;
margin-top: 40rpx;
padding: 0 32rpx;
box-sizing: border-box;
display: flex;
justify-content: space-between;
align-items: center;
padding: 32rpx;
}
.bottomBox1 {
width: 750rpx;
background-color: #ffffff;
position: fixed;
bottom: 0;
left: 0;
margin-top: 40rpx;
box-sizing: border-box;
display: flex;
justify-content: space-between;
align-items: center;
padding: 32rpx;
padding-bottom: 44rpx;
}
.bottomBox .text {
... ...
... ... @@ -20,6 +20,13 @@ Page({
this.setData({
list: data.data
})
let list = this.data.list;
list.forEach((item, index) => {
item.wxName = item.wxName.substring(0, 1) + '***' + item.wxName.substring(item.wxName.length - 1)
})
this.setData({
list: list
})
}
})
},
... ...
... ... @@ -2,8 +2,10 @@
let method = require("../../utils/reuqest.js");
const util = require("../../utils/util.js");
const ary = [];
const App = getApp()
Page({
data: {
iphone: '',
id: '', //订单号
orderId: '',
// list: [],
... ... @@ -172,7 +174,8 @@ Page({
},
onLoad: function (options) {
this.setData({
orderId: options.orderid
orderId: options.orderid,
iphone: App.globalData.isIphoneX
})
let that = this;
that.orderDetail()
... ...
... ... @@ -82,14 +82,14 @@
</view>
<view class="photoOne" wx:for="{{imgs}}" data-index="{{index}}">
<image src="{{item}}" mode="aspectFill"></image>
<view class="delBox" bindtap="delPic">
<view class="delBox" bindtap="delPic" data-index="{{index}}">
<image src="/images/05-06/chaIcon.png" mode="aspectFill"></image>
</view>
</view>>
</view>
</view>
</view>
<!-- buttom -->
<view class="applyBox">
<view class="applyBox" id="{{iphone?'bottom40':''}}">
<view class="applyBtn" bindtap="refund">申请退款</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -40,13 +40,13 @@ margin-right: 16rpx;
.pic {
width: 180rpx;
height: 180rpx;
background-color: blanchedalmond;
margin-right: 24rpx;
}
.pic image {
width: 180rpx;
height: 180rpx;
border-radius: 16rpx;
}
.text {
... ... @@ -60,6 +60,10 @@ margin-right: 16rpx;
text-align: left;
color: #333333;
margin-bottom: 16rpx;
max-width: 430rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.detail,
... ... @@ -68,8 +72,12 @@ margin-right: 16rpx;
font-weight: 400;
text-align: left;
color: #999999;
margin-bottom: 16rpx;
margin-bottom: 60rpx;
display: flex;
max-width: 430rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.price {
... ... @@ -246,8 +254,9 @@ textarea {
top: 0;
right: 0;
box-sizing: border-box;
text-align: center;
vertical-align: middle;
display: flex;
align-items: center;
justify-content: center;
}
.delBox image {
... ...
// pages/affirm-order/affirm-order.js
let method = require("../../utils/reuqest.js");
const util = require("../../utils/util.js");
const App=getApp();
Page({
data: {
iphone:'',
orderId: '', //订单Id
userData: "", //地址
addressId: '',
... ... @@ -263,11 +265,13 @@ Page({
})
},
onLoad: function (options) {
this.setData({
iphone: App.globalData.isIphoneX
})
wx.setStorageSync('type', "")
console.log(wx.getStorageSync('sendTime').substring(12, 23), 'sendtime')
let sendTime = wx.getStorageSync('sendTime')
if (sendTime !== '') {
console.log('jshjxhh5555')
this.setData({
deliveryTime: sendTime.substring(0, 12),
timers: sendTime.substring(12, 23)
... ...
... ... @@ -89,7 +89,7 @@
</view>
</view>
<!-- 立即购买 -->
<view class="bottomBox">
<view class="bottomBox" id="{{iphone?'bottom40':''}}">
<view class="bottomLeft">
<view class="text">合计:</view>
<view class="priceBox">
... ...
... ... @@ -4,7 +4,7 @@
width: 750rpx;
background-color: #f1f2f4;
box-sizing: border-box;
margin-bottom: 130rpx;
margin-bottom: 182rpx;
padding-bottom: 26rpx;
}
... ... @@ -375,13 +375,12 @@ textarea {
/* 底部 */
.bottomBox {
width: 750rpx;
height: 160rpx;
background-color: #ffffff;
position: fixed;
bottom: 0;
left: 0;
margin-top: 40rpx;
padding: 0 32rpx;
padding: 32rpx;
box-sizing: border-box;
display: flex;
justify-content: space-between;
... ...
... ... @@ -2,8 +2,10 @@
let method = require("../../utils/reuqest.js");
const util = require("../../utils/util.js");
const ary = [];
const App=getApp();
Page({
data: {
iphone:'',
imgs: [],
list: [],
postData: [], //商品信息
... ... @@ -204,7 +206,8 @@ Page({
onLoad: function (options) {
this.getList(options.orderid)
this.setData({
orderId: options.orderid
orderId: options.orderid,
iphone: App.globalData.isIphoneX
})
},
... ...
... ... @@ -32,7 +32,7 @@
</view>
<view class="photoOne" wx:for="{{imgs}}" data-index="{{index}}">
<image src="{{item}}"></image>
<view class="delBox" bindtap="delPic">
<view class="delBox" bindtap="delPic" data-index="{{index}}">
<image src="/images/05-06/chaIcon.png"></image>
</view>
</view>
... ... @@ -40,7 +40,7 @@
</view>
<!-- bottom -->
<view class="btnBox" bindtap="submit">
<view class="btnBox" bindtap="submit" id="{{iphone?'bottom40':''}}">
<view class="btn">
提交
</view>
... ...
/* pages/evaluate/evaluate.wxss */
page{
page {
background-color: #f1f2f4;
padding-top: 24rpx;
}
... ... @@ -35,22 +35,28 @@ page{
}
.name {
width: 320rpx;
font-size: 28rpx;
font-weight: 500;
text-align: left;
color: #333333;
margin-bottom: 8rpx;
margin-top: 4rpx;
max-width: 430rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.detail {
width: 314rpx;
font-size: 24rpx;
font-weight: 400;
text-align: left;
color: #999999;
margin-bottom: 8rpx;
max-width: 430rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.price {
... ... @@ -234,8 +240,9 @@ textarea {
top: 0;
right: 0;
box-sizing: border-box;
text-align: center;
vertical-align: middle;
display: flex;
align-items: center;
justify-content: center;
}
.delBox image {
... ... @@ -248,7 +255,7 @@ textarea {
width: 686rpx;
height: 104rpx;
margin: 0 auto;
margin-top:104rpx;
margin-top: 104rpx;
background-color: #ffffff;
display: flex;
justify-content: left;
... ... @@ -294,5 +301,3 @@ textarea {
background: linear-gradient(270deg, #fb7900 -100%, #ff4903);
border-radius: 44rpx;
}
\ No newline at end of file
... ...
... ... @@ -121,7 +121,7 @@
<view class="mainlyTitle">{{nameData.label}}</view>
</view>
<view style="display: flex; align-items: center;">
<view style="display: flex; align-items: center;">
<view style="display: flex;">
<view bindtap="moreMainly" class="moreMainly">查看更多</view>
<view class="arrow" bindtap="moreMainly">
<image src="/images/01-03/icon_more@2x.png"></image>
... ...
... ... @@ -355,6 +355,9 @@ page {
.countNum .num {
width: 150rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.countNum .icon {
... ...
// pages/idea-feedback/idea-feedback.js
let method = require("../../utils/reuqest.js")
var ary = [];
const App = getApp();
Page({
data: {
iphone: '',
length: 0,
maxlength: 100,
content: '',
... ... @@ -187,7 +189,9 @@ Page({
},
onLoad: function (options) {
this.setData({
iphone: App.globalData.isIphoneX
})
},
/**
... ...
... ... @@ -36,6 +36,6 @@
</van-cell-group>
</view>
</view>
<view class="btnBox">
<view class="btnBox" id="{{iphone?'bottom40':''}}">
<view class="btn" bindtap="submit">提交</view>
</view>
\ No newline at end of file
... ...
... ... @@ -86,8 +86,9 @@ textarea {
top: 0;
right: 0;
box-sizing: border-box;
text-align: center;
vertical-align: middle;
display: flex;
align-items: center;
justify-content: center;
}
.delBox image {
... ... @@ -97,7 +98,6 @@ textarea {
.btnBox {
width: 100%;
height: 160rpx;
background: #fff;
position: absolute;
bottom: 0;
... ... @@ -105,6 +105,7 @@ textarea {
display: flex;
align-items: center;
justify-content: center;
padding: 30rpx 0;
}
.btn {
... ...
// pages/affirm-order/affirm-order.js
let method = require("../../utils/reuqest.js");
const util = require("../../utils/util.js");
const App=getApp();
Page({
data: {
iphone:'',
showTime: false, //配送时间
storePickupTime: '',
userData: "",
... ... @@ -248,6 +250,9 @@ Page({
},
onLoad: function (options) {
this.setData({
iphone: App.globalData.isIphoneX
})
let carts = wx.getStorageSync('carts')
let defaultSku = wx.getStorageSync('defaultSku')
if (defaultSku) {
... ...
... ... @@ -88,7 +88,7 @@
</view>
</view>
<!-- 立即购买 -->
<view class="bottomBox">
<view class="bottomBox" id="{{iphone?'bottom40':''}}">
<view class="bottomLeft">
<view class="text">合计:</view>
<view class="priceBox">
... ...
// pages/look-logistics/look-logistics.js
let method = require("../../utils/reuqest.js")
let list = [];
const App=getApp()
Page({
data: {
iphone:'',
orderId:'', //订单id
postData: {
name: '泰国桃子',
... ... @@ -46,6 +48,9 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({
iphone: App.globalData.isIphoneX
})
let list1=this.data.list;
let dataVoList1 = this.data.dataVoList;
let steps=this.data.steps;
... ...
... ... @@ -15,7 +15,7 @@
<!-- 地址 -->
<view class="addressBox">
<view class="top">
<view>{{postData.receiverName}}</view>
<view class="topOne">{{postData.receiverName}}</view>
<view>{{postData.receiverPhone}}</view>
</view>
<view class="bottom">{{postData.receiverDetailAddress}}</view>
... ... @@ -47,7 +47,7 @@
</van-steps>
</view>
<!-- bottom -->
<view class="bottomBox" bindtap="refund">
<view class="bottomBox" bindtap="refund" id="{{iphone?'bottom40':''}}">
<view class="btn">申请退款</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -4,7 +4,6 @@ page{
}
.container {
width: 750rpx;
height: 1000rpx;
background-color: #f1f2f4;
padding-top: 24rpx;
padding-bottom: 160rpx;
... ... @@ -41,22 +40,28 @@ page{
}
.name {
width: 320rpx;
max-width: 420rpx;
font-size: 28rpx;
font-weight: 500;
text-align: left;
color: #333333;
margin-bottom: 8rpx;
margin-top: 4rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.detail {
width: 314rpx;
max-width: 420rpx;
font-size: 24rpx;
font-weight: 400;
text-align: left;
color: #999999;
margin-bottom: 8rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.price {
... ... @@ -100,8 +105,13 @@ page{
margin-bottom: 16rpx;
}
.top>view {
margin-right: 20rpx;
.topOne{
max-width: 480rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding-right: 20rpx;
box-sizing: border-box;
}
.bottom {
... ... @@ -171,12 +181,13 @@ page{
/* bottom */
.bottomBox {
width: 750rpx;
height: 120rpx;
position: fixed;
z-index: 9;
bottom: 0;
left: 0;
background-color: #ffffff;
padding: 20rpx 0;
display: flex;
}
.btn {
... ...
... ... @@ -21,7 +21,7 @@
<view class="pickDesc">{{item.goodsAttributes}}</view>
<view class="collectIcon">
<view style="height:10rpx;display:none"></view>
<view style="display:inline-block;font-size: 28rpx; padding: 10rpx 0;">
<view style="display:inline-block;font-size: 28rpx;">
<text class="moneyIcon">￥</text>
<text class="moneyNum">{{item.goodsPrice}}</text></view>
</view>
... ...
/* pages/searchRequest/searchRequest.wxss */
/* 搜索 */
/* 搜索框 */
page{
page {
background-color: #f1f2f4;
}
.search_center {
height: 90rpx;
width: 750rpx;
... ... @@ -51,6 +52,7 @@ page{
white-space: nowrap;
background: #ffffff;
}
.search_right {
width: 66rpx;
height: 64rpx;
... ... @@ -64,10 +66,12 @@ page{
display: flex;
align-items: center;
}
.search_right image {
width: 36rpx;
height: 36rpx;
}
.placeholder {
font-size: 28rpx;
font-family: PingFang SC;
... ... @@ -75,6 +79,7 @@ page{
line-height: 64rpx;
color: rgba(189, 196, 206, 1);
}
.search_right {
width: 104rpx;
height: 48rpx;
... ... @@ -89,32 +94,37 @@ page{
right: 8rpx;
cursor: progress;
}
/* 商品列表 */
.productList{
.productList {
width: 750rpx;
height:750rpx;
height: 750rpx;
display: flex;
justify-content: center;
align-items: center;
font-size: 32rpx;
color: rgb(206, 208, 209);
}
.listBox{
.listBox {
display: flex;
padding: 0 26rpx;
box-sizing: border-box;
}
/* 每日精选*/
.moneyIcon{
font-size: 23rpx;
.moneyIcon {
font-size: 24rpx;
color: #FF1717;
margin-right: -4rpx;
}
.moneyNum{
.moneyNum {
font-size: 28rpx;
font-weight: 500;
color: #FF1717;
}
.pickContainer {
display: flex;
justify-content: space-between;
... ... @@ -151,7 +161,7 @@ page{
.pickPic image {
width: 100%;
height: 328rpx;
border-radius: 16rpx;
border-radius: 16rpx 16rpx 0 0;
}
.pickTitle {
... ... @@ -159,7 +169,11 @@ page{
font-size: 28rpx;
font-weight: 500;
color: #323233;
padding-left: 8rpx;
padding: 0 24rpx;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
box-sizing: border-box;
}
... ... @@ -169,11 +183,13 @@ page{
text-align: left;
color: #7d7e80;
margin-top: 8rpx;
padding-left: 8rpx;
padding-right: 16rpx;
padding: 0 24rpx;
box-sizing: border-box;
width: 310rpx;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding-top: 4rpx;
}
.pickCollect {
... ... @@ -188,22 +204,29 @@ page{
display: flex;
justify-content: space-between;
}
.collectIcon {
font-size: 24rpx;
color: #ff4742;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 24rpx;
width: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.collectIcon>view {
margin-left: 8rpx;
margin-top: 6rpx;
}
.bottomHint {
background-color: #f1f2f4;
font-size: 24rpx;
color: gray;
display: flex;
justify-content: center;
padding-bottom:16rpx;
padding-bottom: 16rpx;
}
\ No newline at end of file
... ...
... ... @@ -2,8 +2,7 @@
<view class="topLine">
</view>
<!-- 领取会员卡 -->
<!-- <view class="getCard" wx:if="{{noVip}}" > -->
<view class="getCard" wx:if="{{fasle}}" >
<view class="getCard" wx:if="{{noVip}}" >
<view class="title">
{{postData.title}}
</view>
... ... @@ -23,8 +22,7 @@
</view>
</view>
<!-- 会员卡详情 -->
<view class="cardDetail" wx:if="{{true}}">
<!-- <view class="cardDetail" wx:if="{{vip}}"> -->
<view class="cardDetail" wx:if="{{vip}}">
<image src="/images/card.png" ></image>
<!-- content -->
<view class="cardBox1">
... ...
... ... @@ -51,7 +51,7 @@ page {
/* bottom */
.btn {
position: absolute;
bottom: 62rpx;
bottom: 42rpx;
left: 64rpx;
width: 622rpx;
height: 88rpx;
... ... @@ -167,7 +167,7 @@ page {
width: 622rpx;
height: 88rpx;
position: absolute;
bottom: 62rpx;
bottom: 42rpx;
left: 64rpx;
background-color: #ffc644;
font-size: 32rpx;
... ...
// pages/order-detail/order-detail.js
let method = require("../../utils/reuqest.js")
const App = getApp()
Page({
data: {
iphone: '',
flag: false, //判断是否为退款订单
refoundStatus: '', //退款状态
goodsId: '',
... ... @@ -63,6 +65,9 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
this.setData({
iphone: App.globalData.isIphoneX
})
let orderId = options.orderId
if (options.flag) {
this.setData({
... ...
... ... @@ -10,15 +10,18 @@
</view>
<!-- 地址 -->
<view class="address">
<view style="display: flex;align-items: center;">
<view class="userName">{{requestData.receiverName}}</view>
<view class="userTell">{{requestData.receiverPhone}}</view>
<view class="default">默认</view>
</view>
<view class="userAddress">{{requestData.receiverDetailAddress}}</view>
</view>
<!-- 商品列表 -->
<view class="cartList">
<!-- <view class="cartListItem" wx:for="{{list}}" bindtap="goGoodsDetail" data-id="{{item.goodsId}}"> -->
<view class="cartListItem" wx:for="{{requestData.listGoodsVoList}}" bindtap="goGoodsDetail" data-id="{{item.goodsId}}">
<view class="cartListItem" wx:for="{{requestData.listGoodsVoList}}" bindtap="goGoodsDetail"
data-id="{{item.goodsId}}">
<view class="itemRight">
<view class="productPic">
<image src="{{item.goodsPic}}" mode="aspectFill"></image>
... ... @@ -88,13 +91,14 @@
<view class="mainMoney innerPublic">
<view class="title ">商品总额 :</view>
<view class="content">
<view class="icon">￥</view>
<view>{{requestData.payAmount}}</view>
<text class="icon">￥</text>
<text>{{requestData.payAmount}}</text>
<text wx:if="{{addZero}}">.00</text>
</view>
</view>
</view>
<!-- 再次购买 -->
<view class="bottomBox">
<view class="bottomBox" id="{{iphone?'bottom40':''}}">
<view bindtap="buyAgain">再次购买</view>
</view>
</view>
\ No newline at end of file
... ...
... ... @@ -190,7 +190,6 @@ page {
.productPic {
width: 180rpx;
height: 180rpx;
background-color: azure;
margin-right: 24rpx;
}
... ... @@ -201,7 +200,6 @@ page {
}
.productName {
width: 320rpx;
height: 40rpx;
font-size: 28rpx;
font-weight: 500;
... ... @@ -209,16 +207,23 @@ page {
color: #333333;
line-height: 40rpx;
margin-bottom: 8rpx;
max-width: 420rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.productDetail {
width: 304rpx;
max-width: 420rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 24rpx;
font-weight: 400;
text-align: left;
color: #999999;
line-height: 36rpx;
margin-bottom: 40rpx;
margin-bottom: 54rpx;
}
.productPrice {
... ... @@ -430,13 +435,12 @@ textarea {
}
.content .icon {
margin-right: -2rpx;
margin-right: -4rpx;
}
/* bottom */
.bottomBox {
width: 750rpx;
height: 160rpx;
position: fixed;
bottom: 0;
left: 0;
... ... @@ -446,6 +450,7 @@ textarea {
display: flex;
align-items: center;
flex-direction: row-reverse;
padding: 30rpx;
}
.bottomBox>view {
... ...
// pages/product-detail/product-detail.js
let method = require("../../utils/reuqest.js");
const util = require("../../utils/util.js");
const App = getApp();
Page({
data: {
iphone: '', //手机型号
Authorization: '', //判断用户是否登录
id: '',
skuId: '',
goodsId: '',
swiperArray: [], //商品轮播图
countDownShow: '', //判断限时优惠商品
addZero:true, //商品价格补零
addZero: true, //商品价格补零
time: '', //倒计时
timeData: '',
hour: "",
... ... @@ -134,7 +136,7 @@ Page({
Number.isInteger(obj);
if (!Number.isInteger(obj)) {
this.setData({
addZero:false
addZero: false
})
}
},
... ... @@ -151,6 +153,13 @@ Page({
pingjiaNum: data.total,
infoList: data.data
})
let list = this.data.infoList;
list.forEach((item, index) => {
item.wxName=item.wxName.substring(0,1)+'***'+item.wxName.substring(item.wxName.length-1)
})
this.setData({
infoList:list
})
}
})
},
... ... @@ -497,7 +506,8 @@ Page({
let goodsId = wx.getStorageSync('goodsId');
let url = wx.getStorageSync('url')
this.setData({
id: options.id
id: options.id,
iphone: App.globalData.isIphoneX
})
//请求商品信息
if (options.id) {
... ... @@ -534,7 +544,8 @@ Page({
})
} else {
this.setData({
Authorization: true
Authorization: true,
// ipone:wx.getStorageSync('ipone')
})
}
},
... ...
... ... @@ -76,7 +76,7 @@
<view class="userImg" style="display:inline-block" wx:if="{{item.anonymous==1}}">
<image src="/images/nimingtouxiang.png" mode="aspectFill"> </image>
</view>
<view class="userName" style="display:inline-block" >{{item.wxName}}</view>
<view class="userName" style="display:inline-block">{{item.wxName}}</view>
</view>
<view class="evaluateDetails">{{item.content}}</view>
<view class="evaluatePic" wx:if="{{item.images}}">
... ... @@ -107,7 +107,7 @@
<van-goods-action-button type="danger" text="立即购买" />
</van-goods-action>
</view> -->
<view class="bottom">
<view class="{{iphone?'bottom1':'bottom'}}">
<view class="bottom_left">
<view class="bottom_left_item" catchtap="myKefu">
<image src="/images/01-03/kefu.png"></image>
... ... @@ -123,10 +123,6 @@
<image src='{{goodsData.keep==false?"/images/01-03/unshoucang.png":"/images/01-03/shoucang.png"}}'></image>
<view class="collecttext">{{goodsData.keep==false?"收藏":"已收藏"}}</view>
</view>
<!-- <view wx:if="{{goodsData.keep==true}}">
<image src="/images/01-03/shoucang.png"></image>
<view>已收藏</view>
</view> -->
</view>
</view>
<view class="bottom_right" wx:if="{{goodsData.type==2}}">
... ... @@ -149,7 +145,7 @@
</view>
<!-- 加入购物车弹框 -->
<view class="mask" catchtap="closeMask" wx:if='{{showMask}}'>
<view class="diceng" catchtap="openMask">
<view class="diceng" catchtap="openMask" id="{{iphone?'bottom40':''}}">
<view class="info">
<image src="{{goodsData.goodsBanners[0]}}"></image>
<view class="info_right">
... ... @@ -184,7 +180,7 @@
</view>
<!-- 立即购买弹框 -->
<view class="mask" catchtap="closeMaskTwo" wx:if='{{showMaskTwo}}'>
<view class="diceng" catchtap="openMask">
<view class="diceng" catchtap="openMask" id="{{iphone?'bottom40':''}}">
<view class="info">
<image src="{{goodsData.goodsBanners[0]}}"></image>
<view class="info_right">
... ...
... ... @@ -410,6 +410,18 @@ button {
padding-bottom: 16rpx;
padding-top: 16rpx;
}
.bottom1 {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
height: 100rpx;
background: #fff;
display: flex;
justify-content: space-between;
padding-bottom:40rpx;
padding-top: 16rpx;
}
.bottom_left {
width: calc(100% - 420rpx);
... ... @@ -783,7 +795,6 @@ button {
box-sizing: border-box;
max-height: 94%;
overflow-y: auto;
padding-bottom: 60rpx;
}
.info {
... ...
... ... @@ -5,7 +5,7 @@ page{
.container{
width: 750rpx;
padding-top: 24rpx;
padding-bottom: 24rpx;
box-sizing: border-box;
}
.contentBox{
... ...
// pages/select-address/select-address.js
let method = require("../../utils/reuqest.js")
const App = getApp();
Page({
data: {
iphone:'',
default: true, //默认地址
defaultType: '',
list: [],
... ... @@ -103,7 +105,8 @@ Page({
},
onLoad: function (options) {
this.setData({
edit:options.edit
edit:options.edit,
iphone: App.globalData.isIphoneX
})
this.getAddressList();
... ...
... ... @@ -94,7 +94,7 @@
</view>
</view> -->
<!-- 新增地址 -->
<view class="bottom">
<view class="{{iphone?'bottom1':'bottom'}}">
<view class="addAdress" bindtap="addAddress">
新增地址
</view>
... ...
... ... @@ -188,7 +188,16 @@ page {
bottom: 0;
left: 0;
background-color: #fff;
padding: 38rpx 0;
padding: 32rpx 0;
}
.bottom1{
width: 750rpx;
position: fixed;
bottom: 0;
left: 0;
background-color: #fff;
padding: 32rpx 0;
padding-bottom: 40rpx;
}
.addAdress {
... ...
... ... @@ -495,7 +495,7 @@ page {
.cart-list .cart-count-box text {
display: inline-block;
line-height: 44rpx;
line-height: 38rpx;
text-align: center;
}
... ... @@ -510,6 +510,9 @@ page {
width: 86rpx;
background-color: #eeeeee;
font-size: 24rpx;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.cart-del {
... ...