倪静楠 / huarunwj · 提交

转到一个项目

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

20201218

内嵌 并排对比
正在显示 41 个修改的文件 包含 313 行增加 和 154 行删除
@@ -35,8 +35,21 @@ App({ @@ -35,8 +35,21 @@ App({
35 }, 35 },
36 36
37 //获取屏幕高度 37 //获取屏幕高度
38 -  
39 -globalData: {  
40 - userInfo: null  
41 -} 38 + onShow: function () {
  39 + let that = this;
  40 + wx.getSystemInfo({
  41 + success: res => {
  42 + console.log('手机信息res' + res.model)
  43 + let modelmes = res.model;
  44 + if (modelmes.search('iPhone X') != -1) {
  45 + that.globalData.isIphoneX = true
  46 + }
  47 + }
  48 + })
  49 + wx.setStorageSync('ipone', that.globalData.isIphoneX)
  50 + },
  51 + globalData: {
  52 + userInfo: null,
  53 + isIphoneX: false,
  54 + }
42 }) 55 })
@@ -42,10 +42,10 @@ @@ -42,10 +42,10 @@
42 "navigationBarTextStyle": "black" 42 "navigationBarTextStyle": "black"
43 }, 43 },
44 "style": "v2", 44 "style": "v2",
45 - "sitemapLocation": "sitemap.json",  
46 - "selectedColor": "#355DFF", 45 + "sitemapLocation": "sitemap.json",
47 "tabBar": { 46 "tabBar": {
48 "borderStyle": "white", 47 "borderStyle": "white",
  48 + "selectedColor": "#125af7",
49 "list": [ 49 "list": [
50 { 50 {
51 "pagePath": "pages/home/home", 51 "pagePath": "pages/home/home",
@@ -4,4 +4,7 @@ page{ @@ -4,4 +4,7 @@ page{
4 height: 100%; 4 height: 100%;
5 overflow-x: hidden; 5 overflow-x: hidden;
6 background-color: #f1f2f4; 6 background-color: #f1f2f4;
  7 +}
  8 +#bottom40{
  9 + padding-bottom: 40rpx;
7 } 10 }
1 // pages/affirm-order/affirm-order.js 1 // pages/affirm-order/affirm-order.js
2 let method = require("../../utils/reuqest.js"); 2 let method = require("../../utils/reuqest.js");
3 const util = require("../../utils/util.js"); 3 const util = require("../../utils/util.js");
  4 +const App=getApp();
4 Page({ 5 Page({
5 data: { 6 data: {
  7 + iphone:'',
6 userData: "", //收货地址 8 userData: "", //收货地址
7 id: '', //收货地址id 9 id: '', //收货地址id
8 goodsData: '', //商品信息 10 goodsData: '', //商品信息
@@ -293,7 +295,8 @@ Page({ @@ -293,7 +295,8 @@ Page({
293 }, 3000), 295 }, 3000),
294 onLoad: function (options) { 296 onLoad: function (options) {
295 this.setData({ 297 this.setData({
296 - addressId: options.id 298 + addressId: options.id,
  299 + iphone: App.globalData.isIphoneX
297 }) 300 })
298 let carts = wx.getStorageSync('carts') 301 let carts = wx.getStorageSync('carts')
299 this.setData({ 302 this.setData({
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 </view> 89 </view>
90 </view> 90 </view>
91 <!-- 立即购买 --> 91 <!-- 立即购买 -->
92 - <view class="bottomBox"> 92 + <view class="{{iphone?'bottomBox1':'bottomBox'}}">
93 <view class="bottomLeft"> 93 <view class="bottomLeft">
94 <view class="text">合计:</view> 94 <view class="text">合计:</view>
95 <view class="priceBox"> 95 <view class="priceBox">
@@ -409,17 +409,30 @@ textarea { @@ -409,17 +409,30 @@ textarea {
409 /* 底部 */ 409 /* 底部 */
410 .bottomBox { 410 .bottomBox {
411 width: 750rpx; 411 width: 750rpx;
412 - height: 160rpx;  
413 background-color: #ffffff; 412 background-color: #ffffff;
414 position: fixed; 413 position: fixed;
415 bottom: 0; 414 bottom: 0;
416 left: 0; 415 left: 0;
417 margin-top: 40rpx; 416 margin-top: 40rpx;
418 - padding: 0 32rpx;  
419 box-sizing: border-box; 417 box-sizing: border-box;
420 display: flex; 418 display: flex;
421 justify-content: space-between; 419 justify-content: space-between;
422 align-items: center; 420 align-items: center;
  421 + padding: 32rpx;
  422 +}
  423 +.bottomBox1 {
  424 + width: 750rpx;
  425 + background-color: #ffffff;
  426 + position: fixed;
  427 + bottom: 0;
  428 + left: 0;
  429 + margin-top: 40rpx;
  430 + box-sizing: border-box;
  431 + display: flex;
  432 + justify-content: space-between;
  433 + align-items: center;
  434 + padding: 32rpx;
  435 + padding-bottom: 44rpx;
423 } 436 }
424 437
425 .bottomBox .text { 438 .bottomBox .text {
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 let method = require("../../utils/reuqest.js") 2 let method = require("../../utils/reuqest.js")
3 Page({ 3 Page({
4 data: { 4 data: {
5 - list: [], //评价列表 5 + list: [], //评价列表
6 goodsId: '', //商品id 6 goodsId: '', //商品id
7 page: 1, 7 page: 1,
8 bottomHint: false //触底提示 8 bottomHint: false //触底提示
@@ -20,6 +20,13 @@ Page({ @@ -20,6 +20,13 @@ Page({
20 this.setData({ 20 this.setData({
21 list: data.data 21 list: data.data
22 }) 22 })
  23 + let list = this.data.list;
  24 + list.forEach((item, index) => {
  25 + item.wxName = item.wxName.substring(0, 1) + '***' + item.wxName.substring(item.wxName.length - 1)
  26 + })
  27 + this.setData({
  28 + list: list
  29 + })
23 } 30 }
24 }) 31 })
25 }, 32 },
@@ -2,8 +2,10 @@ @@ -2,8 +2,10 @@
2 let method = require("../../utils/reuqest.js"); 2 let method = require("../../utils/reuqest.js");
3 const util = require("../../utils/util.js"); 3 const util = require("../../utils/util.js");
4 const ary = []; 4 const ary = [];
  5 +const App = getApp()
5 Page({ 6 Page({
6 data: { 7 data: {
  8 + iphone: '',
7 id: '', //订单号 9 id: '', //订单号
8 orderId: '', 10 orderId: '',
9 // list: [], 11 // list: [],
@@ -172,7 +174,8 @@ Page({ @@ -172,7 +174,8 @@ Page({
172 }, 174 },
173 onLoad: function (options) { 175 onLoad: function (options) {
174 this.setData({ 176 this.setData({
175 - orderId: options.orderid 177 + orderId: options.orderid,
  178 + iphone: App.globalData.isIphoneX
176 }) 179 })
177 let that = this; 180 let that = this;
178 that.orderDetail() 181 that.orderDetail()
@@ -82,14 +82,14 @@ @@ -82,14 +82,14 @@
82 </view> 82 </view>
83 <view class="photoOne" wx:for="{{imgs}}" data-index="{{index}}"> 83 <view class="photoOne" wx:for="{{imgs}}" data-index="{{index}}">
84 <image src="{{item}}" mode="aspectFill"></image> 84 <image src="{{item}}" mode="aspectFill"></image>
85 - <view class="delBox" bindtap="delPic"> 85 + <view class="delBox" bindtap="delPic" data-index="{{index}}">
86 <image src="/images/05-06/chaIcon.png" mode="aspectFill"></image> 86 <image src="/images/05-06/chaIcon.png" mode="aspectFill"></image>
87 </view> 87 </view>
88 - </view>> 88 + </view>
89 </view> 89 </view>
90 </view> 90 </view>
91 <!-- buttom --> 91 <!-- buttom -->
92 - <view class="applyBox"> 92 + <view class="applyBox" id="{{iphone?'bottom40':''}}">
93 <view class="applyBtn" bindtap="refund">申请退款</view> 93 <view class="applyBtn" bindtap="refund">申请退款</view>
94 </view> 94 </view>
95 </view> 95 </view>
@@ -40,13 +40,13 @@ margin-right: 16rpx; @@ -40,13 +40,13 @@ margin-right: 16rpx;
40 .pic { 40 .pic {
41 width: 180rpx; 41 width: 180rpx;
42 height: 180rpx; 42 height: 180rpx;
43 - background-color: blanchedalmond;  
44 margin-right: 24rpx; 43 margin-right: 24rpx;
45 } 44 }
46 45
47 .pic image { 46 .pic image {
48 width: 180rpx; 47 width: 180rpx;
49 height: 180rpx; 48 height: 180rpx;
  49 + border-radius: 16rpx;
50 } 50 }
51 51
52 .text { 52 .text {
@@ -60,6 +60,10 @@ margin-right: 16rpx; @@ -60,6 +60,10 @@ margin-right: 16rpx;
60 text-align: left; 60 text-align: left;
61 color: #333333; 61 color: #333333;
62 margin-bottom: 16rpx; 62 margin-bottom: 16rpx;
  63 + max-width: 430rpx;
  64 + overflow: hidden;
  65 + text-overflow: ellipsis;
  66 + white-space: nowrap;
63 } 67 }
64 68
65 .detail, 69 .detail,
@@ -68,8 +72,12 @@ margin-right: 16rpx; @@ -68,8 +72,12 @@ margin-right: 16rpx;
68 font-weight: 400; 72 font-weight: 400;
69 text-align: left; 73 text-align: left;
70 color: #999999; 74 color: #999999;
71 - margin-bottom: 16rpx; 75 + margin-bottom: 60rpx;
72 display: flex; 76 display: flex;
  77 + max-width: 430rpx;
  78 + overflow: hidden;
  79 + text-overflow: ellipsis;
  80 + white-space: nowrap;
73 } 81 }
74 82
75 .price { 83 .price {
@@ -246,8 +254,9 @@ textarea { @@ -246,8 +254,9 @@ textarea {
246 top: 0; 254 top: 0;
247 right: 0; 255 right: 0;
248 box-sizing: border-box; 256 box-sizing: border-box;
249 - text-align: center;  
250 - vertical-align: middle; 257 + display: flex;
  258 + align-items: center;
  259 + justify-content: center;
251 } 260 }
252 261
253 .delBox image { 262 .delBox image {
1 // pages/affirm-order/affirm-order.js 1 // pages/affirm-order/affirm-order.js
2 let method = require("../../utils/reuqest.js"); 2 let method = require("../../utils/reuqest.js");
3 const util = require("../../utils/util.js"); 3 const util = require("../../utils/util.js");
  4 +const App=getApp();
4 Page({ 5 Page({
5 data: { 6 data: {
  7 + iphone:'',
6 orderId: '', //订单Id 8 orderId: '', //订单Id
7 userData: "", //地址 9 userData: "", //地址
8 addressId: '', 10 addressId: '',
@@ -263,11 +265,13 @@ Page({ @@ -263,11 +265,13 @@ Page({
263 }) 265 })
264 }, 266 },
265 onLoad: function (options) { 267 onLoad: function (options) {
  268 + this.setData({
  269 + iphone: App.globalData.isIphoneX
  270 + })
266 wx.setStorageSync('type', "") 271 wx.setStorageSync('type', "")
267 console.log(wx.getStorageSync('sendTime').substring(12, 23), 'sendtime') 272 console.log(wx.getStorageSync('sendTime').substring(12, 23), 'sendtime')
268 let sendTime = wx.getStorageSync('sendTime') 273 let sendTime = wx.getStorageSync('sendTime')
269 if (sendTime !== '') { 274 if (sendTime !== '') {
270 - console.log('jshjxhh5555')  
271 this.setData({ 275 this.setData({
272 deliveryTime: sendTime.substring(0, 12), 276 deliveryTime: sendTime.substring(0, 12),
273 timers: sendTime.substring(12, 23) 277 timers: sendTime.substring(12, 23)
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 </view> 89 </view>
90 </view> 90 </view>
91 <!-- 立即购买 --> 91 <!-- 立即购买 -->
92 - <view class="bottomBox"> 92 + <view class="bottomBox" id="{{iphone?'bottom40':''}}">
93 <view class="bottomLeft"> 93 <view class="bottomLeft">
94 <view class="text">合计:</view> 94 <view class="text">合计:</view>
95 <view class="priceBox"> 95 <view class="priceBox">
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 width: 750rpx; 4 width: 750rpx;
5 background-color: #f1f2f4; 5 background-color: #f1f2f4;
6 box-sizing: border-box; 6 box-sizing: border-box;
7 - margin-bottom: 130rpx; 7 + margin-bottom: 182rpx;
8 padding-bottom: 26rpx; 8 padding-bottom: 26rpx;
9 } 9 }
10 10
@@ -375,13 +375,12 @@ textarea { @@ -375,13 +375,12 @@ textarea {
375 /* 底部 */ 375 /* 底部 */
376 .bottomBox { 376 .bottomBox {
377 width: 750rpx; 377 width: 750rpx;
378 - height: 160rpx;  
379 background-color: #ffffff; 378 background-color: #ffffff;
380 position: fixed; 379 position: fixed;
381 bottom: 0; 380 bottom: 0;
382 left: 0; 381 left: 0;
383 margin-top: 40rpx; 382 margin-top: 40rpx;
384 - padding: 0 32rpx; 383 + padding: 32rpx;
385 box-sizing: border-box; 384 box-sizing: border-box;
386 display: flex; 385 display: flex;
387 justify-content: space-between; 386 justify-content: space-between;
@@ -2,8 +2,10 @@ @@ -2,8 +2,10 @@
2 let method = require("../../utils/reuqest.js"); 2 let method = require("../../utils/reuqest.js");
3 const util = require("../../utils/util.js"); 3 const util = require("../../utils/util.js");
4 const ary = []; 4 const ary = [];
  5 +const App=getApp();
5 Page({ 6 Page({
6 data: { 7 data: {
  8 + iphone:'',
7 imgs: [], 9 imgs: [],
8 list: [], 10 list: [],
9 postData: [], //商品信息 11 postData: [], //商品信息
@@ -204,7 +206,8 @@ Page({ @@ -204,7 +206,8 @@ Page({
204 onLoad: function (options) { 206 onLoad: function (options) {
205 this.getList(options.orderid) 207 this.getList(options.orderid)
206 this.setData({ 208 this.setData({
207 - orderId: options.orderid 209 + orderId: options.orderid,
  210 + iphone: App.globalData.isIphoneX
208 }) 211 })
209 }, 212 },
210 213
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 </view> 32 </view>
33 <view class="photoOne" wx:for="{{imgs}}" data-index="{{index}}"> 33 <view class="photoOne" wx:for="{{imgs}}" data-index="{{index}}">
34 <image src="{{item}}"></image> 34 <image src="{{item}}"></image>
35 - <view class="delBox" bindtap="delPic"> 35 + <view class="delBox" bindtap="delPic" data-index="{{index}}">
36 <image src="/images/05-06/chaIcon.png"></image> 36 <image src="/images/05-06/chaIcon.png"></image>
37 </view> 37 </view>
38 </view> 38 </view>
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 </view> 40 </view>
41 41
42 <!-- bottom --> 42 <!-- bottom -->
43 - <view class="btnBox" bindtap="submit"> 43 + <view class="btnBox" bindtap="submit" id="{{iphone?'bottom40':''}}">
44 <view class="btn"> 44 <view class="btn">
45 提交 45 提交
46 </view> 46 </view>
1 /* pages/evaluate/evaluate.wxss */ 1 /* pages/evaluate/evaluate.wxss */
2 -page{ 2 +page {
3 background-color: #f1f2f4; 3 background-color: #f1f2f4;
4 padding-top: 24rpx; 4 padding-top: 24rpx;
5 } 5 }
@@ -35,22 +35,28 @@ page{ @@ -35,22 +35,28 @@ page{
35 } 35 }
36 36
37 .name { 37 .name {
38 - width: 320rpx;  
39 font-size: 28rpx; 38 font-size: 28rpx;
40 font-weight: 500; 39 font-weight: 500;
41 text-align: left; 40 text-align: left;
42 color: #333333; 41 color: #333333;
43 margin-bottom: 8rpx; 42 margin-bottom: 8rpx;
44 margin-top: 4rpx; 43 margin-top: 4rpx;
  44 + max-width: 430rpx;
  45 + overflow: hidden;
  46 + text-overflow: ellipsis;
  47 + white-space: nowrap;
45 } 48 }
46 49
47 .detail { 50 .detail {
48 - width: 314rpx;  
49 font-size: 24rpx; 51 font-size: 24rpx;
50 font-weight: 400; 52 font-weight: 400;
51 text-align: left; 53 text-align: left;
52 color: #999999; 54 color: #999999;
53 margin-bottom: 8rpx; 55 margin-bottom: 8rpx;
  56 + max-width: 430rpx;
  57 + overflow: hidden;
  58 + text-overflow: ellipsis;
  59 + white-space: nowrap;
54 } 60 }
55 61
56 .price { 62 .price {
@@ -234,8 +240,9 @@ textarea { @@ -234,8 +240,9 @@ textarea {
234 top: 0; 240 top: 0;
235 right: 0; 241 right: 0;
236 box-sizing: border-box; 242 box-sizing: border-box;
237 - text-align: center;  
238 - vertical-align: middle; 243 + display: flex;
  244 + align-items: center;
  245 + justify-content: center;
239 } 246 }
240 247
241 .delBox image { 248 .delBox image {
@@ -248,7 +255,7 @@ textarea { @@ -248,7 +255,7 @@ textarea {
248 width: 686rpx; 255 width: 686rpx;
249 height: 104rpx; 256 height: 104rpx;
250 margin: 0 auto; 257 margin: 0 auto;
251 - margin-top:104rpx; 258 + margin-top: 104rpx;
252 background-color: #ffffff; 259 background-color: #ffffff;
253 display: flex; 260 display: flex;
254 justify-content: left; 261 justify-content: left;
@@ -293,6 +300,4 @@ textarea { @@ -293,6 +300,4 @@ textarea {
293 color: #ffffff; 300 color: #ffffff;
294 background: linear-gradient(270deg, #fb7900 -100%, #ff4903); 301 background: linear-gradient(270deg, #fb7900 -100%, #ff4903);
295 border-radius: 44rpx; 302 border-radius: 44rpx;
296 -}  
297 -  
298 - 303 +}
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 <view class="mainlyTitle">{{nameData.label}}</view> 121 <view class="mainlyTitle">{{nameData.label}}</view>
122 </view> 122 </view>
123 <view style="display: flex; align-items: center;"> 123 <view style="display: flex; align-items: center;">
124 - <view style="display: flex; align-items: center;"> 124 + <view style="display: flex;">
125 <view bindtap="moreMainly" class="moreMainly">查看更多</view> 125 <view bindtap="moreMainly" class="moreMainly">查看更多</view>
126 <view class="arrow" bindtap="moreMainly"> 126 <view class="arrow" bindtap="moreMainly">
127 <image src="/images/01-03/icon_more@2x.png"></image> 127 <image src="/images/01-03/icon_more@2x.png"></image>
@@ -355,6 +355,9 @@ page { @@ -355,6 +355,9 @@ page {
355 355
356 .countNum .num { 356 .countNum .num {
357 width: 150rpx; 357 width: 150rpx;
  358 + overflow: hidden;
  359 + text-overflow: ellipsis;
  360 + white-space: nowrap;
358 } 361 }
359 362
360 .countNum .icon { 363 .countNum .icon {
1 // pages/idea-feedback/idea-feedback.js 1 // pages/idea-feedback/idea-feedback.js
2 let method = require("../../utils/reuqest.js") 2 let method = require("../../utils/reuqest.js")
3 var ary = []; 3 var ary = [];
  4 +const App = getApp();
4 Page({ 5 Page({
5 6
6 data: { 7 data: {
  8 + iphone: '',
7 length: 0, 9 length: 0,
8 maxlength: 100, 10 maxlength: 100,
9 content: '', 11 content: '',
@@ -187,7 +189,9 @@ Page({ @@ -187,7 +189,9 @@ Page({
187 189
188 }, 190 },
189 onLoad: function (options) { 191 onLoad: function (options) {
190 - 192 + this.setData({
  193 + iphone: App.globalData.isIphoneX
  194 + })
191 }, 195 },
192 196
193 /** 197 /**
@@ -36,6 +36,6 @@ @@ -36,6 +36,6 @@
36 </van-cell-group> 36 </van-cell-group>
37 </view> 37 </view>
38 </view> 38 </view>
39 -<view class="btnBox"> 39 +<view class="btnBox" id="{{iphone?'bottom40':''}}">
40 <view class="btn" bindtap="submit">提交</view> 40 <view class="btn" bindtap="submit">提交</view>
41 </view> 41 </view>
@@ -86,8 +86,9 @@ textarea { @@ -86,8 +86,9 @@ textarea {
86 top: 0; 86 top: 0;
87 right: 0; 87 right: 0;
88 box-sizing: border-box; 88 box-sizing: border-box;
89 - text-align: center;  
90 - vertical-align: middle; 89 + display: flex;
  90 + align-items: center;
  91 + justify-content: center;
91 } 92 }
92 93
93 .delBox image { 94 .delBox image {
@@ -97,7 +98,6 @@ textarea { @@ -97,7 +98,6 @@ textarea {
97 98
98 .btnBox { 99 .btnBox {
99 width: 100%; 100 width: 100%;
100 - height: 160rpx;  
101 background: #fff; 101 background: #fff;
102 position: absolute; 102 position: absolute;
103 bottom: 0; 103 bottom: 0;
@@ -105,6 +105,7 @@ textarea { @@ -105,6 +105,7 @@ textarea {
105 display: flex; 105 display: flex;
106 align-items: center; 106 align-items: center;
107 justify-content: center; 107 justify-content: center;
  108 + padding: 30rpx 0;
108 } 109 }
109 110
110 .btn { 111 .btn {
1 // pages/affirm-order/affirm-order.js 1 // pages/affirm-order/affirm-order.js
2 let method = require("../../utils/reuqest.js"); 2 let method = require("../../utils/reuqest.js");
3 const util = require("../../utils/util.js"); 3 const util = require("../../utils/util.js");
  4 +const App=getApp();
4 Page({ 5 Page({
5 data: { 6 data: {
  7 + iphone:'',
6 showTime: false, //配送时间 8 showTime: false, //配送时间
7 storePickupTime: '', 9 storePickupTime: '',
8 userData: "", 10 userData: "",
@@ -248,6 +250,9 @@ Page({ @@ -248,6 +250,9 @@ Page({
248 250
249 }, 251 },
250 onLoad: function (options) { 252 onLoad: function (options) {
  253 + this.setData({
  254 + iphone: App.globalData.isIphoneX
  255 + })
251 let carts = wx.getStorageSync('carts') 256 let carts = wx.getStorageSync('carts')
252 let defaultSku = wx.getStorageSync('defaultSku') 257 let defaultSku = wx.getStorageSync('defaultSku')
253 if (defaultSku) { 258 if (defaultSku) {
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 </view> 88 </view>
89 </view> 89 </view>
90 <!-- 立即购买 --> 90 <!-- 立即购买 -->
91 - <view class="bottomBox"> 91 + <view class="bottomBox" id="{{iphone?'bottom40':''}}">
92 <view class="bottomLeft"> 92 <view class="bottomLeft">
93 <view class="text">合计:</view> 93 <view class="text">合计:</view>
94 <view class="priceBox"> 94 <view class="priceBox">
1 // pages/look-logistics/look-logistics.js 1 // pages/look-logistics/look-logistics.js
2 let method = require("../../utils/reuqest.js") 2 let method = require("../../utils/reuqest.js")
3 let list = []; 3 let list = [];
  4 +const App=getApp()
4 Page({ 5 Page({
5 data: { 6 data: {
  7 + iphone:'',
6 orderId:'', //订单id 8 orderId:'', //订单id
7 postData: { 9 postData: {
8 name: '泰国桃子', 10 name: '泰国桃子',
@@ -46,6 +48,9 @@ Page({ @@ -46,6 +48,9 @@ Page({
46 * 生命周期函数--监听页面加载 48 * 生命周期函数--监听页面加载
47 */ 49 */
48 onLoad: function (options) { 50 onLoad: function (options) {
  51 + this.setData({
  52 + iphone: App.globalData.isIphoneX
  53 + })
49 let list1=this.data.list; 54 let list1=this.data.list;
50 let dataVoList1 = this.data.dataVoList; 55 let dataVoList1 = this.data.dataVoList;
51 let steps=this.data.steps; 56 let steps=this.data.steps;
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <!-- 地址 --> 15 <!-- 地址 -->
16 <view class="addressBox"> 16 <view class="addressBox">
17 <view class="top"> 17 <view class="top">
18 - <view>{{postData.receiverName}}</view> 18 + <view class="topOne">{{postData.receiverName}}</view>
19 <view>{{postData.receiverPhone}}</view> 19 <view>{{postData.receiverPhone}}</view>
20 </view> 20 </view>
21 <view class="bottom">{{postData.receiverDetailAddress}}</view> 21 <view class="bottom">{{postData.receiverDetailAddress}}</view>
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 </van-steps> 47 </van-steps>
48 </view> 48 </view>
49 <!-- bottom --> 49 <!-- bottom -->
50 - <view class="bottomBox" bindtap="refund"> 50 + <view class="bottomBox" bindtap="refund" id="{{iphone?'bottom40':''}}">
51 <view class="btn">申请退款</view> 51 <view class="btn">申请退款</view>
52 </view> 52 </view>
53 </view> 53 </view>
@@ -4,7 +4,6 @@ page{ @@ -4,7 +4,6 @@ page{
4 } 4 }
5 .container { 5 .container {
6 width: 750rpx; 6 width: 750rpx;
7 - height: 1000rpx;  
8 background-color: #f1f2f4; 7 background-color: #f1f2f4;
9 padding-top: 24rpx; 8 padding-top: 24rpx;
10 padding-bottom: 160rpx; 9 padding-bottom: 160rpx;
@@ -41,22 +40,28 @@ page{ @@ -41,22 +40,28 @@ page{
41 } 40 }
42 41
43 .name { 42 .name {
44 - width: 320rpx; 43 + max-width: 420rpx;
45 font-size: 28rpx; 44 font-size: 28rpx;
46 font-weight: 500; 45 font-weight: 500;
47 text-align: left; 46 text-align: left;
48 color: #333333; 47 color: #333333;
49 margin-bottom: 8rpx; 48 margin-bottom: 8rpx;
50 margin-top: 4rpx; 49 margin-top: 4rpx;
  50 + overflow: hidden;
  51 + white-space: nowrap;
  52 + text-overflow: ellipsis;
51 } 53 }
52 54
53 .detail { 55 .detail {
54 - width: 314rpx; 56 + max-width: 420rpx;
55 font-size: 24rpx; 57 font-size: 24rpx;
56 font-weight: 400; 58 font-weight: 400;
57 text-align: left; 59 text-align: left;
58 color: #999999; 60 color: #999999;
59 margin-bottom: 8rpx; 61 margin-bottom: 8rpx;
  62 + overflow: hidden;
  63 + white-space: nowrap;
  64 + text-overflow: ellipsis;
60 } 65 }
61 66
62 .price { 67 .price {
@@ -100,8 +105,13 @@ page{ @@ -100,8 +105,13 @@ page{
100 margin-bottom: 16rpx; 105 margin-bottom: 16rpx;
101 } 106 }
102 107
103 -.top>view {  
104 - margin-right: 20rpx; 108 +.topOne{
  109 +max-width: 480rpx;
  110 + overflow: hidden;
  111 + text-overflow: ellipsis;
  112 + white-space: nowrap;
  113 + padding-right: 20rpx;
  114 + box-sizing: border-box;
105 } 115 }
106 116
107 .bottom { 117 .bottom {
@@ -171,12 +181,13 @@ page{ @@ -171,12 +181,13 @@ page{
171 /* bottom */ 181 /* bottom */
172 .bottomBox { 182 .bottomBox {
173 width: 750rpx; 183 width: 750rpx;
174 - height: 120rpx;  
175 position: fixed; 184 position: fixed;
176 z-index: 9; 185 z-index: 9;
177 bottom: 0; 186 bottom: 0;
178 left: 0; 187 left: 0;
179 background-color: #ffffff; 188 background-color: #ffffff;
  189 + padding: 20rpx 0;
  190 + display: flex;
180 } 191 }
181 192
182 .btn { 193 .btn {
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <view class="pickDesc">{{item.goodsAttributes}}</view> 21 <view class="pickDesc">{{item.goodsAttributes}}</view>
22 <view class="collectIcon"> 22 <view class="collectIcon">
23 <view style="height:10rpx;display:none"></view> 23 <view style="height:10rpx;display:none"></view>
24 - <view style="display:inline-block;font-size: 28rpx; padding: 10rpx 0;"> 24 + <view style="display:inline-block;font-size: 28rpx;">
25 <text class="moneyIcon">￥</text> 25 <text class="moneyIcon">￥</text>
26 <text class="moneyNum">{{item.goodsPrice}}</text></view> 26 <text class="moneyNum">{{item.goodsPrice}}</text></view>
27 </view> 27 </view>
1 /* pages/searchRequest/searchRequest.wxss */ 1 /* pages/searchRequest/searchRequest.wxss */
2 /* 搜索 */ 2 /* 搜索 */
3 /* 搜索框 */ 3 /* 搜索框 */
4 -page{ 4 +page {
5 background-color: #f1f2f4; 5 background-color: #f1f2f4;
6 } 6 }
  7 +
7 .search_center { 8 .search_center {
8 height: 90rpx; 9 height: 90rpx;
9 width: 750rpx; 10 width: 750rpx;
@@ -51,6 +52,7 @@ page{ @@ -51,6 +52,7 @@ page{
51 white-space: nowrap; 52 white-space: nowrap;
52 background: #ffffff; 53 background: #ffffff;
53 } 54 }
  55 +
54 .search_right { 56 .search_right {
55 width: 66rpx; 57 width: 66rpx;
56 height: 64rpx; 58 height: 64rpx;
@@ -64,10 +66,12 @@ page{ @@ -64,10 +66,12 @@ page{
64 display: flex; 66 display: flex;
65 align-items: center; 67 align-items: center;
66 } 68 }
  69 +
67 .search_right image { 70 .search_right image {
68 width: 36rpx; 71 width: 36rpx;
69 height: 36rpx; 72 height: 36rpx;
70 } 73 }
  74 +
71 .placeholder { 75 .placeholder {
72 font-size: 28rpx; 76 font-size: 28rpx;
73 font-family: PingFang SC; 77 font-family: PingFang SC;
@@ -75,6 +79,7 @@ page{ @@ -75,6 +79,7 @@ page{
75 line-height: 64rpx; 79 line-height: 64rpx;
76 color: rgba(189, 196, 206, 1); 80 color: rgba(189, 196, 206, 1);
77 } 81 }
  82 +
78 .search_right { 83 .search_right {
79 width: 104rpx; 84 width: 104rpx;
80 height: 48rpx; 85 height: 48rpx;
@@ -89,32 +94,37 @@ page{ @@ -89,32 +94,37 @@ page{
89 right: 8rpx; 94 right: 8rpx;
90 cursor: progress; 95 cursor: progress;
91 } 96 }
  97 +
92 /* 商品列表 */ 98 /* 商品列表 */
93 -.productList{ 99 +.productList {
94 width: 750rpx; 100 width: 750rpx;
95 - height:750rpx; 101 + height: 750rpx;
96 display: flex; 102 display: flex;
97 justify-content: center; 103 justify-content: center;
98 align-items: center; 104 align-items: center;
99 font-size: 32rpx; 105 font-size: 32rpx;
100 color: rgb(206, 208, 209); 106 color: rgb(206, 208, 209);
101 } 107 }
102 -.listBox{ 108 +
  109 +.listBox {
103 display: flex; 110 display: flex;
104 padding: 0 26rpx; 111 padding: 0 26rpx;
105 box-sizing: border-box; 112 box-sizing: border-box;
106 } 113 }
  114 +
107 /* 每日精选*/ 115 /* 每日精选*/
108 -.moneyIcon{  
109 - font-size: 23rpx; 116 +.moneyIcon {
  117 + font-size: 24rpx;
110 color: #FF1717; 118 color: #FF1717;
111 margin-right: -4rpx; 119 margin-right: -4rpx;
112 } 120 }
113 -.moneyNum{ 121 +
  122 +.moneyNum {
114 font-size: 28rpx; 123 font-size: 28rpx;
115 font-weight: 500; 124 font-weight: 500;
116 color: #FF1717; 125 color: #FF1717;
117 } 126 }
  127 +
118 .pickContainer { 128 .pickContainer {
119 display: flex; 129 display: flex;
120 justify-content: space-between; 130 justify-content: space-between;
@@ -151,7 +161,7 @@ page{ @@ -151,7 +161,7 @@ page{
151 .pickPic image { 161 .pickPic image {
152 width: 100%; 162 width: 100%;
153 height: 328rpx; 163 height: 328rpx;
154 - border-radius: 16rpx; 164 + border-radius: 16rpx 16rpx 0 0;
155 } 165 }
156 166
157 .pickTitle { 167 .pickTitle {
@@ -159,7 +169,11 @@ page{ @@ -159,7 +169,11 @@ page{
159 font-size: 28rpx; 169 font-size: 28rpx;
160 font-weight: 500; 170 font-weight: 500;
161 color: #323233; 171 color: #323233;
162 - padding-left: 8rpx; 172 + padding: 0 24rpx;
  173 + width: 100%;
  174 + overflow: hidden;
  175 + white-space: nowrap;
  176 + text-overflow: ellipsis;
163 box-sizing: border-box; 177 box-sizing: border-box;
164 } 178 }
165 179
@@ -169,11 +183,13 @@ page{ @@ -169,11 +183,13 @@ page{
169 text-align: left; 183 text-align: left;
170 color: #7d7e80; 184 color: #7d7e80;
171 margin-top: 8rpx; 185 margin-top: 8rpx;
172 - padding-left: 8rpx;  
173 - padding-right: 16rpx; 186 + padding: 0 24rpx;
174 box-sizing: border-box; 187 box-sizing: border-box;
175 - width: 310rpx; 188 + width: 100%;
176 overflow: hidden; 189 overflow: hidden;
  190 + white-space: nowrap;
  191 + text-overflow: ellipsis;
  192 + padding-top: 4rpx;
177 } 193 }
178 194
179 .pickCollect { 195 .pickCollect {
@@ -188,22 +204,29 @@ page{ @@ -188,22 +204,29 @@ page{
188 display: flex; 204 display: flex;
189 justify-content: space-between; 205 justify-content: space-between;
190 } 206 }
  207 +
191 .collectIcon { 208 .collectIcon {
192 font-size: 24rpx; 209 font-size: 24rpx;
193 color: #ff4742; 210 color: #ff4742;
194 display: flex; 211 display: flex;
195 align-items: center; 212 align-items: center;
196 justify-content: space-between; 213 justify-content: space-between;
  214 + padding: 0 24rpx;
  215 + width: 100%;
  216 + overflow: hidden;
  217 + white-space: nowrap;
  218 + text-overflow: ellipsis;
197 } 219 }
198 220
199 .collectIcon>view { 221 .collectIcon>view {
200 - margin-left: 8rpx; 222 + margin-top: 6rpx;
201 } 223 }
  224 +
202 .bottomHint { 225 .bottomHint {
203 background-color: #f1f2f4; 226 background-color: #f1f2f4;
204 font-size: 24rpx; 227 font-size: 24rpx;
205 color: gray; 228 color: gray;
206 display: flex; 229 display: flex;
207 justify-content: center; 230 justify-content: center;
208 - padding-bottom:16rpx;  
209 -} 231 + padding-bottom: 16rpx;
  232 +}
@@ -2,8 +2,7 @@ @@ -2,8 +2,7 @@
2 <view class="topLine"> 2 <view class="topLine">
3 </view> 3 </view>
4 <!-- 领取会员卡 --> 4 <!-- 领取会员卡 -->
5 -<!-- <view class="getCard" wx:if="{{noVip}}" > -->  
6 -<view class="getCard" wx:if="{{fasle}}" > 5 +<view class="getCard" wx:if="{{noVip}}" >
7 <view class="title"> 6 <view class="title">
8 {{postData.title}} 7 {{postData.title}}
9 </view> 8 </view>
@@ -23,8 +22,7 @@ @@ -23,8 +22,7 @@
23 </view> 22 </view>
24 </view> 23 </view>
25 <!-- 会员卡详情 --> 24 <!-- 会员卡详情 -->
26 -<view class="cardDetail" wx:if="{{true}}">  
27 -<!-- <view class="cardDetail" wx:if="{{vip}}"> --> 25 +<view class="cardDetail" wx:if="{{vip}}">
28 <image src="/images/card.png" ></image> 26 <image src="/images/card.png" ></image>
29 <!-- content --> 27 <!-- content -->
30 <view class="cardBox1"> 28 <view class="cardBox1">
@@ -51,7 +51,7 @@ page { @@ -51,7 +51,7 @@ page {
51 /* bottom */ 51 /* bottom */
52 .btn { 52 .btn {
53 position: absolute; 53 position: absolute;
54 - bottom: 62rpx; 54 + bottom: 42rpx;
55 left: 64rpx; 55 left: 64rpx;
56 width: 622rpx; 56 width: 622rpx;
57 height: 88rpx; 57 height: 88rpx;
@@ -167,7 +167,7 @@ page { @@ -167,7 +167,7 @@ page {
167 width: 622rpx; 167 width: 622rpx;
168 height: 88rpx; 168 height: 88rpx;
169 position: absolute; 169 position: absolute;
170 - bottom: 62rpx; 170 + bottom: 42rpx;
171 left: 64rpx; 171 left: 64rpx;
172 background-color: #ffc644; 172 background-color: #ffc644;
173 font-size: 32rpx; 173 font-size: 32rpx;
1 // pages/order-detail/order-detail.js 1 // pages/order-detail/order-detail.js
2 let method = require("../../utils/reuqest.js") 2 let method = require("../../utils/reuqest.js")
  3 +const App = getApp()
3 Page({ 4 Page({
4 data: { 5 data: {
  6 + iphone: '',
5 flag: false, //判断是否为退款订单 7 flag: false, //判断是否为退款订单
6 refoundStatus: '', //退款状态 8 refoundStatus: '', //退款状态
7 goodsId: '', 9 goodsId: '',
@@ -16,8 +18,8 @@ Page({ @@ -16,8 +18,8 @@ Page({
16 }, 18 },
17 addZero: true, //价格补零 19 addZero: true, //价格补零
18 }, 20 },
19 - //判断价格是否整数  
20 - isInteger(obj) { 21 + //判断价格是否整数
  22 + isInteger(obj) {
21 Number.isInteger(obj); 23 Number.isInteger(obj);
22 if (!Number.isInteger(obj)) { 24 if (!Number.isInteger(obj)) {
23 this.setData({ 25 this.setData({
@@ -45,7 +47,7 @@ Page({ @@ -45,7 +47,7 @@ Page({
45 } 47 }
46 }) 48 })
47 }, 49 },
48 - 50 +
49 //商品详情 51 //商品详情
50 goGoodsDetail(e) { 52 goGoodsDetail(e) {
51 let goodsid = e.currentTarget.dataset.id; 53 let goodsid = e.currentTarget.dataset.id;
@@ -63,6 +65,9 @@ Page({ @@ -63,6 +65,9 @@ Page({
63 * 生命周期函数--监听页面加载 65 * 生命周期函数--监听页面加载
64 */ 66 */
65 onLoad: function (options) { 67 onLoad: function (options) {
  68 + this.setData({
  69 + iphone: App.globalData.isIphoneX
  70 + })
66 let orderId = options.orderId 71 let orderId = options.orderId
67 if (options.flag) { 72 if (options.flag) {
68 this.setData({ 73 this.setData({
@@ -10,15 +10,18 @@ @@ -10,15 +10,18 @@
10 </view> 10 </view>
11 <!-- 地址 --> 11 <!-- 地址 -->
12 <view class="address"> 12 <view class="address">
13 - <view class="userName">{{requestData.receiverName}}</view>  
14 - <view class="userTell">{{requestData.receiverPhone}}</view>  
15 - <view class="default">默认</view> 13 + <view style="display: flex;align-items: center;">
  14 + <view class="userName">{{requestData.receiverName}}</view>
  15 + <view class="userTell">{{requestData.receiverPhone}}</view>
  16 + <view class="default">默认</view>
  17 + </view>
16 <view class="userAddress">{{requestData.receiverDetailAddress}}</view> 18 <view class="userAddress">{{requestData.receiverDetailAddress}}</view>
17 </view> 19 </view>
18 <!-- 商品列表 --> 20 <!-- 商品列表 -->
19 <view class="cartList"> 21 <view class="cartList">
20 <!-- <view class="cartListItem" wx:for="{{list}}" bindtap="goGoodsDetail" data-id="{{item.goodsId}}"> --> 22 <!-- <view class="cartListItem" wx:for="{{list}}" bindtap="goGoodsDetail" data-id="{{item.goodsId}}"> -->
21 - <view class="cartListItem" wx:for="{{requestData.listGoodsVoList}}" bindtap="goGoodsDetail" data-id="{{item.goodsId}}"> 23 + <view class="cartListItem" wx:for="{{requestData.listGoodsVoList}}" bindtap="goGoodsDetail"
  24 + data-id="{{item.goodsId}}">
22 <view class="itemRight"> 25 <view class="itemRight">
23 <view class="productPic"> 26 <view class="productPic">
24 <image src="{{item.goodsPic}}" mode="aspectFill"></image> 27 <image src="{{item.goodsPic}}" mode="aspectFill"></image>
@@ -72,7 +75,7 @@ @@ -72,7 +75,7 @@
72 <text style="margin-right: -6rpx;">￥</text> 75 <text style="margin-right: -6rpx;">￥</text>
73 <text>{{requestData.freightAmount}}</text> 76 <text>{{requestData.freightAmount}}</text>
74 <text wx:if="{{addZero}}">.00</text> 77 <text wx:if="{{addZero}}">.00</text>
75 - </view> 78 + </view>
76 </view> 79 </view>
77 </view> 80 </view>
78 <!-- 订单详情 --> 81 <!-- 订单详情 -->
@@ -88,13 +91,14 @@ @@ -88,13 +91,14 @@
88 <view class="mainMoney innerPublic"> 91 <view class="mainMoney innerPublic">
89 <view class="title ">商品总额 :</view> 92 <view class="title ">商品总额 :</view>
90 <view class="content"> 93 <view class="content">
91 - <view class="icon">￥</view>  
92 - <view>{{requestData.payAmount}}</view> 94 + <text class="icon">￥</text>
  95 + <text>{{requestData.payAmount}}</text>
  96 + <text wx:if="{{addZero}}">.00</text>
93 </view> 97 </view>
94 </view> 98 </view>
95 </view> 99 </view>
96 <!-- 再次购买 --> 100 <!-- 再次购买 -->
97 - <view class="bottomBox"> 101 + <view class="bottomBox" id="{{iphone?'bottom40':''}}">
98 <view bindtap="buyAgain">再次购买</view> 102 <view bindtap="buyAgain">再次购买</view>
99 </view> 103 </view>
100 </view> 104 </view>
@@ -190,7 +190,6 @@ page { @@ -190,7 +190,6 @@ page {
190 .productPic { 190 .productPic {
191 width: 180rpx; 191 width: 180rpx;
192 height: 180rpx; 192 height: 180rpx;
193 - background-color: azure;  
194 margin-right: 24rpx; 193 margin-right: 24rpx;
195 } 194 }
196 195
@@ -201,7 +200,6 @@ page { @@ -201,7 +200,6 @@ page {
201 } 200 }
202 201
203 .productName { 202 .productName {
204 - width: 320rpx;  
205 height: 40rpx; 203 height: 40rpx;
206 font-size: 28rpx; 204 font-size: 28rpx;
207 font-weight: 500; 205 font-weight: 500;
@@ -209,16 +207,23 @@ page { @@ -209,16 +207,23 @@ page {
209 color: #333333; 207 color: #333333;
210 line-height: 40rpx; 208 line-height: 40rpx;
211 margin-bottom: 8rpx; 209 margin-bottom: 8rpx;
  210 + max-width: 420rpx;
  211 + overflow: hidden;
  212 + white-space: nowrap;
  213 + text-overflow: ellipsis;
212 } 214 }
213 215
214 .productDetail { 216 .productDetail {
215 - width: 304rpx; 217 + max-width: 420rpx;
  218 + overflow: hidden;
  219 + white-space: nowrap;
  220 + text-overflow: ellipsis;
216 font-size: 24rpx; 221 font-size: 24rpx;
217 font-weight: 400; 222 font-weight: 400;
218 text-align: left; 223 text-align: left;
219 color: #999999; 224 color: #999999;
220 line-height: 36rpx; 225 line-height: 36rpx;
221 - margin-bottom: 40rpx; 226 + margin-bottom: 54rpx;
222 } 227 }
223 228
224 .productPrice { 229 .productPrice {
@@ -430,13 +435,12 @@ textarea { @@ -430,13 +435,12 @@ textarea {
430 } 435 }
431 436
432 .content .icon { 437 .content .icon {
433 - margin-right: -2rpx; 438 + margin-right: -4rpx;
434 } 439 }
435 440
436 /* bottom */ 441 /* bottom */
437 .bottomBox { 442 .bottomBox {
438 width: 750rpx; 443 width: 750rpx;
439 - height: 160rpx;  
440 position: fixed; 444 position: fixed;
441 bottom: 0; 445 bottom: 0;
442 left: 0; 446 left: 0;
@@ -446,6 +450,7 @@ textarea { @@ -446,6 +450,7 @@ textarea {
446 display: flex; 450 display: flex;
447 align-items: center; 451 align-items: center;
448 flex-direction: row-reverse; 452 flex-direction: row-reverse;
  453 + padding: 30rpx;
449 } 454 }
450 455
451 .bottomBox>view { 456 .bottomBox>view {
1 // pages/product-detail/product-detail.js 1 // pages/product-detail/product-detail.js
2 let method = require("../../utils/reuqest.js"); 2 let method = require("../../utils/reuqest.js");
3 const util = require("../../utils/util.js"); 3 const util = require("../../utils/util.js");
  4 +const App = getApp();
4 Page({ 5 Page({
5 data: { 6 data: {
  7 + iphone: '', //手机型号
6 Authorization: '', //判断用户是否登录 8 Authorization: '', //判断用户是否登录
7 id: '', 9 id: '',
8 skuId: '', 10 skuId: '',
9 goodsId: '', 11 goodsId: '',
10 swiperArray: [], //商品轮播图 12 swiperArray: [], //商品轮播图
11 countDownShow: '', //判断限时优惠商品 13 countDownShow: '', //判断限时优惠商品
12 - addZero:true, //商品价格补零 14 + addZero: true, //商品价格补零
13 time: '', //倒计时 15 time: '', //倒计时
14 timeData: '', 16 timeData: '',
15 hour: "", 17 hour: "",
@@ -134,7 +136,7 @@ Page({ @@ -134,7 +136,7 @@ Page({
134 Number.isInteger(obj); 136 Number.isInteger(obj);
135 if (!Number.isInteger(obj)) { 137 if (!Number.isInteger(obj)) {
136 this.setData({ 138 this.setData({
137 - addZero:false 139 + addZero: false
138 }) 140 })
139 } 141 }
140 }, 142 },
@@ -151,6 +153,13 @@ Page({ @@ -151,6 +153,13 @@ Page({
151 pingjiaNum: data.total, 153 pingjiaNum: data.total,
152 infoList: data.data 154 infoList: data.data
153 }) 155 })
  156 + let list = this.data.infoList;
  157 + list.forEach((item, index) => {
  158 + item.wxName=item.wxName.substring(0,1)+'***'+item.wxName.substring(item.wxName.length-1)
  159 + })
  160 + this.setData({
  161 + infoList:list
  162 + })
154 } 163 }
155 }) 164 })
156 }, 165 },
@@ -497,7 +506,8 @@ Page({ @@ -497,7 +506,8 @@ Page({
497 let goodsId = wx.getStorageSync('goodsId'); 506 let goodsId = wx.getStorageSync('goodsId');
498 let url = wx.getStorageSync('url') 507 let url = wx.getStorageSync('url')
499 this.setData({ 508 this.setData({
500 - id: options.id 509 + id: options.id,
  510 + iphone: App.globalData.isIphoneX
501 }) 511 })
502 //请求商品信息 512 //请求商品信息
503 if (options.id) { 513 if (options.id) {
@@ -534,7 +544,8 @@ Page({ @@ -534,7 +544,8 @@ Page({
534 }) 544 })
535 } else { 545 } else {
536 this.setData({ 546 this.setData({
537 - Authorization: true 547 + Authorization: true,
  548 + // ipone:wx.getStorageSync('ipone')
538 }) 549 })
539 } 550 }
540 }, 551 },
@@ -30,9 +30,9 @@ @@ -30,9 +30,9 @@
30 <view class="productPrice"> 30 <view class="productPrice">
31 <view class="price" wx:if="{{goodsData.type==2}}"> 31 <view class="price" wx:if="{{goodsData.type==2}}">
32 <text class="moneyIcon">￥</text> 32 <text class="moneyIcon">￥</text>
33 - <text class="moneyNum">{{jifenNum}}</text>  
34 - <text class="moneyIcon" wx:if="{{addZero}}">.00</text>  
35 - </view> 33 + <text class="moneyNum">{{jifenNum}}</text>
  34 + <text class="moneyIcon" wx:if="{{addZero}}">.00</text>
  35 + </view>
36 <view class="jifen" wx:if="{{goodsData.type==1}}">积分{{jifenNum}}</view> 36 <view class="jifen" wx:if="{{goodsData.type==1}}">积分{{jifenNum}}</view>
37 <view class="share" data-id="{{goodsId}}"> 37 <view class="share" data-id="{{goodsId}}">
38 <view class="shareIcon"> 38 <view class="shareIcon">
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 </view> 46 </view>
47 <!-- 请选择 --> 47 <!-- 请选择 -->
48 <view class="selectMain" bindtap="addCart"> 48 <view class="selectMain" bindtap="addCart">
49 - <!-- <view class="selectMain" bindtap="selectSku"> --> 49 + <!-- <view class="selectMain" bindtap="selectSku"> -->
50 <view class="selectTitle">选择</view> 50 <view class="selectTitle">选择</view>
51 <view class="selectNum"> 51 <view class="selectNum">
52 <view>{{}}</view> 52 <view>{{}}</view>
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 <view class="userImg" style="display:inline-block" wx:if="{{item.anonymous==1}}"> 76 <view class="userImg" style="display:inline-block" wx:if="{{item.anonymous==1}}">
77 <image src="/images/nimingtouxiang.png" mode="aspectFill"> </image> 77 <image src="/images/nimingtouxiang.png" mode="aspectFill"> </image>
78 </view> 78 </view>
79 - <view class="userName" style="display:inline-block" >{{item.wxName}}</view> 79 + <view class="userName" style="display:inline-block">{{item.wxName}}</view>
80 </view> 80 </view>
81 <view class="evaluateDetails">{{item.content}}</view> 81 <view class="evaluateDetails">{{item.content}}</view>
82 <view class="evaluatePic" wx:if="{{item.images}}"> 82 <view class="evaluatePic" wx:if="{{item.images}}">
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 </view> --> 94 </view> -->
95 </view> 95 </view>
96 <view class="bottomHint" wx:if="{{bottomHint}}"> 96 <view class="bottomHint" wx:if="{{bottomHint}}">
97 - 我是有底线的~ 97 + 我是有底线的~
98 </view> 98 </view>
99 </view> 99 </view>
100 <!--底部 --> 100 <!--底部 -->
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 <van-goods-action-button type="danger" text="立即购买" /> 107 <van-goods-action-button type="danger" text="立即购买" />
108 </van-goods-action> 108 </van-goods-action>
109 </view> --> 109 </view> -->
110 -<view class="bottom"> 110 +<view class="{{iphone?'bottom1':'bottom'}}">
111 <view class="bottom_left"> 111 <view class="bottom_left">
112 <view class="bottom_left_item" catchtap="myKefu"> 112 <view class="bottom_left_item" catchtap="myKefu">
113 <image src="/images/01-03/kefu.png"></image> 113 <image src="/images/01-03/kefu.png"></image>
@@ -123,10 +123,6 @@ @@ -123,10 +123,6 @@
123 <image src='{{goodsData.keep==false?"/images/01-03/unshoucang.png":"/images/01-03/shoucang.png"}}'></image> 123 <image src='{{goodsData.keep==false?"/images/01-03/unshoucang.png":"/images/01-03/shoucang.png"}}'></image>
124 <view class="collecttext">{{goodsData.keep==false?"收藏":"已收藏"}}</view> 124 <view class="collecttext">{{goodsData.keep==false?"收藏":"已收藏"}}</view>
125 </view> 125 </view>
126 - <!-- <view wx:if="{{goodsData.keep==true}}">  
127 - <image src="/images/01-03/shoucang.png"></image>  
128 - <view>已收藏</view>  
129 - </view> -->  
130 </view> 126 </view>
131 </view> 127 </view>
132 <view class="bottom_right" wx:if="{{goodsData.type==2}}"> 128 <view class="bottom_right" wx:if="{{goodsData.type==2}}">
@@ -149,42 +145,42 @@ @@ -149,42 +145,42 @@
149 </view> 145 </view>
150 <!-- 加入购物车弹框 --> 146 <!-- 加入购物车弹框 -->
151 <view class="mask" catchtap="closeMask" wx:if='{{showMask}}'> 147 <view class="mask" catchtap="closeMask" wx:if='{{showMask}}'>
152 - <view class="diceng" catchtap="openMask">  
153 - <view class="info">  
154 - <image src="{{goodsData.goodsBanners[0]}}"></image>  
155 - <view class="info_right"> 148 + <view class="diceng" catchtap="openMask" id="{{iphone?'bottom40':''}}">
  149 + <view class="info">
  150 + <image src="{{goodsData.goodsBanners[0]}}"></image>
  151 + <view class="info_right">
156 <view class="info_name">{{goodsData.goodsName}}</view> 152 <view class="info_name">{{goodsData.goodsName}}</view>
157 - <view class="info_price">￥{{goodsData.list[idx].goodsPrice}}</view>  
158 - <view class="info_stock">库存：{{goodsData.list[idx].goodsStock}}件</view>  
159 - <view class="info_stock" wx:if='{{info.detai.spec_type=="20"}}'>请选择规格</view>  
160 - </view>  
161 - </view>  
162 - <view class="attr" wx:if='{{info.detail.spec_type=="20"}}' wx:for='{{info.specData.spec_attr}}' wx:key='index'>  
163 - <view>{{item.group_name}}</view>  
164 - <view class="attr_main">  
165 - <view class="attr_item {{cell.flag?'activity':''}}" wx:for='{{item.spec_items}}' wx:for-item='cell'  
166 - wx:for-index='cellindex' wx:key='{{cellindex}}' data-index='{{index}}' data-cellindex='{{cellindex}}'  
167 - catchtap="changeAttrNum">{{cell.spec_value}}</view>  
168 - </view>  
169 - </view>  
170 - <view class="spec">  
171 - <view class="{{idx==index?'specItem1':'specItem'}}" wx:for="{{goodsData.list}}" bindtap="check"  
172 - data-index="{{index}}" data-id="{{item.goodsSkuId}}">{{item.goodsSkuName}}</view>  
173 - </view>  
174 - <view class="pay_count">  
175 - <view>购买数量</view>  
176 - <view class="count_box">  
177 - <view class="count_jian" catchtap="decNum">-</view>  
178 - <view class="real_count">{{count}}</view>  
179 - <view class="count_jian" catchtap="addNum">+</view>  
180 - </view>  
181 - </view>  
182 - <view class="confrimBtn" catchtap="confrimCart">确定</view>  
183 - </view> 153 + <view class="info_price">￥{{goodsData.list[idx].goodsPrice}}</view>
  154 + <view class="info_stock">库存：{{goodsData.list[idx].goodsStock}}件</view>
  155 + <view class="info_stock" wx:if='{{info.detai.spec_type=="20"}}'>请选择规格</view>
  156 + </view>
  157 + </view>
  158 + <view class="attr" wx:if='{{info.detail.spec_type=="20"}}' wx:for='{{info.specData.spec_attr}}' wx:key='index'>
  159 + <view>{{item.group_name}}</view>
  160 + <view class="attr_main">
  161 + <view class="attr_item {{cell.flag?'activity':''}}" wx:for='{{item.spec_items}}' wx:for-item='cell'
  162 + wx:for-index='cellindex' wx:key='{{cellindex}}' data-index='{{index}}' data-cellindex='{{cellindex}}'
  163 + catchtap="changeAttrNum">{{cell.spec_value}}</view>
  164 + </view>
  165 + </view>
  166 + <view class="spec">
  167 + <view class="{{idx==index?'specItem1':'specItem'}}" wx:for="{{goodsData.list}}" bindtap="check"
  168 + data-index="{{index}}" data-id="{{item.goodsSkuId}}">{{item.goodsSkuName}}</view>
  169 + </view>
  170 + <view class="pay_count">
  171 + <view>购买数量</view>
  172 + <view class="count_box">
  173 + <view class="count_jian" catchtap="decNum">-</view>
  174 + <view class="real_count">{{count}}</view>
  175 + <view class="count_jian" catchtap="addNum">+</view>
  176 + </view>
  177 + </view>
  178 + <view class="confrimBtn" catchtap="confrimCart">确定</view>
  179 + </view>
184 </view> 180 </view>
185 <!-- 立即购买弹框 --> 181 <!-- 立即购买弹框 -->
186 <view class="mask" catchtap="closeMaskTwo" wx:if='{{showMaskTwo}}'> 182 <view class="mask" catchtap="closeMaskTwo" wx:if='{{showMaskTwo}}'>
187 - <view class="diceng" catchtap="openMask"> 183 + <view class="diceng" catchtap="openMask" id="{{iphone?'bottom40':''}}">
188 <view class="info"> 184 <view class="info">
189 <image src="{{goodsData.goodsBanners[0]}}"></image> 185 <image src="{{goodsData.goodsBanners[0]}}"></image>
190 <view class="info_right"> 186 <view class="info_right">
@@ -203,17 +199,17 @@ @@ -203,17 +199,17 @@
203 </view> 199 </view>
204 </view> 200 </view>
205 <view class="attr" wx:if='{{info.detail.spec_type=="20"}}' wx:for='{{info.specData.spec_attr}}' wx:key='index'> 201 <view class="attr" wx:if='{{info.detail.spec_type=="20"}}' wx:for='{{info.specData.spec_attr}}' wx:key='index'>
206 - <view>{{item.group_name}}</view>  
207 - <view class="attr_main">  
208 - <view class="attr_item {{cell.flag?'activity':''}}" wx:for='{{item.spec_items}}' wx:for-item='cell'  
209 - wx:for-index='cellindex' wx:key='{{cellindex}}' data-index='{{index}}' data-cellindex='{{cellindex}}'  
210 - catchtap="changeAttrNum">{{cell.spec_value}}</view>  
211 - </view>  
212 - </view>  
213 - <view class="spec">  
214 - <view class="{{idx==index?'specItem1':'specItem'}}" wx:for="{{goodsData.list}}" bindtap="check"  
215 - data-index="{{index}}" data-id="{{item.goodsSkuId}}">{{item.goodsSkuName}}</view>  
216 - </view> 202 + <view>{{item.group_name}}</view>
  203 + <view class="attr_main">
  204 + <view class="attr_item {{cell.flag?'activity':''}}" wx:for='{{item.spec_items}}' wx:for-item='cell'
  205 + wx:for-index='cellindex' wx:key='{{cellindex}}' data-index='{{index}}' data-cellindex='{{cellindex}}'
  206 + catchtap="changeAttrNum">{{cell.spec_value}}</view>
  207 + </view>
  208 + </view>
  209 + <view class="spec">
  210 + <view class="{{idx==index?'specItem1':'specItem'}}" wx:for="{{goodsData.list}}" bindtap="check"
  211 + data-index="{{index}}" data-id="{{item.goodsSkuId}}">{{item.goodsSkuName}}</view>
  212 + </view>
217 <view class="pay_count"> 213 <view class="pay_count">
218 <view>购买数量</view> 214 <view>购买数量</view>
219 <view class="count_box"> 215 <view class="count_box">
@@ -410,6 +410,18 @@ button { @@ -410,6 +410,18 @@ button {
410 padding-bottom: 16rpx; 410 padding-bottom: 16rpx;
411 padding-top: 16rpx; 411 padding-top: 16rpx;
412 } 412 }
  413 +.bottom1 {
  414 + position: fixed;
  415 + bottom: 0;
  416 + left: 0;
  417 + width: 100%;
  418 + height: 100rpx;
  419 + background: #fff;
  420 + display: flex;
  421 + justify-content: space-between;
  422 + padding-bottom:40rpx;
  423 + padding-top: 16rpx;
  424 +}
413 425
414 .bottom_left { 426 .bottom_left {
415 width: calc(100% - 420rpx); 427 width: calc(100% - 420rpx);
@@ -783,7 +795,6 @@ button { @@ -783,7 +795,6 @@ button {
783 box-sizing: border-box; 795 box-sizing: border-box;
784 max-height: 94%; 796 max-height: 94%;
785 overflow-y: auto; 797 overflow-y: auto;
786 - padding-bottom: 60rpx;  
787 } 798 }
788 799
789 .info { 800 .info {
@@ -5,7 +5,7 @@ page{ @@ -5,7 +5,7 @@ page{
5 .container{ 5 .container{
6 width: 750rpx; 6 width: 750rpx;
7 padding-top: 24rpx; 7 padding-top: 24rpx;
8 - 8 + padding-bottom: 24rpx;
9 box-sizing: border-box; 9 box-sizing: border-box;
10 } 10 }
11 .contentBox{ 11 .contentBox{
1 // pages/select-address/select-address.js 1 // pages/select-address/select-address.js
2 let method = require("../../utils/reuqest.js") 2 let method = require("../../utils/reuqest.js")
  3 +const App = getApp();
3 Page({ 4 Page({
4 data: { 5 data: {
  6 + iphone:'',
5 default: true, //默认地址 7 default: true, //默认地址
6 defaultType: '', 8 defaultType: '',
7 list: [], 9 list: [],
@@ -103,7 +105,8 @@ Page({ @@ -103,7 +105,8 @@ Page({
103 }, 105 },
104 onLoad: function (options) { 106 onLoad: function (options) {
105 this.setData({ 107 this.setData({
106 - edit:options.edit 108 + edit:options.edit,
  109 + iphone: App.globalData.isIphoneX
107 }) 110 })
108 111
109 this.getAddressList(); 112 this.getAddressList();
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 </view> 94 </view>
95 </view> --> 95 </view> -->
96 <!-- 新增地址 --> 96 <!-- 新增地址 -->
97 - <view class="bottom"> 97 + <view class="{{iphone?'bottom1':'bottom'}}">
98 <view class="addAdress" bindtap="addAddress"> 98 <view class="addAdress" bindtap="addAddress">
99 新增地址 99 新增地址
100 </view> 100 </view>
@@ -188,7 +188,16 @@ page { @@ -188,7 +188,16 @@ page {
188 bottom: 0; 188 bottom: 0;
189 left: 0; 189 left: 0;
190 background-color: #fff; 190 background-color: #fff;
191 - padding: 38rpx 0; 191 + padding: 32rpx 0;
  192 +}
  193 +.bottom1{
  194 + width: 750rpx;
  195 + position: fixed;
  196 + bottom: 0;
  197 + left: 0;
  198 + background-color: #fff;
  199 + padding: 32rpx 0;
  200 + padding-bottom: 40rpx;
192 } 201 }
193 202
194 .addAdress { 203 .addAdress {
@@ -495,7 +495,7 @@ page { @@ -495,7 +495,7 @@ page {
495 495
496 .cart-list .cart-count-box text { 496 .cart-list .cart-count-box text {
497 display: inline-block; 497 display: inline-block;
498 - line-height: 44rpx; 498 + line-height: 38rpx;
499 text-align: center; 499 text-align: center;
500 } 500 }
501 501
@@ -510,6 +510,9 @@ page { @@ -510,6 +510,9 @@ page {
510 width: 86rpx; 510 width: 86rpx;
511 background-color: #eeeeee; 511 background-color: #eeeeee;
512 font-size: 24rpx; 512 font-size: 24rpx;
  513 + overflow: hidden;
  514 + text-overflow: ellipsis;
  515 + white-space: nowrap;
513 } 516 }
514 517
515 .cart-del { 518 .cart-del {