Commit d8e3eb5a38d0cef862f46a44e7c94db6b2a43b2d
1 parent
b131abf8
商品详情
Showing
3 changed files
with
277 additions
and
13 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -25,7 +25,7 @@ Page({ | @@ -25,7 +25,7 @@ Page({ | ||
| 25 | color_type:0,//线条控制 | 25 | color_type:0,//线条控制 |
| 26 | color_type_one:0, | 26 | color_type_one:0, |
| 27 | color_type_two:1, | 27 | color_type_two:1, |
| 28 | - | 28 | + |
| 29 | gid: "", | 29 | gid: "", |
| 30 | stoid: o.stoid, | 30 | stoid: o.stoid, |
| 31 | url: o.url, | 31 | url: o.url, |
| @@ -204,6 +204,9 @@ Page({ | @@ -204,6 +204,9 @@ Page({ | ||
| 204 | 204 | ||
| 205 | //是否点赞中 | 205 | //是否点赞中 |
| 206 | iszaning: 0, | 206 | iszaning: 0, |
| 207 | + | ||
| 208 | + store:0,//选择更多 | ||
| 209 | + index:1 | ||
| 207 | }, | 210 | }, |
| 208 | 211 | ||
| 209 | //------初始化加载---------- | 212 | //------初始化加载---------- |
| @@ -2642,6 +2645,13 @@ Page({ | @@ -2642,6 +2645,13 @@ Page({ | ||
| 2642 | } | 2645 | } |
| 2643 | } | 2646 | } |
| 2644 | }) | 2647 | }) |
| 2645 | - } | ||
| 2646 | - | 2648 | + }, |
| 2649 | + // 选择门店 | ||
| 2650 | + choice_store:function(){ | ||
| 2651 | + this.setData({store:1}) | ||
| 2652 | +}, | ||
| 2653 | + //关闭选择门店 | ||
| 2654 | +close_popup:function(){ | ||
| 2655 | + this.setData({ store: 0}) | ||
| 2656 | +} | ||
| 2647 | }); | 2657 | }); |
| 2648 | \ No newline at end of file | 2658 | \ No newline at end of file |
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -253,7 +253,7 @@ | @@ -253,7 +253,7 @@ | ||
| 253 | </view> | 253 | </view> |
| 254 | 254 | ||
| 255 | <view class="goods-num" wx:if="{{prom_type!=1}}"> | 255 | <view class="goods-num" wx:if="{{prom_type!=1}}"> |
| 256 | - <view class="sales">销量:{{data.sales_sum}}件</view> | 256 | + <view class="sales">销量：{{data.sales_sum}}件</view> |
| 257 | <view class="stock">折扣：{{data.disc}}折</view> | 257 | <view class="stock">折扣：{{data.disc}}折</view> |
| 258 | <view class="stock">{{categories3[0].num}}人评价</view> | 258 | <view class="stock">{{categories3[0].num}}人评价</view> |
| 259 | </view> | 259 | </view> |
| @@ -272,7 +272,7 @@ | @@ -272,7 +272,7 @@ | ||
| 272 | </view> | 272 | </view> |
| 273 | </view> | 273 | </view> |
| 274 | </view> | 274 | </view> |
| 275 | - <view style='height:42rpx'></view> | 275 | + |
| 276 | <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0}}"> | 276 | <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0}}"> |
| 277 | {{data.goods_name}} | 277 | {{data.goods_name}} |
| 278 | </view> | 278 | </view> |
| @@ -299,6 +299,35 @@ | @@ -299,6 +299,35 @@ | ||
| 299 | 299 | ||
| 300 | </view> | 300 | </view> |
| 301 | </block> | 301 | </block> |
| 302 | + | ||
| 303 | + <!-- 门店收货地址 --> | ||
| 304 | + <view class="xc-address_frame flex-vertical xc-ash" > | ||
| 305 | + <view class="address_frame"> | ||
| 306 | + <view class="flex-vertical-between "> | ||
| 307 | + <view class="flex"> | ||
| 308 | + <image class="stores-img" src="../../../images/stores.png"></image> | ||
| 309 | + <view class="fs28"> 选择附近门店</view> | ||
| 310 | + </view> | ||
| 311 | + <view class="red_bb fs32" bindtap="choice_store"> | ||
| 312 | + 更多门店 | ||
| 313 | + <text class="bg_jj"></text> | ||
| 314 | + </view> | ||
| 315 | + </view> | ||
| 316 | + <view class="flex-space-between address ai_and"> | ||
| 317 | + <view> | ||
| 318 | + <text class="fs32 xc-black3 shop_name"> 泉州开源盛世</text> | ||
| 319 | + <text class="fs20">暂无库存</text> | ||
| 320 | + </view> | ||
| 321 | + <view class="distance fs20"> | ||
| 322 | + 距离:3754m | ||
| 323 | + </view> | ||
| 324 | + </view> | ||
| 325 | + <view class="fs20">地址:福建省泉州市鲤城区软件园4栋4层</view> | ||
| 326 | + | ||
| 327 | + | ||
| 328 | + </view> | ||
| 329 | + </view> | ||
| 330 | + | ||
| 302 | <!--许程 7.24暂时注释 --> | 331 | <!--许程 7.24暂时注释 --> |
| 303 | <view wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}"> | 332 | <view wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1}}"> |
| 304 | <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> | 333 | <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> |
| @@ -983,6 +1012,65 @@ | @@ -983,6 +1012,65 @@ | ||
| 983 | </view> | 1012 | </view> |
| 984 | </view> | 1013 | </view> |
| 985 | 1014 | ||
| 1015 | +<!-- 选择门店的弹框 --> | ||
| 1016 | +<block wx:if="{{store==1}}"> | ||
| 1017 | + <view class="mongolia-layer" bindtap="close_popup"></view> | ||
| 1018 | + <view class="popup-frame"> | ||
| 1019 | + <view class="popup-top flex-space-between"> | ||
| 1020 | + <text class="fs32 nearby_store">附近的门店</text> | ||
| 1021 | + <view> | ||
| 1022 | + <view> | ||
| 1023 | + <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon> | ||
| 1024 | + </view> | ||
| 1025 | + <view class="felx choose_more"> | ||
| 1026 | + <text class="fs22 red-co">选择更多门店</text> | ||
| 1027 | + <view class="bg_rights"></view> | ||
| 1028 | + </view> | ||
| 1029 | + </view> | ||
| 1030 | + </view> | ||
| 1031 | + <!-- 门店列表 --> | ||
| 1032 | + <view class="store-list"> | ||
| 1033 | + <view class="store_choose flex"> | ||
| 1034 | + <view class="store flex-vertical"> | ||
| 1035 | + <block wx:if="{{index==1}}"> | ||
| 1036 | + <view class="circle white xc-hook fs20 red-b">Г</view> | ||
| 1037 | + </block> | ||
| 1038 | + <block wx:else> | ||
| 1039 | + <view class="circle xc-hooks"></view> | ||
| 1040 | + </block> | ||
| 1041 | + | ||
| 1042 | + <view class="address-frame xc-ash"> | ||
| 1043 | + <view class="flex-vertical-between "> | ||
| 1044 | + <view class="flex xc-ash"> | ||
| 1045 | + <view class="fs28 xc-black3 address_name">开源盛世广场店</view> | ||
| 1046 | + <text class="fs20">库存剩余数量：{{index}}</text> | ||
| 1047 | + </view> | ||
| 1048 | + <view> | ||
| 1049 | + <view class="distance fs20 address-val">距离:3754m</view> | ||
| 1050 | + </view> | ||
| 1051 | + </view> | ||
| 1052 | + <view class="fs20">地址:福建省泉州市鲤城区软件园4栋4层</view> | ||
| 1053 | + </view> | ||
| 1054 | + </view> | ||
| 1055 | + | ||
| 1056 | + </view> | ||
| 1057 | + | ||
| 1058 | + </view> | ||
| 1059 | + <!-- 门店列表底部 --> | ||
| 1060 | + <view class="store-bottom-frame"> | ||
| 1061 | + <view class="store-bottom flex-vertical-between"> | ||
| 1062 | + <view class="determine red-b fs28 white t-c"> | ||
| 1063 | + 确定 | ||
| 1064 | + </view> | ||
| 1065 | + <view class="default t-c fs28"> | ||
| 1066 | + 设为默认 | ||
| 1067 | + </view> | ||
| 1068 | + </view> | ||
| 1069 | + </view> | ||
| 1070 | + </view> | ||
| 1071 | +</block> | ||
| 1072 | + | ||
| 1073 | + | ||
| 986 | <!-- ---------------分享弹窗--------------- --> | 1074 | <!-- ---------------分享弹窗--------------- --> |
| 987 | <!--二维码显示页面--> | 1075 | <!--二维码显示页面--> |
| 988 | <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{!canvasHidden}}'></canvas> | 1076 | <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{!canvasHidden}}'></canvas> |
pages/goods/goodsInfo/goodsInfo.wxss
| @@ -321,6 +321,8 @@ image { | @@ -321,6 +321,8 @@ image { | ||
| 321 | height: 100rpx; | 321 | height: 100rpx; |
| 322 | background-color: #fff; | 322 | background-color: #fff; |
| 323 | text-align: center; | 323 | text-align: center; |
| 324 | + z-index: 9; | ||
| 325 | + | ||
| 324 | } | 326 | } |
| 325 | 327 | ||
| 326 | .join-cart>view { | 328 | .join-cart>view { |
| @@ -355,7 +357,7 @@ image { | @@ -355,7 +357,7 @@ image { | ||
| 355 | .cart-num { | 357 | .cart-num { |
| 356 | position: absolute; | 358 | position: absolute; |
| 357 | left: 50%; | 359 | left: 50%; |
| 358 | - top: 0; | 360 | + top: 1rpx; |
| 359 | width: 40rpx; | 361 | width: 40rpx; |
| 360 | height: 40rpx; | 362 | height: 40rpx; |
| 361 | line-height: 40rpx; | 363 | line-height: 40rpx; |
| @@ -368,11 +370,18 @@ image { | @@ -368,11 +370,18 @@ image { | ||
| 368 | .cart-btn { | 370 | .cart-btn { |
| 369 | font-size: 28rpx; | 371 | font-size: 28rpx; |
| 370 | color: #fff; | 372 | color: #fff; |
| 371 | - line-height: 100rpx; | 373 | + line-height: 60rpx; |
| 374 | + margin-top:16rpx; | ||
| 375 | + | ||
| 372 | } | 376 | } |
| 373 | 377 | ||
| 374 | .join-btn { | 378 | .join-btn { |
| 375 | background-color: #ffb03f; | 379 | background-color: #ffb03f; |
| 380 | + height: 70rpx; | ||
| 381 | +border-radius: 55rpx 0rpx 0rpx 55rpx; | ||
| 382 | +margin-top: 16rpx; | ||
| 383 | + | ||
| 384 | + | ||
| 376 | } | 385 | } |
| 377 | 386 | ||
| 378 | view.cart-btn-lg { | 387 | view.cart-btn-lg { |
| @@ -381,6 +390,9 @@ view.cart-btn-lg { | @@ -381,6 +390,9 @@ view.cart-btn-lg { | ||
| 381 | 390 | ||
| 382 | .buy-btn { | 391 | .buy-btn { |
| 383 | background-color: #f23030; | 392 | background-color: #f23030; |
| 393 | + height: 70rpx; | ||
| 394 | +border-radius: 0 56rpx 55rpx 0; | ||
| 395 | + | ||
| 384 | } | 396 | } |
| 385 | 397 | ||
| 386 | .toTop { | 398 | .toTop { |
| @@ -741,7 +753,7 @@ left:31rpx;} | @@ -741,7 +753,7 @@ left:31rpx;} | ||
| 741 | .wf .item .item_txy.hs{ background: #cbcbcb;} | 753 | .wf .item .item_txy.hs{ background: #cbcbcb;} |
| 742 | .po{margin-bottom: 20rpx;} | 754 | .po{margin-bottom: 20rpx;} |
| 743 | 755 | ||
| 744 | -.cart-btn.line-h{ line-height: 40rpx;} | 756 | +.cart-btn.line-h{ line-height: 26rpx;} |
| 745 | .cart-btn .fir-v{ margin-top: 10rpx;} | 757 | .cart-btn .fir-v{ margin-top: 10rpx;} |
| 746 | 758 | ||
| 747 | .hyt{ padding: 0 20rpx; font-size: 30rpx; display: flex; align-items:center; margin-top: 10rpx;} | 759 | .hyt{ padding: 0 20rpx; font-size: 30rpx; display: flex; align-items:center; margin-top: 10rpx;} |
| @@ -927,7 +939,7 @@ left:31rpx;} | @@ -927,7 +939,7 @@ left:31rpx;} | ||
| 927 | border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; line-height: 100rpx } | 939 | border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; line-height: 100rpx } |
| 928 | 940 | ||
| 929 | .bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333; | 941 | .bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333; |
| 930 | - font-size: 32rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:31rpx } | 942 | + font-size: 32rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx } |
| 931 | .red_bb{ color: #d70026; min-width:158rpx;width: auto;} | 943 | .red_bb{ color: #d70026; min-width:158rpx;width: auto;} |
| 932 | .bg_jj{ width: 18rpx; height:18rpx; | 944 | .bg_jj{ width: 18rpx; height:18rpx; |
| 933 | border-top: 2rpx solid #d70026; | 945 | border-top: 2rpx solid #d70026; |
| @@ -1139,7 +1151,7 @@ left:31rpx;} | @@ -1139,7 +1151,7 @@ left:31rpx;} | ||
| 1139 | width: 100%; | 1151 | width: 100%; |
| 1140 | height: 42rpx; | 1152 | height: 42rpx; |
| 1141 | padding-left: 34rpx; | 1153 | padding-left: 34rpx; |
| 1142 | - color: #948485; | 1154 | + color: #333; |
| 1143 | 1155 | ||
| 1144 | } | 1156 | } |
| 1145 | .xc_comment-have-pictures{ | 1157 | .xc_comment-have-pictures{ |
| @@ -1266,7 +1278,7 @@ left:31rpx;} | @@ -1266,7 +1278,7 @@ left:31rpx;} | ||
| 1266 | height: 100%; | 1278 | height: 100%; |
| 1267 | line-height: 100rpx; | 1279 | line-height: 100rpx; |
| 1268 | overflow: hidden; | 1280 | overflow: hidden; |
| 1269 | - margin-left: 7rpx; | 1281 | + margin-left: 10rpx; |
| 1270 | } | 1282 | } |
| 1271 | .xc-coupon-fram{ | 1283 | .xc-coupon-fram{ |
| 1272 | position: relative; | 1284 | position: relative; |
| @@ -1306,7 +1318,7 @@ left:31rpx;} | @@ -1306,7 +1318,7 @@ left:31rpx;} | ||
| 1306 | padding-left:15rpx; | 1318 | padding-left:15rpx; |
| 1307 | color: #d70025; | 1319 | color: #d70025; |
| 1308 | position: absolute; | 1320 | position: absolute; |
| 1309 | - right: 7rpx; | 1321 | + right: 5rpx; |
| 1310 | } | 1322 | } |
| 1311 | 1323 | ||
| 1312 | /* 自定义弹出窗口 */ | 1324 | /* 自定义弹出窗口 */ |
| @@ -2226,4 +2238,158 @@ right:17rpx; top:55rpx; | @@ -2226,4 +2238,158 @@ right:17rpx; top:55rpx; | ||
| 2226 | line-height:15rpx; | 2238 | line-height:15rpx; |
| 2227 | } | 2239 | } |
| 2228 | 2240 | ||
| 2229 | -.no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx} | ||
| 2230 | \ No newline at end of file | 2241 | \ No newline at end of file |
| 2242 | +.no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx} | ||
| 2243 | +/* 门店地址 */ | ||
| 2244 | +.xc-address_frame{ | ||
| 2245 | + border-top:1rpx solid #eee; | ||
| 2246 | + width: 100%; | ||
| 2247 | + height: 170rpx; | ||
| 2248 | +} | ||
| 2249 | +.xc-address_frame .address_frame{ | ||
| 2250 | + width: 92%; | ||
| 2251 | +padding-left: 10rpx; | ||
| 2252 | +margin: auto; | ||
| 2253 | + | ||
| 2254 | +} | ||
| 2255 | +.shop_name{ | ||
| 2256 | + | ||
| 2257 | +} | ||
| 2258 | +.stores-img{ | ||
| 2259 | +width: 40rpx; | ||
| 2260 | + height: 35rpx; | ||
| 2261 | + margin-right: 10rpx; | ||
| 2262 | +} | ||
| 2263 | +.shop_name{ | ||
| 2264 | + margin-right: 10rpx; | ||
| 2265 | +} | ||
| 2266 | +.address{ | ||
| 2267 | + width: 87%; | ||
| 2268 | +} | ||
| 2269 | +.distance{ | ||
| 2270 | + padding-left: 15rpx; | ||
| 2271 | + padding-right: 15rpx; | ||
| 2272 | + background: #eee; | ||
| 2273 | + border-radius: 20rpx; | ||
| 2274 | +} | ||
| 2275 | +/* 选择门店的弹窗 */ | ||
| 2276 | +.mongolia-layer{ | ||
| 2277 | + position: fixed; | ||
| 2278 | +left: 0; | ||
| 2279 | +top: 0; | ||
| 2280 | +right: 0; | ||
| 2281 | +bottom: 0; | ||
| 2282 | +z-index: 11; | ||
| 2283 | +background: rgba(0,0,0,0.4); | ||
| 2284 | +width: 100%; | ||
| 2285 | +height: 91.9%; | ||
| 2286 | + | ||
| 2287 | +} | ||
| 2288 | +.popup-frame{ | ||
| 2289 | + position: fixed; | ||
| 2290 | +bottom:99rpx; | ||
| 2291 | +z-index: 20; | ||
| 2292 | +background: white; | ||
| 2293 | +width: 100%; | ||
| 2294 | +border-radius: 20rpx 20rpx 0 0; | ||
| 2295 | +height: 55%; | ||
| 2296 | +} | ||
| 2297 | +.popup-top{ | ||
| 2298 | + border-bottom: 1rpx solid #eee; | ||
| 2299 | + height: 120rpx; | ||
| 2300 | + width: 95%; | ||
| 2301 | + margin: auto; | ||
| 2302 | + line-height: 120rpx; | ||
| 2303 | + | ||
| 2304 | +} | ||
| 2305 | +.bg_rights{ | ||
| 2306 | + border-top: 2rpx solid ; | ||
| 2307 | + border-right: 2rpx solid ; | ||
| 2308 | + transform: rotate(45deg); | ||
| 2309 | + display:inline-block; | ||
| 2310 | + width:15rpx;height:15rpx; | ||
| 2311 | + border-color:#da0b31; | ||
| 2312 | +} | ||
| 2313 | +.modal-closes { | ||
| 2314 | + position: absolute; | ||
| 2315 | + right: 30rpx; | ||
| 2316 | +} | ||
| 2317 | +.choose_more{ | ||
| 2318 | + margin-top: 30rpx; | ||
| 2319 | + margin-right: 20rpx; | ||
| 2320 | + | ||
| 2321 | +} | ||
| 2322 | +.store-list{ | ||
| 2323 | + width: 95%; | ||
| 2324 | + height: 428rpx; | ||
| 2325 | + overflow-y: scroll; | ||
| 2326 | + overflow: hidden; | ||
| 2327 | + margin: auto; | ||
| 2328 | + | ||
| 2329 | +} | ||
| 2330 | +.store-list .store_choose{ | ||
| 2331 | + width: 100%; | ||
| 2332 | + height: 100rpx; | ||
| 2333 | + line-height: 100rpx; | ||
| 2334 | + border-bottom: 1rpx solid #eee; | ||
| 2335 | + | ||
| 2336 | +} | ||
| 2337 | +.store-list .store_choose .store{ | ||
| 2338 | +width: 100%; | ||
| 2339 | +margin: auto; | ||
| 2340 | +line-height: 37rpx; | ||
| 2341 | +padding-left: 20rpx; | ||
| 2342 | + | ||
| 2343 | +} | ||
| 2344 | +.xc-hook{ | ||
| 2345 | + width: 30rpx; | ||
| 2346 | + height: 30rpx; | ||
| 2347 | + transform: rotate(-145deg); | ||
| 2348 | +line-height: 32rpx; | ||
| 2349 | +text-align: center; | ||
| 2350 | +} | ||
| 2351 | + .xc-hooks{ | ||
| 2352 | + width: 30rpx; | ||
| 2353 | + height: 30rpx; | ||
| 2354 | + border: 3rpx solid #999; | ||
| 2355 | + } | ||
| 2356 | + .address-frame{ | ||
| 2357 | + width: 93%; | ||
| 2358 | +margin-left: 7rpx; | ||
| 2359 | + | ||
| 2360 | + } | ||
| 2361 | + .nearby_store{ | ||
| 2362 | +margin-left: 17rpx; | ||
| 2363 | + } | ||
| 2364 | + .address_name{ | ||
| 2365 | + margin-right: 10rpx; | ||
| 2366 | + | ||
| 2367 | + } | ||
| 2368 | + .address-val{ | ||
| 2369 | + height: 30rpx; | ||
| 2370 | +line-height: 30rpx; | ||
| 2371 | + | ||
| 2372 | + } | ||
| 2373 | + .store-bottom{ | ||
| 2374 | + width: 85%; | ||
| 2375 | + margin: auto; | ||
| 2376 | + height: 115rpx; | ||
| 2377 | + | ||
| 2378 | + } | ||
| 2379 | + .determine{ | ||
| 2380 | + width: 280rpx; | ||
| 2381 | + height: 44rpx; | ||
| 2382 | + border-radius: 50rpx; | ||
| 2383 | + line-height: 44rpx; | ||
| 2384 | + } | ||
| 2385 | + .default{ | ||
| 2386 | + width: 280rpx; | ||
| 2387 | + height: 44rpx; | ||
| 2388 | + border:3rpx solid #444; | ||
| 2389 | + border-radius: 50rpx; | ||
| 2390 | + line-height: 44rpx; | ||
| 2391 | + } | ||
| 2392 | + .store-bottom-frame{ | ||
| 2393 | + width: 95%; | ||
| 2394 | + border-top: 3rpx solid #eee; | ||
| 2395 | + margin: auto; | ||
| 2396 | + } | ||
| 2231 | \ No newline at end of file | 2397 | \ No newline at end of file |