获取设备信息相关方法名修改

src/api/fly.js

@@ -14,7 +14,7 @@ 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 appInfo = it.getInfo();
 var provider = it.getProvider();
 var appDev, sendOrderId;
 var packages = apiConfig.package;

src/components/short/index.ux

@@ -20,7 +20,7 @@ export default {
 		bottom:0,
 	},props: ["bottom"],
 	onInit() {
-		let info = it.getAppInfo();
+		let info = it.getInfo();
 		this.icon = info.icon;
 		this.app_name = info.name;
 	},

src/helper/index.js

@@ -11,7 +11,6 @@ export const pageLoad = (meta, fn, params) => {
         resolve(ret);
       } else reject("last page");
     } else {
-      console.log("first page");
       let ret = await fn(params);
       resolve(ret);
     }
@@ -35,7 +34,6 @@ export const configWxPay = async (params) => {
       try {
         ret = await useWxH5Pay(params);
       } catch (e) {
-        console.log("e", e);
         ret = e;
       };
       break;
@@ -52,23 +50,18 @@ let useWxH5Pay = (params) => {
     let extra = {
       mweb_url: config.mweb_url + "&redirect_url=" + encodeURIComponent("https://quickapp.leyuee.com/testp")
     }
-    console.log(extra);
     wxpay.pay({
       prepayid: config.prepay_id,
       referer: "https://quickapp.leyuee.com",
       extra: extra,
       success: (data) => {
-        console.log("success", data);
         // app中返回prepayid web中返回final_url
         resolve({ code: "9000", data: data, order: config.trade_no, message: "订单已经提交" });
       },
       fail: (data, code) => {
-        console.log("error");
-        console.log(data, code);
         reject({ code: code, data: data, message: data });
       },
       cancel: () => {
-        console.log("user cancel");
         reject({ code: "6001", data: "", message: "user cancel" });
       }
     })
@@ -87,23 +80,17 @@ let useWxAppPay = (params) => {
       time_stamp: config.timestamp + "",
       order_sign: config.sign
     }
-    console.log(extra);
-    console.log("prepayid ", config.prepayid);
     wxpay.pay({
       prepayid: config.prepayid,
       extra: extra,
       success: (data) => {
-        console.log("success", data);
         // app中返回prepayid web中返回final_url
         resolve({ code: "9000", data: data, order: config.trade_no, message: "支付成功" });
       },
       fail: (data, code) => {
-        console.log("error");
-        console.log(data, code);
         reject({ code: code, data: data, message: data });
       },
       cancel: () => {
-        console.log("user cancel");
         reject({ code: "6001", data: "", message: "user cancel" });
       }
     })
@@ -117,7 +104,6 @@ export const configAliPay = (params) => {
     alipay.pay({
       orderInfo: orderInfo.order_info,
       callback: (ret) => {
-        console.log("alipay cb", ret);
         resolve({ code: ret.resultStatus, order: orderInfo.trade_no, result: ret.result ? JSON.parse(ret.result) : "" })
       }
     })

src/helper/interface.js

@@ -26,7 +26,7 @@ const getPushRedId = fn => {
 }
 
 //获取应用信息
-const getAppInfo = () => {
+const getInfo = () => {
   const appInfo = app.getInfo()
   return appInfo
 }
@@ -83,7 +83,7 @@ const hasCreateShortCut = (isPayPage = false, fn) => {
 }
 
 //弱加桌
-const loseLevelShortCut = fn => {
+const feeblerShortCut = fn => {
   shortcut.hasInstalled({
     success: ret => {
       if (!ret) {
@@ -101,7 +101,7 @@ const loseLevelShortCut = fn => {
 }
 
 //强制加桌
-const mustCreateShort = fn => {
+const forceToShortCut = fn => {
   shortcut.hasInstalled({
     success: ret => {
       if (!ret) {
@@ -124,7 +124,7 @@ const mustCreateShort = fn => {
 }
 
 //用于返回时提醒加桌
-const backCreateShortCut = fn => {
+const createShortCutWhenBack = fn => {
   shortcut.hasInstalled({
     success: ret => {
       if (!ret) {
@@ -179,17 +179,16 @@ const showMenu = () => {
   })
 }
 const getAppName = () => {
-  let appInfo = getAppInfo();
+  let appInfo = getInfo();
   return appInfo.name;
 }
 
-const  getDevManufacturer = async () => {
+const  devManufacturerName = async () => {
   let data = (await device.getInfo()).data;
-  return data.manufacturer;
-  // console.log('dataaaaaaaaa',data);
+  return data.manufacturer;``
 }
 
-const getHasShortcut = async () => {
+const hasShortcut = async () => {
   
   let data = (await shortcut.hasInstalled()).data;
 
@@ -203,17 +202,17 @@ export default {
   shortcut,
   getDeviceInfo,
   hasCreateShortCut,
-  backCreateShortCut,
+  createShortCutWhenBack,
   showMenu,
   getShortCut,
-  getAppInfo,
+  getInfo,
   getAppDev,
   validatePhone,
   getPushRedId,
   getProvider,
-  mustCreateShort,
-  loseLevelShortCut,
+  forceToShortCut,
+  feeblerShortCut,
   getAppName,
-  getDevManufacturer,
-  getHasShortcut,
+  devManufacturerName,
+  hasShortcut,
 }

src/views/Activity/index.ux

@@ -175,7 +175,7 @@ export default {
     this.currentProduct = this.activity.products[0]
   },
   async wantCharge() {
-     let manufacturer = (await it.getDevManufacturer()).toLowerCase();
+     let manufacturer = (await it.devManufacturerName()).toLowerCase();
     if (!(this.send_order_id || (this.haslogin && this.loginPhone)) &&
       (manufacturer == 'xiaomi' || manufacturer == 'vivo')) {
       prompt.showDialog({

src/views/Pay/index.ux

@@ -240,7 +240,7 @@ export default {
     }
   },
   async toPay() {
-    let manufacturer = (await it.getDevManufacturer()).toLowerCase()
+    let manufacturer = (await it.devManufacturerName()).toLowerCase()
     if (
       !(this.send_order_id || (this.haslogin && this.loginPhone)) &&
       (manufacturer == 'xiaomi' || manufacturer == 'vivo')

src/views/Reader/index.ux

@@ -299,7 +299,7 @@ export default {
         return true;
       }
 
-      it.backCreateShortCut(res => {
+      it.createShortCutWhenBack(res => {
         if (res == 'back') {
           that.getLastPage();
           return true;
@@ -460,7 +460,7 @@ export default {
     })
   },
   addDestop() {
-    it.mustCreateShort((res, code) => {
+    it.forceToShortCut((res, code) => {
       if (res) {
         this.goNext();
       } else {
@@ -493,7 +493,7 @@ export default {
           }
         })
       } else if (this.force_add_desk_type == 2) {
-        it.loseLevelShortCut(res => {
+        it.feeblerShortCut(res => {
           this.goNext();
         })
       } else {