Merge branch 'dev_oa_fu5' into dev

WXD-SEASON\season
2 parents a6ab719c 41a72525
Showing 6 changed files with 96 additions and 20 deletions
app.js
packageF/pages/wuliu/wuliu.js
packageF/pages/wuliu/wuliu.json
packageF/pages/wuliu/wuliu.wxml
packageF/pages/wuliu/wuliu.wxss
pages/index/index/index.js
@@ -1314,24 +1314,10 @@ App({
             if(conf && conf.express_searchtype==1){
                 //在此通过调用api来查询微信快递服务详情
                 //必须用预览才能测试这个功能，无法在工具端模拟
-                var res=  await th.promiseGet('/api/weshop/order/getWaybillToken/'+stoid+'/'+order_id,{});
-                if(res.data.code==0){
-                    var plugin = requirePlugin("logisticsPlugin")
-                    plugin.openWaybillTracking({
-                        waybillToken: res.data.data
-                    });
-                }else{
-                    var msg="查询物流失败";
-                    if(res.data.msg) msg=res.data.msg;
-                    wx.showToast({
-                        title: msg,
-                        icon: 'none',
-                        duration: 1000,
-                    });
-                }
-            }else{
-                getApp().goto(url);
+                url="/packageF/pages/wuliu/wuliu?order_id="+order_id;
             }
+            th.goto(url);
+
         })
     }
  
+var os=getApp().globalData.setting;
+Page({
+  data:{
+      isLoad:0,
+      url: os.imghost,
+  },
+  onLoad:function(t){
+      var th=this;
+      var order_id=t.order_id;
+      getApp().promiseGet('/api/weshop/order/getWaybillToken/'+os.stoid+'/'+order_id,{}).then(res=>{
+          if(res.data.code==0){
+              th.data.isLoad=1;
+              setTimeout(()=>{
+                  var arr = getCurrentPages();
+                  var plugin = requirePlugin("logisticsPlugin");
+                  plugin.openWaybillTracking({
+                      waybillToken: res.data.data
+                  });
+              },100)
+          }else{
+              var msg="查询物流失败";
+              if(res.data.msg) msg=res.data.msg;
+              wx.showToast({
+                  title: msg,
+                  icon: 'none',
+                  duration: 1000,
+              });
+          }
+      })
+  },
+  onShow: function(){
+      if(this.data.isLoad){
+          this.data.isLoad=0;
+          wx.navigateBack({ delta: 1 })  //返回上一页
+          return false;
+      }
+  }
+
+
+});
+{}
 \ No newline at end of file
+<view   class="flex j_c a_c" style="height:80vh">
+    <view>
+    <view style="text-align:center">
+       查询中
+    </view>
+    <view class="loading4">
+        <text class="three1"></text>
+        <text class="three2" style="margin-left:15rpx"></text>
+        <text class="three3" style="margin-left:15rpx"></text>
+    </view>
+    </view>
+</view>
+.flex{
+    display: flex
+}
+.j_c{ justify-content: center}
+.a_c{ align-items: center}
+
+.loading4{
+    width:150px;
+    margin:10px auto;
+    text-align: center;
+}
+.loading4 text{
+    width: 24rpx;
+    height: 24rpx;
+    border-radius: 100%;
+    display:inline-block;
+    /*background-color: #67CF22;*/
+    background-color: #999;
+    -webkit-animation: three 1.4s infinite ease-in-out;
+    animation: three 1.4s infinite ease-in-out;
+    -webkit-animation-fill-mode: both;
+    animation-fill-mode: both;
+}
+.loading4 .three1{
+    -webkit-animation-delay: -0.30s;
+    animation-delay: -0.30s;
+}
+.loading4 .three2{
+    -webkit-animation-delay: -0.15s;
+    animation-delay: -0.15s;
+}
+@-webkit-keyframes three {
+    0%, 80%, 100% {-webkit-transform: scale(0.0) }
+    40% { -webkit-transform: scale(1.0) }
+}
+@keyframes three {
+    0%, 80%, 100% {-webkit-transform: scale(0.0) }
+    40% { -webkit-transform: scale(1.0) }
+}
 \ No newline at end of file
@@ -91,9 +91,7 @@ Page({
  
  
 	onLoad: async function (tt) {
-    console.error('分享群id');
-    console.error(tt);
-    console.error('...................................');
+
 		wx.showShareMenu({
 			withShareTicket:true,
 			menus:['shareAppMessage','shareTimeline']