|
@@ -175,12 +175,17 @@ export function getLocation() {
|
|
|
}
|
|
|
|
|
|
//扫描二维码
|
|
|
-export function scanQRCode(needResult,obj) {
|
|
|
- var needResult = needResult || 1;
|
|
|
+//扫描二维码
|
|
|
+export function scanQRCode(needResult,obj,sz) {
|
|
|
+ var scanTypeList=["qrCode"];
|
|
|
+
|
|
|
+ if(sz){
|
|
|
+ scanTypeList=sz
|
|
|
+ }
|
|
|
let promise = new Promise((resolve, reject) => {
|
|
|
wx.scanQRCode({
|
|
|
needResult: needResult,
|
|
|
- scanType: ["qrCode"],
|
|
|
+ scanType: scanTypeList,
|
|
|
success: function(res) {
|
|
|
var url = res.resultStr;
|
|
|
resolve(url);
|