2222

src/api/fly.js

@@ -9,15 +9,19 @@ import fetch from "@system.fetch";
 import Fly from "flyio/dist/npm/hap";
 import apiConfig from "./config";
 import prompt from '@system.prompt';
-import { getToken, clearToken } from "./utils";
+import { getToken, clearToken,getSendOrderId } from "./utils";
 import it from "../helper/interface.js";
 var fly = new Fly(fetch);
 var qs = require('qs');
 var appInfo = it.getAppInfo();
-var appDev;
+var appDev,sendOrderId;
 it.getAppDev((res)=>{
   appDev=res;
 })
+getSendOrderId((id)=>{
+  sendOrderId=id;
+})
+
 fly.config.baseURL = apiConfig.baseURL;
 fly.config.headers["Content-Type"] =
   "application/x-www-form-urlencoded;charset=utf-8";
@@ -28,15 +32,18 @@ fly.interceptors.request.use(async config => {
   // 过滤一些不需要登录的路由d
   if (filterNoToken.indexOf(config.url) === -1) {
     let token = await getToken();
-  
     if (config.headers){
       config.headers.Authorization = token;
       config.headers["X-Version"] = appInfo.versionName;
       config.headers["X-Brand"] = qs.stringify(appDev);
+      if(sendOrderId) config.headers["send_order_id"]=sendOrderId;
     } 
     else{
-      config.headers = { Authorization: token,'X-Version':appInfo.versionName };
-      config.headers = { Authorization: token,'X-Brand':qs.stringify(appDev) };
+      if(sendOrderId){
+        config.headers = { Authorization: token,'X-Version':appInfo.versionName,'X-Brand':qs.stringify(appDev),'send_order_id':sendOrderId };
+      }else{
+        config.headers = { Authorization: token,'X-Version':appInfo.versionName,'X-Brand':qs.stringify(appDev)};
+      }
     } 
     if (config.method === "POST") {
       config.body = qs.stringify(config.body);

src/api/utils.js

@@ -207,3 +207,15 @@ function isExceedDay(theDate, expDay) {
     (expDay - 1) * 24 * 3600 * 1000;
   return theDate < targetTime;
 }
+
+export const getSendOrderId= (fn) =>{
+  storage.get({
+    key: 'send_order_id',
+    success: data => {
+     fn && fn(data);
+    },
+    fail: (data,code) => {
+      console.log(`handling fail, code = ${code}`)
+    }
+  })
+}

src/manifest.json

@@ -1,8 +1,8 @@
 {
   "package": "com.beidao.kuaiying.zsy",
   "name": "追书云",
-  "versionName": "1.0.7",
-  "versionCode": "8",
+  "versionName": "1.0.8",
+  "versionCode": "9",
   "minPlatformVersion": "1020",
   "icon": "/assets/imgs/logo.png",
   "features": [

src/views/Phone/index.ux

@@ -14,7 +14,7 @@
   </div>
 </template>
 <script>
-import { validatePhone } from '../../api/utils';
+import { validatePhone ,getSendOrderId } from '../../api/utils';
 import { sendCode, userBind } from '../../api/index';
 import router from '@system.router';
 import prompt from '@system.prompt';