From 584860f100846c606ba3619678834ebd9c2f5b32 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 17 Aug 2021 09:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app.js | 2 +-
pages/home/customer-list/index.wxml | 32 -----------------------------
pages/home/qrcode-info/index.js | 7 ++++---
pages/home/qrcode-info/index.wxml | 8 ++++----
pages/home/qrcode-info/index.wxss | 5 ++++-
5 files changed, 13 insertions(+), 41 deletions(-)
diff --git a/app.js b/app.js
index 3f9546c..071098f 100644
--- a/app.js
+++ b/app.js
@@ -2,7 +2,7 @@
App({
evn: 2, // 0: 开发版本；1：测试版本；2：生产版本
tmplIds: ['AFoM5TOfsgERsfcetNSB0UlmEixnLF1ySXr54Bqno2M', 'lOQ8Gvyy_dTk68bYGpRVnVA0M7DsYYrV81Gd39GUPBA'],
- version: '2.3.3',
+ version: '2.4.0',
xAppId: '503258978847953926',
userInfo: null,
//----------------------------------------------globalData--------------------------------------
diff --git a/pages/home/customer-list/index.wxml b/pages/home/customer-list/index.wxml
index 34e3def..716a8f3 100644
--- a/pages/home/customer-list/index.wxml
+++ b/pages/home/customer-list/index.wxml
@@ -3,38 +3,6 @@
客户列表
-
-
取消
diff --git a/pages/home/qrcode-info/index.js b/pages/home/qrcode-info/index.js
index 36433d1..517a09b 100644
--- a/pages/home/qrcode-info/index.js
+++ b/pages/home/qrcode-info/index.js
@@ -5,6 +5,7 @@ const util = require('../../../utils/util')
const event = require('../../../utils/event')
const qrCode = require('../../../utils/weapp-qrcode')
const app = getApp()
+const qrUrl = 'https://apicloudprint.qniao.cn/cloud-print-user-center/verify/qrcode'
Scene({
/**
@@ -27,9 +28,10 @@ Scene({
this.data.type = Number(options.type)
}
if(this.data.type == 0){
+ this.showQrCode(`${qrUrl}?mark=ztb_saas&type=${this.data.type}&factoryId=${app.userInfo.factoryId}&customerId=${this.data.id}`)
this.fetchCustomerInfo()
} else if(this.data.type == 1){
- this.showQrCode(`?mark=ztb_saas&type=${this.data.type}&userId=${this.data.id}` )
+ this.showQrCode(`${qrUrl}?mark=ztb_saas&type=${this.data.type}&factoryId=${app.userInfo.factoryId}&customerId=${this.data.id}`)
let channel = this.getOpenerEventChannel()
let that = this
channel.once('onParam', function (data) {
@@ -53,9 +55,8 @@ Scene({
fetchCustomerInfo: function(){
wx.showLoading({ title: '正在获取', mask: true })
getCustomerInfo(this.data.id).then(result => {
- wx.hideLoading()
this.setData({ form: result.data, type: this.data.type })
- this.showQrCode(`?mark=ztb_saas&type=${this.data.type}&userId=${this.data.id}` )
+ wx.hideLoading()
}).catch(err => {
wx.hideLoading()
util.showToast(err)
diff --git a/pages/home/qrcode-info/index.wxml b/pages/home/qrcode-info/index.wxml
index e767ff1..f4b485b 100644
--- a/pages/home/qrcode-info/index.wxml
+++ b/pages/home/qrcode-info/index.wxml
@@ -1,9 +1,9 @@
- {{type == 0 ? '客户' : '员工'}}二维码
+ {{type == 0 ? '客户' : '员工'}}电子卡
-
-
+
+
@@ -14,7 +14,7 @@
-
+
diff --git a/pages/home/qrcode-info/index.wxss b/pages/home/qrcode-info/index.wxss
index db91716..ce95c7b 100644
--- a/pages/home/qrcode-info/index.wxss
+++ b/pages/home/qrcode-info/index.wxss
@@ -1 +1,4 @@
-/* pages/home/customer-info/index.wxss */
\ No newline at end of file
+/* pages/home/customer-info/index.wxss */
+.group-top{
+ border-radius: 20rpx 20rpx 0rpx 0rpx;
+}
\ No newline at end of file