diff --git a/app.json b/app.json index 36803e1..0644cd7 100644 --- a/app.json +++ b/app.json @@ -12,12 +12,10 @@ "pages/user/index/index", "pages/user/order_list/order_list", "pages/user/order_detail/order_detail", - "pages/user/address_list/address_list", "pages/user/userinfo/userinfo", "pages/user/coupon/coupon", - "pages/user/checkcoupon/checkcoupon", - "pages/user/add_address/add_address", - "pages/user/express/express", + "pages/user/checkcoupon/checkcoupon", + "pages/activity/seckill_list/seckill_list", "pages/activity/pind_list/pind_list", "pages/team/team_success/team_success", @@ -47,8 +45,7 @@ "pages/user/assistance/task_assistance", "pages/user/assistance/friend_assistance", "pages/user/assistance/assistance_success", - "pages/user/assistance/assistance", - "pages/store/index", + "pages/user/assistance/assistance", "pages/giftpack/festival/festival", @@ -232,11 +229,20 @@ "pages/team/team_more/team_more", "pages/user/return_goods_info/return_goods_info", "pages/user/return_goods_list/return_goods_list", - "pages/user/return_goods/return_goods" + "pages/user/return_goods/return_goods", + "pages/user/address_list/address_list", + "pages/user/add_address/add_address" ] + }, + { + "root": "packageG/", + "name": "pack7", + "pages": [ + "pages/store/index", + "pages/user/express/express" + ] } - ], diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 4cb8a4c..8bdb315 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -816,7 +816,7 @@ Page({ enterAddress: function() { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, diff --git a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js index 5778cf0..55a1e2c 100644 --- a/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js +++ b/packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js @@ -662,7 +662,7 @@ Page({ enterAddress: function () { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index f86aa08..d850b6a 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -3018,7 +3018,7 @@ Page({ getApp().globalData.is_cart_old = 1; this.data.isget_by_quan = {}; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js index f90b71c..2250a22 100644 --- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -1667,7 +1667,7 @@ Page({ enterAddressPage: function () { getApp().globalData.is_cart_old = 1; this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list" + url: "/packageF/pages/user/address_list/address_list" }); }, diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml index bf35f8b..857ca09 100644 --- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml +++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml @@ -187,7 +187,7 @@ + data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流 + + + + + + + + 暂无收货地址 + + + + + + + + 获取微信地址 + + + + + + 新建收货地址 + + + + + + + + + + + + + + + + + + + + + {{item.consignee}} + + {{item.mobile}} + 默认地址 + + + + {{item.more_address}} {{item.address}} + + + + + + + + + + + + + + + + + 获取微信地址 + + + + + + 新建收货地址 + + + + \ No newline at end of file diff --git a/packageF/pages/user/address_list/address_list.wxss b/packageF/pages/user/address_list/address_list.wxss new file mode 100644 index 0000000..d20eeaa --- /dev/null +++ b/packageF/pages/user/address_list/address_list.wxss @@ -0,0 +1,247 @@ +/* 没有收货地址时的样式 */ + +.nothing { + width: 100%; + font-size: 31rpx; +} + +.nothing image { + width: 299rpx; + height: 283rpx; + margin-top: 161rpx; +} + +.nothing .nothingaddress { + color: rgb(251, 65, 66); + margin-top: 35rpx; +} + +.nothing .address { + margin-top: 61rpx; +} + +.nothing .address navigator { + color: rgb(255, 255, 255); + background-color: rgb(251, 65, 66); + width: 256rpx; + height: 55rpx; + border-radius: 30rpx; + display: flex; + align-items: center; + justify-content: center; +} + +/* page { + margin-bottom: 200rpx; +} + +.address-box { + background-color: white; + padding: 25rpx 0 25rpx 25rpx; + font-size: 28rpx; + border-bottom: 3rpx #f8f8f8 solid; +} + +.address-user { + box-sizing: border-box; + float: left; + width: 150rpx; +} + +.N-name { + font-size: 30rpx; + padding-bottom: 20rpx; + word-break: keep-all; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; +} + +.default { + color: white; + background-color: red; + padding: 4rpx; + width: fit-content; + border-radius: 6rpx; +} + +.address-info { + box-sizing: border-box; + float: left; + width: 480rpx; + padding-left: 10rpx; +} + +.mobile { + padding-bottom: 25rpx; +} + +.address { + height: 70rpx; + overflow: hidden; +} + +.address-edit { + box-sizing: border-box; + width: 95rpx; + float: left; + text-align: center; + padding-top: 32rpx; +} + +.address-edit>image { + width: 36rpx; + height: 42rpx; +} + +.address-create { + width: 50%; + text-align: center; + position: fixed; + bottom: 80rpx; + left: 25%; +} + +.create-btn { + font-size: 28rpx; + color: white; + background-color: #f23030; + border-radius: 10rpx; + text-align: center; + line-height: 80rpx; + display: block; +} */ + +page { + margin-bottom: 200rpx; +} + +.topbcolor { + width: 100%; + height: 7rpx; + background-color: rgb(245, 245, 245); +} + +.container { + margin-top: 7rpx; +} + +.container .address-box { + width: 100%; +} + +.container .address-box .address-user { + display: flex; + justify-content: center; + width: 100%; + border-bottom: 2rpx solid rgb(245, 245, 245); + height: 180rpx; + align-items: center; +} + +.container .address-box .address-user .icon { + padding-right: 20rpx; + display: flex; + align-items: center; + height: 100%; +} + +.container .address-box .address-user .no_xuanze { + width: 31rpx; + height: 31rpx; + border-radius: 50%; + border: 1rpx solid; +} + +.container .address-box .address-user .address { + width: 530rpx; +} + +.container .address-box .address-user .address .user { + display: flex; + align-items: center; + width: 500rpx; + font-weight: bold; + font-size: 31rpx; + color: rgb(40, 36, 33); +} + +.container .address-box .address-user .address .user .userName { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + max-width: 149rpx; +} + +.container .address-box .address-user .address .user .userPhone { + margin-left: 41rpx; +} + +.container .address-box .address-user .address .user .default { + display: flex; + width: 105rpx; + height: 31rpx; + background-color: rgb(239, 22, 51); + justify-content: center; + font-size: 20rpx; + color: rgb(255, 255, 253); + border-radius: 8rpx; + margin-left: 21rpx; + line-height: 31rpx; +} + +.container .address-box .address-user .address .ShippingAddress { + font-size: 24rpx; + color: rgb(41, 38, 33); + height: 66rpx; +} + +.container .address-box .address-user .edit { + display: flex; + justify-content: center; + margin-left: 60rpx; + height: 100%; + align-items: center; +} + +.container .address-box .address-user .edit image { + width: 41rpx; + height: 38rpx; + align-items: center; +} + +.container .new { + width: 86%; + display: flex; + position: fixed; + bottom: 0rpx; + height: 204rpx; + align-items: center; + background-color: rgb(255, 255, 255); + margin-left:7% +} + +.container .new .add { + margin-right: 10rpx; +} + +.container navigator { + display: flex; + width: 300rpx; + height: 62rpx; + background-color: rgb(239, 22, 51); + border-radius: 40rpx; + justify-content: center; + align-items: center; + color: rgb(255, 255, 255); + font-size: 27rpx; +} + +.container navigator.ye{ + background-color: #fc872d; +} +.nothing .address navigator.ye{ + background-color: #fc872d; +} diff --git a/packageG/pages/store/index.js b/packageG/pages/store/index.js new file mode 100644 index 0000000..de6d033 --- /dev/null +++ b/packageG/pages/store/index.js @@ -0,0 +1,183 @@ +var o=getApp().globalData.setting; +Page({ + data:{ + is_get_local_ok:0, + is_gps:0, + lat:null, + lon:null, + page:1, + cat_list:null, + pick_list:null, + url:o.imghost, + is_no_more:0, + key_word:'', //关键字搜索 + cat_id:0, //分类ID + islading:0, + }, + + //调用视频接口 + onLoad:function(e){ + var th=this; + wx.getLocation({ + type: 'gcj02', + success: function(res) { + th.data.lat = res.latitude; + th.data.lon = res.longitude; + th.data.is_get_local_ok = 1; + }, + fail: function(res) { + th.data.is_get_local_ok = 1; + if (res.errCode == 2) { + getApp().confirmBox("请开启GPS定位", null, 25000, !1); + } + + } + }) + //--获取门店分类--- + getApp().request.get("/api/weshop/storagecategory/page", { + data: { + store_id: o.stoid, + is_show: 1, + pageSize: 300 + }, + success:function(res){ + if(res.data.code==0){ + th.setData({cat_list:res.data.data.pageData}) + } + }, + }) + this.get_sto(); + }, + + //---------拿出门店分类和门店------------ + get_sto() { + var th = this; + var timer_get = setInterval(function() { + if (th.data.is_get_local_ok == 0) return false; + clearInterval(timer_get); + th.get_list(); + }, 500) + + }, + + get_list:function(){ + if(this.data.is_no_more==1) return false; + if(this.data.islading==1) return false; + this.data.islading=1; + var th=this,req = getApp().request; + var dd = { + store_id: o.stoid, + isstop: 0, + pageSize: 10, + page:th.data.page + } + if(th.data.key_word!="" && th.data.key_word!=undefined) { + dd.keyword=th.data.key_word; + } + if(th.data.cat_id){ + dd.category_id=th.data.cat_id; + } + if(th.data.lat){ + dd.lat=th.data.lat; + dd.lon=th.data.lon; + } + + + wx.showLoading(); + //----------获取门店--------- + req.promiseGet("/api/weshop/pickup/list", { + data: dd, + }).then(res => { + this.data.islading=0; + wx.hideLoading(); + if(res.data.code==0){ + if(res.data.data.pageData.length<=0){ + th.data.is_no_more=1; return false; + } + + th.data.page=dd.page+1 + var pick_list=th.data.pick_list; + if(!pick_list) pick_list=[]; + pick_list=pick_list.concat(res.data.data.pageData); + th.setData({ + pick_list:pick_list + }) + } + }) + }, + + //---加载更多是靠这个函数---- + onReachBottom: function() { + this.get_list(); + }, + + lose_focus:function(e){ + var key_word = e.detail.value; + this.data.key_word=key_word; + }, + + + phone:function(e){ + var index=e.currentTarget.dataset.index; + var item=this.data.pick_list[index]; + wx.makePhoneCall({ + phoneNumber: item.pickup_phone, + }) + }, + + //分类的下拉 + bindPickerChange: function (e) { + var index = e.detail.value;//这里会获取他的索引值 + var self = this; + var list = self.data.cat_list; + var item = list[index]; + this.data.cat_id=item['cat_id']; + self.setData({ + periodsname: item['cat_name'], + cid: item['cat_id'] + }) + this.data.page=1; + this.data.is_no_more=0; + this.setData({ pick_list:null}) + this.get_list(); + + }, + + //搜索关键字 + sear:function(){ + this.data.page=1; + this.data.is_no_more=0; + this.setData({ pick_list:null}) + this.get_list(); + }, + + + map: function (e) { + var index = e.currentTarget.dataset.index;//这里会获取他的索引值 + var self = this; + var list = self.data.pick_list; + var item = list[index]; + + wx.openLocation({ + //当前经纬度 + latitude: parseFloat(item.lat), + longitude: parseFloat(item.lon), + //缩放级别默认28 + scale: 28, + //位置名 + name:item.pickup_name, + //详细地址 + address: item.pickup_address, + //成功打印信息 + success: function(res) {}, + //失败打印信息 + fail: function(err) {}, + //完成打印信息 + complete: function(info){}, + }) + }, + + + + +}) \ No newline at end of file diff --git a/packageG/pages/store/index.json b/packageG/pages/store/index.json new file mode 100644 index 0000000..8c3566f --- /dev/null +++ b/packageG/pages/store/index.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "门店列表", + "enablePullDownRefresh": false, + "usingComponents": { + "nav_box": "/components/nav_box/nav_box" + } +} \ No newline at end of file diff --git a/packageG/pages/store/index.wxml b/packageG/pages/store/index.wxml new file mode 100644 index 0000000..2a5c362 --- /dev/null +++ b/packageG/pages/store/index.wxml @@ -0,0 +1,36 @@ + + + + + + + + + + {{periodsname?periodsname:"选择分类"}} + + + + + + + {{item.pickup_name}} + + + + {{item.pickup_phone}} + + 一键拔号 + + + + + {{item.fulladdress}} + + 地图导航 + + + + + + \ No newline at end of file diff --git a/packageG/pages/store/index.wxss b/packageG/pages/store/index.wxss new file mode 100644 index 0000000..62d4aa0 --- /dev/null +++ b/packageG/pages/store/index.wxss @@ -0,0 +1,321 @@ +.box{ + padding: 10px; + border-bottom: 10px solid #f5f5f5; + color: #000000; +} +.box .pickname { + font-size: 32rpx; + line-height: 80rpx; + border-bottom: 1rpx solid #EEEEEE; +} + +.box .mt { + margin-top: 20rpx; +} +.addr{ width: 75%;color: #848484;} +.buttonclass { + width: 160rpx; + height: 60rpx; + line-height: 60rpx; + text-align: center; + border: solid 1px #c3172d; + border-radius: 20rpx; + font-size: 28rpx; + color: #c3172d; +} +.fmob +{width: 28rpx; +height: 32rpx; +margin-right: 10rpx; +top: 4rpx; +position: relative; +} + +.faddr{ +width: 26rpx; +height: 32rpx; +margin-right: 6rpx; +top: 4rpx; +position: relative; +} + +.bcolor{background-color: #f5f5f5; height: 126rpx;} + +.sear_inp{width: 490rpx; background-color:#eaeaea; height: 80rpx; border-radius:5rpx; margin: 25rpx;} +.sear_inp input{width: 400rpx;} +.select{height: 80rpx; width: 220rpx;background-color:#eaeaea; margin:25rpx; font-size: 28rpx; line-height: 80rpx;text-align: center } +.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;} + +.border-bottom { + border-bottom: 2rpx solid #e0e0e0; +} + +.fs22 { + font-size: 22rpx; +} + +.flexShrink-0 { + flex-shrink: 0; +} + +.pt16 { + padding-top: 16rpx; +} + +.maxWidth-340 { + max-width: 340rpx; +} + +.maxWidth-400 { + max-width: 400rpx; +} + + +/* 图标字体 */ +/* @font-face { + font-family: 'iconfont'; + src: url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.eot'); + src: url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.eot?#iefix') format('embedded-opentype'), + url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.woff2') format('woff2'), + url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.woff') format('woff'), + url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.ttf') format('truetype'), + url('//at.alicdn.com/t/font_2054717_8s87fgrotfo.svg#iconfont') format('svg'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 28rpx; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-weizhi:before { + content: "\e615"; + color: #FFBA10; +} + +.icon-arrow_down:before { + content: "\e600"; +} + +.icon-arrow_right:before { + content: "\e61f"; +} */ +/* 图标字体 */ + + + +.icon-weizhi { + color: #FFBA10; +} + +page { + height: 100%; + font-size: 28rpx; +} + +.container { + height: 100%; +} +#map { + /* width: 100%; + height: ; */ + display: block; + width: 100%; + height: 100%; +} +.tab-container.active { + height: calc(100% - 86rpx); +} +.map-container.active ~ .tab-container .list-container { + height: 204rpx; + overflow: hidden; +} +.map-container.active ~ .tab-container .list { + overflow: hidden; +} +.tab-container.active .list-container { + height: calc(100% - 108rpx - 84rpx); + background-color: #F7F7F7; +} + + +.search-container { + display: flex; + align-items: center; + padding: 0 32rpx; + border-bottom: 2rpx solid #F0F0F0; +} + +.city:after { + display: inline-block; + content: '◣'; + font-size: 14rpx; + padding-left: 8rpx; + padding-right: 20rpx; + transform: rotateZ(-45deg); + position: relative; + top: -16rpx; +} + +.input-container { + padding: 12rpx 0; + flex: 1; +} + +.input { + padding: 0 20rpx; + height: 60rpx; + line-height: 60rpx; + border-radius: 30rpx; + background-color: #F3F3F3; +} + +.placeholder { + color: #676767; + font-size: 24rpx; +} + + + + + +/* 切换卡 */ +.tab-title-container { + display: flex; + text-align: center; + border-bottom: 20rpx solid #F7F7F7; +} +.tab-title { + width: 50%; + line-height: 88rpx; + position: relative; +} +.tab-title.active { + font-weight: bold; +} +.tab-title.active::after { + position: absolute; + content: ''; + width: 110rpx; + height: 4rpx; + left: 50%; + bottom: 0; + transform: translateX(-50%); + background-color: #FFBA10; +} + +.map-container { + transition: 0.1s all linear; + background-color: pink; +} + +.map-container.active { + height: calc(100% - 86rpx - 80rpx - 200rpx); + transition: 0.1s all linear; +} + + + + +/* 查看地图 */ +.view-map { + line-height: 80rpx; + text-align: center; + font-size: 24rpx; + color: #000; + border-bottom: 2rpx solid #F0F0F0; +} + + +/* 列表 */ +.list { + height: 100%; +} +.list-item { + padding: 40rpx 28rpx; + border-bottom: 2rpx solid #F0F0F0; + justify-content: space-between; + background-color: #fff; +} +.list-item:last-child { + border-bottom: none; +} +radio .wx-radio-input { + width: 32rpx; + height: 32rpx; +} +radio .wx-radio-input.wx-radio-input-checked { + border-color: #333; + /* border-color: #FFBA10; */ + background-color: white; +} +radio .wx-radio-input.wx-radio-input-checked::before { + display: inline-block; + content: ''; + width: 24rpx; + height: 24rpx; + border-radius: 50%; + background-color: #333; + /* background-color: #FFBA10; */ +} +.name-container { + padding-left: 14rpx; + padding-right: 30rpx; + box-sizing: border-box; +} +.name { + display: flex; + align-items: center; + font-size: 30rpx; + position: relative; +} +.address { + color: #6E6E6E; + font-size: 26rpx; + line-height: 34rpx; + padding-top: 16rpx; + /* padding-right: 40rpx; */ + text-align: justify; +} +.tag { + color: #FF5B5A; + border-radius: 6rpx; + border: 2rpx solid #FF5B5A; + font-size: 22rpx; + padding: 0 4rpx; + flex-shrink: 0; + margin-left: 4rpx; +} + +.distance { + color: #6E6E6E; + font-size: 22rpx; + line-height: 34rpx; + padding-top: 16rpx; + /* word-break: break-all; */ +} + +.icon-arrow_right { + padding-left: 20rpx; +} + +.right { + min-width: 200rpx; + text-align: right; +} + +.icon-arrow_down.active { + display: inline-block; + transform: rotateZ(180deg); +} + + + + + + + + + diff --git a/pages/user/express/express.js b/packageG/pages/user/express/express.js index a3571af..a3571af 100644 --- a/pages/user/express/express.js +++ b/packageG/pages/user/express/express.js diff --git a/pages/user/express/express.json b/packageG/pages/user/express/express.json index 251518d..251518d 100644 --- a/pages/user/express/express.json +++ b/packageG/pages/user/express/express.json diff --git a/pages/user/express/express.wxml b/packageG/pages/user/express/express.wxml index de1d85e..de1d85e 100644 --- a/pages/user/express/express.wxml +++ b/packageG/pages/user/express/express.wxml diff --git a/pages/user/express/express.wxss b/packageG/pages/user/express/express.wxss index 112d0a9..112d0a9 100644 --- a/pages/user/express/express.wxss +++ b/packageG/pages/user/express/express.wxss diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index ee03341..4560153 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1266,7 +1266,7 @@ Page({ enterAddress: function () { this.data.enterAddressPage = !0, wx.navigateTo({ - url: "/pages/user/address_list/address_list?operate=selectAddress" + url: "/packageF/pages/user/address_list/address_list?operate=selectAddress" }); }, onUnload: function () { diff --git a/pages/user/address_list/address_list.js b/pages/user/address_list/address_list.js index a6c1960..51f1e5c 100644 --- a/pages/user/address_list/address_list.js +++ b/pages/user/address_list/address_list.js @@ -71,7 +71,7 @@ Page({ var t = this.getAddressData(e.currentTarget.dataset.id), s = ""; for (var a in t) s += (0 != s.length ? "&" : "?") + a + "=" + t[a]; s && wx.navigateTo({ - url: "/pages/user/add_address/add_address" + s + url: "/packageF/pages/user/add_address/add_address" + s }); }, diff --git a/pages/user/address_list/address_list.wxml b/pages/user/address_list/address_list.wxml index 619915a..794f1cf 100644 --- a/pages/user/address_list/address_list.wxml +++ b/pages/user/address_list/address_list.wxml @@ -16,7 +16,7 @@ 获取微信地址 - + + 新建收货地址 @@ -69,7 +69,7 @@ 获取微信地址 - + + 新建收货地址 diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index ce95d16..32763bb 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -179,7 +179,7 @@ + data-url="/packageG/pages/user/express/express?order_id={{order.order_id}}">查看物流 diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index f9ecaef..bb0a89d 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -262,9 +262,9 @@ + hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流 + hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" data-url="/packageG/pages/user/express/express?order_id={{item.order_id}}">查看物流 订单详情 订单详情 diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml index 4b21b03..54e81aa 100644 --- a/pages/user/userinfo/userinfo.wxml +++ b/pages/user/userinfo/userinfo.wxml @@ -275,7 +275,7 @@ - + 收货地址 ∟