miniprogram / shengxian · 提交

转到一个项目

作者 王旭宇
提交 ce77b4272306817c31fa1326cf99bb773daaf7a0 1 个父辈 8e995b6c

购物车结算原来是amount: this.data.amount

内嵌 并排对比
正在显示 27 个修改的文件 包含 880 行增加 和 329 行删除
@@ -68,7 +68,8 @@ @@ -68,7 +68,8 @@
68 "pages/vip/detail_vip/detail_vip", 68 "pages/vip/detail_vip/detail_vip",
69 "pages/index/goodsDetials/goodsDetials", 69 "pages/index/goodsDetials/goodsDetials",
70 "pages/navigate/navigate", 70 "pages/navigate/navigate",
71 - "pages/index/user_comment_detail/user_comment_detail" 71 + "pages/index/user_comment_detail/user_comment_detail",
  72 + "pages/my/paySuccess/paySuccess"
72 ], 73 ],
73 "window": { 74 "window": {
74 "backgroundTextStyle": "dark", 75 "backgroundTextStyle": "dark",
@@ -9,12 +9,12 @@ @@ -9,12 +9,12 @@
9 9
10 @font-face { 10 @font-face {
11 font-family: 'iconfont'; /* project id 636259 */ 11 font-family: 'iconfont'; /* project id 636259 */
12 - src: url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.eot');  
13 - src: url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.eot?#iefix') format('embedded-opentype'),  
14 - url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.woff2') format('woff2'),  
15 - url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.woff') format('woff'),  
16 - url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.ttf') format('truetype'),  
17 - url('//at.alicdn.com/t/font_636259_21eqdmerlfuj.svg#iconfont') format('svg'); 12 + src: url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.eot');
  13 + src: url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.eot?#iefix') format('embedded-opentype'),
  14 + url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.woff2') format('woff2'),
  15 + url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.woff') format('woff'),
  16 + url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.ttf') format('truetype'),
  17 + url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.svg#iconfont') format('svg');
18 } 18 }
19 /** 19 /**
20 * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/) 20 * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
@@ -255,20 +255,25 @@ input, textarea { @@ -255,20 +255,25 @@ input, textarea {
255 } 255 }
256 256
257 .good_btn { 257 .good_btn {
258 - height: 60rpx;  
259 - width: 60rpx; 258 + height: 100rpx;
  259 + width: 100rpx;
  260 + padding: 20rpx;
  261 + box-sizing: border-box;
260 display: flex; 262 display: flex;
261 align-items: center; 263 align-items: center;
262 justify-content: center; 264 justify-content: center;
263 - border-radius: 50%;  
264 - background-color: #ffda44;  
265 - box-shadow: 5rpx 0px 5rpx rgba(248, 207, 38, 0.3); 265 + text-align: center;
266 } 266 }
267 267
268 .icon-gouwuche { 268 .icon-gouwuche {
269 font-size: 29rpx; 269 font-size: 29rpx;
  270 + line-height: 60rpx;
270 color: #444; 271 color: #444;
271 - 272 + width:60rpx;
  273 + height: 60rpx;
  274 + border-radius: 50%;
  275 + background-color: #ffda44;
  276 + box-shadow: 5rpx 0px 5rpx rgba(248, 207, 38, 0.3);
272 } 277 }
273 278
274 /* 头部信息 */ 279 /* 头部信息 */
@@ -307,13 +312,15 @@ input, textarea { @@ -307,13 +312,15 @@ input, textarea {
307 312
308 313
309 314
  315 +
310 @font-face { 316 @font-face {
311 font-family: 'iconfont'; /* project id 636259 */ 317 font-family: 'iconfont'; /* project id 636259 */
312 - src: url('//at.alicdn.com/t/font_636259_xrf3sdkafk.eot');  
313 - src: url('//at.alicdn.com/t/font_636259_xrf3sdkafk.eot?#iefix') format('embedded-opentype'),  
314 - url('//at.alicdn.com/t/font_636259_xrf3sdkafk.woff') format('woff'),  
315 - url('//at.alicdn.com/t/font_636259_xrf3sdkafk.ttf') format('truetype'),  
316 - url('//at.alicdn.com/t/font_636259_xrf3sdkafk.svg#iconfont') format('svg'); 318 + src: url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.eot');
  319 + src: url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.eot?#iefix') format('embedded-opentype'),
  320 + url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.woff2') format('woff2'),
  321 + url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.woff') format('woff'),
  322 + url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.ttf') format('truetype'),
  323 + url('//at.alicdn.com/t/font_636259_h4mpxnqg2wu.svg#iconfont') format('svg');
317 } 324 }
318 325
319 326
@@ -604,6 +611,10 @@ input, textarea { @@ -604,6 +611,10 @@ input, textarea {
604 content: "\e63b" 611 content: "\e63b"
605 } 612 }
606 613
  614 +.icon-duigoua:before{
  615 + content: "\e63c"
  616 +}
  617 +
607 618
608 619
609 620
@@ -150,6 +150,9 @@ Page({ @@ -150,6 +150,9 @@ Page({
150 showList.push(ele) 150 showList.push(ele)
151 } 151 }
152 ele.t = false 152 ele.t = false
  153 + if(indexxx<r.data.info.num){
  154 + ele.t=true
  155 + }
153 ele.attr.attr_sku.forEach(function (eles, indexxxx) { 156 ele.attr.attr_sku.forEach(function (eles, indexxxx) {
154 for (let i = 0; i < eles.item.length; i++) { 157 for (let i = 0; i < eles.item.length; i++) {
155 eles.item[i].t = false 158 eles.item[i].t = false
@@ -273,7 +276,7 @@ Page({ @@ -273,7 +276,7 @@ Page({
273 }) 276 })
274 if ((n < goods.info.num && n > 0) || n > goods.info.num) { 277 if ((n < goods.info.num && n > 0) || n > goods.info.num) {
275 wx.showToast({ 278 wx.showToast({
276 - title: '请选择' + num + '种商品', 279 + title: '您最多只能选择' + num + '种商品',
277 icon: 'none' 280 icon: 'none'
278 }) 281 })
279 return; 282 return;
@@ -487,11 +490,19 @@ Page({ @@ -487,11 +490,19 @@ Page({
487 let indexs = e.currentTarget.dataset.index 490 let indexs = e.currentTarget.dataset.index
488 let that = this 491 let that = this
489 let list = that.data.packageList 492 let list = that.data.packageList
  493 + let n=0
490 list.forEach(function (ele, index) { 494 list.forEach(function (ele, index) {
491 if (indexs == index) { 495 if (indexs == index) {
492 - console.log(ele.t + "之前")  
493 ele.t = !ele.t 496 ele.t = !ele.t
494 - console.log(ele.t + "之后") 497 + }
  498 + if(ele.t){
  499 + n++
  500 + }
  501 + if(n>that.data.goods.info.num){
  502 + wx.showToast({
  503 + title: '您最多可选择'+that.data.goods.info.num+'种商品',
  504 + icon:'none'
  505 + })
495 } 506 }
496 }) 507 })
497 that.setData({ 508 that.setData({
@@ -201,6 +201,7 @@ @@ -201,6 +201,7 @@
201 <view class='banner'> 201 <view class='banner'>
202 <view class='iconfont icon-fanhui' catchtap='closeShowMore'></view> 202 <view class='iconfont icon-fanhui' catchtap='closeShowMore'></view>
203 <view class='coupons'>商品详情</view> 203 <view class='coupons'>商品详情</view>
  204 + <view class='share' catchtap='closeShowMore'>确定</view>
204 </view> 205 </view>
205 <view class='explaina'> 206 <view class='explaina'>
206 <view class='explain_one'> 207 <view class='explain_one'>
@@ -213,7 +214,7 @@ @@ -213,7 +214,7 @@
213 </view> 214 </view>
214 <view class='three'> 215 <view class='three'>
215 <view class='collocation_boxa' wx:for='{{packageList}}' wx:for-index='index' wx:key='{{index}}' bindtap='goDetail' data-id='{{item.id}}'> 216 <view class='collocation_boxa' wx:for='{{packageList}}' wx:for-index='index' wx:key='{{index}}' bindtap='goDetail' data-id='{{item.id}}'>
216 - <view class='iconfont icon-weixuanzhong {{item.t?"active":""}}' catchtap='changeFlag' data-index='{{index}}'></view> 217 + <view class='iconfont icon-weixuanzhong xuanzhongda {{item.t?"active":""}}' catchtap='changeFlag' data-index='{{index}}'></view>
217 <view class='collocation_img'> 218 <view class='collocation_img'>
218 <image src='{{item.more.thumbnail}}'></image> 219 <image src='{{item.more.thumbnail}}'></image>
219 </view> 220 </view>
@@ -5,13 +5,16 @@ page { @@ -5,13 +5,16 @@ page {
5 width: 100%; 5 width: 100%;
6 height: 100%; 6 height: 100%;
7 } 7 }
8 -.page{ 8 +
  9 +.page {
9 width: 100%; 10 width: 100%;
10 - height: 100% 11 + height: 100%;
11 } 12 }
12 -.page.active{  
13 - overflow: hidden 13 +
  14 +.page.active {
  15 + overflow: hidden;
14 } 16 }
  17 +
15 .big_box { 18 .big_box {
16 width: 100%; 19 width: 100%;
17 height: 100%; 20 height: 100%;
@@ -68,10 +71,11 @@ page { @@ -68,10 +71,11 @@ page {
68 position: fixed; 71 position: fixed;
69 z-index: 999999; 72 z-index: 999999;
70 } 73 }
71 -.banner_box{  
72 - position: relative;  
73 74
  75 +.banner_box {
  76 + position: relative;
74 } 77 }
  78 +
75 .banner_img { 79 .banner_img {
76 height: 630rpx; 80 height: 630rpx;
77 padding-top: 80rpx; 81 padding-top: 80rpx;
@@ -100,7 +104,7 @@ page { @@ -100,7 +104,7 @@ page {
100 text-overflow: ellipsis; 104 text-overflow: ellipsis;
101 overflow: hidden; 105 overflow: hidden;
102 white-space: nowrap; 106 white-space: nowrap;
103 - position: relative 107 + position: relative;
104 } 108 }
105 109
106 .banner_character { 110 .banner_character {
@@ -138,7 +142,7 @@ page { @@ -138,7 +142,7 @@ page {
138 width: auto; 142 width: auto;
139 margin-left: 40rpx; 143 margin-left: 40rpx;
140 display: flex; 144 display: flex;
141 - align-items: center 145 + align-items: center;
142 } 146 }
143 147
144 .money_icon2 { 148 .money_icon2 {
@@ -158,9 +162,9 @@ page { @@ -158,9 +162,9 @@ page {
158 margin-left: 5rpx; 162 margin-left: 5rpx;
159 } 163 }
160 164
161 -.vip image{ 165 +.vip image {
162 width: 100%; 166 width: 100%;
163 - height: 100% 167 + height: 100%;
164 } 168 }
165 169
166 .list_content { 170 .list_content {
@@ -267,7 +271,8 @@ page { @@ -267,7 +271,8 @@ page {
267 margin-left: 113rpx; 271 margin-left: 113rpx;
268 } 272 }
269 273
270 -.item_list2, .item_list3, .item_list4, .itme_list5, .item_list6, .item_list7 , .item_list10 { 274 +.item_list2, .item_list3, .item_list4, .itme_list5, .item_list6, .item_list7,
  275 +.item_list10 {
271 background-color: #fff; 276 background-color: #fff;
272 margin-bottom: 20rpx; 277 margin-bottom: 20rpx;
273 } 278 }
@@ -629,9 +634,10 @@ page { @@ -629,9 +634,10 @@ page {
629 padding: 30rpx 25rpx; 634 padding: 30rpx 25rpx;
630 margin-bottom: 120rpx; 635 margin-bottom: 120rpx;
631 } 636 }
632 -.item_list10{ 637 +
  638 +.item_list10 {
633 padding: 30rpx 25rpx; 639 padding: 30rpx 25rpx;
634 - box-sizing: border-box 640 + box-sizing: border-box;
635 } 641 }
636 642
637 .collocation_title { 643 .collocation_title {
@@ -651,7 +657,7 @@ page { @@ -651,7 +657,7 @@ page {
651 width: 340rpx; 657 width: 340rpx;
652 border-radius: 16rpx; 658 border-radius: 16rpx;
653 overflow: hidden; 659 overflow: hidden;
654 - margin-bottom:20rpx; 660 + margin-bottom: 20rpx;
655 } 661 }
656 662
657 .collocation_img { 663 .collocation_img {
@@ -670,7 +676,7 @@ page { @@ -670,7 +676,7 @@ page {
670 color: #222; 676 color: #222;
671 padding: 22rpx; 677 padding: 22rpx;
672 height: 152rpx; 678 height: 152rpx;
673 - position: relative 679 + position: relative;
674 } 680 }
675 681
676 .bottom_btn { 682 .bottom_btn {
@@ -730,7 +736,8 @@ page { @@ -730,7 +736,8 @@ page {
730 font-size: 26rpx; 736 font-size: 26rpx;
731 color: #fff; 737 color: #fff;
732 } 738 }
733 -.join_btns{ 739 +
  740 +.join_btns {
734 width: 266rpx; 741 width: 266rpx;
735 height: 100rpx; 742 height: 100rpx;
736 display: flex; 743 display: flex;
@@ -738,7 +745,7 @@ page { @@ -738,7 +745,7 @@ page {
738 justify-content: center; 745 justify-content: center;
739 font-size: 26rpx; 746 font-size: 26rpx;
740 color: #fff; 747 color: #fff;
741 - background: transparent 748 + background: transparent;
742 } 749 }
743 750
744 .immediately_btn { 751 .immediately_btn {
@@ -927,124 +934,138 @@ page { @@ -927,124 +934,138 @@ page {
927 color: #ededed; 934 color: #ededed;
928 font-size: 36rpx; 935 font-size: 36rpx;
929 } 936 }
  937 +
930 /*团购样式*/ 938 /*团购样式*/
931 -.banner_box_group{  
932 - width:700rpx;  
933 - height:45rpx; 939 +
  940 +.banner_box_group {
  941 + width: 700rpx;
  942 + height: 45rpx;
934 position: absolute; 943 position: absolute;
935 left: 0; 944 left: 0;
936 bottom: 0; 945 bottom: 0;
937 - background: linear-gradient(to right,#ffda44,transparent);  
938 - padding-left:26rpx; 946 + background: linear-gradient(to right, #ffda44, transparent);
  947 + padding-left: 26rpx;
939 z-index: 999; 948 z-index: 999;
940 - font-size:26rpx;  
941 -font-family:PingFang-SC-Medium;  
942 -font-weight:500;  
943 -color:rgba(255,255,255,1);  
944 -line-height:45rpx; 949 + font-size: 26rpx;
  950 + font-family: PingFang-SC-Medium;
  951 + font-weight: 500;
  952 + color: rgba(255, 255, 255, 1);
  953 + line-height: 45rpx;
945 } 954 }
  955 +
946 /*团购*/ 956 /*团购*/
947 -.good_price_progress{  
948 - margin-top:10rpx;  
949 - }  
950 -.group_font{  
951 - font-size:24rpx;  
952 -font-family:PingFang-SC-Medium;  
953 -font-weight:500;  
954 -color:rgba(136,136,136,1);  
955 -line-height:24rpx;  
956 -height: 24rpx;  
957 -  
958 -}  
959 -.goods_margin_top{  
960 - margin-top:20rpx;  
961 -}  
962 -.group_image{ 957 +
  958 +.good_price_progress {
  959 + margin-top: 10rpx;
  960 +}
  961 +
  962 +.group_font {
  963 + font-size: 24rpx;
  964 + font-family: PingFang-SC-Medium;
  965 + font-weight: 500;
  966 + color: rgba(136, 136, 136, 1);
  967 + line-height: 24rpx;
  968 + height: 24rpx;
  969 +}
  970 +
  971 +.goods_margin_top {
  972 + margin-top: 20rpx;
  973 +}
  974 +
  975 +.group_image {
963 border-radius: 16rpx; 976 border-radius: 16rpx;
964 - overflow: hidden 977 + overflow: hidden;
965 } 978 }
966 -.group_time{ 979 +
  980 +.group_time {
967 position: absolute; 981 position: absolute;
968 - bottom:0;  
969 - height:30px;  
970 - width:200rpx;  
971 - background:rgba(187,187,187,1); 982 + bottom: 0;
  983 + height: 30px;
  984 + width: 200rpx;
  985 + background: rgba(187, 187, 187, 1);
972 border-radius: 0 0 16rpx 16rpx; 986 border-radius: 0 0 16rpx 16rpx;
973 - padding:0 10rpx;  
974 - font-size:20rpx;  
975 -font-family:PingFang-SC-Medium;  
976 -font-weight:500;  
977 -color:rgba(255,255,255,1);  
978 -line-height:54rpx;  
979 -text-align: center;  
980 -}  
981 -.group_time.active{  
982 - background:rgba(255,68,68,1);  
983 - } 987 + padding: 0 10rpx;
  988 + font-size: 20rpx;
  989 + font-family: PingFang-SC-Medium;
  990 + font-weight: 500;
  991 + color: rgba(255, 255, 255, 1);
  992 + line-height: 54rpx;
  993 + text-align: center;
  994 +}
  995 +
  996 +.group_time.active {
  997 + background: rgba(255, 68, 68, 1);
  998 +}
984 999
985 /*小贴士*/ 1000 /*小贴士*/
986 1001
987 -.explain{ 1002 +.explain {
988 width: 93.6%; 1003 width: 93.6%;
989 - height:auto;  
990 - box-shadow:0px 15px 30px 0px rgba(214,214,214,0.6);  
991 - border-radius:16px; 1004 + height: auto;
  1005 + box-shadow: 0px 15px 30px 0px rgba(214, 214, 214, 0.6);
  1006 + border-radius: 16px;
992 background: #fff; 1007 background: #fff;
993 - margin:20rpx auto 130rpx;  
994 - padding:18rpx 49rpx;  
995 - box-sizing: border-box 1008 + margin: 20rpx auto 130rpx;
  1009 + padding: 18rpx 49rpx;
  1010 + box-sizing: border-box;
996 } 1011 }
997 -.explain_one{ 1012 +
  1013 +.explain_one {
998 text-align: center; 1014 text-align: center;
999 - font-size:30rpx;  
1000 - font-family:PingFang-SC-Heavy;  
1001 - font-weight:800;  
1002 - color:rgba(38,54,58,1);  
1003 - line-height:62rpx; 1015 + font-size: 30rpx;
  1016 + font-family: PingFang-SC-Heavy;
  1017 + font-weight: 800;
  1018 + color: rgba(38, 54, 58, 1);
  1019 + line-height: 62rpx;
1004 position: relative; 1020 position: relative;
1005 - margin-bottom:16rpx; 1021 + margin-bottom: 16rpx;
1006 } 1022 }
1007 -.explain_one::before{ 1023 +
  1024 +.explain_one::before {
1008 width: 115rpx; 1025 width: 115rpx;
1009 height: 1rpx; 1026 height: 1rpx;
1010 position: absolute; 1027 position: absolute;
1011 - left:70rpx;  
1012 - top:0;  
1013 - bottom:0;  
1014 - margin:auto 0; 1028 + left: 70rpx;
  1029 + top: 0;
  1030 + bottom: 0;
  1031 + margin: auto 0;
1015 content: ''; 1032 content: '';
1016 - background: linear-gradient(to left,rgba(187,187,187,1),transparent); 1033 + background: linear-gradient(to left, rgba(187, 187, 187, 1), transparent);
1017 } 1034 }
1018 -.explain_one::after{ 1035 +
  1036 +.explain_one::after {
1019 width: 115rpx; 1037 width: 115rpx;
1020 height: 1rpx; 1038 height: 1rpx;
1021 position: absolute; 1039 position: absolute;
1022 - right:70rpx;  
1023 - top:0;  
1024 - bottom:0;  
1025 - margin:auto 0; 1040 + right: 70rpx;
  1041 + top: 0;
  1042 + bottom: 0;
  1043 + margin: auto 0;
1026 content: ''; 1044 content: '';
1027 - background: linear-gradient(to right,rgba(187,187,187,1),transparent); 1045 + background: linear-gradient(to right, rgba(187, 187, 187, 1), transparent);
1028 } 1046 }
1029 -.explain_two{  
1030 - font-size:26rpx;  
1031 - font-family:PingFang-SC-Medium;  
1032 - font-weight:500;  
1033 - color:rgba(38,54,58,1); 1047 +
  1048 +.explain_two {
  1049 + font-size: 26rpx;
  1050 + font-family: PingFang-SC-Medium;
  1051 + font-weight: 500;
  1052 + color: rgba(38, 54, 58, 1);
1034 line-height: 40rpx; 1053 line-height: 40rpx;
1035 } 1054 }
1036 -.food_title_all{  
1037 - margin-bottom:30rpx; 1055 +
  1056 +.food_title_all {
  1057 + margin-bottom: 30rpx;
1038 } 1058 }
1039 -.two_title_xixi{ 1059 +
  1060 +.two_title_xixi {
1040 width: 100%; 1061 width: 100%;
1041 height: 23rpx; 1062 height: 23rpx;
1042 text-align: center; 1063 text-align: center;
1043 - font-size:22rpx;  
1044 -font-family:PingFang-SC-Medium;  
1045 -font-weight:500;  
1046 -color:rgba(148,153,154,1);  
1047 -line-height:23rpx; 1064 + font-size: 22rpx;
  1065 + font-family: PingFang-SC-Medium;
  1066 + font-weight: 500;
  1067 + color: rgba(148, 153, 154, 1);
  1068 + line-height: 23rpx;
1048 } 1069 }
1049 1070
1050 .collocation_contents { 1071 .collocation_contents {
@@ -1053,74 +1074,100 @@ line-height:23rpx; @@ -1053,74 +1074,100 @@ line-height:23rpx;
1053 color: #222; 1074 color: #222;
1054 padding: 22rpx; 1075 padding: 22rpx;
1055 } 1076 }
1056 -.overflowe{ 1077 +
  1078 +.overflowe {
1057 text-overflow: ellipsis; 1079 text-overflow: ellipsis;
1058 overflow: hidden; 1080 overflow: hidden;
1059 white-space: nowrap; 1081 white-space: nowrap;
1060 - position: relative 1082 + position: relative;
1061 } 1083 }
1062 -.icon-icondayu{ 1084 +
  1085 +.icon-icondayu {
1063 position: absolute; 1086 position: absolute;
1064 right: 0; 1087 right: 0;
1065 top: 50%; 1088 top: 50%;
1066 transform: translateY(-50%); 1089 transform: translateY(-50%);
1067 } 1090 }
  1091 +
1068 .introduces { 1092 .introduces {
1069 font-size: 28rpx; 1093 font-size: 28rpx;
1070 color: #888; 1094 color: #888;
1071 } 1095 }
  1096 +
1072 .collocation_boxs { 1097 .collocation_boxs {
1073 width: 360rpx; 1098 width: 360rpx;
1074 border-radius: 16rpx; 1099 border-radius: 16rpx;
1075 overflow: hidden; 1100 overflow: hidden;
1076 float: left; 1101 float: left;
1077 - padding:0 10rpx;  
1078 - position: relative 1102 + padding: 0 10rpx;
  1103 + position: relative;
1079 } 1104 }
1080 -.icon-weixuanzhong{ 1105 +
  1106 +.icon-weixuanzhong {
1081 position: absolute; 1107 position: absolute;
1082 - right:20rpx;  
1083 - top:15rpx;  
1084 - color:#888; 1108 + right: 20rpx;
  1109 + top: 15rpx;
  1110 + color: #888;
  1111 +}
  1112 +
  1113 +.icon-weixuanzhong.active {
  1114 + color: rgba(255, 218, 68, 1);
1085 } 1115 }
1086 -.icon-weixuanzhong.active{  
1087 - color:rgba(255,218,68,1); 1116 +
  1117 +.xuanzhongda {
  1118 + width:80rpx;
  1119 + height: 80rpx;
  1120 + display: flex;
  1121 + align-items: center;
  1122 + justify-content: center;
  1123 + position: absolute;
  1124 + right: 0rpx !important;
  1125 + top: 0rpx !important;
  1126 + color: #888;
  1127 + font-size: 40rpx !important;
1088 } 1128 }
1089 -.replace_dishes{ 1129 +
  1130 +.replace_dishes {
1090 width: 100%; 1131 width: 100%;
1091 /* width:699px; */ 1132 /* width:699px; */
1092 -height:80rpx;  
1093 -border:1rpx solid rgba(255,68,68,1);  
1094 -border-radius:40rpx;  
1095 -margin:10rpx 0 20rpx;  
1096 -display: flex;  
1097 -justify-content: center;  
1098 -align-items: center  
1099 -}  
1100 -.replace_dishes_center{ 1133 + height: 80rpx;
  1134 + border: 1rpx solid rgba(255, 68, 68, 1);
  1135 + border-radius: 40rpx;
  1136 + margin: 10rpx 0 20rpx;
  1137 + display: flex;
  1138 + justify-content: center;
  1139 + align-items: center;
  1140 +}
  1141 +
  1142 +.replace_dishes_center {
1101 display: flex; 1143 display: flex;
1102 /* align-items: center */ 1144 /* align-items: center */
1103 } 1145 }
1104 -.replace_image{ 1146 +
  1147 +.replace_image {
1105 width: 31rpx; 1148 width: 31rpx;
1106 height: 29rpx; 1149 height: 29rpx;
1107 - margin-right:18rpx;  
1108 - margin-top:-14rpx; 1150 + margin-right: 18rpx;
  1151 + margin-top: -14rpx;
1109 } 1152 }
1110 -.replace_image image{ 1153 +
  1154 +.replace_image image {
1111 width: 100%; 1155 width: 100%;
1112 - height: 100% 1156 + height: 100%;
1113 } 1157 }
1114 -.replace_font{ 1158 +
  1159 +.replace_font {
1115 height: 29rpx; 1160 height: 29rpx;
1116 - font-size:26rpx;  
1117 -font-family:PingFang-SC-Medium;  
1118 -font-weight:500;  
1119 -color:rgba(255,68,68,1);  
1120 -line-height: 29rpx; 1161 + font-size: 26rpx;
  1162 + font-family: PingFang-SC-Medium;
  1163 + font-weight: 500;
  1164 + color: rgba(255, 68, 68, 1);
  1165 + line-height: 29rpx;
1121 } 1166 }
  1167 +
1122 /*更换菜品弹框*/ 1168 /*更换菜品弹框*/
1123 -.maskMore{ 1169 +
  1170 +.maskMore {
1124 width: 100%; 1171 width: 100%;
1125 min-height: 100%; 1172 min-height: 100%;
1126 background: #f3f5f5; 1173 background: #f3f5f5;
@@ -1134,66 +1181,73 @@ line-height: 29rpx; @@ -1134,66 +1181,73 @@ line-height: 29rpx;
1134 color: #222; 1181 color: #222;
1135 display: flex; 1182 display: flex;
1136 } 1183 }
1137 -.explaina{ 1184 +
  1185 +.explaina {
1138 width: 93.6%; 1186 width: 93.6%;
1139 - height:auto;  
1140 - box-shadow:0px 15px 30px 0px rgba(214,214,214,0.6);  
1141 - border-radius:16px; 1187 + height: auto;
  1188 + box-shadow: 0px 15px 30px 0px rgba(214, 214, 214, 0.6);
  1189 + border-radius: 16px;
1142 background: #fff; 1190 background: #fff;
1143 - margin:120rpx auto 40rpx;  
1144 - padding:18rpx 49rpx 18rpx;  
1145 - box-sizing: border-box 1191 + margin: 120rpx auto 40rpx;
  1192 + padding: 18rpx 49rpx 18rpx;
  1193 + box-sizing: border-box;
1146 } 1194 }
1147 -.explain_one{ 1195 +
  1196 +.explain_one {
1148 text-align: center; 1197 text-align: center;
1149 - font-size:30rpx;  
1150 - font-family:PingFang-SC-Heavy;  
1151 - font-weight:800;  
1152 - color:rgba(38,54,58,1);  
1153 - line-height:62rpx; 1198 + font-size: 30rpx;
  1199 + font-family: PingFang-SC-Heavy;
  1200 + font-weight: 800;
  1201 + color: rgba(38, 54, 58, 1);
  1202 + line-height: 62rpx;
1154 position: relative; 1203 position: relative;
1155 - margin-bottom:16rpx; 1204 + margin-bottom: 16rpx;
1156 } 1205 }
1157 -.explain_one::before{ 1206 +
  1207 +.explain_one::before {
1158 width: 115rpx; 1208 width: 115rpx;
1159 height: 1rpx; 1209 height: 1rpx;
1160 position: absolute; 1210 position: absolute;
1161 - left:70rpx;  
1162 - top:0;  
1163 - bottom:0;  
1164 - margin:auto 0; 1211 + left: 70rpx;
  1212 + top: 0;
  1213 + bottom: 0;
  1214 + margin: auto 0;
1165 content: ''; 1215 content: '';
1166 - background: linear-gradient(to left,rgba(187,187,187,1),transparent); 1216 + background: linear-gradient(to left, rgba(187, 187, 187, 1), transparent);
1167 } 1217 }
1168 -.explain_one::after{ 1218 +
  1219 +.explain_one::after {
1169 width: 115rpx; 1220 width: 115rpx;
1170 height: 1rpx; 1221 height: 1rpx;
1171 position: absolute; 1222 position: absolute;
1172 - right:70rpx;  
1173 - top:0;  
1174 - bottom:0;  
1175 - margin:auto 0; 1223 + right: 70rpx;
  1224 + top: 0;
  1225 + bottom: 0;
  1226 + margin: auto 0;
1176 content: ''; 1227 content: '';
1177 - background: linear-gradient(to right,rgba(187,187,187,1),transparent); 1228 + background: linear-gradient(to right, rgba(187, 187, 187, 1), transparent);
1178 } 1229 }
1179 -.explain_two{  
1180 - font-size:26rpx;  
1181 - font-family:PingFang-SC-Medium;  
1182 - font-weight:500;  
1183 - color:rgba(38,54,58,1); 1230 +
  1231 +.explain_two {
  1232 + font-size: 26rpx;
  1233 + font-family: PingFang-SC-Medium;
  1234 + font-weight: 500;
  1235 + color: rgba(38, 54, 58, 1);
1184 line-height: 40rpx; 1236 line-height: 40rpx;
1185 } 1237 }
1186 -.three{ 1238 +
  1239 +.three {
1187 width: 100%; 1240 width: 100%;
1188 - padding:0 15rpx;  
1189 - } 1241 + padding: 0 15rpx;
  1242 +}
  1243 +
1190 .collocation_boxa { 1244 .collocation_boxa {
1191 width: 360rpx; 1245 width: 360rpx;
1192 border-radius: 16rpx; 1246 border-radius: 16rpx;
1193 overflow: hidden; 1247 overflow: hidden;
1194 float: left; 1248 float: left;
1195 - padding:0 10rpx;  
1196 - position: relative 1249 + padding: 0 10rpx;
  1250 + position: relative;
1197 } 1251 }
1198 1252
1199 .collocation_img { 1253 .collocation_img {
@@ -1211,15 +1265,17 @@ line-height: 29rpx; @@ -1211,15 +1265,17 @@ line-height: 29rpx;
1211 color: #888; 1265 color: #888;
1212 } 1266 }
1213 1267
1214 -.icon-weixuanzhong{ 1268 +.icon-weixuanzhong {
1215 position: absolute; 1269 position: absolute;
1216 - right:20rpx;  
1217 - top:15rpx;  
1218 - color:#888; 1270 + right: 20rpx;
  1271 + top: 15rpx;
  1272 + color: #888;
1219 } 1273 }
1220 -.icon-weixuanzhong.active{  
1221 - color:rgba(255,218,68,1); 1274 +
  1275 +.icon-weixuanzhong.active {
  1276 + color: rgba(255, 218, 68, 1);
1222 } 1277 }
  1278 +
1223 /*购物车添加状态*/ 1279 /*购物车添加状态*/
1224 1280
1225 .cart_mask { 1281 .cart_mask {
@@ -1388,11 +1444,13 @@ line-height: 29rpx; @@ -1388,11 +1444,13 @@ line-height: 29rpx;
1388 color: #ededed; 1444 color: #ededed;
1389 font-size: 36rpx; 1445 font-size: 36rpx;
1390 } 1446 }
  1447 +
1391 .pickage_display { 1448 .pickage_display {
1392 font-size: 24rpx; 1449 font-size: 24rpx;
1393 color: #f44; 1450 color: #f44;
1394 margin-top: 47rpx; 1451 margin-top: 47rpx;
1395 } 1452 }
  1453 +
1396 .money_icon2 { 1454 .money_icon2 {
1397 font-size: 22rpx; 1455 font-size: 22rpx;
1398 color: #f44; 1456 color: #f44;
@@ -46,7 +46,9 @@ Page({ @@ -46,7 +46,9 @@ Page({
46 groupList: [], 46 groupList: [],
47 yesno: false, 47 yesno: false,
48 stock:0, 48 stock:0,
49 - is_vip:0 49 + is_vip:0,
  50 + string:'',
  51 + gggPrice: null
50 }, 52 },
51 //进入基本参数 53 //进入基本参数
52 jumpBasicInfo() { 54 jumpBasicInfo() {
@@ -203,6 +205,8 @@ Page({ @@ -203,6 +205,8 @@ Page({
203 console.log(str) 205 console.log(str)
204 new_arr_item = new_arr_item.join(','); 206 new_arr_item = new_arr_item.join(',');
205 new_arr_item = new_arr_item.replace(/,/g, " "); 207 new_arr_item = new_arr_item.replace(/,/g, " ");
  208 + var string = ''
  209 + var gggPrice = null
206 for (let i in sys_attrprice) { 210 for (let i in sys_attrprice) {
207 if (i == str) { 211 if (i == str) {
208 skuid = sys_attrprice[i].skuid 212 skuid = sys_attrprice[i].skuid
@@ -210,8 +214,14 @@ Page({ @@ -210,8 +214,14 @@ Page({
210 old_skuid_price = sys_attrprice[i].old_price 214 old_skuid_price = sys_attrprice[i].old_price
211 vip_skuid_price = sys_attrprice[i].vip_price 215 vip_skuid_price = sys_attrprice[i].vip_price
212 stock = sys_attrprice[i].stock 216 stock = sys_attrprice[i].stock
  217 + string = sys_attrprice[i].sku_values
213 } 218 }
214 } 219 }
  220 + if(that.data.is_vip==1){
  221 + gggPrice = vip_skuid_price
  222 + } else {
  223 + gggPrice = old_skuid_price
  224 + }
215 this.setData({ 225 this.setData({
216 id_arr: new_arr, 226 id_arr: new_arr,
217 idss: new_arr, 227 idss: new_arr,
@@ -221,7 +231,9 @@ Page({ @@ -221,7 +231,9 @@ Page({
221 vip_skuid_price: vip_skuid_price, 231 vip_skuid_price: vip_skuid_price,
222 skuid_arr: new_arr, 232 skuid_arr: new_arr,
223 ids: new_arr_item, 233 ids: new_arr_item,
224 - stock:stock 234 + stock:stock,
  235 + string: string,
  236 + gggPrice: gggPrice
225 }); 237 });
226 }, 238 },
227 //关闭弹窗 239 //关闭弹窗
@@ -282,6 +294,7 @@ Page({ @@ -282,6 +294,7 @@ Page({
282 }; 294 };
283 let that = this 295 let that = this
284 let stock=null 296 let stock=null
  297 + let string = null
285 app.post(url, params).then(r => { 298 app.post(url, params).then(r => {
286 console.log(r); 299 console.log(r);
287 WxParse.wxParse('content', 'html', r.data.info.content, this, 5); 300 WxParse.wxParse('content', 'html', r.data.info.content, this, 5);
@@ -316,8 +329,15 @@ Page({ @@ -316,8 +329,15 @@ Page({
316 old_skuid_price = sys_attrprice[i].old_price 329 old_skuid_price = sys_attrprice[i].old_price
317 vip_skuid_price = sys_attrprice[i].vip_price 330 vip_skuid_price = sys_attrprice[i].vip_price
318 stock = sys_attrprice[i].stock 331 stock = sys_attrprice[i].stock
  332 + string =sys_attrprice[i].sku_values
319 } 333 }
320 } 334 }
  335 + var gggPrice = null
  336 + if(that.data.is_vip==1){
  337 + gggPrice = vip_skuid_price
  338 + }else{
  339 + gggPrice = old_skuid_price
  340 + }
321 r.data.comment.forEach(function(ele, index) { 341 r.data.comment.forEach(function(ele, index) {
322 that.setData({ 342 that.setData({
323 goods_star: ele.goods_stars 343 goods_star: ele.goods_stars
@@ -361,6 +381,7 @@ Page({ @@ -361,6 +381,7 @@ Page({
361 percent: percent, 381 percent: percent,
362 goods: r.data, 382 goods: r.data,
363 gPrice: zuihoujiage, 383 gPrice: zuihoujiage,
  384 + gggPrice: gggPrice,
364 collocation: r.data.collocation, 385 collocation: r.data.collocation,
365 comment: r.data.comment, 386 comment: r.data.comment,
366 skuid: skuid, 387 skuid: skuid,
@@ -368,7 +389,8 @@ Page({ @@ -368,7 +389,8 @@ Page({
368 id_arr: arr, 389 id_arr: arr,
369 skuid_arr: arr, 390 skuid_arr: arr,
370 yesno: true, 391 yesno: true,
371 - stock: stock 392 + stock: stock,
  393 + string: string
372 }); 394 });
373 } else { 395 } else {
374 console.log("不是团购") 396 console.log("不是团购")
@@ -376,6 +398,7 @@ Page({ @@ -376,6 +398,7 @@ Page({
376 yesno: false, 398 yesno: false,
377 goods: r.data, 399 goods: r.data,
378 gPrice: zuihoujiage, 400 gPrice: zuihoujiage,
  401 + gggPrice: gggPrice,
379 collocation: r.data.collocation, 402 collocation: r.data.collocation,
380 comment: r.data.comment, 403 comment: r.data.comment,
381 favorite: r.data.is_favorite, 404 favorite: r.data.is_favorite,
@@ -385,7 +408,8 @@ Page({ @@ -385,7 +408,8 @@ Page({
385 skuid: skuid, 408 skuid: skuid,
386 skuid_arr: arr, 409 skuid_arr: arr,
387 id_arr: arr, 410 id_arr: arr,
388 - stock: stock 411 + stock: stock,
  412 + string: string
389 }); 413 });
390 } 414 }
391 }); 415 });
@@ -53,8 +53,8 @@ @@ -53,8 +53,8 @@
53 <text class='original_price '>￥{{goods.info.old_price}}</text> 53 <text class='original_price '>￥{{goods.info.old_price}}</text>
54 </view> 54 </view>
55 <view class='display_box '> 55 <view class='display_box '>
56 - <text class='money_icon2 '>￥</text>  
57 - <text class='money2 '>{{goods.info.vip_price}}</text> 56 + <view class='money_icon2 '>￥</view>
  57 + <view class='money2 '>{{goods.info.vip_price}}</view>
58 <view class='vip '> 58 <view class='vip '>
59 <image class='vipvip ' src='{{imgUrl}}vipvip.png '></image> 59 <image class='vipvip ' src='{{imgUrl}}vipvip.png '></image>
60 </view> 60 </view>
@@ -275,7 +275,7 @@ @@ -275,7 +275,7 @@
275 </view> 275 </view>
276 276
277 <view class='templates' id='NAV{{two}}'> 277 <view class='templates' id='NAV{{two}}'>
278 - <template is="wxParse" data="{{wxParseData:content.nodes}}" /> 278 + <template class='' is="wxParse" data="{{wxParseData:content.nodes}}" />
279 </view> 279 </view>
280 </view> 280 </view>
281 </scroll-view> 281 </scroll-view>
@@ -311,18 +311,27 @@ @@ -311,18 +311,27 @@
311 <view class='quality_left {{value.t?"active":""}}' wx:for='{{cell.item}}' wx:key='{{key}}' data-gid='{{value.id}}' data-parent="{{cellindex}}" data-item="{{value.attribute_value}}" data-index="{{index}}" bindtap='changeIds' wx:for-item='value'>{{value.attribute_value}}</view> 311 <view class='quality_left {{value.t?"active":""}}' wx:for='{{cell.item}}' wx:key='{{key}}' data-gid='{{value.id}}' data-parent="{{cellindex}}" data-item="{{value.attribute_value}}" data-index="{{index}}" bindtap='changeIds' wx:for-item='value'>{{value.attribute_value}}</view>
312 </view> 312 </view>
313 </view> 313 </view>
314 - 314 + <view class='goumaishuliang'>
  315 + <view>购买数量</view>
  316 + <text decode="{{true}}" class='kucun'>&nbsp;（库存{{stock}}）</text>
  317 + <view class='jiajianjian' wx:if='{{!goods.groupType}}'>
  318 + <view bindtap='dec_num' class='dec_num'>-</view>
  319 + <view class='numnum'> {{num}}</view>
  320 + <view bindtap='add_num' class='dec_num'>+</view>
  321 + </view>
  322 + </view>
315 <view class='last_box'> 323 <view class='last_box'>
316 <view class='last_box_top'> 324 <view class='last_box_top'>
317 - <view class='last_box_top_price'>  
318 - <view>￥{{skuid_price}}</view> 325 + <view class=' last_box_top_price last_box_top_pricess'>
  326 + <view>￥{{gggPrice}}</view>
  327 + <text decode="{{true}}">({{string}})</text>
319 </view> 328 </view>
320 </view> 329 </view>
321 <view class='last_box_top'> 330 <view class='last_box_top'>
322 - <view class='last_box_top_price'> 331 + <!-- <view class='last_box_top_price'>
323 <view class='member_price'>￥{{vip_skuid_price}}</view> 332 <view class='member_price'>￥{{vip_skuid_price}}</view>
324 <text class='member'>会员专享</text> 333 <text class='member'>会员专享</text>
325 - </view> 334 + </view> -->
326 <!-- <view class='jiajian'> 335 <!-- <view class='jiajian'>
327 <view bindtap='dec_num' class='dec_num'>-</view> 336 <view bindtap='dec_num' class='dec_num'>-</view>
328 <view class='numnum'> {{num}}</view> 337 <view class='numnum'> {{num}}</view>
@@ -344,9 +353,37 @@ @@ -344,9 +353,37 @@
344 <view class='quality_left {{value.t?"active":""}}' wx:for='{{cell.item}}' wx:key='{{key}}' data-gid='{{value.id}}' data-parent="{{cellindex}}" data-item="{{value.attribute_value}}" data-index="{{index}}" bindtap='changeIds' wx:for-item='value'>{{value.attribute_value}}</view> 353 <view class='quality_left {{value.t?"active":""}}' wx:for='{{cell.item}}' wx:key='{{key}}' data-gid='{{value.id}}' data-parent="{{cellindex}}" data-item="{{value.attribute_value}}" data-index="{{index}}" bindtap='changeIds' wx:for-item='value'>{{value.attribute_value}}</view>
345 </view> 354 </view>
346 </view> 355 </view>
347 - 356 +<view class='goumaishuliang'>
  357 + <view>购买数量</view>
  358 + <text decode="{{true}}" class='kucun'>&nbsp;（库存{{stock}}）</text>
  359 + <view class='jiajianjian' wx:if='{{!goods.groupType}}'>
  360 + <view bindtap='dec_num' class='dec_num'>-</view>
  361 + <view class='numnum'> {{num}}</view>
  362 + <view bindtap='add_num' class='dec_num'>+</view>
  363 + </view>
  364 + </view>
348 <view class='last_box'> 365 <view class='last_box'>
349 <view class='last_box_top'> 366 <view class='last_box_top'>
  367 + <view class=' last_box_top_price last_box_top_pricess'>
  368 + <view>￥{{gggPrice}}</view>
  369 + <text decode="{{true}}">({{string}})</text>
  370 + </view>
  371 + </view>
  372 + <view class='last_box_top'>
  373 + <!-- <view class='last_box_top_price'>
  374 + <view class='member_price'>￥{{vip_skuid_price}}</view>
  375 + <text class='member'>会员专享</text>
  376 + </view> -->
  377 + <!-- <view class='jiajian'>
  378 + <view bindtap='dec_num' class='dec_num'>-</view>
  379 + <view class='numnum'> {{num}}</view>
  380 + <view bindtap='add_num' class='dec_num'>+</view>
  381 + </view> -->
  382 + <view class='purchase' data-limit='{{goods.info.limit_numer}}' bindtap='hide_masks'>确定</view>
  383 + </view>
  384 + </view>
  385 + <!-- <view class='last_box'>
  386 + <view class='last_box_top'>
350 <view class='last_box_top_price'> 387 <view class='last_box_top_price'>
351 <view>￥{{goods.info.price}}</view> 388 <view>￥{{goods.info.price}}</view>
352 </view> 389 </view>
@@ -363,7 +400,7 @@ @@ -363,7 +400,7 @@
363 </view> 400 </view>
364 <view class='purchase' bindtap='hide_masks'>确定</view> 401 <view class='purchase' bindtap='hide_masks'>确定</view>
365 </view> 402 </view>
366 - </view> 403 + </view> -->
367 </view> 404 </view>
368 </view> 405 </view>
369 <!-- 基本信息弹框 --> 406 <!-- 基本信息弹框 -->
@@ -5,7 +5,9 @@ page { @@ -5,7 +5,9 @@ page {
5 width: 100%; 5 width: 100%;
6 height: 100%; 6 height: 100%;
7 } 7 }
8 - 8 +text{
  9 + height: 0!important
  10 +}
9 .big_box { 11 .big_box {
10 width: 100%; 12 width: 100%;
11 height: 100%; 13 height: 100%;
@@ -130,10 +132,13 @@ page { @@ -130,10 +132,13 @@ page {
130 } 132 }
131 133
132 .display_box { 134 .display_box {
133 - width: auto; 135 + height: 30rpx;
134 margin-left: 40rpx; 136 margin-left: 40rpx;
135 display: flex; 137 display: flex;
136 - align-items: center 138 + align-items: center;
  139 + flex-wrap: nowrap;
  140 + white-space: nowrap;
  141 + line-height: 30rpx;
137 } 142 }
138 143
139 .money_icon2 { 144 .money_icon2 {
@@ -142,6 +147,8 @@ page { @@ -142,6 +147,8 @@ page {
142 } 147 }
143 148
144 .money2 { 149 .money2 {
  150 + height: 30rpx;
  151 + line-height: 30rpx;
145 font-size: 38rpx; 152 font-size: 38rpx;
146 font-weight: bold; 153 font-weight: bold;
147 color: #f44; 154 color: #f44;
@@ -298,6 +305,9 @@ white-space: nowrap; @@ -298,6 +305,9 @@ white-space: nowrap;
298 background-color: #fff; 305 background-color: #fff;
299 margin-bottom: 20rpx; 306 margin-bottom: 20rpx;
300 } 307 }
  308 +.item_list2{
  309 + margin-bottom: 0
  310 +}
301 311
302 .user_evaluation { 312 .user_evaluation {
303 display: flex; 313 display: flex;
@@ -584,7 +594,7 @@ white-space: nowrap; @@ -584,7 +594,7 @@ white-space: nowrap;
584 } 594 }
585 595
586 .ingredients { 596 .ingredients {
587 - margin-top: 40rpx; 597 + /* margin-top: 40rpx; */
588 } 598 }
589 599
590 .ingredients_title { 600 .ingredients_title {
@@ -676,7 +686,7 @@ white-space: nowrap; @@ -676,7 +686,7 @@ white-space: nowrap;
676 } 686 }
677 .templates{ 687 .templates{
678 width: 100%!important; 688 width: 100%!important;
679 - margin: 20rpx auto 0!important; 689 + margin: 30rpx auto 0!important;
680 } 690 }
681 .wxParse-p{ 691 .wxParse-p{
682 width: 100%; 692 width: 100%;
@@ -684,7 +694,7 @@ white-space: nowrap; @@ -684,7 +694,7 @@ white-space: nowrap;
684 } 694 }
685 .wxParse-img{ 695 .wxParse-img{
686 width: 100%!important; 696 width: 100%!important;
687 - margin: 0 auto!important 697 + margin: -30rpx auto 0!important
688 } 698 }
689 .content_item{ 699 .content_item{
690 margin-bottom:120rpx; 700 margin-bottom:120rpx;
@@ -839,12 +849,23 @@ white-space: nowrap; @@ -839,12 +849,23 @@ white-space: nowrap;
839 background: rgba(255, 255, 255, 1); 849 background: rgba(255, 255, 255, 1);
840 border-radius: 10px; 850 border-radius: 10px;
841 padding-top: 20rpx; 851 padding-top: 20rpx;
842 - padding-bottom: 130rpx; 852 + padding-bottom: 110rpx;
843 } 853 }
844 .info_mask_diceng{ 854 .info_mask_diceng{
845 padding-bottom: 0; 855 padding-bottom: 0;
846 } 856 }
847 - 857 +.goumaishuliang{
  858 + height: 120rpx;
  859 + width: 100%;
  860 + margin-top: 50rpx;
  861 + padding: 30rpx;
  862 + box-sizing: border-box;
  863 + display: flex;
  864 + position: relative
  865 +}
  866 +.kucun{
  867 + color: #a0a0a0
  868 +}
848 .goods_name { 869 .goods_name {
849 font-size: 30rpx; 870 font-size: 30rpx;
850 font-family: PingFang-SC-Bold; 871 font-family: PingFang-SC-Bold;
@@ -906,7 +927,8 @@ white-space: nowrap; @@ -906,7 +927,8 @@ white-space: nowrap;
906 background: rgba(247, 247, 247, 1); 927 background: rgba(247, 247, 247, 1);
907 border-radius: 0px 0px 10px 10px; 928 border-radius: 0px 0px 10px 10px;
908 margin-top: 100rpx; 929 margin-top: 100rpx;
909 - padding: 18rpx 0 0 51rpx; 930 + padding-left: 30rpx;
  931 + /* padding: 18rpx 0 0 51rpx; */
910 box-sizing: border-box; 932 box-sizing: border-box;
911 position: absolute; 933 position: absolute;
912 bottom: 0; 934 bottom: 0;
@@ -937,6 +959,14 @@ white-space: nowrap; @@ -937,6 +959,14 @@ white-space: nowrap;
937 font-family: PingFang-SC-Bold; 959 font-family: PingFang-SC-Bold;
938 font-weight: bold; 960 font-weight: bold;
939 } 961 }
  962 +.last_box_top_pricess{
  963 + font-size: 28rpx;
  964 + line-height: 110rpx;
  965 +}
  966 +.last_box_top_pricess text{
  967 + font-size: 28rpx!important;
  968 + color: #26363a
  969 +}
940 970
941 .last_box_top_price text { 971 .last_box_top_price text {
942 color: #333; 972 color: #333;
@@ -977,7 +1007,16 @@ white-space: nowrap; @@ -977,7 +1007,16 @@ white-space: nowrap;
977 right: 36rpx; 1007 right: 36rpx;
978 top: 30rpx; 1008 top: 30rpx;
979 } 1009 }
980 - 1010 +.jiajianjian{
  1011 + width: 120rpx;
  1012 + height: 50rpx;
  1013 + position: absolute;
  1014 + right:20rpx;
  1015 + top: 50%;
  1016 + transform: translateY(-50%);
  1017 + display: flex;
  1018 + justify-content: space-between;
  1019 +}
981 .jiajian { 1020 .jiajian {
982 width: 120rpx; 1021 width: 120rpx;
983 height: 50rpx; 1022 height: 50rpx;
@@ -90,7 +90,8 @@ Page({ @@ -90,7 +90,8 @@ Page({
90 scrolltop:0, 90 scrolltop:0,
91 stock:-1, 91 stock:-1,
92 xiaban:{}, 92 xiaban:{},
93 - resolve:false 93 + resolve:false,
  94 + aaa:true
94 }, 95 },
95 //获取购物车数量 96 //获取购物车数量
96 fetchCartNum() { 97 fetchCartNum() {
@@ -859,7 +860,22 @@ Page({ @@ -859,7 +860,22 @@ Page({
859 if (e.scrollTop > 180) { 860 if (e.scrollTop > 180) {
860 that.setData({ 861 that.setData({
861 maodianFlag: true, 862 maodianFlag: true,
862 - resolve:true 863 + aaa: false
  864 + })
  865 + if(that.data.nav!=0){
  866 + wx.pageScrollTo({
  867 + scrollTop: 0,
  868 + duration: 0
  869 + })
  870 + that.setData({
  871 + resolve: true,
  872 + })
  873 + }
  874 + console.log('改了吗'+that.data.resolve)
  875 + } else {
  876 + that.setData({
  877 + resolve: false,
  878 + aaa:true
863 }) 879 })
864 } 880 }
865 // if(that.data.nav!==0){ 881 // if(that.data.nav!==0){
  1 +<!-- <view class='big_page {{resolve?"active":""}}'> -->
1 <view class='big_page {{resolve?"active":""}}'> 2 <view class='big_page {{resolve?"active":""}}'>
2 <view class='page'> 3 <view class='page'>
3 <view class='back_top' wx:if='{{floorstatus}}' bindtap='goTop'> 4 <view class='back_top' wx:if='{{floorstatus}}' bindtap='goTop'>
@@ -84,7 +85,7 @@ @@ -84,7 +85,7 @@
84 <text>每日签到</text> 85 <text>每日签到</text>
85 </view> 86 </view>
86 </view> 87 </view>
87 - <view class='new_person_box'> 88 + <view class='new_person_box' wx:if='{{new_person.length>0}}'>
88 <view class="index_title"> 89 <view class="index_title">
89 <text class="title_left"></text> 90 <text class="title_left"></text>
90 <text class="title_mid">超值新人礼包</text> 91 <text class="title_mid">超值新人礼包</text>
@@ -423,7 +424,7 @@ @@ -423,7 +424,7 @@
423 </view> 424 </view>
424 </view> 425 </view>
425 <view class='fixed_box {{maodianFlag?"active":""}}'> 426 <view class='fixed_box {{maodianFlag?"active":""}}'>
426 - <scroll-view scroll-y='true' scroll-into-view="NAV{{status}}" scroll-with-animation='true' class='scroll_view_class' bindscroll='checkTop' bindscrolltoupper='upper' > 427 + <scroll-view scroll-y='true' scroll-into-view="NAV{{status}}" scroll-with-animation='true' class='scroll_view_class' bindscroll='checkTop' bindscrolltoupper='upper'>
427 <view class='nav_type_box active'> 428 <view class='nav_type_box active'>
428 <view class='nav_type_left'> 429 <view class='nav_type_left'>
429 <view class='nav_type {{wangge==0?"type_active":""}}' bindtap='changeWangGe0'> 430 <view class='nav_type {{wangge==0?"type_active":""}}' bindtap='changeWangGe0'>
@@ -443,7 +444,7 @@ @@ -443,7 +444,7 @@
443 <block wx:if='{{wangge==0}}'> 444 <block wx:if='{{wangge==0}}'>
444 <view wx:for='{{packageList}}' wx:key='{{cellindex}}' wx:for-item='cell' wx:for-index='cellindex'> 445 <view wx:for='{{packageList}}' wx:key='{{cellindex}}' wx:for-item='cell' wx:for-index='cellindex'>
445 <!-- <view id='NAV{{cellindex}}'></view> --> 446 <!-- <view id='NAV{{cellindex}}'></view> -->
446 - <view class='classfy classfydd' bindtap='jump_web' data-jump='{{cell.more.banner_url}}' id='NAV{{cellindex}}' wx:if='{{cell.more.banner}}' > 447 + <view class='classfy classfydd' bindtap='jump_web' data-jump='{{cell.more.banner_url}}' id='NAV{{cellindex}}' wx:if='{{cell.more.banner}}'>
447 <image src='{{cell.more.banner}}'></image> 448 <image src='{{cell.more.banner}}'></image>
448 <!-- <image src='{{cell.more.banner}}' bindtap='get_contant'></image> --> 449 <!-- <image src='{{cell.more.banner}}' bindtap='get_contant'></image> -->
449 </view> 450 </view>
@@ -562,7 +563,7 @@ @@ -562,7 +563,7 @@
562 </block> 563 </block>
563 <block wx:if='{{nav==item.id}}' wx:for='{{category}}' wx:key='{{item.id}}'> 564 <block wx:if='{{nav==item.id}}' wx:for='{{category}}' wx:key='{{item.id}}'>
564 <view class='padding-top_nav'> 565 <view class='padding-top_nav'>
565 - <swiper next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='true' display-multiple-items='1' class='swiper_banner_box' interval='5000' wx:if='{{two_banner.length>0}}'> 566 + <swiper next-margin='40rpx' previous-margin='10rpx' circular='true' autoplay='{{aaa}}' display-multiple-items='1' class='swiper_banner_box' interval='5000' wx:if='{{two_banner.length>0}}'>
566 <block wx:for='{{two_banner}}' wx:key='{{item}}'> 567 <block wx:for='{{two_banner}}' wx:key='{{item}}'>
567 <swiper-item class='nopadding' bindtap='jump_web' data-jump='{{item.jump}}'> 568 <swiper-item class='nopadding' bindtap='jump_web' data-jump='{{item.jump}}'>
568 <image src='{{item.url}}' mode='aspectFill' class="slide-image uiuiui {{currentIndex == 0 ? 'active': ''}}"></image> 569 <image src='{{item.url}}' mode='aspectFill' class="slide-image uiuiui {{currentIndex == 0 ? 'active': ''}}"></image>
@@ -824,10 +825,10 @@ @@ -824,10 +825,10 @@
824 <view class='btn2' catchtap='close_all'>完成</view> 825 <view class='btn2' catchtap='close_all'>完成</view>
825 </view> 826 </view>
826 </view> 827 </view>
827 -</view> 828 + </view>
828 829
829 -<!-- go_hi轮播弹框 -->  
830 -<view wx:if='{{go_hi_flag}}' bindtap='hide_back_shop'> 830 + <!-- go_hi轮播弹框 -->
  831 + <view wx:if='{{go_hi_flag}}' bindtap='hide_back_shop'>
831 <view class='back_shop_index'> 832 <view class='back_shop_index'>
832 <view class='swiper_box_index'> 833 <view class='swiper_box_index'>
833 <swiper previous-margin='60rpx' next-margin='60rpx' circular='true' display-multiple-items='1' current='{{current}}' class='swiper_banner_box_index' bindchange='bindChange' autoplay> 834 <swiper previous-margin='60rpx' next-margin='60rpx' circular='true' display-multiple-items='1' current='{{current}}' class='swiper_banner_box_index' bindchange='bindChange' autoplay>
@@ -847,9 +848,9 @@ @@ -847,9 +848,9 @@
847 </view> 848 </view>
848 <view class='exit_back_shop_index' bindtap='hide_back_shop'>退出</view> 849 <view class='exit_back_shop_index' bindtap='hide_back_shop'>退出</view>
849 </view> 850 </view>
850 -</view>  
851 -<!-- 客服 -->  
852 -<view class='piaofu_kefu' wx:if='{{nav==0}}'> 851 + </view>
  852 + <!-- 客服 -->
  853 + <view class='piaofu_kefu' wx:if='{{nav==0}}'>
853 <view class='message_kefu'> 854 <view class='message_kefu'>
854 <view class='iconfont icon-weixin'> 855 <view class='iconfont icon-weixin'>
855 856
@@ -857,5 +858,5 @@ @@ -857,5 +858,5 @@
857 </view> 858 </view>
858 <button open-type='contact' plain='true' class='index_kefu contact_kefu'>联系客服</button> 859 <button open-type='contact' plain='true' class='index_kefu contact_kefu'>联系客服</button>
859 <!-- <view class='contact_kefu'>联系客服</view> --> 860 <!-- <view class='contact_kefu'>联系客服</view> -->
860 -</view> 861 + </view>
861 </view> 862 </view>
@@ -5,6 +5,12 @@ @@ -5,6 +5,12 @@
5 } 5 }
6 .zuida{ 6 .zuida{
7 background-color: #fafafa; 7 background-color: #fafafa;
  8 + height: 100%;
  9 + overflow: hidden
  10 + }
  11 + .zuida.active{
  12 + height: 100%;
  13 + overflow: hidden
8 } 14 }
9 page { 15 page {
10 /* background-color: #fafafa; */ 16 /* background-color: #fafafa; */
@@ -12,9 +18,9 @@ page { @@ -12,9 +18,9 @@ page {
12 height: 100%; 18 height: 100%;
13 } 19 }
14 .big_page{ 20 .big_page{
15 - min-height: 100% 21 + width: 100%;
16 } 22 }
17 -.big_box.active{ 23 +.big_page.active{
18 height: 100%; 24 height: 100%;
19 overflow: hidden 25 overflow: hidden
20 } 26 }
@@ -385,7 +391,10 @@ page { @@ -385,7 +391,10 @@ page {
385 border-radius: 16rpx; 391 border-radius: 16rpx;
386 overflow: hidden; 392 overflow: hidden;
387 } 393 }
388 - 394 +.good_img image{
  395 + width: 100%;
  396 + height: 100%
  397 +}
389 .label_image { 398 .label_image {
390 width: 70rpx; 399 width: 70rpx;
391 height: 70rpx; 400 height: 70rpx;
@@ -395,12 +404,14 @@ page { @@ -395,12 +404,14 @@ page {
395 } 404 }
396 405
397 .goods_img_image { 406 .goods_img_image {
398 - width: 200rpx;  
399 - height: 200rpx; 407 + width: 200rpx!important;
  408 + height: 200rpx!important;
400 border-radius: 16rpx; 409 border-radius: 16rpx;
401 overflow: hidden 410 overflow: hidden
402 } 411 }
403 - 412 +.good_right{
  413 + width: calc(100% - 220rpx)
  414 +}
404 .good_name { 415 .good_name {
405 height: 32rpx; 416 height: 32rpx;
406 line-height: 32rpx; 417 line-height: 32rpx;
@@ -950,6 +961,10 @@ page { @@ -950,6 +961,10 @@ page {
950 } 961 }
951 962
952 .goods_one_right_one { 963 .goods_one_right_one {
  964 + width: 100%;
  965 + overflow: hidden;
  966 + text-overflow: ellipsis;
  967 + white-space: nowrap;
953 font-size: 30rpx; 968 font-size: 30rpx;
954 font-family: PingFang-SC-Medium; 969 font-family: PingFang-SC-Medium;
955 font-weight: 500; 970 font-weight: 500;
@@ -1994,3 +2009,6 @@ color:rgba(18,25,27,1); @@ -1994,3 +2009,6 @@ color:rgba(18,25,27,1);
1994 /* background: red; */ 2009 /* background: red; */
1995 /* padding-top: 200rpx; */ 2010 /* padding-top: 200rpx; */
1996 } 2011 }
  2012 +.goods_one_right{
  2013 + width: calc(100% - 180rpx)
  2014 +}
1 /* pages/index/select_source/select_source.wxss */ 1 /* pages/index/select_source/select_source.wxss */
2 @import "../../../wxParse/wxParse/wxParse.wxss"; 2 @import "../../../wxParse/wxParse/wxParse.wxss";
  3 +.wxParse-img{
  4 + width: 100%!important;
  5 + margin: -10rpx auto 0!important
  6 +}
@@ -12,3 +12,6 @@ @@ -12,3 +12,6 @@
12 font-family: PingFang-SC-Medium; 12 font-family: PingFang-SC-Medium;
13 line-height: 40rpx 13 line-height: 40rpx
14 } 14 }
  15 +.wxParse-img{
  16 + margin: -10rpx auto 0!important
  17 +}
@@ -6,6 +6,9 @@ @@ -6,6 +6,9 @@
6 view{ 6 view{
7 width: 100% 7 width: 100%
8 } 8 }
  9 +.wxParse-img{
  10 + margin: -10rpx auto 0!important
  11 +}
9 .wxparse{ 12 .wxparse{
10 width: 100% 13 width: 100%
11 } 14 }
@@ -390,6 +390,7 @@ after_order(e) { @@ -390,6 +390,7 @@ after_order(e) {
390 go_pay(e) { 390 go_pay(e) {
391 let index = e.currentTarget.dataset.index; 391 let index = e.currentTarget.dataset.index;
392 let orderList = this.data.orderList; 392 let orderList = this.data.orderList;
  393 + let amount = e.currentTarget.dataset.amount
393 let pay_type = orderList[index].pay_type; 394 let pay_type = orderList[index].pay_type;
394 let pay_order_sn = orderList[index].order_sn; 395 let pay_order_sn = orderList[index].order_sn;
395 console.log(pay_order_sn) 396 console.log(pay_order_sn)
@@ -410,6 +411,9 @@ go_pay(e) { @@ -410,6 +411,9 @@ go_pay(e) {
410 success(res) { 411 success(res) {
411 console.log(456); 412 console.log(456);
412 console.log(res); 413 console.log(res);
  414 + wx.navigateTo({
  415 + url: '../paySuccess/paySuccess?order=' + pay_order_sn+'&amount='+amount,
  416 + })
413 }, 417 },
414 fail(res) { 418 fail(res) {
415 console.log(789); 419 console.log(789);
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 <view> 40 <view>
41 <view class='money_btn' wx:if='{{cell.status==1}}'> 41 <view class='money_btn' wx:if='{{cell.status==1}}'>
42 <view class='cancel' catchtap='cancel_order' data-index='{{index}}' data-orderid='{{cell.id}}'>取消订单</view> 42 <view class='cancel' catchtap='cancel_order' data-index='{{index}}' data-orderid='{{cell.id}}'>取消订单</view>
43 - <view class='pay' data-order='{{cell.order_sn}}' catchtap='go_pay' data-index='{{index}}'>付款</view> 43 + <view class='pay' data-order='{{cell.order_sn}}' catchtap='go_pay' data-amount='{{cell.amount}}' data-index='{{index}}'>付款</view>
44 </view> 44 </view>
45 <view class='money_btn' wx:elif='{{cell.status==2}}'> 45 <view class='money_btn' wx:elif='{{cell.status==2}}'>
46 <view class='cancel' data-index='{{index}}' catchtap='alert_send_goods' data-ordersn='{{cell.order_sn}}'>提醒发货</view> 46 <view class='cancel' data-index='{{index}}' catchtap='alert_send_goods' data-ordersn='{{cell.order_sn}}'>提醒发货</view>
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 </view> 96 </view>
97 <view class='money_btn'> 97 <view class='money_btn'>
98 <view class='cancel' catchtap='cancel_order' data-index='{{index}}' data-orderid='{{cell.id}}'>取消订单</view> 98 <view class='cancel' catchtap='cancel_order' data-index='{{index}}' data-orderid='{{cell.id}}'>取消订单</view>
99 - <view class='pay' catchtap='go_pay' data-index='{{index}}'>付款</view> 99 + <view class='pay' data-order='{{cell.order_sn}}' catchtap='go_pay' data-amount='{{cell.amount}}' data-index='{{index}}'>付款</view>
100 </view> 100 </view>
101 </view> 101 </view>
102 </view> 102 </view>
  1 +// pages/my/paySuccess/paySuccess.js
  2 +Page({
  3 +
  4 + /**
  5 + * 页面的初始数据
  6 + */
  7 + data: {
  8 + order: null,
  9 + amount: null
  10 + },
  11 +
  12 + //get_back
  13 + get_back(){
  14 + wx.switchTab({
  15 + url: '../my',
  16 + })
  17 + },
  18 + //返回首页
  19 + go_index(){
  20 + wx.switchTab({
  21 + url: '../../index/index',
  22 + })
  23 + },
  24 + //订单详情
  25 + go_order(){
  26 + wx.navigateTo({
  27 + url: '/pages/my/unship/unship?id='+this.data.order,
  28 + })
  29 + },
  30 +
  31 + /**
  32 + * 生命周期函数--监听页面加载
  33 + */
  34 + onLoad: function (options) {
  35 + this.setData({
  36 + order:options.order,
  37 + amount:options.amount
  38 + })
  39 + },
  40 +
  41 + /**
  42 + * 生命周期函数--监听页面初次渲染完成
  43 + */
  44 + onReady: function () {
  45 +
  46 + },
  47 +
  48 + /**
  49 + * 生命周期函数--监听页面显示
  50 + */
  51 + onShow: function () {
  52 +
  53 + },
  54 +
  55 + /**
  56 + * 生命周期函数--监听页面隐藏
  57 + */
  58 + onHide: function () {
  59 +
  60 + },
  61 +
  62 + /**
  63 + * 生命周期函数--监听页面卸载
  64 + */
  65 + onUnload: function () {
  66 +
  67 + },
  68 +
  69 + /**
  70 + * 页面相关事件处理函数--监听用户下拉动作
  71 + */
  72 + onPullDownRefresh: function () {
  73 +
  74 + },
  75 +
  76 + /**
  77 + * 页面上拉触底事件的处理函数
  78 + */
  79 + onReachBottom: function () {
  80 +
  81 + },
  82 +
  83 + /**
  84 + * 用户点击右上角分享
  85 + */
  86 + onShareAppMessage: function () {
  87 + return {
  88 + path: '/pages/start/start?share_id=' + app.globalData.user_id,
  89 + imgUrl: '',
  90 + title: ''
  91 + }
  92 + }
  93 +})
  1 +{
  2 + "usingComponents": {}
  3 +}
  1 +<view class='page'>
  2 + <view class='banner'>
  3 + <view class='iconfont icon-fanhui' catchtap='get_back'></view>
  4 + <view class='coupons'>支付成功</view>
  5 + <view class='share'>
  6 + <button open-type='share' type='false' class='share_btn' plain='true'>
  7 + <image src='../../imgs/fenxinag.png'></image>
  8 + </button>
  9 + </view>
  10 + </view>
  11 + <view class='two'>
  12 + <view class='two_item'>
  13 + <view class='duigoua'>
  14 + <image src='../../imgs/duigoua.png'></image>
  15 + </view>
  16 + <view class='pay_success'>付款成功</view>
  17 + <view class='price'>￥{{amount}}</view>
  18 + </view>
  19 + <view class='two_two' bindtap='go_order'>订单详情</view>
  20 + <view class='two_three' bindtap='go_index'>返回首页</view>
  21 + </view>
  22 +</view>
  1 +page {
  2 + width: 100%;
  3 + height: 100%;
  4 + background: #fafafa;
  5 +}
  6 +
  7 +.page {
  8 + width: 100%;
  9 +}
  10 +.share{
  11 + height: 86rpx;
  12 + width: 36rpx;
  13 + padding: 26rpx 0;
  14 + box-sizing: border-box
  15 +}
  16 +.share_btn {
  17 + width: 36rpx!important;
  18 + height: 34rpx!important;
  19 + /* background: transparent; */
  20 + padding: 0;
  21 + margin: 0;
  22 + border: 0 !important;
  23 + color: #222;
  24 + z-index: 999;
  25 + display: flex;
  26 + justify-content: center;
  27 + align-items: center
  28 +}
  29 +.share_btn image{
  30 + width: 100%;
  31 + height: 100%
  32 +}
  33 +.two {
  34 + width: 100%;
  35 + height: 380rpx;
  36 + padding: 0 25rpx;
  37 + box-sizing: border-box;
  38 + margin-top: 16rpx;
  39 +}
  40 +
  41 +.two_item {
  42 + width: 100%;
  43 + height: 100%;
  44 + background: rgba(255, 255, 255, 1);
  45 + border: 1rpx solid rgba(237, 237, 237, 1);
  46 + border-radius: 16rpx;
  47 + padding: 57rpx 0 70rpx 0;
  48 + box-sizing: border-box;
  49 +}
  50 +
  51 +.duigoua {
  52 + width: 126rpx;
  53 + height: 110rpx;
  54 + margin: 0 auto;
  55 +}
  56 +.duigoua image{
  57 + width: 100%;
  58 + height: 100%
  59 +}
  60 +
  61 +.pay_success {
  62 + font-size: 32rpx;
  63 + font-family: PingFang SC;
  64 + font-weight: 500;
  65 + color: #ffda44;
  66 + text-align: center;
  67 + margin-top: 19rpx;
  68 +}
  69 +
  70 +.price {
  71 + height: 52rpx;
  72 + line-height: 52rpx;
  73 + margin-top: 41rpx;
  74 + font-size: 70rpx;
  75 + font-family: PingFang SC;
  76 + font-weight: bold;
  77 + color: rgba(51, 51, 51, 1);
  78 + text-align: center;
  79 +}
  80 +
  81 +.two_two, .two_three {
  82 + width: 100%;
  83 + height: 80rpx;
  84 + background: #ffda44;
  85 + box-shadow: 0rpx 15rpx 30rpx 0rpx rgba(255,218,68,0.6);
  86 + border-radius: 40rpx;
  87 + text-align: center;
  88 + line-height: 80rpx;
  89 + font-size: 26rpx;
  90 + font-family: PingFang SC;
  91 + font-weight: 500;
  92 + color: rgba(255, 255, 255, 1);
  93 + margin-top: 80rpx;
  94 +}
  95 +
  96 +.two_three {
  97 + color: rgba(51, 51, 51, 1);
  98 + background: rgba(255, 255, 255, 1);
  99 + border: 1px solid rgba(224, 224, 224, 1);
  100 + margin-top: 36rpx;
  101 + box-shadow: 0 0 0 0 transparent;
  102 +}
@@ -10,7 +10,7 @@ Page({ @@ -10,7 +10,7 @@ Page({
10 addressIndex: 0, 10 addressIndex: 0,
11 address: {}, 11 address: {},
12 address_List: [], 12 address_List: [],
13 - address__id: 4, 13 + address__id: null,
14 chooseFlagAddress: false, 14 chooseFlagAddress: false,
15 timedat: '', 15 timedat: '',
16 showad: false, 16 showad: false,
@@ -66,7 +66,10 @@ Page({ @@ -66,7 +66,10 @@ Page({
66 optionsproId: '', 66 optionsproId: '',
67 optionspackId: '', 67 optionspackId: '',
68 optionscart: '', 68 optionscart: '',
69 - timeflags:false 69 + timeflags:false,
  70 + addd:null,
  71 + aamount: null,
  72 + dingdanid:null
70 }, 73 },
71 //changeTime 74 //changeTime
72 changeTime() { 75 changeTime() {
@@ -76,16 +79,25 @@ Page({ @@ -76,16 +79,25 @@ Page({
76 }, 79 },
77 //检测选择时间的picker 80 //检测选择时间的picker
78 bindMultiPickerChange(e) { 81 bindMultiPickerChange(e) {
  82 + if(this.data.panduan){
  83 + var addressId = this.data.deliverTimeId
  84 + } else {
  85 + var addressId = this.data.addd
  86 + }
79 this.setData({ 87 this.setData({
80 multiIndex: e.detail.value, 88 multiIndex: e.detail.value,
81 - timeflag:false 89 + timeflag:false,
  90 + deliverTimeId: addressId,
82 }) 91 })
83 }, 92 },
84 //检测picker改变 93 //检测picker改变
85 bindMultiPickerColumnChange(e) { 94 bindMultiPickerColumnChange(e) {
86 - if (this.data.timeflags){ 95 + // if (this.data.timeflags){
  96 + this.setData({
  97 + panduan: true
  98 + })
87 let that = this 99 let that = this
88 - var deliveryTimeId = that.data.deliverTimeId 100 + var deliveryTimeId = null
89 let column = e.detail.column 101 let column = e.detail.column
90 let data = { 102 let data = {
91 multiIndex: that.data.multiIndex, 103 multiIndex: that.data.multiIndex,
@@ -93,6 +105,7 @@ Page({ @@ -93,6 +105,7 @@ Page({
93 timeDataArray: that.data.timeDataArray 105 timeDataArray: that.data.timeDataArray
94 } 106 }
95 data.multiIndex[column] = e.detail.value; 107 data.multiIndex[column] = e.detail.value;
  108 + console.log(e.detail.value+'shijiyaya')
96 switch (column) { 109 switch (column) {
97 case 0: 110 case 0:
98 data.multiArray[1] = that.data.week_two[e.detail.value] 111 data.multiArray[1] = that.data.week_two[e.detail.value]
@@ -107,14 +120,6 @@ Page({ @@ -107,14 +120,6 @@ Page({
107 if (e == c) { 120 if (e == c) {
108 ele.children.forEach(function (eles, indexs) { 121 ele.children.forEach(function (eles, indexs) {
109 if (eles.disabled) { 122 if (eles.disabled) {
110 - if (b == eles.label) {  
111 - deliveryTimeId = eles.value  
112 - }  
113 - that.setData({  
114 - timeflag: false  
115 - })  
116 - } else {  
117 - console.log(909090)  
118 wx.showToast({ 123 wx.showToast({
119 title: '亲,该时间段已排满咯~', 124 title: '亲,该时间段已排满咯~',
120 icon: 'none' 125 icon: 'none'
@@ -122,8 +127,16 @@ Page({ @@ -122,8 +127,16 @@ Page({
122 that.setData({ 127 that.setData({
123 timeflag: true 128 timeflag: true
124 }) 129 })
125 - deliveryTimeId = deliveryTimeId  
126 return 130 return
  131 + } else {
  132 + if (b == eles.label) {
  133 + console.log('b')
  134 + deliveryTimeId = eles.value
  135 + console.log('时间id'+eles.value)
  136 + }
  137 + that.setData({
  138 + timeflag: false
  139 + })
127 } 140 }
128 }) 141 })
129 } 142 }
@@ -132,7 +145,7 @@ Page({ @@ -132,7 +145,7 @@ Page({
132 that.setData({ 145 that.setData({
133 deliverTimeId: deliveryTimeId 146 deliverTimeId: deliveryTimeId
134 }) 147 })
135 - } 148 + // }
136 }, 149 },
137 //判断星期几 150 //判断星期几
138 getWeek() { 151 getWeek() {
@@ -158,35 +171,42 @@ Page({ @@ -158,35 +171,42 @@ Page({
158 week_arr.push(ele.label) 171 week_arr.push(ele.label)
159 week_right.push(ele.arr) 172 week_right.push(ele.arr)
160 }); 173 });
161 - week_right.splice(count, 1)  
162 - let foo = week_arr.indexOf(week)  
163 - if (foo > -1) {  
164 - week_arr.splice(foo, 1);  
165 - }  
166 - // weeks[0] = week_arr  
167 - // weeks[1] = week_right  
168 - // weeks[1] = ["13.00-15.00","15.00-17.00"]  
169 - var weeks_two = week_right  
170 - console.log('000') 174 + var i = null
  175 + week_right.forEach(function (elee,indexe) {
  176 + if (elee.length == 0) {
  177 + i=indexe
  178 + week_arr.splice(indexe, 1)
  179 + }
  180 + })
  181 + week_right.splice(i,1)
  182 + console.log(week_right)
171 console.log(week_arr) 183 console.log(week_arr)
  184 + console.log(1414)
  185 + // week_right.splice(count, 1)
  186 + // let foo = week_arr.indexOf(week)
  187 + // console.log(foo)
  188 + // if (foo >= -1) {
  189 + // week_arr.splice(count, 1);
  190 + // }else{
  191 +
  192 + // }
  193 + var weeks_two = week_right
172 this.setData({ 194 this.setData({
173 timeDataArray: canlda, 195 timeDataArray: canlda,
174 week_arr: week_arr, 196 week_arr: week_arr,
175 multiArray: weeks, 197 multiArray: weeks,
176 week_two: weeks_two 198 week_two: weeks_two
177 }); 199 });
  200 + console.log('3232')
  201 + console.log(this.data.week_two)
178 this.start() 202 this.start()
179 }, 203 },
180 start() { 204 start() {
181 let arr1 = this.data.week_two 205 let arr1 = this.data.week_two
182 let week_arr = this.data.week_arr 206 let week_arr = this.data.week_arr
183 - console.log(arr1)  
184 - console.log(week_arr)  
185 this.setData({ 207 this.setData({
186 multiArray: [week_arr, arr1[0]] 208 multiArray: [week_arr, arr1[0]]
187 }) 209 })
188 - console.log(111)  
189 - console.log([week_arr, arr1[0]])  
190 }, 210 },
191 //返回 211 //返回
192 get_my() { 212 get_my() {
@@ -244,32 +264,43 @@ Page({ @@ -244,32 +264,43 @@ Page({
244 app.post(url, params).then(r => { 264 app.post(url, params).then(r => {
245 console.log(r) 265 console.log(r)
246 var list = r.data.list; 266 var list = r.data.list;
247 - var addid = null  
248 r.data.vips.forEach(function(ele, index) { 267 r.data.vips.forEach(function(ele, index) {
249 ele.t = false 268 ele.t = false
250 }); 269 });
  270 + var n = 0
251 r.data.timeDataArray.forEach(function(ele, index) { 271 r.data.timeDataArray.forEach(function(ele, index) {
252 - if(index==0){ 272 + ele.children.forEach(function(e,i){
  273 + if(!e.disabled){
  274 + n++
  275 + if (n == 1) {
253 addid = ele.children[0].value 276 addid = ele.children[0].value
254 } 277 }
  278 + }
  279 + })
255 var new_arr = [] 280 var new_arr = []
256 for (let i = 0; i < ele.children.length; i++) { 281 for (let i = 0; i < ele.children.length; i++) {
  282 + if (ele.children[i].disabled){
  283 +
  284 + } else {
257 new_arr.push(ele.children[i].label) 285 new_arr.push(ele.children[i].label)
258 } 286 }
  287 + }
259 ele.arr = new_arr 288 ele.arr = new_arr
260 }) 289 })
  290 + var amount = that.data.amount + r.data.priceData.shipment_price
261 that.setData({ 291 that.setData({
262 vip: r.data, 292 vip: r.data,
263 goodsList: r.data.list, 293 goodsList: r.data.list,
264 addressList: r.data.address, 294 addressList: r.data.address,
265 address: r.data.address[0], 295 address: r.data.address[0],
  296 + address__id:r.data.address[0].id,
266 vipList: r.data.vips, 297 vipList: r.data.vips,
267 timeDataArray: [], 298 timeDataArray: [],
268 timeDataArray: r.data.timeDataArray, 299 timeDataArray: r.data.timeDataArray,
269 deliverList: r.data.timeDataArray, 300 deliverList: r.data.timeDataArray,
270 addressList: r.data.address, 301 addressList: r.data.address,
271 - amount: that.data.amount,  
272 - addressId:addid 302 + amount:amount,
  303 + addd:addid
273 }); 304 });
274 console.log(addid+'刚进来') 305 console.log(addid+'刚进来')
275 if (that.data.num == 0) { 306 if (that.data.num == 0) {
@@ -291,30 +322,43 @@ Page({ @@ -291,30 +322,43 @@ Page({
291 app.post(url, params).then(r => { 322 app.post(url, params).then(r => {
292 if (r.code == 1) { 323 if (r.code == 1) {
293 var list = r.data.list; 324 var list = r.data.list;
  325 + var n = 0
294 r.data.timeDataArray.forEach(function (ele, index) { 326 r.data.timeDataArray.forEach(function (ele, index) {
295 - if (index == 0) { 327 + ele.children.forEach(function (e, i) {
  328 + if (!e.disabled) {
  329 + n++
  330 + if (n == 1) {
296 addid = ele.children[0].value 331 addid = ele.children[0].value
297 } 332 }
  333 + }
  334 + })
298 var new_arr = [] 335 var new_arr = []
299 for (let i = 0; i < ele.children.length; i++) { 336 for (let i = 0; i < ele.children.length; i++) {
  337 + if (ele.children[i].disabled) {
  338 +
  339 + } else {
300 new_arr.push(ele.children[i].label) 340 new_arr.push(ele.children[i].label)
301 } 341 }
  342 + }
302 ele.arr = new_arr 343 ele.arr = new_arr
303 }) 344 })
304 that.setData({ 345 that.setData({
305 vip: r.data, 346 vip: r.data,
306 goodsList: r.data.list, 347 goodsList: r.data.list,
307 addressList: r.data.address, 348 addressList: r.data.address,
  349 + address: r.data.address[0],
  350 + address__id: r.data.address[0].id,
308 vipList: r.data.vips, 351 vipList: r.data.vips,
309 timeDataArray: r.data.timeDataArray, 352 timeDataArray: r.data.timeDataArray,
310 deliverList: r.data.timeDataArray, 353 deliverList: r.data.timeDataArray,
311 ship_ment_price: r.data.priceData.shipment_price, 354 ship_ment_price: r.data.priceData.shipment_price,
312 - addressId:addid 355 + addd:addid
313 }); 356 });
314 // that.fetchAmount(); 357 // that.fetchAmount();
315 that.amount() 358 that.amount()
316 that.getWeek(); 359 that.getWeek();
317 } else { 360 } else {
  361 + console.log(3333333333)
318 wx.showToast({ 362 wx.showToast({
319 title: r.msg, 363 title: r.msg,
320 icon: 'none' 364 icon: 'none'
@@ -338,11 +382,14 @@ Page({ @@ -338,11 +382,14 @@ Page({
338 vip: r.data, 382 vip: r.data,
339 goodsList: r.data.list, 383 goodsList: r.data.list,
340 addressList: r.data.address, 384 addressList: r.data.address,
  385 + address: r.data.address[0],
  386 + address__id: r.data.address[0].id,
341 vipList: r.data.vips, 387 vipList: r.data.vips,
342 ship_ment_price: r.data.priceData.shipment_price 388 ship_ment_price: r.data.priceData.shipment_price
343 }); 389 });
344 that.amount(); 390 that.amount();
345 } else { 391 } else {
  392 + console.log(11111111)
346 wx.showToast({ 393 wx.showToast({
347 title: r.msg, 394 title: r.msg,
348 icon: 'none', 395 icon: 'none',
@@ -366,25 +413,37 @@ Page({ @@ -366,25 +413,37 @@ Page({
366 var totalPrice = that.data.totalPrice 413 var totalPrice = that.data.totalPrice
367 app.post(url, params).then(r => { 414 app.post(url, params).then(r => {
368 if (r.code == 1) { 415 if (r.code == 1) {
  416 + var n = 0
369 r.data.timeDataArray.forEach(function (ele, index) { 417 r.data.timeDataArray.forEach(function (ele, index) {
370 - if (index == 0) { 418 + ele.children.forEach(function (e, i) {
  419 + if (!e.disabled) {
  420 + n++
  421 + if (n == 1) {
371 addid = ele.children[0].value 422 addid = ele.children[0].value
372 } 423 }
  424 + }
  425 + })
373 var new_arr = [] 426 var new_arr = []
374 for (let i = 0; i < ele.children.length; i++) { 427 for (let i = 0; i < ele.children.length; i++) {
  428 + if (ele.children[i].disabled) {
  429 +
  430 + } else {
375 new_arr.push(ele.children[i].label) 431 new_arr.push(ele.children[i].label)
376 } 432 }
  433 + }
377 ele.arr = new_arr 434 ele.arr = new_arr
378 }) 435 })
379 this.setData({ 436 this.setData({
380 vip: r.data, 437 vip: r.data,
381 goodsList: r.data.list, 438 goodsList: r.data.list,
382 addressList: r.data.address, 439 addressList: r.data.address,
  440 + address: r.data.address[0],
  441 + address__id: r.data.address[0].id,
383 vipList: r.data.vips, 442 vipList: r.data.vips,
384 timeDataArray: r.data.timeDataArray, 443 timeDataArray: r.data.timeDataArray,
385 deliverList: r.data.timeDataArray, 444 deliverList: r.data.timeDataArray,
386 ship_ment_price: r.data.priceData.shipment_price, 445 ship_ment_price: r.data.priceData.shipment_price,
387 - addressId:addid 446 + addd:addid
388 }) 447 })
389 this.getWeek(); 448 this.getWeek();
390 } 449 }
@@ -434,14 +493,24 @@ Page({ @@ -434,14 +493,24 @@ Page({
434 app.post(url, params).then(r => { 493 app.post(url, params).then(r => {
435 if (r.code == 1) { 494 if (r.code == 1) {
436 console.log(r) 495 console.log(r)
  496 + var n = 0
437 r.data.timeDataArray.forEach(function (ele, index) { 497 r.data.timeDataArray.forEach(function (ele, index) {
438 - if (index == 0) { 498 + ele.children.forEach(function (e, i) {
  499 + if (!e.disabled) {
  500 + n++
  501 + if (n == 1) {
439 addid = ele.children[0].value 502 addid = ele.children[0].value
440 } 503 }
  504 + }
  505 + })
441 var new_arr = [] 506 var new_arr = []
442 for (let i = 0; i < ele.children.length; i++) { 507 for (let i = 0; i < ele.children.length; i++) {
  508 + if (ele.children[i].disabled) {
  509 +
  510 + } else {
443 new_arr.push(ele.children[i].label) 511 new_arr.push(ele.children[i].label)
444 } 512 }
  513 + }
445 ele.arr = new_arr 514 ele.arr = new_arr
446 }) 515 })
447 r.data.list.forEach(function(ele, index) { 516 r.data.list.forEach(function(ele, index) {
@@ -454,6 +523,8 @@ Page({ @@ -454,6 +523,8 @@ Page({
454 vip: r.data, 523 vip: r.data,
455 goodsList: r.data.list, 524 goodsList: r.data.list,
456 addressList: r.data.address, 525 addressList: r.data.address,
  526 + address: r.data.address[0],
  527 + address__id: r.data.address[0].id,
457 vipList: r.data.vips, 528 vipList: r.data.vips,
458 timeDataArray: r.data.timeDataArray, 529 timeDataArray: r.data.timeDataArray,
459 deliverList: r.data.timeDataArray, 530 deliverList: r.data.timeDataArray,
@@ -461,7 +532,7 @@ Page({ @@ -461,7 +532,7 @@ Page({
461 amount: price, 532 amount: price,
462 goodsTotalPrice: price, 533 goodsTotalPrice: price,
463 last_total_price: price, 534 last_total_price: price,
464 - addressId: addid 535 + addd: addid
465 }); 536 });
466 this.getWeek(); 537 this.getWeek();
467 } 538 }
@@ -515,6 +586,14 @@ Page({ @@ -515,6 +586,14 @@ Page({
515 } else { 586 } else {
516 url = '/wxapp/cart/confirm2' 587 url = '/wxapp/cart/confirm2'
517 } 588 }
  589 + console.log(that.data.deliverTimeId + "配送时间ids")
  590 + if (that.data.deliverTimeId==undefined){
  591 + wx.showToast({
  592 + title: '请选择配送时间',
  593 + icon:'none'
  594 + })
  595 + return;
  596 + }
518 if (that.data.num != 0 && that.data.is_group == 0) { 597 if (that.data.num != 0 && that.data.is_group == 0) {
519 console.log("商品直接购买") 598 console.log("商品直接购买")
520 if (index != -1) { 599 if (index != -1) {
@@ -786,26 +865,29 @@ Page({ @@ -786,26 +865,29 @@ Page({
786 } 865 }
787 } 866 }
788 } 867 }
789 - console.log(params.delivery_time + "配送时间id")  
790 if (that.data.last_total_price > 0) { 868 if (that.data.last_total_price > 0) {
791 // if (that.data.amount > 0) { 869 // if (that.data.amount > 0) {
792 if (that.data.is_group == 0) { 870 if (that.data.is_group == 0) {
793 - if (that.data.addressFlag) {  
794 - wx.showToast({  
795 - title: '请选择收货地址',  
796 - icon: 'none'  
797 - })  
798 - } else if (params.delivery_time == 0) {  
799 - wx.showToast({  
800 - title: '请选择配送时间',  
801 - icon: 'none'  
802 - })  
803 - } else { 871 + // if (that.data.addressFlag) {
  872 + // wx.showToast({
  873 + // title: '请选择收货地址',
  874 + // icon: 'none'
  875 + // })
  876 + // } else if (params.delivery_time == 0) {
  877 + // wx.showToast({
  878 + // title: '请选择配送时间',
  879 + // icon: 'none'
  880 + // })
  881 + // } else {
804 app.post(url, params).then(res => { 882 app.post(url, params).then(res => {
805 if (res.code == 1) { 883 if (res.code == 1) {
806 var order_sn = res.data.order_sn 884 var order_sn = res.data.order_sn
  885 + var amount = res.data.amount
  886 + var dingdanid = res.data.order_id
807 that.setData({ 887 that.setData({
808 - order_sn: order_sn 888 + order_sn: order_sn,
  889 + aamount: amount,
  890 + dingdanid:dingdanid
809 }); 891 });
810 let url = '/wxapp/pay/index?order_sn=' + order_sn 892 let url = '/wxapp/pay/index?order_sn=' + order_sn
811 app.post(url).then(r => { 893 app.post(url).then(r => {
@@ -825,6 +907,9 @@ Page({ @@ -825,6 +907,9 @@ Page({
825 that.setData({ 907 that.setData({
826 showad: true 908 showad: true
827 }) 909 })
  910 + wx.navigateTo({
  911 + url: '../paySuccess/paySuccess?order='+dingdanid+'&amount='+that.data.aamount,
  912 + })
828 console.log(showad+"真假值") 913 console.log(showad+"真假值")
829 }, 914 },
830 fail(res) { 915 fail(res) {
@@ -841,6 +926,9 @@ Page({ @@ -841,6 +926,9 @@ Page({
841 title: '支付成功', 926 title: '支付成功',
842 icon: 'none' 927 icon: 'none'
843 }) 928 })
  929 + wx.navigateTo({
  930 + url: '../paySuccess/paySuccess?order=' + dingdanid + '&amount=' + that.data.aamount,
  931 + })
844 wx.switchTab({ 932 wx.switchTab({
845 url: '../../index/index', 933 url: '../../index/index',
846 }) 934 })
@@ -854,6 +942,9 @@ Page({ @@ -854,6 +942,9 @@ Page({
854 paySign: r.data.jsApiParameters.paySign, 942 paySign: r.data.jsApiParameters.paySign,
855 success(res) { 943 success(res) {
856 console.log(res); 944 console.log(res);
  945 + wx.navigateTo({
  946 + url: '../paySuccess/paySuccess?order=' + dingdanid + '&amount=' + that.data.aamount,
  947 + })
857 }, 948 },
858 fail(res) { 949 fail(res) {
859 wx.navigateTo({ 950 wx.navigateTo({
@@ -885,14 +976,14 @@ Page({ @@ -885,14 +976,14 @@ Page({
885 return 976 return
886 } 977 }
887 }) 978 })
888 - }  
889 - } else {  
890 - if (that.data.addressFlag) {  
891 - wx.showToast({  
892 - title: '请选择收货地址',  
893 - icon: 'none'  
894 - }) 979 + // }
895 } else { 980 } else {
  981 + // if (that.data.addressFlag) {
  982 + // wx.showToast({
  983 + // title: '请选择收货地址',
  984 + // icon: 'none'
  985 + // })
  986 + // } else {
896 app.post(url, params).then(res => { 987 app.post(url, params).then(res => {
897 if (res.code == 1) { 988 if (res.code == 1) {
898 var order_sn = res.data.order_sn 989 var order_sn = res.data.order_sn
@@ -961,6 +1052,7 @@ Page({ @@ -961,6 +1052,7 @@ Page({
961 } 1052 }
962 } 1053 }
963 } else { 1054 } else {
  1055 + console.log(2222222222)
964 wx.showToast({ 1056 wx.showToast({
965 title: r.msg, 1057 title: r.msg,
966 icon: 'none' 1058 icon: 'none'
@@ -969,7 +1061,7 @@ Page({ @@ -969,7 +1061,7 @@ Page({
969 }); 1061 });
970 } 1062 }
971 }) 1063 })
972 - } 1064 + // }
973 } 1065 }
974 } else { 1066 } else {
975 wx.showToast({ 1067 wx.showToast({
@@ -11,13 +11,11 @@ @@ -11,13 +11,11 @@
11 <!-- <view class='expected_time' bindtap='chooseTime' wx:if='{{is_group==0}}'> --> 11 <!-- <view class='expected_time' bindtap='chooseTime' wx:if='{{is_group==0}}'> -->
12 <picker mode="multiSelector" wx:if='{{is_group==0}}' class='flex_box' bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}"> 12 <picker mode="multiSelector" wx:if='{{is_group==0}}' class='flex_box' bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
13 <view class="picker_class"> 13 <view class="picker_class">
14 -<view class='zhanman'>  
15 <view class='iconfont icon-time'></view> 14 <view class='iconfont icon-time'></view>
16 -<text class='hint' wx:if='{{timeflag}}'>选择时间</text>  
17 -<text class='hint' wx:else>{{multiArray[0][multiIndex[0]]}}{{multiArray[1][multiIndex[1]]}}</text> 15 +<view class='hint' wx:if='{{timeflag}}'>选择时间</view>
  16 +<view class='hint' wx:else>{{multiArray[0][multiIndex[0]]}}{{multiArray[1][multiIndex[1]]}}</view>
18 17
19 <view class='centers'>送达</view> 18 <view class='centers'>送达</view>
20 -</view>  
21 <view class='iconfont icon-jinru add_left'></view> 19 <view class='iconfont icon-jinru add_left'></view>
22 </view> 20 </view>
23 </picker> 21 </picker>
@@ -28,9 +26,10 @@ @@ -28,9 +26,10 @@
28 </view> 26 </view>
29 <view class='expected_time' bindtap='openAddress'> 27 <view class='expected_time' bindtap='openAddress'>
30 <view class='iconfont icon-position'></view> 28 <view class='iconfont icon-position'></view>
31 - <text wx:if='{{addressFlag}}'>请选择收货地址</text>  
32 - <text wx:else class='centers'>{{address.name}}\t\t\t\t{{address.mobile}}\n{{address.poiname}}\t\t{{address.doorplate}}\t\t</text>  
33 - <view class='iconfont icon-jinru dec_left {{address_jinru?"active":""}}'></view> 29 + <!-- <text wx:if='{{addressFlag}}'>请选择收货地址</text> -->
  30 + <!-- <text wx:else class='centers'>{{address.name}}\t\t\t\t{{address.mobile}}\n{{address.poiname}}\t\t{{address.doorplate}}\t\t</text> -->
  31 + <text class='centers'>{{address.name}}\t\t\t\t{{address.mobile}}\n{{address.poiname}}\t\t{{address.doorplate}}\t\t</text>
  32 + <view class='iconfont icon-jinru dec_left active'></view>
34 </view> 33 </view>
35 </view> 34 </view>
36 35
@@ -16,18 +16,6 @@ box-sizing: border-box; @@ -16,18 +16,6 @@ box-sizing: border-box;
16 .pages.activity{ 16 .pages.activity{
17 overflow: hidden 17 overflow: hidden
18 } 18 }
19 -.flex_box {  
20 -width: 100%;  
21 -}  
22 -  
23 -.picker_class {  
24 -width: 100%;  
25 -display: flex;  
26 -justify-content: space-between;  
27 -align-items: center;  
28 -box-sizing: border-box;  
29 -position: relative;  
30 -}  
31 .scroll{ 19 .scroll{
32 width: 100%; 20 width: 100%;
33 /* height: calc(100% - 600rpx); */ 21 /* height: calc(100% - 600rpx); */
@@ -120,7 +108,8 @@ position: relative; @@ -120,7 +108,8 @@ position: relative;
120 margin-right: 18rpx; 108 margin-right: 18rpx;
121 color:rgba(255,68,68,1); 109 color:rgba(255,68,68,1);
122 /* float: left; */ 110 /* float: left; */
123 - display: inline-block 111 + display: inline-block;
  112 +
124 } 113 }
125 .zhanman{ 114 .zhanman{
126 /* width: 100%; */ 115 /* width: 100%; */
@@ -131,7 +120,7 @@ position: relative; @@ -131,7 +120,7 @@ position: relative;
131 /* float: left; */ 120 /* float: left; */
132 display: inline-block; 121 display: inline-block;
133 color:rgba(34,34,34,1); 122 color:rgba(34,34,34,1);
134 - padding-right:16rpx; 123 + padding-right:26rpx;
135 box-sizing: border-box; 124 box-sizing: border-box;
136 flex-grow: 1; 125 flex-grow: 1;
137 overflow: hidden; 126 overflow: hidden;
@@ -166,10 +155,8 @@ position: relative; @@ -166,10 +155,8 @@ position: relative;
166 .dec_left{ 155 .dec_left{
167 position: absolute; 156 position: absolute;
168 right: 0rpx; 157 right: 0rpx;
169 - top: 24rpx;  
170 -}  
171 -.dec_left.active{  
172 - top: 4rpx 158 + top: 50%;
  159 + transform: translateY(-50%)
173 } 160 }
174 .hint2 { 161 .hint2 {
175 font-size: 22rpx; 162 font-size: 22rpx;
@@ -636,3 +623,17 @@ line-height: 45rpx; @@ -636,3 +623,17 @@ line-height: 45rpx;
636 align-items: center; 623 align-items: center;
637 justify-content: center; 624 justify-content: center;
638 } 625 }
  626 +
  627 +.flex_box {
  628 +width: 100%;
  629 +/* background: red */
  630 +}
  631 +
  632 +.picker_class {
  633 +width: 100%;
  634 +display: flex;
  635 +justify-content: space-between;
  636 +align-items: center;
  637 +box-sizing: border-box;
  638 +position: relative;
  639 +}
@@ -14,6 +14,7 @@ Page({ @@ -14,6 +14,7 @@ Page({
14 totalPrice: 0, 14 totalPrice: 0,
15 cancel_order:false, 15 cancel_order:false,
16 cancel_value: '', 16 cancel_value: '',
  17 + amount: null,
17 sale_arr: [], 18 sale_arr: [],
18 cancel_reason: [{ id: 1, name: '我不想买了' }, { id: 2, name: '卖家缺货' }, { id: 3, name: '多拍了' }, { id: 4, name: '服务太差' }, { id: 5, name: '信息填写错误' }, { id: 6, name: '再等等' }, { id: 7, name: '其他原因' }], 19 cancel_reason: [{ id: 1, name: '我不想买了' }, { id: 2, name: '卖家缺货' }, { id: 3, name: '多拍了' }, { id: 4, name: '服务太差' }, { id: 5, name: '信息填写错误' }, { id: 6, name: '再等等' }, { id: 7, name: '其他原因' }],
19 }, 20 },
@@ -83,7 +84,7 @@ Page({ @@ -83,7 +84,7 @@ Page({
83 success(res) { 84 success(res) {
84 console.log(res); 85 console.log(res);
85 wx.navigateTo({ 86 wx.navigateTo({
86 - url: '../myOrder/myOrder?status='+2, 87 + url: '../paySuccess/paySuccess?order=' + pay_order_sn+'&amount='+this.data.amount,
87 }) 88 })
88 }, 89 },
89 fail(res) { 90 fail(res) {
@@ -184,7 +185,8 @@ Page({ @@ -184,7 +185,8 @@ Page({
184 delivery_time: delivery_time, 185 delivery_time: delivery_time,
185 totalPrice: totalPrice, 186 totalPrice: totalPrice,
186 sale_arr: arr, 187 sale_arr: arr,
187 - More:More 188 + More:More,
  189 + amount: r.data.info.amount
188 }); 190 });
189 }) 191 })
190 }, 192 },
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 "list": [] 35 "list": []
36 }, 36 },
37 "miniprogram": { 37 "miniprogram": {
38 - "current": 93, 38 + "current": 94,
39 "list": [ 39 "list": [
40 { 40 {
41 "id": -1, 41 "id": -1,
@@ -694,6 +694,12 @@ @@ -694,6 +694,12 @@
694 "pathName": "pages/my/wait_receite/wait_receite", 694 "pathName": "pages/my/wait_receite/wait_receite",
695 "query": "", 695 "query": "",
696 "scene": null 696 "scene": null
  697 + },
  698 + {
  699 + "id": -1,
  700 + "name": "支付成功页",
  701 + "pathName": "pages/my/paySuccess/paySuccess",
  702 + "scene": null
697 } 703 }
698 ] 704 ]
699 } 705 }