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/packageG/pages/user/express/express.js b/packageG/pages/user/express/express.js
new file mode 100644
index 0000000..a3571af
--- /dev/null
+++ b/packageG/pages/user/express/express.js
@@ -0,0 +1,41 @@
+var e = getApp(), s = e.request,oo=e.globalData,os=oo.setting;
+
+Page({
+ data: {
+ url: e.globalData.setting.url,
+ resourceUrl: e.globalData.setting.imghost,
+ delivery: null,
+ express: null,
+ re_arr:null,//反转后的数组
+ error: "快递信息异常"
+ },
+ onLoad: function(e) {
+ this.requestDelivery(e.order_id);
+ },
+ requestDelivery: function(e) {
+ var r = this;
+ s.get("/api/order/deliverydoc/page", {
+ data: { order_id: e,store_id:os.stoid },
+ success: function(e) {
+ r.setData({
+ delivery: e.data.data.pageData[0],
+ }), r.requestExpress();
+ }
+ });
+ },
+ requestExpress: function() {
+ var s = this;
+ wx.request({
+ url: this.data.url + "/api/weshop/order/wuliu/" + this.data.delivery.shipping_code + "/" + this.data.delivery.invoice_no + "/" + this.data.delivery.mobile, success: function(e) {
+
+ var re_arr = e.data.data.Traces.reverse();
+ s.setData({
+ express: e.data.data, re_arr: re_arr,
+ });
+ },
+ fail: function(s) {
+ e.showWarning("请求失败");
+ }
+ });
+ }
+});
\ No newline at end of file
diff --git a/packageG/pages/user/express/express.json b/packageG/pages/user/express/express.json
new file mode 100644
index 0000000..251518d
--- /dev/null
+++ b/packageG/pages/user/express/express.json
@@ -0,0 +1,3 @@
+{
+ "navigationBarTitleText": "查看物流信息"
+}
\ No newline at end of file
diff --git a/packageG/pages/user/express/express.wxml b/packageG/pages/user/express/express.wxml
new file mode 100644
index 0000000..de1d85e
--- /dev/null
+++ b/packageG/pages/user/express/express.wxml
@@ -0,0 +1,39 @@
+
+
+ 快递单号 :
+ {{delivery.invoice_no}}
+
+
+ 承运公司 :
+ {{delivery.shipping_name}}
+
+
+
+ 物流状态 :
+ 无轨迹
+ 已揽收
+ 在途中
+ 签收
+ 问题件
+
+
+
+
+
+
+
+
+ {{item.AcceptStation}}
+ {{item.AcceptTime}}
+
+
+
+
+
+ {{express.Reason}}
+
diff --git a/packageG/pages/user/express/express.wxss b/packageG/pages/user/express/express.wxss
new file mode 100644
index 0000000..112d0a9
--- /dev/null
+++ b/packageG/pages/user/express/express.wxss
@@ -0,0 +1,64 @@
+.logistics-mes {
+ padding: 20rpx 30rpx;
+ background-color: #fff;
+}
+
+.logistics-num {
+ display: flex;
+ line-height: 48rpx;
+ font-size: 28rpx;
+}
+
+.logistics-title {
+ color: #777;
+ margin-right: 20rpx;
+}
+
+.logistics-cont {
+ color: #444;
+}
+
+.apply-state {
+ margin-top: 20rpx;
+ background-color: #fff;
+ padding-left: 50rpx;
+ padding-top: 60rpx;
+}
+
+.state-item {
+ border-left: 1px solid #ccc;
+ padding:0 40rpx;
+}
+
+.item-wrap {
+ position: relative;
+ margin-bottom: 20rpx;
+ padding-bottom: 20rpx;
+ border-bottom: 1px solid #eee;
+ font-size: 24rpx;
+ color: #aaa;
+ line-height: 1;
+}
+
+.item-wrap::before {
+ content: '';
+ position: absolute;
+ left: -61rpx;
+ top: 0;
+ width: 26rpx;
+ height: 26rpx;
+ border-radius: 50%;
+ background-color: #e23435;
+ border: 4px solid #ed8182;
+}
+
+.state-title {
+ font-size: 28rpx;
+ font-weight: bold;
+ color: #666;
+ padding-bottom: 20rpx;
+ line-height: 40rpx
+}
+.no_msg{
+ text-align: center;color: #999; font-size: 32rpx
+}
\ No newline at end of file