From 0b9bda4fe681128102a736bbbbf15db8d619a7ff Mon Sep 17 00:00:00 2001 From: shaoying Date: Fri, 3 Jan 2020 09:53:16 +0800 Subject: [PATCH] opt mp --- client/mp/app.js | 1 + client/mp/app.json | 4 +-- client/mp/app.wxss | 10 ------ client/mp/pages/index/index.js | 56 ++++++++++++++++++++++++++++---- client/mp/pages/index/index.wxml | 26 ++++++++++----- client/mp/pages/index/index.wxss | 26 +++++++++++++++ 6 files changed, 97 insertions(+), 26 deletions(-) diff --git a/client/mp/app.js b/client/mp/app.js index c57c5965..aa291278 100644 --- a/client/mp/app.js +++ b/client/mp/app.js @@ -13,6 +13,7 @@ App({ typeof cb == "function" && cb(res) }}) }, + toast(title) {wx.showToast({title: title})}, onLaunch() {var app = this wx.login({success(res) {app.request("login", {code: res.code}, function(msg) {app.conf.sessid = msg.Result() wx.getSetting({success(res) {res.authSetting['scope.userInfo'] && wx.getUserInfo({success(res) { diff --git a/client/mp/app.json b/client/mp/app.json index 34291890..38c82445 100644 --- a/client/mp/app.json +++ b/client/mp/app.json @@ -6,9 +6,9 @@ "window": { "backgroundTextStyle": "light", "navigationBarBackgroundColor": "#fff", - "navigationBarTitleText": "WeChat", + "navigationBarTitleText": "终端工具链", "navigationBarTextStyle": "black" }, "style": "v2", "sitemapLocation": "sitemap.json" -} \ No newline at end of file +} diff --git a/client/mp/app.wxss b/client/mp/app.wxss index 06c6fc9c..e69de29b 100644 --- a/client/mp/app.wxss +++ b/client/mp/app.wxss @@ -1,10 +0,0 @@ -/**app.wxss**/ -.container { - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - justify-content: space-between; - padding: 200rpx 0; - box-sizing: border-box; -} diff --git a/client/mp/pages/index/index.js b/client/mp/pages/index/index.js index af0729bd..9c6687ee 100644 --- a/client/mp/pages/index/index.js +++ b/client/mp/pages/index/index.js @@ -3,18 +3,62 @@ const app = getApp() var utils = require("../../utils/util.js") Page({ data: { + picture: "", + content: "", + comment: "", list: [], }, show() {var page = this page.setData({list: (wx.getStorageSync("qrcode")||[]).reverse()}) }, - click(event) {var page = this - wx.showActionSheet({itemList:["保存"], success(res) { - wx.saveImageToPhotosAlbum({filePath: event.target.dataset.path, success(res) { - wx.showToast({title: "success"}) - }}) + onScan(event) {var page = this + wx.scanCode({success(res) { + page.setData({content: res.result}) + app.download("login?type="+encodeURIComponent(res.scanType)+"&scan="+encodeURIComponent(res.result), {}, function(res) { + page.setData({picture: res.tempFilePath}) + }) + }}) + }, + onCopy(event) {var page = this + wx.setClipboardData({data: page.data.content, success(res) { + app.toast("复制成功") + }}) + }, + onSave(event) {var page = this + wx.saveImageToPhotosAlbum({filePath: page.data.picture, success(res) { + app.toast("保存成功") + }}) + }, + onList(event) {var page = this + wx.saveFile({tempFilePath: page.data.picture, success(res) { + var list = wx.getStorageSync("qrcode") || [] + list.push({time: utils.Time(), index: list.length, + path: res.savedFilePath, content: page.data.content, comment: page.data.comment, + }) + wx.setStorageSync("qrcode", list) + app.toast("保存成功") + page.show() + }}) + }, + onClear(event) {var page = this + var list = wx.getStorageSync("qrcode") || [] + for (var i = 0; i < list.length; i++) { + wx.removeSavedFile({filePath: list[i].path, success(res) {}}) + } + wx.setStorageSync("qrcode", []) + app.toast("删除成功") + page.show() + }, + onClick(event) {var page = this, data = event.target.dataset + wx.showActionSheet({itemList:["显示", "删除", "复制文本", "保存图片"], success(res) { + switch (res.tapIndex) { + case 0: page.setData({picture: data.picture, content: data.content, comment: data.comment}); break + case 1: wx.removeSavedFile({filePath: data.picture, success(res) {app.toast("删除成功")}}); break + case 1: wx.setClipboardData({data: data.content, success(res) {app.toast("复制成功")}}); break + case 2: wx.saveImageToPhotosAlbum({filePath: data.picture, success(res) {app.toast("保存成功")}}); break + case 3: + } }}) - console.log(event) }, onscan(event) {var page = this wx.scanCode({success(res) { diff --git a/client/mp/pages/index/index.wxml b/client/mp/pages/index/index.wxml index 1a33578a..d575bab2 100644 --- a/client/mp/pages/index/index.wxml +++ b/client/mp/pages/index/index.wxml @@ -1,9 +1,19 @@ - - - - - - {{item.time}} - - + + + 扫描内容: