扫码功能优化0.0.45

1 year ago · ea12faa474
parent 715b4b0d38
commit ea12faa474
6 changed files with 113 additions and 6 deletions
--- a/meta.config
+++ b/meta.config
--- a/src/manifest.json
+++ b/src/manifest.json
@ -88,7 +88,42 @@
            }
        },
        /* SDK配置 */
-        "usingComponents" : true
+        "usingComponents" : true,
+        "nativePlugins" : {
+            "Mpaas-Scan" : {
+                "AppId" : "ALIPUB455598B071022",
+                "License" : "jRWdWy9QzrG42p8l0k1Zbz4aGsGiYqVnUQ63io6ncYh/x6ouFyQ/WTRdWTj3vhlePyTcY5/Pr9uf4QqmvRjJQUCToEXcu+TOuZMa7U4IBmXbxctFNWRY2ZMwR1K4UTF2nuppy/Mti8qhMYfJ9xyOeaMTi73H/Q+07+W8XwD72ZuagLF0GrIXXv1HGjna8qNMBRg19ZIoEmk4QHRUWrQ0/1Y7Rj0w5DApdKzINGZQ2q9t0qLKM2Mcw2I72j4aXmMq18vjniQCfMN3DUTaMtsGrlacXXGZsRlC4z/2CiamytQT2GBpXwwhvYcTelMxfsu7eKgPaO+uNORTEbPfVWxF3g==",
+                "WorkspaceId" : "default",
+                "__plugin_info__" : {
+                    "name" : "支付宝原生扫码插件",
+                    "description" : "支付宝原生扫码组件，包体积仅0.7MB，15分钟即可完成接入。同时，mPaaS提供「扫码分析」大盘",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=2636",
+                    "android_package_name" : "lanju.uniapp",
+                    "ios_bundle_id" : "lanju.uniapp",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "2636",
+                    "parameters" : {
+                        "AppId" : {
+                            "des" : "Android平台的AppId，请填写Android的config文件中的appId对应的值",
+                            "key" : "mobilegw.appid",
+                            "value" : ""
+                        },
+                        "License" : {
+                            "des" : "Android平台的License,，请填写Android的config文件中的mpaasConfigLicense对应的值",
+                            "key" : "mpaasConfigLicense",
+                            "value" : ""
+                        },
+                        "WorkspaceId" : {
+                            "des" : "Android平台的WorkspaceId，请填写Android的config文件中的workspaceId对应的值",
+                            "key" : "workspaceId",
+                            "value" : ""
+                        }
+                    }
+                }
+            }
+        }
    },
    "quickapp" : {},
    /* 快应用特有相关 */
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@ -239,6 +239,7 @@ export default class LoginPage extends BasePage {
    const loginName = username;
    const userId = loginResultuser.user.userId;
    const nickName = loginResultuser.user.nickName;
+    const roles = loginResultuser.user.roles;
    const createBy = loginResultuser.user.createBy;
    const menuListold = loginResultuser.menuList;
    let menuList = [];
@ -259,6 +260,7 @@ export default class LoginPage extends BasePage {
      menuList,
      userId,
      nickName,
+      roles,
    });
    uni.showToast({
      //icon: 'success',
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@ -121,6 +121,7 @@
              </div>
            </div>
            <uni-icons type="scan" size="35" @click="scanCodeOne" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons>
+            <!-- <uni-icons type="scan" size="35" @click="scanCodeOne3" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
            <!-- <uni-icons type="scan" size="35" @click="scanCodeOne2" style="color: #0b9eff; margin: auto; padding: 22rpx"></uni-icons> -->
            <div class="upload-name">
              <!-- <div class="name">检查标准:{{ form.item5 }}</div> -->
@ -206,8 +207,9 @@ import { Component } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 import model from './model';
-//import { any } from 'lodash/fp';
 import { session } from '@/store/modules/session';
+const mpaasScanModule: any = uni.requireNativePlugin('Mpaas-Scan-Module');
+
@Component({
  components: {
    jPicker,
@ -328,7 +330,10 @@ export default class PurchaseWHSRM extends BasePage {
  files: any = [];
  DefectListPDAlist: any = [];
  defectCodelist: any = [];
-  imgurl: any = 'http://lj08.cn/21201501124240221021300171390045';
+  imgurl: any = 'http://lj08.cn/21001871815240307020600048115350';
+  // 引入原生插件
+  // 调用插件的 mpaasScan 方法
+
  //收货按钮
  tagClick(index) {
    this.tagslist.splice(index, 1);
@ -792,10 +797,43 @@ export default class PurchaseWHSRM extends BasePage {
    this.detaillistceshi[index].fileListStr = this.detaillistceshi[index].files.join(',');
    console.log(this.detaillistceshi[index]);
  }
+  // "resp_message":"success""res_presult":"http://li08.cn/21001871815240307020600048115350""res_pcode":1000}
  scanCodeOne() {
+    // http://lj08.cn/21201501124240221021300171390045
+    mpaasScanModule.mpaasScan(
+      {
+        // 扫码识别类型，参数可多选，qrCode、barCode，
+        // 如不设置，默认识别所有扫码类型，可能有些许影响识别效率
+        scanType: ['qrCode', 'barCode'],
+        // 是否隐藏相册，默认false不隐藏
+        hideAlbum: false,
+      },
+      (ret) => {
+        console.log(ret);
+        // uni.showModal({
+        //   title: '扫码结果',
+        //   // 返回值中，有三个参数 resp_code、resp_message、resp_result
+        //   // resp_code 表示返回结果值，10：用户取消，11：其他错误，1000：成功
+        //   // resp_message 表示返回结果信息
+        //   // resp_result 表示扫码结果，只有成功才会有返回
+        //   content: JSON.stringify(ret),
+        //   showCancel: false,
+        //   confirmText: '确定',
+        // });
+        if (ret.resp_message == 'success') {
+          uni.navigateTo({
+            url: `/pages/quality/Materialinspection/web?listitem=` + encodeURIComponent(ret.resp_result),
+          });
+        } else {
+          this.customToast(ret.resp_result);
+        }
+      },
+    );
+  }
+  scanCodeOne3() {
    // http://lj08.cn/21201501124240221021300171390045
    uni.scanCode({
-      // scanType: ['barCode'],
+      scanType: ['qrCode', 'barCode'],
      success: (res) => {
        console.log(res.result, 'ssss');
        this.orderNo = res.result;
--- a/src/pages/shouye/me.vue
+++ b/src/pages/shouye/me.vue
@ -7,7 +7,8 @@
      <view>
        <u-avatar :src="src" size="large"></u-avatar>
        <view>{{ sessiondata.loginName }}</view>
-        <view>仓库管理员 ID:0000001</view>
+        <view>{{ sessiondata.roles[0].roleName }}: {{ sessiondata.nickName }}</view>
+        <!-- <view>仓库管理员 ID:0000001</view> -->
      </view>
    </view>
    <view class="container">
@ -65,7 +66,7 @@ export default class RawHome extends BasePage {
  model = model;
  src: 'http://pic2.sc.chinaz.com/Files/pic/pic9/202002/hpic2119_s.jpg';
  today = dayjs().format('YYYY-MM-DD dddd');
-  version = '0.0.44';
+  version = '0.0.45';
  checkversion: any = {};
  sessiondata: any = '';
  onLoad() {
--- a/src/store/modules/session.ts
+++ b/src/store/modules/session.ts
@ -17,6 +17,7 @@ export interface User {
  createBy?: string;
  menuList?: Array<Menu>;
  nickName?: string;
+  roles?: Array<Menu>;
 }
 export interface FactoryCode {
  factoryCode?: string;
@ -88,6 +89,13 @@ class SessionService extends VuexModule {
      return this.user.nickName;
    }
  }
+  get roles(): any {
+    if (this.user === null) {
+      return null;
+    } else {
+      return this.user.roles;
+    }
+  }
  /**
   * 当前选择语言
   */